libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.35, 1.36

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

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

Modified Files:
	mnote-olympus-entry.c 
Log Message:
Various minor fixes and improvements


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- mnote-olympus-entry.c	13 Nov 2007 02:31:23 -0000	1.35
+++ mnote-olympus-entry.c	13 Nov 2007 07:30:12 -0000	1.36
@@ -42,6 +42,19 @@
         }                                                       \
 }
 
+#define CF2(format,target1,target2,v,maxlen)                    \
+{                                                               \
+        if ((format != target1) && (format != target2)) {       \
+                snprintf (v, maxlen,	                        \
+                        _("Invalid format '%s', "               \
+                        "expected '%s' or '%s'."),              \
+                        exif_format_get_name (format),          \
+                        exif_format_get_name (target1),         \
+                        exif_format_get_name (target2));        \
+                break;                                          \
+        }                                                       \
+}
+
 #define CC(number,target,v,maxlen)                                      \
 {                                                                       \
         if (number != target) {                                         \
@@ -185,7 +198,7 @@ static const struct {
       {1, N_("Normal")},
       {2, N_("Soft")},
       {0, NULL}}},
-  { MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID, EXIF_FORMAT_SHORT,
+  { MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID, EXIF_FORMAT_LONG,
     { {0, N_("No")},
       {1, N_("Yes")},
       {0, NULL}}},
@@ -293,39 +306,39 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_NIKON_TAG_IMAGEADJUSTMENT:
 	case MNOTE_NIKON_TAG_ADAPTER:
 	case MNOTE_NIKON_TAG_SATURATION2:
-                CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
-                memcpy(v, entry->data, MIN (maxlen, entry->size));
-                break;
+		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
+		memcpy(v, entry->data, MIN (maxlen, entry->size));
+		break;
 	case MNOTE_NIKON_TAG_TOTALPICTURES:
-                CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
-                CC (entry->components, 1, v, maxlen);
-                vl =  exif_get_long (entry->data, entry->order);
-                snprintf (v, maxlen, "%lu",  (long unsigned int) vl );
-                break;
+		CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
+		CC (entry->components, 1, v, maxlen);
+		vl =  exif_get_long (entry->data, entry->order);
+		snprintf (v, maxlen, "%lu",  (long unsigned int) vl );
+		break;
 	case MNOTE_NIKON_TAG_LENS_FSTOPS:
 	case MNOTE_NIKON_TAG_EXPOSUREDIFF: {
 		unsigned char a,b,c,d;
-                CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
-                CC (entry->components, 4, v, maxlen);
-                vl =  exif_get_long (entry->data, entry->order);
+		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
+		CC (entry->components, 4, v, maxlen);
+		vl =  exif_get_long (entry->data, entry->order);
 		a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff; d = (vl)&0xff;
-                snprintf (v, maxlen, "%.1f",  c?(float)a*((float)b/(float)c):0 );
-                break;
+		snprintf (v, maxlen, "%.1f",  c?(float)a*((float)b/(float)c):0 );
+		break;
 	}
 	case MNOTE_NIKON_TAG_FLASHEXPCOMPENSATION:
 	case MNOTE_NIKON_TAG_FLASHEXPOSUREBRACKETVAL:
-                CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
-                CC (entry->components, 4, v, maxlen);
-                vl =  exif_get_long (entry->data, entry->order);
-                snprintf (v, maxlen, "%.1f",  ((long unsigned int) vl>>24)/6.0 );
-                break;
+		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
+		CC (entry->components, 4, v, maxlen);
+		vl =  exif_get_long (entry->data, entry->order);
+		snprintf (v, maxlen, "%.1f",  ((long unsigned int) vl>>24)/6.0 );
+		break;
 	case MNOTE_NIKON_TAG_SATURATION:
 	case MNOTE_NIKON_TAG_WHITEBALANCEFINE:
-                CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
-                CC (entry->components, 1, v, maxlen);
-                vs = exif_get_short (entry->data, entry->order);
-                snprintf (v, maxlen, "%hd", vs);
-                break;
+		CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
+		CC (entry->components, 1, v, maxlen);
+		vs = exif_get_short (entry->data, entry->order);
+		snprintf (v, maxlen, "%hd", vs);
+		break;
 	case MNOTE_NIKON_TAG_WHITEBALANCERB:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
 		CC (entry->components, 4, v, maxlen);
@@ -347,7 +360,6 @@ mnote_olympus_entry_get_value (MnoteOlym
 			strncpy (v, _("No manual focus selection"), maxlen);
 		}
 		break;
-	case MNOTE_NIKON_TAG_DIGITALZOOM:
 	case MNOTE_NIKON_TAG_SENSORPIXELSIZE:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
 		CC (entry->components, 2, v, maxlen);
@@ -358,11 +370,21 @@ mnote_olympus_entry_get_value (MnoteOlym
 		snprintf (v, maxlen, "%2.2f x %2.2f um", r, b);
 		break;
 	case MNOTE_NIKON_TAG_HUE:
-                CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
-                CC (entry->components, 1, v, maxlen);
-                vs = exif_get_short (entry->data, entry->order);
-                snprintf (v, maxlen, "%hd", vs);
-                break;
+		CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
+		CC (entry->components, 1, v, maxlen);
+		vs = exif_get_short (entry->data, entry->order);
+		snprintf (v, maxlen, "%hd", vs);
+		break;
+	case MNOTE_NIKON_TAG_BRACKETING:
+		CF2 (entry->format, EXIF_FORMAT_BYTE, EXIF_FORMAT_SHORT, v, maxlen);
+		CC (entry->components, 1, v, maxlen);
+		if (EXIF_FORMAT_SHORT == entry->format) {
+			vs = exif_get_short (entry->data, entry->order);
+		} else {
+			vs = entry->data[0];
+		}
+		snprintf (v, maxlen, "%hd", vs);
+		break;
 	case MNOTE_NIKON_TAG_AFFOCUSPOSITION:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
 		CC (entry->components, 4, v, maxlen);
@@ -372,7 +394,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 		  	case  2: strncpy (v, _("AF Position: Bottom"), maxlen); break;
 		  	case  3: strncpy (v, _("AF Position: Left"), maxlen); break;
 		  	case  4: strncpy (v, _("AF Position: Right"), maxlen); break;
-         case  5: strncpy (v, _("AF Position: Upper-left"), maxlen); break;
+			case  5: strncpy (v, _("AF Position: Upper-left"), maxlen); break;
 		  	case  6: strncpy (v, _("AF Position: Upper-right"), maxlen); break;
 		  	case  7: strncpy (v, _("AF Position: Lower-left"), maxlen); break;
 		  	case  8: strncpy (v, _("AF Position: Lower-right"), maxlen); break;
@@ -437,7 +459,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 		for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++)
 			;
 		if (!items[i].tag) {
-		  	snprintf (v, maxlen, _("Internal error (unknown value %i)"), vs);
+		  	snprintf (v, maxlen, _("Internal error (unknown value %hi)"), vs);
 		  	break;
 		}
 		CF (entry->format, items[i].fmt, v, maxlen);
@@ -541,7 +563,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_OLYMPUS_TAG_LENSDISTORTION:
 		CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
 		CC (entry->components, 6, v, maxlen);
-		for (i=0; i < entry->components; ++i) {
+		for (i=0; i < (int)entry->components; ++i) {
 			vs = exif_get_sshort (entry->data+2*i, entry->order);
 			sprintf (buf, "%hd ", vs);
 			strncat (v, buf, maxlen - strlen (v));
@@ -550,7 +572,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_OLYMPUS_TAG_COLORCONTROL:
 		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
 		CC (entry->components, 6, v, maxlen);
-		for (i=0; i < entry->components; ++i) {
+		for (i=0; i < (int)entry->components; ++i) {
 			vs = exif_get_short (entry->data+2*i, entry->order);
 			sprintf (buf, "%hu ", vs);
 			strncat (v, buf, maxlen - strlen (v));
@@ -656,19 +678,21 @@ mnote_olympus_entry_get_value (MnoteOlym
 		strncat (v, buf, maxlen - strlen (v));
 		break;
 	case MNOTE_OLYMPUS_TAG_BLACKLEVEL:
+	case MNOTE_NIKON_TAG_IMAGEBOUNDARY:
 		CC (entry->components, 4, v, maxlen);
 		/* Fall through to COLORMATRIX */
 	case MNOTE_OLYMPUS_TAG_COLORMATRIX:
 		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
 		if (entry->tag == MNOTE_OLYMPUS_TAG_COLORMATRIX)
 			CC (entry->components, 9, v, maxlen);
-		for (i=0; i < entry->components; ++i) {
+		for (i=0; i < (int)entry->components; ++i) {
 			vs = exif_get_short (entry->data+2*i, entry->order);
 			sprintf (buf, "%hu ", vs);
 			strncat (v, buf, maxlen - strlen (v));
 		}
 		break;
 	case MNOTE_NIKON1_TAG_FOCUS:
+	case MNOTE_NIKON_TAG_DIGITALZOOM:
 	case MNOTE_NIKON1_TAG_DIGITALZOOM:
 	case MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);

[libexif-cvs] libexif NEWS,1.30,1.31 ChangeLog,1.252,1.253

[Dan F. <dfa...@us...>]

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

Modified Files:
	NEWS ChangeLog 
Log Message:
* Added support for more Olympus makernotes, based on data on
  Phil Harvey's ExifTool page at
  http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/
  and sanity checked by the pel-images in the libexif test suite.
* Added support for Sanyo makernotes, which have the identical
  tag format and (so it seems) namespace of the Olympus tags.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- NEWS	10 Nov 2007 08:02:32 -0000	1.30
+++ NEWS	13 Nov 2007 02:31:22 -0000	1.31
@@ -2,7 +2,7 @@ libexif-0.6.16.2:
   * Updated translations: de, pl, sk, vi
   * New translations: nl, se, en_CA
   * Bug fixes: #1773810, #1774626
-  * Enhanced support of Canon makernotes 
+  * Enhanced support of Canon and Olympus makernotes 
   * Added support for Sanyo makernotes
   * Added support for the NO_VERBOSE_TAG_STRINGS macro for embedded
     applications

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -p -d -r1.252 -r1.253
--- ChangeLog	8 Nov 2007 21:43:26 -0000	1.252
+++ ChangeLog	13 Nov 2007 02:31:22 -0000	1.253
@@ -1,3 +1,11 @@
+2007-11-12  Dan Fandrich <da...@co...>
+	* Added support for more Olympus makernotes, based on data on
+	  Phil Harvey's ExifTool page at
+	  http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/
+	  and sanity checked by the pel-images in the libexif test suite.
+	* Added support for Sanyo makernotes, which have the identical
+	  tag format and (so it seems) namespace of the Olympus tags.
+
 2007-11-08  Dan Fandrich <da...@co...>
 	* Added Canadian English translation, eh?
 

[libexif-cvs] libexif/po en_CA.po,1.1,1.2

[Dan F. <dfa...@us...>]

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

Modified Files:
	en_CA.po 
Log Message:
* Added support for more Olympus makernotes, based on data on
  Phil Harvey's ExifTool page at
  http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/
  and sanity checked by the pel-images in the libexif test suite.
* Added support for Sanyo makernotes, which have the identical
  tag format and (so it seems) namespace of the Olympus tags.


Index: en_CA.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/en_CA.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- en_CA.po	8 Nov 2007 21:43:27 -0000	1.1
+++ en_CA.po	13 Nov 2007 02:31:23 -0000	1.2
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-07 22:45-0800\n"
-"PO-Revision-Date: 2007-11-07 20:30-0800\n"
+"POT-Creation-Date: 2007-11-12 18:25-0800\n"
+"PO-Revision-Date: 2007-11-12 18:00-0800\n"
 "Last-Translator: Dan Fandrich <da...@co...>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=US-ASCII\n"
[...1311 lines suppressed...]
 msgstr ""
 
+#: libexif/pentax/mnote-pentax-entry.c:393
+#: libexif/pentax/mnote-pentax-entry.c:421
+#, c-format
+msgid "%i bytes unknown data"
+msgstr ""
+
 #: libexif/pentax/mnote-pentax-tag.c:34 libexif/pentax/mnote-pentax-tag.c:61
 msgid "Capture Mode"
 msgstr ""
@@ -4261,7 +4605,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:55
 msgid "Colors"
-msgstr ""
+msgstr "Colours"
 
 #: libexif/pentax/mnote-pentax-tag.c:58
 msgid "PrintIM Settings"

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.34, 1.35 mnote-olympus-tag.c, 1.13, 1.14 mnote-olympus-tag.h, 1.6, 1.7

[Dan F. <dfa...@us...>]

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

Modified Files:
	mnote-olympus-entry.c mnote-olympus-tag.c mnote-olympus-tag.h 
Log Message:
* Added support for more Olympus makernotes, based on data on
  Phil Harvey's ExifTool page at
  http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/
  and sanity checked by the pel-images in the libexif test suite.
* Added support for Sanyo makernotes, which have the identical
  tag format and (so it seems) namespace of the Olympus tags.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- mnote-olympus-entry.c	30 Oct 2007 03:23:29 -0000	1.34
+++ mnote-olympus-entry.c	13 Nov 2007 02:31:23 -0000	1.35
@@ -71,6 +71,7 @@ static const struct {
 		const char *string;
 	} elem[10];
 } items[] = {
+#ifndef NO_VERBOSE_TAG_STRINGS
   { MNOTE_NIKON_TAG_LENSTYPE, EXIF_FORMAT_BYTE,
     { {0, N_("AF non D Lens")},
       {1, N_("Manual")},
@@ -136,31 +137,92 @@ static const struct {
   { MNOTE_OLYMPUS_TAG_MACRO, EXIF_FORMAT_SHORT,
     { {0, N_("No")},
       {1, N_("Yes")},
+      {2, N_("Super Macro")},
+      {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_BWMODE, EXIF_FORMAT_SHORT,
+    { {0, N_("No")},
+      {1, N_("Yes")},
       {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_DIGIZOOM, EXIF_FORMAT_SHORT,
     { {0, N_("1x")},
       {2, N_("2x")},
       {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_ONETOUCHWB, EXIF_FORMAT_SHORT,
+    { {0, N_("Off")},
+      {1, N_("On")},
+      {2, N_("On (Preset)")},
+      {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_FLASHMODE, EXIF_FORMAT_SHORT,
     { {0, N_("Auto")},
       {1, N_("Red-eye reduction")},
       {2, N_("Fill")},
       {3, N_("Off")},
       {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_FLASHDEVICE, EXIF_FORMAT_SHORT,
+    { {1, N_("Internal")},
+      {4, N_("External")},
+      {5, N_("Internal + External")},
+      {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_FOCUSRANGE, EXIF_FORMAT_SHORT,
+    { {0, N_("Normal")},
+      {1, N_("Macro")},
+      {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_MANFOCUS, EXIF_FORMAT_SHORT,
+    { {0, N_("Auto")},
+      {1, N_("Manual")},
+      {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_SHARPNESS, EXIF_FORMAT_SHORT,
     { {0, N_("Normal")},
       {1, N_("Hard")},
       {2, N_("Soft")},
       {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_EXTERNALFLASHBOUNCE, EXIF_FORMAT_SHORT,
+    { {0, N_("No")},
+      {1, N_("Yes")},
+      {0, NULL}}},
   { MNOTE_OLYMPUS_TAG_CONTRAST, EXIF_FORMAT_SHORT,
     { {0, N_("Hard")},
       {1, N_("Normal")},
       {2, N_("Soft")},
       {0, NULL}}},
-  { MNOTE_OLYMPUS_TAG_MANFOCUS, EXIF_FORMAT_SHORT,
+  { MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID, EXIF_FORMAT_SHORT,
+    { {0, N_("No")},
+      {1, N_("Yes")},
+      {0, NULL}}},
+  { MNOTE_OLYMPUS_TAG_CCDSCANMODE, EXIF_FORMAT_SHORT,
+    { {0, N_("Interlaced")},
+      {1, N_("Progressive")},
+      {0, NULL}}},
+  { MNOTE_SANYO_TAG_SEQUENTIALSHOT, EXIF_FORMAT_SHORT,
+    { {0, N_("None")},
+      {1, N_("Standard")},
+      {2, N_("Best")},
+      {3, N_("Adjust Exposure")},
+      {0, NULL}}},
+  { MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE, EXIF_FORMAT_SHORT,
+    { {0, N_("Record while down")},
+      {1, N_("Press start, press stop")},
+      {0, NULL}}},
+  { MNOTE_SANYO_TAG_RESAVED, EXIF_FORMAT_SHORT,
     { {0, N_("No")},
       {1, N_("Yes")},
       {0, NULL}}},
+  { MNOTE_SANYO_TAG_SCENESELECT, EXIF_FORMAT_SHORT,
+    { {0, N_("Off")},
+      {1, N_("Sport")},
+      {2, N_("TV")},
+      {3, N_("Night")},
+      {4, N_("User 1")},
+      {5, N_("User 2")},
+      {6, N_("Lamp")},
+      {0, NULL}}},
+  { MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL, EXIF_FORMAT_SHORT,
+    { {0, N_("5 frames/sec")},
+      {1, N_("10 frames/sec")},
+      {2, N_("15 frames/sec")},
+      {3, N_("20 frames/sec")},
+      {0, NULL}}},
+#endif
   { 0, 0, { { 0, NULL } } }
 };
 
@@ -171,6 +233,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	ExifLong     vl;
 	ExifShort    vs = 0;
 	ExifRational vr, vr2;
+	ExifSRational vsr;
 	int          i, j;
 	double       r, b;
 
@@ -285,13 +348,6 @@ mnote_olympus_entry_get_value (MnoteOlym
 		}
 		break;
 	case MNOTE_NIKON_TAG_DIGITALZOOM:
-	case MNOTE_NIKON1_TAG_DIGITALZOOM:
-		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
-		CC (entry->components, 1, v, maxlen);
-		vr = exif_get_rational (entry->data, entry->order);
-		r = (double)vr.numerator / vr.denominator;
-		snprintf (v, maxlen, "%2.2f", r);
-		break;
 	case MNOTE_NIKON_TAG_SENSORPIXELSIZE:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
 		CC (entry->components, 2, v, maxlen);
@@ -348,17 +404,22 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_NIKON1_TAG_CONVERTER:
 	case MNOTE_OLYMPUS_TAG_QUALITY:
 	case MNOTE_OLYMPUS_TAG_MACRO:
+	case MNOTE_OLYMPUS_TAG_BWMODE:
+	case MNOTE_OLYMPUS_TAG_ONETOUCHWB:
 	case MNOTE_OLYMPUS_TAG_FLASHMODE:
+	case MNOTE_OLYMPUS_TAG_FLASHDEVICE:
+	case MNOTE_OLYMPUS_TAG_FOCUSRANGE:
+	case MNOTE_OLYMPUS_TAG_MANFOCUS:
 	case MNOTE_OLYMPUS_TAG_SHARPNESS:
+	case MNOTE_OLYMPUS_TAG_EXTERNALFLASHBOUNCE:
 	case MNOTE_OLYMPUS_TAG_CONTRAST:
-	case MNOTE_OLYMPUS_TAG_MANFOCUS:
-		/* search the tag */
-		for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++);
-		if (!items[i].tag) {
-		  	strncpy (v, _("Internal error"), maxlen);
-		  	break;
-		}
-		CF (entry->format, items[i].fmt, v, maxlen);
+	case MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID:
+	case MNOTE_OLYMPUS_TAG_CCDSCANMODE:
+	case MNOTE_SANYO_TAG_SEQUENTIALSHOT:
+	case MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE:
+	case MNOTE_SANYO_TAG_RESAVED:
+	case MNOTE_SANYO_TAG_SCENESELECT:
+	case MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL:
 		CC (entry->components, 1, v, maxlen);
 		switch (entry->format) {
 		case EXIF_FORMAT_BYTE:
@@ -372,6 +433,14 @@ mnote_olympus_entry_get_value (MnoteOlym
 			vs = 0;
 			break;
 		}
+		/* search for the tag */
+		for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++)
+			;
+		if (!items[i].tag) {
+		  	snprintf (v, maxlen, _("Internal error (unknown value %i)"), vs);
+		  	break;
+		}
+		CF (entry->format, items[i].fmt, v, maxlen);
 		/* find the value */
 		for (j = 0; items[i].elem[j].string &&
 			    (items[i].elem[j].index < vs); j++);
@@ -381,7 +450,31 @@ mnote_olympus_entry_get_value (MnoteOlym
 		}
 		strncpy (v, items[i].elem[j].string, maxlen);
 		break;
-
+	case MNOTE_OLYMPUS_TAG_NOISEREDUCTION:
+	case MNOTE_SANYO_TAG_WIDERANGE:
+	case MNOTE_SANYO_TAG_COLORADJUSTMENTMODE:
+	case MNOTE_SANYO_TAG_QUICKSHOT:
+	case MNOTE_SANYO_TAG_SELFTIMER:
+	case MNOTE_SANYO_TAG_VOICEMEMO:
+	case MNOTE_SANYO_TAG_FLICKERREDUCE:
+	case MNOTE_SANYO_TAG_OPTICALZOOM:
+	case MNOTE_SANYO_TAG_DIGITALZOOM:
+	case MNOTE_SANYO_TAG_LIGHTSOURCESPECIAL:
+		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
+		CC (entry->components, 1, v, maxlen);
+		vs = exif_get_short (entry->data, entry->order);
+		switch (vs) {
+		case 0:
+			strncpy (v, _("Off"), maxlen);
+			break;
+		case 1:
+			strncpy (v, _("On"), maxlen);
+			break;
+		default:
+			strncpy (v, _("Unknown"), maxlen);
+			break;
+		}
+		break;
 	case MNOTE_NIKON_TAG_LENS:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
 		CC (entry->components, 4, v, maxlen);
@@ -400,17 +493,6 @@ mnote_olympus_entry_get_value (MnoteOlym
 			snprintf (v, maxlen, "%ld-%ldmm 1:%3.1f - %3.1f",a,b,c,d);
 		}
 		break;
-	case MNOTE_NIKON1_TAG_FOCUS:
-		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
-		CC (entry->components, 1, v, maxlen);
-		vr = exif_get_rational (entry->data, entry->order);
-		if (!vr.denominator) {
-			strncpy (v, _("Infinite"), maxlen);
-		} else {
-			r = (double)vr.numerator / vr.denominator;
-			snprintf (v, maxlen, "%2.2f", r);
-		}
-		break;
 
 	/* Olympus */
 	case MNOTE_OLYMPUS_TAG_MODE:
@@ -456,24 +538,33 @@ mnote_olympus_entry_get_value (MnoteOlym
 			strncat (v, buf, maxlen - strlen (v));
 		}
 		break;
-	case MNOTE_OLYMPUS_TAG_UNKNOWN_1:
-		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
-		CC (entry->components, 1, v, maxlen);
-		strncpy (v, _("Unknown tag."), maxlen);
-		break;
-	case MNOTE_OLYMPUS_TAG_UNKNOWN_2:
-		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
-		CC (entry->components, 1, v, maxlen);
-		break;
-	case MNOTE_OLYMPUS_TAG_UNKNOWN_3:
+	case MNOTE_OLYMPUS_TAG_LENSDISTORTION:
 		CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
-		CC (entry->components, 1, v, maxlen);
+		CC (entry->components, 6, v, maxlen);
+		for (i=0; i < entry->components; ++i) {
+			vs = exif_get_sshort (entry->data+2*i, entry->order);
+			sprintf (buf, "%hd ", vs);
+			strncat (v, buf, maxlen - strlen (v));
+		}
+		break;
+	case MNOTE_OLYMPUS_TAG_COLORCONTROL:
+		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
+		CC (entry->components, 6, v, maxlen);
+		for (i=0; i < entry->components; ++i) {
+			vs = exif_get_short (entry->data+2*i, entry->order);
+			sprintf (buf, "%hu ", vs);
+			strncat (v, buf, maxlen - strlen (v));
+		}
 		break;
 	case MNOTE_OLYMPUS_TAG_VERSION:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
 		CC2 (entry->components, 5, 8, v, maxlen);
 		strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
 		break;
+	case MNOTE_OLYMPUS_TAG_SERIALNUMBER2:
+		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
+		strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
+		break;
 	case MNOTE_OLYMPUS_TAG_INFO:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
 		CC2 (entry->components, 52, 60, v, maxlen);
@@ -487,6 +578,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
 		CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
 		CC (entry->components, 30, v, maxlen);
+		/* TODO: display me */
 		break;
 	case MNOTE_OLYMPUS_TAG_FOCUSDIST:
 		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
@@ -537,7 +629,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 					break;
 				}
 				if (colorTemp) {
-					snprintf (v, maxlen, "Manual: %liK", colorTemp);
+					snprintf (v, maxlen, _("Manual: %liK"), colorTemp);
 				}
 				else {
 					strncpy (v, _("Manual: Unknown"), maxlen);
@@ -553,19 +645,69 @@ mnote_olympus_entry_get_value (MnoteOlym
 			break;
 		}
 		break;
+	case MNOTE_OLYMPUS_TAG_REDBALANCE:
+	case MNOTE_OLYMPUS_TAG_BLUEBALANCE:
+		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
+		CC (entry->components, 2, v, maxlen);
+		vs = exif_get_short (entry->data, entry->order);
+		snprintf (v, maxlen, "%hu ", vs);
+		vs = exif_get_short (entry->data + 2, entry->order);
+		sprintf (buf, "%hu", vs);
+		strncat (v, buf, maxlen - strlen (v));
+		break;
+	case MNOTE_OLYMPUS_TAG_BLACKLEVEL:
+		CC (entry->components, 4, v, maxlen);
+		/* Fall through to COLORMATRIX */
+	case MNOTE_OLYMPUS_TAG_COLORMATRIX:
+		CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
+		if (entry->tag == MNOTE_OLYMPUS_TAG_COLORMATRIX)
+			CC (entry->components, 9, v, maxlen);
+		for (i=0; i < entry->components; ++i) {
+			vs = exif_get_short (entry->data+2*i, entry->order);
+			sprintf (buf, "%hu ", vs);
+			strncat (v, buf, maxlen - strlen (v));
+		}
+		break;
+	case MNOTE_NIKON1_TAG_FOCUS:
+	case MNOTE_NIKON1_TAG_DIGITALZOOM:
+	case MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL:
+		CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
+		/* Fall through to default handler for display */
 	default:
 		switch (entry->format) {
 		case EXIF_FORMAT_ASCII:
 			strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
 			break;
 		case EXIF_FORMAT_SHORT:
+			CC (entry->components, 1, v, maxlen);
 			vs = exif_get_short (entry->data, entry->order);
-			snprintf (v, maxlen, "%hi", vs);
+			snprintf (v, maxlen, "%hu", vs);
 			break;
 		case EXIF_FORMAT_LONG:
+			CC (entry->components, 1, v, maxlen);
 			vl = exif_get_long (entry->data, entry->order);
 			snprintf (v, maxlen, "%li", (long int) vl);
 			break;
+		case EXIF_FORMAT_RATIONAL:
+			CC (entry->components, 1, v, maxlen);
+			vr = exif_get_rational (entry->data, entry->order);
+			if (!vr.denominator) {
+				strncpy (v, _("Infinite"), maxlen);
+			} else {
+				r = (double)vr.numerator / vr.denominator;
+				snprintf (v, maxlen, "%2.3f", r);
+			}
+			break;
+		case EXIF_FORMAT_SRATIONAL:
+			CC (entry->components, 1, v, maxlen);
+			vsr = exif_get_srational (entry->data, entry->order);
+			if (!vsr.denominator) {
+				strncpy (v, _("Infinite"), maxlen);
+			} else {
+				r = (double)vsr.numerator / vsr.denominator;
+				snprintf (v, maxlen, "%2.3f", r);
+			}
+			break;
 		case EXIF_FORMAT_UNDEFINED:
 		default:
 			snprintf (v, maxlen, _("%i bytes unknown data: "),

Index: mnote-olympus-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- mnote-olympus-tag.h	3 Oct 2006 14:44:27 -0000	1.6
+++ mnote-olympus-tag.h	13 Nov 2007 02:31:23 -0000	1.7
@@ -98,27 +98,95 @@ enum _MnoteOlympusTag {
 	MNOTE_NIKON1_TAG_DIGITALZOOM            = 0x000a + MNOTE_NIKON1_TAG_BASE,
 	MNOTE_NIKON1_TAG_CONVERTER              = 0x000b + MNOTE_NIKON1_TAG_BASE,
 
-	/* Olympus */
-	MNOTE_OLYMPUS_TAG_MODE		= 0x0200,
-	MNOTE_OLYMPUS_TAG_QUALITY	= 0x0201,
-	MNOTE_OLYMPUS_TAG_MACRO		= 0x0202,
-	MNOTE_OLYMPUS_TAG_UNKNOWN_1	= 0x0203,
-	MNOTE_OLYMPUS_TAG_DIGIZOOM	= 0x0204,
-	MNOTE_OLYMPUS_TAG_UNKNOWN_2	= 0x0205,
-	MNOTE_OLYMPUS_TAG_UNKNOWN_3	= 0x0206,
-	MNOTE_OLYMPUS_TAG_VERSION	= 0x0207,
-	MNOTE_OLYMPUS_TAG_INFO		= 0x0208,
-	MNOTE_OLYMPUS_TAG_ID		= 0x0209,
-	MNOTE_OLYMPUS_TAG_UNKNOWN_4	= 0x0f04,
-	MNOTE_OLYMPUS_TAG_FLASHMODE	= 0x1004,
-	MNOTE_OLYMPUS_TAG_MANFOCUS	= 0x100b,
-	MNOTE_OLYMPUS_TAG_FOCUSDIST	= 0x100c,
-	MNOTE_OLYMPUS_TAG_SHARPNESS	= 0x100f,
-	MNOTE_OLYMPUS_TAG_WBALANCE	= 0x1015,
-	MNOTE_OLYMPUS_TAG_CONTRAST	= 0x1029
+	/* Olympus and some Sanyo */
+	MNOTE_OLYMPUS_TAG_THUMBNAILIMAGE	= 0x0100,
+	MNOTE_OLYMPUS_TAG_MODE			= 0x0200,
+	MNOTE_OLYMPUS_TAG_QUALITY		= 0x0201,
+	MNOTE_OLYMPUS_TAG_MACRO			= 0x0202,
+	MNOTE_OLYMPUS_TAG_BWMODE		= 0x0203,
+	MNOTE_OLYMPUS_TAG_DIGIZOOM		= 0x0204,
+	MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL	= 0x0205,
+	MNOTE_OLYMPUS_TAG_LENSDISTORTION	= 0x0206,
+	MNOTE_OLYMPUS_TAG_VERSION		= 0x0207,
+	MNOTE_OLYMPUS_TAG_INFO			= 0x0208,
+	MNOTE_OLYMPUS_TAG_ID			= 0x0209,
+	MNOTE_OLYMPUS_TAG_PRECAPTUREFRAMES	= 0x0300,
+	MNOTE_OLYMPUS_TAG_WHITEBOARD		= 0x0301,
+	MNOTE_OLYMPUS_TAG_ONETOUCHWB		= 0x0302,
+	MNOTE_OLYMPUS_TAG_WHITEBALANCEBRACKET	= 0x0303,
+	MNOTE_OLYMPUS_TAG_WHITEBALANCEBIAS	= 0x0304,
+	MNOTE_OLYMPUS_TAG_UNKNOWN_5		= 0x0f00,
+	MNOTE_OLYMPUS_TAG_UNKNOWN_4		= 0x0f04,
+	MNOTE_OLYMPUS_TAG_SHUTTERSPEED		= 0x1000,
+	MNOTE_OLYMPUS_TAG_ISOVALUE		= 0x1001,
+	MNOTE_OLYMPUS_TAG_APERTUREVALUE		= 0x1002,
+	MNOTE_OLYMPUS_TAG_BRIGHTNESSVALUE	= 0x1003,
+	MNOTE_OLYMPUS_TAG_FLASHMODE		= 0x1004,
+	MNOTE_OLYMPUS_TAG_FLASHDEVICE		= 0x1005,
+	MNOTE_OLYMPUS_TAG_EXPOSURECOMP		= 0x1006,
+	MNOTE_OLYMPUS_TAG_SENSORTEMPERATURE	= 0x1007,
+	MNOTE_OLYMPUS_TAG_LENSTEMPERATURE	= 0x1008,
+	MNOTE_OLYMPUS_TAG_LIGHTCONDITION	= 0x1009,
+	MNOTE_OLYMPUS_TAG_FOCUSRANGE		= 0x100a,
+	MNOTE_OLYMPUS_TAG_MANFOCUS		= 0x100b,
+	MNOTE_OLYMPUS_TAG_FOCUSDIST		= 0x100c,
+	MNOTE_OLYMPUS_TAG_ZOOMSTEPCOUNT		= 0x100d,
+	MNOTE_OLYMPUS_TAG_FOCUSSTEPCOUNT	= 0x100e,
+	MNOTE_OLYMPUS_TAG_SHARPNESS		= 0x100f,
+	MNOTE_OLYMPUS_TAG_FLASHCHARGELEVEL	= 0x1010,
+	MNOTE_OLYMPUS_TAG_COLORMATRIX		= 0x1011,
+	MNOTE_OLYMPUS_TAG_BLACKLEVEL		= 0x1012,
+	MNOTE_OLYMPUS_TAG_WBALANCE		= 0x1015,
+	MNOTE_OLYMPUS_TAG_REDBALANCE		= 0x1017,
+	MNOTE_OLYMPUS_TAG_BLUEBALANCE		= 0x1018,
+	MNOTE_OLYMPUS_TAG_COLORMATRIXNUMBER	= 0x1019,
+	MNOTE_OLYMPUS_TAG_SERIALNUMBER2		= 0x101a,
+	MNOTE_OLYMPUS_TAG_FLASHEXPOSURECOMP	= 0x1023,
+	MNOTE_OLYMPUS_TAG_INTERNALFLASHTABLE	= 0x1024,
+	MNOTE_OLYMPUS_TAG_EXTERNALFLASHGVALUE	= 0x1025,
+	MNOTE_OLYMPUS_TAG_EXTERNALFLASHBOUNCE	= 0x1026,
+	MNOTE_OLYMPUS_TAG_EXTERNALFLASHZOOM	= 0x1027,
+	MNOTE_OLYMPUS_TAG_EXTERNALFLASHMODE	= 0x1028,
+	MNOTE_OLYMPUS_TAG_CONTRAST		= 0x1029,
+	MNOTE_OLYMPUS_TAG_SHARPNESSFACTOR	= 0x102a,
+	MNOTE_OLYMPUS_TAG_COLORCONTROL		= 0x102b,
+	MNOTE_OLYMPUS_TAG_IMAGEWIDTH		= 0x102e,
+	MNOTE_OLYMPUS_TAG_IMAGEHEIGHT		= 0x102f,
+	MNOTE_OLYMPUS_TAG_SCENEDETECT		= 0x1030,
+	MNOTE_OLYMPUS_TAG_COMPRESSIONRATIO	= 0x1034,
+	MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID	= 0x1035,
+	MNOTE_OLYMPUS_TAG_AFRESULT		= 0x1038,
+	MNOTE_OLYMPUS_TAG_CCDSCANMODE		= 0x1039,
+	MNOTE_OLYMPUS_TAG_NOISEREDUCTION	= 0x103a,
+	MNOTE_OLYMPUS_TAG_INFINITYLENSSTEP	= 0x103b,
+	MNOTE_OLYMPUS_TAG_NEARLENSSTEP		= 0x103c,
+	MNOTE_OLYMPUS_TAG_LIGHTVALUECENTER	= 0x103d,
+	MNOTE_OLYMPUS_TAG_LIGHTVALUEPERIPHERY	= 0x103e,
+
+	/* Sanyo */
+	MNOTE_SANYO_TAG_SEQUENTIALSHOT		= 0x020e,
+	MNOTE_SANYO_TAG_WIDERANGE		= 0x020f,
+	MNOTE_SANYO_TAG_COLORADJUSTMENTMODE	= 0x0210,
+	MNOTE_SANYO_TAG_QUICKSHOT		= 0x0213,
+	MNOTE_SANYO_TAG_SELFTIMER		= 0x0214,
+	MNOTE_SANYO_TAG_VOICEMEMO		= 0x0216,
+	MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE	= 0x0217,
+	MNOTE_SANYO_TAG_FLICKERREDUCE		= 0x0218,
+	MNOTE_SANYO_TAG_OPTICALZOOM		= 0x0219,
+	MNOTE_SANYO_TAG_DIGITALZOOM		= 0x021b,
+	MNOTE_SANYO_TAG_LIGHTSOURCESPECIAL	= 0x021d,
+	MNOTE_SANYO_TAG_RESAVED			= 0x021e,
+	MNOTE_SANYO_TAG_SCENESELECT		= 0x021f,
+	MNOTE_SANYO_TAG_MANUALFOCUSDISTANCE	= 0x0223,
+	MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL	= 0x0224,
 };
 typedef enum _MnoteOlympusTag MnoteOlympusTag;
 
+/* Don't use these definitions. They are here for compatibility only. */
+#define MNOTE_OLYMPUS_TAG_UNKNOWN_1	MNOTE_OLYMPUS_TAG_BWMODE
+#define MNOTE_OLYMPUS_TAG_UNKNOWN_2	MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL
+#define MNOTE_OLYMPUS_TAG_UNKNOWN_3	MNOTE_OLYMPUS_TAG_LENSDISTORTION
+
 const char *mnote_olympus_tag_get_name        (MnoteOlympusTag tag);
 const char *mnote_olympus_tag_get_title       (MnoteOlympusTag tag);
 const char *mnote_olympus_tag_get_description (MnoteOlympusTag tag);

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- mnote-olympus-tag.c	30 Oct 2007 03:23:29 -0000	1.13
+++ mnote-olympus-tag.c	13 Nov 2007 02:31:23 -0000	1.14
@@ -32,7 +32,7 @@ static const struct {
 	const char *title;
 	const char *description;
 } table[] = {
-
+#ifndef NO_VERBOSE_TAG_STRINGS
 	/* Nikon v2 */
 	{MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), ""},
 	{MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), ""},
@@ -101,24 +101,88 @@ static const struct {
 	{MNOTE_NIKON1_TAG_DIGITALZOOM,    "DigitalZoom", N_("Digital Zoom"), ""},
 	{MNOTE_NIKON1_TAG_CONVERTER,      "Converter", N_("Converter"), ""},
 
-	/* Olympus */
+	/* Olympus & some Sanyo */
+	{MNOTE_OLYMPUS_TAG_THUMBNAILIMAGE, "ThumbnailImage", N_("Thumbnail Image"), ""},
 	{MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), ""},
 	{MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), ""},
 	{MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_1, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_BWMODE, "BWMode", N_("B&W Mode"), ""},
 	{MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_2, NULL, NULL, NULL},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_3, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_FOCALPLANEDIAGONAL, "FocalPlaneDiagonal", N_("Focal Plane Diagonal"), ""},
+	{MNOTE_OLYMPUS_TAG_LENSDISTORTION, "LensDistortionParams", N_("Lens Distortion Parameters"), ""},
 	{MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), ""},
 	{MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), ""},
 	{MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), ""},
+	{MNOTE_OLYMPUS_TAG_PRECAPTUREFRAMES, "PreCaptureFrames", N_("Precapture Frames"), ""},
+	{MNOTE_OLYMPUS_TAG_WHITEBOARD, "WhiteBoard", N_("White Board"), ""},
+	{MNOTE_OLYMPUS_TAG_ONETOUCHWB, "OneTouchWB", N_("One Touch White Balance"), ""},
+	{MNOTE_OLYMPUS_TAG_WHITEBALANCEBRACKET, "WhiteBalanceBracket", N_("White Balance Bracket"), ""},
+	{MNOTE_OLYMPUS_TAG_WHITEBALANCEBIAS, "WhiteBalanceBias", N_("White Balance Bias"), ""},
+	{MNOTE_OLYMPUS_TAG_UNKNOWN_5, NULL, NULL, NULL},
 	{MNOTE_OLYMPUS_TAG_UNKNOWN_4, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_SHUTTERSPEED, "ShutterSpeed", N_("Shutter Speed"), ""},
+	{MNOTE_OLYMPUS_TAG_ISOVALUE, "ISOValue", N_("ISO Value"), ""},
+	{MNOTE_OLYMPUS_TAG_APERTUREVALUE, "ApertureValue", N_("Aperture Value"), ""},
+	{MNOTE_OLYMPUS_TAG_BRIGHTNESSVALUE, "BrightnessValue", N_("Brightness Value"), ""},
 	{MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), ""},
+	{MNOTE_OLYMPUS_TAG_FLASHDEVICE, "FlashDevice", N_("Flash Device"), ""},
+	{MNOTE_OLYMPUS_TAG_EXPOSURECOMP, "ExposureCompensation", N_("Exposure Compensation"), ""},
+	{MNOTE_OLYMPUS_TAG_SENSORTEMPERATURE, "SensorTemperature", N_("Sensor Temperature"), ""},
+	{MNOTE_OLYMPUS_TAG_LENSTEMPERATURE, "LensTemperature", N_("Lens Temperature"), ""},
+	{MNOTE_OLYMPUS_TAG_LIGHTCONDITION, "LightCondition", N_("Light Condition"), ""},
+	{MNOTE_OLYMPUS_TAG_FOCUSRANGE, "FocusRange", N_("Focus Range"), ""},
+	{MNOTE_OLYMPUS_TAG_MANFOCUS, "FocusMode", N_("Focus Mode"), "Automatic or manual focusing mode"},
 	{MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
+	{MNOTE_OLYMPUS_TAG_ZOOMSTEPCOUNT, "ZoomStepCount", N_("Zoom Step Count"), ""},
+	{MNOTE_OLYMPUS_TAG_FOCUSSTEPCOUNT, "FocusStepCount", N_("Focus Step Count"), ""},
 	{MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), ""},
+	{MNOTE_OLYMPUS_TAG_FLASHCHARGELEVEL, "FlashChargeLevel", N_("Flash Charge Level"), ""},
+	{MNOTE_OLYMPUS_TAG_COLORMATRIX, "ColorMatrix", N_("Color Matrix"), ""},
+	{MNOTE_OLYMPUS_TAG_BLACKLEVEL, "BlackLevel", N_("Black Level"), ""},
 	{MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), ""},
+	{MNOTE_OLYMPUS_TAG_REDBALANCE, "RedBalance", N_("Red Balance"), ""},
+	{MNOTE_OLYMPUS_TAG_BLUEBALANCE, "BlueBalance", N_("Blue Balance"), ""},
+	{MNOTE_OLYMPUS_TAG_COLORMATRIXNUMBER, "ColorMatrixNumber", N_("Color Matrix Number"), ""},
+	{MNOTE_OLYMPUS_TAG_SERIALNUMBER2, "SerialNumber", N_("Serial Number"), ""},
+	{MNOTE_OLYMPUS_TAG_FLASHEXPOSURECOMP, "FlashExposureComp", N_("Flash Exposure Comp"), ""},
+	{MNOTE_OLYMPUS_TAG_INTERNALFLASHTABLE, "InternalFlashTable", N_("Internal Flash Table"), ""},
+	{MNOTE_OLYMPUS_TAG_EXTERNALFLASHGVALUE, "ExternalFlashGValue", N_("External Flash G Value"), ""},
+	{MNOTE_OLYMPUS_TAG_EXTERNALFLASHBOUNCE, "ExternalFlashBounce", N_("External Flash Bounce"), ""},
+	{MNOTE_OLYMPUS_TAG_EXTERNALFLASHZOOM, "ExternalFlashZoom", N_("External Flash Zoom"), ""},
+	{MNOTE_OLYMPUS_TAG_EXTERNALFLASHMODE, "ExternalFlashMode", N_("External Flash Mode"), ""},
 	{MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), ""},
-	{MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), ""},
+	{MNOTE_OLYMPUS_TAG_SHARPNESSFACTOR, "SharpnessFactor", N_("Sharpness Factor"), ""},
+	{MNOTE_OLYMPUS_TAG_COLORCONTROL, "ColorControl", N_("Color Control"), ""},
+	{MNOTE_OLYMPUS_TAG_IMAGEWIDTH, "OlympusImageWidth", N_("Olympus Image Width"), ""},
+	{MNOTE_OLYMPUS_TAG_IMAGEHEIGHT, "OlympusImageHeight", N_("Olympus Image Height"), ""},
+	{MNOTE_OLYMPUS_TAG_SCENEDETECT, "SceneDetect", N_("Scene Detect"), ""},
+	{MNOTE_OLYMPUS_TAG_COMPRESSIONRATIO, "CompressionRatio", N_("Compression Ratio"), ""},
+	{MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID, "PreviewImageValid", N_("Preview Image Valid"), ""},
+	{MNOTE_OLYMPUS_TAG_AFRESULT, "AFResult", N_("AF Result"), ""},
+	{MNOTE_OLYMPUS_TAG_CCDSCANMODE, "CCDScanMode", N_("CCD Scan Mode"), ""},
+	{MNOTE_OLYMPUS_TAG_NOISEREDUCTION, "NoiseReduction", N_("Noise Reduction"), ""},
+	{MNOTE_OLYMPUS_TAG_INFINITYLENSSTEP, "InfinityLensStep", N_("Infinity Lens Step"), ""},
+	{MNOTE_OLYMPUS_TAG_NEARLENSSTEP, "NearLensStep", N_("Near Lens Step"), ""},
+	{MNOTE_OLYMPUS_TAG_LIGHTVALUECENTER, "LightValueCenter", N_("Light Value Center"), ""},
+	{MNOTE_OLYMPUS_TAG_LIGHTVALUEPERIPHERY, "LightValuePeriphery", N_("Light Value Periphery"), ""},
+
+	/* Sanyo */
+	{MNOTE_SANYO_TAG_SEQUENTIALSHOT, "SequentialShot", N_("Sequential Shot"), ""},
+	{MNOTE_SANYO_TAG_WIDERANGE, "WideRange", N_("Wide Range"), ""},
+	{MNOTE_SANYO_TAG_COLORADJUSTMENTMODE, "ColorAdjustmentMode", N_("Color Adjustment Mode"), ""},
+	{MNOTE_SANYO_TAG_QUICKSHOT, "QuickShot", N_("Quick Shot"), ""},
+	{MNOTE_SANYO_TAG_SELFTIMER, "SelfTimer", N_("Self Timer"), ""},
+	{MNOTE_SANYO_TAG_VOICEMEMO, "VoiceMemo", N_("Voice Memo"), ""},
+	{MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE, "RecordShutterRelease", N_("Record Shutter Release"), ""},
+	{MNOTE_SANYO_TAG_FLICKERREDUCE, "FlickerReduce", N_("Flicker Reduce"), ""},
+	{MNOTE_SANYO_TAG_OPTICALZOOM, "OpticalZoom", N_("Optical Zoom"), ""},
+	{MNOTE_SANYO_TAG_DIGITALZOOM, "DigitalZoom", N_("Digital Zoom"), ""},
+	{MNOTE_SANYO_TAG_LIGHTSOURCESPECIAL, "LightSourceSpecial", N_("Light Source Special"), ""},
+	{MNOTE_SANYO_TAG_RESAVED, "Resaved", N_("Resaved"), ""},
+	{MNOTE_SANYO_TAG_SCENESELECT, "SceneSelect", N_("Scene Select"), ""},
+	{MNOTE_SANYO_TAG_MANUALFOCUSDISTANCE, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
+	{MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL, "SequenceShotInterval", N_("Sequence Shot Interval"), ""},
+#endif
 	{0, NULL, NULL, NULL}
 };
 

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.13, 1.14

[Dan F. <dfa...@us...>]

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

Modified Files:
	mnote-pentax-entry.c 
Log Message:
* Added support for more Olympus makernotes, based on data on
  Phil Harvey's ExifTool page at
  http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/
  and sanity checked by the pel-images in the libexif test suite.
* Added support for Sanyo makernotes, which have the identical
  tag format and (so it seems) namespace of the Olympus tags.


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- mnote-pentax-entry.c	30 Oct 2007 03:23:29 -0000	1.13
+++ mnote-pentax-entry.c	13 Nov 2007 02:31:23 -0000	1.14
@@ -275,6 +275,7 @@ static const struct {
       {4, 0, "1600x1200"},
       {5, 0, "2048x1536"},
       {8, 0, "2560x1920"},
+      {34, 0, "1536x1024"},
       {36, 0, N_("3008x2008 or 3040x2024")},
       {37, 0, "3008x2000"},
       {35, 1, "2400x1600"},

[libexif-cvs] libexif/libexif exif-data.c,1.100,1.101

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-data.c 
Log Message:
Added support for Sanyo makernotes, which are identical to Olympus


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -d -r1.100 -r1.101
--- exif-data.c	30 Oct 2007 06:45:23 -0000	1.100
+++ exif-data.c	10 Nov 2007 08:02:33 -0000	1.101
@@ -689,9 +689,11 @@ exif_data_get_type_maker_note (ExifData 
 	if (!e) 
 		return EXIF_DATA_TYPE_MAKER_NOTE_NONE;
 
-	/* Olympus & Nikon */
-	if ((e->size >= 8) && (!memcmp (e->data, "OLYMP", 6) ||
-			!memcmp (e->data, "OLYMPUS", 8) || !memcmp (e->data, "Nikon", 6)))
+	/* Olympus & Nikon & Sanyo */
+	if ((e->size >= 8) && ( !memcmp (e->data, "OLYMP", 6) ||
+				!memcmp (e->data, "OLYMPUS", 8) ||
+				!memcmp (e->data, "SANYO", 6) ||
+				!memcmp (e->data, "Nikon", 6)))
 		return EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS;
 
 	em = exif_data_get_entry (d, EXIF_TAG_MAKE);

[libexif-cvs] libexif NEWS,1.29,1.30

[Dan F. <dfa...@us...>]

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

Modified Files:
	NEWS 
Log Message:
Added support for Sanyo makernotes, which are identical to Olympus


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- NEWS	8 Nov 2007 21:43:26 -0000	1.29
+++ NEWS	10 Nov 2007 08:02:32 -0000	1.30
@@ -3,6 +3,7 @@ libexif-0.6.16.2:
   * New translations: nl, se, en_CA
   * Bug fixes: #1773810, #1774626
   * Enhanced support of Canon makernotes 
+  * Added support for Sanyo makernotes
   * Added support for the NO_VERBOSE_TAG_STRINGS macro for embedded
     applications
 

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.h, 1.7, 1.8 exif-mnote-data-olympus.c, 1.31, 1.32

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-mnote-data-olympus.h exif-mnote-data-olympus.c 
Log Message:
Added support for Sanyo makernotes, which are identical to Olympus


Index: exif-mnote-data-olympus.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- exif-mnote-data-olympus.h	8 May 2007 09:18:36 -0000	1.7
+++ exif-mnote-data-olympus.h	10 Nov 2007 08:02:33 -0000	1.8
@@ -26,7 +26,7 @@
 #include <libexif/exif-byte-order.h>
 #include <libexif/exif-mem.h>
 
-enum OlympusVersion {nikonV1 = 1, nikonV2 = 2, olympusV1 = 3, olympusV2 = 4 };
+enum OlympusVersion {nikonV1 = 1, nikonV2 = 2, olympusV1 = 3, olympusV2 = 4, sanyoV1 = 5 };
 
 
 typedef struct _ExifMnoteDataOlympus ExifMnoteDataOlympus;

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -d -r1.31 -r1.32
--- exif-mnote-data-olympus.c	16 Aug 2007 19:49:34 -0000	1.31
+++ exif-mnote-data-olympus.c	10 Nov 2007 08:02:33 -0000	1.32
@@ -97,11 +97,12 @@ exif_mnote_data_olympus_save (ExifMnoteD
 	*buf_size = 6 + 2 + 2 + n->count * 12;
 	switch (n->version) {
 	case olympusV1:
+	case sanyoV1:
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
 		if (!*buf) return;
 
 		/* Write the header and the number of entries. */
-		strcpy ((char *)*buf, "OLYMP");
+		strcpy ((char *)*buf, n->version==sanyoV1?"SANYO":"OLYMP");
 		exif_set_short (*buf + 6, n->order, (ExifShort) 1);
 		datao = n->offset;
 		break;
@@ -208,6 +209,9 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	 * a size of 22 bytes (6 for 'OLYMP', 2 other bytes, 2 for the
 	 * number of entries, and 12 for one entry.
 	 *
+	 * Sanyo format is identical and uses identical tags except that
+	 * header starts with "SANYO".
+	 *
 	 * Nikon headers start with "Nikon" (6 bytes including '\0'), 
 	 * version number (1 or 2).
 	 * 
@@ -219,12 +223,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	 * lastly 0x2A.
 	 */
 	if (buf_size - n->offset < 22) return;
-	if (!memcmp (buf + o2, "OLYMP", 6)) {
+	if (!memcmp (buf + o2, "OLYMP", 6) || !memcmp (buf + o2, "SANYO", 6)) {
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
-			"Parsing Olympus maker note v1...");
+			"Parsing Olympus/Sanyo maker note v1...");
 
 		/* The number of entries is at position 8. */
-		n->version = olympusV1;
+		if (!memcmp (buf + o2, "SANYO", 6))
+			n->version = sanyoV1;
+		else
+			n->version = olympusV1;
 		if (buf[o2 + 6] == 1)
 			n->order = EXIF_BYTE_ORDER_INTEL;
 		else if (buf[o2 + 6 + 1] == 1)

[libexif-cvs] m4m gp-check-popt.m4,1.1,1.2

[Dan F. <dfa...@us...>]

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

Modified Files:
	gp-check-popt.m4 
Log Message:
Clarified the help message for POPT_LIBS


Index: gp-check-popt.m4
===================================================================
RCS file: /cvsroot/libexif/m4m/gp-check-popt.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- gp-check-popt.m4	9 Apr 2005 20:18:59 -0000	1.1
+++ gp-check-popt.m4	9 Nov 2007 22:21:56 -0000	1.2
@@ -54,8 +54,8 @@ if test "$require_popt" != yes; then
 fi
 
 dnl Implicit AC_SUBST
-AC_ARG_VAR([POPT_CFLAGS],[cppflags to compile with libpopt])dnl
-AC_ARG_VAR([POPT_LIBS],[location of libpopt to link against])dnl
+AC_ARG_VAR([POPT_CFLAGS],[CPPFLAGS to compile with libpopt])dnl
+AC_ARG_VAR([POPT_LIBS],[LDFLAGS to link with libpopt])dnl
 
 have_popt=no
 

[libexif-cvs] libexif/libexif exif-entry.c,1.109,1.110

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-entry.c 
Log Message:
Show a generic message for all unknown, undefined data.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -d -r1.109 -r1.110
--- exif-entry.c	1 Nov 2007 06:38:58 -0000	1.109
+++ exif-entry.c	9 Nov 2007 21:47:05 -0000	1.110
@@ -875,11 +875,6 @@ exif_entry_get_value (ExifEntry *e, char
 		else
 			snprintf (val, maxlen, "%i, %i", v_short, v_short2);
 		break;
-	case EXIF_TAG_MAKER_NOTE:
-		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		snprintf (val, maxlen, _("%i bytes unknown data"),
-			  e->size);
-		break;
 	case EXIF_TAG_SUBJECT_AREA:
 		CF (e, EXIF_FORMAT_SHORT, val, maxlen);
 		switch (e->components) {
@@ -1005,6 +1000,9 @@ exif_entry_get_value (ExifEntry *e, char
 		case EXIF_FORMAT_UNDEFINED:
 			if ((e->tag == EXIF_TAG_SCENE_TYPE) && (e->size == 1)) {
 				snprintf (val, maxlen, "%i", e->data[0]);
+			} else {
+				snprintf (val, maxlen, _("%i bytes undefined data"),
+					  e->size);
 			}
 			break;
 		case EXIF_FORMAT_BYTE:

[libexif-cvs] exif/exif main.c,1.57,1.58

[Dan F. <dfa...@us...>]

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

Modified Files:
	main.c 
Log Message:
exif/main.c: Load popt.h later so it works with popt-1.12


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -d -r1.57 -r1.58
--- main.c	8 Nov 2007 06:30:04 -0000	1.57
+++ main.c	9 Nov 2007 06:54:54 -0000	1.58
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <popt.h>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
@@ -40,6 +39,9 @@
 #include "exif-i18n.h"
 #include "utils.h"
 
+/* Must be loaded after exif-i18n.h */
+#include <popt.h>
+
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif

[libexif-cvs] exif ChangeLog,1.61,1.62

[Dan F. <dfa...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
exif/main.c: Load popt.h later so it works with popt-1.12


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -d -r1.61 -r1.62
--- ChangeLog	8 Nov 2007 06:30:03 -0000	1.61
+++ ChangeLog	9 Nov 2007 06:54:54 -0000	1.62
@@ -1,6 +1,7 @@
 2007-11-07  Dan Fandrich <da...@co...>
 
 	* exif/main.c: Fixed the output of -t and -s when iconv is configured.
+	Load popt.h later so it works with popt-1.12.
 
 2006-07-28  Lutz Mueller <lu...@us...>
 

[libexif-cvs] libexif configure.ac, 1.38, 1.39 ChangeLog, 1.251, 1.252 NEWS, 1.28, 1.29

[Dan F. <dfa...@us...>]

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

Modified Files:
	configure.ac ChangeLog NEWS 
Log Message:
* Added Canadian English translation, eh?


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- NEWS	30 Oct 2007 05:03:04 -0000	1.28
+++ NEWS	8 Nov 2007 21:43:26 -0000	1.29
@@ -1,6 +1,6 @@
 libexif-0.6.16.2:
   * Updated translations: de, pl, sk, vi
-  * New translations: nl, se
+  * New translations: nl, se, en_CA
   * Bug fixes: #1773810, #1774626
   * Enhanced support of Canon makernotes 
   * Added support for the NO_VERBOSE_TAG_STRINGS macro for embedded

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -d -r1.38 -r1.39
--- configure.ac	30 Oct 2007 02:46:54 -0000	1.38
+++ configure.ac	8 Nov 2007 21:43:26 -0000	1.39
@@ -152,7 +152,7 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
-ALL_LINGUAS="cs de es fr pl ru sk vi"
+ALL_LINGUAS="cs de en_CA es fr pl ru sk vi"
 AM_PO_SUBDIRS
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
                 [Lutz Mueller and others])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -p -d -r1.251 -r1.252
--- ChangeLog	7 Nov 2007 06:53:14 -0000	1.251
+++ ChangeLog	8 Nov 2007 21:43:26 -0000	1.252
@@ -1,3 +1,6 @@
+2007-11-08  Dan Fandrich <da...@co...>
+	* Added Canadian English translation, eh?
+
 2007-11-06  Dan Fandrich <da...@co...>
 	* Renamed EXIF_TAG_UNKNOWN_C4A5 to EXIF_TAG_PRINT_IMAGE_MATCHING
 	  The PIM entry seems to have a format consisting of an 8 byte

[libexif-cvs] libexif/po en_CA.po,NONE,1.1

[Dan F. <dfa...@us...>]

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

Added Files:
	en_CA.po 
Log Message:
* Added Canadian English translation, eh?


--- NEW FILE: en_CA.po ---
# libexif translation into Canadian English
# Copyright (C) 2007 Lutz Mueller and others
# This file is distributed under the same license as the libexif package.
# Dan Fandrich <da...@co...>, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: libexif 0.6.16.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-11-07 22:45-0800\n"
"PO-Revision-Date: 2007-11-07 20:30-0800\n"
"Last-Translator: Dan Fandrich <da...@co...>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=US-ASCII\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"

#: libexif/canon/mnote-canon-entry.c:40
[...4269 lines suppressed...]

#: libexif/pentax/mnote-pentax-tag.c:68
msgid "Auto AF Point"
msgstr ""

#: libexif/pentax/mnote-pentax-tag.c:70
msgid "Object Distance"
msgstr ""

#: libexif/pentax/mnote-pentax-tag.c:70
msgid "Distance of photographed object in millimeters."
msgstr "Distance of photographed object in millimetres."

#: libexif/pentax/mnote-pentax-tag.c:72
msgid "Bestshot mode"
msgstr ""

#: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
msgstr ""

[libexif-cvs] libexif/libexif exif-tag.c,1.36,1.37

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-tag.c 
Log Message:
Be consistent and call it "color space" (two words).


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -d -r1.36 -r1.37
--- exif-tag.c	7 Nov 2007 06:53:19 -0000	1.36
+++ exif-tag.c	8 Nov 2007 06:45:30 -0000	1.37
@@ -186,13 +186,13 @@ static const struct {
 	{EXIF_TAG_WHITE_POINT, "WhitePoint", N_("White Point"),
 	 N_("The chromaticity of the white point of the image. Normally "
 	    "this tag is not necessary, since color space is specified "
-	    "in the colorspace information tag (<ColorSpace>)."),
+	    "in the color space information tag (<ColorSpace>)."),
 	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_PRIMARY_CHROMATICITIES, "PrimaryChromaticities",
 	 N_("Primary Chromaticities"),
 	 N_("The chromaticity of the three primary colors of the image. "
-	    "Normally this tag is not necessary, since colorspace is "
-	    "specified in the colorspace information tag (<ColorSpace>)."),
+	    "Normally this tag is not necessary, since color space is "
+	    "specified in the color space information tag (<ColorSpace>)."),
 	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
 	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "

[libexif-cvs] exif/exif main.c,1.56,1.57

[Dan F. <dfa...@us...>]

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

Modified Files:
	main.c 
Log Message:
exif/main.c: Fixed the output of -t and -s when iconv is configured.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -d -r1.56 -r1.57
--- main.c	24 Jun 2007 16:44:02 -0000	1.56
+++ main.c	8 Nov 2007 06:30:04 -0000	1.57
@@ -71,11 +71,17 @@ show_entry (ExifEntry *entry, unsigned i
 		return;
 	}
 
-	printf (_("EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"),
-		C(exif_tag_get_title_in_ifd (entry->tag, ifd)), entry->tag,
-		C(exif_tag_get_name_in_ifd (entry->tag, ifd)), 
+	/*
+	 * The C() macro can point to a static buffer so these printfs
+	 * must be done separately.
+	 */
+	printf (_("EXIF entry '%s' "),
+		C(exif_tag_get_title_in_ifd (entry->tag, ifd)));
+	printf (_("(0x%x, '%s') "),
+		entry->tag,
+		C(exif_tag_get_name_in_ifd (entry->tag, ifd)));
+	printf (_("exists in IFD '%s':\n"),
 		C(exif_ifd_get_name (ifd)));
-	printf ("\n");
 
 	exif_entry_dump (entry, 0);
 }
@@ -417,11 +423,17 @@ main (int argc, const char **argv)
 
 	if (show_description) {
 		if (!eo.tag) exif_log (log, -1, "exif", _("Please specify a tag!"));
-		printf (_("Tag '%s' (0x%04x, '%s'): %s"),
-			C(exif_tag_get_title_in_ifd (eo.tag, ifd)), eo.tag,
-			C(exif_tag_get_name_in_ifd (eo.tag, ifd)),
+		/*
+		 * The C() macro can point to a static buffer so these printfs
+		 * must be done separately.
+		 */
+		printf (_("Tag '%s' "),
+			C(exif_tag_get_title_in_ifd (eo.tag, ifd)));
+		printf (_("(0x%04x, '%s'): "),
+			eo.tag,
+			C(exif_tag_get_name_in_ifd (eo.tag, ifd)));
+		printf ("%s\n",
 			C(exif_tag_get_description_in_ifd (eo.tag, ifd)));
-		printf ("\n");
 		return (0);
 	}
 

[libexif-cvs] exif ChangeLog,1.60,1.61 NEWS,1.7,1.8

[Dan F. <dfa...@us...>]

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

Modified Files:
	ChangeLog NEWS 
Log Message:
exif/main.c: Fixed the output of -t and -s when iconv is configured.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- NEWS	6 Jun 2007 14:18:45 -0000	1.7
+++ NEWS	8 Nov 2007 06:30:03 -0000	1.8
@@ -1,3 +1,7 @@
+exif-0.6.16.x:
+  * Fixed the output of -s and -t when iconv is configured
+
+
 exif-0.6.16:
   * Updated translations: pl
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -d -r1.60 -r1.61
--- ChangeLog	28 Jul 2006 19:12:31 -0000	1.60
+++ ChangeLog	8 Nov 2007 06:30:03 -0000	1.61
@@ -1,3 +1,7 @@
+2007-11-07  Dan Fandrich <da...@co...>
+
+	* exif/main.c: Fixed the output of -t and -s when iconv is configured.
+
 2006-07-28  Lutz Mueller <lu...@us...>
 
   Patch by Marek 'marx' Grac <mg...@re...>:

[libexif-cvs] libexif ChangeLog,1.250,1.251

[Dan F. <dfa...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Renamed EXIF_TAG_UNKNOWN_C4A5 to EXIF_TAG_PRINT_IMAGE_MATCHING
The PIM entry seems to have a format consisting of an 8 byte
magic number, 6 byte version number, 2 byte record count field,
then a series of 6 byte records consisting of a 2 byte tag field
and an 4 byte data field.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -d -r1.250 -r1.251
--- ChangeLog	30 Oct 2007 05:03:04 -0000	1.250
+++ ChangeLog	7 Nov 2007 06:53:14 -0000	1.251
@@ -1,3 +1,10 @@
+2007-11-06  Dan Fandrich <da...@co...>
+	* Renamed EXIF_TAG_UNKNOWN_C4A5 to EXIF_TAG_PRINT_IMAGE_MATCHING
+	  The PIM entry seems to have a format consisting of an 8 byte
+	  magic number, 6 byte version number, 2 byte record count field,
+	  then a series of 6 byte records consisting of a 2 byte tag field
+	  and an 4 byte data field.
+
 2007-10-29  Dan Fandrich <da...@co...>
 	* Fixed some typos in messages
 	* Made some structs const

[libexif-cvs] libexif/libexif exif-tag.c, 1.35, 1.36 exif-tag.h, 1.15, 1.16

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:
Renamed EXIF_TAG_UNKNOWN_C4A5 to EXIF_TAG_PRINT_IMAGE_MATCHING
The PIM entry seems to have a format consisting of an 8 byte
magic number, 6 byte version number, 2 byte record count field,
then a series of 6 byte records consisting of a 2 byte tag field
and an 4 byte data field.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- exif-tag.h	15 May 2007 18:23:28 -0000	1.15
+++ exif-tag.h	7 Nov 2007 06:53:20 -0000	1.16
@@ -142,8 +142,8 @@ typedef enum {
 	EXIF_TAG_DEVICE_SETTING_DESCRIPTION	= 0xa40b,
 	EXIF_TAG_SUBJECT_DISTANCE_RANGE		= 0xa40c,
 	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420,
-	EXIF_TAG_GAMMA = 0xa500,
-	EXIF_TAG_UNKNOWN_C4A5 = 0xc4a5
+	EXIF_TAG_GAMMA				= 0xa500,
+	EXIF_TAG_PRINT_IMAGE_MATCHING		= 0xc4a5
 } ExifTag;
 
 /* GPS tags overlap with above ones. */
@@ -198,6 +198,9 @@ const char     *exif_tag_get_name       
 const char     *exif_tag_get_title       (ExifTag tag);
 const char     *exif_tag_get_description (ExifTag tag);
 
+/* Don't use these definitions. They are here for compatibility only. */
+#define EXIF_TAG_UNKNOWN_C4A5 EXIF_TAG_PRINT_IMAGE_MATCHING
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- exif-tag.c	30 Oct 2007 06:45:23 -0000	1.35
+++ exif-tag.c	7 Nov 2007 06:53:19 -0000	1.36
@@ -371,7 +371,7 @@ static const struct {
 	    "input device as specified in ISO 12232."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_OECF, "OECF", "OECF",
-	 N_("Indicates the Opto-Electoric Conversion Function (OECF) "
+	 N_("Indicates the Opto-Electronic Conversion Function (OECF) "
 	    "specified in ISO 14524. <OECF> is the relationship between "
 	    "the camera optical input and the image values."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
@@ -458,7 +458,7 @@ static const struct {
 	    "with NULL (\"00.h\"). ID codes are assigned by means of "
 	    "registration. The designation method and references for each "
 	    "character code are given in Table 6. The value of CountN "
-	    "is determinated based on the 8 bytes in the character code "
+	    "is determined based on the 8 bytes in the character code "
 	    "area and the number of bytes in the user comment part. Since "
 	    "the TYPE is not ASCII, NULL termination is not necessary "
 	    "(see Fig. 9). "
@@ -679,8 +679,8 @@ static const struct {
 	    "to hexadecimal notation and 128-bit fixed length.")},
 	{EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
 	 N_("Indicates the value of coefficient gamma.")},
-	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
-	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
+	{EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),
+	 N_("Related to Epson's PRINT Image Matching technology")},
 #endif
 	{0, NULL, NULL, NULL}
 };

[libexif-cvs] libexif/libexif exif-entry.c,1.108,1.109

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

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

Modified Files:
	exif-entry.c 
Log Message:
1) Fixed typos
2) Synchronized capitalization
3) Updated Czech translation


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -d -r1.108 -r1.109
--- exif-entry.c	30 Oct 2007 05:03:05 -0000	1.108
+++ exif-entry.c	1 Nov 2007 06:38:58 -0000	1.109
@@ -462,7 +462,7 @@ static const struct {
       {  3, {N_("Tungsten incandescent light"), N_("Tungsten"), NULL}},
       {  4, {N_("Flash"), NULL}},
       {  9, {N_("Fine weather"), NULL}},
-      { 10, {N_("Cloudy weather"), N_("cloudy"), NULL}},
+      { 10, {N_("Cloudy weather"), N_("Cloudy"), NULL}},
       { 11, {N_("Shade"), NULL}},
       { 12, {N_("Daylight fluorescent"), NULL}},
       { 13, {N_("Day white fluorescent"), NULL}},
@@ -540,8 +540,8 @@ static const struct {
   {EXIF_TAG_SUBJECT_DISTANCE_RANGE, 
     { {0, {N_("Unknown"), N_("?"), NULL}},
       {1, {N_("Macro"), NULL}},
-      {2, {N_("Close view"), N_("close"), NULL}},
-      {3, {N_("Distant view"), N_("distant"), NULL}},
+      {2, {N_("Close view"), N_("Close"), NULL}},
+      {3, {N_("Distant view"), N_("Distant"), NULL}},
       {0, {NULL}}}},
   { EXIF_TAG_COLOR_SPACE,
     { {1, {N_("sRGB"), NULL}},

[libexif-cvs] libexif/po cs.po, 1.8, 1.9 de.po, 1.42, 1.43 es.po, 1.29, 1.30 fr.po, 1.29, 1.30 nl.po, 1.1, 1.2 pl.po, 1.17, 1.18 ru.po, 1.13, 1.14 sk.po, 1.10, 1.11 sv.po, 1.1, 1.2 vi.po, 1.14, 1.15

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

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

Modified Files:
	cs.po de.po es.po fr.po nl.po pl.po ru.po sk.po sv.po vi.po 
Log Message:
1) Fixed typos
2) Synchronized capitalization
3) Updated Czech translation


Index: sv.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sv.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- sv.po	12 Sep 2007 06:01:24 -0000	1.1
+++ sv.po	1 Nov 2007 06:39:02 -0000	1.2
@@ -1570,10 +1570,6 @@ msgstr "Fint väder"
 msgid "Cloudy weather"
 msgstr "Molnigt väder"
 
-#: libexif/exif-entry.c:452
-msgid "cloudy"
-msgstr "molnigt"
-
 #: libexif/exif-entry.c:455
 msgid "Day white fluorescent"
 msgstr ""
@@ -1795,16 +1791,12 @@ msgstr "?"
 msgid "Close view"
 msgstr ""
 
-#: libexif/exif-entry.c:530
-msgid "close"
-msgstr "nära"
-
 #: libexif/exif-entry.c:531
 msgid "Distant view"
 msgstr ""
 
 #: libexif/exif-entry.c:531
-msgid "distant"
+msgid "Distant"
 msgstr ""
 
 #: libexif/exif-entry.c:534
@@ -3171,7 +3163,7 @@ msgid "Flash Mode"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sk.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- sk.po	12 Sep 2007 06:01:24 -0000	1.10
+++ sk.po	1 Nov 2007 06:39:01 -0000	1.11
@@ -1634,10 +1634,6 @@ msgstr "pekné počasie"
 msgid "Cloudy weather"
 msgstr "oblačné počasie"
 
-#: libexif/exif-entry.c:452
-msgid "cloudy"
-msgstr "oblačno"
-
 # exif-lightsource-13
 #: libexif/exif-entry.c:455
 msgid "Day white fluorescent"
@@ -1879,17 +1875,13 @@ msgstr "?"
 msgid "Close view"
 msgstr "pohľad zblízka"
 
-#: libexif/exif-entry.c:530
-msgid "close"
-msgstr "zblízka"
-
 # exif-subjectdistancerange-3
 #: libexif/exif-entry.c:531
 msgid "Distant view"
 msgstr "vzdialený pohľad"
 
 #: libexif/exif-entry.c:531
-msgid "distant"
+msgid "Distant"
 msgstr "vzdialený"
 
 #: libexif/exif-entry.c:534
@@ -3345,7 +3337,7 @@ msgid "Flash Mode"
 msgstr "režim blesku"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "RB vyváženia bielej"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: fr.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/fr.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- fr.po	14 Aug 2007 19:52:42 -0000	1.29
+++ fr.po	1 Nov 2007 06:39:00 -0000	1.30
@@ -1663,10 +1663,6 @@ msgstr "Temps clair"
 msgid "Cloudy weather"
 msgstr "Temps couvert"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "nuageux"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr ""
@@ -1919,17 +1915,13 @@ msgstr ""
 msgid "Close view"
 msgstr "Vue de près"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr ""
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Vue de loin"
 
 #: libexif/exif-entry.c:548
 #, fuzzy
-msgid "distant"
+msgid "Distant"
 msgstr "Vue de loin"
 
 #: libexif/exif-entry.c:551
@@ -3736,7 +3728,7 @@ msgstr "Flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 #, fuzzy
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Balance des blancs"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: ru.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/ru.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- ru.po	14 Aug 2007 19:52:43 -0000	1.13
+++ ru.po	1 Nov 2007 06:39:01 -0000	1.14
@@ -1663,10 +1663,6 @@ msgstr "Ясная погода"
 msgid "Cloudy weather"
 msgstr "Облачность"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "облачно"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr ""
@@ -1901,16 +1897,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Крупный план"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr ""
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr ""
 
 #: libexif/exif-entry.c:548
-msgid "distant"
+msgid "Distant"
 msgstr ""
 
 #: libexif/exif-entry.c:551
@@ -3734,7 +3726,7 @@ msgid "Flash Mode"
 msgstr "Режим вспышки"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Точная подстройка баланса белого"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: nl.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/nl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- nl.po	12 Sep 2007 06:01:24 -0000	1.1
+++ nl.po	1 Nov 2007 06:39:01 -0000	1.2
@@ -1572,10 +1572,6 @@ msgstr "Mooi weer"
 msgid "Cloudy weather"
 msgstr "Bewolkt weer"
 
-#: libexif/exif-entry.c:452
-msgid "cloudy"
-msgstr "bewolkt"
-
 #: libexif/exif-entry.c:455
 msgid "Day white fluorescent"
 msgstr "Daglicht wit TL-licht"
@@ -1797,16 +1793,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Dichtbij bekijken"
 
-#: libexif/exif-entry.c:530
-msgid "close"
-msgstr "dichtbij"
-
 #: libexif/exif-entry.c:531
 msgid "Distant view"
 msgstr "Op afstand bekijken"
 
 #: libexif/exif-entry.c:531
-msgid "distant"
+msgid "Distant"
 msgstr "op afstand"
 
 #: libexif/exif-entry.c:534
@@ -3172,7 +3164,7 @@ msgid "Flash Mode"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -d -r1.42 -r1.43
--- de.po	14 Aug 2007 19:52:42 -0000	1.42
+++ de.po	1 Nov 2007 06:39:00 -0000	1.43
@@ -815,7 +815,7 @@ msgstr "Sonnig"
 #: libexif/olympus/mnote-olympus-entry.c:121
 #: libexif/pentax/mnote-pentax-entry.c:254
 msgid "Cloudy"
-msgstr "Wolkiges Wetter"
+msgstr "Wolkig"
 
 #: libexif/canon/mnote-canon-entry.c:283 libexif/exif-entry.c:466
 #: libexif/pentax/mnote-pentax-entry.c:99
@@ -1607,10 +1607,6 @@ msgstr "Gutes Wetter"
 msgid "Cloudy weather"
 msgstr "Wolkiges Wetter"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "wolkig"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr "Tageslichtweiß Leuchtstoff"
@@ -1848,16 +1844,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Nahaufnahme"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr "nah"
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Große Entfernung"
 
 #: libexif/exif-entry.c:548
-msgid "distant"
+msgid "Distant"
 msgstr "entfernt"
 
 #: libexif/exif-entry.c:551
@@ -3799,7 +3791,7 @@ msgid "Flash Mode"
 msgstr "Blitzmodus"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Weißabgleich Feinabstimmung"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: es.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/es.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- es.po	14 Aug 2007 19:52:42 -0000	1.29
+++ es.po	1 Nov 2007 06:39:00 -0000	1.30
@@ -1664,10 +1664,6 @@ msgstr "Tiempo bueno"
 msgid "Cloudy weather"
 msgstr "Tiempo nublado"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "nublado"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr "Día blanco fluorescente"
@@ -1925,18 +1921,13 @@ msgstr ""
 msgid "Close view"
 msgstr "Vista cercana"
 
-#: libexif/exif-entry.c:547
-#, fuzzy
-msgid "close"
-msgstr "co-situado"
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Vista distante"
 
 #: libexif/exif-entry.c:548
 #, fuzzy
-msgid "distant"
+msgid "Distant"
 msgstr "Vista distante"
 
 #: libexif/exif-entry.c:551
@@ -3958,7 +3949,7 @@ msgstr "Flash"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 #, fuzzy
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Balance de blanco"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: pl.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/pl.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -d -r1.17 -r1.18
--- pl.po	14 Aug 2007 19:52:43 -0000	1.17
+++ pl.po	1 Nov 2007 06:39:01 -0000	1.18
@@ -1597,10 +1597,6 @@ msgstr "Dobra pogoda"
 msgid "Cloudy weather"
 msgstr "Pochmurna pogoda"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "pochmurno"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr "Białe fluorescencyjne światło dzienne"
@@ -1841,16 +1837,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Widok bliski"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr "blisko"
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Widok daleki"
 
 #: libexif/exif-entry.c:548
-msgid "distant"
+msgid "Distant"
 msgstr "daleko"
 
 #: libexif/exif-entry.c:551
@@ -3827,7 +3819,7 @@ msgid "Flash Mode"
 msgstr "Tryb flesza"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Dokładne ustawienie balansu bieli"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

Index: cs.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/cs.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- cs.po	14 Aug 2007 19:52:42 -0000	1.8
+++ cs.po	1 Nov 2007 06:39:00 -0000	1.9
@@ -1194,7 +1194,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:96
 msgid "White balance"
-msgstr ""
+msgstr "Vyvážení bílé"
 
 #: libexif/canon/mnote-canon-tag.c:98
 msgid "Sequence number"
@@ -1480,11 +1480,11 @@ msgstr ""
 
 #: libexif/exif-entry.c:423
 msgid "Auto white balance"
-msgstr ""
+msgstr "Automatické vyvážení"
 
 #: libexif/exif-entry.c:423
 msgid "Manual white balance"
-msgstr ""
+msgstr "Ruční nastavení"
 
 #: libexif/exif-entry.c:425
 msgid "Standard"
@@ -1555,7 +1555,7 @@ msgstr ""
 
 #: libexif/exif-entry.c:450
 msgid "Pattern"
-msgstr "Vzorek"
+msgstr "Vzorkování"
 
 #: libexif/exif-entry.c:455
 msgid "Uncompressed"
@@ -1595,10 +1595,6 @@ msgstr "Pěkné počasí"
 msgid "Cloudy weather"
 msgstr "Oblačné počasí"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "Oblačno"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr ""
@@ -1833,16 +1829,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Blízký pohled"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr "Blízko"
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Vzdálený pohled"
 
 #: libexif/exif-entry.c:548
-msgid "distant"
+msgid "Distant"
 msgstr "Vzdáleno"
 
 #: libexif/exif-entry.c:551
@@ -2784,7 +2776,7 @@ msgid ""
 "The value of brightness. The unit is the APEX value. Ordinarily it is given "
 "in the range of -99.99 to 99.99."
 msgstr ""
-"Úroven jasu, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99."
+"Úroveň jasu, v jednotkách APEX. Obvykle se nachází v rozsahu -99,99 až 99,99."
 
 #: libexif/exif-tag.c:420
 msgid "Exposure Bias"
@@ -3105,7 +3097,7 @@ msgstr ""
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
-msgstr ""
+msgstr "Udává pozici a velikost hlavního objektu ve fotografované scéně."
 
 #: libexif/exif-tag.c:624
 msgid "TIFF/EP Standard ID"
@@ -3131,16 +3123,17 @@ msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
-msgstr ""
+msgstr "Udává režim expozice při pořizování snímků. V režimu auto bracket "
+"fotoaparát pořizuje sekvenci snímků s různým nastavením expozice."
 
 #: libexif/exif-tag.c:634 libexif/pentax/mnote-pentax-tag.c:40
 #: libexif/pentax/mnote-pentax-tag.c:69
 msgid "White Balance"
-msgstr ""
+msgstr "Vyvážení bílé"
 
 #: libexif/exif-tag.c:635
 msgid "This tag indicates the white balance mode set when the image was shot."
-msgstr ""
+msgstr "Udává způsob vyvážení bílé při pořizování snímku."
 
 #: libexif/exif-tag.c:638
 msgid "Digital Zoom Ratio"
@@ -3193,19 +3186,19 @@ msgstr ""
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
-msgstr ""
+msgstr "Udává směr zpracování kontrastu fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:661
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
-msgstr ""
+msgstr "Udává směr zpracování sytosti fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:664
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
-msgstr ""
+msgstr "Udává směr zpracování ostrosti fotoaparátem při pořizování snímku."
 
 #: libexif/exif-tag.c:667
 msgid "Device Setting Description"
@@ -3586,7 +3579,7 @@ msgid "Flash Mode"
 msgstr "Režim blesku"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:47
@@ -3748,7 +3741,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:119
 msgid "White Balance Setting"
-msgstr ""
+msgstr "Nastavení vyvážení bílé"
 
 #: libexif/olympus/mnote-olympus-tag.c:120
 msgid "Contrast Setting"

Index: vi.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/vi.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- vi.po	14 Aug 2007 19:52:43 -0000	1.14
+++ vi.po	1 Nov 2007 06:39:02 -0000	1.15
@@ -1600,10 +1600,6 @@ msgstr "Trời đẹp"
 msgid "Cloudy weather"
 msgstr "Đầy mây"
 
-#: libexif/exif-entry.c:469
-msgid "cloudy"
-msgstr "đầy mây"
-
 #: libexif/exif-entry.c:472
 msgid "Day white fluorescent"
 msgstr "Huỳnh quang ngày trắng"
@@ -1844,16 +1840,12 @@ msgstr "?"
 msgid "Close view"
 msgstr "Xem gần"
 
-#: libexif/exif-entry.c:547
-msgid "close"
-msgstr "gần"
-
 #: libexif/exif-entry.c:548
 msgid "Distant view"
 msgstr "Xem xa"
 
 #: libexif/exif-entry.c:548
-msgid "distant"
+msgid "Distant"
 msgstr "xa"
 
 #: libexif/exif-entry.c:551
@@ -3799,7 +3791,7 @@ msgid "Flash Mode"
 msgstr "Chế độ đèn nháy"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
-msgid "Whitebalance fine ajustment"
+msgid "Whitebalance fine adjustment"
 msgstr "Điều chỉnh chính xác cán cân trắng"
 
 #: libexif/olympus/mnote-olympus-tag.c:47

[libexif-cvs] libexif/libexif exif-data.c, 1.99, 1.100 exif-tag.c, 1.34, 1.35

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-data.c exif-tag.c 
Log Message:
When NO_VERBOSE_TAG_STRINGS is used, don't set
EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS by default or else no tags at all will
be loaded. Also, properly terminate the ExifTagTable.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- exif-tag.c	30 Oct 2007 05:03:05 -0000	1.34
+++ exif-tag.c	30 Oct 2007 06:45:23 -0000	1.35
@@ -681,8 +681,8 @@ static const struct {
 	 N_("Indicates the value of coefficient gamma.")},
 	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
 	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
-	{0, NULL, NULL, NULL}
 #endif
+	{0, NULL, NULL, NULL}
 };
 
 /* For now, do not use these functions. */

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -d -r1.99 -r1.100
--- exif-data.c	30 Oct 2007 03:23:28 -0000	1.99
+++ exif-data.c	30 Oct 2007 06:45:23 -0000	1.100
@@ -134,7 +134,13 @@ exif_data_new_mem (ExifMem *mem)
 	}
 
 	/* Default options */
+#ifndef NO_VERBOSE_TAG_STRINGS
+	/*
+	 * When the tag list is compiled away, setting this option prevents
+	 * any tags from being loaded
+	 */
 	exif_data_set_option (data, EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS);
+#endif
 	exif_data_set_option (data, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
 
 	/* Default data type: none */

[libexif-cvs] exif/exif actions.c,1.27,1.28

[Dan F. <dfa...@us...>]

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

Modified Files:
	actions.c 
Log Message:
Don't crash if a tag title string is not available


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -d -r1.27 -r1.28
--- actions.c	28 Jul 2006 19:12:32 -0000	1.27
+++ actions.c	30 Oct 2007 06:27:35 -0000	1.28
@@ -71,7 +71,7 @@ show_entry (ExifEntry *e, void *data)
 	if (*ids)
 		fprintf (stdout, "0x%04x", e->tag);
 	else
-		fprintf (stdout, "%-20.20s", C(exif_tag_get_title_in_ifd (e->tag, ifd)));
+		fprintf (stdout, "%-20.20s", C(CN(exif_tag_get_title_in_ifd (e->tag, ifd))));
 	printf ("|");
 	if (*ids)
 		fprintf (stdout, "%-72.72s",

[libexif-cvs] libexif/libexif exif-entry.c, 1.107, 1.108 exif-log.c, 1.6, 1.7 exif-log.h, 1.7, 1.8 exif-tag.c, 1.33, 1.34

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-entry.c exif-log.c exif-log.h exif-tag.c 
Log Message:
* Support compiling away the detailed tag tables and log messages when
  the NO_VERBOSE_TAG_STRINGS macro is defined to reduce the size of
  the library for use in embedded applications where space is at
  a premium
* Display the raw value of a tag when the tag is unknown


Index: exif-log.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- exif-log.c	11 Nov 2004 20:24:39 -0000	1.6
+++ exif-log.c	30 Oct 2007 05:03:05 -0000	1.7
@@ -35,7 +35,7 @@ struct _ExifLog {
 	ExifMem *mem;
 };
 
-static struct {
+static const struct {
 	ExifLogCode code;
 	const char *title;
 	const char *message;
@@ -127,6 +127,10 @@ exif_log_set_func (ExifLog *log, ExifLog
 	log->data = data;
 }
 
+#ifdef NO_VERBOSE_TAG_STRINGS
+/* exif_log forms part of the API and can't be commented away */
+#undef exif_log
+#endif
 void
 exif_log (ExifLog *log, ExifLogCode code, const char *domain,
 	  const char *format, ...)

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -d -r1.33 -r1.34
--- exif-tag.c	26 Jun 2007 02:06:51 -0000	1.33
+++ exif-tag.c	30 Oct 2007 05:03:05 -0000	1.34
@@ -38,13 +38,14 @@
 #define ESL_NNNO { EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_NOT_RECORDED, EXIF_SUPPORT_LEVEL_OPTIONAL }
 #define ESL_GPS { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN }
 
-static struct {
+static const struct {
 	ExifTag tag;
 	const char *name;
 	const char *title;
 	const char *description;
 	ExifSupportLevel esl[EXIF_IFD_COUNT][4];
 } ExifTagTable[] = {
+#ifndef NO_VERBOSE_TAG_STRINGS
 	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
 	 "New Subfile Type", N_("A general indication of the kind of data "
 	    "contained in this subfile.")},
@@ -681,6 +682,7 @@ static struct {
 	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
 	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
 	{0, NULL, NULL, NULL}
+#endif
 };
 
 /* For now, do not use these functions. */

Index: exif-log.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- exif-log.h	25 Jun 2007 23:03:00 -0000	1.7
+++ exif-log.h	30 Oct 2007 05:03:05 -0000	1.8
@@ -55,12 +55,22 @@ typedef void (* ExifLogFunc) (ExifLog *l
  */
 void     exif_log_set_func (ExifLog *log, ExifLogFunc func, void *data);
 
+#ifndef NO_VERBOSE_TAG_STRINGS
 void     exif_log  (ExifLog *log, ExifLogCode, const char *domain,
 		    const char *format, ...)
 #ifdef __GNUC__
 			__attribute__((__format__(printf,4,5)))
 #endif
 ;
+#else
+#if defined(__STDC_VERSION__) &&  __STDC_VERSION__ >= 199901L
+#define exif_log(...) do { } while (0)
+#elif defined(__GNUC__)
+#define exif_log(x...) do { } while (0)
+#else
+#define exif_log (void)
+#endif
+#endif
 
 void     exif_logv (ExifLog *log, ExifLogCode, const char *domain,
 		    const char *format, va_list args);

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -d -r1.107 -r1.108
--- exif-entry.c	27 Jun 2007 11:15:50 -0000	1.107
+++ exif-entry.c	30 Oct 2007 05:03:05 -0000	1.108
@@ -42,6 +42,7 @@ struct _ExifEntryPrivate
 /* This function is hidden in exif-data.c */
 ExifLog *exif_data_get_log (ExifData *);
 
+#ifndef NO_VERBOSE_TAG_STRINGS
 static void
 exif_entry_log (ExifEntry *e, ExifLogCode code, const char *format, ...)
 {
@@ -54,6 +55,15 @@ exif_entry_log (ExifEntry *e, ExifLogCod
 	exif_logv (l, code, "ExifEntry", format, args);
 	va_end (args);
 }
+#else
+#if defined(__STDC_VERSION__) &&  __STDC_VERSION__ >= 199901L
+#define exif_entry_log(...) do { } while (0)
+#elif defined(__GNUC__)
+#define exif_entry_log(x...) do { } while (0)
+#else
+#define exif_entry_log (void)
+#endif
+#endif
 
 static void *
 exif_entry_alloc (ExifEntry *e, unsigned int i)
@@ -378,10 +388,11 @@ exif_entry_dump (ExifEntry *e, unsigned 
 	}								\
 }
 
-static struct {
+static const struct {
 	ExifTag tag;
 	const char *strings[10];
 } list[] = {
+#ifndef NO_VERBOSE_TAG_STRINGS
   { EXIF_TAG_PLANAR_CONFIGURATION,
     { N_("chunky format"), N_("planar format"), NULL}},
   { EXIF_TAG_SENSING_METHOD,
@@ -414,16 +425,18 @@ static struct {
     { N_("Normal"), N_("Low saturation"), N_("High saturation"), NULL}},
   { EXIF_TAG_CONTRAST , {N_("Normal"), N_("Soft"), N_("Hard"), NULL}},
   { EXIF_TAG_SHARPNESS, {N_("Normal"), N_("Soft"), N_("Hard"), NULL}},
+#endif
   { 0, {NULL}}
 };
 
-static struct {
+static const struct {
   ExifTag tag;
   struct {
     int index;
     const char *values[4];
   } elem[25];
 } list2[] = {
+#ifndef NO_VERBOSE_TAG_STRINGS
   { EXIF_TAG_METERING_MODE,
     { {  0, {N_("Unknown"), NULL}},
       {  1, {N_("Average"), N_("avg"), NULL}},
@@ -535,6 +548,7 @@ static struct {
       {2, {N_("Adobe RGB"), NULL}},
       {0xffff, {N_("Uncalibrated"), NULL}},
       {0x0000, {NULL}}}},
+#endif
   {0, { { 0, {NULL}}} }
 };
 
@@ -554,8 +568,8 @@ exif_entry_get_value (ExifEntry *e, char
 	ExifByteOrder o;
 	double d;
 	ExifEntry *entry;
-	static struct {
-		char *label;
+	static const struct {
+		const char *label;
 		char major, minor;
 	} versions[] = {
 		{"0110", 1,  1},
@@ -915,7 +929,8 @@ exif_entry_get_value (ExifEntry *e, char
 		/* Search the tag */
 		for (i = 0; list2[i].tag && (list2[i].tag != e->tag); i++);
 		if (!list2[i].tag) {
-			strncpy (val, _("Internal error"), maxlen);
+			snprintf (val, maxlen, _("Internal error (unknown "
+				  "value %i)"), v_short);
 			break;
 		}
 
@@ -958,7 +973,8 @@ exif_entry_get_value (ExifEntry *e, char
 		/* Search the tag */
 		for (i = 0; list[i].tag && (list[i].tag != e->tag); i++);
 		if (!list[i].tag) {
-			strncpy (val, _("Internal error"), maxlen);
+			snprintf (val, maxlen, _("Internal error (unknown "
+				  "value %i)"), v_short);
 			break;
 		}
 

[libexif-cvs] libexif ChangeLog,1.249,1.250 NEWS,1.27,1.28

[Dan F. <dfa...@us...>]

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

Modified Files:
	ChangeLog NEWS 
Log Message:
* Support compiling away the detailed tag tables and log messages when
  the NO_VERBOSE_TAG_STRINGS macro is defined to reduce the size of
  the library for use in embedded applications where space is at
  a premium
* Display the raw value of a tag when the tag is unknown


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -d -r1.27 -r1.28
--- NEWS	12 Sep 2007 06:03:31 -0000	1.27
+++ NEWS	30 Oct 2007 05:03:04 -0000	1.28
@@ -3,6 +3,8 @@ libexif-0.6.16.2:
   * New translations: nl, se
   * Bug fixes: #1773810, #1774626
   * Enhanced support of Canon makernotes 
+  * Added support for the NO_VERBOSE_TAG_STRINGS macro for embedded
+    applications
 
 
 libexif-0.6.16 (2007-06-12) since 0.6.1.15 (2007-05-23):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -p -d -r1.249 -r1.250
--- ChangeLog	12 Sep 2007 06:03:31 -0000	1.249
+++ ChangeLog	30 Oct 2007 05:03:04 -0000	1.250
@@ -1,3 +1,12 @@
+2007-10-29  Dan Fandrich <da...@co...>
+	* Fixed some typos in messages
+	* Made some structs const
+	* Support compiling away the detailed tag tables and log messages when
+	  the NO_VERBOSE_TAG_STRINGS macro is defined to reduce the size of
+	  the library for use in embedded applications where space is at
+	  a premium
+	* Display the raw value of a tag when the tag is unknown
+
 2007-09-12  Jan Patera <pa...@us...>
 
 	* Enhancements to Canon makernote parsers submitted by Thorsten Kukuk