[libexif-cvs] libexif/libexif exif-entry.c,1.46,1.47

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8387

Modified Files:
	exif-entry.c 
Log Message:
Fixes of changes "2004-03-02  Joerg Hoh<jo...@de...>":
1) EXIF_TAG_SUBJECT_DISTANCE_RANGE: entries made global static
 to be compilable with C
2) all values of the new code were shifted by one



Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- exif-entry.c	2 Mar 2004 18:11:06 -0000	1.46
+++ exif-entry.c	3 Mar 2004 15:38:36 -0000	1.47
@@ -176,6 +176,8 @@
   { 0, {NULL}}
 };
 
+static char* sdr_entries[] = {"Unknown", "Macro", "Close view", "Distant view"};
+
 const char *
 exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
 {
@@ -668,10 +670,9 @@
 	case EXIF_TAG_SUBJECT_DISTANCE_RANGE:
 		CF (e->format, EXIF_FORMAT_SHORT, val, maxlen);
 		CC (e->components, 1, val, maxlen);
-		char* entries[] = {"Unknown", "Macro", "Close view", "Distant view"};
 		v_short = exif_get_short (e->data, o);
 		if (v_short < 4) {
-		  strncpy (val, _(entries[v_short]), maxlen -1);
+		  strncpy (val, _(sdr_entries[v_short]), maxlen -1);
 		}
 		else {
 		  snprintf (val, maxlen, "%i", v_short);
@@ -731,7 +732,7 @@
 			strncpy (val, "Internal error.", maxlen - 1);
 			break;
 		}
-		for (j = 0; list[i].strings[j] && (j <= v_short); j++);
+		for (j = 0; list[i].strings[j] && (j < v_short); j++);
 		if (!list[i].strings[j])
 			snprintf (val, maxlen, "%i", v_short);
 		else