Menu
▾
▴
libexif-cvs — CVS commitlogs of all libexif CVS modules
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(57) |
Oct
(39) |
Nov
(93) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(15) |
Feb
(8) |
Mar
(12) |
Apr
(25) |
May
(2) |
Jun
|
Jul
(11) |
Aug
(32) |
Sep
(18) |
Oct
(53) |
Nov
|
Dec
(11) |
| 2004 |
Jan
(19) |
Feb
(1) |
Mar
(15) |
Apr
(17) |
May
(56) |
Jun
(19) |
Jul
(6) |
Aug
(16) |
Sep
(44) |
Oct
(31) |
Nov
(36) |
Dec
(13) |
| 2005 |
Jan
(2) |
Feb
(41) |
Mar
(304) |
Apr
(176) |
May
(19) |
Jun
(33) |
Jul
(14) |
Aug
(21) |
Sep
(4) |
Oct
(3) |
Nov
|
Dec
(8) |
| 2006 |
Jan
(18) |
Feb
(9) |
Mar
(5) |
Apr
(2) |
May
(2) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
(10) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(124) |
Jun
(59) |
Jul
(1) |
Aug
(13) |
Sep
(3) |
Oct
(11) |
Nov
(30) |
Dec
(35) |
| 2008 |
Jan
(31) |
Feb
(42) |
Mar
(4) |
Apr
(5) |
May
(2) |
Jun
(12) |
Jul
(8) |
Aug
(2) |
Sep
(4) |
Oct
(5) |
Nov
(89) |
Dec
(23) |
| 2009 |
Jan
(71) |
Feb
(5) |
Mar
(8) |
Apr
(7) |
May
(8) |
Jun
(7) |
Jul
|
Aug
(4) |
Sep
(58) |
Oct
(74) |
Nov
(53) |
Dec
(32) |
| 2010 |
Jan
(8) |
Feb
(13) |
Mar
(4) |
Apr
|
May
|
Jun
(10) |
Jul
(1) |
Aug
(2) |
Sep
(12) |
Oct
(17) |
Nov
(2) |
Dec
(24) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(24) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(20) |
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
|
From: Lutz M. <lu...@us...> - 2005-12-27 21:23:31
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11184 Modified Files: ChangeLog Log Message: 2005-12-27 Lutz Mueller <lu...@to...> * test/Makefile.am: Remove the SOURCES variables - they are not necessary. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.226 retrieving revision 1.227 diff -u -p -d -r1.226 -r1.227 --- ChangeLog 24 Oct 2005 15:25:26 -0000 1.226 +++ ChangeLog 27 Dec 2005 21:23:14 -0000 1.227 @@ -1,3 +1,7 @@ +2005-12-27 Lutz Mueller <lu...@to...> + + * test/Makefile.am: Remove the SOURCES variables - they are not necessary. + 2005-10-24 Jan Patera <pa...@us...> * libexif/Canon/mnote-canon-entry.c: Don't check size of MNOTE_CANON_TAG_OWNER |
|
From: Lutz M. <lu...@us...> - 2005-12-27 21:23:31
|
Update of /cvsroot/libexif/libexif/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11184/test Modified Files: Makefile.am Log Message: 2005-12-27 Lutz Mueller <lu...@to...> * test/Makefile.am: Remove the SOURCES variables - they are not necessary. Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -d -r1.18 -r1.19 --- Makefile.am 26 Dec 2005 00:40:15 -0000 1.18 +++ Makefile.am 27 Dec 2005 21:23:16 -0000 1.19 @@ -14,11 +14,8 @@ TESTS = test-mem test-value check_PROGRAMS = test-mem test-mnote test-value -test_mem_SOURCES = test_mem.c test_mem_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) -test_mnote_SOURCES = test_mnote.c test_mnote_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) -test_value_SOURCES = test_value.c test_value_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) |
|
From: Hans U. N. <hu...@us...> - 2005-12-26 01:10:08
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28580 Added Files: README-Win32.txt Log Message: add README-Win32.txt --- NEW FILE: README-Win32.txt --- If this is a combined source/binary distribution tree, then you can find * the binary DLL in the subdirectory binary/bin/ * the include files in the subdirectory binary/include/ As for building libexif yourself on or for Win32, you can a) hack yourself a build system somehow This seems to be the Windows way of doing things. b) Use MinGW32 If you use MinGW32 (including MSYS) on Windows, building libexif should follow the usual pattern of ./configure make make install as for any Unix like system and you can just follow the general instructions. Something neat to do is to use a MinGW32 cross compiler on a Unix system (Debian ships one for example). Then you can run ./configure --host=i586-mingw32msvc --disable-nls make make install If you want to build a combined source/binary distribution tarball/zipfile, then add the --enable-ship-binaries option to the ./configure command line. |
|
From: Hans U. N. <hu...@us...> - 2005-12-26 00:40:23
|
Update of /cvsroot/libexif/libexif/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23350/test Modified Files: Makefile.am Log Message: ship test programs in source tarball Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -d -r1.17 -r1.18 --- Makefile.am 20 Jun 2005 08:38:18 -0000 1.17 +++ Makefile.am 26 Dec 2005 00:40:15 -0000 1.18 @@ -14,6 +14,11 @@ TESTS = test-mem test-value check_PROGRAMS = test-mem test-mnote test-value +test_mem_SOURCES = test_mem.c test_mem_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) + +test_mnote_SOURCES = test_mnote.c test_mnote_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) + +test_value_SOURCES = test_value.c test_value_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL) |
|
From: Hans U. N. <hu...@us...> - 2005-12-26 00:39:59
|
Update of /cvsroot/libexif/libexif/binary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23153/binary Added Files: Makefile.am Log Message: help support tarball/zip distributions with binaries --- NEW FILE: Makefile.am --- if SHIP_BINARIES EXTRA_DIST = include bin SH_DIST_HOOK = dist-ship-binary-hook dist-ship-binary-hook include bin: cd "$(top_builddir)" && $(MAKE) includedir="$(PWD)/include" DESTDIR="" prefix="$(PWD)/tmp" install mkdir -p "$(PWD)/bin" cp "$(PWD)/tmp/bin/"*.dll "bin/" endif dist-hook: $(SH_DIST_HOOK) |
|
From: Hans U. N. <hu...@us...> - 2005-12-26 00:39:59
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23153 Modified Files: Makefile.am configure.ac Log Message: help support tarball/zip distributions with binaries Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- configure.ac 28 Sep 2005 06:48:27 -0000 1.11 +++ configure.ac 26 Dec 2005 00:39:50 -0000 1.12 @@ -2,7 +2,7 @@ AC_PREREQ(2.59) AC_INIT([EXIF library],[0.6.13],[lib...@li...],[libexif]) AC_CONFIG_SRCDIR([libexif/exif-data.h]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2]) +AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2 dist-zip]) if test ! -d "$srcdir/m4m"; then AC_MSG_ERROR([ @@ -59,6 +59,22 @@ dnl that will always be available AX_NEED_STDINT_H([libexif/_stdint.h]) +dnl ------------------------------------------------------------------------ +dnl Whether we're supposed to ship binaries in the tarball +dnl ------------------------------------------------------------------------ + +ship_binaries=false +AC_ARG_ENABLE([ship-binaries], +[AS_HELP_STRING([--enable-ship-binaries], +[Whether to ship binaries in the tarball [default=no]])],[ + if test x$enableval = xyes; then + ship_binaries=true + fi +]) +AM_CONDITIONAL([SHIP_BINARIES],[$ship_binaries]) +GP_CONFIG_MSG([Ship binaries in tarball],[$ship_binaries]) + + dnl --------------------------------------------------------------------------- dnl Whether -lm is required for our math functions dnl --------------------------------------------------------------------------- @@ -148,6 +164,7 @@ AC_CONFIG_FILES([ doc/Doxyfile doc/Doxyfile-internals libexif/libexif.pc + binary/Makefile ]) AC_OUTPUT Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -d -r1.39 -r1.40 --- Makefile.am 12 Apr 2005 03:27:08 -0000 1.39 +++ Makefile.am 26 Dec 2005 00:39:50 -0000 1.40 @@ -1,6 +1,10 @@ -SUBDIRS = m4m po libexif test doc +SUBDIRS = m4m po libexif test doc binary -EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh +if SHIP_BINARIES +README_W32_XDIST = README-Win32.txt +endif + +EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST) ACLOCAL_AMFLAGS = -I m4m @@ -30,7 +34,7 @@ $(srcdir)/ChangeLog.cvs: usermap=""; \ fi; \ (cd "$(srcdir)" && cvs2cl $${usermap} -f "ChangeLog.cvs") - + .PHONY: cvs-tag-release cvs-tag-release: @tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \ |
|
From: Hans U. N. <hu...@us...> - 2005-12-25 23:42:58
|
Update of /cvsroot/libexif/libexif/binary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11629/binary Log Message: Directory /cvsroot/libexif/libexif/binary added to the repository |
|
From: Jan P. <pa...@us...> - 2005-10-24 15:25:37
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23556 Modified Files: ChangeLog Log Message: libexif/Canon/mnote-canon-entry.c: Don't check size of MNOTE_CANON_TAG_OWNER and MNOTE_CANON_TAG_FIRMWARE - I have seen many different values (14, 22, 24, 32...) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.225 retrieving revision 1.226 diff -u -p -d -r1.225 -r1.226 --- ChangeLog 27 Aug 2005 10:30:10 -0000 1.225 +++ ChangeLog 24 Oct 2005 15:25:26 -0000 1.226 @@ -1,3 +1,8 @@ +2005-10-24 Jan Patera <pa...@us...> + + * libexif/Canon/mnote-canon-entry.c: Don't check size of MNOTE_CANON_TAG_OWNER + and MNOTE_CANON_TAG_FIRMWARE - there can be many different values. + 2005-08-27 Jan Patera <pa...@us...> * Canon mnote: Both parts of Settings had indices shifted by 1. |
|
From: Jan P. <pa...@us...> - 2005-10-24 15:25:34
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23556/libexif/canon Modified Files: mnote-canon-entry.c Log Message: libexif/Canon/mnote-canon-entry.c: Don't check size of MNOTE_CANON_TAG_OWNER and MNOTE_CANON_TAG_FIRMWARE - I have seen many different values (14, 22, 24, 32...) Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- mnote-canon-entry.c 27 Aug 2005 10:30:10 -0000 1.13 +++ mnote-canon-entry.c 24 Oct 2005 15:25:26 -0000 1.14 @@ -340,16 +340,17 @@ mnote_canon_entry_get_value (const Mnote } break; - case MNOTE_CANON_TAG_IMAGE_TYPE: case MNOTE_CANON_TAG_OWNER: - CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen); CC (entry->components, 32, val, maxlen); + /* Fall through; ImageType can have many sizes */ + case MNOTE_CANON_TAG_IMAGE_TYPE: + CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen); strncpy (val, (char *)data, MIN (entry->size, maxlen)); break; case MNOTE_CANON_TAG_FIRMWARE: CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen); - CC2 (entry->components, 24, 32, val, maxlen); +/* CC2 (entry->components, 24, 32, val, maxlen); Can also be 22 */ strncpy (val, (char *)data, MIN (entry->size, maxlen)); break; |
|
From: Marcus M. <mar...@us...> - 2005-10-02 22:30:11
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1510/libexif Modified Files: exif-entry.c Log Message: Fixed crash with NULL Copyright entry. (Bug #1306193) Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -p -d -r1.90 -r1.91 --- exif-entry.c 15 Aug 2005 20:29:16 -0000 1.90 +++ exif-entry.c 1 Oct 2005 16:32:41 -0000 1.91 @@ -682,14 +682,15 @@ exif_entry_get_value (ExifEntry *e, char strncat (val, _("(Photographer)"), maxlen - strlen (val)); /* Second part: Editor. */ - t = e->data + strlen ((char *) e->data) + 1; - ts = e->data + e->size - t; strncat (val, " - ", maxlen - strlen (val)); - if (e->size && e->data && (ts > 0) && - (strspn ((char *)t, " ") != ts)) + if (e->size && e->data) { + t = e->data + strlen ((char *) e->data) + 1; + ts = e->data + e->size - t; + if ((ts > 0) && (strspn ((char *)t, " ") != ts)) strncat (val, (char *)t, MIN (maxlen - strlen (val), ts)); - else + } else { strncat (val, _("[None]"), maxlen - strlen (val)); + } strncat (val, " ", maxlen - strlen (val)); strncat (val, _("(Editor)"), maxlen - strlen (val)); |
|
From: Marcus M. <mar...@us...> - 2005-09-28 06:55:04
|
Update of /cvsroot/libexif/exif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13528 Modified Files: de.po Log Message: updated translations Index: de.po =================================================================== RCS file: /cvsroot/libexif/exif/po/de.po,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- de.po 29 Mar 2005 05:23:18 -0000 1.11 +++ de.po 28 Sep 2005 06:54:53 -0000 1.12 @@ -1,343 +1,259 @@ +# translation of de.po to # German Translation # Copyright © 2002 Free Software Foundation, Inc. # Lutz Müller <lu...@us...>, 2002. +# Marcus Meissner <ma...@je...>, 2005. # msgid "" msgstr "" -"Project-Id-Version: exif\n" -"Report-Msgid-Bugs-To: lib...@li...\n" -"POT-Creation-Date: 2005-03-29 06:04+0200\n" -"PO-Revision-Date: 2005-03-14 04:14+0100\n" -"Last-Translator: Lutz Müller <lu...@us...>\n" -"Language-Team: Deutsch <de...@li...>\n" +"Project-Id-Version: de\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-09-28 08:52+0200\n" +"PO-Revision-Date: 2005-09-28 08:54+0200\n" +"Last-Translator: Marcus Meissner <ma...@je...>\n" +"Language-Team: <de...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10\n" #: exif/actions.c:45 #, c-format msgid "EXIF tags in '%s':" msgstr "EXIF Einträge in '%s':" -#: exif/actions.c:113 +#: exif/actions.c:114 #, c-format msgid "Unknown MakerNote format.\n" -msgstr "" +msgstr "Unbekanntes MakerNote Format.\n" -#: exif/actions.c:120 +#: exif/actions.c:121 #, c-format msgid "MakerNote does not contain any value.\n" msgstr "MakerNote enthält keinen Wert!\n" -#: exif/actions.c:123 +#: exif/actions.c:124 #, c-format msgid "MakerNote contains 1 value:\n" msgstr "MakerNote enthält einen Wert:\n" -#: exif/actions.c:126 +#: exif/actions.c:127 #, c-format msgid "MakerNote contains %i values:\n" msgstr "MakerNote enthält %i Werte:\n" -#: exif/actions.c:134 +#: exif/actions.c:135 msgid "Unknown tag" msgstr "Unbekannter Eintrag" -#: exif/actions.c:137 +#: exif/actions.c:138 msgid "Unknown value" msgstr "Unbekannter Wert" -#: exif/actions.c:162 +#: exif/actions.c:163 #, c-format msgid "EXIF tags in '%s' ('%s' byte order):" msgstr "EXIF Einträge in '%s' ('%s' Byte-Reihenfolge):" -#: exif/actions.c:167 exif/actions.c:169 +#: exif/actions.c:168 exif/actions.c:170 msgid "Tag" msgstr "Eintrag" -#: exif/actions.c:173 exif/actions.c:175 exif/main.c:297 +#: exif/actions.c:174 exif/actions.c:176 exif/main.c:349 msgid "Value" msgstr "Wert" -#: exif/actions.c:181 +#: exif/actions.c:182 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." msgstr "EXIF Daten enthalten eine Vorschau (%i Bytes)." -#: exif/actions.c:216 +#: exif/actions.c:218 #, c-format msgid "ThumbnailSize\t%i\n" -msgstr "" +msgstr "ThumbnailgröÃe\t%i\n" -#: exif/main.c:51 +#: exif/main.c:55 #, c-format msgid "Internal error. Please contact <%s>.)" msgstr "Interner Fehler. Bitte nehmen Sie Kontakt mit <%s> auf." -#: exif/main.c:68 +#: exif/main.c:74 #, c-format msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':" msgstr "Der EXIF Eintrag '%s' (0x%x, '%s') existiert in IFD '%s':" -#: exif/main.c:105 +#: exif/main.c:112 #, c-format msgid "Not enough memory." msgstr "Nicht genügend Speicher." -#: exif/main.c:123 +#: exif/main.c:130 #, c-format msgid "Too few components specified!" -msgstr "" +msgstr "Zu wenig Komponenten angegeben!" -#: exif/main.c:153 +#: exif/main.c:160 #, c-format msgid "Not yet implemented!" -msgstr "" - -#: exif/main.c:172 -#, c-format -msgid "Could not parse JPEG file '%s'." -msgstr "Konnte die JPEG Datei '%s' nicht interpretieren." +msgstr "Noch nicht implementiert!" -#: exif/main.c:182 +#: exif/main.c:233 #, c-format msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed." -msgstr "" +msgstr "Zuviel EXIF Daten (%i Bytes). Das Maximum ist %i Bytes." -#: exif/main.c:196 exif/main.c:450 +#: exif/main.c:247 exif/main.c:484 #, c-format msgid "Wrote file '%s'." msgstr "Datei '%s' geschrieben." -#: exif/main.c:275 +#: exif/main.c:327 msgid "Show IDs instead of tag names" msgstr "Zeige IDs anstelle der Namen der Einträge" -#: exif/main.c:277 +#: exif/main.c:329 msgid "Select tag" msgstr "Wähle Eintrag" -#: exif/main.c:277 +#: exif/main.c:329 msgid "tag" msgstr "Eintrag" -#: exif/main.c:279 +#: exif/main.c:331 msgid "Select IFD" msgstr "Wähle IFD" -#: exif/main.c:279 +#: exif/main.c:331 msgid "IFD" msgstr "IFD" -#: exif/main.c:281 +#: exif/main.c:333 msgid "List all EXIF tags" msgstr "Liste alle EXIF Einträge auf" -#: exif/main.c:283 +#: exif/main.c:335 msgid "Show contents of tag MakerNote" msgstr "Zeige Inhalt des MakerNote-Eintrags" -#: exif/main.c:285 +#: exif/main.c:337 msgid "Remove tag or ifd" -msgstr "" +msgstr "Entferne Tag oder IFD" -#: exif/main.c:287 +#: exif/main.c:339 msgid "Show description of tag" msgstr "Zeige Beschreibung des Eintrags" -#: exif/main.c:289 +#: exif/main.c:341 msgid "Extract thumbnail" msgstr "Extrahiere Vorschau" -#: exif/main.c:291 +#: exif/main.c:343 msgid "Remove thumbnail" msgstr "Lösche Vorschaubild" -#: exif/main.c:293 +#: exif/main.c:345 msgid "Insert FILE as thumbnail" msgstr "Füge DATEI als Vorschau ein" -#: exif/main.c:293 exif/main.c:295 +#: exif/main.c:345 exif/main.c:347 msgid "FILE" msgstr "DATEI" -#: exif/main.c:295 +#: exif/main.c:347 msgid "Write data to FILE" msgstr "Schreibe Daten in DATEI" -#: exif/main.c:299 +#: exif/main.c:351 msgid "Output in a machine-readable (tab delimited) format" msgstr "Gebe maschinenlesbares Format (tab delimited) aus." -#: exif/main.c:302 +#: exif/main.c:354 msgid "Show debugging messages" msgstr "Zeige Diagnose-Nachrichten" -#: exif/main.c:319 +#: exif/main.c:371 msgid "[OPTION...] file" msgstr "[OPTION...] datei" -#: exif/main.c:336 -#, c-format -msgid "Invalid tag '%s'!" -msgstr "Ungültiger Eintrag '%s'!" - -#: exif/main.c:347 +#: exif/main.c:391 #, c-format msgid "" "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and " "'Interoperability'." msgstr "" +"Unzulässiger IFD '%s'. Zulässige IFDs sind '0', '1', 'EXIF', 'GPS' " +"und 'Interoperability'." -#: exif/main.c:357 +#: exif/main.c:399 #, c-format +msgid "Invalid tag '%s'!" +msgstr "Ungültiger Eintrag '%s'!" + +#: exif/main.c:404 msgid "Please specify a tag!" msgstr "Bitte geben Sie einen Eintrag an!" -#: exif/main.c:361 +#: exif/main.c:405 #, c-format msgid "Tag '%s' (0x%04x, '%s'): %s" msgstr "Eintrag '%s' (0x%04x, '%s'): %s" -#: exif/main.c:385 +#: exif/main.c:434 #, c-format msgid "'%s' does not contain EXIF data!" msgstr "'%s' enthält keine EXIF Daten!" -#: exif/main.c:411 +#: exif/main.c:457 #, c-format msgid "IFD '%s' does not contain tag '%s'." msgstr "IFD '%s' enthält keinen Eintrag '%s'." -#: exif/main.c:425 +#: exif/main.c:466 #, c-format msgid "'%s' does not contain a thumbnail!" msgstr "'%s' enthält keine Vorschau!" -#: exif/main.c:437 +#: exif/main.c:474 #, c-format msgid "Could not open '%s' for writing (%m)!" msgstr "Konnte '%s' nicht zum Schreiben öffnen (%m)!" -#: exif/main.c:441 +#: exif/main.c:478 #, c-format msgid "Could not open '%s' for writing (%s)!" msgstr "Konnte '%s' nicht zum Schreiben öffnen (%s)!" -#: exif/main.c:479 +#: exif/main.c:513 #, c-format msgid "Could not open '%s' (%m)!" msgstr "Konnte '%s' nicht öffnen (%m)!" -#: exif/main.c:482 +#: exif/main.c:516 #, c-format msgid "Could not open '%s' (%s)!" msgstr "Konnte '%s' nicht öffnen (%s)!" -#: exif/main.c:493 -#, c-format -msgid "Could not allocate %i byte(s)." -msgstr "Konnte nicht %i Byte(s) zur Verfügung stellen." - -#: exif/main.c:503 +#: exif/main.c:528 #, c-format msgid "Could not read '%s' (%m)." msgstr "Konnte '%s' nicht lesen (%m)." -#: exif/main.c:506 +#: exif/main.c:531 #, c-format msgid "Could not read '%s' (%s)." msgstr "Konnte '%s' nicht lesen (%s)." -#: exif/main.c:521 -#, c-format +#: exif/main.c:542 msgid "You need to specify a tag!" msgstr "Bitte geben Sie einen Eintrag an!" -#: exif/main.c:530 exif/main.c:553 -#, c-format +#: exif/main.c:547 exif/main.c:566 msgid "You need to specify an IFD!" msgstr "Bitte geben Sie einen IFD an!" -#: exif/main.c:569 +#: exif/main.c:578 #, c-format msgid "IFD '%s' does not contain a tag '%s'!" msgstr "IFD '%s' enthält keinen Eintrag '%s'!" -#, fuzzy -#~ msgid "EXIF MakerNote tags in '%s' ('%s' byte order):" -#~ msgstr "EXIF Einträge in '%s' ('%s' Byte-Reihenfolge):" - -#, fuzzy -#~ msgid "MakerNote entry '%s' (0x%x, '%s'):" -#~ msgstr "Eintrag '%s' (0x%04x, '%s'): %s" - -#, fuzzy -#~ msgid "Select MakerNote tag" -#~ msgstr "Wähle Eintrag" - -#, fuzzy -#~ msgid "ntag" -#~ msgstr "Eintrag" - -#, fuzzy -#~ msgid "List all EXIF MakerNote tags" -#~ msgstr "Liste alle EXIF Einträge auf" - -#, fuzzy -#~ msgid "'%s' does not contain EXIF MakerNote data!" -#~ msgstr "'%s' enthält keine EXIF Daten!" - -#, fuzzy -#~ msgid "Invalid MakerNote tag '%s'!" -#~ msgstr "Ungültiger Eintrag '%s'!" - -#, fuzzy -#~ msgid "Please specify a MakerNote tag!" -#~ msgstr "Bitte geben Sie einen Eintrag an!" - -#~ msgid "Could not parse data of tag '%s'." -#~ msgstr "Konnte den Inhalt von Abschnitt '%s' nicht interpretieren." - -#~ msgid "Tag '%s' does not contain known information." -#~ msgstr "Abschnitt '%s' enthält unbekannte Informationen." - -#~ msgid "Tag '%s' contains one piece of information:" -#~ msgstr "Abschnitt '%s' enthält eine Information:" - -#~ msgid "Tag '%s' contains the following information:" -#~ msgstr "Abschitt '%s' enhält folgende Informationen:" - -#~ msgid " Format: '%s'" -#~ msgstr " Format: '%s'" - -#~ msgid " Components: %i" -#~ msgstr " Komponenten: %i" - -#~ msgid " Value: '%s'" -#~ msgstr " Wert: '%s'" - -#~ msgid " Data:" -#~ msgstr " Daten: '%s'" - -#~ msgid "EXIF IFD" -#~ msgstr "EXIF IFD" - -#~ msgid "GPS IFD" -#~ msgstr "GPS IFD" - -#~ msgid "IFD 1" -#~ msgstr "IFD 1" - -#~ msgid "Interoperability IFD" -#~ msgstr "Interoperabilitäts-IFD" - -#~ msgid "EXIF" -#~ msgstr "EXIF" - -#~ msgid "GPS" -#~ msgstr "GPS" - -#~ msgid "Interop." -#~ msgstr "Interop." |
|
From: Marcus M. <mar...@us...> - 2005-09-28 06:48:35
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12195 Modified Files: configure.ac Log Message: save CFLAGS to save_CFLAGS, no CPPFLAGS. Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -d -r1.10 -r1.11 --- configure.ac 22 Aug 2005 22:17:30 -0000 1.10 +++ configure.ac 28 Sep 2005 06:48:27 -0000 1.11 @@ -68,7 +68,7 @@ AC_ARG_VAR([MATHLIBS],[The libraries req if test "x$MATHLIBS" = "x"; then # We must not compile with -Wall -Werror here: # char *sqrt() conflicts with double sin(const double xx) in any case. - CFLAGS_save="$CPPFLAGS" + CFLAGS_save="$CFLAGS" CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="" CFLAGS="" |
|
From: Marcus M. <mar...@us...> - 2005-09-28 06:25:41
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7060 Modified Files: de.po Log Message: Nearly complete de.po translation update. Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -d -r1.26 -r1.27 --- de.po 14 Jul 2005 22:13:43 -0000 1.26 +++ de.po 28 Sep 2005 06:25:32 -0000 1.27 @@ -1,23 +1,714 @@ +# translation of de.po to # translation of de.po to deutsch # German Translation # Copyright: # Free Software Foundation, Inc., 2002 -# Lutz Mueller <lu...@us...>, 2002 -# Marcus Meissner <ma...@je...>, 2004, 2005 # This file is distributed under the same license as the libexif package. +# Lutz Mueller <lu...@us...>, 2002. +# Marcus Meissner <ma...@je...>, 2004, 2005. # [...3429 lines suppressed...] - -#, fuzzy -#~ msgid "Unknown tag 0x00ab" -#~ msgstr "Unbekannt" - -#, fuzzy -#~ msgid "Unknown tag 0x0e0e" -#~ msgstr "Unbekannt" - -#, fuzzy -#~ msgid "Unknown tag 0x0Ee10" -#~ msgstr "Unbekannt" - -#, fuzzy -#~ msgid "Unknown tag 0x0002" -#~ msgstr "Unbekannt" - -#, fuzzy -#~ msgid "Unknown tag 0x0009" -#~ msgstr "Unbekannt" |
|
From: Marcus M. <mar...@us...> - 2005-09-28 06:22:00
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6530 Modified Files: POTFILES.in Log Message: sorted, added libexif/exif-data.c,libexif/exif-loader.c,libexif/exif-log.c Index: POTFILES.in =================================================================== RCS file: /cvsroot/libexif/libexif/po/POTFILES.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- POTFILES.in 24 Apr 2005 09:01:51 -0000 1.7 +++ POTFILES.in 28 Sep 2005 06:21:52 -0000 1.8 @@ -1,12 +1,15 @@ +libexif/canon/mnote-canon-entry.c +libexif/canon/mnote-canon-tag.c libexif/exif-byte-order.c +libexif/exif-data.c libexif/exif-entry.c libexif/exif-format.c +libexif/exif-loader.c +libexif/exif-log.c libexif/exif-tag.c -libexif/canon/mnote-canon-tag.c -libexif/canon/mnote-canon-entry.c -libexif/olympus/mnote-olympus-tag.c libexif/olympus/mnote-olympus-entry.c -libexif/pentax/mnote-pentax-tag.c +libexif/olympus/mnote-olympus-tag.c libexif/pentax/mnote-pentax-entry.c -test/nls/test-nls.c +libexif/pentax/mnote-pentax-tag.c test/nls/test-codeset.c +test/nls/test-nls.c |
|
From: Jan P. <pa...@us...> - 2005-08-27 10:30:21
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv707/libexif/canon Modified Files: mnote-canon-entry.c mnote-canon-tag.c Log Message: Fix of changes from beginning of this week: * Canon mnote: Both parts of Settings had indices shifted by 1. entries[] must have secondary sorting by value which is unsigned. Wrong # of items in Settings: reading beyond allocated memory, crashes. Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- mnote-canon-tag.c 24 Aug 2005 18:15:52 -0000 1.7 +++ mnote-canon-tag.c 27 Aug 2005 10:30:10 -0000 1.8 @@ -47,38 +47,38 @@ static struct { unsigned int subtag; const char *name; } table_sub[] = { - {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Macro mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Self time")}, - {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Quality")}, - {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Flash mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 5, N_("Continuous drive mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 7, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Image size")}, - {MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Easy shooting mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Contrast")}, - {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Saturation")}, - {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("Sharpness")}, - {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("ISO")}, - {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Metering mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("Focus type")}, - {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("AF point selected")}, - {MNOTE_CANON_TAG_SETTINGS_1, 20, N_("Exposure mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Lens type")}, - {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Long focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Short focal length of lens")}, - {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Focal units per mm")}, - {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Maximal aperture")}, - {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash activity")}, - {MNOTE_CANON_TAG_SETTINGS_1, 29, N_("Flash details")}, - {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("Focus mode")}, - {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution")}, - {MNOTE_CANON_TAG_SETTINGS_1, 37, N_("Zoomed resolution base")}, - {MNOTE_CANON_TAG_SETTINGS_1, 42, N_("Color tone")}, - {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, - {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, - {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, - {MNOTE_CANON_TAG_SETTINGS_2, 15, N_("Flash bias")}, - {MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Subject distance")}, + {MNOTE_CANON_TAG_SETTINGS_1, 0, N_("Macro mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Self time")}, + {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Quality")}, + {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Flash mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Continuous drive mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 6, N_("Focus 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, 12, N_("Contrast")}, + {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Saturation")}, + {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Sharpness")}, + {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("ISO")}, + {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("Metering mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Focus type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("AF point selected")}, + {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("Exposure mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 21, N_("Lens type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Long focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Short focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Focal units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Maximal aperture")}, + {MNOTE_CANON_TAG_SETTINGS_1, 27, N_("Flash activity")}, + {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash details")}, + {MNOTE_CANON_TAG_SETTINGS_1, 31, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 35, N_("Zoomed resolution")}, + {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution base")}, + {MNOTE_CANON_TAG_SETTINGS_1, 41, N_("Color tone")}, + {MNOTE_CANON_TAG_SETTINGS_2, 6, N_("White balance")}, + {MNOTE_CANON_TAG_SETTINGS_2, 8, N_("Sequence number")}, + {MNOTE_CANON_TAG_SETTINGS_2, 13, N_("AF point used")}, + {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("Flash bias")}, + {MNOTE_CANON_TAG_SETTINGS_2, 18, N_("Subject distance")}, {0, 0, NULL} }; Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- mnote-canon-entry.c 24 Aug 2005 18:15:52 -0000 1.12 +++ mnote-canon-entry.c 27 Aug 2005 10:30:10 -0000 1.13 @@ -32,9 +32,6 @@ /* #define DEBUG */ -#undef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - #define CF(format,target,v,maxlen) \ { \ if (format != target) { \ @@ -74,127 +71,129 @@ static struct { ExifShort value; char *name; } entries [] = { - { 1, 1, N_("macro")}, - { 1, 2, N_("normal")}, - { 4, 0, N_("flash did not fire")}, - { 4, 1, N_("auto")}, - { 4, 2, N_("on")}, - { 4, 3, N_("red eyes reduction")}, - { 4, 4, N_("slow synchro")}, - { 4, 5, N_("auto + red yes reduction")}, - { 4, 6, N_("on + red eyes reduction")}, - { 4, 16, N_("external")}, - { 5, 0, N_("single or timer")}, - { 5, 1, N_("continuous")}, - { 7, 0, N_("one-Shot")}, - { 7, 1, N_("AI Servo")}, - { 7, 2, N_("AI Focus")}, - { 7, 3, N_("MF")}, - { 7, 4, N_("Single")}, - { 7, 5, N_("Continuous")}, - { 7, 6, N_("MF")}, - {10, 0, N_("large")}, - {10, 1, N_("medium")}, - {10, 2, N_("small")}, - {11, 0, N_("full auto")}, - {11, 1, N_("manual")}, - {11, 2, N_("landscape")}, - {11, 3, N_("fast shutter")}, - {11, 4, N_("slow shutter")}, - {11, 5, N_("night")}, - {11, 6, N_("Black & White")}, - {11, 7, N_("Sepia")}, - {11, 8, N_("Portrait")}, - {11, 9, N_("Sports")}, - {11, 10, N_("Macro / Close-Up")}, - {11, 11, N_("Pan Focus")}, - {13, 0xffff, N_("low")}, + { 0, 1, N_("macro")}, + { 0, 2, N_("normal")}, + { 3, 0, N_("flash did not fire")}, + { 3, 1, N_("auto")}, + { 3, 2, N_("on")}, + { 3, 3, N_("red eyes reduction")}, + { 3, 4, N_("slow synchro")}, + { 3, 5, N_("auto + red yes reduction")}, + { 3, 6, N_("on + red eyes reduction")}, + { 3, 16, N_("external")}, + { 4, 0, N_("single or timer")}, + { 4, 1, N_("continuous")}, + { 6, 0, N_("one-Shot")}, + { 6, 1, N_("AI Servo")}, + { 6, 2, N_("AI Focus")}, + { 6, 3, N_("MF")}, + { 6, 4, N_("Single")}, + { 6, 5, N_("Continuous")}, + { 6, 6, N_("MF")}, + { 9, 0, N_("large")}, + { 9, 1, N_("medium")}, + { 9, 2, N_("small")}, + {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_("Black & White")}, + {10, 7, N_("Sepia")}, + {10, 8, N_("Portrait")}, + {10, 9, N_("Sports")}, + {10, 10, N_("Macro / Close-Up")}, + {10, 11, N_("Pan Focus")}, + {12, 0x0000, N_("normal")}, + {12, 0x0001, N_("high")}, + {12, 0xffff, N_("low")}, {13, 0x0000, N_("normal")}, {13, 0x0001, N_("high")}, - {14, 0xffff, N_("low")}, + {13, 0xffff, N_("low")}, {14, 0x0000, N_("normal")}, {14, 0x0001, N_("high")}, - {15, 0xffff, N_("low")}, - {15, 0x0000, N_("normal")}, - {15, 0x0001, N_("high")}, - {16, 15, N_("auto")}, - {16, 16, N_("50")}, - {16, 17, N_("100")}, - {16, 18, N_("200")}, - {16, 19, N_("400")}, - {17, 3, N_("evaluative")}, - {17, 4, N_("partial")}, - {17, 5, N_("center-weighted")}, - {19, 0x3000, N_("none (manual focus)")}, - {19, 0x3001, N_("auto-selected")}, - {19, 0x3002, N_("right")}, - {19, 0x3003, N_("center")}, - {19, 0x3004, N_("left")}, - {20, 0, N_("easy shooting")}, - {20, 1, N_("program")}, - {20, 2, N_("Tv-priority")}, - {20, 3, N_("Av-priority")}, - {20, 4, N_("manual")}, - {20, 5, N_("A-DEP")}, - {22, 0x001, N_("Canon EF 50mm f/1.8")}, - {22, 0x002, N_("Canon EF 28mm f/2.8")}, - {22, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")}, - {22, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")}, - {22, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, - {22, 0x011, N_("Canon EF 35mm f/2")}, - {22, 0x013, N_("Canon EF 15mm f/2.8")}, - {22, 0x021, N_("Canon EF 80-200mm f/2.8L")}, - {22, 0x026, N_("Cosina 100mm f/3.5 Macro AF")}, - {22, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, - {22, 0x029, N_("Canon EF 50mm f/1.8 MkII")}, - {22, 0x039, N_("Canon EF 75-300mm f/4-5.6")}, - {22, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")}, - {22, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, - {22, 0x125, N_("Canon TS-E 24mm f/3.5L")}, - {22, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, - {22, 0x135, N_("Canon EF 200mm f/1.8L")}, - {22, 0x136, N_("Canon EF 300mm f/2.8L")}, - {22, 0x139, N_("Canon EF 400mm f/2.8L")}, - {22, 0x141, N_("Canon EF 500mm f/4.5L")}, - {22, 0x149, N_("Canon EF 100mm f/2")}, - {22, 0x150, N_("Sigma 20mm EX f/1.8")}, - {22, 0x151, N_("Canon EF 200mm f/2.8L")}, - {22, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")}, - {22, 0x155, N_("Canon EF 85mm f/1.8 USM")}, - {22, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")}, - {22, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")}, - {22, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")}, - {22, 0x165, N_("Canon EF 70-200mm f/2.8 L")}, - {22, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")}, - {22, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")}, - {22, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")}, - {22, 0x170, N_("Canon EF 200mm f/2.8L II")}, - {22, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")}, - {22, 0x174, N_("Canon EF 135mm f/2L")}, - {22, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")}, - {22, 0x177, N_("Canon EF 300mm f/4L IS")}, - {22, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")}, - {22, 0x180, N_("Canon EF 35mm f/1.4L")}, - {22, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")}, - {22, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")}, - {22, 0x186, N_("Canon EF 70-200mm f/4L")}, - {22, 0x190, N_("Canon EF 100mm f/2.8 Macro")}, - {22, 0x191, N_("Canon EF 400mm f/4 DO IS")}, - {22, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")}, - {22, 0x198, N_("Canon EF 50mm f/1.4")}, - {22, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")}, - {22, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")}, - {22, 0x229, N_("Canon EF 16-35mm f/2.8L")}, - {22, 0x230, N_("Canon EF 24-70mm f/2.8L")}, - {22, 0x231, N_("Canon EF 17-40mm f/4L")}, - {32, 0, N_("single")}, - {32, 1, N_("continuous")}, + {14, 0xffff, N_("low")}, + {15, 15, N_("auto")}, + {15, 16, N_("50")}, + {15, 17, N_("100")}, + {15, 18, N_("200")}, + {15, 19, N_("400")}, + {16, 3, N_("evaluative")}, + {16, 4, N_("partial")}, + {16, 5, N_("center-weighted")}, + {18, 0x3000, N_("none (manual focus)")}, + {18, 0x3001, N_("auto-selected")}, + {18, 0x3002, N_("right")}, + {18, 0x3003, N_("center")}, + {18, 0x3004, N_("left")}, + {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")}, + {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")}, + {31, 0, N_("single")}, + {31, 1, N_("continuous")}, { 0, 0, NULL} }; unsigned int mnote_canon_entry_count_values (const MnoteCanonEntry *entry) { + unsigned int val; + if (!entry) return 0; switch (entry->tag) { @@ -202,7 +201,10 @@ mnote_canon_entry_count_values (const Mn case MNOTE_CANON_TAG_SETTINGS_2: case MNOTE_CANON_TAG_CUSTOM_FUNCS: if (entry->format != EXIF_FORMAT_SHORT) return 0; - return exif_get_short (entry->data, entry->order) / 2; + + val = exif_get_short (entry->data, entry->order); + /* val is buffer size, i.e. # of values plus 1 */ + return MIN (entry->size - 2, val) / 2; default: return 1; } @@ -230,23 +232,21 @@ mnote_canon_entry_get_value (const Mnote CC (entry->components, n, val, maxlen); vs = exif_get_short (entry->data + 2 + t * 2, entry->order); switch (t) { - case 0: - break; - case 2: + case 1: if (!vs) break; snprintf (buf, sizeof (buf), _("%i (ms)"), vs * 100); strncpy (val, buf, maxlen - strlen (val)); break; + case 22: case 23: - case 24: snprintf (buf, sizeof (buf), "%u", vs); strncpy (val, buf, maxlen - strlen (val)); break; - case 25: + case 24: snprintf (buf, sizeof (buf), _("%u mm"), vs); strncpy (val, buf, maxlen - strlen(val)); break; - case 29: + case 28: if ((vs >> 14) & 1) strncpy (val, _("External E-TTL"), maxlen - strlen (val)); if ((vs >> 13) & 1) @@ -278,7 +278,7 @@ mnote_canon_entry_get_value (const Mnote CC (entry->components, n, val, maxlen); vs = exif_get_short (entry->data + 2 + t * 2, entry->order); switch (t) { - case 7: + case 6: switch (vs) { case 0: strncpy (val, _("Auto"), maxlen - strlen (val)); @@ -306,11 +306,11 @@ mnote_canon_entry_get_value (const Mnote strncpy (val, buf, maxlen - strlen (val)); } break; - case 9: + case 8: snprintf (buf, sizeof (buf), "%u", vs); strncpy (val, buf, maxlen - strlen (val)); break; - case 14: + case 13: if (vs >> 12) { if (vs & 1) strncpy (val, _("right"), maxlen - strlen (val)); @@ -325,11 +325,11 @@ mnote_canon_entry_get_value (const Mnote strncat (val, buf, maxlen - strlen (val)); } break; - case 15: + case 14: snprintf (buf, sizeof (buf), _("%.2f EV"), vs / 32.); strncpy (val, buf, maxlen - strlen (val)); break; - case 19: + case 18: snprintf (buf, sizeof (buf), _("%u mm"), vs); strncpy (val, buf, maxlen - strlen (val)); break; |
|
From: Jan P. <pa...@us...> - 2005-08-27 10:30:21
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv707 Modified Files: ChangeLog Log Message: Fix of changes from beginning of this week: * Canon mnote: Both parts of Settings had indices shifted by 1. entries[] must have secondary sorting by value which is unsigned. Wrong # of items in Settings: reading beyond allocated memory, crashes. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.224 retrieving revision 1.225 diff -u -p -d -r1.224 -r1.225 --- ChangeLog 22 Aug 2005 22:17:29 -0000 1.224 +++ ChangeLog 27 Aug 2005 10:30:10 -0000 1.225 @@ -1,3 +1,9 @@ +2005-08-27 Jan Patera <pa...@us...> + + * Canon mnote: Both parts of Settings had indices shifted by 1. + entries[] must have secondary sorting by value which is unsigned. + Wrong # of items in Settings: reading beyond allocated memory, crashes. + 2005-08-23 Lutz Mueller <lu...@us...> Some work on canon maker notes. Entries that contain several different |
|
From: Lutz M. <lu...@us...> - 2005-08-24 18:16:00
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3854 Modified Files: mnote-canon-entry.c mnote-canon-tag.c Log Message: Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- mnote-canon-tag.c 22 Aug 2005 22:59:58 -0000 1.6 +++ mnote-canon-tag.c 24 Aug 2005 18:15:52 -0000 1.7 @@ -63,12 +63,17 @@ static struct { {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("Focus type")}, {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("AF point selected")}, {MNOTE_CANON_TAG_SETTINGS_1, 20, N_("Exposure mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 22, N_("Lens type")}, {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Long focal length of lens")}, {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Short focal length of lens")}, {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Focal units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 26, N_("Maximal aperture")}, {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash activity")}, {MNOTE_CANON_TAG_SETTINGS_1, 29, N_("Flash details")}, {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 36, N_("Zoomed resolution")}, + {MNOTE_CANON_TAG_SETTINGS_1, 37, N_("Zoomed resolution base")}, + {MNOTE_CANON_TAG_SETTINGS_1, 42, N_("Color tone")}, {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- mnote-canon-entry.c 24 Aug 2005 17:54:08 -0000 1.11 +++ mnote-canon-entry.c 24 Aug 2005 18:15:52 -0000 1.12 @@ -97,45 +97,96 @@ static struct { {10, 1, N_("medium")}, {10, 2, N_("small")}, {11, 0, N_("full auto")}, - {11, 1, N_("manual")}, - {11, 2, N_("landscape")}, - {11, 3, N_("fast shutter")}, - {11, 4, N_("slow shutter")}, - {11, 5, N_("night")}, - {11, 6, N_("Black & White")}, - {11, 7, N_("Sepia")}, - {11, 8, N_("Portrait")}, - {11, 9, N_("Sports")}, - {11, 10, N_("Macro / Close-Up")}, - {11, 11, N_("Pan Focus")}, - {13, 0xffff, N_("low")}, - {13, 0x0000, N_("normal")}, - {13, 0x0001, N_("high")}, - {14, 0xffff, N_("low")}, - {14, 0x0000, N_("normal")}, - {14, 0x0001, N_("high")}, - {15, 0xffff, N_("low")}, - {15, 0x0000, N_("normal")}, - {15, 0x0001, N_("high")}, - {16, 15, N_("auto")}, - {16, 16, N_("50")}, - {16, 17, N_("100")}, - {16, 18, N_("200")}, - {16, 19, N_("400")}, - {17, 3, N_("evaluative")}, - {17, 4, N_("partial")}, - {17, 5, N_("center-weighted")}, - {19, 0x3000, N_("none (manual focus)")}, - {19, 0x3001, N_("auto-selected")}, - {19, 0x3002, N_("right")}, - {19, 0x3003, N_("center")}, - {19, 0x3004, N_("left")}, - {20, 0, N_("easy shooting")}, - {20, 1, N_("program")}, - {20, 2, N_("Tv-priority")}, - {20, 3, N_("Av-priority")}, - {20, 4, N_("manual")}, - {20, 5, N_("A-DEP")}, + {11, 1, N_("manual")}, + {11, 2, N_("landscape")}, + {11, 3, N_("fast shutter")}, + {11, 4, N_("slow shutter")}, + {11, 5, N_("night")}, + {11, 6, N_("Black & White")}, + {11, 7, N_("Sepia")}, + {11, 8, N_("Portrait")}, + {11, 9, N_("Sports")}, + {11, 10, N_("Macro / Close-Up")}, + {11, 11, N_("Pan Focus")}, + {13, 0xffff, N_("low")}, + {13, 0x0000, N_("normal")}, + {13, 0x0001, N_("high")}, + {14, 0xffff, N_("low")}, + {14, 0x0000, N_("normal")}, + {14, 0x0001, N_("high")}, + {15, 0xffff, N_("low")}, + {15, 0x0000, N_("normal")}, + {15, 0x0001, N_("high")}, + {16, 15, N_("auto")}, + {16, 16, N_("50")}, + {16, 17, N_("100")}, + {16, 18, N_("200")}, + {16, 19, N_("400")}, + {17, 3, N_("evaluative")}, + {17, 4, N_("partial")}, + {17, 5, N_("center-weighted")}, + {19, 0x3000, N_("none (manual focus)")}, + {19, 0x3001, N_("auto-selected")}, + {19, 0x3002, N_("right")}, + {19, 0x3003, N_("center")}, + {19, 0x3004, N_("left")}, + {20, 0, N_("easy shooting")}, + {20, 1, N_("program")}, + {20, 2, N_("Tv-priority")}, + {20, 3, N_("Av-priority")}, + {20, 4, N_("manual")}, + {20, 5, N_("A-DEP")}, + {22, 0x001, N_("Canon EF 50mm f/1.8")}, + {22, 0x002, N_("Canon EF 28mm f/2.8")}, + {22, 0x004, N_("Sigma UC Zoom 35-135mm f/4-5.6")}, + {22, 0x006, N_("Tokina AF193-2 19-35mm f/3.5-4.5")}, + {22, 0x010, N_("Sigma 50mm f/2.8 EX or 28mm f/1.8")}, + {22, 0x011, N_("Canon EF 35mm f/2")}, + {22, 0x013, N_("Canon EF 15mm f/2.8")}, + {22, 0x021, N_("Canon EF 80-200mm f/2.8L")}, + {22, 0x026, N_("Cosina 100mm f/3.5 Macro AF")}, + {22, 0x028, N_("Tamron AF Aspherical 28-200mm f/3.8-5.6")}, + {22, 0x029, N_("Canon EF 50mm f/1.8 MkII")}, + {22, 0x039, N_("Canon EF 75-300mm f/4-5.6")}, + {22, 0x040, N_("Canon EF 28-80mm f/3.5-5.6")}, + {22, 0x124, N_("Canon MP-E 65mm f/2.8 1-5x Macro Photo")}, + {22, 0x125, N_("Canon TS-E 24mm f/3.5L")}, + {22, 0x131, N_("Sigma 17-35mm f2.8-4 EX Aspherical HSM")}, + {22, 0x135, N_("Canon EF 200mm f/1.8L")}, + {22, 0x136, N_("Canon EF 300mm f/2.8L")}, + {22, 0x139, N_("Canon EF 400mm f/2.8L")}, + {22, 0x141, N_("Canon EF 500mm f/4.5L")}, + {22, 0x149, N_("Canon EF 100mm f/2")}, + {22, 0x150, N_("Sigma 20mm EX f/1.8")}, + {22, 0x151, N_("Canon EF 200mm f/2.8L")}, + {22, 0x153, N_("Canon EF 35-350mm f/3.5-5.6L")}, + {22, 0x155, N_("Canon EF 85mm f/1.8 USM")}, + {22, 0x156, N_("Canon EF 28-105mm f/3.5-4.5 USM")}, + {22, 0x160, N_("Canon EF 20-35mm f/3.5-4.5 USM")}, + {22, 0x161, N_("Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8")}, + {22, 0x165, N_("Canon EF 70-200mm f/2.8 L")}, + {22, 0x166, N_("Canon EF 70-200mm f/2.8 L + x1.4")}, + {22, 0x167, N_("Canon EF 70-200mm f/2.8 L + x2")}, + {22, 0x169, N_("Sigma 15-30mm f/3.5-4.5 EX DG Aspherical")}, + {22, 0x170, N_("Canon EF 200mm f/2.8L II")}, + {22, 0x173, N_("Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5")}, + {22, 0x174, N_("Canon EF 135mm f/2L")}, + {22, 0x176, N_("Canon EF 24-85mm f/3.5-4.5 USM")}, + {22, 0x177, N_("Canon EF 300mm f/4L IS")}, + {22, 0x178, N_("Canon EF 28-135mm f/3.5-5.6 IS")}, + {22, 0x180, N_("Canon EF 35mm f/1.4L")}, + {22, 0x182, N_("Canon EF 100-400mm f/4.5-5.6L IS + x2")}, + {22, 0x183, N_("Canon EF 100-400mm f/4.5-5.6L IS")}, + {22, 0x186, N_("Canon EF 70-200mm f/4L")}, + {22, 0x190, N_("Canon EF 100mm f/2.8 Macro")}, + {22, 0x191, N_("Canon EF 400mm f/4 DO IS")}, + {22, 0x197, N_("Canon EF 75-300mm f/4-5.6 IS")}, + {22, 0x198, N_("Canon EF 50mm f/1.4")}, + {22, 0x202, N_("Canon EF 28-80 f/3.5-5.6 USM IV")}, + {22, 0x213, N_("Canon EF 90-300mm f/4.5-5.6")}, + {22, 0x229, N_("Canon EF 16-35mm f/2.8L")}, + {22, 0x230, N_("Canon EF 24-70mm f/2.8L")}, + {22, 0x231, N_("Canon EF 17-40mm f/4L")}, {32, 0, N_("single")}, {32, 1, N_("continuous")}, { 0, 0, NULL} |
|
From: Lutz M. <lu...@us...> - 2005-08-24 17:54:31
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31004 Modified Files: mnote-canon-entry.c Log Message: Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -d -r1.10 -r1.11 --- mnote-canon-entry.c 22 Aug 2005 22:59:58 -0000 1.10 +++ mnote-canon-entry.c 24 Aug 2005 17:54:08 -0000 1.11 @@ -96,7 +96,7 @@ static struct { {10, 0, N_("large")}, {10, 1, N_("medium")}, {10, 2, N_("small")}, - {11, 0, N_("Full Auto")}, + {11, 0, N_("full auto")}, {11, 1, N_("manual")}, {11, 2, N_("landscape")}, {11, 3, N_("fast shutter")}, @@ -125,7 +125,7 @@ static struct { {17, 3, N_("evaluative")}, {17, 4, N_("partial")}, {17, 5, N_("center-weighted")}, - {19, 0x3000, N_("none (MF)")}, + {19, 0x3000, N_("none (manual focus)")}, {19, 0x3001, N_("auto-selected")}, {19, 0x3002, N_("right")}, {19, 0x3003, N_("center")}, @@ -134,7 +134,7 @@ static struct { {20, 1, N_("program")}, {20, 2, N_("Tv-priority")}, {20, 3, N_("Av-priority")}, - {20, 4, N_("Manual")}, + {20, 4, N_("manual")}, {20, 5, N_("A-DEP")}, {32, 0, N_("single")}, {32, 1, N_("continuous")}, |
|
From: Lutz M. <lu...@us...> - 2005-08-22 23:00:09
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17612/libexif/canon Modified Files: exif-mnote-data-canon.c mnote-canon-entry.c mnote-canon-tag.c Log Message: 2005-08-23 Lutz Mueller <lu...@us...> Some work on canon maker notes. Entries that contain several different values now expand to different entries. Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- mnote-canon-tag.c 22 Aug 2005 22:17:31 -0000 1.5 +++ mnote-canon-tag.c 22 Aug 2005 22:59:58 -0000 1.6 @@ -47,6 +47,28 @@ static struct { unsigned int subtag; const char *name; } table_sub[] = { + {MNOTE_CANON_TAG_SETTINGS_1, 1, N_("Macro mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 2, N_("Self time")}, + {MNOTE_CANON_TAG_SETTINGS_1, 3, N_("Quality")}, + {MNOTE_CANON_TAG_SETTINGS_1, 4, N_("Flash mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 5, N_("Continuous drive mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 7, N_("Focus mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 10, N_("Image size")}, + {MNOTE_CANON_TAG_SETTINGS_1, 11, N_("Easy shooting mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 13, N_("Contrast")}, + {MNOTE_CANON_TAG_SETTINGS_1, 14, N_("Saturation")}, + {MNOTE_CANON_TAG_SETTINGS_1, 15, N_("Sharpness")}, + {MNOTE_CANON_TAG_SETTINGS_1, 16, N_("ISO")}, + {MNOTE_CANON_TAG_SETTINGS_1, 17, N_("Metering mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 18, N_("Focus type")}, + {MNOTE_CANON_TAG_SETTINGS_1, 19, N_("AF point selected")}, + {MNOTE_CANON_TAG_SETTINGS_1, 20, N_("Exposure mode")}, + {MNOTE_CANON_TAG_SETTINGS_1, 23, N_("Long focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 24, N_("Short focal length of lens")}, + {MNOTE_CANON_TAG_SETTINGS_1, 25, N_("Focal units per mm")}, + {MNOTE_CANON_TAG_SETTINGS_1, 28, N_("Flash activity")}, + {MNOTE_CANON_TAG_SETTINGS_1, 29, N_("Flash details")}, + {MNOTE_CANON_TAG_SETTINGS_1, 32, N_("Focus mode")}, {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, Index: exif-mnote-data-canon.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- exif-mnote-data-canon.c 22 Aug 2005 22:17:31 -0000 1.13 +++ exif-mnote-data-canon.c 22 Aug 2005 22:59:57 -0000 1.14 @@ -67,7 +67,7 @@ exif_mnote_data_canon_get_tags (ExifMnot unsigned int from = 0, to; if (!dc || !m) return; - for (*m = 1; *m < dc->count; (*m)++) { + for (*m = 0; *m < dc->count; (*m)++) { to = from + mnote_canon_entry_count_values (&dc->entries[*m]); if (to > n) { if (s) *s = n - from; Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -d -r1.9 -r1.10 --- mnote-canon-entry.c 22 Aug 2005 22:17:31 -0000 1.9 +++ mnote-canon-entry.c 22 Aug 2005 22:59:58 -0000 1.10 @@ -70,13 +70,13 @@ #define UNDEFINED 0xFF static struct { - unsigned int tag; unsigned int subtag; - char *value; + ExifShort value; + char *name; } entries [] = { - { 1, 1, N_("Macro")}, - { 1, 2, N_("Normal")}, - { 4, 0, N_("Flash not fired")}, + { 1, 1, N_("macro")}, + { 1, 2, N_("normal")}, + { 4, 0, N_("flash did not fire")}, { 4, 1, N_("auto")}, { 4, 2, N_("on")}, { 4, 3, N_("red eyes reduction")}, @@ -86,82 +86,61 @@ static struct { { 4, 16, N_("external")}, { 5, 0, N_("single or timer")}, { 5, 1, N_("continuous")}, - { 7, 0, N_("One-Shot")}, + { 7, 0, N_("one-Shot")}, { 7, 1, N_("AI Servo")}, { 7, 2, N_("AI Focus")}, { 7, 3, N_("MF")}, { 7, 4, N_("Single")}, { 7, 5, N_("Continuous")}, { 7, 6, N_("MF")}, - {10, 0, N_("Large")}, - {10, 1, N_("Medium")}, - {10, 2, N_("Small")}, + {10, 0, N_("large")}, + {10, 1, N_("medium")}, + {10, 2, N_("small")}, {11, 0, N_("Full Auto")}, - {11, 1, N_("Manual")}, - {11, 2, N_("Landscape")}, - {11, 3, N_("Fast Shutter")}, - {11, 4, N_("Slow Shutter")}, - {11, 5, N_("Night")}, + {11, 1, N_("manual")}, + {11, 2, N_("landscape")}, + {11, 3, N_("fast shutter")}, + {11, 4, N_("slow shutter")}, + {11, 5, N_("night")}, {11, 6, N_("Black & White")}, {11, 7, N_("Sepia")}, {11, 8, N_("Portrait")}, {11, 9, N_("Sports")}, {11, 10, N_("Macro / Close-Up")}, {11, 11, N_("Pan Focus")}, - {13, 0xffff, N_("Low")}, - {13, 0x0000, N_("Normal")}, - {13, 0x0001, N_("High")}, - {14, 0xffff, N_("Low")}, - {14, 0x0000, N_("Normal")}, - {14, 0x0001, N_("High")}, - {15, 0xffff, N_("Low")}, - {15, 0x0000, N_("Normal")}, - {15, 0x0001, N_("High")}, + {13, 0xffff, N_("low")}, + {13, 0x0000, N_("normal")}, + {13, 0x0001, N_("high")}, + {14, 0xffff, N_("low")}, + {14, 0x0000, N_("normal")}, + {14, 0x0001, N_("high")}, + {15, 0xffff, N_("low")}, + {15, 0x0000, N_("normal")}, + {15, 0x0001, N_("high")}, {16, 15, N_("auto")}, {16, 16, N_("50")}, {16, 17, N_("100")}, {16, 18, N_("200")}, {16, 19, N_("400")}, - {17, 3, N_("Evaluative")}, - {17, 4, N_("Partial")}, - {17, 5, N_("Center-weighted")}, + {17, 3, N_("evaluative")}, + {17, 4, N_("partial")}, + {17, 5, N_("center-weighted")}, {19, 0x3000, N_("none (MF)")}, {19, 0x3001, N_("auto-selected")}, {19, 0x3002, N_("right")}, {19, 0x3003, N_("center")}, {19, 0x3004, N_("left")}, - {20, 0, N_("Easy shooting")}, - {20, 1, N_("Program")}, + {20, 0, N_("easy shooting")}, + {20, 1, N_("program")}, {20, 2, N_("Tv-priority")}, {20, 3, N_("Av-priority")}, {20, 4, N_("Manual")}, {20, 5, N_("A-DEP")}, - {32, 0, N_("Single")}, - {32, 1, N_("Continuous")}, + {32, 0, N_("single")}, + {32, 1, N_("continuous")}, { 0, 0, NULL} }; -static struct { - unsigned int tag; - char *value; -} headings[] = { - { 1, N_("Macro mode")}, - { 4, N_(" / Flash mode : ")}, - { 5, N_(" / Continuous drive mode : ")}, - { 7, N_(" / Focus mode : ")}, - {10, N_(" / Image size : ")}, - {11, N_(" / Easy shooting mode : ")}, - {13, N_(" / Contrast : ")}, - {14, N_(" / Saturation : ")}, - {15, N_(" / Sharpness : ")}, - {16, N_(" / ISO : ")}, - {17, N_(" / Metering mode : ")}, - {19, N_(" / AF point selected : ")}, - {20, N_(" / Exposure mode : ")}, - {32, N_(" / Focus mode2 : ")}, - { 0, NULL} -}; - unsigned int mnote_canon_entry_count_values (const MnoteCanonEntry *entry) { @@ -184,7 +163,7 @@ mnote_canon_entry_get_value (const Mnote char buf[128]; ExifLong vl; ExifShort vs, n; - unsigned int i, j, k; + unsigned int j; unsigned char *data = entry->data; if (!entry) return NULL; @@ -203,53 +182,40 @@ mnote_canon_entry_get_value (const Mnote case 0: break; case 2: - if (vs) { - snprintf (buf, sizeof (buf), _(" / Self Timer : %i (ms)"), vs*100); - strncat (val, buf, maxlen - strlen(val)); - } + if (!vs) break; + snprintf (buf, sizeof (buf), _("%i (ms)"), vs * 100); + strncpy (val, buf, maxlen - strlen (val)); break; case 23: - snprintf (buf, sizeof (buf), _(" / long focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; case 24: - snprintf (buf, sizeof (buf), _(" / short focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); + snprintf (buf, sizeof (buf), "%u", vs); + strncpy (val, buf, maxlen - strlen (val)); break; case 25: - snprintf (buf, sizeof (buf), _(" / focal units per mm : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); + snprintf (buf, sizeof (buf), _("%u mm"), vs); + strncpy (val, buf, maxlen - strlen(val)); break; case 29: - strncat (val, _(" / Flash details : "), maxlen - strlen(val)); - if ((vs>>14)&1) - strncat (val, _("External E-TTL"), maxlen - strlen(val)); - if ((vs>>13)&1) - strncat (val, _("Internal flash"), maxlen - strlen(val)); - if ((vs>>11)&1) - strncat (val, _("FP sync used"), maxlen - strlen(val)); - if ((vs>>4)&1) - strncat (val, _("FP sync enabled"), maxlen - strlen(val)); + if ((vs >> 14) & 1) + strncpy (val, _("External E-TTL"), maxlen - strlen (val)); + if ((vs >> 13) & 1) + strncpy (val, _("Internal flash"), maxlen - strlen (val)); + if ((vs >> 11) & 1) + strncpy (val, _("FP sync used"), maxlen - strlen (val)); + if ((vs >> 4) & 1) + strncpy (val, _("FP sync enabled"), maxlen - strlen (val)); break; - default: - - /* Title of tag */ - for (k = 0; (headings[k].tag != t) && headings[k].tag; k++); - strncat (val, - headings[k].value ? headings[k].value : _(" / Unknown : "), - maxlen - strlen (val)); - - /* Value of tag */ - for (j = 0; entries[j].tag && ((entries[j].tag < t) || - ((entries[j].tag == i) && entries[j].subtag <= vs)); j++) - if ((entries[j].tag == i) && (entries[j].subtag == vs)) break; - if ((entries[j].tag != i) || (entries[j].subtag != vs)) break; - if (entries[j].subtag == vs) - strncat (val, entries[j]. value, maxlen - strlen (val)); + default: + for (j = 0; entries[j].name && ((entries[j].subtag < t) || + ((entries[j].subtag == t) && entries[j].value <= vs)); j++) + if ((entries[j].subtag == t) && (entries[j].value == vs)) break; + if ((entries[j].subtag == t) && + (entries[j].value == vs) && entries[j].name) + strncpy (val, entries[j]. name, maxlen - strlen (val)); else { - snprintf (buf, sizeof (buf), entries[j].value, vs); - strncat (val, buf, maxlen - strlen (val)); + snprintf (buf, sizeof (buf), "0x%04x", vs); + strncpy (val, buf, maxlen - strlen (val)); } } break; @@ -296,15 +262,15 @@ mnote_canon_entry_get_value (const Mnote case 14: if (vs >> 12) { if (vs & 1) - strncpy (val, _("Right"), maxlen - strlen (val)); + strncpy (val, _("right"), maxlen - strlen (val)); if ((vs >> 1) & 1) - strncpy (val, _("Center"), maxlen - strlen (val)); + strncpy (val, _("center"), maxlen - strlen (val)); if ((vs >> 2) & 1) - strncpy (val, _("Left"), maxlen - strlen (val)); + strncpy (val, _("left"), maxlen - strlen (val)); if (vs >> 12 == 1) snprintf (buf, sizeof (buf), _(" (1 available focus point)")); else - snprintf (buf, sizeof (buf), _(" (%u available focus point)"), vs >> 12); + snprintf (buf, sizeof (buf), _(" (%u available focus points)"), vs >> 12); strncat (val, buf, maxlen - strlen (val)); } break; @@ -316,6 +282,10 @@ mnote_canon_entry_get_value (const Mnote snprintf (buf, sizeof (buf), _("%u mm"), vs); strncpy (val, buf, maxlen - strlen (val)); break; + default: + snprintf (buf, sizeof (buf), "0x%04x", vs); + strncpy (val, buf, maxlen - strlen (val)); + break; } break; |
|
From: Lutz M. <lu...@us...> - 2005-08-22 22:17:39
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10193/libexif/canon Modified Files: exif-mnote-data-canon.c mnote-canon-entry.c mnote-canon-entry.h mnote-canon-tag.c mnote-canon-tag.h Log Message: 2005-08-23 Lutz Mueller <lu...@us...> Some work on canon maker notes. Entries that contain several different values now expand to different entries. Index: mnote-canon-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- mnote-canon-tag.c 17 Mar 2005 16:00:25 -0000 1.4 +++ mnote-canon-tag.c 22 Aug 2005 22:17:31 -0000 1.5 @@ -42,6 +42,19 @@ static struct { {0, NULL, NULL, NULL} }; +static struct { + MnoteCanonTag tag; + unsigned int subtag; + const char *name; +} table_sub[] = { + {MNOTE_CANON_TAG_SETTINGS_2, 7, N_("White balance")}, + {MNOTE_CANON_TAG_SETTINGS_2, 9, N_("Sequence number")}, + {MNOTE_CANON_TAG_SETTINGS_2, 14, N_("AF point used")}, + {MNOTE_CANON_TAG_SETTINGS_2, 15, N_("Flash bias")}, + {MNOTE_CANON_TAG_SETTINGS_2, 19, N_("Subject distance")}, + {0, 0, NULL} +}; + const char * mnote_canon_tag_get_name (MnoteCanonTag t) { @@ -53,6 +66,16 @@ mnote_canon_tag_get_name (MnoteCanonTag } const char * +mnote_canon_tag_get_name_sub (MnoteCanonTag t, unsigned int s) +{ + unsigned int i; + for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) + if ((table_sub[i].tag == t) && (table_sub[i].subtag == s)) + return _(table_sub[i].name); + return mnote_canon_tag_get_name (t); +} + +const char * mnote_canon_tag_get_title (MnoteCanonTag t) { unsigned int i; @@ -64,6 +87,16 @@ mnote_canon_tag_get_title (MnoteCanonTag } const char * +mnote_canon_tag_get_title_sub (MnoteCanonTag t, unsigned int s) +{ + unsigned int i; + for (i = 0; i < sizeof (table_sub) / sizeof (table_sub[0]); i++) + if ((table_sub[i].tag == t) && (table_sub[i].subtag == s)) + return _(table_sub[i].name); + return mnote_canon_tag_get_title (t); +} + +const char * mnote_canon_tag_get_description (MnoteCanonTag t) { unsigned int i; Index: mnote-canon-tag.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- mnote-canon-tag.h 26 Oct 2003 10:06:17 -0000 1.1 +++ mnote-canon-tag.h 22 Aug 2005 22:17:31 -0000 1.2 @@ -41,9 +41,11 @@ enum _MnoteCanonTag { }; typedef enum _MnoteCanonTag MnoteCanonTag; -const char *mnote_canon_tag_get_name (MnoteCanonTag tag); -const char *mnote_canon_tag_get_title (MnoteCanonTag tag); -const char *mnote_canon_tag_get_description (MnoteCanonTag tag); +const char *mnote_canon_tag_get_name (MnoteCanonTag); +const char *mnote_canon_tag_get_name_sub (MnoteCanonTag, unsigned int); +const char *mnote_canon_tag_get_title (MnoteCanonTag); +const char *mnote_canon_tag_get_title_sub (MnoteCanonTag, unsigned int); +const char *mnote_canon_tag_get_description (MnoteCanonTag); #ifdef __cplusplus } Index: mnote-canon-entry.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- mnote-canon-entry.h 7 Jan 2004 14:53:04 -0000 1.2 +++ mnote-canon-entry.h 22 Aug 2005 22:17:31 -0000 1.3 @@ -38,6 +38,7 @@ struct _MnoteCanonEntry { ExifByteOrder order; }; -char *mnote_canon_entry_get_value (const MnoteCanonEntry *entry, char *val, unsigned int maxlen); +unsigned int mnote_canon_entry_count_values (const MnoteCanonEntry *); +char *mnote_canon_entry_get_value (const MnoteCanonEntry *, unsigned int t, char *val, unsigned int maxlen); #endif /* __MNOTE_CANON_ENTRY_H__ */ Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -d -r1.8 -r1.9 --- mnote-canon-entry.c 1 Jul 2005 10:14:56 -0000 1.8 +++ mnote-canon-entry.c 22 Aug 2005 22:17:31 -0000 1.9 @@ -67,286 +67,256 @@ } \ } -char * -mnote_canon_entry_get_value (const MnoteCanonEntry *entry, char *val, unsigned int maxlen) -{ - char buf[128]; - ExifLong vl; - ExifShort vs, n; - int i; - unsigned char *data = entry->data; - - #define UNDEFINED 0xFF static struct { - int tag; - int subtag; - char* value; + unsigned int tag; + unsigned int subtag; + char *value; } entries [] = { - {1,1,N_("Macro")}, - {1,2,N_("Normal")}, - {1,UNDEFINED,N_("%i???")}, - {4,0,N_("Flash not fired")}, - {4,1,N_("auto")}, - {4,2,N_("on")}, - {4,3,N_("red eyes reduction")}, - {4,4,N_("slow synchro")}, - {4,5,N_("auto + red yes reduction")}, - {4,6,N_("on + red eyes reduction")}, - {4,16,N_("external")}, - {4,UNDEFINED,N_("%i???")}, - {5,0,N_("single or timer")}, - {5,1,N_("continuous")}, - {5,UNDEFINED,N_("%i???")}, - {7,0,N_("One-Shot")}, - {7,1,N_("AI Servo")}, - {7,2,N_("AI Focus")}, - {7,3,N_("MF")}, - {7,4,N_("Single")}, - {7,5,N_("Continuous")}, - {7,6,N_("MF")}, - {7,UNDEFINED,N_("%i???")}, - {10,0,N_("Large")}, - {10,1,N_("Medium")}, - {10,2,N_("Small")}, - {10,UNDEFINED,N_("%i???")}, - {11,0,N_("Full Auto")}, - {11,1,N_("Manual")}, - {11,2,N_("Landscape")}, - {11,3,N_("Fast Shutter")}, - {11,4,N_("Slow Shutter")}, - {11,5,N_("Night")}, - {11,6,N_("Black & White")}, - {11,7,N_("Sepia")}, - {11,8,N_("Portrait")}, - {11,9,N_("Sports")}, - {11,10,N_("Macro / Close-Up")}, - {11,11,N_("Pan Focus")}, - {11,UNDEFINED,N_("%i???")}, - {13,0xffff,N_("Low")}, - {13,0x0000,N_("Normal")}, - {13,0x0001,N_("High")}, - {13,UNDEFINED,N_("%i???")}, - {14,0xffff,N_("Low")}, - {14,0x0000,N_("Normal")}, - {14,0x0001,N_("High")}, - {14,UNDEFINED,N_("%i???")}, - {15,0xffff,N_("Low")}, - {15,0x0000,N_("Normal")}, - {15,0x0001,N_("High")}, - {15,UNDEFINED,N_("%i???")}, - {16,15,N_("auto")}, - {16,16,N_("50")}, - {16,17,N_("100")}, - {16,18,N_("200")}, - {16,19,N_("400")}, - {16,UNDEFINED,N_("%i???")}, - {17,3,N_("Evaluative")}, - {17,4,N_("Partial")}, - {17,5,N_("Center-weighted")}, - {17,UNDEFINED,N_("%i???")}, - {19,0x3000,N_("none (MF)")}, - {19,0x3001,N_("auto-selected")}, - {19,0x3002,N_("right")}, - {19,0x3003,N_("center")}, - {19,0x3004,N_("left")}, - {19,UNDEFINED,N_("%i???")}, - {20,0,N_("Easy shooting")}, - {20,1,N_("Program")}, - {20,2,N_("Tv-priority")}, - {20,3,N_("Av-priority")}, - {20,4,N_("Manual")}, - {20,5,N_("A-DEP")}, - {20,UNDEFINED,N_("%i???")}, - {32,0,N_("Single")}, - {32,1,N_("Continuous")}, - {32,UNDEFINED,N_("%i???")}, - - {0,0,NULL} + { 1, 1, N_("Macro")}, + { 1, 2, N_("Normal")}, + { 4, 0, N_("Flash not fired")}, + { 4, 1, N_("auto")}, + { 4, 2, N_("on")}, + { 4, 3, N_("red eyes reduction")}, + { 4, 4, N_("slow synchro")}, + { 4, 5, N_("auto + red yes reduction")}, + { 4, 6, N_("on + red eyes reduction")}, + { 4, 16, N_("external")}, + { 5, 0, N_("single or timer")}, + { 5, 1, N_("continuous")}, + { 7, 0, N_("One-Shot")}, + { 7, 1, N_("AI Servo")}, + { 7, 2, N_("AI Focus")}, + { 7, 3, N_("MF")}, + { 7, 4, N_("Single")}, + { 7, 5, N_("Continuous")}, + { 7, 6, N_("MF")}, + {10, 0, N_("Large")}, + {10, 1, N_("Medium")}, + {10, 2, N_("Small")}, + {11, 0, N_("Full Auto")}, + {11, 1, N_("Manual")}, + {11, 2, N_("Landscape")}, + {11, 3, N_("Fast Shutter")}, + {11, 4, N_("Slow Shutter")}, + {11, 5, N_("Night")}, + {11, 6, N_("Black & White")}, + {11, 7, N_("Sepia")}, + {11, 8, N_("Portrait")}, + {11, 9, N_("Sports")}, + {11, 10, N_("Macro / Close-Up")}, + {11, 11, N_("Pan Focus")}, + {13, 0xffff, N_("Low")}, + {13, 0x0000, N_("Normal")}, + {13, 0x0001, N_("High")}, + {14, 0xffff, N_("Low")}, + {14, 0x0000, N_("Normal")}, + {14, 0x0001, N_("High")}, + {15, 0xffff, N_("Low")}, + {15, 0x0000, N_("Normal")}, + {15, 0x0001, N_("High")}, + {16, 15, N_("auto")}, + {16, 16, N_("50")}, + {16, 17, N_("100")}, + {16, 18, N_("200")}, + {16, 19, N_("400")}, + {17, 3, N_("Evaluative")}, + {17, 4, N_("Partial")}, + {17, 5, N_("Center-weighted")}, + {19, 0x3000, N_("none (MF)")}, + {19, 0x3001, N_("auto-selected")}, + {19, 0x3002, N_("right")}, + {19, 0x3003, N_("center")}, + {19, 0x3004, N_("left")}, + {20, 0, N_("Easy shooting")}, + {20, 1, N_("Program")}, + {20, 2, N_("Tv-priority")}, + {20, 3, N_("Av-priority")}, + {20, 4, N_("Manual")}, + {20, 5, N_("A-DEP")}, + {32, 0, N_("Single")}, + {32, 1, N_("Continuous")}, + { 0, 0, NULL} }; static struct { - int index; - char* value; + unsigned int tag; + char *value; } headings[] = { - {1,N_("Macro mode")}, - {4,N_(" / Flash mode : ")}, - {5,N_(" / Continuous drive mode : ")}, - {7,N_(" / Focus mode : ")}, - {10,N_(" / Image size : ")}, - {11,N_(" / Easy shooting mode : ")}, - {13,N_(" / Contrast : ")}, - {14,N_(" / Saturation : ")}, - {15,N_(" / Sharpness : ")}, - {16,N_(" / ISO : ")}, - {17,N_(" / Metering mode : ")}, - {19,N_(" / AF point selected : ")}, - {20,N_(" / Exposure mode : ")}, - {32,N_(" / Focus mode2 : ")}, + { 1, N_("Macro mode")}, + { 4, N_(" / Flash mode : ")}, + { 5, N_(" / Continuous drive mode : ")}, + { 7, N_(" / Focus mode : ")}, + {10, N_(" / Image size : ")}, + {11, N_(" / Easy shooting mode : ")}, + {13, N_(" / Contrast : ")}, + {14, N_(" / Saturation : ")}, + {15, N_(" / Sharpness : ")}, + {16, N_(" / ISO : ")}, + {17, N_(" / Metering mode : ")}, + {19, N_(" / AF point selected : ")}, + {20, N_(" / Exposure mode : ")}, + {32, N_(" / Focus mode2 : ")}, + { 0, NULL} +}; - {0,NULL} +unsigned int +mnote_canon_entry_count_values (const MnoteCanonEntry *entry) +{ + if (!entry) return 0; -}; + switch (entry->tag) { + case MNOTE_CANON_TAG_SETTINGS_1: + case MNOTE_CANON_TAG_SETTINGS_2: + case MNOTE_CANON_TAG_CUSTOM_FUNCS: + if (entry->format != EXIF_FORMAT_SHORT) return 0; + return exif_get_short (entry->data, entry->order) / 2; + default: + return 1; + } +} +char * +mnote_canon_entry_get_value (const MnoteCanonEntry *entry, unsigned int t, char *val, unsigned int maxlen) +{ + char buf[128]; + ExifLong vl; + ExifShort vs, n; + unsigned int i, j, k; + unsigned char *data = entry->data; - if (!entry) return NULL; + if (!entry) return NULL; - memset (val, 0, maxlen); - maxlen--; + memset (val, 0, maxlen); + maxlen--; - switch (entry->tag) { + switch (entry->tag) { case MNOTE_CANON_TAG_SETTINGS_1: CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); n = exif_get_short (data, entry->order) / 2; - data += 2; + if (t >= n) return NULL; CC (entry->components, n, val, maxlen); - for (i = 1; i < n; i++) { - vs = exif_get_short (data, entry->order); - data += 2; - switch (i) { - case 2: - if (vs) { - snprintf (buf, sizeof (buf), - _(" / Self Timer : %i (ms)"), vs*100); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 23: - snprintf (buf, sizeof (buf), _(" / long focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 24: - snprintf (buf, sizeof (buf), _(" / short focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 25: - snprintf (buf, sizeof (buf), _(" / focal units per mm : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 29: - strncat (val, _(" / Flash details : "), maxlen - strlen(val)); - if ((vs>>14)&1) - strncat (val, _("External E-TTL"), maxlen - strlen(val)); - if ((vs>>13)&1) - strncat (val, _("Internal flash"), maxlen - strlen(val)); - if ((vs>>11)&1) - strncat (val, _("FP sync used"), maxlen - strlen(val)); - if ((vs>>4)&1) - strncat (val, _("FP sync enabled"), maxlen - strlen(val)); -#ifdef DEBUG - printf ("Value29=0x%08x\n", vs); -#endif - break; - default: - { - int index; - int found = 0; - for (index=0; entries[index].tag <= i && entries[index].value && vs && !found; i++) { - if (entries[index].tag == i) { - int a=0; - for (a=0; headings[a].index != i; a++); - strncat (val, headings[a].value, maxlen - strlen(val)); + vs = exif_get_short (entry->data + 2 + t * 2, entry->order); + switch (t) { + case 0: + break; + case 2: + if (vs) { + snprintf (buf, sizeof (buf), _(" / Self Timer : %i (ms)"), vs*100); + strncat (val, buf, maxlen - strlen(val)); + } + break; + case 23: + snprintf (buf, sizeof (buf), _(" / long focal length of lens (in focal units) : %u"), vs); + strncat (val, buf, maxlen - strlen(val)); + break; + case 24: + snprintf (buf, sizeof (buf), _(" / short focal length of lens (in focal units) : %u"), vs); + strncat (val, buf, maxlen - strlen(val)); + break; + case 25: + snprintf (buf, sizeof (buf), _(" / focal units per mm : %u"), vs); + strncat (val, buf, maxlen - strlen(val)); + break; + case 29: + strncat (val, _(" / Flash details : "), maxlen - strlen(val)); + if ((vs>>14)&1) + strncat (val, _("External E-TTL"), maxlen - strlen(val)); + if ((vs>>13)&1) + strncat (val, _("Internal flash"), maxlen - strlen(val)); + if ((vs>>11)&1) + strncat (val, _("FP sync used"), maxlen - strlen(val)); + if ((vs>>4)&1) + strncat (val, _("FP sync enabled"), maxlen - strlen(val)); + break; + default: - if (entries[index].subtag == vs) { - strncat(val,entries[index].value, maxlen - strlen(val)); - found = 1; - } - if (entries[index].subtag == UNDEFINED) { - snprintf (buf, sizeof (buf), entries[index].value, vs); - strncat (val, buf, maxlen - strlen(val)); - found = 1; + /* Title of tag */ + for (k = 0; (headings[k].tag != t) && headings[k].tag; k++); + strncat (val, + headings[k].value ? headings[k].value : _(" / Unknown : "), + maxlen - strlen (val)); - } - } - } - if (!found) - printf ("Value%d=%d\n", i, vs); - } - } - } // for + /* Value of tag */ + for (j = 0; entries[j].tag && ((entries[j].tag < t) || + ((entries[j].tag == i) && entries[j].subtag <= vs)); j++) + if ((entries[j].tag == i) && (entries[j].subtag == vs)) break; + if ((entries[j].tag != i) || (entries[j].subtag != vs)) break; - break; + if (entries[j].subtag == vs) + strncat (val, entries[j]. value, maxlen - strlen (val)); + else { + snprintf (buf, sizeof (buf), entries[j].value, vs); + strncat (val, buf, maxlen - strlen (val)); + } + } + break; case MNOTE_CANON_TAG_SETTINGS_2: CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - n = exif_get_short (data, entry->order)/2; - data += 2; + n = exif_get_short (data, entry->order) / 2; + if (t >= n) return NULL; CC (entry->components, n, val, maxlen); -#ifdef DEBUG - printf ("Setting2 size %d %d\n",n,entry->size); -#endif - for (i=1;i<n;i++) - { - vs = exif_get_short (data, entry->order); - data+=2; - switch(i) { - case 7: - strncpy (val, _("White balance : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Auto"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("Sunny"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("Cloudy"), maxlen - strlen(val)); - break; - case 3: - strncat (val, _("Tungsten"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("Flourescent"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("Flash"), maxlen - strlen(val)); - break; - case 6: - strncat (val, _("Custom"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } + vs = exif_get_short (entry->data + 2 + t * 2, entry->order); + switch (t) { + case 7: + switch (vs) { + case 0: + strncpy (val, _("Auto"), maxlen - strlen (val)); break; - case 9: - snprintf (buf, sizeof (buf), _(" / Sequence number : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); + case 1: + strncpy (val, _("Sunny"), maxlen - strlen (val)); break; - case 14: - if (vs>>12) - { - strncat (val, _(" / AF point used : "), maxlen - strlen(val)); - if (vs&1) - strncat (val, _("Right"), maxlen - strlen(val)); - if ((vs>>1)&1) - strncat (val, _("Center"), maxlen - strlen(val)); - if ((vs>>2)&1) - strncat (val, _("Left"), maxlen - strlen(val)); - snprintf (buf, sizeof (buf), _(" (%u available focus point)"), vs>>12); - strncat (val, buf, maxlen - strlen(val)); - } -#ifdef DEBUG - printf ("0x%08x\n", vs); -#endif + case 2: + strncpy (val, _("Cloudy"), maxlen - strlen (val)); break; - case 15: - snprintf (buf, sizeof (buf), _(" / Flash bias : %.2f EV"), vs/32.0); - strncat (val, buf, maxlen - strlen(val)); - + case 3: + strncpy (val, _("Tungsten"), maxlen - strlen (val)); break; - case 19: - snprintf (buf, sizeof (buf), _(" / Subject Distance (mm) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); + case 4: + strncpy (val, _("Flourescent"), maxlen - strlen (val)); + break; + case 5: + strncpy (val, _("Flash"), maxlen - strlen (val)); + break; + case 6: + strncpy (val, _("Custom"), maxlen - strlen (val)); break; -#ifdef DEBUG default: - printf ("Value%d=%d\n", i, vs); -#endif + snprintf (buf, sizeof (buf), "%i", vs); + strncpy (val, buf, maxlen - strlen (val)); + } + break; + case 9: + snprintf (buf, sizeof (buf), "%u", vs); + strncpy (val, buf, maxlen - strlen (val)); + break; + case 14: + if (vs >> 12) { + if (vs & 1) + strncpy (val, _("Right"), maxlen - strlen (val)); + if ((vs >> 1) & 1) + strncpy (val, _("Center"), maxlen - strlen (val)); + if ((vs >> 2) & 1) + strncpy (val, _("Left"), maxlen - strlen (val)); + if (vs >> 12 == 1) + snprintf (buf, sizeof (buf), _(" (1 available focus point)")); + else + snprintf (buf, sizeof (buf), _(" (%u available focus point)"), vs >> 12); + strncat (val, buf, maxlen - strlen (val)); } + break; + case 15: + snprintf (buf, sizeof (buf), _("%.2f EV"), vs / 32.); + strncpy (val, buf, maxlen - strlen (val)); + break; + case 19: + snprintf (buf, sizeof (buf), _("%u mm"), vs); + strncpy (val, buf, maxlen - strlen (val)); + break; } - break; case MNOTE_CANON_TAG_IMAGE_TYPE: @@ -380,19 +350,12 @@ static struct { case MNOTE_CANON_TAG_CUSTOM_FUNCS: CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - n = exif_get_short (data, entry->order)/2; - data+=2; + n = exif_get_short (data, entry->order) / 2; + if (t >= n) return NULL; CC (entry->components, n, val, maxlen); -#ifdef DEBUG - printf ("Custom Function size %d %d\n",n,entry->size); -#endif - for (i=1;i<n;i++) - { - vs = exif_get_short (data, entry->order); - data += 2; - snprintf (buf, sizeof(buf), _("C.F%d : %u"), i, vs); - strncat (val, buf, maxlen - strlen(val)); - } + vs = exif_get_short (data + 2 + 2 * t, entry->order); + snprintf (buf, sizeof (buf), "%u", vs); + strncat (val, buf, maxlen - strlen (val)); break; default: @@ -413,6 +376,6 @@ static struct { strncpy (val, data, MIN (entry->size, maxlen)); #endif break; - } - return val; + } + return val; } Index: exif-mnote-data-canon.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- exif-mnote-data-canon.c 22 Mar 2005 01:27:10 -0000 1.12 +++ exif-mnote-data-canon.c 22 Aug 2005 22:17:31 -0000 1.13 @@ -60,14 +60,33 @@ exif_mnote_data_canon_free (ExifMnoteDat exif_mnote_data_canon_clear ((ExifMnoteDataCanon *) n); } +static void +exif_mnote_data_canon_get_tags (ExifMnoteDataCanon *dc, unsigned int n, + unsigned int *m, unsigned int *s) +{ + unsigned int from = 0, to; + + if (!dc || !m) return; + for (*m = 1; *m < dc->count; (*m)++) { + to = from + mnote_canon_entry_count_values (&dc->entries[*m]); + if (to > n) { + if (s) *s = n - from; + break; + } + from = to; + } +} + static char * exif_mnote_data_canon_get_value (ExifMnoteData *note, unsigned int n, char *val, unsigned int maxlen) { - ExifMnoteDataCanon *cnote = (ExifMnoteDataCanon *) note; + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) note; + unsigned int m, s; - if (!note) return NULL; - if (cnote->count <= n) return NULL; - return mnote_canon_entry_get_value (&cnote->entries[n], val, maxlen); + if (!dc) return NULL; + exif_mnote_data_canon_get_tags (dc, n, &m, &s); + if (m >= dc->count) return NULL; + return mnote_canon_entry_get_value (&dc->entries[m], s, val, maxlen); } static void @@ -176,80 +195,93 @@ exif_mnote_data_canon_load (ExifMnoteDat /* Parse the entries */ for (i = 0; i < c; i++) { - o = 6 + 2 + n->offset + 12 * i; - if (o + 8 > buf_size) return; + o = 6 + 2 + n->offset + 12 * i; + if (o + 8 > buf_size) return; - n->count = i + 1; - n->entries = exif_mem_realloc (ne->mem, n->entries, - sizeof (MnoteCanonEntry) * (i+1)); - memset (&n->entries[i], 0, sizeof (MnoteCanonEntry)); - n->entries[i].tag = exif_get_short (buf + o, n->order); - n->entries[i].format = exif_get_short (buf + o + 2, n->order); - n->entries[i].components = exif_get_long (buf + o + 4, n->order); - n->entries[i].order = n->order; + n->count = i + 1; + n->entries = exif_mem_realloc (ne->mem, n->entries, + sizeof (MnoteCanonEntry) * (i+1)); + memset (&n->entries[i], 0, sizeof (MnoteCanonEntry)); + n->entries[i].tag = exif_get_short (buf + o, n->order); + n->entries[i].format = exif_get_short (buf + o + 2, n->order); + n->entries[i].components = exif_get_long (buf + o + 4, n->order); + n->entries[i].order = n->order; - /* - * Size? If bigger than 4 bytes, the actual data is not - * in the entry but somewhere else (offset). - */ - s = exif_format_get_size (n->entries[i].format) * - n->entries[i].components; - if (!s) return; - o += 8; - if (s > 4) o = exif_get_long (buf + o, n->order) + 6; - if (o + s > buf_size) return; - - /* Sanity check */ - n->entries[i].data = exif_mem_alloc (ne->mem, sizeof (char) * s); - if (!n->entries[i].data) return; - n->entries[i].size = s; - memcpy (n->entries[i].data, buf + o, s); + /* + * Size? If bigger than 4 bytes, the actual data is not + * in the entry but somewhere else (offset). + */ + s = exif_format_get_size (n->entries[i].format) * n->entries[i].components; + if (!s) return; + o += 8; + if (s > 4) o = exif_get_long (buf + o, n->order) + 6; + if (o + s > buf_size) return; + + /* Sanity check */ + n->entries[i].data = exif_mem_alloc (ne->mem, sizeof (char) * s); + if (!n->entries[i].data) return; + n->entries[i].size = s; + memcpy (n->entries[i].data, buf + o, s); } } static unsigned int exif_mnote_data_canon_count (ExifMnoteData *n) { - return n ? ((ExifMnoteDataCanon *) n)->count : 0; + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) n; + unsigned int i, c; + + for (i = c = 0; dc && (i < dc->count); i++) + c += mnote_canon_entry_count_values (&dc->entries[i]); + return c; } static unsigned int -exif_mnote_data_canon_get_id (ExifMnoteData *d, unsigned int n) +exif_mnote_data_canon_get_id (ExifMnoteData *d, unsigned int i) { - ExifMnoteDataCanon *note = (ExifMnoteDataCanon *) d; + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) d; + unsigned int m; - if (!note) return 0; - if (note->count <= n) return 0; - return note->entries[n].tag; + if (!dc) return 0; + exif_mnote_data_canon_get_tags (dc, i, &m, NULL); + if (m >= dc->count) return 0; + return dc->entries[m].tag; } static const char * exif_mnote_data_canon_get_name (ExifMnoteData *note, unsigned int i) { - ExifMnoteDataCanon *cnote = (ExifMnoteDataCanon *) note; + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) note; + unsigned int m, s; - if (!note) return NULL; - if (i >= cnote->count) return NULL; - return mnote_canon_tag_get_name (cnote->entries[i].tag); + if (!dc) return NULL; + exif_mnote_data_canon_get_tags (dc, i, &m, &s); + if (m >= dc->count) return NULL; + return mnote_canon_tag_get_name_sub (dc->entries[m].tag, s); } static const char * exif_mnote_data_canon_get_title (ExifMnoteData *note, unsigned int i) { - ExifMnoteDataCanon *cnote = (ExifMnoteDataCanon *) note; + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) note; + unsigned int m, s; - if (!note) return NULL; - if (i >= cnote->count) return NULL; - return mnote_canon_tag_get_title (cnote->entries[i].tag); + if (!dc) return NULL; + exif_mnote_data_canon_get_tags (dc, i, &m, &s); + if (m >= dc->count) return NULL; + return mnote_canon_tag_get_title_sub (dc->entries[m].tag, s); } static const char * exif_mnote_data_canon_get_description (ExifMnoteData *note, unsigned int i) { - ExifMnoteDataCanon *cnote = (ExifMnoteDataCanon *) note; - if (!note) return NULL; - if (i >= cnote->count) return NULL; - return mnote_canon_tag_get_description (cnote->entries[i].tag); + ExifMnoteDataCanon *dc = (ExifMnoteDataCanon *) note; + unsigned int m; + + if (!dc) return NULL; + exif_mnote_data_canon_get_tags (dc, i, &m, NULL); + if (m >= dc->count) return NULL; + return mnote_canon_tag_get_description (dc->entries[m].tag); } ExifMnoteData * |
|
From: Lutz M. <lu...@us...> - 2005-08-22 22:17:38
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10193 Modified Files: ChangeLog configure.ac Log Message: 2005-08-23 Lutz Mueller <lu...@us...> Some work on canon maker notes. Entries that contain several different values now expand to different entries. Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -d -r1.9 -r1.10 --- configure.ac 20 Jun 2005 23:59:07 -0000 1.9 +++ configure.ac 22 Aug 2005 22:17:30 -0000 1.10 @@ -99,7 +99,7 @@ GP_CHECK_DOXYGEN # --------------------------------------------------------------------------- GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT}], [Lutz Müller and others]) -ALL_LINGUAS="de es fr" +ALL_LINGUAS="de es fr pl" AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) AM_PO_SUBDIRS() Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.223 retrieving revision 1.224 diff -u -p -d -r1.223 -r1.224 --- ChangeLog 15 Aug 2005 20:29:14 -0000 1.223 +++ ChangeLog 22 Aug 2005 22:17:29 -0000 1.224 @@ -1,3 +1,8 @@ +2005-08-23 Lutz Mueller <lu...@us...> + + Some work on canon maker notes. Entries that contain several different + values now expand to different entries. + 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>, related to translation. |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:52:55
|
Update of /cvsroot/libexif/gexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4932 Modified Files: ChangeLog configure.ac Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Jakub Bogusz <qb...@pl...>: * po/pl.po: New. Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/gexif/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- configure.ac 25 Apr 2005 18:06:44 -0000 1.3 +++ configure.ac 15 Aug 2005 20:52:47 -0000 1.4 @@ -35,7 +35,7 @@ GP_PKG_CONFIG # i18n support # --------------------------------------------------------------------------- GP_GETTEXT_HACK([],[Lutz Müller and others]) -ALL_LINGUAS="de es fr" +ALL_LINGUAS="de es fr po" AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) AM_PO_SUBDIRS() Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/gexif/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- ChangeLog 24 Mar 2005 04:44:48 -0000 1.13 +++ ChangeLog 15 Aug 2005 20:52:47 -0000 1.14 @@ -1,3 +1,9 @@ +2005-08-15 Lutz Mueller <lu...@us...> + + Jakub Bogusz <qb...@pl...>: + + * po/pl.po: New. + 2005-03-24 Hans Ulrich Niedermann <gp...@n-...> * autogen.sh, configure.in, */Makefile.am, ...: Updated build system. |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:52:54
|
Update of /cvsroot/libexif/gexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4932/po Added Files: pl.po Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Jakub Bogusz <qb...@pl...>: * po/pl.po: New. --- NEW FILE: pl.po --- # Polish translation for gexif. # This file is distributed under the same license as the gexif package. # Jakub Bogusz <qb...@pl...>, 2005. # msgid "" msgstr "" "Project-Id-Version: gexif 0.5\n" "POT-Creation-Date: 2003-01-07 19:11+0100\n" "PO-Revision-Date: 2005-03-21 18:20+0100\n" "Last-Translator: Jakub Bogusz <qb...@pl...>\n" "Language-Team: Polish <tra...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: gexif/gexif-main.c:239 msgid "Save As..." msgstr "Zapisz jako..." #: gexif/gexif-main.c:270 msgid "Open..." msgstr "Otwórz..." |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:50:53
|
Update of /cvsroot/libexif/exif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351/po Added Files: pl.po Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * libexif/exif-i18n.h: Fix translation. * po/pl.po: New --- NEW FILE: pl.po --- # Polish translation for exif. # This file is distributed under the same license as the exif package. # Jakub Bogusz <qb...@pl...>, 2005. # msgid "" msgstr "" "Project-Id-Version: exif 0.6.9\n" "POT-Creation-Date: 2004-05-27 19:45+0200\n" "PO-Revision-Date: 2005-03-21 18:01+0100\n" "Last-Translator: Jakub Bogusz <qb...@pl...>\n" "Language-Team: Polish <tra...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: exif/actions.c:43 #, c-format msgid "EXIF tags in '%s':" msgstr "Znaczniki EXIF w '%s':" #: exif/actions.c:109 #, c-format msgid "Unknown MakerNote format." msgstr "Nieznany format MakerNote." #: exif/actions.c:116 #, c-format msgid "MakerNote does not contain any value.\n" msgstr "MakerNote nie zawiera żadnej wartoÅci.\n" #: exif/actions.c:119 #, c-format msgid "MakerNote contains 1 value:\n" msgstr "MakerNote zawiera 1 wartoÅÄ:\n" #: exif/actions.c:122 #, c-format msgid "MakerNote contains %i values:\n" msgstr "MakerNote zawiera %i wartoÅci:\n" #: exif/actions.c:139 #, c-format msgid "EXIF tags in '%s' ('%s' byte order):" msgstr "Znaczniki EXIF w '%s' (kolejnoÅÄ bajtów '%s'):" #: exif/actions.c:144 exif/actions.c:146 msgid "Tag" msgstr "Znacznik" #: exif/actions.c:149 exif/actions.c:151 exif/main.c:282 msgid "Value" msgstr "WartoÅÄ" #: exif/actions.c:157 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." msgstr "Dane EXIF zawierajÄ miniaturkÄ (%i bajtów)." #: exif/actions.c:189 #, c-format msgid "ThumbnailSize\t%i\n" msgstr "ThumbnailSize\t%i\n" #: exif/main.c:51 #, c-format msgid "Internal error. Please contact <lib...@li...>." msgstr "BÅÄ d wewnÄtrzny. ProszÄ skontaktowaÄ siÄ z <lib...@li...>." #: exif/main.c:61 #, c-format msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':" msgstr "Wpis EXIF '%s' (0x%x, '%s') istnieje w IFD '%s':" #: exif/main.c:98 #, c-format msgid "Not enough memory." msgstr "Za maÅo pamiÄci." #: exif/main.c:116 #, c-format msgid "Too few components specified!" msgstr "Podano za maÅo skÅadowych!" #: exif/main.c:146 #, c-format msgid "Not yet implemented!" msgstr "Jeszcze nie zaimplementowane!" #: exif/main.c:165 #, c-format msgid "Could not parse JPEG file '%s'." msgstr "Nie można przeanalizowaÄ pliku JPEG '%s'." #: exif/main.c:175 #, c-format msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed." msgstr "Zbyt dużo danych EXIF (%i bajtów). Dozwolone jest tylko %i bajtów." #: exif/main.c:189 exif/main.c:435 #, c-format msgid "Wrote file '%s'." msgstr "Zapisano plik '%s'." #: exif/main.c:260 msgid "Show IDs instead of tag names" msgstr "Pokazywanie ID zamiast nazw znaczników" #: exif/main.c:262 msgid "Select tag" msgstr "Wybór znacznika" #: exif/main.c:262 msgid "tag" msgstr "znacznik" #: exif/main.c:264 msgid "Select IFD" msgstr "Wybór IFD" #: exif/main.c:264 msgid "IFD" msgstr "IFD" #: exif/main.c:266 msgid "List all EXIF tags" msgstr "Wypisanie wszystkich znaczników EXIF" #: exif/main.c:268 msgid "Show contents of tag MakerNote" msgstr "Pokazanie zawartoÅci znacznika MakerNote" #: exif/main.c:270 msgid "Remove tag or ifd" msgstr "UsuniÄcie znacznika lub IFD" #: exif/main.c:272 msgid "Show description of tag" msgstr "Pokazanie opisu znacznika" #: exif/main.c:274 msgid "Extract thumbnail" msgstr "WyciÄ gniÄcie miniaturki" #: exif/main.c:276 msgid "Remove thumbnail" msgstr "UsuniÄcie miniaturki" #: exif/main.c:278 msgid "Insert FILE as thumbnail" msgstr "Wstawienie PLIKU jako miniaturki" #: exif/main.c:278 exif/main.c:280 msgid "FILE" msgstr "PLIK" #: exif/main.c:280 msgid "Write data to FILE" msgstr "Zapis danych do PLIKU" #: exif/main.c:284 msgid "Output in a machine-readable (tab delimited) format" msgstr "WyjÅcie w formacie czytelnym dla maszyny (ograniczonym tabulacjami)" #: exif/main.c:287 msgid "Show debugging messages" msgstr "Pokazywanie komunikatów diagnostycznych" #: exif/main.c:304 msgid "[OPTION...] file" msgstr "[OPCJA...] plik" #: exif/main.c:321 #, c-format msgid "Invalid tag '%s'!" msgstr "BÅÄdny znacznik '%s'!" #: exif/main.c:332 #, c-format msgid "" "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and " "'Interoperability'." msgstr "" "BÅÄdny IFD '%s'. Poprawne IFD to '0', '1', 'EXIF', 'GPS' oraz 'Interoperability'." #: exif/main.c:342 #, c-format msgid "Please specify a tag!" msgstr "ProszÄ podaÄ znacznik!" #: exif/main.c:346 #, c-format msgid "Tag '%s' (0x%04x, '%s'): %s" msgstr "Znacznik '%s' (0x%04x, '%s'): %s" #: exif/main.c:370 #, c-format msgid "'%s' does not contain EXIF data!" msgstr "'%s' nie zawiera danych EXIF!" #: exif/main.c:396 #, c-format msgid "IFD '%s' does not contain tag '%s'." msgstr "IFD '%s' nie zawiera znacznika '%s'." #: exif/main.c:410 #, c-format msgid "'%s' does not contain a thumbnail!" msgstr "'%s' nie zawiera miniaturki!" #: exif/main.c:422 #, c-format msgid "Could not open '%s' for writing (%m)!" msgstr "Nie można otworzyÄ '%s' do zapisu (%m)!" #: exif/main.c:426 #, c-format msgid "Could not open '%s' for writing (%s)!" msgstr "Nie można otworzyÄ '%s' do zapisu (%s)!" #: exif/main.c:464 #, c-format msgid "Could not open '%s' (%m)!" msgstr "Nie można otworzyÄ '%s' (%m)!" #: exif/main.c:467 #, c-format msgid "Could not open '%s' (%s)!" msgstr "Nie można otworzyÄ '%s' (%s)!" #: exif/main.c:478 #, c-format msgid "Could not allocate %i byte(s)." msgstr "Nie można przydzieliÄ %i bajtów." #: exif/main.c:488 #, c-format msgid "Could not read '%s' (%m)." msgstr "Nie można odczytaÄ '%s' (%m)." #: exif/main.c:491 #, c-format msgid "Could not read '%s' (%s)." msgstr "Nie można odczytaÄ '%s' (%s)." #: exif/main.c:506 #, c-format msgid "You need to specify a tag!" msgstr "Trzeba podaÄ znacznik!" #: exif/main.c:515 exif/main.c:538 #, c-format msgid "You need to specify an IFD!" msgstr "Trzeba podaÄ IFD!" #: exif/main.c:554 #, c-format msgid "IFD '%s' does not contain a tag '%s'!" msgstr "IFD '%s' nie zawiera znacznika '%s'!" #. popt.h: msgid "Help options:" msgstr "Opcje pomocy:" #. popt msgid "Show this help message" msgstr "Pokazanie tej pomocy" msgid "Display brief usage message" msgstr "WyÅwietlenie skróconego sposóbu użycia" |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:50:53
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4351 Modified Files: configure.ac ChangeLog Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * libexif/exif-i18n.h: Fix translation. * po/pl.po: New Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/exif/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- configure.ac 27 Apr 2005 14:26:33 -0000 1.5 +++ configure.ac 15 Aug 2005 20:50:43 -0000 1.6 @@ -37,7 +37,7 @@ GP_PKG_CONFIG # i18n support # --------------------------------------------------------------------------- GP_GETTEXT_HACK([${PACKAGE}],[Lutz Müller and others]) -ALL_LINGUAS="de es fr" +ALL_LINGUAS="de es fr pl" AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) AM_PO_SUBDIRS() Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -d -r1.57 -r1.58 --- ChangeLog 15 Aug 2005 20:43:18 -0000 1.57 +++ ChangeLog 15 Aug 2005 20:50:43 -0000 1.58 @@ -3,6 +3,7 @@ Patch by Jakub Bogusz <qb...@pl...>: * libexif/exif-i18n.h: Fix translation. + * po/pl.po: New 2005-04-27 Lutz Mueller <lu...@us...> |
