libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif exif-data.c,1.126,1.127

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28013/libexif

Modified Files:
	exif-data.c 
Log Message:
Factored out interpret_maker_note


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -p -d -r1.126 -r1.127
--- exif-data.c	18 Dec 2009 02:18:26 -0000	1.126
+++ exif-data.c	8 Jan 2010 23:17:02 -0000	1.127
@@ -235,7 +235,6 @@ exif_data_save_data_entry (ExifData *dat
 			   unsigned int offset)
 {
 	unsigned int doff, s;
-	unsigned char *t;
 	unsigned int ts;
 
 	if (!data || !data->priv) 
@@ -253,6 +252,7 @@ exif_data_save_data_entry (ExifData *dat
 	if (!(data->priv->options & EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE)) {
 		/* If this is the maker note tag, update it. */
 		if ((e->tag == EXIF_TAG_MAKER_NOTE) && data->priv->md) {
+			/* TODO: this is using the wrong ExifMem to free e->data */
 			exif_mem_free (data->priv->mem, e->data);
 			e->data = NULL;
 			e->size = 0;
@@ -271,6 +271,7 @@ exif_data_save_data_entry (ExifData *dat
 	 */
 	s = exif_format_get_size (e->format) * e->components;
 	if (s > 4) {
+		unsigned char *t;
 		doff = *ds - 6;
 		ts = *ds + s;
 
@@ -779,6 +780,47 @@ exif_data_get_type_maker_note (ExifData 
 	return EXIF_DATA_TYPE_MAKER_NOTE_NONE;
 }
 
+/*! If MakerNote is recognized, load it.
+ *
+ * \param[in,out] data #ExifData
+ * \param[in] d pointer to raw EXIF data
+ * \param[in] ds length of data at d
+ */
+static void
+interpret_maker_note(ExifData *data, const unsigned char *d, unsigned int ds)
+{
+	switch (exif_data_get_type_maker_note (data)) {
+	case EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS:
+	case EXIF_DATA_TYPE_MAKER_NOTE_NIKON:
+		data->priv->md = exif_mnote_data_olympus_new (data->priv->mem);
+		break;
+	case EXIF_DATA_TYPE_MAKER_NOTE_PENTAX:
+	case EXIF_DATA_TYPE_MAKER_NOTE_CASIO:
+		data->priv->md = exif_mnote_data_pentax_new (data->priv->mem);
+		break;
+	case EXIF_DATA_TYPE_MAKER_NOTE_CANON:
+		data->priv->md = exif_mnote_data_canon_new (data->priv->mem, data->priv->options);
+		break;
+	case EXIF_DATA_TYPE_MAKER_NOTE_FUJI:
+		data->priv->md = exif_mnote_data_fuji_new (data->priv->mem);
+		break;
+	default:
+		break;
+	}
+
+	/* 
+	 * If we are able to interpret the maker note, do so.
+	 */
+	if (data->priv->md) {
+		exif_mnote_data_log (data->priv->md, data->priv->log);
+		exif_mnote_data_set_byte_order (data->priv->md,
+						data->priv->order);
+		exif_mnote_data_set_offset (data->priv->md,
+					    data->priv->offset_mnote);
+		exif_mnote_data_load (data->priv->md, d, ds);
+	}
+}
+
 #define LOG_TOO_SMALL \
 exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", \
 		_("Size of data too small to allow for EXIF data."));
@@ -929,37 +971,9 @@ exif_data_load_data (ExifData *data, con
 	 * space between IFDs. Here is the only place where we have access
 	 * to that data.
 	 */
-	switch (exif_data_get_type_maker_note (data)) {
-	case EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS:
-	case EXIF_DATA_TYPE_MAKER_NOTE_NIKON:
-		data->priv->md = exif_mnote_data_olympus_new (data->priv->mem);
-		break;
-	case EXIF_DATA_TYPE_MAKER_NOTE_PENTAX:
-	case EXIF_DATA_TYPE_MAKER_NOTE_CASIO:
-		data->priv->md = exif_mnote_data_pentax_new (data->priv->mem);
-		break;
-	case EXIF_DATA_TYPE_MAKER_NOTE_CANON:
-		data->priv->md = exif_mnote_data_canon_new (data->priv->mem, data->priv->options);
-		break;
-	case EXIF_DATA_TYPE_MAKER_NOTE_FUJI:
-		data->priv->md = exif_mnote_data_fuji_new (data->priv->mem);
-		break;
-	default:
-		break;
-	}
-
-	/* 
-	 * If we are able to interpret the maker note, do so.
-	 */
-	if (data->priv->md) {
-		exif_mnote_data_log (data->priv->md, data->priv->log);
-		exif_mnote_data_set_byte_order (data->priv->md,
-						data->priv->order);
-		exif_mnote_data_set_offset (data->priv->md,
-					    data->priv->offset_mnote);
-		exif_mnote_data_load (data->priv->md, d, ds);
-	}
+	interpret_maker_note(data, d, ds);
 
+	/* Fixup tags if requested */
 	if (data->priv->options & EXIF_DATA_OPTION_FOLLOW_SPECIFICATION)
 		exif_data_fix (data);
 }

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.51, 1.52

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1771

Modified Files:
	mnote-olympus-entry.c 
Log Message:
1) MNOTE_NIKON_TAG_LENSTYPE: added one more value
2) MNOTE_OLYMPUS_TAG_DIGIZOOM: fixed div by zero


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -d -r1.51 -r1.52
--- mnote-olympus-entry.c	27 Oct 2009 06:06:11 -0000	1.51
+++ mnote-olympus-entry.c	5 Jan 2010 21:02:51 -0000	1.52
@@ -91,6 +91,7 @@ static const struct {
       {2, N_("AF-D or AF-S Lens")},
       {6, N_("AF-D G Lens")},
       {10, N_("AF-D VR Lens")},
+      {14, N_("AF-D G VR Lens")},
       {0, NULL}}},
   { MNOTE_NIKON_TAG_FLASHUSED, EXIF_FORMAT_BYTE,
     { {0, N_("Flash did not fire")},
@@ -446,10 +447,10 @@ mnote_olympus_entry_get_value (MnoteOlym
 		if (entry->format == EXIF_FORMAT_RATIONAL) {
 			CC (entry->components, 1, v, maxlen);
 			vr = exif_get_rational (entry->data, entry->order);
-			r = (double)vr.numerator / vr.denominator;
 			if (!vr.numerator) {
 				strncpy (v, _("None"), maxlen);
 			} else {
+				r = (double)vr.numerator / vr.denominator;
 				snprintf (v, maxlen, "%2.2f", r);
 			}
 			break;

[libexif-cvs] exif/po sk.po,1.2,1.3

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

Update of /cvsroot/libexif/exif/po
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10032/po

Modified Files:
	sk.po 
Log Message:
po/sk.po: Updated Slovak translation by Ivan Masár


Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/sk.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- sk.po	25 Nov 2008 18:52:11 -0000	1.2
+++ sk.po	31 Dec 2009 04:41:55 -0000	1.3
@@ -1,14 +1,14 @@
 # Slovak translation of exif
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the exif package.
-# Ivan Masár <he...@ce...>, 2008.
+# Ivan Masár <he...@ce...>, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: exif 0.6.17\n"
+"Project-Id-Version: exif 0.6.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 01:03-0800\n"
-"PO-Revision-Date: 2008-11-25 11:42+0100\n"
+"POT-Creation-Date: 2009-10-08 18:05-0700\n"
+"PO-Revision-Date: 2009-12-31 03:19+0100\n"
 "Last-Translator: Ivan Masár <he...@ce...>\n"
 "Language-Team: Slovak <sk...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -16,127 +16,112 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
-#: exif/actions.c:56
+#: exif/actions.c:57
 #, c-format
 msgid "Not enough memory."
 msgstr "Nedostatok pamäte."
 
-#: exif/actions.c:74
+#: exif/actions.c:75
 #, c-format
 msgid "Setting a value for this tag is unsupported!"
 msgstr "Nastavenie hodnoty tejto značky nie je podporované!"
 
-#: exif/actions.c:91
+#: exif/actions.c:92
 #, c-format
 msgid "Too few components specified!"
 msgstr "Bolo uvedených príliš málo zložiek."
 
-#: exif/actions.c:106
+#: exif/actions.c:107
 #, c-format
 msgid "Internal error. Please contact <%s>."
 msgstr "Vnútorná chyba. Prosím, kontaktujte <%s>."
 
-#: exif/actions.c:143
+#: exif/actions.c:146
 #, c-format
 msgid "Not yet implemented!"
 msgstr "Funkcia zatiaľ nie je implementovaná!"
 
-#: exif/actions.c:150
+#: exif/actions.c:153
 #, c-format
 msgid "Warning; Too many components specified!"
 msgstr "Upozornenie - bolo uvedených príliš veľa zložiek."
 
-#: exif/actions.c:172
+#: exif/actions.c:175
 #, c-format
 msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
 msgstr "Príliš mnoho EXIF údajov (%i bajtov). Je povolených iba %i bajtov."
 
-#: exif/actions.c:183 exif/actions.c:358
+#: exif/actions.c:186 exif/actions.c:357
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Zapísaný súbor „%s“."
 
-#: exif/actions.c:203
+#: exif/actions.c:206
 #, c-format
 msgid "EXIF entry '%s' "
 msgstr "EXIF záznam „%s“"
 
-#: exif/actions.c:205
+#: exif/actions.c:208
 #, c-format
 msgid "(0x%x, '%s') "
 msgstr "(0x%x, „%s“) "
 
-#: exif/actions.c:208
+#: exif/actions.c:211
 #, c-format
 msgid "exists in IFD '%s':\n"
 msgstr "existuje v IFD „%s“:\n"
 
-#: exif/actions.c:251
+#: exif/actions.c:262
 #, c-format
 msgid "IFD '%s' does not contain a tag '%s'!"
 msgstr "IFD „%s“ neobsahuje značku „%s“!"
 
-#: exif/actions.c:282
-#, c-format
-msgid "Could not open '%s' (%m)!"
-msgstr "Nebolo možné otvoriť „%s“ (%m)!"
-
-#: exif/actions.c:285
+#: exif/actions.c:292
 #, c-format
 msgid "Could not open '%s' (%s)!"
 msgstr "Nebolo možné otvoriť „%s“ (%s)!"
 
-#: exif/actions.c:295
-#, c-format
-msgid "Could not read '%s' (%m)."
-msgstr "Nebolo možné prečítať „%s“ (%m)."
-
-#: exif/actions.c:298
+#: exif/actions.c:301
 #, c-format
 msgid "Could not read '%s' (%s)."
 msgstr "Nebolo možné prečítať „%s“ (%s)."
 
-#: exif/actions.c:317
+#: exif/actions.c:320
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "IFD „%s“ neobsahuje značku „%s“."
 
-#: exif/actions.c:323
+#: exif/actions.c:326
 #, c-format
 msgid "'%s' does not contain tag '%s'."
 msgstr "IFD „%s“ neobsahuje značku „%s“."
 
-#: exif/actions.c:341
+#: exif/actions.c:344
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "„%s“ neobsahuje náhľad!"
 
-#: exif/actions.c:350
-#, c-format
-msgid "Could not open '%s' for writing (%m)!"
-msgstr "Nebolo možné otvoriť „%s“ na zápis (%m)!"
-
-#: exif/actions.c:353
+#: exif/actions.c:352
 #, c-format
 msgid "Could not open '%s' for writing (%s)!"
 msgstr "Nebolo možné otvoriť „%s“ na zápis (%s)!"
 
-#: exif/actions.c:371
+#: exif/actions.c:374
 #, c-format
 msgid "EXIF tags in '%s':"
 msgstr "EXIF značky v „%s“:"
 
-#: exif/actions.c:440
+#: exif/actions.c:470
 #, c-format
-msgid "Unknown MakerNote format.\n"
-msgstr "Neznámy formát Poznámky výrobcu.\n"
+msgid "Unknown format or nonexistent MakerNote.\n"
+msgstr "Neznámy formát alebo neexistujúca MakerNote.\n"
 
-#: exif/actions.c:447
+#: exif/actions.c:477
 #, c-format
 msgid "MakerNote does not contain any value.\n"
 msgstr "Poznámka výrobcu neobsahuje žiadnu hodnotu.\n"
 
-#: exif/actions.c:450
+#: exif/actions.c:480
 #, c-format
 msgid "MakerNote contains %i value:\n"
 msgid_plural "MakerNote contains %i values:\n"
@@ -144,149 +129,189 @@ msgstr[0] "Poznámka výrobcu obsahuje %
 msgstr[1] "Poznámka výrobcu obsahuje %i hodnoty.\n"
 msgstr[2] "Poznámka výrobcu obsahuje %i hodnôt.\n"
 
-#: exif/actions.c:460
+#: exif/actions.c:490
 msgid "Unknown tag"
 msgstr "Neznáma značka"
 
-#: exif/actions.c:464
+#: exif/actions.c:499
 msgid "Unknown value"
 msgstr "Neznáma hodnota"
 
-#: exif/actions.c:490
+#: exif/actions.c:523
 #, c-format
 msgid "EXIF tags in '%s' ('%s' byte order):"
 msgstr "EXIF značky v „%s“ (poradie bajtov „%s“):"
 
-#: exif/actions.c:495 exif/actions.c:497
+#: exif/actions.c:529
 msgid "Tag"
 msgstr "Značka"
 
-#: exif/actions.c:501 exif/actions.c:503 exif/main.c:199
+#: exif/actions.c:535
 msgid "Value"
 msgstr "Hodnota"
 
-#: exif/actions.c:509
+#: exif/actions.c:550
 #, c-format
 msgid "EXIF data contains a thumbnail (%i bytes)."
 msgstr "EXIF údaje obsahujú náhľad (%i bajtov)."
 
-#: exif/actions.c:545
+#: exif/actions.c:592
 #, c-format
 msgid "ThumbnailSize\t%i\n"
 msgstr "Veľkosť náhľadu\t%i\n"
 
-#: exif/main.c:175
+#: exif/main.c:196
 msgid "Display software version"
 msgstr "Zobraziť verziu softvéru"
 
-#: exif/main.c:177
+#: exif/main.c:198
 msgid "Show IDs instead of tag names"
 msgstr "Zobraziť ID namiesto názvov značiek"
 
-#: exif/main.c:179
+#: exif/main.c:200
 msgid "Select tag"
 msgstr "Vybrať značku"
 
-#: exif/main.c:179
+#: exif/main.c:200
 msgid "tag"
 msgstr "značka"
 
-#: exif/main.c:181
+#: exif/main.c:202
 msgid "Select IFD"
 msgstr "Vybrať IFD"
 
-#: exif/main.c:181
+#: exif/main.c:202
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:183
+#: exif/main.c:204
 msgid "List all EXIF tags"
 msgstr "Zoznam všetkých EXIF značiek"
 
-#: exif/main.c:185
+#: exif/main.c:206
 msgid "Show contents of tag MakerNote"
 msgstr "Zobraziť obsah značky Poznámka výrobcu"
 
-#: exif/main.c:187
+#: exif/main.c:208
 msgid "Remove tag or ifd"
 msgstr "Odstrániť značku alebo IFD"
 
-#: exif/main.c:189
+#: exif/main.c:210
 msgid "Show description of tag"
 msgstr "Zobraziť popis značky"
 
-#: exif/main.c:191
+#: exif/main.c:212
 msgid "Extract thumbnail"
 msgstr "Extrahovať náhľad"
 
-#: exif/main.c:193
+#: exif/main.c:214
 msgid "Remove thumbnail"
 msgstr "Odstrániť náhľad"
 
-#: exif/main.c:195
+#: exif/main.c:216
 msgid "Insert FILE as thumbnail"
 msgstr "Vložiť SÚBOR ako náhľad"
 
-#: exif/main.c:195 exif/main.c:197
+#: exif/main.c:216 exif/main.c:220
 msgid "FILE"
 msgstr "SÚBOR"
 
-#: exif/main.c:197
+#: exif/main.c:218
+msgid "Do not fix existing tags in files"
+msgstr "Neopravovať existujúce značky v súboroch."
+
+#: exif/main.c:220
 msgid "Write data to FILE"
 msgstr "Zapísať údaje do SÚBORu"
 
-#: exif/main.c:201
+#: exif/main.c:222
+msgid "Value of tag"
+msgstr "Hodnota značky"
+
+#: exif/main.c:224
 msgid "Create EXIF data if not existing"
 msgstr "Vytvoriť EXIF údaje ak neexistujú"
 
-#: exif/main.c:203
+#: exif/main.c:226
 msgid "Output in a machine-readable (tab delimited) format"
 msgstr "Výstup v strojovo čitateľnom formáte (oddeľovač je tabulátor)"
 
-#: exif/main.c:206
+#: exif/main.c:229
+msgid "Width of output"
+msgstr "Šírka výstupu"
+
+#: exif/main.c:229
+msgid "WIDTH"
+msgstr "ŠÍRKA"
+
+#: exif/main.c:231
 msgid "Output in a XML format"
 msgstr "Výstup vo formáte XML"
 
-#: exif/main.c:209
+#: exif/main.c:234
 msgid "Show debugging messages"
 msgstr "Zobraziť ladiace správy"
 
-#: exif/main.c:229
+#: exif/main.c:240
+msgid "Help options:"
+msgstr "Možnosti Pomocníka"
+
+#: exif/main.c:241
+msgid "Show this help message"
+msgstr "Zobraziť túto správu Pomocníka"
+
+#: exif/main.c:242
+msgid "Display brief usage message"
+msgstr "Zobraziť stručnú správu o použití"
+
+#: exif/main.c:262
 msgid "[OPTION...] file"
 msgstr "[VOĽBA...] súbor"
 
-#: exif/main.c:241
+#: exif/main.c:277
 #, c-format
 msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'."
 msgstr "Neplatný IFD „%s“. Platné IFD sú „0“, „1“, „EXIF“, „GPS“ a „Interoperability“."
 
-#: exif/main.c:250
+#: exif/main.c:286
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "Neplatná značka „%s“!"
 
-#: exif/main.c:258
+#: exif/main.c:294
 msgid "You need to specify a tag!"
 msgstr "Musíte zadať značku!"
 
-#: exif/main.c:263
+#: exif/main.c:299
 msgid "You need to specify an IFD!"
 msgstr "Musíte zadať IFD!"
 
-#: exif/main.c:286
+#: exif/main.c:322
 #, c-format
 msgid "Tag '%s' "
 msgstr "Značka „%s“"
 
-#: exif/main.c:288
+#: exif/main.c:324
 #, c-format
 msgid "(0x%04x, '%s'): "
 msgstr "(0x%04x, „%s“): "
 
-#: exif/main.c:338
+#: exif/main.c:388
 #, c-format
-msgid "'%s' does not contain EXIF data!"
-msgstr "„%s“ neobsahuje EXIF údaje!"
+msgid "'%s' is not readable or does not contain EXIF data!"
+msgstr "„%s“ nie je čitateľný alebo neobsahuje EXIF údaje!"
+
+#~ msgid "Could not open '%s' (%m)!"
+#~ msgstr "Nebolo možné otvoriť „%s“ (%m)!"
+
+#~ msgid "Could not read '%s' (%m)."
+#~ msgstr "Nebolo možné prečítať „%s“ (%m)."
+
+#~ msgid "Could not open '%s' for writing (%m)!"
+#~ msgstr "Nebolo možné otvoriť „%s“ na zápis (%m)!"
+
+#~ msgid "Unknown MakerNote format.\n"
+#~ msgstr "Neznámy formát Poznámky výrobcu.\n"
 
 #~ msgid "Please specify a tag!"
 #~ msgstr "Prosím, zadajte štítok!"

[libexif-cvs] exif ChangeLog,1.110,1.111 NEWS,1.44,1.45

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

Update of /cvsroot/libexif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10032

Modified Files:
	ChangeLog NEWS 
Log Message:
po/sk.po: Updated Slovak translation by Ivan Masár


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -d -r1.44 -r1.45
--- NEWS	16 Dec 2009 23:48:18 -0000	1.44
+++ NEWS	31 Dec 2009 04:41:54 -0000	1.45
@@ -1,5 +1,5 @@
 exif-0.6.x:
-  * Updated translations: it
+  * Updated translations: it, sk
   * --no-fixup now honoured during --create-exif to not create default tags
   * Fixed crash when not enough components were given to --set-value
   * Made --set-value more forgiving of whitespace

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -d -r1.110 -r1.111
--- ChangeLog	16 Dec 2009 23:48:27 -0000	1.110
+++ ChangeLog	31 Dec 2009 04:41:54 -0000	1.111
@@ -1,3 +1,7 @@
+2009-12-30  Dan Fandrich <da...@co...>
+
+	* po/sk.po: Updated Slovak translation by Ivan Masár
+
 2009-12-16  Dan Fandrich <da...@co...>
 
 	* Honour --machine-readable with --show-mnote

[libexif-cvs] libexif/po da.po, 1.7, 1.8 sk.po, 1.15, 1.16 sv.po, 1.4, 1.5

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

Update of /cvsroot/libexif/libexif/po
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9518/po

Modified Files:
	da.po sk.po sv.po 
Log Message:
po/da.po: Updated Danish translation by Joe Hansen
po/sk.po: Updated Slovak translation by Ivan Masár
po/sv.po: Updated Swedish translation by Daniel Nylander


Index: sv.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sv.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- sv.po	14 Oct 2009 04:36:14 -0000	1.4
+++ sv.po	31 Dec 2009 04:37:59 -0000	1.5
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.18-pre2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-01 22:54-0700\n"
-"PO-Revision-Date: 2009-10-10 11:37+0100\n"
+"Project-Id-Version: libexif 0.6.19\n"
+"Report-Msgid-Bugs-To: lib...@li...\n"
+"POT-Creation-Date: 2009-11-12 22:15-0800\n"
+"PO-Revision-Date: 2009-12-15 22:04+0100\n"
[...2838 lines suppressed...]
 #: libexif/olympus/mnote-olympus-tag.c:99
 msgid "Focus"
@@ -4945,7 +4940,7 @@ msgstr "Kvalitetsnivå"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
 msgid "ISOSpeed"
-msgstr ""
+msgstr "ISO-känslighet"
 
 #: libexif/pentax/mnote-pentax-tag.c:56
 msgid "Colors"
@@ -5133,7 +5128,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:133
 msgid "CCS ISO Sensitivity"
-msgstr ""
+msgstr "CCS ISO-känslighet"
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"

Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sk.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- sk.po	25 Nov 2008 18:54:43 -0000	1.15
+++ sk.po	31 Dec 2009 04:37:58 -0000	1.16
@@ -1,14 +1,14 @@
 # translation of libexif to Slovak
 # Copyright (C) 2007 Lutz Müller and others
 # This file is distributed under the same license as the libexif package.
-# Ivan Masár <he...@ce...>, 2007, 2008.
+# Ivan Masár <he...@ce...>, 2007, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.17\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-06 00:59-0800\n"
[...4365 lines suppressed...]
-#~ msgstr "Vnútorná chyba (neznáma hodnota %i)."
+#: libexif/pentax/mnote-pentax-tag.c:136
+msgid "Finer"
+msgstr "jemnejšie"
 
-#~ msgid "1x"
-#~ msgstr "1x"
+#: 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 "[DO_NOT_TRANSLATE_THIS_MARKER]"
 
-#~ msgid "Unknown tag."
-#~ msgstr "neznámy štítok."
+#~ msgid "%i"
+#~ msgstr "%i"
 
-#~ msgid "Manual Focus"
-#~ msgstr "ručné zaostrenie"
+#~ msgid "%d"
+#~ msgstr "%d"

Index: da.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/da.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- da.po	25 Nov 2009 21:26:24 -0000	1.7
+++ da.po	31 Dec 2009 04:37:58 -0000	1.8
@@ -24,6 +24,7 @@
 # focal point -> brændpunkt
 # hue -> farvetone
 # incandescence -> hvidglødende
+# Interoperability -> (uafklaret; Erklæringen om brugsret?)
 # shutter -> lukketid
 # still image -> stillbillede
 # strobe light -> stroboskoplys
@@ -35,7 +36,7 @@ msgstr ""
 "Project-Id-Version: libexif-0.6.19\n"
 "Report-Msgid-Bugs-To: lib...@li...\n"
 "POT-Creation-Date: 2009-11-12 22:15-0800\n"
-"PO-Revision-Date: 2009-11-24 01:01I+0200\n"
+"PO-Revision-Date: 2009-11-30 01:01I+0200\n"
 "Last-Translator: Joe Hansen <joe...@ya...>\n"
 "Language-Team: Danish <da...@da...>\n"
 "MIME-Version: 1.0\n"
@@ -2552,6 +2553,9 @@ msgid "GPS time (atomic clock)"
 msgstr "GPS-tid (atomur)"
 
 # oversætter man UTC til dansk KUT ?
+# Det ville ingen forstå. Det er meningen at forkortelsen UTC skal være
+# gældende for alle sprog. På DRs tekst-tv kalder man det "Universal time
+# coordinated". Ifølge da.wikipedia kaldes det også "universel tid".
 #: libexif/exif-tag.c:115
 msgid "Indicates the time as UTC (Coordinated Universal Time). TimeStamp is expressed as three RATIONAL values giving the hour, minute, and second."
 msgstr "Indikerer tiden som UTC (Koordineret universel tid). TimeStamp udtrykkes som tre RATIONAL-værdier i form af time, minut og sekund."
@@ -2563,11 +2567,11 @@ msgstr "GPS-satellitter brugt til målin
 # hvad er SNR?
 #: libexif/exif-tag.c:119
 msgid "Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag shall be set to NULL."
-msgstr "Indikerer GPS-satellitterne brugt til måling. Dette mærke kan bruges til at beskrive antallet af satellitter, deres id-nummer, vinkel for målinger, azimut, SNR og anden information med ASCII-notation. Formatet er ikke angivet. Hvis GPS-modtageren er i stand til at opmåle, vil værdien af mærket være angivet som NULL."
+msgstr "Indikerer GPS-satellitterne brugt til måling. Dette mærke kan bruges til at beskrive antallet af satellitter, deres id-nummer, vinkel for målinger, azimut, SNR og anden information med ASCII-notation. Formatet er ikke angivet. Hvis GPS-modtageren er ude af stand til at måle, vil værdien af mærket være angivet som NULL."
 
 #: libexif/exif-tag.c:125
 msgid "GPS receiver status"
-msgstr "GPS-modtagerstatus"
+msgstr "Status for GPS-modtager"
 
 # Nogen forslag til Interoperability?
 #: libexif/exif-tag.c:126
@@ -2588,19 +2592,19 @@ msgstr "Målingspræcision"
 
 #: libexif/exif-tag.c:134
 msgid "Indicates the GPS DOP (data degree of precision). An HDOP value is written during two-dimensional measurement, and PDOP during three-dimensional measurement."
-msgstr "Indikerer GPS DOP'en (datagrad af præcision). En HDOP-værdi skrives via 2-dimensionel måling, og PDOP under 3-dimensionel måling."
+msgstr "Indikerer DOP (grad af præcision for data) for GPS-modtageren. En HDOP-værdi skrives via 2-dimensionel måling, og PDOP under 3-dimensionel måling."
 
 #: libexif/exif-tag.c:137
 msgid "Speed unit"
-msgstr "Hastighedsenhed"
+msgstr "Enhed for hastighed"
 
 #: libexif/exif-tag.c:138
 msgid "Indicates the unit used to express the GPS receiver speed of movement. 'K', 'M' and 'N' represent kilometers per hour, miles per hour, and knots."
-msgstr "Indikerer enheden brugt til at udtrykke GPS-modtagerens bevægelseshastighed. 'K', 'M' og 'N' repræsenterer kilometre per time, mil per time og knop."
+msgstr "Indikerer enheden brugt til at udtrykke GPS-modtagerens bevægelseshastighed. 'K', 'M' og 'N' repræsenterer kilometer per time, mil per time og knop."
 
 #: libexif/exif-tag.c:141
 msgid "Speed of GPS receiver"
-msgstr "Hastighed på GPS-modtager"
+msgstr "GPS-modtagerens hastighed"
 
 #: libexif/exif-tag.c:142
 msgid "Indicates the speed of GPS receiver movement."
@@ -2608,7 +2612,7 @@ msgstr "Indikerer hastigheden på GPS-mo
 
 #: libexif/exif-tag.c:143
 msgid "Reference for direction of movement"
-msgstr "Reference for retning på bevægelse"
+msgstr "Reference for bevægelsesretning"
 
 #: libexif/exif-tag.c:144
 msgid "Indicates the reference for giving the direction of GPS receiver movement. 'T' denotes true direction and 'M' is magnetic direction."
@@ -2616,7 +2620,7 @@ msgstr "Indikerer referencen for retning
 
 #: libexif/exif-tag.c:147
 msgid "Direction of movement"
-msgstr "Retning på bevægelse"
+msgstr "Bevægelsesretning"
 
 #: libexif/exif-tag.c:148
 msgid "Indicates the direction of GPS receiver movement. The range of values is from 0.00 to 359.99."
@@ -2644,39 +2648,41 @@ msgstr "Anvendte geodæiske undersøgels
 
 #: libexif/exif-tag.c:157
 msgid "Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is 'TOKYO' or 'WGS-84'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
-msgstr "Indikerer de geodæiske undersøgelsesdata der bruges af GPS-modtageren. Hvis undersøgelsesdataene er begrænset til Japan er værdien af mærket 'TOKYO' eller 'WGS-84'. Hvis et GPS-infomærke er optaget, anbefales det stærkt at dette mærke registreres."
+msgstr "Indikerer de geodæiske undersøgelsesdata der bruges af GPS-modtageren. Hvis undersøgelsesdataene er begrænset til Japan er værdien af mærket 'TOKYO' eller 'WGS-84'. Hvis et GPS-infomærke er optaget, anbefales det kraftigt, at dette mærke registreres."
 
+# "Reference for ankomststedets breddegrad"
+# Kan man skrive /stedets/ isf. ankomststedets?
 #: libexif/exif-tag.c:161
 msgid "Reference for latitude of destination"
-msgstr "Reference for breddegrad på ankomststed"
+msgstr "Reference for ankomststedets breddegrad"
 
 #: libexif/exif-tag.c:162
 msgid "Indicates whether the latitude of the destination point is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
-msgstr "Indikerer hvorvidt breddegraden på ankomststedet er nordlig eller sydlig breddegrad. ASCII-værdien 'N' indikerer nordlig breddegrad, og 'S' er sydlig breddegrad."
+msgstr "Indikerer om breddegraden på ankomststedet er nordlig eller sydlig breddegrad. ASCII-værdien 'N' indikerer nordlig breddegrad, og 'S' er sydlig breddegrad."
 
 #: libexif/exif-tag.c:165
 msgid "Latitude of destination"
-msgstr "Breddegrad på ankomststed"
+msgstr "Ankomststedets breddegrad"
 
 #: libexif/exif-tag.c:166
 msgid "Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1."
-msgstr "Indikerer breddegraden på ankomststedet. Breddegraden er udtrykt som tre RATIONAL-værdier i form af grader, minutter og sekunder, henholdsvis. Hvis breddegrad er udtrykt som grader, minutter og sekunder vil et typisk format være dd/1,mm/1,ss/1. Når grader og minutter bruges og, for eksempel, fraktioner af minutter er angivet med op til to decimaler, vil formatet være dd/1,mmmm/100,0/1."
+msgstr "Indikerer breddegraden på ankomststedet. Breddegraden er udtrykt som tre RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis breddegrad er udtrykt som grader, minutter og sekunder, vil et typisk format være dd/1,mm/1,ss/1. Når der for eksempel bruges grader, minutter og dele af minutter med op til to decimaler, vil formatet være dd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:173
 msgid "Reference for longitude of destination"
-msgstr "Reference for længdegrad på ankomststed"
+msgstr "Reference for ankomststedets længdegrad"
 
 #: libexif/exif-tag.c:174
 msgid "Indicates whether the longitude of the destination point is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
-msgstr "Indikerer hvorvidt længdegraden på ankomststedet er østlig eller vestlig længdegrad. ASCII-værdien 'E' indikerer østlig breddegrad, og 'W' er vestlig længdegrad."
+msgstr "Indikerer om længdegraden på ankomststedet er østlig eller vestlig længdegrad. ASCII-værdien 'E' indikerer østlig breddegrad, og 'W' er vestlig længdegrad."
 
 #: libexif/exif-tag.c:177
 msgid "Longitude of destination"
-msgstr "Længdegrad på ankomststed"
+msgstr "Ankomststedets længdegrad"
 
 #: libexif/exif-tag.c:178
 msgid "Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1."
-msgstr "Indikerer længdegraden på ankomststedet. Længdegraden er udtrykt som tre RATIONAL-værdier angivet som grader, minutter og sekunder, henholdsvis. Hvis længdegrad er udtrykt som grader, minutter og sekunder, et typisk format vil være ddd/1,mm/1,ss/1. Når grader og minutter bruges og, for eksempel, fraktioner af minutter er anført med op til to decimaler, vil formatet være ddd/1,mmmm/100,0/1."
+msgstr "Indikerer længdegraden på ankomststedet. Længdegraden er udtrykt som tre RATIONAL-værdier, der angiver grader, minutter og sekunder. Hvis længdegrad er udtrykt som grader, minutter og sekunder, vil et typisk format være ddd/1,mm/1,ss/1. Når der for eksempel bruges grader, minutter og dele af minutter med op til to decimaler, vil formatet være ddd/1,mmmm/100,0/1."
 
 #: libexif/exif-tag.c:186
 msgid "Reference for bearing of destination"
@@ -2952,7 +2958,7 @@ msgstr "Transferinterval"
 
 #: libexif/exif-tag.c:366
 msgid "JPEG Interchange Format"
-msgstr ""
+msgstr "JPEG-udvekslingsformat"
 
 #: libexif/exif-tag.c:367
 msgid "The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data."
@@ -2964,7 +2970,7 @@ msgstr "JPEG-udvekslingsformatlængde"
 
 #: libexif/exif-tag.c:373
 msgid "The number of bytes of JPEG compressed thumbnail data. This is not used for primary image JPEG data. JPEG thumbnails are not divided but are recorded as a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not be recorded. Compressed thumbnails must be recorded in no more than 64 Kbytes, including all other data to be recorded in APP1."
-msgstr ""
+msgstr "Antallet af byte i JPEG-komprimeret miniaturedata. Dette bruges ikke til primære billed-JPEG-data. JPEG-miniaturebilleder er ikke opdelt, men er optaget som en fortsættende JPEG-bitstrøm fra SOI til EOI. Appn- og COM-markører bør ikke optages. Komprimeret miniaturebilleder skal optages i ikke mere end 64 Kbyte, inklusiv alle andre data der optages i APP1."
 
 #: libexif/exif-tag.c:382
 msgid "YCbCr Coefficients"
@@ -3024,7 +3030,7 @@ msgstr "Ophavsret"
 
 #: libexif/exif-tag.c:445
 msgid "Copyright information. In this standard the tag is used to indicate both the photographer and editor copyrights. It is the copyright notice of the person or organization claiming rights to the image. The Interoperability copyright statement including date and rights should be written in this field; e.g., \"Copyright, John Smith, 19xx. All rights reserved.\". In this standard the field records both the photographer and editor copyrights, with each recorded in a separate part of the statement. When there is a clear distinction between the photographer and editor copyrights, these are to be written in the order of photographer followed by editor copyright, separated by NULL (in this case, since the statement also ends with a NULL, there are two NULL codes) (see example 1). When only the photographer is given, it is terminated by one NULL code (see example 2). When only the editor copyright is given, the photographer copyright part consists of one space followed by a terminating NULL code, then the editor copyright is given (see example 3). When the field is left blank, it is treated as unknown."
-msgstr "Information om ophavsret. I dette standardmærke angives både fotografens og redaktørens ophavsret. Det er ophavsretsoplysningen på personen eller organisationen som hævder at have rettighederne til billedet. Interoperabilityerklæringen for ophavsret inklusiv dato og rettigheder bør skrives i dette felt; for eksempel, »Ophavsret, Kaj Jensen, 19xx. Alle rettigheder forbeholdes.«. Med denne standard registreres både fotografen og redaktøren, hvor hver registreres i en separat del af udsagnet. Når der er en klar adskillelse mellem fotografens og redaktørens ophavsret, skal de skrives i rækkefølge med fotografen først efterfulgt af redaktørens ophavsret, adskilt af NULL (i dette tilfælde, da udsagnet også afsluttes med NULL, er der to NULL-koder) (se eksempel 1). Når kun fotografen er angivet, afsluttes med en NULL-kode (se eksempel 2). Når kun redaktørens rettighed er angivet, består fotografens ophavsretdel af et mellemrum efterfulgt af en afsluttende NULL-kode, derefter er redaktørens ophavsret angivet (se eksempel 3). Når feltet efterlades blankt, behandles oplysningen som ukendt."
+msgstr "Information om ophavsret. I denne standard angives både fotografens og redaktørens ophavsret i samme mærke. Her angives  ophavsretsoplysningen for personen eller organisationen som hævder at have rettighederne til billedet. Interoperabilityerklæringen for ophavsret inklusive dato og rettigheder bør skrives i dette felt; for eksempel, »Ophavsret, Kaj Jensen, 19xx. Alle rettigheder forbeholdes.«. I denne standard registreres både fotografen og redaktøren i samme felt. Når der er en klar forskel på fotografens og redaktørens ophavsret, skal de skrives i rækkefølge med fotografen først efterfulgt af redaktørens ophavsret, adskilt af NULL (da udsagnet også afsluttes med NULL, er der i dette tilfælde to NULL-koder) (se eksempel 1). Når kun fotografen er angivet, afsluttes med en NULL-kode (se eksempel 2). Når kun redaktørens rettighed er angivet, består fotografens ophavsretdel af et mellemrum efterfulgt af en afsluttende NULL-kode, hvorefter redaktørens ophavsret er angivet (se eksempel 3). Når feltet efterlades blankt, behandles oplysningen som ukendt."
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
@@ -3578,7 +3584,7 @@ msgstr "F-Chrome"
 
 #: libexif/fuji/mnote-fuji-entry.c:148
 msgid "F-B&W"
-msgstr "F-S&H"
+msgstr "F-S/H"
 
 #: libexif/fuji/mnote-fuji-entry.c:151
 msgid "No blur"
@@ -3592,10 +3598,12 @@ msgstr "Sløringsadvarsel"
 msgid "Focus good"
 msgstr "God fokus"
 
+# ikke i fokus, ufokuseret
 #: libexif/fuji/mnote-fuji-entry.c:156
 msgid "Out of focus"
-msgstr "Ikke i fokus"
+msgstr "Ude af fokus"
 
+# automatisk eksponenering
 #: libexif/fuji/mnote-fuji-entry.c:159
 msgid "AE good"
 msgstr "God AE"
@@ -3693,11 +3701,11 @@ msgstr "Fokuseringstilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:47
 msgid "Focus Point"
-msgstr ""
+msgstr "Fokuspunkt"
 
 #: libexif/fuji/mnote-fuji-tag.c:48
 msgid "Slow Synchro Mode"
-msgstr ""
+msgstr "Langsom synkroniseringstilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:49
 msgid "Picture Mode"
@@ -3705,15 +3713,15 @@ msgstr "Billedtilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:50
 msgid "Continuous Taking"
-msgstr ""
+msgstr "Fortsat fotografering"
 
 #: libexif/fuji/mnote-fuji-tag.c:51
 msgid "Continuous Sequence Number"
-msgstr ""
+msgstr "Fortsættende sekvensnummer"
 
 #: libexif/fuji/mnote-fuji-tag.c:52
 msgid "FinePix Color"
-msgstr ""
+msgstr "FinePix-farve"
 
 #: libexif/fuji/mnote-fuji-tag.c:53
 msgid "Blur Check"
@@ -3729,19 +3737,19 @@ msgstr "Autobelysningstjek"
 
 #: libexif/fuji/mnote-fuji-tag.c:56
 msgid "Dynamic Range"
-msgstr ""
+msgstr "Dynamisk afstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:57
 msgid "Film Simulation Mode"
-msgstr ""
+msgstr "Filmsimulationtilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:58
 msgid "Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Dynamisk afstand - bredtilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:59
 msgid "Development Dynamic Range Wide Mode"
-msgstr ""
+msgstr "Udvikling - dynamisk afstand - bredtilstand"
 
 #: libexif/fuji/mnote-fuji-tag.c:60
 msgid "Minimum Focal Length"
@@ -3765,7 +3773,7 @@ msgstr "Ordrenummer"
 
 #: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
 msgid "Frame Number"
-msgstr ""
+msgstr "Rammenummer"
 
 #: libexif/olympus/mnote-olympus-entry.c:49
 #, c-format
@@ -3774,19 +3782,19 @@ msgstr "Ugyldig format '%s', forventede 
 
 #: libexif/olympus/mnote-olympus-entry.c:89
 msgid "AF non D Lens"
-msgstr ""
+msgstr "Linser - AF ikke D"
 
 #: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S Lens"
-msgstr ""
+msgstr "Linser - AF-D eller AF-S"
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G Lens"
-msgstr ""
+msgstr "Linser - AF-D G"
 
 #: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR Lens"
-msgstr ""
+msgstr "Linser - AF-D VR"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash unit unknown"
@@ -3802,39 +3810,39 @@ msgstr "Blitz er på et kamera"
 
 #: libexif/olympus/mnote-olympus-entry.c:102
 msgid "VGA Basic"
-msgstr ""
+msgstr "VGA - basis"
 
 #: libexif/olympus/mnote-olympus-entry.c:103
 msgid "VGA Normal"
-msgstr ""
+msgstr "VGA - normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:104
 msgid "VGA Fine"
-msgstr ""
+msgstr "VGA - fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:105
 msgid "SXGA Basic"
-msgstr ""
+msgstr "SXGA - basis"
 
 #: libexif/olympus/mnote-olympus-entry.c:106
 msgid "SXGA Normal"
-msgstr ""
+msgstr "SXGA - normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:107
 msgid "SXGA Fine"
-msgstr ""
+msgstr "SXGA - fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:108
 msgid "2 MPixel Basic"
-msgstr ""
+msgstr "2 MPixel - basis"
 
 #: libexif/olympus/mnote-olympus-entry.c:109
 msgid "2 MPixel Normal"
-msgstr ""
+msgstr "2 MPixel - normal"
 
 #: libexif/olympus/mnote-olympus-entry.c:110
 msgid "2 MPixel Fine"
-msgstr ""
+msgstr "2 Mpixel - fin"
 
 #: libexif/olympus/mnote-olympus-entry.c:113
 msgid "Color"
@@ -3842,11 +3850,11 @@ msgstr "Farve"
 
 #: libexif/olympus/mnote-olympus-entry.c:118
 msgid "Bright+"
-msgstr ""
+msgstr "Klar+"
 
 #: libexif/olympus/mnote-olympus-entry.c:119
 msgid "Bright-"
-msgstr ""
+msgstr "Klar-"
 
 #: libexif/olympus/mnote-olympus-entry.c:120
 msgid "Contrast+"
@@ -4601,7 +4609,7 @@ msgstr "Tæt på linsetrin"
 
 #: libexif/olympus/mnote-olympus-tag.c:166
 msgid "Light Value Center"
-msgstr ""
+msgstr "Let værdicenter"
 
 #: libexif/olympus/mnote-olympus-tag.c:167
 msgid "Light Value Periphery"
@@ -4774,13 +4782,14 @@ msgstr "Levende lys"
 msgid "Natural Skin Tone"
 msgstr "Naturlig hudfarve"
 
+# er vist et navn
 #: libexif/pentax/mnote-pentax-entry.c:190
 msgid "Synchro Sound Record"
-msgstr ""
+msgstr "Synchro Sound Record"
 
 #: libexif/pentax/mnote-pentax-entry.c:191
 msgid "Frame Composite"
-msgstr ""
+msgstr "Rammesammensat"
 
 #: libexif/pentax/mnote-pentax-entry.c:194
 msgid "Auto, Did not fire"
@@ -4820,7 +4829,7 @@ msgstr "Tændt, langsom synkronisering, 
 
 #: libexif/pentax/mnote-pentax-entry.c:205
 msgid "On, Trailing-curtain Sync"
-msgstr ""
+msgstr "Tændt, efterfølgende gardinsynkronisering"
 
 #: libexif/pentax/mnote-pentax-entry.c:212
 msgid "Pan Focus"
@@ -5011,7 +5020,7 @@ msgstr "Hvidbalancetilstand"
 
 #: libexif/pentax/mnote-pentax-tag.c:93
 msgid "World Time Location"
-msgstr ""
+msgstr "Placering af verdenstid"
 
 #: libexif/pentax/mnote-pentax-tag.c:94
 msgid "Hometown City"
@@ -5021,21 +5030,22 @@ msgstr "Hjemmeby"
 msgid "Destination City"
 msgstr "Destinationsby"
 
+# Er der en forkortelse for sommertid på dansk?
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Hometown DST"
-msgstr ""
+msgstr "Sommertid hjemme"
 
 #: libexif/pentax/mnote-pentax-tag.c:96
 msgid "Home Daylight Savings Time"
-msgstr ""
+msgstr "Sommertid hjemme"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination DST"
-msgstr ""
+msgstr "Sommertid destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:97
 msgid "Destination Daylight Savings Time"
-msgstr ""
+msgstr "Sommertid på destination"
 
 #: libexif/pentax/mnote-pentax-tag.c:99
 msgid "Image Processing"
@@ -5115,7 +5125,7 @@ msgstr "Blitzafstand"
 
 #: libexif/pentax/mnote-pentax-tag.c:132
 msgid "Bestshot Mode"
-msgstr ""
+msgstr "Optimal tilstand"
 
 #: libexif/pentax/mnote-pentax-tag.c:133
 msgid "CCS ISO Sensitivity"
@@ -5123,7 +5133,7 @@ msgstr "CCS ISO-følsomhed"
 
 #: libexif/pentax/mnote-pentax-tag.c:135
 msgid "Enhancement"
-msgstr ""
+msgstr "Forbedring"
 
 #: libexif/pentax/mnote-pentax-tag.c:136
 msgid "Finer"

[libexif-cvs] libexif NEWS,1.66,1.67 ChangeLog,1.345,1.346

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9518

Modified Files:
	NEWS ChangeLog 
Log Message:
po/da.po: Updated Danish translation by Joe Hansen
po/sk.po: Updated Slovak translation by Ivan Masár
po/sv.po: Updated Swedish translation by Daniel Nylander


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -d -r1.66 -r1.67
--- NEWS	8 Dec 2009 00:15:45 -0000	1.66
+++ NEWS	31 Dec 2009 04:37:55 -0000	1.67
@@ -1,5 +1,7 @@
 libexif-0.6.x:
-  * Updated translations: da, ja
+  * Updated translations: da, ja, sk, sv
+  * Fixed some problems in the write-exif.c example program
+  * Stop listing -lm as a required library for dynamic linking in libexif.pc
 
 
 libexif-0.6.19 (2009-11-12):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -d -r1.345 -r1.346
--- ChangeLog	18 Dec 2009 02:18:27 -0000	1.345
+++ ChangeLog	31 Dec 2009 04:37:56 -0000	1.346
@@ -1,3 +1,9 @@
+2009-12-30  Dan Fandrich <da...@co...>
+
+	* po/da.po: Updated Danish translation by Joe Hansen
+	* po/sk.po: Updated Slovak translation by Ivan Masár
+	* po/sv.po: Updated Swedish translation by Daniel Nylander
+
 2009-12-17  Dan Fandrich <da...@co...>
 
 	* Don't warn "No thumbnail but entries on thumbnail." unless

[libexif-cvs] libexif-website/static index.html,1.27,1.28

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

Update of /cvsroot/libexif/libexif-website/static
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27212/static

Modified Files:
	index.html 
Log Message:
Updated links


Index: index.html
===================================================================
RCS file: /cvsroot/libexif/libexif-website/static/index.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -d -r1.27 -r1.28
--- index.html	8 Dec 2009 00:14:15 -0000	1.27
+++ index.html	19 Dec 2009 08:59:33 -0000	1.28
@@ -141,7 +141,7 @@ around the world compile the source code
 number of platforms. Here is a list of some of the sites you can look.</p>
 <ul>
 	<li>AIX: <a href="http://www.perzl.org/aix/index.php?n=Main.Libexif">Michael Perzl</a></li>
-	<li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/DragonFly-2.3.2/stable/graphics/?P=*exif-*">DragonFly project</a></li>
+	<li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/i386/DragonFly-2.5.1/stable/graphics/">DragonFly project</a></li>
 
 	<li>FreeBSD: <a href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-current/All/">FreeBSD ports</a></li>
 
@@ -163,14 +163,14 @@ number of platforms. Here is a list of s
 	<a href="http://www.hmug.org/pub/MacOS_X/BSD/Libraries/Graphics/libexif/">HMUG</a></li>
 
 	<li>Solaris: 
-	<a href="http://www.blastwave.org/packages.php/libexif">Blastwave</a>,
-	<a href="http://gnusolaris.intergenia.de/nexenta/dists/elatte-stable/main/binary-solaris-i386/libs/?P=*libexif*">Nexenta</a>,
+	<a href="http://www.blastwave.org/pkg/pkgcontents.ftd?software=libexif&amp;style=brief&amp;state=5&amp;arch=i386">Blastwave</a>,
+	<a href="http://gnusolaris.intergenia.de/nexenta/dists/hardy-unstable/main/binary-solaris-i386/libs/?P=*libexif*">Nexenta</a>,
 	<a href="ftp://ftp.sunfreeware.com/pub/freeware/intel/10/">Sun Freeware</a>
 	</li>
 
 	<li>Windows: 
 	<a href="http://cygwin.com/cgi-bin2/package-grep.cgi?grep=exif-">Cygwin</a>,
-	<a href="http://www.gimp.org/~tml/gimp/win32/downloads.html">GIMP project</a>
+	<!-- a href="http://www.gimp.org/~tml/gimp/win32/downloads.html">GIMP project</a -->
 	</li>
 </ul>
 </li>
@@ -205,7 +205,7 @@ number of platforms. Here is a list of s
       style="border:0;width:88px;height:31px"
       src="http://jigsaw.w3.org/css-validator/images/vcss" 
       alt="Valid CSS!" /></a>
-<span>Last update: 2009-12-07</span>
+<span>Last update: 2009-12-19</span>
 </div>
 
 </body>

[libexif-cvs] libexif/test test-tagtable.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/test
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32260/test

Modified Files:
	test-tagtable.c 
Log Message:
Use the new, clearer EXIF_DATA_TYPE_UNKNOWN definition.


Index: test-tagtable.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-tagtable.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- test-tagtable.c	27 Oct 2009 06:06:11 -0000	1.2
+++ test-tagtable.c	18 Dec 2009 19:30:54 -0000	1.3
@@ -56,7 +56,7 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_NOT_RECORDED)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_PLANAR_CONFIGURATION,
-               EXIF_IFD_0, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_0, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     /*
@@ -93,7 +93,7 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_GPS_VERSION_ID,
-               EXIF_IFD_GPS, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_GPS, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_GPS_VERSION_ID,
@@ -101,12 +101,12 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_NOT_RECORDED)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_GPS_VERSION_ID,
-               EXIF_IFD_0, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_0, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     /* The unused tag 0xffff should NOT be treated specially */
     VALIDATE(exif_tag_get_support_level_in_ifd(0xffff,
-               EXIF_IFD_0, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_0, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(0xffff,
@@ -119,7 +119,7 @@ static int support_level(void)
      * instead of not recorded.
      */
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_DOCUMENT_NAME,
-               EXIF_IFD_0, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_0, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_DOCUMENT_NAME,
@@ -137,7 +137,7 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_INTEROPERABILITY_INDEX,
-               EXIF_IFD_INTEROPERABILITY, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_INTEROPERABILITY, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_INTEROPERABILITY_INDEX,
@@ -145,7 +145,7 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_NOT_RECORDED)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_INTEROPERABILITY_INDEX,
-               EXIF_IFD_0, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_0, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_GPS_LATITUDE_REF,
@@ -153,12 +153,12 @@ static int support_level(void)
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_GPS_LATITUDE_REF,
-               EXIF_IFD_GPS, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_GPS, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_OPTIONAL)
 
     /* The result of an unknown IFD should always be unknown */
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_EXIF_VERSION,
-               EXIF_IFD_COUNT, EXIF_DATA_TYPE_COUNT) == 
+               EXIF_IFD_COUNT, EXIF_DATA_TYPE_UNKNOWN) == 
              EXIF_SUPPORT_LEVEL_UNKNOWN)
 
     VALIDATE(exif_tag_get_support_level_in_ifd(EXIF_TAG_EXIF_VERSION,

[libexif-cvs] libexif ChangeLog,1.344,1.345

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7801

Modified Files:
	ChangeLog 
Log Message:
Don't warn "No thumbnail but entries on thumbnail." unless
there actually are entries.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -d -r1.344 -r1.345
--- ChangeLog	15 Dec 2009 23:26:33 -0000	1.344
+++ ChangeLog	18 Dec 2009 02:18:27 -0000	1.345
@@ -1,3 +1,8 @@
+2009-12-17  Dan Fandrich <da...@co...>
+
+	* Don't warn "No thumbnail but entries on thumbnail." unless
+	  there actually are entries.
+
 2009-12-15  Dan Fandrich <da...@co...>
 
 	* libexif.pc.in: Move -lm flag into Libs.private since it's only

[libexif-cvs] libexif/libexif exif-data.c,1.125,1.126

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7801/libexif

Modified Files:
	exif-data.c 
Log Message:
Don't warn "No thumbnail but entries on thumbnail." unless
there actually are entries.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -p -d -r1.125 -r1.126
--- exif-data.c	26 Nov 2009 05:24:27 -0000	1.125
+++ exif-data.c	18 Dec 2009 02:18:26 -0000	1.126
@@ -1255,7 +1255,7 @@ fix_func (ExifContent *c, void *UNUSED(d
 	case EXIF_IFD_1:
 		if (c->parent->data)
 			exif_content_fix (c);
-		else {
+		else if (c->count) {
 			exif_log (c->parent->priv->log, EXIF_LOG_CODE_DEBUG, "exif-data",
 				  "No thumbnail but entries on thumbnail. These entries have been "
 				  "removed.");

[libexif-cvs] libexif/libexif/fuji mnote-fuji-tag.c,1.8,1.9

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

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1688/fuji

Modified Files:
	mnote-fuji-tag.c 
Log Message:
Only call bindtextdomain if a translated string is being returned.


Index: mnote-fuji-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/mnote-fuji-tag.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- mnote-fuji-tag.c	27 Oct 2009 06:06:11 -0000	1.8
+++ mnote-fuji-tag.c	18 Dec 2009 01:34:26 -0000	1.9
@@ -94,12 +94,12 @@ mnote_fuji_tag_get_description (MnoteFuj
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) {
 			if (!*table[i].description)
 				return "";
-			return (_(table[i].description));
+			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			return _(table[i].description);
 		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif/canon mnote-canon-tag.c,1.19,1.20

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

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1688/canon

Modified Files:
	mnote-canon-tag.c 
Log Message:
Only call bindtextdomain if a translated string is being returned.


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- mnote-canon-tag.c	27 Oct 2009 06:06:11 -0000	1.19
+++ mnote-canon-tag.c	18 Dec 2009 01:34:26 -0000	1.20
@@ -190,12 +190,12 @@ mnote_canon_tag_get_description (MnoteCa
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) {
 			if (!*table[i].description)
 				return "";
-			return (_(table[i].description));
+			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			return _(table[i].description);
 		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif/pentax mnote-pentax-tag.c,1.14,1.15

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

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1688/pentax

Modified Files:
	mnote-pentax-tag.c 
Log Message:
Only call bindtextdomain if a translated string is being returned.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- mnote-pentax-tag.c	27 Oct 2009 06:06:11 -0000	1.14
+++ mnote-pentax-tag.c	18 Dec 2009 01:34:26 -0000	1.15
@@ -164,12 +164,12 @@ mnote_pentax_tag_get_description (MnoteP
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			return (_(table[i].description));
+			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			return _(table[i].description);
 		}
 	return NULL;
 }

[libexif-cvs] libexif/libexif/olympus mnote-olympus-tag.c, 1.22, 1.23

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1688/olympus

Modified Files:
	mnote-olympus-tag.c 
Log Message:
Only call bindtextdomain if a translated string is being returned.


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- mnote-olympus-tag.c	27 Oct 2009 06:06:11 -0000	1.22
+++ mnote-olympus-tag.c	18 Dec 2009 01:34:24 -0000	1.23
@@ -219,12 +219,12 @@ mnote_olympus_tag_get_description (Mnote
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
 		if (table[i].tag == t) {
 			if (!table[i].description || !*table[i].description)
 				return "";
-			return (_(table[i].description));
+			bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+			return _(table[i].description);
 		}
 	return NULL;
 }

[libexif-cvs] libexif-testsuite NEWS,1.19,1.20

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

Update of /cvsroot/libexif/libexif-testsuite
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30528

Modified Files:
	NEWS 
Log Message:
Added check-fixup.sh to test tag data type fixing


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- NEWS	24 Nov 2009 05:31:29 -0000	1.19
+++ NEWS	17 Dec 2009 08:15:28 -0000	1.20
@@ -3,6 +3,7 @@ New in 0.7.x:
   * Added check-add-tags.sh to test correct adding of new tags
   * Added check-create-tags.sh to test correct creation of an EXIF tag block
   * Added check-remove-tags.sh to test correct removal of tags
+  * Added check-fixup.sh to test tag data type fixing
 
 New in 0.7.15:
   * Working with libexif and exif ver. 0.6.19
@@ -10,7 +11,7 @@ New in 0.7.15:
     check-readwrite-identity.sh tests
   * Added --width option to allow more text to be compared
   * Added check-bid37022.sh to test for the fixed libexif heap
-    overflow
+    overflow bug (CVE-2009-3895)
 
 New in 0.7.14:
   * Working with libexif and exif ver. 0.6.18

[libexif-cvs] libexif-testsuite/tests check-fixup.sh, NONE, 1.1 wrong-format.jpg, NONE, 1.1 Makefile.am, 1.30, 1.31

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

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30528/tests

Modified Files:
	Makefile.am 
Added Files:
	check-fixup.sh wrong-format.jpg 
Log Message:
Added check-fixup.sh to test tag data type fixing


--- NEW FILE: wrong-format.jpg ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- Makefile.am	17 Dec 2009 07:09:58 -0000	1.30
+++ Makefile.am	17 Dec 2009 08:15:31 -0000	1.31
@@ -27,6 +27,7 @@ EXTRA_DIST = \
 	check-tag-description.sh \
 	check-add-tags.sh \
 	check-create-tags.sh \
+	check-fixup.sh \
 	check-remove-tags.sh
 
 if HAVE_EXIF_CLI
@@ -42,6 +43,7 @@ check_SCRIPTS = \
 	check-tag-description.sh \
 	check-add-tags.sh \
 	check-create-tags.sh \
+	check-fixup.sh \
 	check-remove-tags.sh
 
 # These check scripts may take a little longer - but are invaluable. :)

--- NEW FILE: check-fixup.sh ---
#!/bin/sh
# Tests the fixup of tag data from the wrong type into the correct type.
# The file wrong-format.jpg contains many tags that have many different,
# incorrect, data types, which are converted into the correct data types
# by libexif.

. check-vars.sh

srcimg="$SRCDIR/wrong-format.jpg"
dstimg="./fixup.out.jpg"
tmpfile="output.tmp"

# Abort on any command failure
set -e

echo Fix up data
# Use --remove of a nonexistent tag to force a rewrite of the file
"$EXIFEXE" -o "$dstimg" --remove --tag=0xbeef "$srcimg"

# Check the resulting EXIF file
env LANG=C LANGUAGE=C "$EXIFEXE" -m -i "$dstimg" >"$tmpfile"
"$DIFFEXE" "$tmpfile" - <<EOF
0x0112	left - bottom
0x011a	72.00
0x011b	72.00
0x011c	planar format
0x0128	Inch
0x0132	2009:12:16 23:30:32
0x0213	centered
0x829a	1/2 sec.
0x9000	Exif Version 2.1
0x9101	Y Cb Cr -
0x9201	0.04 EV (1/1 sec.)
0x9286	Missing the character set
0xa000	FlashPix Version 1.0
0xa001	sRGB
0xa002	64
0xa003	64
0xa403	Manual white balance
0xa406	Night scene
EOF

rm -f "$dstimg" "$tmpfile"

[libexif-cvs] libexif-testsuite/tests image-info.sh, NONE, 1.1 Makefile.am, 1.29, 1.30 check-no-unknown-tags.sh, 1.2, 1.3 check-readwrite-identity.sh, 1.3, 1.4 check-vars.sh.in, 1.2, 1.3

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

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20063

Modified Files:
	Makefile.am check-no-unknown-tags.sh 
	check-readwrite-identity.sh check-vars.sh.in 
Added Files:
	image-info.sh 
Log Message:
Moved functions that determine image characteristics into image-info.sh.
Added functions to return whether images have unsorted or unknown tags so
the tests can work around the problems.


Index: check-vars.sh.in
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-vars.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-vars.sh.in	13 Jan 2009 22:31:46 -0000	1.2
+++ check-vars.sh.in	17 Dec 2009 07:09:58 -0000	1.3
@@ -12,13 +12,5 @@ DIFFEXE=@DIFF@
 # space-separated list of all JPEG images to test
 ALLFILES="$TOPSRCDIR/src/pel-images/*.jpg $SRCDIR/images/*.jpg"
 
-# Function that returns true when the given file contains no EXIF tags
-noexiftags () {
-	# Test images without EXIF tags
-	case "$1" in 
-		 *-thumb* | *no-exif* | *canon-powershot-a400-001.jpg)
-			return 0 # No EXIF tags in this image
-			;;
-	esac
-	return 1 # normal image with EXIF tags
-}
+# Load functions that determine characteristics of the $ALLFILES test images
+. image-info.sh

--- NEW FILE: image-info.sh ---
# Test functions for use within libexif-testsuite tests.
# These functions return characteristics of the various images that form
# a part of the test suite. Each function is called with the file name of
# the image as the only argument and returns a status value of 0 for true or
# 1 for false.

# Function that returns true when the given file contains no EXIF tags
noexiftags () {
	# This line could almost replace this function except that
	# it fails with a few images, and it's a lot slower:
	#file "$1" | grep -v -q "EXIF standard"
	case "$1" in 
		 *-thumb* | *no-exif* | *canon-powershot-a400-001.jpg)
			return 0 # No EXIF tags in this image
			;;
	esac
	return 1 # normal image with EXIF tags
}

# Function that returns true when the given file contains tags that are
# not properly sorted (i.e. the input file is corrupt and not to spec).
unsortedtags () {
	case "$1" in 
		 *Kodak_C310.jpg)
		 	return 0 # Input file has unsorted tags
			;;
	esac
	return 1 # normal image
}

# Function that returns true when the given file contains tags that are
# not recognized by libexif (i.e. the input file is corrupt and not to spec).
unknowntags () {
	case "$1" in 
		 *Panasonic_DMC-G1.jpg)
		 	return 0 # Input file has unknown tags
			;;
	esac
	return 1 # normal image
}

Index: check-readwrite-identity.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-readwrite-identity.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- check-readwrite-identity.sh	13 Nov 2009 07:54:13 -0000	1.3
+++ check-readwrite-identity.sh	17 Dec 2009 07:09:58 -0000	1.4
@@ -72,10 +72,15 @@ do
 	check_result $tmpfile2
 
 	# Compare the tag output of the original and copied files.
-	# A difference here could simply be due to the sort order, which
-	# could be due to the original EXIF file being corrupt.
 	canonicalize "$tmpfile"
 	canonicalize "$tmpfile2"
+	if unsortedtags "${img}"; then
+		# If input file is not to spec and its tags are not sorted,
+		# sort the before and after files so they will compare equal
+		echo Sorting tags on out-of-spec image
+		sort -o "$tmpfile" "$tmpfile"
+		sort -o "$tmpfile2" "$tmpfile2"
+	fi
 	echo -n "Comparing before and after..."
 	"$DIFFEXE" "$tmpfile" "$tmpfile2"
 	check_result

Index: check-no-unknown-tags.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-no-unknown-tags.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-no-unknown-tags.sh	13 Jan 2009 22:31:46 -0000	1.2
+++ check-no-unknown-tags.sh	17 Dec 2009 07:09:58 -0000	1.3
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Run all test images through exif and ensure that all the tags are known.
+# This is as much a test of the images as of exif itself.
 
 . check-vars.sh
 
@@ -36,6 +37,11 @@ do
 		continue # skip image
 	fi
 
+	if unknowntags "$img" ; then
+		echo "Skipping $img due to known, unknown tags"
+		continue # skip image
+	fi
+
 	total_img=$(expr $total_img + 1)
 	echo -n "#${total_img} "
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- Makefile.am	24 Nov 2009 05:31:31 -0000	1.29
+++ Makefile.am	17 Dec 2009 07:09:58 -0000	1.30
@@ -11,6 +11,7 @@ SUBDIRS = images
 
 # check-vars.sh.in is automatically included
 EXTRA_DIST = \
+	image-info.sh \
 	check-exif-executable.sh \
 	check-general-images.sh \
 	check-readwrite-identity.sh \

[libexif-cvs] libexif-testsuite/tests check-tag-description.sh, 1.4, 1.5

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

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12635

Modified Files:
	check-tag-description.sh 
Log Message:
Updated test for new -s behaviour on unknown tags, and -m flag


Index: check-tag-description.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-tag-description.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- check-tag-description.sh	14 Dec 2009 23:52:22 -0000	1.4
+++ check-tag-description.sh	17 Dec 2009 06:17:53 -0000	1.5
@@ -39,20 +39,19 @@ for ifd in GPS Interoperability 0 1 EXIF
 	done
 done
 
+# Test --machine-readable, using first mandatory tag
+env LANG=C LANGUAGE=C "$EXIFEXE" --tag=0x11a --ifd=0 -m -s >>"$tmpfile"
+
 "$DIFFEXE" "$tmpfile" - <<EOF
 Tag 'GPS tag version' (0x0000, 'GPSVersionID'): Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> tag is given in bytes, unlike the <ExifVersion> tag. When the version is 2.0.0.0, the tag value is 02000000.H).
 Tag 'North or South Latitude' (0x0001, 'GPSLatitudeRef'): Indicates whether the latitude is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude.
 Tag 'Interoperability Index' (0x0001, 'InteroperabilityIndex'): Indicates the identification of the Interoperability rule. Use "R98" for stating ExifR98 Rules. Four bytes used including the termination code (NULL). see the separate volume of Recommended Exif Interoperability Rules (ExifR98) for other tags used for ExifR98.
-Tag '' (0x0001, ''): 
 Tag 'Image Width' (0x0100, 'ImageWidth'): The number of columns of image data, equal to the number of pixels per row. In JPEG compressed data a JPEG marker is used instead of this tag.
 Tag 'New Subfile Type' (0x00fe, 'NewSubfileType'): A general indication of the kind of data contained in this subfile.
-Tag '' (0x8769, ''): 
-Tag '' (0xbbbb, ''): 
-Tag '' (0xfffe, ''): 
 Tag 'JPEG Interchange Format' (0x0201, 'JPEGInterchangeFormat'): The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
-Tag '' (0x0201, ''): 
 Tag 'Image Unique ID' (0xa420, 'ImageUniqueID'): This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
 Tag 'Padding' (0xea1c, 'Padding'): This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags.
+0x011a	XResolution	x-Resolution	The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated.
 EOF
 s="$?"
 

[libexif-cvs] exif ChangeLog,1.109,1.110

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

Update of /cvsroot/libexif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12817

Modified Files:
	ChangeLog 
Log Message:
Honour --machine-readable with --show-mnote


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -d -r1.109 -r1.110
--- ChangeLog	11 Dec 2009 08:09:27 -0000	1.109
+++ ChangeLog	16 Dec 2009 23:48:27 -0000	1.110
@@ -1,3 +1,7 @@
+2009-12-16  Dan Fandrich <da...@co...>
+
+	* Honour --machine-readable with --show-mnote
+
 2009-12-11  Dan Fandrich <da...@co...>
 
 	* Fixed a couple of memory leaks

[libexif-cvs] exif/exif exif-i18n.c,1.7,1.8 main.c,1.80,1.81

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

Update of /cvsroot/libexif/exif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12595/exif

Modified Files:
	exif-i18n.c main.c 
Log Message:
Honour --machine-readable with --show-mnote


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- exif-i18n.c	25 Jan 2008 03:34:03 -0000	1.7
+++ exif-i18n.c	16 Dec 2009 23:48:20 -0000	1.8
@@ -21,6 +21,7 @@ exif_i18n_convert_utf8_to_locale (const 
 	 * no way for the app to know the encoding of the translated text).
 	 * In this case, assume the translated text is in UTF-8 (which could
 	 * be wrong) and use iconv to convert to the proper encoding.
+	 * This is only an issue with really old gettext versions.
 	 */
 	static iconv_t tr = 0;
 	size_t t = (in ? strlen (in) : 0);

Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -d -r1.80 -r1.81
--- main.c	11 Dec 2009 08:09:29 -0000	1.80
+++ main.c	16 Dec 2009 23:48:20 -0000	1.81
@@ -315,20 +315,35 @@ main (int argc, const char **argv)
 		return 0;
 	}
 	if (show_description) {
-		/*
-		 * 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 (p.tag, p.ifd)));
-		printf (_("(0x%04x, '%s'): "), p.tag,
-			C(exif_tag_get_name_in_ifd (p.tag, p.ifd)));
-		printf ("%s\n",
-			C(exif_tag_get_description_in_ifd (p.tag, p.ifd)));
+		int rc = 0;
+		const char *name = exif_tag_get_name_in_ifd (p.tag, p.ifd);
+		if (!name) {
+			exif_log (log, -1, "exif", _("Unknown tag"));
+			rc = 1;
+
+		} else if (p.machine_readable) {
+			/*
+			 * The C() macro can point to a static buffer so these printfs
+			 * must be done separately.
+			 */
+			printf ("0x%04x\t%s\t", p.tag,
+				C(exif_tag_get_name_in_ifd (p.tag, p.ifd)));
+			printf ("%s\t", C(exif_tag_get_title_in_ifd (p.tag, p.ifd)));
+			printf ("%s\n",
+				C(exif_tag_get_description_in_ifd (p.tag, p.ifd)));
+
+		} else {
+			printf (_("Tag '%s' "),
+				C(exif_tag_get_title_in_ifd (p.tag, p.ifd)));
+			printf (_("(0x%04x, '%s'): "), p.tag,
+				C(exif_tag_get_name_in_ifd (p.tag, p.ifd)));
+			printf ("%s\n",
+				C(exif_tag_get_description_in_ifd (p.tag, p.ifd)));
+		}
 
 		exif_log_free (log);
 		poptFreeContext (ctx);
-		return 0;
+		return rc;
 	}
 
 	/* Commands related to files */

[libexif-cvs] exif NEWS,1.43,1.44

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

Update of /cvsroot/libexif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12595

Modified Files:
	NEWS 
Log Message:
Honour --machine-readable with --show-mnote


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -d -r1.43 -r1.44
--- NEWS	11 Dec 2009 08:09:27 -0000	1.43
+++ NEWS	16 Dec 2009 23:48:18 -0000	1.44
@@ -4,7 +4,7 @@ exif-0.6.x:
   * Fixed crash when not enough components were given to --set-value
   * Made --set-value more forgiving of whitespace
   * Allow --set-value on UNDEFINED tags (treating them as byte arrays)
-  * Honour --machine-readable with --show-mnote
+  * Honour --machine-readable with --show-mnote and --show-description
 
 
 exif-0.6.19 (2009-11-12):

[libexif-cvs] libexif ChangeLog,1.343,1.344 libexif.pc.in,1.3,1.4

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20661

Modified Files:
	ChangeLog libexif.pc.in 
Log Message:
libexif.pc.in: Move -lm flag into Libs.private since it's only
needed when statically linking. A future enhancement would be to
make even this dependent on the check for -lm done in configure.


Index: libexif.pc.in
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- libexif.pc.in	17 May 2007 14:57:25 -0000	1.3
+++ libexif.pc.in	15 Dec 2009 23:26:33 -0000	1.4
@@ -7,5 +7,6 @@ Name: libexif
 Description: Library for easy access to EXIF data
 Requires:
 Version: @VERSION@
-Libs: -L${libdir} -lexif -lm
+Libs: -L${libdir} -lexif
+Libs.private: -lm
 Cflags: -I${includedir}

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -p -d -r1.343 -r1.344
--- ChangeLog	11 Dec 2009 08:13:17 -0000	1.343
+++ ChangeLog	15 Dec 2009 23:26:33 -0000	1.344
@@ -1,3 +1,9 @@
+2009-12-15  Dan Fandrich <da...@co...>
+
+	* libexif.pc.in: Move -lm flag into Libs.private since it's only
+	  needed when statically linking. A future enhancement would be to
+	  make even this dependent on the check for -lm done in configure.
+
 2009-12-11  Dan Fandrich <da...@co...>
 
 	* Added tag 0xEA1C, the Padding tag from the Microsoft HD Photo

[libexif-cvs] libexif-testsuite/tests check-tag-description.sh, 1.3, 1.4

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

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11432

Modified Files:
	check-tag-description.sh 
Log Message:
Changed to test the new last tag in the table.


Index: check-tag-description.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-tag-description.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- check-tag-description.sh	19 Nov 2009 01:44:17 -0000	1.3
+++ check-tag-description.sh	14 Dec 2009 23:52:22 -0000	1.4
@@ -29,7 +29,7 @@ TESTTAGS_1="0x0201"             # only e
 
 TESTTAGS_EXIF=$TESTTAGS_EXIF" 0x0201" # only exists in IFD 1, not EXIF IFD
 TESTTAGS_EXIF=$TESTTAGS_EXIF" 0xa420" # last in table associated with an IFD
-TESTTAGS_EXIF=$TESTTAGS_EXIF" 0xc4a5" # last in table (not associated with IFD)
+TESTTAGS_EXIF=$TESTTAGS_EXIF" 0xea1c" # last in table (not associated with IFD)
 
 for ifd in GPS Interoperability 0 1 EXIF; do
 	TESTTAGS=`eval echo \\$TESTTAGS_${ifd}`
@@ -52,7 +52,7 @@ Tag '' (0xfffe, ''): 
 Tag 'JPEG Interchange Format' (0x0201, 'JPEGInterchangeFormat'): The offset to the start byte (SOI) of JPEG compressed thumbnail data. This is not used for primary image JPEG data.
 Tag '' (0x0201, ''): 
 Tag 'Image Unique ID' (0xa420, 'ImageUniqueID'): This tag indicates an identifier assigned uniquely to each image. It is recorded as an ASCII string equivalent to hexadecimal notation and 128-bit fixed length.
-Tag 'PRINT Image Matching' (0xc4a5, 'PrintImageMatching'): Related to Epson's PRINT Image Matching technology
+Tag 'Padding' (0xea1c, 'Padding'): This tag reserves space that can be reclaimed later when additional metadata are added. New metadata can be written in place by replacing this tag with a smaller data element and using the reclaimed space to store the new or expanded metadata tags.
 EOF
 s="$?"
 

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.h, 1.11, 1.12

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31772/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.h 
Log Message:
Use the proper enum type for the version member


Index: exif-mnote-data-olympus.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- exif-mnote-data-olympus.h	27 Oct 2009 06:06:11 -0000	1.11
+++ exif-mnote-data-olympus.h	11 Dec 2009 08:19:26 -0000	1.12
@@ -46,8 +46,7 @@ struct _ExifMnoteDataOlympus {
 
 	ExifByteOrder order;
 	unsigned int offset;
-	/* 0: Olympus; 1: Nikon v1; 2: Nikon v2 */
-	int version;
+	enum OlympusVersion version;
 };
 
 ExifMnoteData *exif_mnote_data_olympus_new (ExifMem *);

[libexif-cvs] libexif/libexif exif-content.c,1.34,1.35

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28052/libexif

Modified Files:
	exif-content.c 
Log Message:
Minor speedup in exif_content_get_ifd()


Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- exif-content.c	27 Oct 2009 07:05:42 -0000	1.34
+++ exif-content.c	11 Dec 2009 08:14:13 -0000	1.35
@@ -236,9 +236,9 @@ exif_content_get_ifd (ExifContent *c)
 	if (!c || !c->parent) return EXIF_IFD_COUNT;
 
 	return 
+		((c)->parent->ifd[EXIF_IFD_EXIF] == (c)) ? EXIF_IFD_EXIF :
 		((c)->parent->ifd[EXIF_IFD_0] == (c)) ? EXIF_IFD_0 :
 		((c)->parent->ifd[EXIF_IFD_1] == (c)) ? EXIF_IFD_1 :
-		((c)->parent->ifd[EXIF_IFD_EXIF] == (c)) ? EXIF_IFD_EXIF :
 		((c)->parent->ifd[EXIF_IFD_GPS] == (c)) ? EXIF_IFD_GPS :
 		((c)->parent->ifd[EXIF_IFD_INTEROPERABILITY] == (c)) ? EXIF_IFD_INTEROPERABILITY :
 		EXIF_IFD_COUNT;