libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif exif-content.c,1.21,1.22

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

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

Modified Files:
	exif-content.c 
Log Message:
Fixed some typos in messages.


Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -d -r1.21 -r1.22
--- exif-content.c	26 Jun 2007 02:16:31 -0000	1.21
+++ exif-content.c	30 Oct 2007 04:15:15 -0000	1.22
@@ -267,7 +267,7 @@ exif_content_fix (ExifContent *c)
 			e = exif_content_get_entry (c, t);
 			if (!e) break;
 			exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
-					"Tag '%s' is not recoreded in IFD '%s' and has therefore been "
+					"Tag '%s' is not recorded in IFD '%s' and has therefore been "
 					"removed.", exif_tag_get_name_in_ifd (t, ifd),
 					exif_ifd_get_name (ifd));
 			exif_content_remove_entry (c, e);

[libexif-cvs] libexif/libexif exif-data.c, 1.98, 1.99 exif-format.c, 1.14, 1.15 exif-ifd.c, 1.5, 1.6

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

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

Modified Files:
	exif-data.c exif-format.c exif-ifd.c 
Log Message:
Fixed some typos in messages.
Made some structs const.


Index: exif-ifd.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-ifd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- exif-ifd.c	10 Nov 2004 18:53:39 -0000	1.5
+++ exif-ifd.c	30 Oct 2007 03:23:28 -0000	1.6
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 
-static struct {
+static const struct {
 	ExifIfd ifd;
 	const char *name;
 } ExifIfdTable[] = {

Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- exif-format.c	2 May 2005 19:29:14 -0000	1.14
+++ exif-format.c	30 Oct 2007 03:23:28 -0000	1.15
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-static struct {
+static const struct {
         ExifFormat format;
 	const char *name;
         unsigned char size;

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -d -r1.98 -r1.99
--- exif-data.c	27 Jun 2007 11:14:35 -0000	1.98
+++ exif-data.c	30 Oct 2007 03:23:28 -0000	1.99
@@ -318,7 +318,7 @@ if ((i) == ifd) {				\
 }							\
 if (data->ifd[(i)]->count) {				\
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG,	\
-		"ExifData", "Attemt to load IFD "	\
+		"ExifData", "Attempt to load IFD "	\
 		"'%s' multiple times detected. "	\
 		"Skipping...",				\
 		exif_ifd_get_name (i));			\
@@ -1120,7 +1120,7 @@ exif_data_get_log (ExifData *data)
 	return data->priv->log;
 }
 
-static struct {
+static const struct {
 	ExifDataOption option;
 	const char *name;
 	const char *description;

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.33, 1.34 mnote-olympus-tag.c, 1.12, 1.13

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

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

Modified Files:
	mnote-olympus-entry.c mnote-olympus-tag.c 
Log Message:
Fixed some typos in messages.
Made some structs const.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -d -r1.33 -r1.34
--- mnote-olympus-entry.c	26 Jun 2007 02:31:42 -0000	1.33
+++ mnote-olympus-entry.c	30 Oct 2007 03:23:29 -0000	1.34
@@ -63,7 +63,7 @@
 	}                                                               \
 }
 
-static struct {
+static const struct {
 	ExifTag tag;
     ExifFormat fmt;
 	struct {

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- mnote-olympus-tag.c	11 May 2007 06:22:44 -0000	1.12
+++ mnote-olympus-tag.c	30 Oct 2007 03:23:29 -0000	1.13
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-static struct {
+static const struct {
 	MnoteOlympusTag tag;
 	const char *name;
 	const char *title;
@@ -43,7 +43,7 @@ static struct {
 	{MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), ""},
 	{MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), ""},
 	{MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), ""},
-	{MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine ajustment"), ""},
+	{MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine adjustment"), ""},
 	{MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("Whitebalance RB"), ""},
 	{MNOTE_NIKON_TAG_UNKNOWN_0X000D,  NULL, NULL, NULL},
 	{MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("Isoselection"), ""},

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.12, 1.13 mnote-pentax-tag.c, 1.7, 1.8

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

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

Modified Files:
	mnote-pentax-entry.c mnote-pentax-tag.c 
Log Message:
Fixed some typos in messages.
Made some structs const.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- mnote-pentax-tag.c	13 May 2007 19:21:47 -0000	1.7
+++ mnote-pentax-tag.c	30 Oct 2007 03:23:29 -0000	1.8
@@ -25,7 +25,7 @@
 
 #include <libexif/i18n.h>
 
-static struct {
+static const struct {
 	MnotePentaxTag tag;
 	const char *name;
 	const char *title;

Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- mnote-pentax-entry.c	24 May 2007 06:47:14 -0000	1.12
+++ mnote-pentax-entry.c	30 Oct 2007 03:23:29 -0000	1.13
@@ -65,7 +65,7 @@
 	}                                                               \
 }
 
-static struct {
+static const struct {
 	ExifTag tag;
 	struct {
 		int index;
@@ -263,7 +263,7 @@ static struct {
 };
 
 /* Two-component values */
-static struct {
+static const struct {
 	ExifTag tag;
 	struct {
 		int index1, index2;

[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c, 1.23, 1.24 mnote-canon-tag.c, 1.13, 1.14

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

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

Modified Files:
	mnote-canon-entry.c mnote-canon-tag.c 
Log Message:
Fixed some typos in messages.
Made some structs const.


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- mnote-canon-tag.c	12 Sep 2007 05:46:23 -0000	1.13
+++ mnote-canon-tag.c	30 Oct 2007 03:23:29 -0000	1.14
@@ -25,7 +25,7 @@
 
 #include <libexif/i18n.h>
 
-static struct {
+static const struct {
 	MnoteCanonTag tag;
 	const char *name;
 	const char *title;
@@ -45,7 +45,7 @@ static struct {
 	{0, NULL, NULL, NULL}
 };
 
-static struct {
+static const struct {
 	MnoteCanonTag tag;
 	unsigned int subtag;
 	const char *name;

Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- mnote-canon-entry.c	12 Sep 2007 05:46:23 -0000	1.23
+++ mnote-canon-entry.c	30 Oct 2007 03:23:29 -0000	1.24
@@ -67,10 +67,10 @@
 
 #define UNDEFINED 0xFF
     
-static struct canon_entry_table_t {
+static const struct canon_entry_table_t {
   unsigned int subtag;
   ExifShort value;
-  char *name;
+  const char *name;
 } entries_settings_1 [] = {
   { 0,  1, N_("Macro")},
   { 0,  2, N_("Normal")},
@@ -425,7 +425,7 @@ color_information [] = {
 };
 
 static void
-canon_search_table_value (struct canon_entry_table_t table[],
+canon_search_table_value (const struct canon_entry_table_t table[],
     unsigned int t, ExifShort vs, char *val, unsigned int maxlen)
 {
 	unsigned int j;
@@ -447,7 +447,7 @@ canon_search_table_value (struct canon_e
 }
 
 static void
-canon_search_table_bitfield (struct canon_entry_table_t table[],
+canon_search_table_bitfield (const struct canon_entry_table_t table[],
     unsigned int t, ExifShort vs, char *val, unsigned int maxlen)
 {
 	unsigned int j;

[libexif-cvs] libexif configure.ac,1.37,1.38

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

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

Modified Files:
	configure.ac 
Log Message:
Moved the AM_PO_SUBDIRS macro before AM_GNU_GETTEXT to avoid an error
with gettext 0.16.1 and automake 1.10


Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -d -r1.37 -r1.38
--- configure.ac	14 Aug 2007 19:54:04 -0000	1.37
+++ configure.ac	30 Oct 2007 02:46:54 -0000	1.38
@@ -153,11 +153,11 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [
 # i18n support
 # ---------------------------------------------------------------------------
 ALL_LINGUAS="cs de es fr pl ru sk vi"
+AM_PO_SUBDIRS
 GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}],
                 [Lutz Mueller and others])
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
-AM_PO_SUBDIRS()
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 

[libexif-cvs] libexif/doc Makefile.am,1.14,1.15

[Hans U. N. <hu...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Handle installation of API docs with lots of long filenames

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- Makefile.am	14 Aug 2007 19:55:14 -0000	1.14
+++ Makefile.am	17 Oct 2007 02:58:49 -0000	1.15
@@ -13,8 +13,9 @@ DOXYGEN_CLEAN_TARGETS =
 
 DOXYGEN_TARBALLS =
 
-# FIXME: Depending on the source files would be sufficient.
-#        Depending on libexif.la works at least, however.
+# FIXME: Depending on the source files would be sufficient, but only
+#        maintainable with a completely non-recursive build.
+#        Depending on libexif.la works at least.
 $(top_builddir)/libexif/libexif.la:
 	cd $(top_builddir)/libexif && $(MAKE) libexif.la
 
@@ -46,33 +47,31 @@ $(HTML_APIDOC_INTERNALS_DIR).tar.gz: $(H
 
 DOXYGEN_INSTALL_TARGETS += install-apidocs-internals
 install-apidocs-internals: $(HTML_APIDOC_INTERNALS_DIR).stamp
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
-	$(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)/
+	mkdir -p "$(DESTDIR)$(docdir)"
+	find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)" \
+		\( -type d -exec chmod 0755 {} \; \) -or \
+		\( -type f -exec chmod 0644 {} \; \)
+	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_INTERNALS_DIR)") \
+		| (cd "$(DESTDIR)$(docdir)" && tar xpf -)
 
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs-internals
 uninstall-apidocs-internals:
-	if cd "$(DESTDIR)$(docdir)"; then \
-		rm -f "$(DOC_APIDOC_INTERNALS_HTML)/"*; \
-		rmdir "$(DOC_APIDOC_INTERNALS_HTML)"; \
-	fi;:
+	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_INTERNALS_DIR)"
 
 endif
 
-# Directory names used while installing
-DOC_APIDOC_HTML = api.html
-DOC_APIDOC_INTERNALS_HTML = internals.html
-
 DOXYGEN_INSTALL_TARGETS += install-apidocs
 install-apidocs: $(HTML_APIDOC_DIR).stamp
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
-	$(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/
+	mkdir -p "$(DESTDIR)$(docdir)"
+	find "$(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)" \
+		\( -type d -exec chmod 0755 {} \; \) -or \
+		\( -type f -exec chmod 0644 {} \; \)
+	(unset CDPATH; cd "$(DOXYGEN_OUTPUT_DIR)" && tar cpf - "$(HTML_APIDOC_DIR)") \
+		| (cd "$(DESTDIR)$(docdir)" && tar xpf -)
 
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs
 uninstall-apidocs:
-	if cd "$(DESTDIR)$(docdir)"; then \
-		rm -f "$(DOC_APIDOC_HTML)/"*; \
-		rmdir "$(DOC_APIDOC_HTML)"; \
-	fi;:
+	rm -rf "$(DESTDIR)$(docdir)/$(HTML_APIDOC_DIR)"
 
 DOXYGEN_CLEAN_TARGETS += clean-apidocs
 clean-apidocs:

[libexif-cvs] libexif/po nl.po, NONE, 1.1 sv.po, NONE, 1.1 sk.po, 1.9, 1.10

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

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

Modified Files:
	sk.po 
Added Files:
	nl.po sv.po 
Log Message:
Updates from the Translation Project:
1) Added Dutch and Swedish translations
2) Updated Slovak translation


--- NEW FILE: sv.po ---
# Swedish translation for libexif
# Copyright (C) 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the libexif package.
# Daniel Nylander <po...@da...>, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: libexif 0.6.16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-06-12 15:13+0200\n"
"PO-Revision-Date: 2007-08-29 08:37+0100\n"
"Last-Translator: Daniel Nylander <po...@da...>\n"
"Language-Team: Swedish <tp...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: libexif/canon/mnote-canon-entry.c:40
#: libexif/olympus/mnote-olympus-entry.c:37
[...3651 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 ""

#: 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 ""

Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sk.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- sk.po	14 Aug 2007 19:52:43 -0000	1.9
+++ sk.po	12 Sep 2007 06:01:24 -0000	1.10
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 01:50+0200\n"
-"PO-Revision-Date: 2007-08-09 13:05+0100\n"
+"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"PO-Revision-Date: 2007-08-23 17:05+0100\n"
 "Last-Translator: Ivan Masár <he...@ce...>\n"
 "Language-Team: Slovak <sk...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Neplatný počet zložiek (%i, b
[...2712 lines suppressed...]
+#: libexif/pentax/mnote-pentax-entry.c:353
+#, c-format
+msgid "Internal error (unknown value %i)"
+msgstr "Vnútorná chyba (neznáma hodnota %i)"
+
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"
@@ -4502,10 +3872,4 @@ msgstr "režim najlepšieho snímku"
 
 #: 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 ""
-
-#~ msgid "Internal error."
-#~ msgstr "Vnútorná chyba."
-
-#~ msgid "Internal error (unknown value %i)."
-#~ msgstr "Vnútorná chyba (neznáma hodnota %i)."
+msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]"

--- NEW FILE: nl.po ---
# translation of libexif-0.6.16.po to Dutch
# Copyright (C) YEAR Lutz Mueller and others
# This file is distributed under the same license as the PACKAGE package.
#
# Freek de Kruijf <f.d...@he...>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: libexif-0.6.16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-06-12 15:13+0200\n"
"PO-Revision-Date: 2007-08-26 19:48+0200\n"
"Last-Translator: Freek de Kruijf <f.d...@he...>\n"
"Language-Team: Dutch <ver...@vr...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
"Plural-Forms:  nplurals=2; plural=(n != 1);\n"

[...3652 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 ""

#: 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 ChangeLog,1.248,1.249 NEWS,1.26,1.27

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

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

Modified Files:
	ChangeLog NEWS 
Log Message:
* Enhancements to Canon makernote parsers submitted by Thorsten Kukuk
* Added Dutch and Swedish translations, updated Slovak translation


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -d -r1.26 -r1.27
--- NEWS	16 Aug 2007 19:53:21 -0000	1.26
+++ NEWS	12 Sep 2007 06:03:31 -0000	1.27
@@ -1,9 +1,11 @@
 libexif-0.6.16.2:
   * Updated translations: de, pl, sk, vi
+  * New translations: nl, se
   * Bug fixes: #1773810, #1774626
+  * Enhanced support of Canon makernotes 
 
 
-libexif-0.6.16 (2007-06-12):
+libexif-0.6.16 (2007-06-12) since 0.6.1.15 (2007-05-23):
   * Security fix: CVE-2006-4168 aka IDEF1514.
   * Updated translations: cz, pl, vi
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -d -r1.248 -r1.249
--- ChangeLog	16 Aug 2007 19:53:21 -0000	1.248
+++ ChangeLog	12 Sep 2007 06:03:31 -0000	1.249
@@ -1,3 +1,8 @@
+2007-09-12  Jan Patera <pa...@us...>
+
+	* Enhancements to Canon makernote parsers submitted by Thorsten Kukuk
+	* Added Dutch and Swedish translations, updated Slovak translation
+
 2007-08-16  Jan Patera <pa...@us...>
 
 	* exif-mnote-data-olympus.c: Fix of bugs #1773810, #1774626, gnome bug #466044:

[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c, 1.22, 1.23 mnote-canon-tag.c, 1.12, 1.13 mnote-canon-tag.h, 1.4, 1.5

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

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

Modified Files:
	mnote-canon-entry.c mnote-canon-tag.c mnote-canon-tag.h 
Log Message:
Enhancements submitted by Thorsten Kukuk


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- mnote-canon-tag.c	9 May 2007 06:15:23 -0000	1.12
+++ mnote-canon-tag.c	12 Sep 2007 05:46:23 -0000	1.13
@@ -39,6 +39,7 @@ static struct {
 	{MNOTE_CANON_TAG_FIRMWARE, "FirmwareVersion", N_("Firmware version"), ""},
 	{MNOTE_CANON_TAG_IMAGE_NUMBER, "ImageNumber", N_("Image number"), ""},
 	{MNOTE_CANON_TAG_OWNER, "OwnerName", N_("Owner name"), ""},
+	{MNOTE_CANON_TAG_COLOR_INFORMATION, "ColorInformation", N_("Color information"), ""},
 	{MNOTE_CANON_TAG_SERIAL_NUMBER, "SerialNumber", N_("Serial number"), ""},
 	{MNOTE_CANON_TAG_CUSTOM_FUNCS, "CustomFunctions", N_("Custom functions"), ""},
 	{0, NULL, NULL, NULL}
@@ -55,6 +56,7 @@ static struct {
 	{MNOTE_CANON_TAG_SETTINGS_1,  3, N_("Flash mode")},
 	{MNOTE_CANON_TAG_SETTINGS_1,  4, N_("Drive mode")},
 	{MNOTE_CANON_TAG_SETTINGS_1,  6, N_("Focus mode")},
+	{MNOTE_CANON_TAG_SETTINGS_1,  8, N_("Record mode")},
 	{MNOTE_CANON_TAG_SETTINGS_1,  9, N_("Image size")},
 	{MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Easy shooting mode")},
 	{MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Digital zoom")},
@@ -113,6 +115,10 @@ static struct {
 	{MNOTE_CANON_TAG_SETTINGS_2, 32, N_("Manual flash output")},
 	{MNOTE_CANON_TAG_PANORAMA, 2, N_("Panorama frame")},
 	{MNOTE_CANON_TAG_PANORAMA, 5, N_("Panorama direction")},
+	{MNOTE_CANON_TAG_COLOR_INFORMATION, 0, N_("Tone curve")},
+	{MNOTE_CANON_TAG_COLOR_INFORMATION, 2, N_("Sharpness frequency")},
+	{MNOTE_CANON_TAG_COLOR_INFORMATION, 7, N_("White balance")},
+	{MNOTE_CANON_TAG_COLOR_INFORMATION, 9, N_("Picture style")},
 	{0, 0, NULL}
 };
 

Index: mnote-canon-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -d -r1.4 -r1.5
--- mnote-canon-tag.h	9 May 2007 06:15:23 -0000	1.4
+++ mnote-canon-tag.h	12 Sep 2007 05:46:23 -0000	1.5
@@ -41,7 +41,8 @@ enum _MnoteCanonTag {
 	MNOTE_CANON_TAG_UNKNOWN_10	= 0xa,
 	MNOTE_CANON_TAG_SERIAL_NUMBER	= 0xc,
 	MNOTE_CANON_TAG_UNKNOWN_13	= 0xd,
-	MNOTE_CANON_TAG_CUSTOM_FUNCS	= 0xf
+	MNOTE_CANON_TAG_CUSTOM_FUNCS	= 0xf,
+	MNOTE_CANON_TAG_COLOR_INFORMATION = 0xa0
 };
 typedef enum _MnoteCanonTag MnoteCanonTag;
 

Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- mnote-canon-entry.c	11 May 2007 02:45:41 -0000	1.22
+++ mnote-canon-entry.c	12 Sep 2007 05:46:23 -0000	1.23
@@ -96,179 +96,222 @@ static struct canon_entry_table_t {
   { 6,  0, N_("One-shot AF")},
   { 6,  1, N_("AI servo AF")},
   { 6,  2, N_("AI focus AF")},
-  { 6,  3, N_("Manual focus")}, 
+  { 6,  3, N_("Manual focus")},
   { 6,  4, N_("Single")},
   { 6,  5, N_("Continuous")},
   { 6,  6, N_("Manual focus")},
-  { 6,  16, N_("Pan focus")},  
+  { 6,  16, N_("Pan focus")},
+  { 8,  1, N_("JPEG")},
+  { 8,  2, N_("CRW+THM")},
+  { 8,  3, N_("AVI+THM")},
+  { 8,  4, N_("TIF")},
+  { 8,  5, N_("TIF+JPEG")},
+  { 8,  6, N_("CR2")},
+  { 8,  7, N_("CR2+JPEG")},
   { 9,  0, N_("Large")},
   { 9,  1, N_("Medium")},
   { 9,  2, N_("Small")},
   { 9,  5, N_("Medium 1")},
   { 9,  6, N_("Medium 2")},
-  { 9,  7, N_("Medium 3")},  
+  { 9,  7, N_("Medium 3")},
+  { 9,  8, N_("Postcard")},
+  { 9,  9, N_("Widescreen")},
   {10,  0, N_("Full auto")},
-	{10,  1, N_("Manual")},
-	{10,  2, N_("Landscape")},
-	{10,  3, N_("Fast shutter")},
-	{10,  4, N_("Slow shutter")},
-	{10,  5, N_("Night")},
-	{10,  6, N_("Grayscale")},
-	{10,  7, N_("Sepia")},
-	{10,  8, N_("Portrait")},
-	{10,  9, N_("Sports")},
-	{10, 10, N_("Macro")},
-	{10, 11, N_("Black & white")},
-	{10, 12, N_("Pan focus")},
-	{10, 13, N_("Vivid")},
-	{10, 14, N_("Neutral")},
-	{10, 15, N_("Flash off")},
-	{10, 16, N_("Long shutter")},
-	{10, 17, N_("Super macro")},
-	{10, 18, N_("Foliage")},
-	{10, 19, N_("Indoor")},
-	{10, 20, N_("Fireworks")},
-	{10, 21, N_("Beach")},
-	{10, 22, N_("Underwater")},
-	{10, 23, N_("Snow")},
-	{10, 24, N_("Kids & pets")},
-	{10, 25, N_("Night snapshot")},
-	{10, 26, N_("Digital macro")},
-	{10, 27, N_("My colors")},
-	{10, 28, N_("Still image")},
-	{11, 0, N_("None")},
-	{11, 1, N_("2x")},
-	{11, 2, N_("4x")},
-	{11, 3, N_("Other")},
-	{12, 0x0000, N_("Normal")},
-	{12, 0x0001, N_("High")},
-	{12, 0xffff, N_("Low")},
-	{13, 0x0000, N_("Normal")},
-	{13, 0x0001, N_("High")},
-	{13, 0xffff, N_("Low")},
-	{14, 0x0000, N_("Normal")},
-	{14, 0x0001, N_("High")},
-	{14, 0xffff, N_("Low")},
-	{15, 14, N_("Auto high")},
-	{15, 15, N_("Auto")},
-	{15, 16, N_("50")},
-	{15, 17, N_("100")},
-	{15, 18, N_("200")},
-	{15, 19, N_("400")},
-	{15, 20, N_("800")},
-	{16,  0, N_("Default")},
-	{16,  1, N_("Spot")},
-	{16,  2, N_("Average")},	
-	{16,  3, N_("Evaluative")},
-	{16,  4, N_("Partial")},
-	{16,  5, N_("Center-weighted average")},
-	{17,  0, N_("Manual")},
-	{17,  1, N_("Auto")},
-	{17,  2, N_("Not known")},
-	{17,  3, N_("Macro")},
-	{17,  4, N_("Very close")},
-	{17,  5, N_("Close")},
-	{17,  6, N_("Middle range")},
-	{17,  7, N_("Far range")},
-	{17,  8, N_("Pan focus")},
-	{17,  9, N_("Super macro")},
-	{17,  10, N_("Infinity")},
-	{18, 0x2005, N_("Manual AF point selection")},
-	{18, 0x3000, N_("None (MF)")},
-	{18, 0x3001, N_("Auto-selected")},
-	{18, 0x3002, N_("Right")},
-	{18, 0x3003, N_("Center")},
-	{18, 0x3004, N_("Left")},
-	{18, 0x4001, N_("Auto AF point selection")},
-	{19,  0, N_("Easy shooting")},
-	{19,  1, N_("Program")},
-	{19,  2, N_("Tv-priority")},
-	{19,  3, N_("Av-priority")},
-	{19,  4, N_("Manual")},
-	{19,  5, N_("A-DEP")},
-	{19,  6, N_("M-DEP")},
-	{21, 0x001, N_("Canon EF 50mm f/1.8")},
-	{21, 0x002, N_("Canon EF 28mm f/2.8")},
-	{21, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")},
-	{21, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")},
-	{21, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")},
-	{21, 0x011, N_("Canon EF 35mm f/2")},
-	{21, 0x013, N_("Canon EF 15mm f/2.8")},
-	{21, 0x021, N_("Canon EF 80-200mm f/2.8L")},
-	{21, 0x026, N_("Cosina 100mm f/3.5 Macro AF")},
-	{21, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")},
-	{21, 0x029, N_("Canon EF 50mm f/1.8 MkII")},
-	{21, 0x039, N_("Canon EF 75-300mm f/4-5.6")},
-	{21, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")},
-	{21, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")},
-	{21, 0x125, N_("Canon TS-E 24mm f/3.5L")},
-	{21, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")},
-	{21, 0x135, N_("Canon EF 200mm f/1.8L")},
-	{21, 0x136, N_("Canon EF 300mm f/2.8L")},
-	{21, 0x139, N_("Canon EF 400mm f/2.8L")},
-	{21, 0x141, N_("Canon EF 500mm f/4.5L")},
-	{21, 0x149, N_("Canon EF 100mm f/2")},
-	{21, 0x150, N_("Sigma 20mm EX f/1.8")},
-	{21, 0x151, N_("Canon EF 200mm f/2.8L")},
-	{21, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")},
-	{21, 0x155, N_("Canon EF 85mm f/1.8 USM")},
-	{21, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")},
-	{21, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")},
-	{21, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")},
-	{21, 0x165, N_("Canon EF 70-200mm f/2.8 L")},
-	{21, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")},
-	{21, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")},
-	{21, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")},
-	{21, 0x170, N_("Canon EF 200mm f/2.8L II")},
-	{21, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")},
-	{21, 0x174, N_("Canon EF 135mm f/2L")},
-	{21, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")},
-	{21, 0x177, N_("Canon EF 300mm f/4L IS")},
-	{21, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")},
-	{21, 0x180, N_("Canon EF 35mm f/1.4L")},
-	{21, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")},
-	{21, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")},
-	{21, 0x186, N_("Canon EF 70-200mm f/4L")},
-	{21, 0x190, N_("Canon EF 100mm f/2.8 Macro")},
-	{21, 0x191, N_("Canon EF 400mm f/4 DO IS")},
-	{21, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")},
-	{21, 0x198, N_("Canon EF 50mm f/1.4")},
-	{21, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")},
-	{21, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")},
-	{21, 0x229, N_("Canon EF 16-35mm f/2.8L")},
-	{21, 0x230, N_("Canon EF 24-70mm f/2.8L")},
-	{21, 0x231, N_("Canon EF 17-40mm f/4L")},
-	{28, 0, N_("Manual")},
-	{28, 1, N_("TTL")},
-	{28, 2, N_("A-TTL")},
-	{28, 3, N_("E-TTL")},
-	{28, 4, N_("FP sync enabled")},
-	{28, 7, N_("2nd-curtain sync used")},
-	{28, 11, N_("FP sync used")},
-	{28, 13, N_("Internal")},
-	{28, 14, N_("External")},
+  {10,  1, N_("Manual")},
+  {10,  2, N_("Landscape")},
+  {10,  3, N_("Fast shutter")},
+  {10,  4, N_("Slow shutter")},
+  {10,  5, N_("Night")},
+  {10,  6, N_("Grayscale")},
+  {10,  7, N_("Sepia")},
+  {10,  8, N_("Portrait")},
+  {10,  9, N_("Sports")},
+  {10, 10, N_("Macro")},
+  {10, 11, N_("Black & white")},
+  {10, 12, N_("Pan focus")},
+  {10, 13, N_("Vivid")},
+  {10, 14, N_("Neutral")},
+  {10, 15, N_("Flash off")},
+  {10, 16, N_("Long shutter")},
+  {10, 17, N_("Super macro")},
+  {10, 18, N_("Foliage")},
+  {10, 19, N_("Indoor")},
+  {10, 20, N_("Fireworks")},
+  {10, 21, N_("Beach")},
+  {10, 22, N_("Underwater")},
+  {10, 23, N_("Snow")},
+  {10, 24, N_("Kids & pets")},
+  {10, 25, N_("Night snapshot")},
+  {10, 26, N_("Digital macro")},
+  {10, 27, N_("My colors")},
+  {10, 28, N_("Still image")},
+  {10, 30, N_("Color accent")},
+  {10, 31, N_("Color swap")},
+  {10, 32, N_("Aquarium")},
+  {10, 33, N_("ISO 3200")},
+  {11, 0, N_("None")},
+  {11, 1, N_("2x")},
+  {11, 2, N_("4x")},
+  {11, 3, N_("Other")},
+  {12, 0x0000, N_("Normal")},
+  {12, 0x0001, N_("High")},
+  {12, 0xffff, N_("Low")},
+  {13, 0x0000, N_("Normal")},
+  {13, 0x0001, N_("High")},
+  {13, 0xffff, N_("Low")},
+  {14, 0x0000, N_("Normal")},
+  {14, 0x0001, N_("High")},
+  {14, 0xffff, N_("Low")},
+  {15, 14, N_("Auto high")},
+  {15, 15, N_("Auto")},
+  {15, 16, N_("50")},
+  {15, 17, N_("100")},
+  {15, 18, N_("200")},
+  {15, 19, N_("400")},
+  {15, 20, N_("800")},
+  {16,  0, N_("Default")},
+  {16,  1, N_("Spot")},
+  {16,  2, N_("Average")},	
+  {16,  3, N_("Evaluative")},
+  {16,  4, N_("Partial")},
+  {16,  5, N_("Center-weighted average")},
+  {17,  0, N_("Manual")},
+  {17,  1, N_("Auto")},
+  {17,  2, N_("Not known")},
+  {17,  3, N_("Macro")},
+  {17,  4, N_("Very close")},
+  {17,  5, N_("Close")},
+  {17,  6, N_("Middle range")},
+  {17,  7, N_("Far range")},
+  {17,  8, N_("Pan focus")},
+  {17,  9, N_("Super macro")},
+  {17,  10, N_("Infinity")},
+  {18, 0x2005, N_("Manual AF point selection")},
+  {18, 0x3000, N_("None (MF)")},
+  {18, 0x3001, N_("Auto-selected")},
+  {18, 0x3002, N_("Right")},
+  {18, 0x3003, N_("Center")},
+  {18, 0x3004, N_("Left")},
+  {18, 0x4001, N_("Auto AF point selection")},
+  {19,  0, N_("Easy shooting")},
+  {19,  1, N_("Program")},
+  {19,  2, N_("Tv-priority")},
+  {19,  3, N_("Av-priority")},
+  {19,  4, N_("Manual")},
+  {19,  5, N_("A-DEP")},
+  {19,  6, N_("M-DEP")},
+  {21,   1, N_("Canon EF 50mm f/1.8")},
+  {21,   2, N_("Canon EF 28mm f/2.8")},
+  {21,   4, N_("Sigma UC Zoom 35-135mm f/4-5.6")},
+  {21,   6, N_("Tokina AF193-2 19-35mm f/3.5-4.5")},
+  {21,   7, N_("Canon EF 100-300mm F5.6L")},
+  {21,  10, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")},
+  {21,  11, N_("Canon EF 35mm f/2")},
+  {21,  13, N_("Canon EF 15mm f/2.8")},
+  {21,  21, N_("Canon EF 80-200mm f/2.8L")},
+  {21,  22, N_("Tokina AT-X280AF PRO 28-80mm F2.8 ASPHERICAL")},
+  {21,  26, N_("Cosina 100mm f/3.5 Macro AF")},
+  {21,  28, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")},
+  {21,  29, N_("Canon EF 50mm f/1.8 MkII")},
+  {21,  31, N_("Tamron SP AF 300mm f/2.8 LD IF")},
+  {21,  32, N_("Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye")},
+  {21,  39, N_("Canon EF 75-300mm f/4-5.6")},
+  {21,  40, N_("Canon EF 28-80mm f/3.5-5.6")},
+  {21,  43, N_("Canon EF 28-105mm f/4-5.6")},
+  {21,  45, N_("Canon EF-S 18-55mm f/3.5-5.6")},
+  {21, 124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")},
+  {21, 125, N_("Canon TS-E 24mm f/3.5L")},
+  {21, 126, N_("Canon TS-E 45mm f/2.8")},
+  {21, 127, N_("Canon TS-E 90mm f/2.8")},
+  {21, 130, N_("Canon EF 50mm f/1.0L")},
+  {21, 131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")},
+  {21, 134, N_("Canon EF 600mm f/4L IS")},
+  {21, 135, N_("Canon EF 200mm f/1.8L")},
+  {21, 136, N_("Canon EF 300mm f/2.8L")},
+  {21, 137, N_("Canon EF 85mm f/1.2L")},
+  {21, 139, N_("Canon EF 400mm f/2.8L")},
+  {21, 141, N_("Canon EF 500mm f/4.5L")},
+  {21, 142, N_("Canon EF 300mm f/2.8L IS")},
+  {21, 143, N_("Canon EF 500mm f/4L IS")},
+  {21, 149, N_("Canon EF 100mm f/2")},
+  {21, 150, N_("Sigma 20mm EX f/1.8")},
+  {21, 151, N_("Canon EF 200mm f/2.8L")},
+  {21, 152, N_("Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8")},
+  {21, 153, N_("Canon EF 35-350mm f/3.5-5.6L")},
+  {21, 155, N_("Canon EF 85mm f/1.8 USM")},
+  {21, 156, N_("Canon EF 28-105mm f/3.5-4.5 USM")},
+  {21, 160, N_("Canon EF 20-35mm f/3.5-4.5 USM")},
+  {21, 161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")},
+  {21, 165, N_("Canon EF 70-200mm f/2.8 L")},
+  {21, 166, N_("Canon EF 70-200mm f/2.8 L + x1.4")},
+  {21, 167, N_("Canon EF 70-200mm f/2.8 L + x2")},
+  {21, 168, N_("Canon EF 28mm f/1.8 USM")},
+  {21, 169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")},
+  {21, 170, N_("Canon EF 200mm f/2.8L II")},
+  {21, 173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")},
+  {21, 174, N_("Canon EF 135mm f/2L")},
+  {21, 176, N_("Canon EF 24-85mm f/3.5-4.5 USM")},
+  {21, 177, N_("Canon EF 300mm f/4L IS")},
+  {21, 178, N_("Canon EF 28-135mm f/3.5-5.6 IS")},
+  {21, 180, N_("Canon EF 35mm f/1.4L")},
+  {21, 181, N_("Canon EF 100-400mm f/4.5-5.6L IS + x1.4")},
+  {21, 182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")},
+  {21, 183, N_("Canon EF 100-400mm f/4.5-5.6L IS")},
+  {21, 184, N_("Canon EF 400mm f/2.8L + x2")},
+  {21, 186, N_("Canon EF 70-200mm f/4L")},
+  {21, 190, N_("Canon EF 100mm f/2.8 Macro")},
+  {21, 191, N_("Canon EF 400mm f/4 DO IS")},
+  {21, 197, N_("Canon EF 75-300mm f/4-5.6 IS")},
+  {21, 198, N_("Canon EF 50mm f/1.4")},
+  {21, 202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")},
+  {21, 211, N_("Canon EF 28-200mm f/3.5-5.6")},
+  {21, 213, N_("Canon EF 90-300mm f/4.5-5.6")},
+  {21, 214, N_("Canon EF-S 18-55mm f/3.5-4.5 USM")},
+  {21, 224, N_("Canon EF 70-200mm f/2.8L IS USM")},
+  {21, 225, N_("Canon EF 70-200mm f/2.8L IS USM + x1.4")},
+  {21, 226, N_("Canon EF 70-200mm f/2.8L IS USM + x2")},
+  {21, 229, N_("Canon EF 16-35mm f/2.8L")},
+  {21, 230, N_("Canon EF 24-70mm f/2.8L")},
+  {21, 231, N_("Canon EF 17-40mm f/4L")},
+  {21, 232, N_("Canon EF 70-300mm f/4.5-5.6 DO IS USM")},
+  {21, 234, N_("Canon EF-S 17-85mm f4-5.6 IS USM")},
+  {21, 235, N_("Canon EF-S10-22mm F3.5-4.5 USM")},
+  {21, 236, N_("Canon EF-S60mm F2.8 Macro USM")},
+  {21, 237, N_("Canon EF 24-105mm f/4L IS")},
+  {21, 238, N_("Canon EF 70-300mm F4-5.6 IS USM")},
+  {21, 241, N_("Canon EF 50mm F1.2L USM")},
+  {21, 242, N_("Canon EF 70-200mm f/4L IS USM")},
+  {28, 0, N_("Manual")},
+  {28, 1, N_("TTL")},
+  {28, 2, N_("A-TTL")},
+  {28, 3, N_("E-TTL")},
+  {28, 4, N_("FP sync enabled")},
+  {28, 7, N_("2nd-curtain sync used")},
+  {28, 11, N_("FP sync used")},
+  {28, 13, N_("Internal")},
+  {28, 14, N_("External")},
   {31,  0, N_("Single")},
   {31,  1, N_("Continuous")},
-	{32, 0, N_("Normal AE")},
-  	{32, 1, N_("Exposure compensation")},
-  	{32, 2, N_("AE lock")},
-  	{32, 3, N_("AE lock + Exposure compensation")},
-  	{32, 4, N_("No AE")},
-  	{33, 0, N_("Off")},
-  	{33, 1, N_("On")},
-  	{33, 2, N_("On, shot only")},
-  	{39, 0, N_("Off")},
-  	{39, 1, N_("Vivid")},
-  	{39, 2, N_("Neutral")},
-  	{39, 3, N_("Smooth")},
-  	{39, 4, N_("Sepia")},
-  	{39, 5, N_("Black & white")},
-  	{39, 6, N_("Custom")},
-  	{39, 100, N_("My color data")},
-  	{40, 0, N_("Off")},
-  	{40, 0x0500, N_("Full")},
-  	{40, 0x0502, N_("2/3")},
-  	{40, 0x0504, N_("1/3")},
+  {32, 0, N_("Normal AE")},
+  {32, 1, N_("Exposure compensation")},
+  {32, 2, N_("AE lock")},
+  {32, 3, N_("AE lock + Exposure compensation")},
+  {32, 4, N_("No AE")},
+  {33, 0, N_("Off")},
+  {33, 1, N_("On")},
+  {33, 2, N_("On, shot only")},
+  {39, 0, N_("Off")},
+  {39, 1, N_("Vivid")},
+  {39, 2, N_("Neutral")},
+  {39, 3, N_("Smooth")},
+  {39, 4, N_("Sepia")},
+  {39, 5, N_("Black & white")},
+  {39, 6, N_("Custom")},
+  {39, 100, N_("My color data")},
+  {40, 0, N_("Off")},
+  {40, 0x0500, N_("Full")},
+  {40, 0x0502, N_("2/3")},
+  {40, 0x0504, N_("1/3")},
   { 0,  0, NULL}
 },
 entries_focal_length [] = {
@@ -320,12 +363,12 @@ entries_settings_2 [] = {
   { 26,  3, N_("Rotate 270 CW")},
   { 26,  0xffff, N_("Rotated by software")},
   { 27,  0, N_("Off")},
-  { 27,  1, N_("On")},  
-  	{32, 0, N_("Off")},
-  	{32, 0x0014, N_("1/3")},
-  	{32, 0x008c, N_("2/3")},
-  	{32, 0x07d0, N_("Full")},
-	{0, 0, NULL}
+  { 27,  1, N_("On")}, 
+  { 32,  0, N_("Off")},
+  { 32,  0x0014, N_("1/3")},
+  { 32,  0x008c, N_("2/3")},
+  { 32,  0x07d0, N_("Full")},
+  {0, 0, NULL}
 },
 entries_panorama [] = {
 	{0, 0, N_("Left to right")},
@@ -334,6 +377,51 @@ entries_panorama [] = {
 	{0, 3, N_("Top to bottom")},
 	{0, 4, N_("2x2 matrix (clockwise)")},
 	{0, 0, NULL}
+},
+color_information [] = {
+  {0, 0, N_("Standard")},
+  {0, 1, N_("Manual")},
+  {0, 2, N_("Custom")},
+  {2, 0, N_("N/A")},
+  {2, 1, N_("Lowest")},
+  {2, 2, N_("Low")},
+  {2, 3, N_("Standard")},
+  {2, 4, N_("High")},
+  {2, 5, N_("Highest")},
+  {7,  0, N_("Auto")},
+  {7,  1, N_("Daylight")},
+  {7,  2, N_("Cloudy")},
+  {7,  3, N_("Tungsten")},
+  {7,  4, N_("Fluorescent")},
+  {7,  5, N_("Flash")},
+  {7,  6, N_("Custom")},
+  {7,  7, N_("Black & White")},
+  {7,  8, N_("Shade")},
+  {7,  9, N_("Manual Temperature (Kelvin)")},
+  {7, 10, N_("PC Set1")},
+  {7, 11, N_("PC Set2")},
+  {7, 12, N_("PC Set3")},
+  {7, 14, N_("Daylight Fluorescent")},
+  {7, 15, N_("Custom 1")},
+  {7, 16, N_("Custom 2")},
+  {7, 17, N_("Underwater")},
+  {9, 0x00, N_("None")},
+  {9, 0x01, N_("Standard")},
+  {9, 0x02, N_("Set 1")},
+  {9, 0x03, N_("Set 2")},
+  {9, 0x04, N_("Set 3")},
+  {9, 0x21, N_("User Def. 1")},
+  {9, 0x22, N_("User Def. 2")},
+  {9, 0x23, N_("User Def. 3")},
+  {9, 0x41, N_("External 1")},
+  {9, 0x42, N_("External 2")},
+  {9, 0x43, N_("External 3")},
+  {9, 0x81, N_("Standard")},
+  {9, 0x82, N_("Portrait")},
+  {9, 0x83, N_("Landscape")},
+  {9, 0x84, N_("Neutral")},
+  {9, 0x85, N_("Faithful")},
+  {9, 0x86, N_("Monochrome")},
 };
 
 static void
@@ -412,6 +500,7 @@ mnote_canon_entry_count_values (const Mn
 	case MNOTE_CANON_TAG_SETTINGS_1:
 	case MNOTE_CANON_TAG_SETTINGS_2:
 	case MNOTE_CANON_TAG_CUSTOM_FUNCS:
+	case MNOTE_CANON_TAG_COLOR_INFORMATION:
 		if (entry->format != EXIF_FORMAT_SHORT) return 0;
 
 		val = exif_get_short (entry->data, entry->order);
@@ -467,7 +556,7 @@ mnote_canon_entry_get_value (const Mnote
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
-		vs = exif_get_short (entry->data + 2 + t * 2, entry->order);
+		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		switch (t) {
 		case 1:
 			if (!vs) {
@@ -511,7 +600,7 @@ mnote_canon_entry_get_value (const Mnote
 
 	case MNOTE_CANON_TAG_FOCAL_LENGTH:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
-		vs = exif_get_short (entry->data + t * 2, entry->order);
+		vs = exif_get_short (data + t * 2, entry->order);
 		switch (t) {
 		case 1:
 			snprintf (val, maxlen, "%u", vs);
@@ -530,7 +619,7 @@ mnote_canon_entry_get_value (const Mnote
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
-		vs = exif_get_short (entry->data + 2 + t * 2, entry->order);
+		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		switch (t) {
 		case 0:
 		case 1:
@@ -578,7 +667,7 @@ mnote_canon_entry_get_value (const Mnote
 
 	case MNOTE_CANON_TAG_PANORAMA:
 		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
-		vs = exif_get_short (entry->data + t * 2, entry->order);
+		vs = exif_get_short (data + t * 2, entry->order);
 		canon_search_table_value (entries_panorama, t, vs, val, maxlen);
 		break;
 
@@ -617,13 +706,24 @@ mnote_canon_entry_get_value (const Mnote
 		n = exif_get_short (data, entry->order) / 2;
 		if (t >= n) return NULL;
 		CC (entry->components, n, val, maxlen);
-		vs = exif_get_short (data + 2 + 2 * t, entry->order);
+		vs = exif_get_short (data + 2 + t * 2, entry->order);
 		snprintf (buf, sizeof (buf), "%u", vs);
 		strncat (val, buf, maxlen - strlen (val));
 		break;
 
+	case MNOTE_CANON_TAG_COLOR_INFORMATION:
+		CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen);
+		n = exif_get_short (data, entry->order) / 2;
+		if (t >= n) return NULL;
+		CC (entry->components, n, val, maxlen);
+		vs = exif_get_short (data + 2 + t * 2, entry->order);
+		canon_search_table_value (color_information, t, vs, val, maxlen);
+		break;
+
 	default:
 #ifdef DEBUG
+	  {
+		int i;
 		if (entry->format == EXIF_FORMAT_SHORT)
 		for(i=0;i<entry->components;i++) {
 			vs = exif_get_short (data, entry->order);
@@ -638,6 +738,7 @@ mnote_canon_entry_get_value (const Mnote
 		}
 		else if (entry->format == EXIF_FORMAT_ASCII)
 		    strncpy (val, data, MIN (entry->size, maxlen));
+	  }
 #endif
 		break;
 	}

[libexif-cvs] libexif ChangeLog,1.247,1.248 NEWS,1.25,1.26

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

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

Modified Files:
	ChangeLog NEWS 
Log Message:
* exif-mnote-data-olympus.c: Fix of bugs #1773810, #1774626, gnome bug #466044:
  Some Olympus files have main IFD in MM byte order as well as makernote, but
  makernote order was guessed wrongly. Bug introduced when fixing bug #1525770.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -d -r1.25 -r1.26
--- NEWS	26 Jun 2007 03:00:14 -0000	1.25
+++ NEWS	16 Aug 2007 19:53:21 -0000	1.26
@@ -1,5 +1,6 @@
 libexif-0.6.16.2:
-  * Updated translations: de, pl, vi
+  * Updated translations: de, pl, sk, vi
+  * Bug fixes: #1773810, #1774626
 
 
 libexif-0.6.16 (2007-06-12):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -p -d -r1.247 -r1.248
--- ChangeLog	25 Jun 2007 05:56:24 -0000	1.247
+++ ChangeLog	16 Aug 2007 19:53:21 -0000	1.248
@@ -1,3 +1,9 @@
+2007-08-16  Jan Patera <pa...@us...>
+
+	* exif-mnote-data-olympus.c: Fix of bugs #1773810, #1774626, gnome bug #466044:
+	  Some Olympus files have main IFD in MM byte order as well as makernote, but
+	  makernote order was guessed wrongly. Bug introduced when fixing bug #1525770.
+
 2007-06-25  Jan Patera <pa...@us...>
 
 	* Endianess of Nikon V1 makernotes is now guessed, it might not

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c, 1.30, 1.31

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

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

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
Fix of bugs #1773810, #1774626, gnome bug #466044:
Olympus files have main IFD in MM order as well as makernote, but makernote endianness
was guessed wrongly. Bug introduced when fixing bug #1525770.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- exif-mnote-data-olympus.c	25 Jun 2007 05:55:23 -0000	1.30
+++ exif-mnote-data-olympus.c	16 Aug 2007 19:49:34 -0000	1.31
@@ -230,6 +230,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		else if (buf[o2 + 6 + 1] == 1)
 			n->order = EXIF_BYTE_ORDER_MOTOROLA;
 		o2 += 8;
+		if (o2 >= buf_size) return;
+		c = exif_get_short (buf + o2, n->order);
+		if ((!(c & 0xFF)) && (c > 0x500)) {
+			if (n->order == EXIF_BYTE_ORDER_INTEL) {
+				n->order = EXIF_BYTE_ORDER_MOTOROLA;
+			} else {
+				n->order = EXIF_BYTE_ORDER_INTEL;
+			}
+		}
 
 	} else if (!memcmp (buf + o2, "OLYMPUS", 8)) {
 		/* Olympus S760, S770 */

[libexif-cvs] libexif/libexif exif-system.h,1.1,1.2

[Hans U. N. <hu...@us...>]

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

Modified Files:
	exif-system.h 
Log Message:
add license

Index: exif-system.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-system.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- exif-system.h	26 Jun 2007 02:03:47 -0000	1.1
+++ exif-system.h	14 Aug 2007 19:57:42 -0000	1.2
@@ -1,5 +1,22 @@
 /** \file exif-system.h
  * \brief System specific definitions, not for installation!
+ *
+ * Copyright (C) 2007 Hans Ulrich Niedermann <gp...@n-...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef EXIF_SYSTEM_H

[libexif-cvs] libexif/doc Doxyfile-internals.in,1.5,1.6

[Hans U. N. <hu...@us...>]

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

Modified Files:
	Doxyfile-internals.in 
Log Message:
document test code for internal docs

Index: Doxyfile-internals.in
===================================================================
RCS file: /cvsroot/libexif/libexif/doc/Doxyfile-internals.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- Doxyfile-internals.in	21 May 2007 18:33:56 -0000	1.5
+++ Doxyfile-internals.in	14 Aug 2007 19:55:36 -0000	1.6
@@ -450,7 +450,7 @@ WARN_LOGFILE           = 
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/libexif
+INPUT                  = @top_srcdir@/libexif @top_srcdir@/test
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

[libexif-cvs] libexif/doc Makefile.am,1.13,1.14

[Hans U. N. <hu...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
fix uninstall

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- Makefile.am	23 May 2007 13:04:19 -0000	1.13
+++ Makefile.am	14 Aug 2007 19:55:14 -0000	1.14
@@ -51,8 +51,10 @@ install-apidocs-internals: $(HTML_APIDOC
 
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs-internals
 uninstall-apidocs-internals:
-	cd "$(DESTDIR)$(docdir)" && rm -f $(DOC_APIDOC_INTERNALS_HTML)/*
-	rmdir $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
+	if cd "$(DESTDIR)$(docdir)"; then \
+		rm -f "$(DOC_APIDOC_INTERNALS_HTML)/"*; \
+		rmdir "$(DOC_APIDOC_INTERNALS_HTML)"; \
+	fi;:
 
 endif
 
@@ -67,8 +69,10 @@ install-apidocs: $(HTML_APIDOC_DIR).stam
 
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs
 uninstall-apidocs:
-	cd "$(DESTDIR)$(docdir)" && rm -f $(DOC_APIDOC_HTML)/*
-	rmdir $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
+	if cd "$(DESTDIR)$(docdir)"; then \
+		rm -f "$(DOC_APIDOC_HTML)/"*; \
+		rmdir "$(DOC_APIDOC_HTML)"; \
+	fi;:
 
 DOXYGEN_CLEAN_TARGETS += clean-apidocs
 clean-apidocs:

[libexif-cvs] libexif configure.ac,1.36,1.37

[Hans U. N. <hu...@us...>]

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

Modified Files:
	configure.ac 
Log Message:
more intuitive var def sequence

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -d -r1.36 -r1.37
--- configure.ac	2 Aug 2007 03:01:59 -0000	1.36
+++ configure.ac	14 Aug 2007 19:54:04 -0000	1.37
@@ -50,9 +50,9 @@ dnl C:A:R
 dnl 12:0:1   0.6.13
 dnl 13:1:0   added EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE (for 0.6.14)
 dnl 14:2:0   added XP_ WinXP tags (for 0.6.15)
+LIBEXIF_CURRENT=14
 LIBEXIF_AGE=2
 LIBEXIF_REVISION=0
-LIBEXIF_CURRENT=14
 AC_SUBST([LIBEXIF_AGE])
 AC_SUBST([LIBEXIF_REVISION])
 AC_SUBST([LIBEXIF_CURRENT])

[libexif-cvs] libexif/po cs.po, 1.7, 1.8 de.po, 1.41, 1.42 es.po, 1.28, 1.29 fr.po, 1.28, 1.29 pl.po, 1.16, 1.17 ru.po, 1.12, 1.13 sk.po, 1.8, 1.9 vi.po, 1.13, 1.14

[Hans U. N. <hu...@us...>]

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

Modified Files:
	cs.po de.po es.po fr.po pl.po ru.po sk.po vi.po 
Log Message:
updated sk and vi translations, po-update

Index: es.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/es.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- es.po	15 Jun 2007 06:54:48 -0000	1.28
+++ es.po	14 Aug 2007 19:52:42 -0000	1.29
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
 "PO-Revision-Date: 2005-03-12 05:43+0100\n"
 "Last-Translator: Fabian Mandelbaum <fa...@ma...>\n"
 "Language-Team: Spanish <es...@li...>\n"
@@ -38,7 +38,7 @@ msgid "Invalid number of components (%i,
 msgstr "Cantidad de componentes no válida (%i, se esperaba %i o %i)."
 
[...1131 lines suppressed...]
-#: libexif/pentax/mnote-pentax-entry.c:344
-#: libexif/pentax/mnote-pentax-entry.c:367
-msgid "Internal error"
-msgstr ""
-
 #: libexif/olympus/mnote-olympus-entry.c:379
 #, c-format
 msgid "Unknown value %hi"
@@ -4461,11 +4462,6 @@ msgstr ""
 msgid "Digital Filter?"
 msgstr "Relación de zoom digital"
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr ""
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"

Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sk.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- sk.po	16 Jul 2007 22:28:58 -0000	1.8
+++ sk.po	14 Aug 2007 19:52:43 -0000	1.9
@@ -1,14 +1,14 @@
-# translation of libexif-0.6.13.pot to Slovak
+# translation of libexif-0.6.16.pot to Slovak
 # Copyright (C) YEAR Lutz Müller and others
 # This file is distributed under the same license as the libexif package.
 # Ivan Masár <he...@ce...>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif-0.6.16\n"
+"Project-Id-Version: libexif 0.6.16\n"
 "Report-Msgid-Bugs-To: \n"
[...3497 lines suppressed...]
-#~ msgstr " (1 dostupný bod zaostrenia)"
-
-#~ msgid " (%u available focus points)"
-#~ msgstr " (%u dostupných bodov zaostrenia)"
-
-#~ msgid "Zoomed resolution"
-#~ msgstr "Rozlíšenie priblíženia"
-
-#~ msgid "Zoomed resolution base"
-#~ msgstr "Základ rozlíšenia priblíženia"
-
-#~ msgid "Flash bias"
-#~ msgstr "Skreslenie blesku"
+#~ msgid "Internal error."
+#~ msgstr "Vnútorná chyba."
 
-#~ msgid "Flash fired, compulsory flash mode, red-eye reduction, return light detected"
-#~ msgstr "Blesk sa spustil, povinný režim blesku, režim redukcie červených očí, vracajúce sa svetlo detegované."
+#~ msgid "Internal error (unknown value %i)."
+#~ msgstr "Vnútorná chyba (neznáma hodnota %i)."

Index: fr.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/fr.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- fr.po	12 Jun 2007 13:53:37 -0000	1.28
+++ fr.po	14 Aug 2007 19:52:42 -0000	1.29
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
 "PO-Revision-Date: 2005-03-12 05:42+0100\n"
 "Last-Translator: Arnaud Launay <as...@la...>\n"
 "Language-Team: Français <tr...@tr...>\n"
@@ -38,7 +38,7 @@ msgid "Invalid number of components (%i,
 msgstr "Nombre invalide de composants (%i, attendait %i ou %i)."
 
[...1128 lines suppressed...]
-#: libexif/pentax/mnote-pentax-entry.c:344
-#: libexif/pentax/mnote-pentax-entry.c:367
-msgid "Internal error"
-msgstr ""
-
 #: libexif/olympus/mnote-olympus-entry.c:379
 #, c-format
 msgid "Unknown value %hi"
@@ -4247,11 +4244,6 @@ msgstr ""
 msgid "Digital Filter?"
 msgstr "Valeur du zoom numérique"
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr ""
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"

Index: ru.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/ru.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- ru.po	12 Jun 2007 13:53:38 -0000	1.12
+++ ru.po	14 Aug 2007 19:52:43 -0000	1.13
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
 "PO-Revision-Date: 2006-01-12 13:25+0300\n"
 "Last-Translator: Alexandre Prokoudine <ale...@gm...>\n"
 "Language-Team: Russian <ru...@li...>\n"
@@ -41,7 +41,7 @@ msgid "Invalid number of components (%i,
 msgstr "Некорректное число компонентов (%i, ожидалось %i или %i)."
 
[...1122 lines suppressed...]
-msgid "Internal error (unknown value %i)"
-msgstr "Внутренняя ошибка (неизвестное значение %i)"
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, fuzzy, c-format
 msgid "Internal error (unknown value %i %i)"
@@ -4301,6 +4293,13 @@ msgstr "Режим вспышки"
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
 msgstr ""
 
+#~ msgid "Internal error."
+#~ msgstr "Внутренняя ошибка"
+
+#, fuzzy
+#~ msgid "Internal error (unknown value %i)."
+#~ msgstr "Внутренняя ошибка (неизвестное значение %i)"
+
 #~ msgid "auto"
 #~ msgstr "авто"
 

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -d -r1.41 -r1.42
--- de.po	15 Jun 2007 03:00:15 -0000	1.41
+++ de.po	14 Aug 2007 19:52:42 -0000	1.42
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
-"PO-Revision-Date: 2007-06-14 19:37+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
+"PO-Revision-Date: 2007-06-27 14:37+0200\n"
 "Last-Translator: Marcus Meissner <ma...@je...>\n"
 "Language-Team: German <tra...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid "Invalid number of components (%i,
[...1135 lines suppressed...]
 msgstr "Digitaler Filter?"
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr "Interner Fehler (unbekannter Wert %i)"
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"
@@ -4322,3 +4314,9 @@ msgstr "Einfacher Aufnahmemodus"
 #: 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_de]"
+
+#~ msgid "Internal error."
+#~ msgstr "Interner Fehler."
+
+#~ msgid "Internal error (unknown value %i)."
+#~ msgstr "Interner Fehler (unbekannter Wert %i)."

Index: pl.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/pl.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- pl.po	15 Jun 2007 03:00:16 -0000	1.16
+++ pl.po	14 Aug 2007 19:52:43 -0000	1.17
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
 "PO-Revision-Date: 2007-07-14 18:10+0200\n"
 "Last-Translator: Jakub Bogusz <qb...@pl...>\n"
 "Language-Team: Polish <tra...@li...>\n"
@@ -37,7 +37,7 @@ msgid "Invalid number of components (%i,
 msgstr "Błędna liczba składowych (%i, a oczekiwano %i lub %i)."
 
[...1134 lines suppressed...]
 msgstr "Filtr cyfrowy?"
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr "Błąd wewnętrzny (nieznana wartość %i)"
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"
@@ -4346,3 +4339,9 @@ msgstr "Tryb łatwego robienia zdjęć"
 #: 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 "Internal error."
+#~ msgstr "Błąd wewnętrzny."
+
+#~ msgid "Internal error (unknown value %i)."
+#~ msgstr "Błąd wewnętrzny (nieznana wartość %i)."

Index: cs.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/cs.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- cs.po	15 Jun 2007 06:54:47 -0000	1.7
+++ cs.po	14 Aug 2007 19:52:42 -0000	1.8
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
 "PO-Revision-Date: 2007-05-24 06:46+0200\n"
 "Last-Translator: Jan Patera <pa...@us...>\n"
 "Language-Team: <cs...@li...>\n"
@@ -38,7 +38,7 @@ msgid "Invalid number of components (%i,
 msgstr "Spatný počet položek (%i, očekáváno %i nebo %i)."
 
[...1107 lines suppressed...]
-#: libexif/pentax/mnote-pentax-entry.c:344
-#: libexif/pentax/mnote-pentax-entry.c:367
-msgid "Internal error"
-msgstr "Vnitřní chyba"
-
 #: libexif/olympus/mnote-olympus-entry.c:379
 #, c-format
 msgid "Unknown value %hi"
@@ -4028,11 +4034,6 @@ msgstr ""
 msgid "Digital Filter?"
 msgstr ""
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr "Vnitřní chyba (neznámá hodnota %i)"
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"

Index: vi.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/vi.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- vi.po	15 Jun 2007 04:09:47 -0000	1.13
+++ vi.po	14 Aug 2007 19:52:43 -0000	1.14
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 15:13+0200\n"
-"PO-Revision-Date: 2007-06-15 13:00+0930\n"
+"POT-Creation-Date: 2007-07-01 01:50+0200\n"
+"PO-Revision-Date: 2007-08-11 16:09+0930\n"
 "Last-Translator: Clytie Siddall <cl...@ri...>\n"
 "Language-Team: Vietnamese <vi...@go...>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
[...1203 lines suppressed...]
 msgstr "Lọc số ?"
 
-#: libexif/pentax/mnote-pentax-entry.c:353
-#, c-format
-msgid "Internal error (unknown value %i)"
-msgstr "Lỗi nội bộ (giá trị không rõ %i)"
-
 #: libexif/pentax/mnote-pentax-entry.c:376
 #, c-format
 msgid "Internal error (unknown value %i %i)"
@@ -4318,3 +4311,9 @@ msgstr "Chế độ chụp tốt nhất"
 #: 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 "Internal error."
+#~ msgstr "Lỗi nội bộ."
+
+#~ msgid "Internal error (unknown value %i)."
+#~ msgstr "Lỗi nội bộ (không biết giá trị %i)."

[libexif-cvs] libexif/test test-parse.c,1.3,1.4

[Hans U. N. <hu...@us...>]

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

Modified Files:
	test-parse.c 
Log Message:
fix param names

Index: test-parse.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-parse.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- test-parse.c	29 Jun 2007 14:55:44 -0000	1.3
+++ test-parse.c	2 Aug 2007 03:03:54 -0000	1.4
@@ -87,7 +87,7 @@ void split_ws_string(const char *string,
 	if (str) {
 	  memcpy(str, start, len);
 	  str[len] = '\0';
-	  func(str, data);
+	  func(str, callback_data);
 	  free(str);
 	  start = p+1;
 	}
@@ -115,7 +115,7 @@ int main(const int argc, const char *arg
   }
 
   for (i=1; i<argc; i++) {
-    test_parse(argv[i], data);
+    test_parse(argv[i], callback_data);
   }
 
   return 0;

[libexif-cvs] libexif/libexif/pentax Makefile-files, NONE, 1.1 Makefile.am, 1.4, NONE

[Hans U. N. <hu...@us...>]

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

Added Files:
	Makefile-files 
Removed Files:
	Makefile.am 
Log Message:
Partially get rid of recursive make, fixing parallel make issue


--- NEW FILE: Makefile-files ---
# -*- Makefile -*-
noinst_LTLIBRARIES += libmnote-pentax.la
libmnote_pentax_la_SOURCES = \
	pentax/mnote-pentax-entry.c pentax/mnote-pentax-entry.h \
	pentax/exif-mnote-data-pentax.c pentax/exif-mnote-data-pentax.h \
	pentax/mnote-pentax-tag.c pentax/mnote-pentax-tag.h
libmnote_pentax_la_LIBADD = $(LTLIBINTL)

--- Makefile.am DELETED ---

[libexif-cvs] libexif/libexif/olympus Makefile-files, NONE, 1.1 Makefile.am, 1.9, NONE

[Hans U. N. <hu...@us...>]

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

Added Files:
	Makefile-files 
Removed Files:
	Makefile.am 
Log Message:
Partially get rid of recursive make, fixing parallel make issue


--- NEW FILE: Makefile-files ---
# -*- Makefile -*-
noinst_LTLIBRARIES += libmnote-olympus.la
libmnote_olympus_la_SOURCES = \
	olympus/mnote-olympus-entry.c olympus/mnote-olympus-entry.h \
	olympus/exif-mnote-data-olympus.c olympus/exif-mnote-data-olympus.h \
	olympus/mnote-olympus-tag.c olympus/mnote-olympus-tag.h
libmnote_olympus_la_LIBADD = $(LTLIBINTL)

--- Makefile.am DELETED ---

[libexif-cvs] libexif/libexif Makefile.am,1.39,1.40

[Hans U. N. <hu...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
Partially get rid of recursive make, fixing parallel make issue


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -d -r1.39 -r1.40
--- Makefile.am	26 Jun 2007 02:03:47 -0000	1.39
+++ Makefile.am	2 Aug 2007 03:02:00 -0000	1.40
@@ -1,13 +1,16 @@
 EXTRA_DIST =
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
 
-SUBDIRS = canon olympus pentax
-
-lib_LTLIBRARIES = libexif.la
+include canon/Makefile-files
+include olympus/Makefile-files
+include pentax/Makefile-files
 
 # The -no-undefined makes it possible to build DLLs for Windows,
 # or shared libraries for Tru64 or AIX (according to the autobook
 # chapter on "Portable Library Design"). It doesn't seem to hurt
 # elsewhere, so we can leave it in.
+lib_LTLIBRARIES += libexif.la
 libexif_la_LDFLAGS = \
 	-export-symbols $(srcdir)/libexif.sym \
 	-no-undefined -version-info @LIBEXIF_VERSION_INFO@
@@ -28,24 +31,15 @@ libexif_la_SOURCES =		\
 	i18n.h
 libexif_la_DEPENDENCIES = \
 	$(srcdir)/libexif.sym \
-	canon/libmnote-canon.la		\
-	olympus/libmnote-olympus.la	\
-	pentax/libmnote-pentax.la
+	libmnote-canon.la		\
+	libmnote-olympus.la	\
+	libmnote-pentax.la
 libexif_la_LIBADD =			\
 	$(MATHLIBS)			\
 	$(LTLIBINTL)			\
-	canon/libmnote-canon.la		\
-	olympus/libmnote-olympus.la	\
-	pentax/libmnote-pentax.la
-
-canon/libmnote-canon.la:
-	cd canon && $(MAKE) libmnote-canon.la
-
-olympus/libmnote-olympus.la:
-	cd olympus && $(MAKE) libmnote-olympus.la
-
-pentax/libmnote-pentax.la:
-	cd pentax && $(MAKE) libmnote-pentax.la
+	libmnote-canon.la		\
+	libmnote-olympus.la	\
+	libmnote-pentax.la
 
 libexifincludedir = $(includedir)/libexif
 libexifinclude_HEADERS = 	\
@@ -69,4 +63,3 @@ EXTRA_DIST += exif-system.h
 EXTRA_DIST += libexif.sym
 
 DISTCLEANFILES = _stdint.h
-

[libexif-cvs] libexif configure.ac,1.35,1.36

[Hans U. N. <hu...@us...>]

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

Modified Files:
	configure.ac 
Log Message:
Partially get rid of recursive make, fixing parallel make issue


Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- configure.ac	26 Jun 2007 03:00:15 -0000	1.35
+++ configure.ac	2 Aug 2007 03:01:59 -0000	1.36
@@ -189,9 +189,6 @@ AC_CONFIG_FILES([ 
   Makefile
   libexif.spec
   libexif/Makefile
-  libexif/canon/Makefile
-  libexif/olympus/Makefile
-  libexif/pentax/Makefile
   test/Makefile
   test/nls/Makefile
   m4m/Makefile

[libexif-cvs] libexif/libexif/canon Makefile-files, NONE, 1.1 Makefile.am, 1.8, NONE

[Hans U. N. <hu...@us...>]

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

Added Files:
	Makefile-files 
Removed Files:
	Makefile.am 
Log Message:
Partially get rid of recursive make, fixing parallel make issue


--- NEW FILE: Makefile-files ---
# -*- Makefile -*-
noinst_LTLIBRARIES += libmnote-canon.la
libmnote_canon_la_SOURCES = \
	canon/exif-mnote-data-canon.c canon/exif-mnote-data-canon.h \
	canon/mnote-canon-entry.c canon/mnote-canon-entry.h \
	canon/mnote-canon-tag.c canon/mnote-canon-tag.h
libmnote_canon_la_LIBADD = $(LTLIBINTL)

--- Makefile.am DELETED ---

[libexif-cvs] libexif/po sk.po,1.7,1.8

[Hans U. N. <hu...@us...>]

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

Modified Files:
	sk.po 
Log Message:
updated sk.po translation

Index: sk.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/sk.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- sk.po	15 Jun 2007 06:54:48 -0000	1.7
+++ sk.po	16 Jul 2007 22:28:58 -0000	1.8
@@ -1,15 +1,15 @@
-# translation of libexif-0.6.14.pot to Slovak
-# Copyright (C) 2007 Lutz Müller and others
+# translation of libexif-0.6.13.pot to Slovak
+# Copyright (C) YEAR Lutz Müller and others
 # This file is distributed under the same license as the libexif package.
 # Ivan Masár <he...@ce...>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif-0.6.14\n"
+"Project-Id-Version: libexif-0.6.16\n"
[...3564 lines suppressed...]
 #: libexif/pentax/mnote-pentax-tag.c:72
-#, fuzzy
 msgid "Bestshot mode"
-msgstr "Režim jednoduchého fotenia"
+msgstr "Režim najlepšieho snímku"
 
 #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
@@ -4281,9 +3780,5 @@ msgstr ""
 #~ msgid "Flash bias"
 #~ msgstr "Skreslenie blesku"
 
-#~ msgid ""
-#~ "Flash fired, compulsory flash mode, red-eye reduction, return light "
-#~ "detected."
-#~ msgstr ""
-#~ "Blesk sa spustil, povinný režim blesku, režim redukcie červených očí, "
-#~ "vracajúce sa svetlo detegované."
+#~ msgid "Flash fired, compulsory flash mode, red-eye reduction, return light detected"
+#~ msgstr "Blesk sa spustil, povinný režim blesku, režim redukcie červených očí, vracajúce sa svetlo detegované."

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

[Hans U. N. <hu...@us...>]

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

Modified Files:
	test-parse.c 
Log Message:
comments

Index: test-parse.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-parse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- test-parse.c	29 Jun 2007 14:14:26 -0000	1.2
+++ test-parse.c	29 Jun 2007 14:55:44 -0000	1.3
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
+ *
  */
 
 #include "libexif/exif-data.h"
@@ -27,6 +28,7 @@
 #include <stdlib.h>
 
 
+/** Callback function handling an ExifEntry. */
 void content_foreach_func(ExifEntry *entry, void *callback_data);
 void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
 {
@@ -44,6 +46,7 @@ void content_foreach_func(ExifEntry *ent
 }
 
 
+/** Callback function handling an ExifContent (corresponds 1:1 to an IFD). */
 void data_foreach_func(ExifContent *content, void *callback_data);
 void data_foreach_func(ExifContent *content, void *callback_data)
 {
@@ -52,6 +55,7 @@ void data_foreach_func(ExifContent *cont
 }
 
 
+/** Run EXIF parsing test on the given file. */
 void test_parse(const char *filename, void *callback_data);
 void test_parse(const char *filename, void *callback_data)
 {
@@ -63,10 +67,12 @@ void test_parse(const char *filename, vo
   exif_data_unref(d);
 }
 
+
+/** Callback function prototype for string parsing. */
 typedef void (*test_parse_func) (const char *filename, void *callback_data);
 
 
-/** Split string at whitespace and call callback with each substring */
+/** Split string at whitespace and call callback with each substring. */
 void split_ws_string(const char *string, test_parse_func func, void *callback_data);
 void split_ws_string(const char *string, test_parse_func func, void *callback_data)
 {
@@ -97,6 +103,7 @@ void split_ws_string(const char *string,
 }
 
 
+/** Main program. */
 int main(const int argc, const char *argv[])
 {
   int i;