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: Dan F. <dfa...@us...> - 2010-12-14 06:41:50
|
Update of /cvsroot/libexif/libexif/po In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19247/po Added Files: bs.po tr.po Log Message: po/bs.po: Added Bosnian translation from launchpad.net po/tr.po: Added Turkish translation from launchpad.net --- NEW FILE: bs.po --- # Bosnian translation for libexif # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the libexif package. # FIRST AUTHOR <EMAIL@ADDRESS>, 2010. # msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-11-12 22:15-0800\n" "PO-Revision-Date: 2010-01-11 10:29+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Bosnian <bs...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2010-12-14 00:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" [...5665 lines suppressed...] #: libexif/pentax/mnote-pentax-tag.c:132 msgid "Bestshot Mode" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:133 msgid "CCS ISO Sensitivity" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:135 msgid "Enhancement" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:136 msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" --- NEW FILE: tr.po --- # Turkish translation for libexif # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the libexif package. # FIRST AUTHOR <EMAIL@ADDRESS>, 2009. # msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-11-12 22:15-0800\n" "PO-Revision-Date: 2010-08-30 11:29+0000\n" "Last-Translator: Enes AteÅ <e....@ho...>\n" "Language-Team: Turkish <tr...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2010-12-14 00:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" [...5443 lines suppressed...] #: libexif/pentax/mnote-pentax-tag.c:132 msgid "Bestshot Mode" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:133 msgid "CCS ISO Sensitivity" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:135 msgid "Enhancement" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:136 msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "" |
|
From: Dan F. <dfa...@us...> - 2010-12-14 06:34:04
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17171 Modified Files: ChangeLog Log Message: Updated non-TP translations from launchpad.net: be.po en_GB.po pt_BR.po pt.po ru.po sq.po sr.po zh_CN.po Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.354 retrieving revision 1.355 diff -u -p -d -r1.354 -r1.355 --- ChangeLog 14 Dec 2010 05:54:38 -0000 1.354 +++ ChangeLog 14 Dec 2010 06:33:52 -0000 1.355 @@ -1,6 +1,8 @@ 2010-12-13 Dan Fandrich <da...@co...> * po/da.po: Updated Danish translation by Joe Hansen + * Updated non-TP translations from launchpad.net: + be.po en_GB.po pt_BR.po pt.po ru.po sq.po sr.po zh_CN.po 2010-12-10 Dan Fandrich <da...@co...> @@ -48,6 +50,7 @@ * po/ja.po: Updated Japanese translation by Tadashi Jokagi * po/pl.po: Updated Polish translation by Jakub Bogusz * po/vi.po: Updated Vietnamese translation by Clytie Siddall + * po/en_CA.po: Updated Canadian English translation 2010-02-05 Dan Fandrich <da...@co...> |
|
From: Dan F. <dfa...@us...> - 2010-12-14 06:34:03
|
Update of /cvsroot/libexif/libexif/po In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17171/po Modified Files: be.po en_GB.po pt.po pt_BR.po ru.po sq.po sr.po zh_CN.po Log Message: Updated non-TP translations from launchpad.net: be.po en_GB.po pt_BR.po pt.po ru.po sq.po sr.po zh_CN.po Index: en_GB.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/en_GB.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- en_GB.po 6 Nov 2009 06:58:12 -0000 1.1 +++ en_GB.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2007-06-28 12:03+0000\n" -"Last-Translator: Bruce Cowan <Unknown>\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2010-03-17 17:09+0000\n" +"Last-Translator: Robert Readman <Unknown>\n" [...5873 lines suppressed...] +msgstr "Flash Distance" + +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "Bestshot Mode" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "CCS ISO Sensitivity" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "Enhancement" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" +msgstr "Finer" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" Index: ru.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/ru.po,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -d -r1.18 -r1.19 --- ru.po 9 Oct 2009 19:58:24 -0000 1.18 +++ ru.po 14 Dec 2010 06:33:54 -0000 1.19 @@ -7,17 +7,16 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 11:07-0700\n" -"PO-Revision-Date: 2009-10-09 12:21-0700\n" -"Last-Translator: Alexandre Prokoudine <ale...@gm...>\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2010-12-08 00:53+0000\n" +"Last-Translator: Alexey Ivanov <ale...@gm...>\n" [...5547 lines suppressed...] -#~ msgid "center-weighted" -#~ msgstr "ЦенÑÑовзвеÑеннÑй" - -#~ msgid "none (manual focus)" -#~ msgstr "ÐиÑего (ÑÑÑÐ½Ð°Ñ ÑокÑÑиÑовка)" - -#~ msgid "External E-TTL" -#~ msgstr "ÐнеÑнÑÑ E-TTL" - -#~ msgid "Flourescent" -#~ msgstr "ФлÑоÑеÑÑенÑÐ½Ð°Ñ Ð»Ð°Ð¼Ð¿Ð°" - -#~ msgid " (1 available focus point)" -#~ msgstr " (1 доÑÑÑÐ¿Ð½Ð°Ñ ÑоÑка ÑокÑÑиÑовки)" - -#~ msgid " (%u available focus points)" -#~ msgstr " (доÑÑÑпнÑÑ Ð¸ÑÑек ÑокÑÑиÑовки - %u)" - -#~ msgid "Subject distance" -#~ msgstr "РаÑÑÑоÑние до обÑекÑа" Index: pt_BR.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/pt_BR.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- pt_BR.po 9 Oct 2009 19:50:35 -0000 1.1 +++ pt_BR.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -4,2176 +4,2490 @@ # These translations are licensed under a BSD-style license # They were extracted from the BigLinux distribution for import into the # libexif repository. - msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-12 15:13+0200\n" -"PO-Revision-Date: 2008-03-29 20:18+0000\n" +"Report-Msgid-Bugs-To: lib...@li...\n" [...7320 lines suppressed...] +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" -msgstr "" +msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" Index: pt.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/pt.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- pt.po 6 Nov 2009 06:58:12 -0000 1.1 +++ pt.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2008-06-30 12:58+0000\n" -"Last-Translator: nglnx <Unknown>\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2009-11-25 15:19+0000\n" +"Last-Translator: Ubuntu Archive Auto-Sync <ar...@ub...>\n" [...4507 lines suppressed...] +msgid "Flash Distance" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 Index: be.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/be.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- be.po 6 Nov 2009 06:58:12 -0000 1.1 +++ be.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2009-10-19 10:31+0000\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2009-11-25 15:18+0000\n" "Last-Translator: Iryna Nikanchuk <def...@gm...>\n" "Language-Team: Belarusian <be...@li...>\n" [...4522 lines suppressed...] +msgid "Flash Distance" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 Index: sq.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/sq.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- sq.po 6 Nov 2009 06:58:12 -0000 1.1 +++ sq.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2009-06-19 15:47+0000\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2009-11-25 15:23+0000\n" "Last-Translator: Vilson Gjeci <vil...@gm...>\n" "Language-Team: Albanian <sq...@li...>\n" [...4529 lines suppressed...] +msgid "Flash Distance" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 Index: sr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/sr.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- sr.po 9 Oct 2009 19:50:35 -0000 1.1 +++ sr.po 14 Dec 2010 06:33:54 -0000 1.2 @@ -3,1330 +3,1605 @@ # Marko Uskokovic <usk...@et...>, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: libexif 0.6.16\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-12 15:13+0200\n" -"PO-Revision-Date: 2008-05-12 23:17+0200\n" -"Last-Translator: Marko Uskokovic <usk...@et...>\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2010-04-24 08:59+0000\n" [...7280 lines suppressed...] -#: test/nls/test-nls.c:24 +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" +msgstr "" + +#: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" Index: zh_CN.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/zh_CN.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- zh_CN.po 6 Nov 2009 06:58:12 -0000 1.3 +++ zh_CN.po 14 Dec 2010 06:33:54 -0000 1.4 @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2009-09-29 10:31+0000\n" +"Report-Msgid-Bugs-To: lib...@li...\n" +"POT-Creation-Date: 2009-11-12 22:15-0800\n" +"PO-Revision-Date: 2009-11-25 15:22+0000\n" "Last-Translator: Tao Wei <wei...@gm...>\n" "Language-Team: Chinese (China) <zh...@li...>\n" [...4580 lines suppressed...] +msgid "Flash Distance" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:132 +msgid "Bestshot Mode" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:133 +msgid "CCS ISO Sensitivity" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:135 +msgid "Enhancement" +msgstr "" + +#: libexif/pentax/mnote-pentax-tag.c:136 +msgid "Finer" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 |
|
From: Dan F. <dfa...@us...> - 2010-12-14 06:29:49
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4805 Modified Files: ChangeLog Log Message: po/da.po: Updated Danish translation by Joe Hansen Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.353 retrieving revision 1.354 diff -u -p -d -r1.353 -r1.354 --- ChangeLog 10 Dec 2010 20:33:50 -0000 1.353 +++ ChangeLog 14 Dec 2010 05:54:38 -0000 1.354 @@ -1,3 +1,7 @@ +2010-12-13 Dan Fandrich <da...@co...> + + * po/da.po: Updated Danish translation by Joe Hansen + 2010-12-10 Dan Fandrich <da...@co...> * Changed the display of rational numbers to estimate the number of |
|
From: Dan F. <dfa...@us...> - 2010-12-14 05:54:51
|
Update of /cvsroot/libexif/libexif/po In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4805/po Modified Files: da.po Log Message: po/da.po: Updated Danish translation by Joe Hansen Index: da.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/da.po,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- da.po 17 Jun 2010 05:33:42 -0000 1.11 +++ da.po 14 Dec 2010 05:54:40 -0000 1.12 @@ -28,7 +28,10 @@ # Interoperability -> (uafklaret; Erklæringen om brugsret?) # lens -> linse (men kunne vel også være objektiv) # matrix -> matrice (alternativ matrix) -# shutter -> lukketid +# shutter -> lukker +# http://da.wikipedia.org/wiki/Lukker +# shutter speed -> lukkertid +# http://da.wikipedia.org/wiki/Lukkertid # still image -> stillbillede # strobe light -> stroboskoplys # top -> øverst @@ -39,7 +42,7 @@ msgstr "" "Project-Id-Version: libexif-0.6.20-pre1\n" "Report-Msgid-Bugs-To: lib...@li...\n" "POT-Creation-Date: 2010-02-05 16:15-0800\n" -"PO-Revision-Date: 2010-04-30 01:01I+0200\n" +"PO-Revision-Date: 2010-10-27 01:01I+0200\n" "Last-Translator: Joe Hansen <joe...@ya...>\n" "Language-Team: Danish <da...@da...>\n" "MIME-Version: 1.0\n" @@ -324,11 +327,11 @@ msgstr "Landskab" #: libexif/canon/mnote-canon-entry.c:123 msgid "Fast shutter" -msgstr "Hurtig lukketid" +msgstr "Hurtig lukker" #: libexif/canon/mnote-canon-entry.c:124 msgid "Slow shutter" -msgstr "Langsom lukketid" +msgstr "Langsom lukker" #: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123 #: libexif/olympus/mnote-olympus-entry.c:254 @@ -379,7 +382,7 @@ msgstr "Blitz slukket" #: libexif/canon/mnote-canon-entry.c:136 msgid "Long shutter" -msgstr "Lang lukketid" +msgstr "Lang lukker" #: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188 #: libexif/olympus/mnote-olympus-entry.c:171 @@ -1089,7 +1092,7 @@ msgstr "Pc sæt 1" #: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411 msgid "PC set 2" -msgstr "Pc sæt 3" +msgstr "Pc sæt 2" #: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412 msgid "PC set 3" @@ -1563,7 +1566,7 @@ msgstr "Hvidbalance" #: libexif/canon/mnote-canon-tag.c:102 msgid "Slow Shutter" -msgstr "Langsom lukketid" +msgstr "Langsom lukker" #: libexif/canon/mnote-canon-tag.c:103 msgid "Sequence Number" @@ -2043,11 +2046,11 @@ msgstr "Blændetal" #: libexif/exif-entry.c:748 msgid "Shutter priority" -msgstr "Prioriteret lukketid" +msgstr "Lukkerprioritet" #: libexif/exif-entry.c:748 msgid "Shutter" -msgstr "Lukketid" +msgstr "Lukker" #: libexif/exif-entry.c:749 msgid "Creative program (biased toward depth of field)" @@ -2059,7 +2062,7 @@ msgstr "Kreativt" #: libexif/exif-entry.c:751 msgid "Creative program (biased toward fast shutter speed)" -msgstr "Kreativt program (med henblik på hurtig lukketid)" +msgstr "Kreativt program (med henblik på hurtig lukkertid)" #: libexif/exif-entry.c:752 msgid "Action" @@ -3092,7 +3095,7 @@ msgstr "Indikerer ISO Speed og ISO Latit #: libexif/exif-tag.c:507 msgid "Opto-Electronic Conversion Function" -msgstr "" +msgstr "Opto-Electronic konversionsfunktion" #: libexif/exif-tag.c:508 msgid "Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO 14524. <OECF> is the relationship between the camera optical input and the image values." @@ -3136,7 +3139,7 @@ msgstr "Komponentkonfiguration" #: libexif/exif-tag.c:531 msgid "Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences." -msgstr "" +msgstr "Information specifik for komprimerede data. Kanalerne på hver komponent er arrangeret i rækkefølge fra den første komponent til den fjerde. For ukomprimerede data er dataarrangementet angivet i mærket <PhotometricInterpretation>. Da <PhotometricInterpretation> dog kun kan udtrykke rækkefølgen af Y, Cb og Cr, tilbydes dette mærke til tilfælde hvor komprimerede data bruger komponenter udover Y, Cb og Cr og for at aktivere understøttelse af andre sekvenser." #: libexif/exif-tag.c:541 msgid "Compressed Bits per Pixel" @@ -3148,11 +3151,11 @@ msgstr "Information specifik for komprim #: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123 msgid "Shutter Speed" -msgstr "Lukketidshastighed" +msgstr "Lukkertid" #: libexif/exif-tag.c:547 msgid "Shutter speed. The unit is the APEX (Additive System of Photographic Exposure) setting." -msgstr "Lukketidshastighed. Denne enhed er APEX-indstillingen (Additive System of Photographic Exposure)." +msgstr "Lukkertid. Denne enhed er APEX-indstillingen (Additive System of Photographic Exposure)." #: libexif/exif-tag.c:551 msgid "The lens aperture. The unit is the APEX value." @@ -3236,7 +3239,7 @@ msgstr "Brugerkommentar" #: libexif/exif-tag.c:596 msgid "A tag for Exif users to write keywords or comments on the image besides those in <ImageDescription>, and without the character code limitations of the <ImageDescription> tag. The character code used in the <UserComment> tag is identified based on an ID code in a fixed 8-byte area at the start of the tag data area. The unused portion of the area is padded with NULL (\"00.h\"). ID codes are assigned by means of registration. The designation method and references for each character code are defined in the specification. The value of CountN is determined based on the 8 bytes in the character code area and the number of bytes in the user comment part. Since the TYPE is not ASCII, NULL termination is not necessary. The ID code for the <UserComment> area may be a Defined code such as JIS or ASCII, or may be Undefined. The Undefined name is UndefinedText, and the ID code is filled with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag must have a function for determining the ID code. This function is not required in Exif readers that do not use the <UserComment> tag. When a <UserComment> area is set aside, it is recommended that the ID code be ASCII and that the following user comment part be filled with blank characters [20.H]." -msgstr "Et mærke hvor Exifbrugere kan skrive nøgleord eller kommentarer på billederne udover dem i <ImageDescription>, og uden begrænsningerne på tegnkoden i dette mærke. Tegnkoden brugt i mærket <UserComment> identificeres på grundlag af en id-kode i et fast 8-byte område i starten af mærkets dataområde. Den ubrugte del af området fyldt med NULL (00.h). Id-koder tildeles ved brug af registrering. Betegnelsesmetoden og referencer for hver tegnkode defineres i specifikationen. Værdien af CountN afgøres på grundlag af de 8 byte i tegnkodeområdet og antallet af byte i brugerkommenteringsdelen. Da TYPEN ikke er ASCII, er NULL-terminering ikke nødvendig. Id-koden for området <UserComment> kan være en defineret kode som JIS eller ASCII, eller kan være udefineret. Det udefinerede navn er Udefineret tekst, og id-koden fyldes med 8 byte af alle NULL (00.H). En Exiflæser som læser mærket <UserComment> skal have en funktion der kan aflæse id-koden. Denne funktion er ikke krævet hvis Exiflæseren ikke bruger mærket <UserComment>. Når et <UserComment>-område reserveres anbefales det af id-koden er i ASCII-format og at den følgende brugerkommenteringsplads fyldes med blanke tegn [20.H]" +msgstr "Et mærke hvor Exifbrugere kan skrive nøgleord eller kommentarer på billederne udover dem i <ImageDescription>, og uden begrænsningerne på tegnkoden i dette mærke. Tegnkoden brugt i mærket <UserComment> identificeres på grundlag af en id-kode i et fast 8-byte område i starten af mærkets dataområde. Den ubrugte del af området fyldt med NULL (00.h). Id-koder tildeles ved brug af registrering. Betegnelsesmetoden og referencer for hver tegnkode defineres i specifikationen. Værdien af CountN afgøres på grundlag af de 8 byte i tegnkodeområdet og antallet af byte i brugerkommenteringsdelen. Da TYPEN ikke er ASCII, er NULL-terminering ikke nødvendig. Id-koden for området <UserComment> kan være en defineret kode som JIS eller ASCII, eller kan være udefineret. Det udefinerede navn er Udefineret tekst, og id-koden fyldes med 8 byte af alle NULL (00.H). En Exiflæser som læser mærket <UserComment> skal have en funktion der kan aflæse id-koden. Denne funktion er ikke krævet hvis Exiflæseren ikke bruger mærket <UserComment>. Når et <UserComment>-område reserveres anbefales det af id-koden er i ASCII-format og at den følgende brugerkommenteringsplads fyldes med blanke tegn [20.H]." #: libexif/exif-tag.c:619 msgid "Sub-second Time" @@ -3328,7 +3331,7 @@ msgstr "Billedpunktets y-dimension" #: libexif/exif-tag.c:678 msgid "Information specific to compressed data. When a compressed file is recorded, the valid height of the meaningful image must be recorded in this tag, whether or not there is padding data or a restart marker. This tag should not exist in an uncompressed file. Since data padding is unnecessary in the vertical direction, the number of lines recorded in this valid image height tag will in fact be the same as that recorded in the SOF." -msgstr "Specifik information for komprimerede data. Når en komprimeret fil optages, skal den den gyldige højde på det meningsfulde billede optages i dette mærke, uanset om der er fyldningsdata eller en genstartsmarkør. Dette mærke bør ikke eksistere i en ukomprimeret fil. Da datafyldning er unødvendigt lodret, vil antallet af linjer optaget i dette gyldige billedhøjdemærke være det samme som optaget i SOF'en." +msgstr "Specifik information for komprimerede data. Når en komprimeret fil optages, skal den gyldige højde på det meningsfulde billede optages i dette mærke, uanset om der er fyldningsdata eller en genstartsmarkør. Dette mærke bør ikke eksistere i en ukomprimeret fil. Da datafyldning er unødvendigt lodret, vil antallet af linjer optaget i dette gyldige billedhøjdemærke være det samme som optaget i SOF'en." #: libexif/exif-tag.c:688 msgid "Related Sound File" @@ -3336,7 +3339,7 @@ msgstr "Forbundet lydfil" #: libexif/exif-tag.c:689 msgid "This tag is used to record the name of an audio file related to the image data. The only relational information recorded here is the Exif audio file name and extension (an ASCII string consisting of 8 characters + '.' + 3 characters). The path is not recorded. Stipulations on audio and file naming conventions are defined in the specification. When using this tag, audio files must be recorded in conformance to the Exif audio format. Writers are also allowed to store the data such as Audio within APP2 as FlashPix extension stream data. Audio files must be recorded in conformance to the Exif audio format. The mapping of Exif image files and audio files is done in any of three ways, [1], [2] and [3]. If multiple files are mapped to one file as in [2] or [3], the above format is used to record just one audio file name. If there are multiple audio files, the first recorded file is given. In the case of [3], for example, for the Exif image file \"DSC00001.JPG\" only \"SND00001.WAV\" is given as the related Exif audio file. When there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG\", is indicated. By combining multiple relational information, a variety of playback possibilities can be supported. The method of using relational information is left to the implementation on the playback side. Since this information is an ASCII character string, it is terminated by NULL. When this tag is used to map audio files, the relation of the audio file to image data must also be indicated on the audio file end." -msgstr "" +msgstr "Dette mærke bruges til at optage navnet på en lydfil som hænger sammen med billeddataene. Den eneste relationelle information optaget her er lydfilnavnet i Exif og filendelsen (en ASCII-streng bestående af 8 tegn + '.' + 3 tegn). Stien optages ikke. Stipulationer på lyd- og filnavnskonventioner er definerede i specifikationerne. Under brug af dette mærke, skal lydfiler optages i overensstemmelse med Exifs lydformat. Forfattere kan også gemme data som lyd indenfor APP2 som FlashPix-udvidelsesstrømdata. Lydfiler skal optages i overensstemmelse med Exifs lydformat. Mapningen af Exifs billedfiler og lydfiler gøres på en af følgende tre måder: [1], [2] og [3]. Hvis flere filer mappes til en fil som i [2] eller [3], bruges ovenstående format til at optage netop et lydfilnavn. Hvis der er flere lydfiler, angives den først optaget fil. I tilfældet [3] er for eksemplet »DSC00001.JPG« kun angivet »SND00001.WAV« som den forbundne Exif-lydfil. Når der er tre Exif-lydfiler »SND00001.WAV«, »SND00002.WAV« og »SND00003.WAV«, indikeres Exifs billedfilnavn for hvert af dem »DSC00001.JPG«. Ved at kombinere flere forbundne informationer, kan et bredt udvalg af afspilningsmuligheder understøttes. Metoden med at bruge forbundne informationer er overladt til implementationen på afspilningssiden. Da denne information er i ASCII-tegnstreng, afsluttes den med NULL. Når dette mærke brugers til at kortlægge lydfiler, skal relationen i lydfilen til billedet også angives ved lydfilens afslutning." #: libexif/exif-tag.c:720 msgid "Interoperability IFD Pointer" @@ -3344,7 +3347,7 @@ msgstr "Interoperability IFD-peger" #: libexif/exif-tag.c:721 msgid "Interoperability IFD is composed of tags which stores the information to ensure the Interoperability and pointed by the following tag located in Exif IFD. The Interoperability structure of Interoperability IFD is the same as TIFF defined IFD structure but does not contain the image data characteristically compared with normal TIFF IFD." -msgstr "Interoperabilitet-IFD består af mærker som gemmer informationen der sikrer interoperabilitet og og vejledt af det følgende mærke placeret i Exif-IFD. Interoperabilitetsstrukturen på interoperabilitet-IFD er den samme som TIFF defineret IFD-struktur men indeholder ikke billeddatakarakteristika sammenlignet med normal TIFF-IFD." +msgstr "Interoperabilitet-IFD består af mærker som gemmer informationen, der sikrer interoperabilitet og vejledt af det følgende mærke placeret i Exif-IFD. Interoperabilitetsstrukturen på interoperabilitet-IFD er den samme som TIFF defineret IFD-struktur, men indeholder ikke billeddatakarakteristika sammenlignet med normal TIFF-IFD." #: libexif/exif-tag.c:730 msgid "Flash Energy" @@ -3486,7 +3489,7 @@ msgstr "Dette mærke indikerer retningen #: libexif/exif-tag.c:838 msgid "This tag indicates the direction of sharpness processing applied by the camera when the image was shot." -msgstr "Dette mærke indikerer retniningen for behandlingen af skarpheden brugt af kameraet, da billedet blev taget." +msgstr "Dette mærke indikerer retningen for behandlingen af skarpheden brugt af kameraet, da billedet blev taget." #: libexif/exif-tag.c:842 msgid "Device Setting Description" @@ -3616,7 +3619,7 @@ msgstr "Blændetalsprioritet AE" #: libexif/fuji/mnote-fuji-entry.c:138 msgid "Shutter priority AE" -msgstr "Lukketidsprioritet AE" +msgstr "Lukkerprioritet AE" #: libexif/fuji/mnote-fuji-entry.c:146 msgid "F-Standard" @@ -4643,7 +4646,7 @@ msgstr "Stemmememo" #: libexif/olympus/mnote-olympus-tag.c:177 msgid "Record Shutter Release" -msgstr "Optag lukketidsudløsning" +msgstr "Optag lukkerudløsning" #: libexif/olympus/mnote-olympus-tag.c:178 msgid "Flicker Reduce" @@ -5096,123 +5099,3 @@ msgstr "Finere" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER_da]" - -#~ msgid "On + Red-eye reduction" -#~ msgstr "Tændt + Rødøjereduktion" - -#~ msgid "Center + Right" -#~ msgstr "Centrum + højre" - -#~ msgid "Left + Right" -#~ msgstr "Venstre + højre" - -#~ msgid "Manual Temperature (Kelvin)" -#~ msgstr "Manuel temperatur (Kelvin)" - -#~ msgid "PC Set1" -#~ msgstr "Pc Sæt1" - -#~ msgid "PC Set2" -#~ msgstr "Pc Sæt2" - -#~ msgid "PC Set3" -#~ msgstr "Pc Sæt3" - -#~ msgid "Daylight Fluorescent" -#~ msgstr "Fluorescerende dagslys" - -#~ msgid "top - left" -#~ msgstr "øverst - venstre" - -#~ msgid "top - right" -#~ msgstr "øverst - højre" - -#~ msgid "bottom - right" -#~ msgstr "nederst - højre" - -#~ msgid "bottom - left" -#~ msgstr "nederst - venstre" - -#~ msgid "Center-Weighted Average" -#~ msgstr "Centrumvægtet gennemsnit" - -#~ msgid "flash" -#~ msgstr "blitz" - -#~ msgid "GPS satellites used for measurement" -#~ msgstr "GPS-satellitter brugt til måling" - -#~ msgid "y-Resolution" -#~ msgstr "y-opløsning" - -#~ msgid "OECF" -#~ msgstr "OECF" - -#~ msgid "Shutter speed" -#~ msgstr "Lukketidshastighed" - -#~ msgid "Focal Plane y-Resolution" -#~ msgstr "Brændpunktsplan y-opløsning" - -#~ msgid "Daylight-color fluorescent" -#~ msgstr "Fluorescerende dagslysfarve" - -#~ msgid "DayWhite-color fluorescent" -#~ msgstr "Fluorescerende daghvidfarve" - -#~ msgid "Macro mode" -#~ msgstr "Makrotilstand" - -#~ msgid "Super Macro" -#~ msgstr "Supermakro" - -#~ msgid "normal" -#~ msgstr "normal" - -#~ msgid "unknown" -#~ msgstr "ukendt" - -#~ msgid "panorama" -#~ msgstr "panorama" - -#~ msgid "left to right" -#~ msgstr "venstre mod højre" - -#~ msgid "right to left" -#~ msgstr "højre mod venstre" - -#~ msgid "bottom to top" -#~ msgstr "nederst til øverst" - -#~ msgid "top to bottom" -#~ msgstr "øverst til nederst" - -#~ msgid "Noisereduction" -#~ msgstr "Støjreduktion" - -#~ msgid "B&W Mode" -#~ msgstr "S&H-tilstand" - -#~ msgid "Self Timer" -#~ msgstr "Selvudløser" - -#~ msgid "Night-scene" -#~ msgstr "Natscene" - -#~ msgid "Red-eye Reduction" -#~ msgstr "Rødøjereduktion" - -#~ msgid "Night Scene" -#~ msgstr "Natscene" - -#~ msgid "Pan Focus" -#~ msgstr "Panfokus" - -#~ msgid "Daywhite Fluorescent" -#~ msgstr "Fluorescerende daghvid" - -#~ msgid "White Fluorescent" -#~ msgstr "Fluorescerende hvid" - -#~ msgid "PictureMode" -#~ msgstr "Billedtilstand" |
|
From: Dan F. <dfa...@us...> - 2010-12-10 20:34:00
|
Update of /cvsroot/libexif/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25512/libexif Modified Files: exif-entry.c Log Message: Changed the display of rational numbers to estimate the number of significant figures (based on the size of the denominator) and show that number of decimal places. This simplifies the output in the case of integers (e.g. resolution), and shows all the available accuracy in the case of rationals (e.g. latitude & longitude). Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -p -d -r1.141 -r1.142 --- exif-entry.c 15 Oct 2010 06:30:22 -0000 1.141 +++ exif-entry.c 10 Dec 2010 20:33:52 -0000 1.142 @@ -532,25 +532,27 @@ exif_entry_format_value(ExifEntry *e, ch strncpy (val, (char *) e->data, MIN (maxlen, e->size)); break; case EXIF_FORMAT_RATIONAL: - v_rat = exif_get_rational (e->data, o); - if (v_rat.denominator) - snprintf (val, maxlen, "%2.2f", - (double) v_rat.numerator / - (double) v_rat.denominator); - else - snprintf (val, maxlen, "%lu/%lu", - (unsigned long) v_rat.numerator, - (unsigned long) v_rat.denominator); - maxlen -= strlen (val); - for (i = 1; i < e->components; i++) { + for (i = 0; i < e->components; i++) { + if (i > 0) { + strncat (val, ", ", maxlen); + maxlen -= 2; + } v_rat = exif_get_rational ( e->data + 8 * i, o); - if (v_rat.denominator) - snprintf (b, sizeof (b), ", %2.2f", + if (v_rat.denominator) { + /* + * Choose the number of significant digits to + * display based on the size of the denominator. + * It is scaled so that denominators within the + * range 13..120 will show 2 decimal points. + */ + int decimals = (int)(log10(v_rat.denominator)-0.08+1.0); + snprintf (b, sizeof (b), "%2.*f", + decimals, (double) v_rat.numerator / (double) v_rat.denominator); - else - snprintf (b, sizeof (b), ", %lu/%lu", + } else + snprintf (b, sizeof (b), "%lu/%lu", (unsigned long) v_rat.numerator, (unsigned long) v_rat.denominator); strncat (val, b, maxlen); @@ -559,26 +561,23 @@ exif_entry_format_value(ExifEntry *e, ch } break; case EXIF_FORMAT_SRATIONAL: - v_srat = exif_get_srational (e->data, o); - if (v_srat.denominator) { - snprintf (val, maxlen, "%2.2f", - (double)v_srat.numerator / v_srat.denominator); - } else { - snprintf (val, maxlen, "%li/%li", - (long) v_srat.numerator, - (long) v_srat.denominator); - } - maxlen -= strlen (val); - for (i = 1; i < e->components; i++) { + for (i = 0; i < e->components; i++) { + if (i > 0) { + strncat (val, ", ", maxlen); + maxlen -= 2; + } v_srat = exif_get_srational ( e->data + 8 * i, o); - if (v_srat.denominator) - snprintf (b, sizeof (b), ", %2.2f", - (double)v_srat.numerator / v_srat.denominator); - else - snprintf (b, sizeof (b), ", %li/%li", - (long) v_srat.numerator, - (long) v_srat.denominator); + if (v_srat.denominator) { + int decimals = (int)(log10(fabs(v_srat.denominator))-0.08+1.0); + snprintf (b, sizeof (b), "%2.*f", + decimals, + (double) v_srat.numerator / + (double) v_srat.denominator); + } else + snprintf (b, sizeof (b), "%li/%li", + (long) v_srat.numerator, + (long) v_srat.denominator); strncat (val, b, maxlen); maxlen -= strlen (b); if ((signed) maxlen <= 0) break; |
|
From: Dan F. <dfa...@us...> - 2010-12-10 20:34:00
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25512 Modified Files: ChangeLog NEWS Log Message: Changed the display of rational numbers to estimate the number of significant figures (based on the size of the denominator) and show that number of decimal places. This simplifies the output in the case of integers (e.g. resolution), and shows all the available accuracy in the case of rationals (e.g. latitude & longitude). Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -d -r1.73 -r1.74 --- NEWS 20 Oct 2010 06:46:35 -0000 1.73 +++ NEWS 10 Dec 2010 20:33:50 -0000 1.74 @@ -6,6 +6,7 @@ libexif-0.6.x: * Changed a lot of strings to make the case of the text more consistent * exif_entry_dump() now displays the correct tag name for GPS tags * Fixed some invalid format specifiers that caused problems on some platforms + * Display rational numbers with the right number of significant figures libexif-0.6.19 (2009-11-12): * New translations: be, en_GB, it, ja, pt, sq, zh_CN Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.352 retrieving revision 1.353 diff -u -p -d -r1.352 -r1.353 --- ChangeLog 20 Oct 2010 06:46:35 -0000 1.352 +++ ChangeLog 10 Dec 2010 20:33:50 -0000 1.353 @@ -1,3 +1,11 @@ +2010-12-10 Dan Fandrich <da...@co...> + + * Changed the display of rational numbers to estimate the number of + significant figures (based on the size of the denominator) and show + that number of decimal places. This simplifies the output in the + case of integers (e.g. resolution), and shows all the available + accuracy in the case of rationals (e.g. latitude & longitude). + 2010-10-14 Dan Fandrich <da...@co...> * Fixed some invalid format specifiers and typecasts. This caused a |
|
From: Dan F. <dfa...@us...> - 2010-12-01 22:20:56
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5438/libexif/olympus Modified Files: exif-mnote-data-olympus.c exif-mnote-data-olympus.h Log Message: Reuse exif_mnote_data_olympus_identify_variant() to detect the MakerNote type while actually parsing the tag. Index: exif-mnote-data-olympus.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- exif-mnote-data-olympus.h 8 Oct 2010 04:20:03 -0000 1.13 +++ exif-mnote-data-olympus.h 1 Dec 2010 22:20:41 -0000 1.14 @@ -28,12 +28,14 @@ #include <libexif/exif-mem.h> enum OlympusVersion { + unrecognized = 0, nikonV1 = 1, nikonV2 = 2, olympusV1 = 3, olympusV2 = 4, sanyoV1 = 5, - epsonV1 = 6 + epsonV1 = 6, + nikonV0 = 7 }; Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -p -d -r1.45 -r1.46 --- exif-mnote-data-olympus.c 8 Oct 2010 04:20:03 -0000 1.45 +++ exif-mnote-data-olympus.c 1 Dec 2010 22:20:41 -0000 1.46 @@ -37,6 +37,11 @@ */ /*#define EXIF_OVERCOME_SANYO_OFFSET_BUG */ +static enum OlympusVersion +exif_mnote_data_olympus_identify_variant (const unsigned char *buf, + unsigned int buf_size); + + static void exif_mnote_data_olympus_clear (ExifMnoteDataOlympus *n) { @@ -122,6 +127,7 @@ exif_mnote_data_olympus_save (ExifMnoteD exif_set_short (*buf + 6, n->order, (ExifShort) 1); datao = n->offset; break; + case olympusV2: *buf_size += 8-6 + 4; *buf = exif_mem_alloc (ne->mem, *buf_size); @@ -139,6 +145,7 @@ exif_mnote_data_olympus_save (ExifMnoteD exif_set_short (*buf + 10, n->order, (ExifShort) 3); o2 += 4; break; + case nikonV1: base = MNOTE_NIKON1_TAG_BASE; @@ -146,8 +153,10 @@ exif_mnote_data_olympus_save (ExifMnoteD datao += n->offset + 10; /* subtract the size here, so the increment in the next case will not harm us */ *buf_size -= 8 + 2; - /* Fall through to nikonV2 handler */ + /* Fall through to nikonV2 handler */ case nikonV2: + /* Write out V0 files in V2 format */ + case nikonV0: *buf_size += 8 + 2; *buf_size += 4; /* Next IFD pointer */ *buf = exif_mem_alloc (ne->mem, *buf_size); @@ -160,7 +169,7 @@ exif_mnote_data_olympus_save (ExifMnoteD strcpy ((char *)*buf, "Nikon"); (*buf)[6] = n->version; - if (n->version == nikonV2) { + if (n->version != nikonV1) { exif_set_short (*buf + 10, n->order, (ExifShort) ( (n->order == EXIF_BYTE_ORDER_INTEL) ? ('I' << 8) | 'I' : @@ -265,18 +274,15 @@ exif_mnote_data_olympus_load (ExifMnoteD * two unknown bytes (0), "MM" or "II", another byte 0 and * lastly 0x2A. */ - if (!memcmp (buf + o2, "OLYMP", 6) || !memcmp (buf + o2, "SANYO", 6) || - !memcmp (buf + o2, "EPSON", 6)) { + n->version = exif_mnote_data_olympus_identify_variant(buf+o2, buf_size-o2); + switch (n->version) { + case olympusV1: + case sanyoV1: + case epsonV1: exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", "Parsing Olympus/Sanyo/Epson maker note v1..."); /* The number of entries is at position 8. */ - if (!memcmp (buf + o2, "SANYO", 6)) - n->version = sanyoV1; - else if (!memcmp (buf + o2, "EPSON", 6)) - n->version = epsonV1; - else - n->version = olympusV1; if (buf[o2 + 6] == 1) n->order = EXIF_BYTE_ORDER_INTEL; else if (buf[o2 + 6 + 1] == 1) @@ -291,8 +297,9 @@ exif_mnote_data_olympus_load (ExifMnoteD n->order = EXIF_BYTE_ORDER_INTEL; } } + break; - } else if (!memcmp (buf + o2, "OLYMPUS", 8)) { + case olympusV2: /* Olympus S760, S770 */ datao = o2; o2 += 8; @@ -306,83 +313,95 @@ exif_mnote_data_olympus_load (ExifMnoteD n->order = EXIF_BYTE_ORDER_MOTOROLA; /* The number of entries is at position 8+4. */ - n->version = olympusV2; o2 += 4; + break; - } else if (!memcmp (buf + o2, "Nikon", 6)) { + case nikonV1: o2 += 6; + if (o2 >= buf_size) return; exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", - "Parsing Nikon maker note (0x%02x, %02x, %02x, " + "Parsing Nikon maker note v1 (0x%02x, %02x, %02x, " "%02x, %02x, %02x, %02x, %02x)...", buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]); - /* The first byte is the version. */ - if (o2 >= buf_size) return; - n->version = buf[o2]; + + /* Skip version number */ o2 += 1; /* Skip an unknown byte (00 or 0A). */ o2 += 1; - switch (n->version) { - case nikonV1: - - base = MNOTE_NIKON1_TAG_BASE; - /* Fix endianness, if needed */ - if (o2 + 2 > buf_size) return; - c = exif_get_short (buf + o2, n->order); - if ((!(c & 0xFF)) && (c > 0x500)) { - if (n->order == EXIF_BYTE_ORDER_INTEL) { - n->order = EXIF_BYTE_ORDER_MOTOROLA; - } else { - n->order = EXIF_BYTE_ORDER_INTEL; - } + base = MNOTE_NIKON1_TAG_BASE; + /* Fix endianness, if needed */ + if (o2 + 2 > buf_size) return; + c = exif_get_short (buf + o2, n->order); + if ((!(c & 0xFF)) && (c > 0x500)) { + if (n->order == EXIF_BYTE_ORDER_INTEL) { + n->order = EXIF_BYTE_ORDER_MOTOROLA; + } else { + n->order = EXIF_BYTE_ORDER_INTEL; } - break; - - case nikonV2: + } + break; - /* Skip 2 unknown bytes (00 00). */ - o2 += 2; + case nikonV2: + o2 += 6; + if (o2 >= buf_size) return; + exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", + "Parsing Nikon maker note v2 (0x%02x, %02x, %02x, " + "%02x, %02x, %02x, %02x, %02x)...", + buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], + buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]); - /* - * Byte order. From here the data offset - * gets calculated. - */ - datao = o2; - if (o2 >= buf_size) return; - if (!strncmp ((char *)&buf[o2], "II", 2)) - n->order = EXIF_BYTE_ORDER_INTEL; - else if (!strncmp ((char *)&buf[o2], "MM", 2)) - n->order = EXIF_BYTE_ORDER_MOTOROLA; - else { - exif_log (en->log, EXIF_LOG_CODE_DEBUG, - "ExifMnoteDataOlympus", "Unknown " - "byte order '%c%c'", buf[o2], - buf[o2 + 1]); - return; - } - o2 += 2; + /* Skip version number */ + o2 += 1; - /* Skip 2 unknown bytes (00 2A). */ - o2 += 2; + /* Skip an unknown byte (00 or 0A). */ + o2 += 1; - /* Go to where the number of entries is. */ - if (o2 + 4 > buf_size) return; - o2 = datao + exif_get_long (buf + o2, n->order); - break; + /* Skip 2 unknown bytes (00 00). */ + o2 += 2; - default: + /* + * Byte order. From here the data offset + * gets calculated. + */ + datao = o2; + if (o2 >= buf_size) return; + if (!strncmp ((char *)&buf[o2], "II", 2)) + n->order = EXIF_BYTE_ORDER_INTEL; + else if (!strncmp ((char *)&buf[o2], "MM", 2)) + n->order = EXIF_BYTE_ORDER_MOTOROLA; + else { exif_log (en->log, EXIF_LOG_CODE_DEBUG, - "ExifMnoteDataOlympus", "Unknown Nikon " - "version number %i.", n->version); + "ExifMnoteDataOlympus", "Unknown " + "byte order '%c%c'", buf[o2], + buf[o2 + 1]); return; } - } else if (!memcmp (buf + o2, "\0\x1b", 2)) { - n->version = nikonV2; + o2 += 2; + + /* Skip 2 unknown bytes (00 2A). */ + o2 += 2; + + /* Go to where the number of entries is. */ + if (o2 + 4 > buf_size) return; + o2 = datao + exif_get_long (buf + o2, n->order); + break; + + case nikonV0: + exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", + "Parsing Nikon maker note v0 (0x%02x, %02x, %02x, " + "%02x, %02x, %02x, %02x, %02x)...", + buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], + buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]); /* 00 1b is # of entries in Motorola order - the rest should also be in MM order */ n->order = EXIF_BYTE_ORDER_MOTOROLA; - } else { + break; + + default: + exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus", + "Unknown Olympus variant %i.", n->version); return; } @@ -553,22 +572,23 @@ exif_mnote_data_olympus_set_offset (Exif if (n) ((ExifMnoteDataOlympus *) n)->offset = o; } -int -exif_mnote_data_olympus_identify (const ExifData *ed, const ExifEntry *e) +static enum OlympusVersion +exif_mnote_data_olympus_identify_variant (const unsigned char *buf, + unsigned int buf_size) { /* Olympus, Nikon, Sanyo, Epson */ - if (e->size >= 8) { + if (buf_size >= 8) { /* Match the terminating NUL character, too */ - if (!memcmp (e->data, "OLYMPUS", 8)) - return olympusV2; - else if (!memcmp (e->data, "OLYMP", 6)) - return olympusV1; - else if (!memcmp (e->data, "SANYO", 6)) - return sanyoV1; - else if (!memcmp (e->data, "EPSON", 6)) - return epsonV1; - else if (!memcmp (e->data, "Nikon", 6)) { - switch (e->data[6]) { + if (!memcmp (buf, "OLYMPUS", 8)) + return olympusV2; + else if (!memcmp (buf, "OLYMP", 6)) + return olympusV1; + else if (!memcmp (buf, "SANYO", 6)) + return sanyoV1; + else if (!memcmp (buf, "EPSON", 6)) + return epsonV1; + else if (!memcmp (buf, "Nikon", 6)) { + switch (buf[6]) { case 1: return nikonV1; case 2: return nikonV2; default: return 0; /* Unrecognized Nikon variant */ @@ -577,9 +597,23 @@ exif_mnote_data_olympus_identify (const } /* Another variant of Nikon */ - if ((e->size >= 2) && (e->data[0] == 0x00) && (e->data[1] == 0x1b)) { + if ((buf_size >= 2) && (buf[0] == 0x00) && (buf[1] == 0x1b)) { + return nikonV0; + } + + return unrecognized; +} + +int +exif_mnote_data_olympus_identify (const ExifData *ed, const ExifEntry *e) +{ + int variant = exif_mnote_data_olympus_identify_variant(e->data, e->size); + + if (variant == nikonV0) { + /* This variant needs some extra checking with the Make */ char value[5]; ExifEntry *em = exif_data_get_entry (ed, EXIF_TAG_MAKE); + variant = unrecognized; if (em) { const char *v = exif_entry_get_value (em, value, sizeof(value)); @@ -588,11 +622,11 @@ exif_mnote_data_olympus_identify (const /* When saved, this variant will be written out like the * alternative nikonV2 form above instead */ - return nikonV2; + variant = nikonV0; } } - return 0; + return variant; } |
|
From: Dan F. <dfa...@us...> - 2010-11-20 08:32:39
|
Update of /cvsroot/libexif/libexif-testsuite/tests In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16655 Modified Files: check-create-tags.sh Log Message: Portability fixes Index: check-create-tags.sh =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-create-tags.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-create-tags.sh 24 Nov 2009 05:31:31 -0000 1.1 +++ check-create-tags.sh 20 Nov 2010 08:32:29 -0000 1.2 @@ -11,24 +11,24 @@ dstimg="./create-tags.out.jpg" set -e echo Create an empty EXIF tag block -"$EXIFEXE" --create-exif --no-fixup -o "$dstimg" "$SRCDIR/images/no-exif.jpg" +$EXIFEXE --create-exif --no-fixup -o "$dstimg" "$SRCDIR/images/no-exif.jpg" # Count the number of tags -numtags=`"$EXIFEXE" --no-fixup -m -i "$dstimg" | wc -l` +numtags=`$EXIFEXE --no-fixup -m -i "$dstimg" | wc -l` echo Must be 0 tags: $numtags -test "$numtags" = 0 +test $numtags = 0 rm -f "$dstimg" echo Create a EXIF tag block with mandatory and default tags -"$EXIFEXE" --create-exif -o "$dstimg" "$SRCDIR/images/no-exif.jpg" +$EXIFEXE --create-exif -o "$dstimg" "$SRCDIR/images/no-exif.jpg" # Count the number of tags -numtags=`"$EXIFEXE" --no-fixup -m -i "$dstimg" | wc -l` +numtags=`$EXIFEXE --no-fixup -m -i "$dstimg" | wc -l` echo Must be 11 tags: $numtags -test "$numtags" = 11 +test $numtags = 11 rm -f "$dstimg" |
|
From: Dan F. <dfa...@us...> - 2010-11-03 00:09:59
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27451 Modified Files: README Log Message: Fixed name of digikam Index: README =================================================================== RCS file: /cvsroot/libexif/libexif/README,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -d -r1.28 -r1.29 --- README 20 Oct 2010 06:46:35 -0000 1.28 +++ README 3 Nov 2010 00:09:46 -0000 1.29 @@ -65,7 +65,7 @@ Right now, I know of the following front - gtkam: A GTK+ frontend to libgphoto2 (http://www.topfrose.de). - thirdeye: Digital photos organizer and driver for eComStation (http://ecomstation.ru/thirdeye). - - digicam: digital photo management application for KDE + - digikam: digital photo management application for KDE (http://www.digikam.org/) If you would like to migrate your program to use libexif or add EXIF support |
|
From: Dan F. <dfa...@us...> - 2010-10-20 06:46:44
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20485 Modified Files: ChangeLog NEWS README Log Message: Updates to reflect recent changes Index: README =================================================================== RCS file: /cvsroot/libexif/libexif/README,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -d -r1.27 -r1.28 --- README 17 Jun 2010 05:33:37 -0000 1.27 +++ README 20 Oct 2010 06:46:35 -0000 1.28 @@ -36,17 +36,14 @@ is no longer needed. USAGE ----- -We have started documenting the libexif API using doxygen and are making +We have documented the libexif API using doxygen and are making the results available at http://libexif.sourceforge.net/api/ -Until someone writes some better documentation however, you need to refer -to the header files. - -The short test-program test/test-mem illustrates how to create valid -EXIF data from scratch, how to save EXIF data and how to load EXIF data -from data in memory. There are also a few simple example programs available -in the contrib/examples/ directory. Don't hesitate to contact us -(<lib...@li...>) if you've got any questions +The short test programs in the test directory illustrates how to create +valid EXIF data from scratch, how to save EXIF data and how to load EXIF +data from data in memory. There are also a few simple example programs +available in the contrib/examples/ directory. Don't hesitate to contact +us at <lib...@li...> if you've got any questions on how to use libexif. To link to libexif into your own package, we recommend using the @@ -68,7 +65,9 @@ Right now, I know of the following front - gtkam: A GTK+ frontend to libgphoto2 (http://www.topfrose.de). - thirdeye: Digital photos organizer and driver for eComStation (http://ecomstation.ru/thirdeye). - - digicam: + - digicam: digital photo management application for KDE + (http://www.digikam.org/) + If you would like to migrate your program to use libexif or add EXIF support to it, don't hesitate to contact the authors. @@ -105,7 +104,7 @@ necessary: ./configure make -Or, possibly just: +Or, probably just: autoreconf -i ./configure Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.72 retrieving revision 1.73 diff -u -p -d -r1.72 -r1.73 --- NEWS 23 Sep 2010 20:56:39 -0000 1.72 +++ NEWS 20 Oct 2010 06:46:35 -0000 1.73 @@ -5,6 +5,7 @@ libexif-0.6.x: * Turned on the --enable-silent-rules configure option * Changed a lot of strings to make the case of the text more consistent * exif_entry_dump() now displays the correct tag name for GPS tags + * Fixed some invalid format specifiers that caused problems on some platforms libexif-0.6.19 (2009-11-12): * New translations: be, en_GB, it, ja, pt, sq, zh_CN Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.351 retrieving revision 1.352 diff -u -p -d -r1.351 -r1.352 --- ChangeLog 8 Oct 2010 04:19:59 -0000 1.351 +++ ChangeLog 20 Oct 2010 06:46:35 -0000 1.352 @@ -1,3 +1,8 @@ +2010-10-14 Dan Fandrich <da...@co...> + + * Fixed some invalid format specifiers and typecasts. This caused a + problem on mingw32, at least. + 2010-10-07 Dan Fandrich <da...@co...> * Refactored MakerNote detection code to put detection of each type |
|
From: Dan F. <dfa...@us...> - 2010-10-20 06:45:20
|
Update of /cvsroot/libexif/exif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20012 Modified Files: README exif.1 Log Message: Minor documentation updates Index: README =================================================================== RCS file: /cvsroot/libexif/exif/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- README 6 Nov 2008 01:38:49 -0000 1.5 +++ README 20 Oct 2010 06:45:11 -0000 1.6 @@ -29,6 +29,10 @@ path, like this: ./configure PKG_CONFIG_PATH=/usr/local/lib/pkgconfig +When building from CVS, run this before configuring: + + autoreconf -i + INTERNATIONALIZATION -------------------- Index: exif.1 =================================================================== RCS file: /cvsroot/libexif/exif/exif.1,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- exif.1 26 Sep 2010 06:23:45 -0000 1.21 +++ exif.1 20 Oct 2010 06:45:11 -0000 1.22 @@ -199,6 +199,12 @@ existing image and fix the existing tags exif --output=new.jpg --tag=YCbCrSubSampling --ifd=0 --set-value='2 1' image.jpg .RE .LP +List table with all known EXIF tags, highlighting mandatory ones: +.LP +.RS +exif -cl +.RE +.LP .SH "AUTHOR" .B exif was written by Lutz Mueller <lu...@us...> |
|
From: Dan F. <dfa...@us...> - 2010-10-20 06:44:52
|
Update of /cvsroot/libexif/exif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19142 Modified Files: ChangeLog configure.ac Log Message: po/gl.po: Added new Galician translation by Fran Diéguez po/is.po: Updated Icelandic translation by Sveinn à Felli Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/exif/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -d -r1.36 -r1.37 --- configure.ac 24 Sep 2010 05:18:08 -0000 1.36 +++ configure.ac 20 Oct 2010 06:44:40 -0000 1.37 @@ -43,7 +43,7 @@ GP_PKG_CONFIG # i18n support # --------------------------------------------------------------------------- GP_GETTEXT_HACK([${PACKAGE}],[Lutz Mueller and others]) -ALL_LINGUAS="da de es fi fr id is it lv nl pl ro sk sv vi zh_CN" +ALL_LINGUAS="da de es fi fr gl id is it lv nl pl ro sk sv vi zh_CN" 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.116 retrieving revision 1.117 diff -u -p -d -r1.116 -r1.117 --- ChangeLog 17 Jun 2010 06:29:14 -0000 1.116 +++ ChangeLog 20 Oct 2010 06:44:40 -0000 1.117 @@ -1,3 +1,8 @@ +2010-10-19 Dan Fandrich <da...@co...> + + * po/gl.po: Added new Galician translation by Fran Diéguez + * po/is.po: Updated Icelandic translation by Sveinn í Felli + 2010-06-16 Dan Fandrich <da...@co...> * Adding and removing a thumbnail can now be done at the same time |
|
From: Dan F. <dfa...@us...> - 2010-10-20 06:44:52
|
Update of /cvsroot/libexif/exif/po In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19142/po Modified Files: is.po Added Files: gl.po Log Message: po/gl.po: Added new Galician translation by Fran Diéguez po/is.po: Updated Icelandic translation by Sveinn à Felli Index: is.po =================================================================== RCS file: /cvsroot/libexif/exif/po/is.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- is.po 3 Sep 2009 17:20:24 -0000 1.1 +++ is.po 20 Oct 2010 06:44:42 -0000 1.2 @@ -1,14 +1,14 @@ -# translation of exif-0.6.17.po to Icelandic +# translation of exif-0.6.18.is.po to Icelandic # Copyright (C) 2009 Lutz Mueller and others # This file is distributed under the same license as the exif package. -# Sveinn à Felli <sv...@ne...>, 2009. # +# Sveinn à Felli <sv...@ne...>, 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: exif-0.6.17\n" +"Project-Id-Version: exif-0.6.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-06 01:03-0800\n" -"PO-Revision-Date: 2009-09-03 15:14+0000\n" +"POT-Creation-Date: 2009-10-08 18:05-0700\n" +"PO-Revision-Date: 2010-10-10 19:13+0000\n" "Last-Translator: Sveinn à Felli <sv...@ne...>\n" "Language-Team: Icelandic <(nothing)>\n" "MIME-Version: 1.0\n" @@ -17,273 +17,286 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: exif/actions.c:56 +#: exif/actions.c:57 #, c-format msgid "Not enough memory." msgstr "Ekki nægt minni!" -#: exif/actions.c:74 +#: exif/actions.c:75 #, c-format msgid "Setting a value for this tag is unsupported!" msgstr "Ekki er stutt að setja gildi fyrir þetta merki!" -#: exif/actions.c:91 +#: exif/actions.c:92 #, c-format msgid "Too few components specified!" msgstr "Of fáar einingar tilgreindar!" -#: exif/actions.c:106 +#: exif/actions.c:107 #, c-format msgid "Internal error. Please contact <%s>." msgstr "Innri villa. Hafðu samband við <%s>." -#: exif/actions.c:143 +#: exif/actions.c:146 #, c-format msgid "Not yet implemented!" msgstr "Ekki útfært ennþá!" -#: exif/actions.c:150 +#: exif/actions.c:153 #, c-format msgid "Warning; Too many components specified!" msgstr "Aðvörun; of margar einingar tilgreindar!" -#: exif/actions.c:172 +#: exif/actions.c:175 #, c-format msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed." msgstr "Of mikið af EXIF gögnum (%i bæti). Aðeins %i bæti eru leyfileg." -#: exif/actions.c:183 exif/actions.c:358 +#: exif/actions.c:186 exif/actions.c:357 #, c-format msgid "Wrote file '%s'." msgstr "Skrifaði skrá '%s'." -#: exif/actions.c:203 +#: exif/actions.c:206 #, c-format msgid "EXIF entry '%s' " msgstr "EXIF færsla '%s' " -#: exif/actions.c:205 +#: exif/actions.c:208 #, c-format msgid "(0x%x, '%s') " msgstr "(0x%x, '%s') " -#: exif/actions.c:208 +#: exif/actions.c:211 #, c-format msgid "exists in IFD '%s':\n" msgstr "er til à IFD '%s':\n" -#: exif/actions.c:251 +#: exif/actions.c:262 #, c-format msgid "IFD '%s' does not contain a tag '%s'!" msgstr "IFD '%s' inniheldur ekki merkið '%s'!" -#: exif/actions.c:282 -#, c-format -msgid "Could not open '%s' (%m)!" -msgstr "Gat ekki opnað '%s' (%m)!" - -#: exif/actions.c:285 +#: exif/actions.c:292 #, c-format msgid "Could not open '%s' (%s)!" msgstr "Gat ekki opnað '%s' (%s)!" -#: exif/actions.c:295 -#, c-format -msgid "Could not read '%s' (%m)." -msgstr "Gat ekki lesið '%s' (%m)." - -#: exif/actions.c:298 +#: exif/actions.c:301 #, c-format msgid "Could not read '%s' (%s)." msgstr "Gat ekki lesið '%s' (%s)." -#: exif/actions.c:317 +#: exif/actions.c:320 #, c-format msgid "IFD '%s' does not contain tag '%s'." msgstr "IFD '%s' inniheldur ekki merkið '%s'." -#: exif/actions.c:323 +#: exif/actions.c:326 #, c-format msgid "'%s' does not contain tag '%s'." msgstr "'%s' inniheldur ekki merkið '%s'." -#: exif/actions.c:341 +#: exif/actions.c:344 #, c-format msgid "'%s' does not contain a thumbnail!" msgstr "'%s' inniheldur ekki smámynd!" -#: exif/actions.c:350 -#, c-format -msgid "Could not open '%s' for writing (%m)!" -msgstr "Gat ekki opnað '%s' til skrifunar (%m)!" - -#: exif/actions.c:353 +#: exif/actions.c:352 #, c-format msgid "Could not open '%s' for writing (%s)!" msgstr "Gat ekki opnað '%s' til skrifunar (%s)!" -#: exif/actions.c:371 +#: exif/actions.c:374 #, c-format msgid "EXIF tags in '%s':" msgstr "EXIF merki à '%s':" -#: exif/actions.c:440 +#: exif/actions.c:470 #, c-format -msgid "Unknown MakerNote format.\n" -msgstr "Ãþekkt MakerNote-snið.\n" +msgid "Unknown format or nonexistent MakerNote.\n" +msgstr "Ãþekkt snið MakerNote merkja eða að þau eru ekki fyrir hendi.\n" -#: exif/actions.c:447 +#: exif/actions.c:477 #, c-format msgid "MakerNote does not contain any value.\n" msgstr "MakerNote inniheldur engin gildi.\n" -#: exif/actions.c:450 +#: exif/actions.c:480 #, c-format msgid "MakerNote contains %i value:\n" msgid_plural "MakerNote contains %i values:\n" msgstr[0] "MakerNote inniheldur %i gildi:\n" msgstr[1] "MakerNote inniheldur %i gildi:\n" -#: exif/actions.c:460 +#: exif/actions.c:490 msgid "Unknown tag" msgstr "Ãþekkt merki" -#: exif/actions.c:464 +#: exif/actions.c:499 msgid "Unknown value" msgstr "Ãþekkt gildi" -#: exif/actions.c:490 +#: exif/actions.c:523 #, c-format msgid "EXIF tags in '%s' ('%s' byte order):" msgstr "EXIF merki à '%s' ('%s' à bætaröð):" -#: exif/actions.c:495 exif/actions.c:497 +#: exif/actions.c:529 msgid "Tag" msgstr "Merki" -#: exif/actions.c:501 exif/actions.c:503 exif/main.c:199 +#: exif/actions.c:535 msgid "Value" msgstr "Gildi" -#: exif/actions.c:509 +#: exif/actions.c:550 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." msgstr "EXIF-gögnin innihalda smámynd (%i bæti)." -#: exif/actions.c:545 +#: exif/actions.c:592 #, c-format msgid "ThumbnailSize\t%i\n" msgstr "SmámyndarStærð\t%i\n" -#: exif/main.c:175 +#: exif/main.c:196 msgid "Display software version" msgstr "Sýna útgáfu hugbúnaðar" -#: exif/main.c:177 +#: exif/main.c:198 msgid "Show IDs instead of tag names" msgstr "Sýna auðkenni (ID) à stað heita á merkjum" -#: exif/main.c:179 +#: exif/main.c:200 msgid "Select tag" msgstr "Veldu merki" -#: exif/main.c:179 +#: exif/main.c:200 msgid "tag" msgstr "merki" -#: exif/main.c:181 +#: exif/main.c:202 msgid "Select IFD" msgstr "Veldu IFD" -#: exif/main.c:181 +#: exif/main.c:202 msgid "IFD" msgstr "IFD" -#: exif/main.c:183 +#: exif/main.c:204 msgid "List all EXIF tags" msgstr "Birta öll EXIF merki" -#: exif/main.c:185 +#: exif/main.c:206 msgid "Show contents of tag MakerNote" msgstr "Sýna innihald MakerNote merkis" -#: exif/main.c:187 +#: exif/main.c:208 msgid "Remove tag or ifd" msgstr "Fjarlægja merki eða IFD" -#: exif/main.c:189 +#: exif/main.c:210 msgid "Show description of tag" msgstr "Sýna lýsingu merkis" -#: exif/main.c:191 +#: exif/main.c:212 msgid "Extract thumbnail" msgstr "Taka út smámynd" -#: exif/main.c:193 +#: exif/main.c:214 msgid "Remove thumbnail" msgstr "Fjarlægja smámynd" -#: exif/main.c:195 +#: exif/main.c:216 msgid "Insert FILE as thumbnail" msgstr "Setja SKRà inn sem smámynd" -#: exif/main.c:195 exif/main.c:197 +#: exif/main.c:216 exif/main.c:220 msgid "FILE" msgstr "SKRÃ" -#: exif/main.c:197 +#: exif/main.c:218 +msgid "Do not fix existing tags in files" +msgstr "Ekki laga þau merki sem þegar eru à skrám" + +#: exif/main.c:220 msgid "Write data to FILE" msgstr "Skrifa gögn à SKRÃ" -#: exif/main.c:201 +#: exif/main.c:222 +msgid "Value of tag" +msgstr "Gildi merkis" + +#: exif/main.c:224 msgid "Create EXIF data if not existing" msgstr "Búa til EXIF gögn ef þau eru ekki til" -#: exif/main.c:203 +#: exif/main.c:226 msgid "Output in a machine-readable (tab delimited) format" msgstr "Skrifa út á véltæku sniði (machine-readable - tab delimited)" -#: exif/main.c:206 +#: exif/main.c:229 +msgid "Width of output" +msgstr "Breidd úttaks" + +#: exif/main.c:229 +msgid "WIDTH" +msgstr "BREIDD" + +#: exif/main.c:231 msgid "Output in a XML format" msgstr "Skrifa út á XML-sniði" -#: exif/main.c:209 +#: exif/main.c:234 msgid "Show debugging messages" msgstr "Sýna aflúsunarúttak" -#: exif/main.c:229 +#: exif/main.c:240 +msgid "Help options:" +msgstr "Hjálparmöguleikar:" + +#: exif/main.c:241 +msgid "Show this help message" +msgstr "Sýna þessi hjálparskilaboð" + +#: exif/main.c:242 +msgid "Display brief usage message" +msgstr "Sýna stuttar notkunarleiðbeiningar" + +#: exif/main.c:262 msgid "[OPTION...] file" msgstr "[ROFI...] skrá" -#: exif/main.c:241 +#: exif/main.c:277 #, c-format msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'." msgstr "Ãgilt IFD '%s'. VGild IFD eru '0', '1', 'EXIF', 'GPS', og 'Interoperability'." -#: exif/main.c:250 +#: exif/main.c:286 #, c-format msgid "Invalid tag '%s'!" msgstr "Ãgilt merki '%s'!" -#: exif/main.c:258 +#: exif/main.c:294 msgid "You need to specify a tag!" msgstr "Ãú þarft að tilgreina merki!" -#: exif/main.c:263 +#: exif/main.c:299 msgid "You need to specify an IFD!" msgstr "Ãú þarft að tilgreina IFD!" -#: exif/main.c:286 +#: exif/main.c:322 #, c-format msgid "Tag '%s' " msgstr "Merki '%s' " -#: exif/main.c:288 +#: exif/main.c:324 #, c-format msgid "(0x%04x, '%s'): " msgstr "(0x%04x, '%s'): " -#: exif/main.c:338 +#: exif/main.c:388 #, c-format -msgid "'%s' does not contain EXIF data!" -msgstr "'%s' inniheldur ekki EXIF gögn!" +msgid "'%s' is not readable or does not contain EXIF data!" +msgstr "'%s' er ekki lesanlegt eða inniheldur ekki EXIF gögn!" --- NEW FILE: gl.po --- (This appears to be a binary file; contents omitted.) |
|
From: Dan F. <dfa...@us...> - 2010-10-20 06:39:44
|
Update of /cvsroot/libexif/exif/test In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18589/test Modified Files: check-help.sh Log Message: Also test the alternate way to get help Index: check-help.sh =================================================================== RCS file: /cvsroot/libexif/exif/test/check-help.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- check-help.sh 25 Sep 2010 07:45:16 -0000 1.1 +++ check-help.sh 20 Oct 2010 06:39:35 -0000 1.2 @@ -7,6 +7,10 @@ export LANG=C export LANGUAGE=C -# If this random help string is found, the rest are probably also there +# If these random help strings are found, the rest are probably also there $EXIFEXE --help | grep '^ -c, --create-exif Create EXIF data if not existing$' >/dev/null +test $? -eq 0 || exit 1 + +$EXIFEXE -\? | grep '^ -r, --remove-thumbnail Remove thumbnail$' >/dev/null +test $? -eq 0 || exit 1 |
|
From: Dan F. <dfa...@us...> - 2010-10-15 06:30:32
|
Update of /cvsroot/libexif/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20270 Modified Files: exif-entry.c Log Message: Fixed some invalid format specifiers and typecasts Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.140 retrieving revision 1.141 diff -u -p -d -r1.140 -r1.141 --- exif-entry.c 23 Sep 2010 20:56:41 -0000 1.140 +++ exif-entry.c 15 Oct 2010 06:30:22 -0000 1.141 @@ -503,13 +503,13 @@ exif_entry_format_value(ExifEntry *e, ch break; case EXIF_FORMAT_LONG: v_long = exif_get_long (e->data, o); - snprintf (val, maxlen, "%lu", (long int) v_long); + snprintf (val, maxlen, "%lu", (unsigned long) v_long); maxlen -= strlen (val); for (i = 1; i < e->components; i++) { v_long = exif_get_long (e->data + exif_format_get_size (e->format) * i, o); - snprintf (b, sizeof (b), ", %lu", (long int) v_long); + snprintf (b, sizeof (b), ", %lu", (unsigned long) v_long); strncat (val, b, maxlen); maxlen -= strlen (b); if ((signed)maxlen <= 0) break; @@ -534,7 +534,7 @@ exif_entry_format_value(ExifEntry *e, ch case EXIF_FORMAT_RATIONAL: v_rat = exif_get_rational (e->data, o); if (v_rat.denominator) - snprintf (val, maxlen, "%2.2lf", + snprintf (val, maxlen, "%2.2f", (double) v_rat.numerator / (double) v_rat.denominator); else @@ -546,7 +546,7 @@ exif_entry_format_value(ExifEntry *e, ch v_rat = exif_get_rational ( e->data + 8 * i, o); if (v_rat.denominator) - snprintf (b, sizeof (b), ", %2.2lf", + snprintf (b, sizeof (b), ", %2.2f", (double) v_rat.numerator / (double) v_rat.denominator); else @@ -985,7 +985,7 @@ exif_entry_get_value (ExifEntry *e, char break; } d = (double) v_rat.numerator / (double) v_rat.denominator; - snprintf (val, maxlen, "f/%.01lf", d); + snprintf (val, maxlen, "f/%.01f", d); break; case EXIF_TAG_APERTURE_VALUE: case EXIF_TAG_MAX_APERTURE_VALUE: @@ -997,7 +997,7 @@ exif_entry_get_value (ExifEntry *e, char break; } d = (double) v_rat.numerator / (double) v_rat.denominator; - snprintf (val, maxlen, _("%.02lf EV"), d); + snprintf (val, maxlen, _("%.02f EV"), d); snprintf (b, sizeof (b), _(" (f/%.01f)"), pow (2, d / 2.)); if (maxlen > strlen (val) + strlen (b)) strncat (val, b, maxlen - strlen (val)); @@ -1037,7 +1037,7 @@ exif_entry_get_value (ExifEntry *e, char (double) v_rat.denominator)); d = (double) v_rat.numerator / (double) v_rat.denominator; - snprintf (val, maxlen, "%.1lf mm", d); + snprintf (val, maxlen, "%.1f mm", d); if (maxlen > strlen (val) + strlen (b)) strncat (val, b, maxlen - strlen (val)); break; @@ -1050,7 +1050,7 @@ exif_entry_get_value (ExifEntry *e, char break; } d = (double) v_rat.numerator / (double) v_rat.denominator; - snprintf (val, maxlen, "%.1lf m", d); + snprintf (val, maxlen, "%.1f m", d); break; case EXIF_TAG_EXPOSURE_TIME: CF (e, EXIF_FORMAT_RATIONAL, val, maxlen); |
|
From: Dan F. <dfa...@us...> - 2010-10-08 06:50:28
|
Update of /cvsroot/libexif/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2744 Modified Files: exif-data.c Log Message: Remove obsolete strncasecmp macro Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -p -d -r1.128 -r1.129 --- exif-data.c 8 Oct 2010 04:20:03 -0000 1.128 +++ exif-data.c 8 Oct 2010 06:50:19 -0000 1.129 @@ -39,10 +39,6 @@ #include <stdio.h> #include <string.h> -#if defined(__WATCOMC__) || defined(_MSC_VER) -# define strncasecmp strnicmp -#endif - #undef JPEG_MARKER_SOI #define JPEG_MARKER_SOI 0xd8 #undef JPEG_MARKER_APP0 |
|
From: Dan F. <dfa...@us...> - 2010-10-08 05:22:12
|
Update of /cvsroot/libexif/libexif-testsuite/tests In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19315/tests Modified Files: Makefile.am Added Files: check-mnote-count.sh Log Message: Added check-mnote-count.sh to sanity test the MakerNote detection --- NEW FILE: check-mnote-count.sh --- #!/bin/sh # Count the number of MakerNotes that can be parsed . check-vars.sh # Run this in the C locale so the messages are known export LANG=C export LANGUAGE=C tmpfile="./log.tmp" : >"$tmpfile" total=0 total_img=0 maker_img=0 for img in $ALLFILES do test -f "$img" || continue total_img=$(expr $total_img + 1) # Test images without EXIF tags if noexiftags "$img" ; then #echo No EXIF tags in "$img" continue fi if ! $EXIFEXE -m --ifd=EXIF --tag=MakerNote "$img" >/dev/null 2>&1 ; then #echo No MakerNote tag in "$img" continue fi maker_img=$(expr $maker_img + 1) $EXIFEXE --show-mnote "$img" | grep 'MakerNote contains' >/dev/null s="$?" if test "$s" -eq 0; then total=$(expr $total + 1) #echo MakerNote understood in "${img}" $EXIFEXE --show-mnote -d "$img" | grep 'MakerNote variant' >>"$tmpfile" else echo Cannot understand MakerNote in "${img}" fi done echo '' echo MakerNote variants recognized: sort "$tmpfile" | uniq maker_variants=`sort "$tmpfile" | uniq | wc -l` rm "$tmpfile" self="$(basename "$0")" echo "$self: $total_img images checked." echo "$self: $maker_img images had MakerNote tags." echo "$self: $total images contained supported MakerNotes." echo "$self: $maker_variants different MakerNote variants seen." test "$total" -ne 0 Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -d -r1.32 -r1.33 --- Makefile.am 7 Oct 2010 04:27:27 -0000 1.32 +++ Makefile.am 8 Oct 2010 05:22:03 -0000 1.33 @@ -30,7 +30,8 @@ EXTRA_DIST = \ check-fixup.sh \ check-remove-tags.sh \ check-init-mandatory-tags.sh \ - check-write-fail.sh + check-write-fail.sh \ + check-mnote-count.sh if HAVE_EXIF_CLI @@ -48,7 +49,8 @@ check_SCRIPTS = \ check-fixup.sh \ check-remove-tags.sh \ check-init-mandatory-tags.sh \ - check-write-fail.sh + check-write-fail.sh \ + check-mnote-count.sh # These check scripts may take a little longer - but are invaluable. :) check_SCRIPTS += check-general-images.sh \ |
|
From: Dan F. <dfa...@us...> - 2010-10-08 05:22:11
|
Update of /cvsroot/libexif/libexif-testsuite In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19315 Modified Files: NEWS Log Message: Added check-mnote-count.sh to sanity test the MakerNote detection Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -d -r1.22 -r1.23 --- NEWS 7 Oct 2010 04:27:21 -0000 1.22 +++ NEWS 8 Oct 2010 05:22:01 -0000 1.23 @@ -7,6 +7,7 @@ New in 0.7.x: * Added check-init-mandatory-tags.sh to test that all mandatory EXIF values can be created from scratch * Added check-write-fail.sh to test that exif detects an unwritable file + * Added check-mnote-count.sh to sanity test the MakerNote detection * Changed tests to account for slightly different exif text output New in 0.7.15: |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:41
|
Update of /cvsroot/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980 Modified Files: ChangeLog Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.350 retrieving revision 1.351 diff -u -p -d -r1.350 -r1.351 --- ChangeLog 17 Jun 2010 05:33:53 -0000 1.350 +++ ChangeLog 8 Oct 2010 04:19:59 -0000 1.351 @@ -1,3 +1,23 @@ +2010-10-07 Dan Fandrich <da...@co...> + + * Refactored MakerNote detection code to put detection of each type + into the module handling that type + +2010-09-23 Dan Fandrich <da...@co...> + + * exif_entry_dump() now displays the correct tag name for GPS tags by + taking the IFD into account when looking up the name. Fixes + bug #3073307. + +2010-08-11 Dan Fandrich <da...@co...> + + * Removed redundant sentence. Fixes Ubuntu bug #197306 + +2010-07-23 Dan Fandrich <da...@co...> + + * Canon EOS 5D Mark II writes Aperture values as invalid values + 0x80000000/1 which makes pow() throw floating-point exceptions + 2010-06-16 Dan Fandrich <da...@co...> * po/da.po: Updated Danish translation by Joe Hansen |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:13
|
Update of /cvsroot/libexif/libexif/libexif In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980/libexif Modified Files: exif-data.c exif-tag.h Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: exif-tag.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -p -d -r1.29 -r1.30 --- exif-tag.h 11 Dec 2009 08:13:19 -0000 1.29 +++ exif-tag.h 8 Oct 2010 04:20:03 -0000 1.30 @@ -202,7 +202,9 @@ typedef enum { /*! Return the tag ID given its unique textual name. * * \param[in] name tag name - * \return tag ID + * \return tag ID, or 0 if tag not found + * \note The tag not found value cannot be distinguished from a legitimate + * tag number 0. */ ExifTag exif_tag_from_name (const char *name); Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -p -d -r1.127 -r1.128 --- exif-data.c 8 Jan 2010 23:17:02 -0000 1.127 +++ exif-data.c 8 Oct 2010 04:20:03 -0000 1.128 @@ -729,57 +729,6 @@ typedef enum { EXIF_DATA_TYPE_MAKER_NOTE_FUJI = 6 } ExifDataTypeMakerNote; -static ExifDataTypeMakerNote -exif_data_get_type_maker_note (ExifData *d) -{ - ExifEntry *e, *em; - char value[1024]; - - if (!d) - return EXIF_DATA_TYPE_MAKER_NOTE_NONE; - - e = exif_data_get_entry (d, EXIF_TAG_MAKER_NOTE); - if (!e) - return EXIF_DATA_TYPE_MAKER_NOTE_NONE; - - /* Olympus & Nikon & Sanyo */ - if ((e->size >= 8) && ( !memcmp (e->data, "OLYMP", 6) || - !memcmp (e->data, "OLYMPUS", 8) || - !memcmp (e->data, "SANYO", 6) || - !memcmp (e->data, "EPSON", 6) || - !memcmp (e->data, "Nikon", 6))) - return EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS; - - em = exif_data_get_entry (d, EXIF_TAG_MAKE); - if (!em) - return EXIF_DATA_TYPE_MAKER_NOTE_NONE; - - /* Canon */ - if (!strcmp (exif_entry_get_value (em, value, sizeof (value)), "Canon")) - return EXIF_DATA_TYPE_MAKER_NOTE_CANON; - - /* Pentax & some variant of Nikon */ - if ((e->size >= 2) && (e->data[0] == 0x00) && (e->data[1] == 0x1b)) { - if (!strncasecmp ( - exif_entry_get_value (em, value, sizeof(value)), - "Nikon", 5)) - return EXIF_DATA_TYPE_MAKER_NOTE_NIKON; - else - return EXIF_DATA_TYPE_MAKER_NOTE_PENTAX; - } - if ((e->size >= 8) && !memcmp (e->data, "AOC", 4)) { - return EXIF_DATA_TYPE_MAKER_NOTE_PENTAX; - } - if ((e->size >= 8) && !memcmp (e->data, "QVC", 4)) { - return EXIF_DATA_TYPE_MAKER_NOTE_CASIO; - } - if ((e->size >= 12) && !memcmp (e->data, "FUJIFILM", 8)) { - return EXIF_DATA_TYPE_MAKER_NOTE_FUJI; - } - - return EXIF_DATA_TYPE_MAKER_NOTE_NONE; -} - /*! If MakerNote is recognized, load it. * * \param[in,out] data #ExifData @@ -789,23 +738,32 @@ exif_data_get_type_maker_note (ExifData static void interpret_maker_note(ExifData *data, const unsigned char *d, unsigned int ds) { - switch (exif_data_get_type_maker_note (data)) { - case EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS: - case EXIF_DATA_TYPE_MAKER_NOTE_NIKON: + int mnoteid; + ExifEntry* e = exif_data_get_entry (data, EXIF_TAG_MAKER_NOTE); + if (!e) + return; + + if ((mnoteid = exif_mnote_data_olympus_identify (data, e)) != 0) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, + "ExifData", "Olympus MakerNote variant type %d", mnoteid); data->priv->md = exif_mnote_data_olympus_new (data->priv->mem); - break; - case EXIF_DATA_TYPE_MAKER_NOTE_PENTAX: - case EXIF_DATA_TYPE_MAKER_NOTE_CASIO: - data->priv->md = exif_mnote_data_pentax_new (data->priv->mem); - break; - case EXIF_DATA_TYPE_MAKER_NOTE_CANON: + + } else if ((mnoteid = exif_mnote_data_canon_identify (data, e)) != 0) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, + "ExifData", "Canon MakerNote variant type %d", mnoteid); data->priv->md = exif_mnote_data_canon_new (data->priv->mem, data->priv->options); - break; - case EXIF_DATA_TYPE_MAKER_NOTE_FUJI: + + } else if ((mnoteid = exif_mnote_data_fuji_identify (data, e)) != 0) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, + "ExifData", "Fuji MakerNote variant type %d", mnoteid); data->priv->md = exif_mnote_data_fuji_new (data->priv->mem); - break; - default: - break; + + /* NOTE: Must do Pentax detection last because some of the + * heuristics are pretty general. */ + } else if ((mnoteid = exif_mnote_data_pentax_identify (data, e)) != 0) { + exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, + "ExifData", "Pentax MakerNote variant type %d", mnoteid); + data->priv->md = exif_mnote_data_pentax_new (data->priv->mem); } /* |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:13
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980/libexif/pentax Modified Files: exif-mnote-data-pentax.c exif-mnote-data-pentax.h Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: exif-mnote-data-pentax.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- exif-mnote-data-pentax.h 27 Oct 2009 06:06:11 -0000 1.7 +++ exif-mnote-data-pentax.h 8 Oct 2010 04:20:04 -0000 1.8 @@ -25,6 +25,7 @@ #include <libexif/exif-mnote-data.h> #include <libexif/exif-mnote-data-priv.h> #include <libexif/pentax/mnote-pentax-entry.h> +#include <libexif/exif-data.h> #include <libexif/exif-mem.h> enum PentaxVersion {pentaxV1 = 1, pentaxV2 = 2, pentaxV3 = 3, casioV2 = 4 }; @@ -43,6 +44,16 @@ struct _ExifMnoteDataPentax { enum PentaxVersion version; }; +/*! Detect if MakerNote is recognized as one handled by the Pentax module. + * + * \param[in] ed image #ExifData to identify as as a Pentax type + * \param[in] e #ExifEntry for EXIF_TAG_MAKER_NOTE, from within ed but + * duplicated here for convenience + * \return 0 if not recognized, nonzero if recognized. The specific nonzero + * value returned may identify a subtype unique within this module. + */ +int exif_mnote_data_pentax_identify (const ExifData *ed, const ExifEntry *e); + ExifMnoteData *exif_mnote_data_pentax_new (ExifMem *); #endif /* __EXIF_MNOTE_DATA_PENTAX_H__ */ Index: exif-mnote-data-pentax.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -d -r1.20 -r1.21 --- exif-mnote-data-pentax.c 27 Oct 2009 06:06:11 -0000 1.20 +++ exif-mnote-data-pentax.c 8 Oct 2010 04:20:04 -0000 1.21 @@ -397,6 +397,29 @@ exif_mnote_data_pentax_set_byte_order (E } } +int +exif_mnote_data_pentax_identify (const ExifData *ed, const ExifEntry *e) +{ + if ((e->size >= 8) && !memcmp (e->data, "AOC", 4)) { + if (((e->data[4] == 'I') && (e->data[5] == 'I')) || + ((e->data[4] == 'M') && (e->data[5] == 'M'))) + return pentaxV3; + else + /* Uses Casio v2 tags */ + return pentaxV2; + } + + if ((e->size >= 8) && !memcmp (e->data, "QVC", 4)) + return casioV2; + + /* This isn't a very robust test, so make sure it's done last */ + /* Maybe we should additionally check for a make of Asahi or Pentax */ + if ((e->size >= 2) && (e->data[0] == 0x00) && (e->data[1] == 0x1b)) + return pentaxV1; + + return 0; +} + ExifMnoteData * exif_mnote_data_pentax_new (ExifMem *mem) { |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:12
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980/libexif/olympus Modified Files: exif-mnote-data-olympus.c exif-mnote-data-olympus.h Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: exif-mnote-data-olympus.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- exif-mnote-data-olympus.h 11 Dec 2009 08:19:26 -0000 1.12 +++ exif-mnote-data-olympus.h 8 Oct 2010 04:20:03 -0000 1.13 @@ -24,6 +24,7 @@ #include <libexif/exif-mnote-data-priv.h> #include <libexif/olympus/mnote-olympus-entry.h> #include <libexif/exif-byte-order.h> +#include <libexif/exif-data.h> #include <libexif/exif-mem.h> enum OlympusVersion { @@ -49,6 +50,16 @@ struct _ExifMnoteDataOlympus { enum OlympusVersion version; }; +/*! Detect if MakerNote is recognized as one handled by the Olympus module. + * + * \param[in] ed image #ExifData to identify as as an Olympus type + * \param[in] e #ExifEntry for EXIF_TAG_MAKER_NOTE, from within ed but + * duplicated here for convenience + * \return 0 if not recognized, nonzero if recognized. The specific nonzero + * value returned may identify a subtype unique within this module. + */ +int exif_mnote_data_olympus_identify (const ExifData *ed, const ExifEntry *e); + ExifMnoteData *exif_mnote_data_olympus_new (ExifMem *); #endif /* __MNOTE_OLYMPUS_CONTENT_H__ */ Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -d -r1.44 -r1.45 --- exif-mnote-data-olympus.c 29 Jan 2010 19:26:54 -0000 1.44 +++ exif-mnote-data-olympus.c 8 Oct 2010 04:20:03 -0000 1.45 @@ -146,7 +146,7 @@ exif_mnote_data_olympus_save (ExifMnoteD datao += n->offset + 10; /* subtract the size here, so the increment in the next case will not harm us */ *buf_size -= 8 + 2; - /* Fall through */ + /* Fall through to nikonV2 handler */ case nikonV2: *buf_size += 8 + 2; *buf_size += 4; /* Next IFD pointer */ @@ -553,6 +553,49 @@ exif_mnote_data_olympus_set_offset (Exif if (n) ((ExifMnoteDataOlympus *) n)->offset = o; } +int +exif_mnote_data_olympus_identify (const ExifData *ed, const ExifEntry *e) +{ + /* Olympus, Nikon, Sanyo, Epson */ + if (e->size >= 8) { + /* Match the terminating NUL character, too */ + if (!memcmp (e->data, "OLYMPUS", 8)) + return olympusV2; + else if (!memcmp (e->data, "OLYMP", 6)) + return olympusV1; + else if (!memcmp (e->data, "SANYO", 6)) + return sanyoV1; + else if (!memcmp (e->data, "EPSON", 6)) + return epsonV1; + else if (!memcmp (e->data, "Nikon", 6)) { + switch (e->data[6]) { + case 1: return nikonV1; + case 2: return nikonV2; + default: return 0; /* Unrecognized Nikon variant */ + } + } + } + + /* Another variant of Nikon */ + if ((e->size >= 2) && (e->data[0] == 0x00) && (e->data[1] == 0x1b)) { + char value[5]; + ExifEntry *em = exif_data_get_entry (ed, EXIF_TAG_MAKE); + + if (em) { + const char *v = exif_entry_get_value (em, value, sizeof(value)); + if (v && (!strncmp (v, "Nikon", sizeof(value)) || + !strncmp (v, "NIKON", sizeof(value)) )) + /* When saved, this variant will be written out like the + * alternative nikonV2 form above instead + */ + return nikonV2; + } + } + + return 0; +} + + ExifMnoteData * exif_mnote_data_olympus_new (ExifMem *mem) { |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:11
|
Update of /cvsroot/libexif/libexif/libexif/fuji In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980/libexif/fuji Modified Files: exif-mnote-data-fuji.c exif-mnote-data-fuji.h Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: exif-mnote-data-fuji.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- exif-mnote-data-fuji.c 29 Jan 2010 19:26:51 -0000 1.12 +++ exif-mnote-data-fuji.c 8 Oct 2010 04:20:03 -0000 1.13 @@ -314,6 +314,12 @@ exif_mnote_data_fuji_set_offset (ExifMno if (n) ((ExifMnoteDataFuji *) n)->offset = o; } +int +exif_mnote_data_fuji_identify (const ExifData *ed, const ExifEntry *e) +{ + return ((e->size >= 12) && !memcmp (e->data, "FUJIFILM", 8)); +} + ExifMnoteData * exif_mnote_data_fuji_new (ExifMem *mem) { Index: exif-mnote-data-fuji.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- exif-mnote-data-fuji.h 27 Oct 2009 06:06:11 -0000 1.3 +++ exif-mnote-data-fuji.h 8 Oct 2010 04:20:03 -0000 1.4 @@ -22,12 +22,12 @@ #define __MNOTE_FUJI_CONTENT_H__ #include <libexif/exif-mnote-data.h> - -typedef struct _ExifMnoteDataFuji ExifMnoteDataFuji; - #include <libexif/exif-mnote-data-priv.h> +#include <libexif/exif-data.h> #include <libexif/fuji/mnote-fuji-entry.h> +typedef struct _ExifMnoteDataFuji ExifMnoteDataFuji; + struct _ExifMnoteDataFuji { ExifMnoteData parent; @@ -38,6 +38,16 @@ struct _ExifMnoteDataFuji { unsigned int offset; }; +/*! Detect if MakerNote is recognized as one handled by the Fuji module. + * + * \param[in] ed image #ExifData to identify as as a Fuji type + * \param[in] e #ExifEntry for EXIF_TAG_MAKER_NOTE, from within ed but + * duplicated here for convenience + * \return 0 if not recognized, nonzero if recognized. The specific nonzero + * value returned may identify a subtype unique within this module. + */ +int exif_mnote_data_fuji_identify (const ExifData *ed, const ExifEntry *e); + ExifMnoteData *exif_mnote_data_fuji_new (ExifMem *); #endif /* __MNOTE_FUJI_CONTENT_H__ */ |
|
From: Dan F. <dfa...@us...> - 2010-10-08 04:20:11
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7980/libexif/canon Modified Files: exif-mnote-data-canon.c exif-mnote-data-canon.h Log Message: Refactored MakerNote detection code to put detection of each type into the module handling that type Index: exif-mnote-data-canon.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -d -r1.26 -r1.27 --- exif-mnote-data-canon.c 27 Oct 2009 06:06:11 -0000 1.26 +++ exif-mnote-data-canon.c 8 Oct 2010 04:20:03 -0000 1.27 @@ -346,6 +346,16 @@ exif_mnote_data_canon_get_description (E return mnote_canon_tag_get_description (dc->entries[m].tag); } +int +exif_mnote_data_canon_identify (const ExifData *ed, const ExifEntry *e) +{ + char value[8]; + ExifEntry *em = exif_data_get_entry (ed, EXIF_TAG_MAKE); + if (!em) + return 0; + return !strcmp (exif_entry_get_value (em, value, sizeof (value)), "Canon"); +} + ExifMnoteData * exif_mnote_data_canon_new (ExifMem *mem, ExifDataOption o) { Index: exif-mnote-data-canon.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- exif-mnote-data-canon.h 27 Oct 2009 06:06:11 -0000 1.6 +++ exif-mnote-data-canon.h 8 Oct 2010 04:20:03 -0000 1.7 @@ -43,6 +43,16 @@ struct _ExifMnoteDataCanon { ExifDataOption options; }; +/*! Detect if MakerNote is recognized as one handled by the Canon module. + * + * \param[in] ed image #ExifData to identify as as a Canon type + * \param[in] e #ExifEntry for EXIF_TAG_MAKER_NOTE, from within ed but + * duplicated here for convenience + * \return 0 if not recognized, nonzero if recognized. The specific nonzero + * value returned may identify a subtype unique within this module. + */ +int exif_mnote_data_canon_identify (const ExifData *ed, const ExifEntry *e); + ExifMnoteData *exif_mnote_data_canon_new (ExifMem *mem, ExifDataOption o); #endif /* __EXIF_MNOTE_DATA_CANON_H__ */ |
