[libexif-cvs] libmnote/test test-mnote.c,1.1,1.2

[Matthieu C. <ma...@us...>]

Update of /cvsroot/libexif/libmnote/test
In directory sc8-pr-cvs1:/tmp/cvs-serv23705/test

Modified Files:
	test-mnote.c 
Log Message:
Canon bugfixe

Index: test-mnote.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/test/test-mnote.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-mnote.c	15 Nov 2002 22:10:08 -0000	1.1
+++ test-mnote.c	28 Aug 2003 15:43:50 -0000	1.2
@@ -7,15 +7,17 @@
 int
 main (int argc, char **argv)
 {
+#ifndef USE_EXIF_DATA
 	ExifData *ed;
 	ExifEntry *e;
+#endif
 	MNoteData *md;
 
 	if (argc < 2) {
 		fprintf (stderr, "You need to supply a file!\n");
 		return (1);
 	}
-
+#ifndef USE_EXIF_DATA
 	ed = exif_data_new_from_file (argv[1]);
 	if (!ed) {
 		fprintf (stderr, "Could not retreive EXIF data from '%s'!\n",
@@ -35,7 +37,9 @@
 
 	md = mnote_data_new_from_data (e->data, e->size);
 	exif_data_unref (ed);
-
+#else
+	md = mnote_data_new_from_file(argv[1]);
+#endif
 	if (!md) {
 		fprintf (stderr, "Could not parse EXIF tag MakerNote!\n");
 		return (1);