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...> - 2009-06-17 19:08:00
|
Update of /cvsroot/libexif/libexif/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28075 Modified Files: da.po Log Message: More Danish translation updates from the Translation Project Index: da.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/da.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- da.po 16 Jun 2009 06:30:15 -0000 1.2 +++ da.po 17 Jun 2009 19:06:36 -0000 1.3 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: libexif-0.6.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2009-06-15 01:01I+0200\n" +"PO-Revision-Date: 2009-06-17 01:01I+0200\n" "Last-Translator: Joe Hansen <joe...@ya...>\n" "Language-Team: Danish <da...@da...>\n" "MIME-Version: 1.0\n" @@ -1639,7 +1639,7 @@ msgstr "Følg specifikation" #: libexif/exif-data.c:1174 msgid "Add, correct and remove entries to get EXIF data that follows the specification." -msgstr "Tilføj, ret eller fjern punkter for at få EXIF-data som følger specifikationen." +msgstr "Tilføj, ret eller fjern poster for at få EXIF-data som følger specifikationen." #: libexif/exif-data.c:1176 msgid "Do not change maker note" @@ -3189,7 +3189,7 @@ msgstr "" #: libexif/exif-tag.c:686 msgid "Gamma" -msgstr "" +msgstr "Gamma" #: libexif/exif-tag.c:687 msgid "Indicates the value of coefficient gamma." @@ -3263,7 +3263,7 @@ msgstr "" #: libexif/fuji/mnote-fuji-entry.c:127 msgid "Sunset" -msgstr "" +msgstr "Solnedgang" #: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181 msgid "Museum" @@ -3861,7 +3861,7 @@ msgstr "Manuelt: %liK" #: libexif/olympus/mnote-olympus-entry.c:673 msgid "Manual: Unknown" -msgstr "Manuel: Ukendt" +msgstr "Manuelt: Ukendt" #: libexif/olympus/mnote-olympus-entry.c:679 msgid "One-touch" |
|
From: Dan F. <dfa...@us...> - 2009-06-16 06:30:38
|
Update of /cvsroot/libexif/libexif/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12233/po Modified Files: da.po Log Message: po/da.po: Danish translation corrections by Lars Christian Jensen Index: da.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/da.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- da.po 3 Jun 2009 19:21:26 -0000 1.1 +++ da.po 16 Jun 2009 06:30:15 -0000 1.2 @@ -2,13 +2,17 @@ # Copyright (C) 2009 Lutz Mueller and Joe Hansen. # This file is distributed under the same license as the libexif package. # Joe Hansen <joe...@ya...>, 2009. +# Korrekturlæst Lars Christian Jensen 12. juni 2009. # # Canon EF 50mm f/1.8 -> Canon EF 50mm f/1.8 (der er ikke oversat til dansk mellemrum: 50 mm etc.) -# Send fejlrapport på at deres forkortelser skal have den fulde betegnelse ovenfor til hjælp for oversætterne. +# Send fejlrapport på at deres forkortelser skal have den fulde betegnelse ovenfor til +# hjælp for oversætterne. # # konventioner: # bracket -> kantparentes # brightness -> lysstyrke +# custom -> tilpasset +# entry -> post # exposure -> belysning # flash -> blitz # fluorescent -> fluorescerende @@ -23,7 +27,7 @@ msgstr "" "Project-Id-Version: libexif-0.6.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-06 00:59-0800\n" -"PO-Revision-Date: 2009-06-03 01:01I+0200\n" +"PO-Revision-Date: 2009-06-15 01:01I+0200\n" "Last-Translator: Joe Hansen <joe...@ya...>\n" "Language-Team: Danish <da...@da...>\n" "MIME-Version: 1.0\n" @@ -42,14 +46,14 @@ msgstr "Ugyldigt format '%s', forventede #: libexif/pentax/mnote-pentax-entry.c:51 #, c-format msgid "Invalid number of components (%i, expected %i)." -msgstr "Ugyldigt antal af komponenter (%i, forventede %i)." +msgstr "Ugyldigt antal komponenter (%i, forventede %i)." #: libexif/canon/mnote-canon-entry.c:61 #: libexif/olympus/mnote-olympus-entry.c:72 #: libexif/pentax/mnote-pentax-entry.c:61 #, c-format msgid "Invalid number of components (%i, expected %i or %i)." -msgstr "Ugyldigt antal af komponenter (%i, forventede %i eller %i)." +msgstr "Ugyldigt antal komponenter (%i, forventede %i eller %i)." #: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130 #: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:542 @@ -277,6 +281,7 @@ msgstr "Fuldskærm" msgid "Full auto" msgstr "Fuld auto" +# er det en handling eller en manual. (Manual eller manuelt) #: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179 #: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:285 #: libexif/canon/mnote-canon-entry.c:392 libexif/exif-entry.c:490 @@ -290,7 +295,7 @@ msgstr "Fuld auto" #: libexif/pentax/mnote-pentax-entry.c:211 #: libexif/pentax/mnote-pentax-entry.c:250 msgid "Manual" -msgstr "Manual" +msgstr "Manuelt" #: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:430 #: libexif/exif-entry.c:419 libexif/exif-entry.c:501 @@ -990,7 +995,7 @@ msgstr "Udglattet" #: libexif/canon/mnote-canon-entry.c:393 libexif/canon/mnote-canon-entry.c:406 #: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87 msgid "Custom" -msgstr "Brugertilpasset" +msgstr "Tilpasset" #: libexif/canon/mnote-canon-entry.c:311 msgid "My color data" @@ -1343,7 +1348,7 @@ msgstr "Serienummer" #: libexif/canon/mnote-canon-tag.c:45 msgid "Custom functions" -msgstr "Brugertilpasset funktioner" +msgstr "Tilpasset funktioner" #: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45 msgid "Macro mode" @@ -3075,7 +3080,7 @@ msgstr "Scenetype" #: libexif/exif-tag.c:620 msgid "Indicates the type of scene. If a DSC recorded the image, this tag value must always be set to 1, indicating that the image was directly photographed." -msgstr "Indikerer scenetypen. Hvis en DSC optog billedet, skal denne mærkeværdi altid være sat til 1, hvilket viser at billedet blev direkte fotograferet." +msgstr "Indikerer scenetypen. Hvis en DSC optog billedet, skal denne mærkeværdi altid være sat til 1, hvilket viser at billedet blev fotograferet direkte." #: libexif/exif-tag.c:628 msgid "Subject Area" @@ -3852,11 +3857,11 @@ msgstr "Automatisk" #: libexif/olympus/mnote-olympus-entry.c:670 #, c-format msgid "Manual: %liK" -msgstr "Manual: %liK" +msgstr "Manuelt: %liK" #: libexif/olympus/mnote-olympus-entry.c:673 msgid "Manual: Unknown" -msgstr "Manual: Ukendt" +msgstr "Manuel: Ukendt" #: libexif/olympus/mnote-olympus-entry.c:679 msgid "One-touch" |
|
From: Dan F. <dfa...@us...> - 2009-06-16 06:30:22
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12233 Modified Files: ChangeLog Log Message: po/da.po: Danish translation corrections by Lars Christian Jensen Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.309 retrieving revision 1.310 diff -u -p -d -r1.309 -r1.310 --- ChangeLog 3 Jun 2009 19:21:24 -0000 1.309 +++ ChangeLog 16 Jun 2009 06:30:13 -0000 1.310 @@ -1,3 +1,7 @@ +2009-06-15 Dan Fandrich <da...@co...> + + * po/da.po: Danish translation corrections by Lars Christian Jensen + 2009-06-03 Dan Fandrich <da...@co...> * po/da.po: Added Danish translation by Joe Hansen |
|
From: Dan F. <dfa...@us...> - 2009-06-03 19:22:04
|
Update of /cvsroot/libexif/libexif/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4977/po Added Files: da.po Log Message: po/da.po: Added Danish translation by Joe Hansen --- NEW FILE: da.po --- # Danish translation libexif. # Copyright (C) 2009 Lutz Mueller and Joe Hansen. # This file is distributed under the same license as the libexif package. # Joe Hansen <joe...@ya...>, 2009. # # Canon EF 50mm f/1.8 -> Canon EF 50mm f/1.8 (der er ikke oversat til dansk mellemrum: 50 mm etc.) # Send fejlrapport på at deres forkortelser skal have den fulde betegnelse ovenfor til hjælp for oversætterne. # # konventioner: # bracket -> kantparentes # brightness -> lysstyrke # exposure -> belysning # flash -> blitz # fluorescent -> fluorescerende # bottom -> nederst # shutter -> lukketid # strobe light -> stroboskoplys # top -> øverst # tag -> mærke [...4589 lines suppressed...] #: libexif/pentax/mnote-pentax-tag.c:69 msgid "Auto AF Point" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:71 msgid "Object Distance" msgstr "" #: libexif/pentax/mnote-pentax-tag.c:71 msgid "Distance of photographed object in millimeters." msgstr "" #: libexif/pentax/mnote-pentax-tag.c:73 msgid "Bestshot mode" msgstr "" #: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "" |
|
From: Dan F. <dfa...@us...> - 2009-06-03 19:21:36
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4977 Modified Files: NEWS ChangeLog configure.ac Log Message: po/da.po: Added Danish translation by Joe Hansen Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -d -r1.51 -r1.52 --- NEWS 22 Jan 2009 07:38:17 -0000 1.51 +++ NEWS 3 Jun 2009 19:21:23 -0000 1.52 @@ -1,5 +1,6 @@ libexif-0.6.x: * Updated translations: nl, pl, sk, vi + * New translation: da * Added some example programs * libexif is now thread safe when the underlying C library is thread safe and when each object allocated by libexif isn't used by more than one Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif/configure.ac,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -d -r1.51 -r1.52 --- configure.ac 3 Feb 2009 04:43:12 -0000 1.51 +++ configure.ac 3 Jun 2009 19:21:24 -0000 1.52 @@ -168,7 +168,7 @@ AM_CONDITIONAL([ENABLE_INTERNAL_DOCS], [ # --------------------------------------------------------------------------- # i18n support # --------------------------------------------------------------------------- -ALL_LINGUAS="cs de en_CA es fr nl pl ru sk sv vi" +ALL_LINGUAS="cs da de en_CA es fr nl pl ru sk sv vi" AM_PO_SUBDIRS GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_CURRENT_MIN}], [Lutz Mueller and others]) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.308 retrieving revision 1.309 diff -u -p -d -r1.308 -r1.309 --- ChangeLog 29 May 2009 04:43:38 -0000 1.308 +++ ChangeLog 3 Jun 2009 19:21:24 -0000 1.309 @@ -1,3 +1,7 @@ +2009-06-03 Dan Fandrich <da...@co...> + + * po/da.po: Added Danish translation by Joe Hansen + 2009-05-28 Dan Fandrich <da...@co...> * Fixed negative exposure values in Canon makernotes (bug #2797280) |
|
From: Dan F. <dfa...@us...> - 2009-05-30 03:17:16
|
Update of /cvsroot/libexif/libexif-website In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1572 Modified Files: Makefile Log Message: Fixed a few links. Removed the unneeded chmod stuff in the makefile. Index: Makefile =================================================================== RCS file: /cvsroot/libexif/libexif-website/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- Makefile 11 Nov 2008 18:53:38 -0000 1.6 +++ Makefile 30 May 2009 03:17:04 -0000 1.7 @@ -1,7 +1,9 @@ +# Automated upload of libexif web site to SourceForge web server # Your ~/.ssh/config file must be set up with something like this: # Host sf # HostName web.sourceforge.net # User username,libexif +# SF_SSH_HOSTNAME = sf HTDOCS_DIR = /home/groups/l/li/libexif/htdocs @@ -27,15 +29,6 @@ upload-static.stamp: static $(wildcard s # on the remote server, but it's more dangerous since if the local host # is accidentally missing some files, they'll be permanently # deleted on the server. - # rsync -avz --delete --progress --exclude="CVS" static/ "$(SF_SSH_HOSTNAME):$(HTDOCS_DIR)/" - rsync -avz --progress --exclude="CVS" static/* "$(SF_SSH_HOSTNAME):$(HTDOCS_DIR)/" - # Note: as of Nov 2008, SourceForge has complicated remote shell access - # so this doesn't work as-is. But it also shouldn't be necessary since - # permissions are set correctly above before the files are uploaded. - ssh "$(SF_SSH_HOSTNAME)" "find $(HTDOCS_DIR) \ - \( -type d -exec chgrp libexif {} \; -exec chmod g+rwxs,a+rx {} \; \) \ - -or \( -type f -exec chgrp libexif {} \; -exec chmod g+rw {} \; \ - \( -name '*.html' -or -name '*.png' -or -name '*.php' -or -name '*.jpg' \ - -or -name '*.css' -name '*.dot' -name '*.map' \) \ - -exec chmod a+r {} \; \)" + # rsync -avz --fuzzy --delete-after --progress --exclude="CVS" static/ "$(SF_SSH_HOSTNAME):$(HTDOCS_DIR)/" + rsync -avz --fuzzy --progress --exclude="CVS" static/* "$(SF_SSH_HOSTNAME):$(HTDOCS_DIR)/" date > $@ |
|
From: Dan F. <dfa...@us...> - 2009-05-30 03:17:14
|
Update of /cvsroot/libexif/libexif-website/static In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1572/static Modified Files: docs.html index.html Log Message: Fixed a few links. Removed the unneeded chmod stuff in the makefile. Index: docs.html =================================================================== RCS file: /cvsroot/libexif/libexif-website/static/docs.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- docs.html 19 Nov 2008 05:54:28 -0000 1.1 +++ docs.html 30 May 2009 03:17:06 -0000 1.2 @@ -61,8 +61,8 @@ pre { <h1>libexif Project Documentation</h1> <p> -There is not currently much documentation available for libexif and its -associated programs. What is available is linked here. +There is not currently much documentation available for some parts of the +libexif project, but what is available is linked here. </p> <h2>libexif</h2> Index: index.html =================================================================== RCS file: /cvsroot/libexif/libexif-website/static/index.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- index.html 27 Nov 2008 23:28:18 -0000 1.21 +++ index.html 30 May 2009 03:17:06 -0000 1.22 @@ -115,9 +115,9 @@ svn co https://libexif.svn.sourceforge.n around the world compile the source code and provide binaries for a number of platforms. Here is a list of some of the sites you can look.</p> <ul> - <li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/DragonFly-2.0/stable/graphics/?P=*exif*">DragonFly project</a></li> + <li>DragonFly BSD: <a href="http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/DragonFly-2.3.1/graphics/?P=*exif-*">DragonFly project</a></li> - <li>FreeBSD: <a href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-current/All/">FreeBSD project</a></li> + <li>FreeBSD: <a href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-current/All/">FreeBSD ports</a></li> <li>IRIX: <a href="http://freeware.sgi.com/index-by-alpha.html#exif">SGI</a></li> @@ -129,7 +129,10 @@ number of platforms. Here is a list of s <a href="http://rpmfind.net/linux/rpm2html/search.php?query=libexif12&submit=Search+...&system=&arch=">rpmfind.net</a>. </li> - <li>Mac OS X: <a href="http://www.hmug.org/pub/MacOS_X/BSD/Libraries/Graphics/libexif/">HMUG</a></li> + <li>Mac OS X: + <a href="http://pdb.finkproject.org/pdb/package.php/libexif12">Fink</a>, + <a href="http://www.gnu-darwin.org/packages/ppc/graphics/">GNU-Darwin</a>, + <a href="http://www.hmug.org/pub/MacOS_X/BSD/Libraries/Graphics/libexif/">HMUG</a></li> <li>Solaris: <a href="http://www.blastwave.org/packages.php/libexif">Blastwave</a>, @@ -138,7 +141,7 @@ number of platforms. Here is a list of s </li> <li>Windows: - <a href="http://cygwin.com/cgi-bin2/package-grep.cgi?grep=exif">Cygwin</a>, + <a href="http://cygwin.com/cgi-bin2/package-grep.cgi?grep=exif-">Cygwin</a>, <a href="http://www.gimp.org/~tml/gimp/win32/downloads.html">GIMP project</a> </li> </ul> @@ -174,7 +177,7 @@ number of platforms. Here is a list of s style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" /></a> -<span>Last update: 2008-11-09</span> +<span>Last update: 2009-05-29</span> </div> </body> |
|
From: Dan F. <dfa...@us...> - 2009-05-29 04:43:50
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20440/libexif/canon Modified Files: mnote-canon-entry.c Log Message: Fixed negative exposure values in Canon makernotes (bug #2797280) Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -d -r1.28 -r1.29 --- mnote-canon-entry.c 9 Oct 2008 09:47:30 -0000 1.28 +++ mnote-canon-entry.c 29 May 2009 04:43:41 -0000 1.29 @@ -642,7 +642,7 @@ mnote_canon_entry_get_value (const Mnote case 5: case 14: case 16: - snprintf (val, maxlen, _("%.2f EV"), vs / 32.0); + snprintf (val, maxlen, _("%.2f EV"), (ExifSShort)vs / 32.0); break; case 3: case 20: |
|
From: Dan F. <dfa...@us...> - 2009-05-29 04:43:50
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20440 Modified Files: ChangeLog Log Message: Fixed negative exposure values in Canon makernotes (bug #2797280) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.307 retrieving revision 1.308 diff -u -p -d -r1.307 -r1.308 --- ChangeLog 2 May 2009 06:28:22 -0000 1.307 +++ ChangeLog 29 May 2009 04:43:38 -0000 1.308 @@ -1,3 +1,7 @@ +2009-05-28 Dan Fandrich <da...@co...> + + * Fixed negative exposure values in Canon makernotes (bug #2797280) + 2009-05-02 Dan Fandrich <da...@co...> * Added contrib/examples/write-exif.c |
|
From: Dan F. <dfa...@us...> - 2009-05-02 06:28:27
|
Update of /cvsroot/libexif/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18356/libexif Modified Files: exif-entry.c Log Message: Create a valid default for EXIF_TAG_COMPONENTS_CONFIGURATION Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.129 retrieving revision 1.130 diff -u -p -d -r1.129 -r1.130 --- exif-entry.c 31 Jan 2009 23:32:37 -0000 1.129 +++ exif-entry.c 2 May 2009 06:28:20 -0000 1.130 @@ -1675,5 +1675,18 @@ exif_entry_initialize (ExifEntry *e, Exi if (!e->data) break; memcpy (e->data, "0210", 4); break; + + /* UNDEFINED, 4 components, default 1,2,3,0 */ + case EXIF_TAG_COMPONENTS_CONFIGURATION: + e->components = 4; + e->format = EXIF_FORMAT_UNDEFINED; + e->size = exif_format_get_size (e->format) * e->components; + e->data = exif_entry_alloc (e, e->size); + if (!e->data) break; + e->data[0] = 1; + e->data[1] = 2; + e->data[2] = 3; + e->data[3] = 0; + break; } } |
|
From: Dan F. <dfa...@us...> - 2009-05-02 06:28:27
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18356 Modified Files: ChangeLog Log Message: Create a valid default for EXIF_TAG_COMPONENTS_CONFIGURATION Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.306 retrieving revision 1.307 diff -u -p -d -r1.306 -r1.307 --- ChangeLog 2 May 2009 06:24:26 -0000 1.306 +++ ChangeLog 2 May 2009 06:28:22 -0000 1.307 @@ -1,6 +1,7 @@ 2009-05-02 Dan Fandrich <da...@co...> * Added contrib/examples/write-exif.c + * Create a valid default for EXIF_TAG_COMPONENTS_CONFIGURATION 2009-03-21 Lutz Mueller <lu...@us...> |
|
From: Dan F. <dfa...@us...> - 2009-05-02 06:24:36
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17734 Modified Files: ChangeLog Log Message: Added contrib/examples/write-exif.c Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.305 retrieving revision 1.306 diff -u -p -d -r1.305 -r1.306 --- ChangeLog 21 Mar 2009 22:03:03 -0000 1.305 +++ ChangeLog 2 May 2009 06:24:26 -0000 1.306 @@ -1,3 +1,7 @@ +2009-05-02 Dan Fandrich <da...@co...> + + * Added contrib/examples/write-exif.c + 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity |
|
From: Dan F. <dfa...@us...> - 2009-05-02 06:24:36
|
Update of /cvsroot/libexif/libexif/contrib/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17734/contrib/examples Modified Files: Makefile.am Added Files: write-exif.c Log Message: Added contrib/examples/write-exif.c Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/contrib/examples/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- Makefile.am 3 Jan 2009 08:17:37 -0000 1.2 +++ Makefile.am 2 May 2009 06:24:30 -0000 1.3 @@ -1,5 +1,5 @@ # Simple example programs -check_PROGRAMS = photographer thumbnail +check_PROGRAMS = photographer thumbnail write-exif # Example programs with dependencies other than plain libexif COMPLICATED_EXAMPLES = cam_features.c --- NEW FILE: write-exif.c --- /* * write-exif.c * * Placed into the public domain by Daniel Fandrich * * Create a new EXIF data block and write it into a JPEG image file. * * The JPEG image data used in this example is fixed and is guaranteed not * to contain an EXIF tag block already, so it is easy to precompute where * in the file the EXIF data should be. In real life, a library like * libjpeg (included with the exif command-line tool source code) would * be used to write to an existing JPEG file. */ #include <stdio.h> #include <assert.h> #include <libexif/exif-data.h> /* this file will be unilaterally overwritten */ #define FILE_NAME "write-exif.jpg" /* raw JPEG image data */ static const unsigned char image_jpg[] = { 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x01, 0x00, 0x48, 0x00, 0x48, 0x00, 0x00, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x14, 0x0e, 0x0f, 0x12, 0x0f, 0x0d, 0x14, 0x12, 0x10, 0x12, 0x17, 0x15, 0x14, 0x18, 0x1e, 0x32, 0x21, 0x1e, 0x1c, 0x1c, 0x1e, 0x3d, 0x2c, 0x2e, 0x24, 0x32, 0x49, 0x40, 0x4c, 0x4b, 0x47, 0x40, 0x46, 0x45, 0x50, 0x5a, 0x73, 0x62, 0x50, 0x55, 0x6d, 0x56, 0x45, 0x46, 0x64, 0x88, 0x65, 0x6d, 0x77, 0x7b, 0x81, 0x82, 0x81, 0x4e, 0x60, 0x8d, 0x97, 0x8c, 0x7d, 0x96, 0x73, 0x7e, 0x81, 0x7c, 0xff, 0xc0, 0x00, 0x0b, 0x08, 0x00, 0x40, 0x00, 0x40, 0x01, 0x01, 0x11, 0x00, 0xff, 0xc4, 0x00, 0x1b, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x06, 0x04, 0x03, 0x07, 0x02, 0x01, 0xff, 0xc4, 0x00, 0x2f, 0x10, 0x00, 0x01, 0x03, 0x03, 0x02, 0x05, 0x03, 0x03, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x11, 0x00, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x81, 0x61, 0x71, 0x91, 0x13, 0x32, 0xa1, 0x14, 0x22, 0xc1, 0x15, 0x23, 0x52, 0xd1, 0xf0, 0xff, 0xda, 0x00, 0x08, 0x01, 0x01, 0x00, 0x00, 0x3f, 0x00, 0xb3, 0xa2, 0x8a, 0x28, 0xa2, 0x8a, 0x28, 0xa2, 0x97, 0x64, 0x72, 0xd6, 0x58, 0xd4, 0x8f, 0xd5, 0x3d, 0xca, 0xa5, 0x7d, 0xa8, 0x4e, 0xaa, 0x3e, 0xb0, 0x3a, 0x7a, 0x9d, 0x2b, 0x2d, 0x87, 0x13, 0xe3, 0xaf, 0x9f, 0x0c, 0xb6, 0xb5, 0xb6, 0xe2, 0xb4, 0x48, 0x71, 0x30, 0x14, 0x7b, 0x02, 0x09, 0x14, 0xee, 0x94, 0x64, 0x38, 0x87, 0x1f, 0x8d, 0x5f, 0xd3, 0x7d, 0xe2, 0xa7, 0x46, 0xe8, 0x6c, 0x49, 0x1e, 0xfd, 0x07, 0xb1, 0x33, 0x5f, 0xb8, 0xdc, 0xf5, 0x96, 0x51, 0x7c, 0x96, 0xee, 0x14, 0xba, 0x04, 0xf2, 0x2c, 0x42, 0xa3, 0xd3, 0x70, 0x7c, 0x1a, 0x6d, 0x45, 0x2c, 0xcd, 0xe5, 0x11, 0x89, 0xb1, 0x5b, 0xc4, 0x02, 0xe1, 0xd1, 0xb4, 0xcf, 0xdc, 0xa3, 0xfc, 0x0d, 0xcd, 0x41, 0xde, 0xe3, 0xb2, 0x2e, 0xda, 0x1c, 0xbd, 0xe2, 0x4a, 0x90, 0xe9, 0x04, 0x95, 0x2b, 0xf7, 0x41, 0xd0, 0x18, 0xe8, 0x36, 0x03, 0xc6, 0x91, 0x4a, 0x81, 0x20, 0x82, 0x24, 0x10, 0x66, 0x45, 0x5a, 0xdd, 0xf1, 0x32, 0xff, 0x00, 0xa2, 0x5a, 0x8b, 0x62, 0x57, 0x7d, 0x70, 0x80, 0x93, 0x1a, 0x94, 0x10, 0x79, 0x4a, 0xa3, 0xb9, 0x20, 0xc0, 0xf3, 0xd3, 0x55, 0x59, 0x4e, 0x1c, 0x7a, 0xc7, 0x12, 0x9b, 0xc7, 0x94, 0xa7, 0x2e, 0x14, 0xa9, 0x74, 0x0d, 0x42, 0x01, 0x04, 0xc9, 0x3b, 0x93, 0x30, 0x09, 0xdb, 0x5f, 0x35, 0x9b, 0x85, 0xad, 0xde, 0x7f, 0x39, 0x6e, 0xa6, 0x82, 0xa1, 0xa5, 0x73, 0x2d, 0x40, 0x68, 0x13, 0x06, 0x67, 0xdf, 0x6f, 0x35, 0xe9, 0xb4, 0x52, 0x4c, 0xbe, 0x0c, 0x65, 0x72, 0x16, 0xcf, 0x3a, 0xff, 0x00, 0xf6, 0x5a, 0xd1, 0x4d, 0x11, 0xa1, 0x13, 0x26, 0x0f, 0x73, 0x00, 0x1f, 0x41, 0x5b, 0x72, 0xd6, 0xa2, 0xeb, 0x15, 0x73, 0x6e, 0x13, 0xf7, 0x36, 0x42, 0x40, 0xee, 0x04, 0x8f, 0xc8, 0x15, 0xe4, 0xf5, 0x59, 0xc1, 0x16, 0x0d, 0x3d, 0x70, 0xed, 0xdb, 0x84, 0x29, 0x6c, 0x40, 0x42, 0x3b, 0x13, 0x3f, 0xb8, 0xfc, 0x10, 0x3c, 0xd5, 0xc1, 0x00, 0x88, 0x22, 0x41, 0xef, 0x5f, 0x0d, 0xb4, 0x86, 0x81, 0x0d, 0xa1, 0x28, 0x07, 0x52, 0x12, 0x00, 0x06, 0xba, 0xd1, 0x45, 0x71, 0xb8, 0xb8, 0x6e, 0xd9, 0x85, 0xbc, 0xf2, 0xb9, 0x5b, 0x40, 0x25, 0x47, 0xb0, 0xaf, 0x24, 0x79, 0x48, 0x53, 0xce, 0x29, 0xb4, 0x94, 0xa0, 0xa8, 0x94, 0xa7, 0xb0, 0x27, 0x41, 0xf1, 0x54, 0x9c, 0x09, 0x71, 0xc9, 0x92, 0x7d, 0x82, 0x74, 0x75, 0xa9, 0x1e, 0xa5, 0x27, 0xfd, 0x13, 0x55, 0xd9, 0x3c, 0x83, 0x38, 0xbb, 0x45, 0x5c, 0xbf, 0x3c, 0xa1, 0x40, 0x40, 0x02, 0x54, 0x4f, 0x41, 0x3e, 0x4f, 0x83, 0x5a, 0x2d, 0xae, 0x1b, 0xba, 0xb7, 0x6d, 0xf6, 0x89, 0x28, 0x71, 0x21, 0x49, 0x24, 0x41, 0x83, 0xe9, 0x5d, 0xe9, 0x3f, 0x12, 0x64, 0x97, 0x8b, 0xc6, 0x17, 0x59, 0x03, 0xea, 0xa9, 0x61, 0x08, 0x24, 0x48, 0x04, 0xc9, 0x9f, 0x80, 0x6a, 0x4b, 0x17, 0xc4, 0xd7, 0xac, 0xdf, 0x36, 0xab, 0xbb, 0x85, 0x39, 0x6e, 0xb5, 0x00, 0xe0, 0x50, 0x06, 0x01, 0x3a, 0x91, 0x02, 0x44, 0x6f, 0x02, 0xb7, 0x65, 0xb2, 0x0e, 0x71, 0x25, 0xf3, 0x58, 0xdc, 0x72, 0x8f, 0xe9, 0xc1, 0xe6, 0x52, 0xe0, 0xc2, 0xa3, 0x72, 0x46, 0xe0, 0x0e, 0x83, 0xa9, 0xf1, 0x4b, 0x38, 0x9f, 0x16, 0xde, 0x2e, 0xfd, 0xa4, 0x32, 0x92, 0x1a, 0x5b, 0x40, 0x83, 0xdc, 0x8d, 0x0f, 0x9d, 0x01, 0x3e, 0xf5, 0x83, 0x17, 0x7a, 0xac, 0x76, 0x41, 0x9b, 0xa4, 0xa7, 0x9b, 0xe9, 0xab, 0x51, 0x31, 0x20, 0x82, 0x08, 0xf8, 0x34, 0xf9, 0xdb, 0x97, 0xb8, 0xb7, 0x2c, 0xcd, 0xba, 0x12, 0xa6, 0xec, 0xda, 0x3c, 0xca, 0x13, 0x24, 0x0e, 0xa4, 0x91, 0xa4, 0x9d, 0x87, 0x69, 0xf7, 0xab, 0x74, 0x21, 0x2d, 0xa1, 0x28, 0x4a, 0x42, 0x52, 0x90, 0x02, 0x40, 0xd8, 0x01, 0xb0, 0xae, 0x95, 0x87, 0x29, 0x8f, 0x6f, 0x27, 0x64, 0xe5, 0xb3, 0xc4, 0x80, 0xa8, 0x29, 0x50, 0xdd, 0x24, 0x6c, 0x47, 0xfd, 0xd4, 0xd4, 0x92, 0x78, 0x1e, 0xef, 0xeb, 0x42, 0xae, 0x98, 0x0d, 0x7f, 0x90, 0x0a, 0x27, 0xe2, 0x00, 0xfc, 0xd5, 0x4e, 0x27, 0x11, 0x6d, 0x89, 0x60, 0xb7, 0x6e, 0x92, 0x54, 0xa8, 0xe6, 0x71, 0x5b, 0xa8, 0xff, 0x00, 0x03, 0xd2, 0xbe, 0x73, 0x38, 0x86, 0x72, 0xf6, 0xc1, 0xb7, 0x4f, 0x2a, 0xd1, 0x25, 0x0e, 0x01, 0x25, 0x27, 0xae, 0x9d, 0x41, 0xed, 0xed, 0x52, 0xe8, 0xe0, 0x7b, 0xcf, 0xab, 0x0e, 0x5d, 0x30, 0x96, 0xe7, 0xee, 0x4f, 0x31, 0x57, 0xc1, 0x00, 0x7e, 0x6a, 0xaf, 0x15, 0x8b, 0x63, 0x17, 0x6e, 0x1a, 0x61, 0x24, 0x92, 0x65, 0x6b, 0x3b, 0xa8, 0xf7, 0x3e, 0x9d, 0x87, 0x4a, 0x63, 0x45, 0x14, 0x51, 0x45, 0x14, 0x51, 0x45, 0x7f, 0xff, 0xd9 }; /* length of data in image_jpg */ static const unsigned int image_jpg_len = sizeof(image_jpg); /* dimensions of image */ static const unsigned int image_jpg_x = 64; static const unsigned int image_jpg_y = 64; /* start of JPEG image data section */ static const unsigned int image_data_offset = 20; #define image_data_len (image_jpg_len - image_data_offset) /* raw EXIF header data */ static const unsigned char exif_header[] = { 0xff, 0xd8, 0xff, 0xe1 }; /* length of data in exif_header */ static const unsigned int exif_header_len = sizeof(exif_header); /* byte order to use in the EXIF block */ #define BYTE_ORDER EXIF_BYTE_ORDER_INTEL /* Get an existing tag, or create one if it doesn't exist */ static ExifEntry *init_tag(ExifData *exif, ExifIfd ifd, ExifTag tag) { ExifEntry *entry; if (!((entry = exif_content_get_entry (exif->ifd[ifd], tag)))) { entry = exif_entry_new (); exif_content_add_entry (exif->ifd[ifd], entry); exif_entry_initialize (entry, tag); } assert(entry != NULL); /* catch an out of memory condition */ return entry; } int main(int argc, char **argv) { int rc = 1; FILE *f; unsigned char *exif_data; unsigned int exif_data_len; ExifEntry *entry; ExifData *exif = exif_data_new(); if (!exif) { fprintf(stderr, "Out of memory\n"); return 2; } /* Set the image options */ exif_data_set_option(exif, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION); exif_data_set_data_type(exif, EXIF_DATA_TYPE_COMPRESSED); exif_data_set_byte_order(exif, BYTE_ORDER); /* Create the mandatory EXIF fields */ exif_data_fix(exif); /* All these tags are created with default values by exif_data_fix() */ /* Change the data to the correct values for this image. */ entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION); exif_set_long(entry->data, BYTE_ORDER, image_jpg_x); entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION); exif_set_long(entry->data, BYTE_ORDER, image_jpg_y); entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_COLOR_SPACE); exif_set_short(entry->data, BYTE_ORDER, 1); /* A good example to give here would be to add a new tag that isn't * automatically created by exif_data_fix() (such as * EXIF_TAG_USER_COMMENT) which requires allocating memory in * entry->data. This isn't so easy, unfortunately. */ /* Get a pointer to the EXIF data block we just created */ exif_data_save_data(exif, &exif_data, &exif_data_len); f = fopen(FILE_NAME, "wb"); if (!f) { fprintf(stderr, "Error creating file %s\n", FILE_NAME); exif_data_unref(exif); return rc; } /* Write EXIF header */ if (fwrite(exif_header, exif_header_len, 1, f) != 1) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); goto errout; } /* Write EXIF block length */ if (fputc((exif_data_len+2) >> 8, f) < 0) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); goto errout; } if (fputc((exif_data_len+2) & 0xff, f) < 0) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); goto errout; } /* Write EXIF data block */ if (fwrite(exif_data, exif_data_len, 1, f) != 1) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); goto errout; } /* Write JPEG image data */ if (fwrite(image_jpg+image_data_offset, image_data_len, 1, f) != 1) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); goto errout; } printf("Wrote file %s\n", FILE_NAME); rc = 0; errout: if (fclose(f)) { fprintf(stderr, "Error writing to file %s\n", FILE_NAME); rc = 1; } exif_data_unref(exif); return rc; } |
|
From: Jan P. <pa...@us...> - 2009-04-20 10:08:04
|
Update of /cvsroot/libexif/libexif/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18124 Modified Files: cs.po Log Message: Updated Czech translation Index: cs.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/cs.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- cs.po 31 Jan 2009 23:39:26 -0000 1.15 +++ cs.po 20 Apr 2009 10:07:36 -0000 1.16 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libexif 0.6.17-pre1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-31 15:37-0800\n" -"PO-Revision-Date: 2007-12-15 16:51+0000\n" +"PO-Revision-Date: 2009-04-20 11:00+0000\n" "Last-Translator: Jan Patera <pa...@us...>\n" "Language-Team: Czech <tra...@li...>\n" "MIME-Version: 1.0\n" @@ -193,7 +193,7 @@ msgstr "" #: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103 [...1109 lines suppressed...] -#~ msgid "HQ" -#~ msgstr "HQ" - -#~ msgid "SHQ" -#~ msgstr "SHQ" - -#~ msgid "SQ1" -#~ msgstr "SQ1" - -#~ msgid "SQ2" -#~ msgstr "SQ2" - -#~ msgid "Lenstype" -#~ msgstr "Druh ÄoÄek" - -#~ msgid "Unknown tag." -#~ msgstr "Neznámá znaÄka" - -#~ msgid "Manual Focus" -#~ msgstr "RuÄnà zaostÅovánÃ" |
|
From: Dan F. <dfa...@us...> - 2009-04-14 06:00:25
|
Update of /cvsroot/libexif/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4516/libexif Modified Files: exif-byte-order.h exif-data.h Log Message: Added some more Doxygen comments. Index: exif-byte-order.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-byte-order.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- exif-byte-order.h 17 Feb 2008 18:31:55 -0000 1.5 +++ exif-byte-order.h 14 Apr 2009 06:00:15 -0000 1.6 @@ -25,11 +25,18 @@ extern "C" { #endif /* __cplusplus */ +/*! Which byte order to use */ typedef enum { + /*! Big-endian byte order */ EXIF_BYTE_ORDER_MOTOROLA, + /*! Little-endian byte order */ EXIF_BYTE_ORDER_INTEL } ExifByteOrder; +/*! Return a short, localized, textual name for the given byte order. + * \param[in] order byte order + * \return localized textual name of the byte order + */ const char *exif_byte_order_get_name (ExifByteOrder order); #ifdef __cplusplus Index: exif-data.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -d -r1.23 -r1.24 --- exif-data.h 13 Jan 2009 01:48:39 -0000 1.23 +++ exif-data.h 14 Apr 2009 06:00:15 -0000 1.24 @@ -57,12 +57,19 @@ struct _ExifData ExifDataPrivate *priv; }; -/*! Allocate a new, empty #ExifData. +/*! Allocate a new #ExifData. The #ExifData contains an empty + * #ExifContent for each IFD and the default set of options. * * \return allocated #ExifData, or NULL on error */ ExifData *exif_data_new (void); +/*! Allocate a new #ExifData using the given memory allocator. + * The #ExifData contains an empty #ExifContent for each IFD and the default + * set of options. + * + * \return allocated #ExifData, or NULL on error + */ ExifData *exif_data_new_mem (ExifMem *); /*! Allocate a new #ExifData and load EXIF data from a JPEG file. @@ -85,6 +92,8 @@ ExifData *exif_data_new_from_data (const /*! Load the #ExifData structure from the raw JPEG or EXIF data in the given * memory buffer. If the EXIF data contains a recognized MakerNote, it is * loaded and stored as well for later retrieval by #exif_data_get_mnote_data. + * If the EXIF_DATA_OPTION_FOLLOW_SPECIFICATION has been set on this #ExifData, + * then the tags are fixed after loading. * * \param[in,out] data EXIF data * \param[in] d pointer to raw JPEG or EXIF data |
|
From: Dan F. <dfa...@us...> - 2009-04-14 05:57:29
|
Update of /cvsroot/libexif/exif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3974 Modified Files: ChangeLog Log Message: exif/actions.c: Allow setting signed & unsigned byte data Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -d -r1.88 -r1.89 --- ChangeLog 14 Apr 2009 05:53:48 -0000 1.88 +++ ChangeLog 14 Apr 2009 05:57:22 -0000 1.89 @@ -2,6 +2,7 @@ * po/lv.po: Added Latvian translation by Rihards Prieditis * po/da.po: Updated Danish translation by Joe Hansen + * exif/actions.c: Allow setting signed & unsigned byte data 2009-01-21 Dan Fandrich <da...@co...> |
|
From: Dan F. <dfa...@us...> - 2009-04-14 05:57:26
|
Update of /cvsroot/libexif/exif/exif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3974/exif Modified Files: actions.c Log Message: exif/actions.c: Allow setting signed & unsigned byte data Index: actions.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/actions.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -p -d -r1.42 -r1.43 --- actions.c 22 Jan 2009 07:41:11 -0000 1.42 +++ actions.c 14 Apr 2009 05:57:23 -0000 1.43 @@ -139,6 +139,8 @@ convert_arg_to_entry (const char *set_va break; case EXIF_FORMAT_BYTE: case EXIF_FORMAT_SBYTE: + e->data[s * i] = atoi ((char *) buf); + break; case EXIF_FORMAT_FLOAT: case EXIF_FORMAT_DOUBLE: case EXIF_FORMAT_UNDEFINED: |
|
From: Dan F. <dfa...@us...> - 2009-04-14 05:56:30
|
Update of /cvsroot/libexif/exif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3849 Modified Files: exif.1 Log Message: Added an example of setting a data array type. Index: exif.1 =================================================================== RCS file: /cvsroot/libexif/exif/exif.1,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -d -r1.13 -r1.14 --- exif.1 22 Jan 2009 07:41:09 -0000 1.13 +++ exif.1 14 Apr 2009 05:56:23 -0000 1.14 @@ -165,6 +165,13 @@ Add an Orientation tag with value "botto exif --output=new.jpg --ifd=0 --tag=0x0112 --set-value=4 image.jpg .RE .LP +Add a YCbCr Sub-Sampling tag with value 2,1 (a.k.a YCbCr 4:2:2) to an +existing image: +.LP +.RS +exif --output=new.jpg --tag=YCbCrSubSampling --ifd=0 --set-value='2 1' image.jpg +.RE +.LP .SH "AUTHOR" Written by Lutz Mueller <lu...@us...>. .SH "SEE ALSO" |
|
From: Dan F. <dfa...@us...> - 2009-04-14 05:54:00
|
Update of /cvsroot/libexif/exif/po In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3488/po Modified Files: da.po Added Files: lv.po Log Message: po/lv.po: Added Latvian translation by Rihards Prieditis po/da.po: Updated Danish translation by Joe Hansen --- NEW FILE: lv.po --- # translation of exif to Latvian # Copyright (C) 2009 Lutz Mueller and others # This file is distributed under the same license as the exif package. # # Rihards Prieditis <RPr...@in...>, 2009. msgid "" msgstr "" "Project-Id-Version: exif-0.6.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-06 01:03-0800\n" "PO-Revision-Date: 2009-04-12 19:39+0300\n" "Last-Translator: Rihards Prieditis <RPr...@in...>\n" "Language-Team: Latvian <tra...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 0.3\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #: exif/actions.c:56 #, c-format msgid "Not enough memory." msgstr "Nepietiek atmiÅas." #: exif/actions.c:74 #, c-format msgid "Setting a value for this tag is unsupported!" msgstr "VÄrtÄ«bas uzstÄdÄ«Å¡anai Å¡ai atzÄ«mei netiek atbalstÄ«ta!" #: exif/actions.c:91 #, c-format msgid "Too few components specified!" msgstr "PÄrÄk maz komponenti norÄdÄ«ti!" #: exif/actions.c:106 #, c-format msgid "Internal error. Please contact <%s>." msgstr "IekÅ¡ÄjÄ kļūda. LÅ«dzu sazinieties ar <%s>." #: exif/actions.c:143 #, c-format msgid "Not yet implemented!" msgstr "VÄl nav ieviests!" #: exif/actions.c:150 #, c-format msgid "Warning; Too many components specified!" msgstr "BrÄ«dinÄjums: PÄrak daudz komponenti norÄdÄ«ti!" #: exif/actions.c:172 #, c-format msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed." msgstr "PÄrÄk daudz EXIF datu (%i baitu). Atļauti tikai %i baiti." #: exif/actions.c:183 exif/actions.c:358 #, c-format msgid "Wrote file '%s'." msgstr "UzrakstÄ«ju failu \"%s\"." #: exif/actions.c:203 #, c-format msgid "EXIF entry '%s' " msgstr "EXIF ieeja \"%s\"" #: exif/actions.c:205 #, c-format msgid "(0x%x, '%s') " msgstr "(0x%x, \"%s\") " #: exif/actions.c:208 #, c-format msgid "exists in IFD '%s':\n" msgstr "eksistÄ iekÅ¡ IFD \"%s\":\n" #: exif/actions.c:251 #, c-format msgid "IFD '%s' does not contain a tag '%s'!" msgstr "IFD \"%s\" nesatur iezÄ«mi \"%s\"!" #: exif/actions.c:282 #, c-format msgid "Could not open '%s' (%m)!" msgstr "NevarÄja atvÄrt \"%s\" (%m)!" #: exif/actions.c:285 #, c-format msgid "Could not open '%s' (%s)!" msgstr "NevarÄja atvÄrt \"%s\" (%s)!" #: exif/actions.c:295 #, c-format msgid "Could not read '%s' (%m)." msgstr "NevarÄja nolasÄ«t \"%s\" (%m)!" #: exif/actions.c:298 #, c-format msgid "Could not read '%s' (%s)." msgstr "NevarÄja atvÄrt \"%s\" (%s)!" #: exif/actions.c:317 #, c-format msgid "IFD '%s' does not contain tag '%s'." msgstr "IFD \"%s\" nesatur iezÄ«mi \"%s\"." #: exif/actions.c:323 #, c-format msgid "'%s' does not contain tag '%s'." msgstr "\"%s\" nesatur iezÄ«mi \"%s\"." #: exif/actions.c:341 #, c-format msgid "'%s' does not contain a thumbnail!" msgstr "\"%s\" nesatur sÄ«ktÄlu!" #: exif/actions.c:350 #, c-format msgid "Could not open '%s' for writing (%m)!" msgstr "Nevar atvÄrt \"%s\" rakstÄ«Å¡anai (%m)!" #: exif/actions.c:353 #, c-format msgid "Could not open '%s' for writing (%s)!" msgstr "Nevar atvÄrt \"%s\" rakstÄ«Å¡anai (%s)!" #: exif/actions.c:371 #, c-format msgid "EXIF tags in '%s':" msgstr "EXIF iezÄ«mes iekÅ¡ \"%s\":" #: exif/actions.c:440 #, c-format msgid "Unknown MakerNote format.\n" msgstr "NezinÄms MakerNote formÄts.\n" #: exif/actions.c:447 #, c-format msgid "MakerNote does not contain any value.\n" msgstr "MakerNote nesatur nevienu vÄrtÄ«bu.\n" #: exif/actions.c:450 #, c-format msgid "MakerNote contains %i value:\n" msgid_plural "MakerNote contains %i values:\n" msgstr[0] "MakerNote satur %i vÄrtÄ«bu:\n" msgstr[1] "MakerNote satur %i vÄrtÄ«bas:\n" msgstr[2] "MakerNote satur %i vÄrtÄ«bas:\n" #: exif/actions.c:460 msgid "Unknown tag" msgstr "NezinÄma iezÄ«me" #: exif/actions.c:464 msgid "Unknown value" msgstr "NezinÄma vÄrtÄ«ba" #: exif/actions.c:490 #, c-format msgid "EXIF tags in '%s' ('%s' byte order):" msgstr "EXIF iezÄ«mes iekÅ¡ \"%s\" (\"%s\" baitu secÄ«ba):" #: exif/actions.c:495 exif/actions.c:497 msgid "Tag" msgstr "IezÄ«me" #: exif/actions.c:501 exif/actions.c:503 exif/main.c:199 msgid "Value" msgstr "VÄrtÄ«ba" #: exif/actions.c:509 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." msgstr "EXIF dati satur sÄ«ktÄlu (%i baitus)." #: exif/actions.c:545 #, c-format msgid "ThumbnailSize\t%i\n" msgstr "SÄ«ktÄla izmÄrs\t%i\n" #: exif/main.c:175 msgid "Display software version" msgstr "AttÄlo programmatÅ«ras versiju" #: exif/main.c:177 msgid "Show IDs instead of tag names" msgstr "RÄda identifikÄtorus, nevis iezÄ«mes nosaukumus" #: exif/main.c:179 msgid "Select tag" msgstr "Atlasiet iezÄ«mi" #: exif/main.c:179 msgid "tag" msgstr "iezÄ«me" #: exif/main.c:181 msgid "Select IFD" msgstr "Atlasiet IFD" #: exif/main.c:181 msgid "IFD" msgstr "IFD" #: exif/main.c:183 msgid "List all EXIF tags" msgstr "Visu EXIF iezÄ«mju saraksts" #: exif/main.c:185 msgid "Show contents of tag MakerNote" msgstr "RÄdÄ«t MakerNote iezÄ«mes saturu" #: exif/main.c:187 msgid "Remove tag or ifd" msgstr "NoÅemt iezÄ«mi vai ifd" #: exif/main.c:189 msgid "Show description of tag" msgstr "RÄdÄ«t apraksta iezÄ«mi" #: exif/main.c:191 msgid "Extract thumbnail" msgstr "Izvilkt sÄ«ktÄlu" #: exif/main.c:193 msgid "Remove thumbnail" msgstr "NoÅemt sÄ«ktÄlu" #: exif/main.c:195 msgid "Insert FILE as thumbnail" msgstr "Ievietot FAILU, kÄ sÄ«ktÄlu" #: exif/main.c:195 exif/main.c:197 msgid "FILE" msgstr "FAILS" #: exif/main.c:197 msgid "Write data to FILE" msgstr "RakstÄ«t datus uz FAILU" #: exif/main.c:201 msgid "Create EXIF data if not existing" msgstr "Izveidot EXIF, ja dati neeksistÄ" #: exif/main.c:203 msgid "Output in a machine-readable (tab delimited) format" msgstr "IzvadÄ«t mÄÅ¡Ä«nu-lasÄma (tab atdalÄ«tÄ) formÄta" #: exif/main.c:206 msgid "Output in a XML format" msgstr "IzvadÄ«t XML formÄtÄ" #: exif/main.c:209 msgid "Show debugging messages" msgstr "RÄdÄ«t atkļūdoÅ¡anas ziÅojumus" #: exif/main.c:229 msgid "[OPTION...] file" msgstr "[IESPÄJAS...] fails" #: exif/main.c:241 #, c-format msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'." msgstr "NederÄ«gs IFD \"%s\". DerÄ«gi IFD ir \"0\", \"1\", \"EXIF\", \"GPS\" un \"'Interoperability'\"." #: exif/main.c:250 #, c-format msgid "Invalid tag '%s'!" msgstr "NederÄ«ga iezÄ«me \"%s\"!" #: exif/main.c:258 msgid "You need to specify a tag!" msgstr "Jums jÄnorÄda iezÄ«me!" #: exif/main.c:263 msgid "You need to specify an IFD!" msgstr "Jums jÄnorÄda IFD!" #: exif/main.c:286 #, c-format msgid "Tag '%s' " msgstr "IezÄ«me \"%s\"" #: exif/main.c:288 #, c-format msgid "(0x%04x, '%s'): " msgstr "(0x%04x, \"%s\"): " #: exif/main.c:338 #, c-format msgid "'%s' does not contain EXIF data!" msgstr "\"%s\" nesatur EXIF datus!" Index: da.po =================================================================== RCS file: /cvsroot/libexif/exif/po/da.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- da.po 29 Nov 2008 16:15:49 -0000 1.3 +++ da.po 14 Apr 2009 05:53:50 -0000 1.4 @@ -1,18 +1,19 @@ # Danish translation of exif. -# Copyright (C) 2008 exif. +# Copyright (C) 2009 exif. # This file is distributed under the same license as the exif package. -# Joe Hansen <joe...@ya...>, 2008. +# Joe Hansen <joe...@ya...>, 2009. # # Konventioner # har bevaret ' ' som de fremgÃ¥r af engelsk tekst (kunne ogsÃ¥ være »« eller "") # tag -> mærke +# thumbnail -> miniature (en miniature; Xfce har denne oversættelse) # msgid "" msgstr "" "Project-Id-Version: exif-0.6.17\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-06 01:03-0800\n" -"PO-Revision-Date: 2008-11-26 00:00+0000\n" +"PO-Revision-Date: 2009-04-13 00:00+0000\n" "Last-Translator: Joe Hansen <joe...@ya...>\n" "Language-Team: Danish <da...@da...>\n" "MIME-Version: 1.0\n" @@ -113,7 +114,7 @@ msgstr "'%s' indeholder ikke mærke '%s' #: exif/actions.c:341 #, c-format msgid "'%s' does not contain a thumbnail!" -msgstr "'%s' indeholder ikke et miniatureportræt!" +msgstr "'%s' indeholder ikke en miniature!" #: exif/actions.c:350 #, c-format @@ -171,12 +172,12 @@ msgstr "Værdi" #: exif/actions.c:509 #, c-format msgid "EXIF data contains a thumbnail (%i bytes)." -msgstr "EXIF-data indeholder et miniatureportræt (%i byte)." +msgstr "EXIF-data indeholder en miniature (%i byte)." #: exif/actions.c:545 #, c-format msgid "ThumbnailSize\t%i\n" -msgstr "MiniatureportrætStørrelse\t%i\n" +msgstr "MiniatureStørrelse\t%i\n" #: exif/main.c:175 msgid "Display software version" @@ -220,15 +221,15 @@ msgstr "Vis beskrivelse af mærke" #: exif/main.c:191 msgid "Extract thumbnail" -msgstr "Udtræk miniatureportræt" +msgstr "Udtræk miniature" #: exif/main.c:193 msgid "Remove thumbnail" -msgstr "Fjern miniatureportræt" +msgstr "Fjern miniature" #: exif/main.c:195 msgid "Insert FILE as thumbnail" -msgstr "Indæst FIl som miniatureportræt" +msgstr "Indæst FIl som miniature" #: exif/main.c:195 exif/main.c:197 msgid "FILE" |
|
From: Dan F. <dfa...@us...> - 2009-04-14 05:53:59
|
Update of /cvsroot/libexif/exif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3488 Modified Files: ChangeLog NEWS configure.ac Log Message: po/lv.po: Added Latvian translation by Rihards Prieditis po/da.po: Updated Danish translation by Joe Hansen Index: NEWS =================================================================== RCS file: /cvsroot/libexif/exif/NEWS,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -d -r1.27 -r1.28 --- NEWS 22 Jan 2009 07:41:09 -0000 1.27 +++ NEWS 14 Apr 2009 05:53:48 -0000 1.28 @@ -1,5 +1,5 @@ exif-0.6.x: - * Added translation: it + * Added translations: it, lv * Updated translations: da, id, nl, pl, sk, sv, vi, zh_CN * Fixed alignment of tables in locales with multibyte character encoding (bug #2034873) Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/exif/configure.ac,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -d -r1.25 -r1.26 --- configure.ac 28 Nov 2008 18:45:35 -0000 1.25 +++ configure.ac 14 Apr 2009 05:53:48 -0000 1.26 @@ -39,7 +39,7 @@ GP_PKG_CONFIG # i18n support # --------------------------------------------------------------------------- GP_GETTEXT_HACK([${PACKAGE}],[Lutz Mueller and others]) -ALL_LINGUAS="da de es fr id it nl pl sk sv vi zh_CN" +ALL_LINGUAS="da de es fr id it lv nl pl 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.87 retrieving revision 1.88 diff -u -p -d -r1.87 -r1.88 --- ChangeLog 22 Jan 2009 07:41:09 -0000 1.87 +++ ChangeLog 14 Apr 2009 05:53:48 -0000 1.88 @@ -1,3 +1,8 @@ +2009-04-13 Dan Fandrich <da...@co...> + + * po/lv.po: Added Latvian translation by Rihards Prieditis + * po/da.po: Updated Danish translation by Joe Hansen + 2009-01-21 Dan Fandrich <da...@co...> * exif/main.c: Create mandatory EXIF tags with the --create-exif option |
|
From: Lutz M. <lu...@us...> - 2009-03-21 22:04:33
|
Update of /cvsroot/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31085 Modified Files: ChangeLog Log Message: 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity checks: * libexif/exif-data.c (exif_data_load_entry), (exif_data_load_data_thumbnail) * libexif/canon/exif_mnote-data-canon.c (exif_mnote_data_canon_load) * libexif/fuji/exif-mnote-data-fuji.c (exif_mnote_data_fuji_load) * libexif/olympus/exif-mnote-data-olympus.c (exif_mnote_data_olympus_load) * libexif/pentax/exif-mnote-data-pentax.c (exif_mnote_data_pentax_load) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.304 retrieving revision 1.305 diff -u -p -d -r1.304 -r1.305 --- ChangeLog 16 Mar 2009 22:36:10 -0000 1.304 +++ ChangeLog 21 Mar 2009 22:03:03 -0000 1.305 @@ -1,3 +1,19 @@ +2009-03-21 Lutz Mueller <lu...@us...> + + Meder Kydyraliev <me...@gm...> suggested to add some sanity + checks: + + * libexif/exif-data.c (exif_data_load_entry), + (exif_data_load_data_thumbnail) + * libexif/canon/exif_mnote-data-canon.c + (exif_mnote_data_canon_load) + * libexif/fuji/exif-mnote-data-fuji.c + (exif_mnote_data_fuji_load) + * libexif/olympus/exif-mnote-data-olympus.c + (exif_mnote_data_olympus_load) + * libexif/pentax/exif-mnote-data-pentax.c + (exif_mnote_data_pentax_load) + 2009-03-16 Lutz Mueller <lu...@us...> * libexif/canon/exif-mnote-data-canon.c: |
|
From: Lutz M. <lu...@us...> - 2009-03-21 22:04:27
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31085/libexif/canon Modified Files: exif-mnote-data-canon.c Log Message: 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity checks: * libexif/exif-data.c (exif_data_load_entry), (exif_data_load_data_thumbnail) * libexif/canon/exif_mnote-data-canon.c (exif_mnote_data_canon_load) * libexif/fuji/exif-mnote-data-fuji.c (exif_mnote_data_fuji_load) * libexif/olympus/exif-mnote-data-olympus.c (exif_mnote_data_olympus_load) * libexif/pentax/exif-mnote-data-pentax.c (exif_mnote_data_pentax_load) Index: exif-mnote-data-canon.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- exif-mnote-data-canon.c 16 Mar 2009 22:36:13 -0000 1.21 +++ exif-mnote-data-canon.c 21 Mar 2009 22:03:09 -0000 1.22 @@ -241,7 +241,7 @@ exif_mnote_data_canon_load (ExifMnoteDat } o += 8; if (s > 4) o = exif_get_long (buf + o, n->order) + 6; - if (o + s > buf_size) { + if ((o + s < s) || (o + s < o) || (o + s > buf_size)) { exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteCanon", "Tag data past end of buffer (%u > %u)", |
|
From: Lutz M. <lu...@us...> - 2009-03-21 22:04:27
|
Update of /cvsroot/libexif/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31085/libexif Modified Files: exif-data.c Log Message: 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity checks: * libexif/exif-data.c (exif_data_load_entry), (exif_data_load_data_thumbnail) * libexif/canon/exif_mnote-data-canon.c (exif_mnote_data_canon_load) * libexif/fuji/exif-mnote-data-fuji.c (exif_mnote_data_fuji_load) * libexif/olympus/exif-mnote-data-olympus.c (exif_mnote_data_olympus_load) * libexif/pentax/exif-mnote-data-pentax.c (exif_mnote_data_pentax_load) Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -p -d -r1.118 -r1.119 --- exif-data.c 22 Jan 2009 07:27:57 -0000 1.118 +++ exif-data.c 21 Mar 2009 22:03:09 -0000 1.119 @@ -196,9 +196,7 @@ exif_data_load_data_entry (ExifData *dat doff = offset + 8; /* Sanity checks */ - if ((doff + s < doff) || (doff + s < s)) - return 0; - if (size < doff + s) + if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) return 0; entry->data = exif_data_alloc (data, s); @@ -309,21 +307,24 @@ exif_data_save_data_entry (ExifData *dat static void exif_data_load_data_thumbnail (ExifData *data, const unsigned char *d, - unsigned int ds, ExifLong offset, ExifLong size) + unsigned int ds, ExifLong o, ExifLong s) { - if ((ds < offset + size) || (offset > ds)) { + /* Sanity checks */ + if ((o + s < o) || (o + s < s) || (o + s > ds) || (o > ds)) { exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Bogus thumbnail offset (%u) or size (%u).", - offset, size); + o, s); return; } + if (data->data) exif_mem_free (data->priv->mem, data->data); - data->size = size; - data->data = exif_data_alloc (data, data->size); - if (!data->data) + if (!(data->data = exif_data_alloc (data, s))) { + data->size = 0; return; - memcpy (data->data, d + offset, data->size); + } + data->size = s; + memcpy (data->data, d + o, s); } #undef CHECK_REC |
|
From: Lutz M. <lu...@us...> - 2009-03-21 22:03:27
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31085/libexif/olympus Modified Files: exif-mnote-data-olympus.c Log Message: 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity checks: * libexif/exif-data.c (exif_data_load_entry), (exif_data_load_data_thumbnail) * libexif/canon/exif_mnote-data-canon.c (exif_mnote_data_canon_load) * libexif/fuji/exif-mnote-data-fuji.c (exif_mnote_data_fuji_load) * libexif/olympus/exif-mnote-data-olympus.c (exif_mnote_data_olympus_load) * libexif/pentax/exif-mnote-data-pentax.c (exif_mnote_data_pentax_load) Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -d -r1.39 -r1.40 --- exif-mnote-data-olympus.c 14 Jan 2009 07:22:14 -0000 1.39 +++ exif-mnote-data-olympus.c 21 Mar 2009 22:03:09 -0000 1.40 @@ -380,7 +380,7 @@ exif_mnote_data_olympus_load (ExifMnoteD /* Parse all c entries, storing ones that are successfully parsed */ for (i = c, tcount = 0, o = o2; i; --i, o += 12) { size_t dataofs; - if (o + 12 > buf_size) { + if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) { exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteOlympus", "Short MakerNote"); break; @@ -427,11 +427,12 @@ exif_mnote_data_olympus_load (ExifMnoteD } #endif } - if (dataofs + s > buf_size) { + if ((dataofs + s < dataofs) || (dataofs + s < s) || + (dataofs + s > buf_size)) { exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus", "Tag data past end of buffer (%u > %u)", - dataofs+s, buf_size); + dataofs + s, buf_size); continue; } |
|
From: Lutz M. <lu...@us...> - 2009-03-21 22:03:19
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31085/libexif/pentax Modified Files: exif-mnote-data-pentax.c Log Message: 2009-03-21 Lutz Mueller <lu...@us...> Meder Kydyraliev <me...@gm...> suggested to add some sanity checks: * libexif/exif-data.c (exif_data_load_entry), (exif_data_load_data_thumbnail) * libexif/canon/exif_mnote-data-canon.c (exif_mnote_data_canon_load) * libexif/fuji/exif-mnote-data-fuji.c (exif_mnote_data_fuji_load) * libexif/olympus/exif-mnote-data-olympus.c (exif_mnote_data_olympus_load) * libexif/pentax/exif-mnote-data-pentax.c (exif_mnote_data_pentax_load) Index: exif-mnote-data-pentax.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -d -r1.14 -r1.15 --- exif-mnote-data-pentax.c 14 Jan 2009 07:56:52 -0000 1.14 +++ exif-mnote-data-pentax.c 21 Mar 2009 22:03:09 -0000 1.15 @@ -139,10 +139,10 @@ exif_mnote_data_pentax_load (ExifMnoteDa if (!s) return; o += 8; if (s > 4) o = exif_get_long (buf + o, n->order) + 6; - if (o + s > buf_size) { - exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteDataPentax", - "Tag data past end of buffer (%u > %u)", - o+s, buf_size); + if ((o + s < o) || (o + s < s) || (o + s > buf_size)) { + exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA, + "ExifMnoteDataPentax", "Tag data past end " + "of buffer (%u > %u)", o + s, buf_size); return; } |
