[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.9, 1.10 mnote-pentax-tag.c, 1.5, 1.6

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

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8194

Modified Files:
	mnote-pentax-entry.c mnote-pentax-tag.c 
Log Message:
1) correct checks of size of entry's data: entry->size contains real size
  of entry->data, e.g. 0 if entry->data is NULL
2) return empty string instead of NULL when asked for description


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- mnote-pentax-tag.c	17 Mar 2005 16:00:29 -0000	1.5
+++ mnote-pentax-tag.c	11 May 2007 06:26:02 -0000	1.6
@@ -31,33 +31,33 @@ static struct {
 	const char *title;
 	const char *description;
 } table[] = {
-	{MNOTE_PENTAX_TAG_MODE, "Mode", N_("Capture Mode"), NULL},
-	{MNOTE_PENTAX_TAG_QUALITY, "Quality", N_("Quality Level"), NULL},
-	{MNOTE_PENTAX_TAG_FOCUS, "Focus", N_("Focus Mode"), NULL},
-	{MNOTE_PENTAX_TAG_FLASH, "Flash", N_("Flash Mode"), NULL},
+	{MNOTE_PENTAX_TAG_MODE, "Mode", N_("Capture Mode"), ""},
+	{MNOTE_PENTAX_TAG_QUALITY, "Quality", N_("Quality Level"), ""},
+	{MNOTE_PENTAX_TAG_FOCUS, "Focus", N_("Focus Mode"), ""},
+	{MNOTE_PENTAX_TAG_FLASH, "Flash", N_("Flash Mode"), ""},
 	{MNOTE_PENTAX_TAG_UNKNOWN_05, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_06, NULL, NULL, NULL},
-	{MNOTE_PENTAX_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), NULL},
+	{MNOTE_PENTAX_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), ""},
 	{MNOTE_PENTAX_TAG_UNKNOWN_08, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_09, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_ZOOM, "Zoom", N_("Zoom"), NULL},
-	{MNOTE_PENTAX_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), NULL},
-	{MNOTE_PENTAX_TAG_CONTRAST, "Contrast", N_("Contrast"), NULL},
-	{MNOTE_PENTAX_TAG_SATURATION, "Saturation", N_("Saturation"), NULL},
+	{MNOTE_PENTAX_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), ""},
+	{MNOTE_PENTAX_TAG_CONTRAST, "Contrast", N_("Contrast"), ""},
+	{MNOTE_PENTAX_TAG_SATURATION, "Saturation", N_("Saturation"), ""},
 	{MNOTE_PENTAX_TAG_UNKNOWN_14, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_15, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_16, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_17, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_18, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_19, NULL, NULL, NULL},
-	{MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISOSpeed"), NULL},
+	{MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISOSpeed"), ""},
 	{MNOTE_PENTAX_TAG_UNKNOWN_21, NULL, NULL, NULL},
-	{MNOTE_PENTAX_TAG_COLOR, "Color", N_("Color"), NULL},
+	{MNOTE_PENTAX_TAG_COLOR, "Color", N_("Color"), ""},
 	{MNOTE_PENTAX_TAG_UNKNOWN_24, NULL, NULL, NULL},
 	{MNOTE_PENTAX_TAG_UNKNOWN_25, NULL, NULL, NULL},
-	{MNOTE_PENTAX_TAG_PRINTIM, "PrintIM", N_("PrintIM Settings"), NULL},
-	{MNOTE_PENTAX_TAG_TZ_CITY, "TimeZone", N_("TimeZone"), NULL},
-	{MNOTE_PENTAX_TAG_TZ_DST, "DaylightSavings", N_("DaylightSavings"), NULL},
+	{MNOTE_PENTAX_TAG_PRINTIM, "PrintIM", N_("PrintIM Settings"), ""},
+	{MNOTE_PENTAX_TAG_TZ_CITY, "TimeZone", N_("TimeZone"), ""},
+	{MNOTE_PENTAX_TAG_TZ_DST, "DaylightSavings", N_("DaylightSavings"), ""},
 	{0, NULL, NULL, NULL}
 };
 

Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- mnote-pentax-entry.c	5 May 2005 16:57:58 -0000	1.9
+++ mnote-pentax-entry.c	11 May 2007 06:26:02 -0000	1.10
@@ -177,17 +177,17 @@ mnote_pentax_entry_get_value (MnotePenta
 	case MNOTE_PENTAX_TAG_TZ_CITY:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (entry->components, 4, val, maxlen);
-		snprintf (val, entry->components, "%s", entry->data);
+		strncpy (val, (char*)entry->data, MIN(maxlen, entry->size));
 		break;
 	case MNOTE_PENTAX_TAG_TZ_DST:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (entry->components, 4, val, maxlen);
-		snprintf (val, entry->components, "%s", entry->data);
+		strncpy (val, (char*)entry->data, MIN(maxlen, entry->size));
 		break;
 	default:
 		switch (entry->format) {
 		case EXIF_FORMAT_ASCII:
-		  strncpy (val, (char *)entry->data, MIN(maxlen, entry->components));
+		  strncpy (val, (char *)entry->data, MIN(maxlen, entry->size));
 		  break;
 		case EXIF_FORMAT_SHORT:
 		  vs = exif_get_short (entry->data, entry->order);