libexif-cvs

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1:/tmp/cvs-serv22696/exif

Modified Files:
	actions.c 
Log Message:

2004-01-08  Lutz Mueller <lu...@us...>

	* exif/actions.c: Adapt to new API
	* configure.in: Require libexif-0.5.13.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- actions.c	30 Sep 2003 22:43:00 -0000	1.14
+++ actions.c	7 Jan 2004 23:38:07 -0000	1.15
@@ -78,7 +78,7 @@
 		if (!name)
 			continue;
 		fprintf (stdout, "  0x%04x %-29.29s", tag, name);
-		if (mnote_data_get_value (en, tag))
+		if (mnote_data_get_value (en, tag, txt, 1))
 			printf (ENTRY_FOUND);
 		else
 			printf (ENTRY_NOT_FOUND);
@@ -92,6 +92,7 @@
 show_entry (ExifEntry *e, void *data)
 {
 	unsigned char *ids = data;
+	char v[128];
 
 	if (*ids)
 		fprintf (stdout, "0x%04x", e->tag);
@@ -99,9 +100,11 @@
 		fprintf (stdout, "%-20.20s", C(exif_tag_get_title (e->tag)));
 	printf ("|");
 	if (*ids)
-		fprintf (stdout, "%-72.72s", C(exif_entry_get_value (e)));
+		fprintf (stdout, "%-72.72s",
+			 C(exif_entry_get_value (e, v, 73)));
 	else
-		fprintf (stdout, "%-58.58s", C(exif_entry_get_value (e)));
+		fprintf (stdout, "%-58.58s",
+			 C(exif_entry_get_value (e, v, 59)));
 	fputc ('\n', stdout);
 }
 
@@ -117,6 +120,7 @@
 show_note_entry (MNoteData *note, MNoteTag tag, void *data)
 {
 	unsigned char *ids = data;
+	char v[73];
 
 	if (*ids)
 		fprintf (stdout, "0x%04x", tag);
@@ -124,9 +128,11 @@
 		fprintf (stdout, "%-20.20s", mnote_tag_get_title (note, tag));
 	printf ("|");
 	if (*ids)
-		fprintf (stdout, "%-72.72s", mnote_data_get_value (note, tag));
+		fprintf (stdout, "%-72.72s",
+			 mnote_data_get_value (note, tag, v, 73));
 	else
-		fprintf (stdout, "%-58.58s", mnote_data_get_value (note, tag));
+		fprintf (stdout, "%-58.58s",
+			 mnote_data_get_value (note, tag, v, 58));
 	fputc ('\n', stdout);
 }
 
@@ -138,11 +144,9 @@
         unsigned int i, width;
 
         width = (ids ? 6 : 20); 
-        for (i = 0; i < width; i++)
-                fputc ('-', stdout);
+        for (i = 0; i < width; i++) fputc ('-', stdout);
         fputc ('+', stdout);
-        for (i = 0; i < 78 - width; i++)
-		fputc ('-', stdout);
+        for (i = 0; i < 78 - width; i++) fputc ('-', stdout);
 	fputc ('\n', stdout);
 }
 
@@ -180,15 +184,15 @@
 }
 
 static void
-show_entry_machine (ExifEntry *entry, void *data)
+show_entry_machine (ExifEntry *e, void *data)
 {
 	unsigned char *ids = data;
+	char *v[1024];
 
-	if (*ids) fprintf (stdout, "0x%04x", entry->tag);
-	else fprintf (stdout, "%s", exif_tag_get_title (entry->tag));
+	if (*ids) fprintf (stdout, "0x%04x", e->tag);
+	else fprintf (stdout, "%s", exif_tag_get_title (e->tag));
 	printf ("\t");
-	if (*ids) fprintf (stdout, "%s", exif_entry_get_value (entry));
-	else fprintf (stdout, "%s", exif_entry_get_value (entry));
+	fprintf (stdout, "%s", exif_entry_get_value (e, v, sizeof (v)));
 	fputc ('\n', stdout);
 }