From: Dan F. <dfa...@us...> - 2007-11-14 05:27:26
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25739/libexif/pentax Modified Files: mnote-pentax-entry.c mnote-pentax-tag.c Log Message: * Added support for a new macro NO_VERBOSE_TAG_DATA to allow some size reduction but still retain the ability to properly interpret each tag. * Added an end-of-table marker in the Canon color_information makernote table that could otherwise potentially cause a crash on a bad image. Index: mnote-pentax-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -d -r1.8 -r1.9 --- mnote-pentax-tag.c 30 Oct 2007 03:23:29 -0000 1.8 +++ mnote-pentax-tag.c 14 Nov 2007 05:27:19 -0000 1.9 @@ -31,6 +31,7 @@ static const struct { const char *title; const char *description; } table[] = { +#ifndef NO_VERBOSE_TAG_STRINGS {MNOTE_PENTAX_TAG_MODE, "Mode", N_("Capture Mode"), ""}, {MNOTE_PENTAX_TAG_QUALITY, "Quality", N_("Quality Level"), ""}, {MNOTE_PENTAX_TAG_FOCUS, "Focus", N_("Focus Mode"), ""}, @@ -70,6 +71,7 @@ static const struct { {MNOTE_CASIO2_TAG_OBJECT_DISTANCE, "ObjectDistance", N_("Object Distance"), N_("Distance of photographed object in millimeters.")}, {MNOTE_CASIO2_TAG_TIME_ZONE, "TimeZone", N_("Time Zone"), ""}, {MNOTE_CASIO2_TAG_BESTSHOT_MODE, "BestshotMode", N_("Bestshot mode"), ""}, +#endif {0, NULL, NULL, NULL} }; Index: mnote-pentax-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -d -r1.14 -r1.15 --- mnote-pentax-entry.c 13 Nov 2007 02:31:23 -0000 1.14 +++ mnote-pentax-entry.c 14 Nov 2007 05:27:19 -0000 1.15 @@ -72,6 +72,7 @@ static const struct { const char *string; } elem[33]; } items[] = { +#ifndef NO_VERBOSE_TAG_DATA { MNOTE_PENTAX_TAG_MODE, { {0, N_("Auto")}, {1, N_("Night-scene")}, @@ -259,6 +260,7 @@ static const struct { { {0, N_("Off")}, {1, N_("On")}, {0, NULL}}}, +#endif {0, {{0, NULL}}} }; @@ -270,6 +272,7 @@ static const struct { const char *string; } elem[39]; } items2[] = { +#ifndef NO_VERBOSE_TAG_DATA { MNOTE_PENTAX2_TAG_IMAGE_SIZE, { {0, 0, "2304x1728"}, {4, 0, "1600x1200"}, @@ -297,6 +300,7 @@ static const struct { {5, 2, N_("Portrait")}, {6, 2, N_("Landscape")}, {0, 0, NULL}}}, +#endif {0, {{0, 0, NULL}}} }; @@ -342,7 +346,8 @@ mnote_pentax_entry_get_value (MnotePenta /* search the tag */ for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++); if (!items[i].tag) { - strncpy (val, _("Internal error"), maxlen); + snprintf (val, maxlen, + _("Internal error (unknown value %i)"), vs); break; } @@ -365,7 +370,8 @@ mnote_pentax_entry_get_value (MnotePenta /* search the tag */ for (i = 0; (items2[i].tag && items2[i].tag != entry->tag); i++); if (!items2[i].tag) { - strncpy (val, _("Internal error"), maxlen); + snprintf (val, maxlen, + _("Internal error (unknown value %i %i)"), vs, vs2); break; } |