Menu
▾
▴
libexif-cvs — CVS commitlogs of all libexif CVS modules
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(22) |
Sep
(57) |
Oct
(39) |
Nov
(93) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(15) |
Feb
(8) |
Mar
(12) |
Apr
(25) |
May
(2) |
Jun
|
Jul
(11) |
Aug
(32) |
Sep
(18) |
Oct
(53) |
Nov
|
Dec
(11) |
| 2004 |
Jan
(19) |
Feb
(1) |
Mar
(15) |
Apr
(17) |
May
(56) |
Jun
(19) |
Jul
(6) |
Aug
(16) |
Sep
(44) |
Oct
(31) |
Nov
(36) |
Dec
(13) |
| 2005 |
Jan
(2) |
Feb
(41) |
Mar
(304) |
Apr
(176) |
May
(19) |
Jun
(33) |
Jul
(14) |
Aug
(21) |
Sep
(4) |
Oct
(3) |
Nov
|
Dec
(8) |
| 2006 |
Jan
(18) |
Feb
(9) |
Mar
(5) |
Apr
(2) |
May
(2) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
(7) |
Oct
(10) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(124) |
Jun
(59) |
Jul
(1) |
Aug
(13) |
Sep
(3) |
Oct
(11) |
Nov
(30) |
Dec
(35) |
| 2008 |
Jan
(31) |
Feb
(42) |
Mar
(4) |
Apr
(5) |
May
(2) |
Jun
(12) |
Jul
(8) |
Aug
(2) |
Sep
(4) |
Oct
(5) |
Nov
(89) |
Dec
(23) |
| 2009 |
Jan
(71) |
Feb
(5) |
Mar
(8) |
Apr
(7) |
May
(8) |
Jun
(7) |
Jul
|
Aug
(4) |
Sep
(58) |
Oct
(74) |
Nov
(53) |
Dec
(32) |
| 2010 |
Jan
(8) |
Feb
(13) |
Mar
(4) |
Apr
|
May
|
Jun
(10) |
Jul
(1) |
Aug
(2) |
Sep
(12) |
Oct
(17) |
Nov
(2) |
Dec
(24) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(24) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
(20) |
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(12) |
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(8) |
Jun
|
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:48:57
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3856/po Added Files: pl.po Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>, related to translation. --- NEW FILE: pl.po --- # Polish translation for libexif. # This file is distributed under the same license as the libexif package. # Jakub Bogusz <qb...@pl...>, 2005. # msgid "" msgstr "" "Project-Id-Version: libexif 0.6.12\n" "Report-Msgid-Bugs-To: lib...@li...\n" "POT-Creation-Date: 2005-03-13 03:28+0100\n" "PO-Revision-Date: 2005-03-21 09:30+0100\n" "Last-Translator: Jakub Bogusz <qb...@pl...>\n" "Language-Team: Polish <tra...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: libexif/exif-byte-order.c:33 msgid "Motorola" msgstr "Motorola" [...2931 lines suppressed...] #: libexif/pentax/mnote-pentax-entry.c:79 msgid "Flash on" msgstr "Flesz wÅÄ czony" #: libexif/pentax/mnote-pentax-entry.c:80 msgid "Flash off" msgstr "Flesz wyÅÄ czony" #: libexif/pentax/mnote-pentax-entry.c:81 msgid "Red-eye Reduction" msgstr "Redukcja czerwonych oczu" #: libexif/pentax/mnote-pentax-entry.c:113 msgid "Full" msgstr "PeÅny" #: test/nls/test-nls.c:19 test/nls/test-nls.c:22 test/nls/test-nls.c:23 msgid "[DO_NOT_TRANSLATE_THIS_MARKER]" msgstr "[DO_NOT_TRANSLATE_THIS_MARKER]" |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:48:26
|
Update of /cvsroot/libexif/libexif-gtk/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3679/po Added Files: pl.po Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * po/pl.po: New --- NEW FILE: pl.po --- # Polish translation for libexif-gtk. # This file is distributed under the same license as the libexif-gtk package. # Jakub Bogusz <qb...@pl...>, 2005. # msgid "" msgstr "" "Project-Id-Version: libexif-gtk 0.3.5\n" "POT-Creation-Date: 2004-10-17 16:44+0200\n" "PO-Revision-Date: 2005-03-21 17:20+0100\n" "Last-Translator: Jakub Bogusz <qb...@pl...>\n" "Language-Team: Polish <tra...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: libexif-gtk/gtk-exif-browser.c:145 msgid "Nothing selected." msgstr "Nic nie wybrano" #: libexif-gtk/gtk-exif-browser.c:393 msgid "No thumbnail available." msgstr "Miniaturka niedostÄpna." #: libexif-gtk/gtk-exif-browser.c:401 msgid "Could not parse thumbnail data." msgstr "Nie można przetworzyÄ danych miniaturki." #: libexif-gtk/gtk-exif-browser.c:416 #, c-format msgid "Size: %i byte(s)." msgstr "Rozmiar: %i bajt(ów)." #: libexif-gtk/gtk-exif-browser.c:485 msgid "Load..." msgstr "Wczytaj..." #: libexif-gtk/gtk-exif-browser.c:525 msgid "Save As..." msgstr "Zapisz jako..." #: libexif-gtk/gtk-exif-browser.c:575 msgid "Thumbnail" msgstr "Miniaturka" #: libexif-gtk/gtk-exif-browser.c:592 msgid "Load" msgstr "Wczytaj" #: libexif-gtk/gtk-exif-browser.c:597 msgid "Save" msgstr "Zapisz" #: libexif-gtk/gtk-exif-browser.c:602 msgid "Delete" msgstr "UsuÅ" |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:48:26
|
Update of /cvsroot/libexif/libexif-gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3679 Modified Files: ChangeLog configure.ac Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * po/pl.po: New Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -d -r1.3 -r1.4 --- configure.ac 25 Apr 2005 18:06:46 -0000 1.3 +++ configure.ac 15 Aug 2005 20:48:15 -0000 1.4 @@ -60,7 +60,7 @@ dnl GP_CONFIG_MSG([Features]) # --------------------------------------------------------------------------- GP_GETTEXT_HACK([${PACKAGE}-${LIBEXIF_GTK_CURRENT}], [Lutz Müller and others]) -ALL_LINGUAS="es fr ru" +ALL_LINGUAS="es fr pl ru" AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) AM_PO_SUBDIRS() Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- ChangeLog 24 Mar 2005 04:44:23 -0000 1.21 +++ ChangeLog 15 Aug 2005 20:48:15 -0000 1.22 @@ -1,3 +1,9 @@ +2005-08-15 Lutz Mueller <lu...@us...> + + Patch by Jakub Bogusz <qb...@pl...>: + + * po/pl.po: New + 2005-03-24 Hans Ulrich Niedermann <gp...@n-...> * autogen.sh, configure.in, */Makefile.am, ...: Updated build system. |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:43:32
|
Update of /cvsroot/libexif/exif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2580/exif Modified Files: exif-i18n.c Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * libexif/exif-i18n.h: Fix translation. Index: exif-i18n.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- exif-i18n.c 31 Aug 2004 13:19:13 -0000 1.4 +++ exif-i18n.c 15 Aug 2005 20:43:19 -0000 1.5 @@ -3,6 +3,7 @@ #ifdef HAVE_ICONV # include <iconv.h> +# include <langinfo.h> #endif #include <string.h> @@ -24,7 +25,7 @@ exif_i18n_convert_utf8_to_lat1 (const ch if (!in) return NULL; memset (buf, 0, sizeof (buf)); - if (!tr) tr = iconv_open ("ISO-8859-1", "UTF-8"); + if (!tr) tr = iconv_open (nl_langinfo (CODESET), "UTF-8"); iconv (tr, (char **) &in, &t, (char **) &out, &buf_size); return buf; #else |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:43:31
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2580 Modified Files: ChangeLog Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>: * libexif/exif-i18n.h: Fix translation. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -d -r1.56 -r1.57 --- ChangeLog 27 Apr 2005 06:44:19 -0000 1.56 +++ ChangeLog 15 Aug 2005 20:43:18 -0000 1.57 @@ -1,3 +1,9 @@ +2005-08-15 Lutz Mueller <lu...@us...> + + Patch by Jakub Bogusz <qb...@pl...>: + + * libexif/exif-i18n.h: Fix translation. + 2005-04-27 Lutz Mueller <lu...@us...> * libexif/main.c |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:29:27
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31467/libexif Modified Files: exif-entry.c exif-tag.c Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>, related to translation. Index: exif-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -d -r1.28 -r1.29 --- exif-tag.c 2 May 2005 19:29:14 -0000 1.28 +++ exif-tag.c 15 Aug 2005 20:29:16 -0000 1.29 @@ -71,7 +71,7 @@ static struct { {EXIF_TAG_BITS_PER_SAMPLE, "BitsPerSample", N_("Bits per Sample"), N_("The number of bits per image component. In this standard each " "component of the image is 8 bits, so the value for this " - "tag is 9. See also <SamplesPerPixel>. In JPEG compressed data " + "tag is 8. See also <SamplesPerPixel>. In JPEG compressed data " "a JPEG marker is used instead of this tag."), { ESL_MMMN, ESL_MMMN, ESL_NNNN, ESL_NNNN, ESL_NNNN } }, {EXIF_TAG_COMPRESSION, "Compression", N_("Compression"), @@ -129,7 +129,7 @@ static struct { N_("The number of rows per strip. This is the number of rows " "in the image of one strip when an image is divided into " "strips. With JPEG compressed data this designation is not " - "needed and is omitted. See also <RowsPerStrip> and " + "needed and is omitted. See also <StripOffsets> and " "<StripByteCounts>."), { ESL_MMMN, ESL_MMMN, ESL_NNNN, ESL_NNNN, ESL_NNNN } }, {EXIF_TAG_STRIP_BYTE_COUNTS, "StripByteCounts", N_("Strip Byte Count"), @@ -315,7 +315,7 @@ static struct { N_("Spectral Sensitivity"), N_("Indicates the spectral sensitivity of each channel of the " "camera used. The tag value is an ASCII string compatible " - "with the standard developed by the ASTM Technical committee."), + "with the standard developed by the ASTM Technical Committee."), { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } }, {EXIF_TAG_GPS_INFO_IFD_POINTER, "GPSInfoIFDPointer", "GPSInfoIFDPointer", @@ -326,7 +326,7 @@ static struct { {EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS tag version"), N_("Indicates the version of <GPSInfoIFD>. The version is given " "as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is " - "present. (Note: The <GPSVersionID tag is given in bytes, " + "present. (Note: The <GPSVersionID> tag is given in bytes, " "unlike the <ExifVersion> tag. When the version is " "2.0.0.0, the tag value is 02000000.H)."), ESL_GPS}, {EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", N_("North or South Latitude"), @@ -339,7 +339,7 @@ static struct { "respectively. When degrees, minutes and seconds are expressed, " "the format is dd/1,mm/1,ss/1. When degrees and minutes are used " "and, for example, fractions of minutes are given up to two " - "two decimal places, the format is dd/1,mmmm/100,0/1."), + "decimal places, the format is dd/1,mmmm/100,0/1."), ESL_GPS}, {EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", N_("East or West Longitude"), N_("Indicates whether the longitude is east or west longitude. " Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -p -d -r1.89 -r1.90 --- exif-entry.c 14 Aug 2005 19:41:05 -0000 1.89 +++ exif-entry.c 15 Aug 2005 20:29:16 -0000 1.90 @@ -199,9 +199,9 @@ exif_entry_fix (ExifEntry *e) exif_format_get_size (e->format); e->data = exif_entry_realloc (e, e->data, e->size); exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag '%s' was of format '%s' (which is " + _("Tag '%s' was of format '%s' (which is " "against specification) and has been " - "changed to format '%s'.", + "changed to format '%s'."), exif_tag_get_name (e->tag), exif_format_get_name (EXIF_FORMAT_LONG), exif_format_get_name (EXIF_FORMAT_SHORT)); @@ -233,9 +233,9 @@ exif_entry_fix (ExifEntry *e) } e->format = EXIF_FORMAT_RATIONAL; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag '%s' was of format '%s' (which is " + _("Tag '%s' was of format '%s' (which is " "against specification) and has been " - "changed to format '%s'.", + "changed to format '%s'."), exif_tag_get_name (e->tag), exif_format_get_name (EXIF_FORMAT_SRATIONAL), exif_format_get_name (EXIF_FORMAT_RATIONAL)); @@ -250,8 +250,8 @@ exif_entry_fix (ExifEntry *e) /* Format needs to be UNDEFINED. */ if (e->format != EXIF_FORMAT_UNDEFINED) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' had invalid format '%s'. " - "Format has been set to 'undefined'.", + _("Tag 'UserComment' had invalid format '%s'. " + "Format has been set to 'undefined'."), exif_format_get_name (e->format)); e->format = EXIF_FORMAT_UNDEFINED; } @@ -277,9 +277,9 @@ exif_entry_fix (ExifEntry *e) e->size += 8; e->components += 8; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' has been expanded to at " + _("Tag 'UserComment' has been expanded to at " "least 8 bytes in order to follow the " - "specification."); + "specification.")); break; } @@ -319,8 +319,8 @@ exif_entry_fix (ExifEntry *e) e->size += 8; e->components += 8; exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag 'UserComment' did not start with " - "format identifyer. This has been fixed."); + _("Tag 'UserComment' did not start with " + "format identifier. This has been fixed.")); break; } @@ -475,7 +475,7 @@ static struct { {4, {N_("Shutter priority"),N_("Shutter"), NULL}}, {5, {N_("Creative program (biased toward depth of field)"), N_("Creative"), NULL}}, - {6, {N_("Creative program (biased toward fast shutter speed"), + {6, {N_("Creative program (biased toward fast shutter speed)"), N_("Action"), NULL}}, {7, {N_("Portrait mode (for closeup photos with the background out " "of focus)"), N_("Portrait"), NULL}}, @@ -632,11 +632,11 @@ exif_entry_get_value (ExifEntry *e, char * Print as much as possible. */ exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Tag UserComment does not comply " - "with standard but contains data."); + _("Tag UserComment does not comply " + "with standard but contains data.")); for (; (i < e->size) && (strlen (val) < maxlen - 1); i++) { exif_entry_log (e, EXIF_LOG_CODE_DEBUG, - "Byte at position %i: 0x%02x", i, e->data[i]); + _("Byte at position %i: 0x%02x"), i, e->data[i]); val[strlen (val)] = isprint (e->data[i]) ? e->data[i] : '.'; } @@ -896,7 +896,7 @@ exif_entry_get_value (ExifEntry *e, char /* Search the tag */ for (i = 0; list2[i].tag && (list2[i].tag != e->tag); i++); if (!list2[i].tag) { - strncpy (val, "Internal error.", maxlen - 1); + strncpy (val, _("Internal error."), maxlen - 1); break; } @@ -904,8 +904,8 @@ exif_entry_get_value (ExifEntry *e, char for (j = 0; list2[i].elem[j].values && (list2[i].elem[j].index < v_short); j++); if (list2[i].elem[j].index != v_short) { - snprintf (val, maxlen, "Internal error (unknown " - "value %i).", v_short); + snprintf (val, maxlen, _("Internal error (unknown " + "value %i)."), v_short); break; } @@ -940,7 +940,7 @@ exif_entry_get_value (ExifEntry *e, char /* Search the tag */ for (i = 0; list[i].tag && (list[i].tag != e->tag); i++); if (!list[i].tag) { - strncpy (val, "Internal error.", maxlen - 1); + strncpy (val, _("Internal error."), maxlen - 1); break; } |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:29:26
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31467/libexif/olympus Modified Files: mnote-olympus-entry.c Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>, related to translation. Index: mnote-olympus-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -d -r1.20 -r1.21 --- mnote-olympus-entry.c 5 May 2005 16:57:58 -0000 1.20 +++ mnote-olympus-entry.c 15 Aug 2005 20:29:17 -0000 1.21 @@ -248,7 +248,7 @@ mnote_olympus_entry_get_value (MnoteOlym vr = exif_get_rational (entry->data+8, entry->order); b = (double)vr.numerator / vr.denominator; //printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); - snprintf (v, maxlen, "Red Correction %f, Blue Correction %f", r,b); + snprintf (v, maxlen, _("Red Correction %f, Blue Correction %f"), r,b); break; case MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE: CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen); @@ -256,7 +256,7 @@ mnote_olympus_entry_get_value (MnoteOlym vr = exif_get_rational (entry->data, entry->order); if (vr.numerator) { r = (double)vr.numerator / vr.denominator; - snprintf (v, maxlen, "%2.2f meters", r); + snprintf (v, maxlen, _("%2.2f meters"), r); } else { strncpy (v, _("No manual focus selection"), maxlen); } @@ -273,12 +273,12 @@ mnote_olympus_entry_get_value (MnoteOlym CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen); CC (entry->components, 4, v, maxlen); switch ( *( entry->data+1) ) { - case 0: strncpy (v, "AF Position: Center", maxlen); break; - case 1: strncpy (v, "AF Position: Top", maxlen); break; - case 2: strncpy (v, "AF Position: Bottom", maxlen); break; - case 3: strncpy (v, "AF Position: Left", maxlen); break; - case 4: strncpy (v, "AF Position: Right", maxlen); break; - default: strncpy (v, "Unknown AF Position", maxlen); + case 0: strncpy (v, _("AF Position: Center"), maxlen); break; + case 1: strncpy (v, _("AF Position: Top"), maxlen); break; + case 2: strncpy (v, _("AF Position: Bottom"), maxlen); break; + case 3: strncpy (v, _("AF Position: Left"), maxlen); break; + case 4: strncpy (v, _("AF Position: Right"), maxlen); break; + default: strncpy (v, _("Unknown AF Position"), maxlen); } break; case MNOTE_OLYMPUS_TAG_DIGIZOOM: @@ -311,7 +311,7 @@ mnote_olympus_entry_get_value (MnoteOlym /* search the tag */ for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++); if (!items[i].tag) { - strncpy (v, "Internal error", maxlen); + strncpy (v, _("Internal error"), maxlen); break; } CF (entry->format, items[i].fmt, v, maxlen); @@ -332,7 +332,7 @@ mnote_olympus_entry_get_value (MnoteOlym for (j = 0; items[i].elem[j].string && (items[i].elem[j].index < vs); j++); if (items[i].elem[j].index != vs) { - snprintf (v, maxlen, "Unknown value %hi", vs); + snprintf (v, maxlen, _("Unknown value %hi"), vs); break; } strncpy (v, items[i].elem[j].string, maxlen); |
|
From: Lutz M. <lu...@us...> - 2005-08-15 20:29:25
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31467 Modified Files: ChangeLog Log Message: 2005-08-15 Lutz Mueller <lu...@us...> Patch by Jakub Bogusz <qb...@pl...>, related to translation. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.222 retrieving revision 1.223 diff -u -p -d -r1.222 -r1.223 --- ChangeLog 14 Aug 2005 19:41:04 -0000 1.222 +++ ChangeLog 15 Aug 2005 20:29:14 -0000 1.223 @@ -1,3 +1,7 @@ +2005-08-15 Lutz Mueller <lu...@us...> + + Patch by Jakub Bogusz <qb...@pl...>, related to translation. + 2005-08-14 Jan Patera <pa...@us...> * libexif/exif-entry.c: Added value 2 of EXIF_TAG_COLOR_SPACE |
|
From: Jan P. <pa...@us...> - 2005-08-14 19:41:13
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11080 Modified Files: ChangeLog Log Message: Added value 2 of EXIF_TAG_COLOR_SPACE: patch #1253625 by Ross Burton - burtonini Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.221 retrieving revision 1.222 diff -u -p -d -r1.221 -r1.222 --- ChangeLog 18 Jul 2005 20:36:23 -0000 1.221 +++ ChangeLog 14 Aug 2005 19:41:04 -0000 1.222 @@ -1,3 +1,8 @@ +2005-08-14 Jan Patera <pa...@us...> + + * libexif/exif-entry.c: Added value 2 of EXIF_TAG_COLOR_SPACE + patch #1253625 by Ross Burton - burtonini + 2005-07-18 Lutz Mueller <lu...@us...> * doc/Makefile.am: Make distcheck work again. |
|
From: Jan P. <pa...@us...> - 2005-08-14 19:41:13
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11080/libexif Modified Files: exif-entry.c Log Message: Added value 2 of EXIF_TAG_COLOR_SPACE: patch #1253625 by Ross Burton - burtonini Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -p -d -r1.88 -r1.89 --- exif-entry.c 5 May 2005 16:57:45 -0000 1.88 +++ exif-entry.c 14 Aug 2005 19:41:05 -0000 1.89 @@ -526,6 +526,7 @@ static struct { {0, {NULL}}}}, { EXIF_TAG_COLOR_SPACE, { {1, {N_("sRGB"), NULL}}, + {2, {N_("Adobe RGB"), NULL}}, {0xffff, {N_("Uncalibrated"), NULL}}}}, {0, } }; |
|
From: Hubert F. <hfi...@us...> - 2005-07-24 23:35:04
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19527 Modified Files: exif-data.c exif-loader.c Log Message: EOL mandatory after a if() Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -d -r1.84 -r1.85 --- exif-data.c 2 Jul 2005 06:32:57 -0000 1.84 +++ exif-data.c 24 Jul 2005 23:34:41 -0000 1.85 @@ -76,10 +76,12 @@ exif_data_alloc (ExifData *data, unsigne { void *d; - if (!data || !i) return NULL; + if (!data || !i) + return NULL; d = exif_mem_alloc (data->priv->mem, i); - if (d) return d; + if (d) + return d; EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", i); return NULL; @@ -108,10 +110,12 @@ exif_data_new_mem (ExifMem *mem) ExifData *data; unsigned int i; - if (!mem) return NULL; + if (!mem) + return NULL; data = exif_mem_alloc (mem, sizeof (ExifData)); - if (!data) return (NULL); + if (!data) + return (NULL); data->priv = exif_mem_alloc (mem, sizeof (ExifDataPrivate)); if (!data->priv) { exif_mem_free (mem, data); @@ -191,12 +195,12 @@ exif_data_load_data_entry (ExifData *dat /* If this is the MakerNote, remember the offset */ if (entry->tag == EXIF_TAG_MAKER_NOTE) { if (entry->size > 6) exif_log (data->priv->log, - EXIF_LOG_CODE_DEBUG, "ExifData", - "MakerNote found (%02x %02x %02x %02x " - "%02x %02x %02x...).", - entry->data[0], entry->data[1], entry->data[2], - entry->data[3], entry->data[4], entry->data[5], - entry->data[6]); + EXIF_LOG_CODE_DEBUG, "ExifData", + "MakerNote found (%02x %02x %02x %02x " + "%02x %02x %02x...).", + entry->data[0], entry->data[1], entry->data[2], + entry->data[3], entry->data[4], entry->data[5], + entry->data[6]); data->priv->offset_mnote = doff; } } @@ -208,7 +212,8 @@ exif_data_save_data_entry (ExifData *dat { unsigned int doff, s; - if (!data || !data->priv) return; + if (!data || !data->priv) + return; /* * Each entry is 12 bytes long. The memory for the entry has @@ -248,21 +253,24 @@ exif_data_save_data_entry (ExifData *dat * the offset must be an even number. If we need to introduce * a padding byte, we set it to 0. */ - if (s & 1) (*ds)++; + if (s & 1) + (*ds)++; *d = exif_mem_realloc (data->priv->mem, *d, *ds); if (!*d) { EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds); return; } exif_set_long (*d + 6 + offset + 8, data->priv->order, doff); - if (s & 1) *(*d + *ds - 1) = '\0'; + if (s & 1) + *(*d + *ds - 1) = '\0'; } else doff = offset + 8; /* Write the data. Fill unneeded bytes with 0. */ memcpy (*d + 6 + doff, e->data, s); - if (s < 4) memset (*d + 6 + doff + s, 0, (4 - s)); + if (s < 4) + memset (*d + 6 + doff + s, 0, (4 - s)); } static void @@ -275,10 +283,12 @@ exif_data_load_data_thumbnail (ExifData (int) ds, (int) offset, (int) size); return; } - if (data->data) exif_mem_free (data->priv->mem, data->data); + 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) return; + if (!data->data) + return; memcpy (data->data, d + offset, data->size); } @@ -311,24 +321,28 @@ exif_data_load_data_content (ExifData *d unsigned int i; ExifTag tag; - if (!data || !data->priv) return; - if ((ifd < 0) || (ifd >= EXIF_IFD_COUNT)) return; + if (!data || !data->priv) + return; + if ((ifd < 0) || (ifd >= EXIF_IFD_COUNT)) + return; if (recursion_depth > 150) { exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", - "Deep recursion detected!"); + "Deep recursion detected!"); return; } /* Read the number of entries */ - if (offset >= ds - 1) return; + if (offset >= ds - 1) + return; n = exif_get_short (d + offset, data->priv->order); exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Loading %i entries...", n); offset += 2; /* Check if we have enough data. */ - if (offset + 12 * n > ds) n = (ds - offset) / 12; + if (offset + 12 * n > ds) + n = (ds - offset) / 12; for (i = 0; i < n; i++) { @@ -358,15 +372,15 @@ exif_data_load_data_content (ExifData *d thumbnail_offset = o; if (thumbnail_offset && thumbnail_length) exif_data_load_data_thumbnail (data, d, - ds, thumbnail_offset, - thumbnail_length); + ds, thumbnail_offset, + thumbnail_length); break; case EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH: thumbnail_length = o; if (thumbnail_offset && thumbnail_length) exif_data_load_data_thumbnail (data, d, - ds, thumbnail_offset, - thumbnail_length); + ds, thumbnail_offset, + thumbnail_length); break; default: return; @@ -387,14 +401,14 @@ exif_data_load_data_content (ExifData *d */ if (!memcmp (d + offset + 12 * i, "\0\0\0\0", 4)) { exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "Skipping empty entry at position %i in '%s'.", i, - exif_ifd_get_name (ifd)); + "Skipping empty entry at position %i in '%s'.", i, + exif_ifd_get_name (ifd)); break; } exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "Unknown tag 0x%04x (entry %i in '%s'). Please report this tag " - "to <lib...@li...>.", tag, i, - exif_ifd_get_name (ifd)); + "Unknown tag 0x%04x (entry %i in '%s'). Please report this tag " + "to <lib...@li...>.", tag, i, + exif_ifd_get_name (ifd)); if (data->priv->options & EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS) break; } @@ -421,14 +435,14 @@ static int cmp_func_intel (const void *elem1, const void *elem2) { return cmp_func ((const unsigned char *) elem1, - (const unsigned char *) elem2, EXIF_BYTE_ORDER_INTEL); + (const unsigned char *) elem2, EXIF_BYTE_ORDER_INTEL); } static int cmp_func_motorola (const void *elem1, const void *elem2) { return cmp_func ((const unsigned char *) elem1, - (const unsigned char *) elem2, EXIF_BYTE_ORDER_MOTOROLA); + (const unsigned char *) elem2, EXIF_BYTE_ORDER_MOTOROLA); } static void @@ -439,7 +453,8 @@ exif_data_save_data_content (ExifData *d unsigned int j, n_ptr = 0, n_thumb = 0; ExifIfd i; - if (!data || !data->priv || !ifd || !d || !ds) return; + if (!data || !data->priv || !ifd || !d || !ds) + return; for (i = 0; i < EXIF_IFD_COUNT; i++) if (ifd == data->ifd[i]) @@ -523,7 +538,7 @@ exif_data_save_data_content (ExifData *d exif_set_long (*d + 6 + offset + 8, data->priv->order, *ds - 6); exif_data_save_data_content (data, - data->ifd[EXIF_IFD_EXIF], d, ds, *ds - 6); + data->ifd[EXIF_IFD_EXIF], d, ds, *ds - 6); offset += 12; } @@ -538,7 +553,7 @@ exif_data_save_data_content (ExifData *d exif_set_long (*d + 6 + offset + 8, data->priv->order, *ds - 6); exif_data_save_data_content (data, - data->ifd[EXIF_IFD_GPS], d, ds, *ds - 6); + data->ifd[EXIF_IFD_GPS], d, ds, *ds - 6); offset += 12; } @@ -559,8 +574,8 @@ exif_data_save_data_content (ExifData *d exif_set_long (*d + 6 + offset + 8, data->priv->order, *ds - 6); exif_data_save_data_content (data, - data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, - *ds - 6); + data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, + *ds - 6); offset += 12; } @@ -594,7 +609,7 @@ exif_data_save_data_content (ExifData *d /* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */ exif_set_short (*d + 6 + offset + 0, data->priv->order, - EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); + EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); exif_set_short (*d + 6 + offset + 2, data->priv->order, EXIF_FORMAT_LONG); exif_set_long (*d + 6 + offset + 4, data->priv->order, @@ -611,12 +626,12 @@ exif_data_save_data_content (ExifData *d /* Sort the directory according to TIFF specification */ qsort (*d + 6 + offset - (ifd->count + n_ptr + n_thumb) * 12, - (ifd->count + n_ptr + n_thumb), 12, - (data->priv->order == EXIF_BYTE_ORDER_INTEL) ? cmp_func_intel : cmp_func_motorola); + (ifd->count + n_ptr + n_thumb), 12, + (data->priv->order == EXIF_BYTE_ORDER_INTEL) ? cmp_func_intel : cmp_func_motorola); /* Correctly terminate the directory */ if (i == EXIF_IFD_0 && (data->ifd[EXIF_IFD_1]->count || - data->size)) { + data->size)) { /* * We are saving IFD 0. Tell where IFD 1 starts and save @@ -642,10 +657,12 @@ exif_data_get_type_maker_note (ExifData ExifEntry *e, *em; char value[1024]; - if (!d) return EXIF_DATA_TYPE_MAKER_NOTE_NONE; + 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; + if (!e) + return EXIF_DATA_TYPE_MAKER_NOTE_NONE; /* Olympus & Nikon */ if ((e->size >= 5) && (!memcmp (e->data, "OLYMP", 5) || @@ -653,7 +670,8 @@ exif_data_get_type_maker_note (ExifData 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; + if (!em) + return EXIF_DATA_TYPE_MAKER_NOTE_NONE; /* Canon */ if (!strcmp (exif_entry_get_value (em, value, sizeof (value)), "Canon")) @@ -662,8 +680,8 @@ exif_data_get_type_maker_note (ExifData /* 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)) + exif_entry_get_value (em, value, sizeof(value)), + "Nikon", 5)) return EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS; else return EXIF_DATA_TYPE_MAKER_NOTE_PENTAX; @@ -686,7 +704,8 @@ exif_data_load_data (ExifData *data, con const unsigned char *d = d_orig; unsigned int ds = ds_orig, len; - if (!data || !data->priv || !d || !ds) return; + if (!data || !data->priv || !d || !ds) + return; exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", "Parsing %i byte(s) EXIF data...\n", ds); @@ -761,7 +780,7 @@ exif_data_load_data (ExifData *data, con } if (memcmp (d, ExifHeader, 6)) { exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", _("EXIF header not found.")); + "ExifData", _("EXIF header not found.")); return; } @@ -777,7 +796,7 @@ exif_data_load_data (ExifData *data, con data->priv->order = EXIF_BYTE_ORDER_MOTOROLA; else { exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, - "ExifData", _("Unknown encoding.")); + "ExifData", _("Unknown encoding.")); return; } @@ -861,7 +880,8 @@ exif_data_save_data (ExifData *data, uns /* Header */ *ds = 14; *d = exif_data_alloc (data, *ds); - if (!*d) return; + if (!*d) + return; memcpy (*d, ExifHeader, 6); /* Order (offset 6) */ @@ -917,10 +937,12 @@ exif_data_ref (ExifData *data) void exif_data_unref (ExifData *data) { - if (!data) return; + if (!data) + return; data->priv->ref_count--; - if (!data->priv->ref_count) exif_data_free (data); + if (!data->priv->ref_count) + exif_data_free (data); } void @@ -929,7 +951,8 @@ exif_data_free (ExifData *data) unsigned int i; ExifMem *mem = (data && data->priv) ? data->priv->mem : NULL; - if (!data) return; + if (!data) + return; for (i = 0; i < EXIF_IFD_COUNT; i++) { if (data->ifd[i]) { @@ -1051,7 +1074,8 @@ exif_data_log (ExifData *data, ExifLog * { unsigned int i; - if (!data || !data->priv) return; + if (!data || !data->priv) + return; exif_log_unref (data->priv->log); data->priv->log = log; exif_log_ref (log); @@ -1065,7 +1089,8 @@ ExifLog *exif_data_get_log (ExifData *); ExifLog * exif_data_get_log (ExifData *data) { - if (!data || !data->priv) return NULL; + if (!data || !data->priv) + return NULL; return data->priv->log; } @@ -1075,10 +1100,10 @@ static struct { const char *description; } exif_data_option[] = { {EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS, N_("Ignore unknown tags"), - N_("Ignore unknown tags when loading EXIF data.")}, + N_("Ignore unknown tags when loading EXIF data.")}, {EXIF_DATA_OPTION_FOLLOW_SPECIFICATION, N_("Follow specification"), - N_("Add, correct and remove entries to get EXIF data that follows " - "the specification.")}, + N_("Add, correct and remove entries to get EXIF data that follows " + "the specification.")}, {0, NULL, NULL} }; @@ -1088,7 +1113,8 @@ exif_data_option_get_name (ExifDataOptio unsigned int i; for (i = 0; exif_data_option[i].name; i++) - if (exif_data_option[i].option == o) break; + if (exif_data_option[i].option == o) + break; return _(exif_data_option[i].name); } @@ -1098,14 +1124,16 @@ exif_data_option_get_description (ExifDa unsigned int i; for (i = 0; exif_data_option[i].description; i++) - if (exif_data_option[i].option == o) break; + if (exif_data_option[i].option == o) + break; return _(exif_data_option[i].description); } void exif_data_set_option (ExifData *d, ExifDataOption o) { - if (!d) return; + if (!d) + return; d->priv->options |= o; } @@ -1113,7 +1141,8 @@ exif_data_set_option (ExifData *d, ExifD void exif_data_unset_option (ExifData *d, ExifDataOption o) { - if (!d) return; + if (!d) + return; d->priv->options &= ~o; } @@ -1127,8 +1156,8 @@ fix_func (ExifContent *c, void *data) exif_content_fix (c); else { exif_log (c->parent->priv->log, EXIF_LOG_CODE_DEBUG, "exif-data", - "No thumbnail but entries on thumbnail. These entries have been " - "removed."); + "No thumbnail but entries on thumbnail. These entries have been " + "removed."); while (c->count) exif_content_remove_entry (c, c->entries[c->count - 1]); } @@ -1147,7 +1176,8 @@ exif_data_fix (ExifData *d) void exif_data_set_data_type (ExifData *d, ExifDataType dt) { - if (!d || !d->priv) return; + if (!d || !d->priv) + return; d->priv->data_type = dt; } Index: exif-loader.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -d -r1.19 -r1.20 --- exif-loader.c 11 Jul 2005 20:32:03 -0000 1.19 +++ exif-loader.c 24 Jul 2005 23:34:41 -0000 1.20 @@ -80,10 +80,12 @@ exif_loader_alloc (ExifLoader *l, unsign { void *d; - if (!l || !i) return NULL; + if (!l || !i) + return NULL; d = exif_mem_alloc (l->mem, i); - if (d) return d; + if (d) + return d; EXIF_LOG_NO_MEMORY (l->log, "ExifLog", i); return NULL; @@ -99,7 +101,8 @@ exif_loader_write_file (ExifLoader *l, c int size; unsigned char data[1024]; - if (!l) return; + if (!l) + return; f = fopen (path, "rb"); if (!f) { @@ -109,8 +112,10 @@ exif_loader_write_file (ExifLoader *l, c } while (1) { size = fread (data, 1, sizeof (data), f); - if (size <= 0) break; - if (!exif_loader_write (l, data, size)) break; + if (size <= 0) + break; + if (!exif_loader_write (l, data, size)) + break; } fclose (f); } @@ -118,11 +123,14 @@ exif_loader_write_file (ExifLoader *l, c static unsigned int exif_loader_copy (ExifLoader *eld, unsigned char *buf, unsigned int len) { - if (!eld || (len && !buf) || (eld->bytes_read >= eld->size)) return 0; + if (!eld || (len && !buf) || (eld->bytes_read >= eld->size)) + return 0; /* If needed, allocate the buffer. */ - if (!eld->buf) eld->buf = exif_loader_alloc (eld, eld->size); - if (!eld->buf) return 0; + if (!eld->buf) + eld->buf = exif_loader_alloc (eld, eld->size); + if (!eld->buf) + return 0; /* Copy memory */ len = MIN (len, eld->size - eld->bytes_read); @@ -137,13 +145,17 @@ exif_loader_write (ExifLoader *eld, unsi { unsigned int i; - if (!eld || (len && !buf)) return 0; + if (!eld || (len && !buf)) + return 0; switch (eld->state) { case EL_EXIF_FOUND: return exif_loader_copy (eld, buf, len); case EL_SKIP_BYTES: - if (eld->size > len) { eld->size -= len; return 1; } + if (eld->size > len) { + eld->size -= len; + return 1; + } len -= eld->size; buf += eld->size; eld->size = 0; @@ -172,7 +184,8 @@ exif_loader_write (ExifLoader *eld, unsi if (i) { memcpy (&eld->b[eld->b_len], buf, i); eld->b_len += i; - if (eld->b_len < sizeof (eld->b)) return 1; + if (eld->b_len < sizeof (eld->b)) + return 1; buf += i; len -= i; } @@ -203,11 +216,13 @@ exif_loader_write (ExifLoader *eld, unsi switch (eld->state) { case EL_EXIF_FOUND: if (!exif_loader_copy (eld, eld->b + i, - sizeof (eld->b) - i)) return 0; + sizeof (eld->b) - i)) + return 0; return exif_loader_copy (eld, buf, len); case EL_SKIP_BYTES: eld->size--; - if (!eld->size) eld->state = EL_READ; + if (!eld->size) + eld->state = EL_READ; break; case EL_READ_SIZE_BYTE_24: @@ -294,10 +309,12 @@ exif_loader_new_mem (ExifMem *mem) { ExifLoader *loader; - if (!mem) return NULL; + if (!mem) + return NULL; loader = exif_mem_alloc (mem, sizeof (ExifLoader)); - if (!loader) return NULL; + if (!loader) + return NULL; loader->ref_count = 1; loader->mem = mem; @@ -309,7 +326,8 @@ exif_loader_new_mem (ExifMem *mem) void exif_loader_ref (ExifLoader *loader) { - if (loader) loader->ref_count++; + if (loader) + loader->ref_count++; } static void @@ -317,7 +335,8 @@ exif_loader_free (ExifLoader *loader) { ExifMem *mem; - if (!loader) return; + if (!loader) + return; mem = loader->mem; exif_loader_reset (loader); @@ -328,7 +347,8 @@ exif_loader_free (ExifLoader *loader) void exif_loader_unref (ExifLoader *loader) { - if (!loader) return; + if (!loader) + return; if (!--loader->ref_count) exif_loader_free (loader); } @@ -336,7 +356,8 @@ exif_loader_unref (ExifLoader *loader) void exif_loader_reset (ExifLoader *loader) { - if (!loader) return; + if (!loader) + return; exif_mem_free (loader->mem, loader->buf); loader->buf = NULL; loader->size = 0; loader->bytes_read = 0; @@ -350,7 +371,8 @@ exif_loader_get_data (ExifLoader *loader { ExifData *ed; - if (!loader) return NULL; + if (!loader) + return NULL; ed = exif_data_new_mem (loader->mem); exif_data_log (ed, loader->log); @@ -362,7 +384,8 @@ exif_loader_get_data (ExifLoader *loader void exif_loader_log (ExifLoader *loader, ExifLog *log) { - if (!loader) return; + if (!loader) + return; exif_log_unref (loader->log); loader->log = log; exif_log_ref (log); |
|
From: Lutz M. <lu...@us...> - 2005-07-18 20:36:34
|
Update of /cvsroot/libexif/libexif/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv930/doc Modified Files: Makefile.am Log Message: 2005-07-18 Lutz Mueller <lu...@us...> * doc/Makefile.am: Make distcheck work again. Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -d -r1.6 -r1.7 --- Makefile.am 20 Jun 2005 23:59:11 -0000 1.6 +++ Makefile.am 18 Jul 2005 20:36:24 -0000 1.7 @@ -5,7 +5,7 @@ if HAVE_DOXYGEN DOXYGEN_FILES = -DOXYGEN_STAMPS = $(HTML_APIDOC_DIR).stamp $(HTML_APIDOC_INTERNALS_DIR).stamp +DOXYGEN_STAMPS = $(HTML_APIDOC_DIR).stamp $(HTML_APIDOC_INTERNALS_DIR).stamp $(DOXYGEN_OUTPUT_DIR).stamp DOXYGEN_UPLOAD = $(HTML_APIDOC_DIR).uploaded $(HTML_APIDOC_INTERNALS_DIR).uploaded # FIXME: Depending on the source files would be sufficient... @@ -18,6 +18,10 @@ $(HTML_APIDOC_INTERNALS_DIR).stamp: Doxy doxygen $< echo > $@ +$(DOXYGEN_OUTPUT_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la + doxygen $< + echo > $@ + $(top_builddir)/libexif/libexif.la: cd $(top_builddir)/libexif && $(MAKE) libexif.la @@ -48,6 +52,7 @@ uninstall-apidocs: clean-apidocs: rm -rf $(DOXYGEN_OUTPUT_DIR) + rm -f $(HTML_APIDOC_DIR).tar.gz $(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS) find $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \ |
|
From: Lutz M. <lu...@us...> - 2005-07-18 20:36:33
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv930 Modified Files: ChangeLog Log Message: 2005-07-18 Lutz Mueller <lu...@us...> * doc/Makefile.am: Make distcheck work again. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.220 retrieving revision 1.221 diff -u -p -d -r1.220 -r1.221 --- ChangeLog 11 Jul 2005 20:31:34 -0000 1.220 +++ ChangeLog 18 Jul 2005 20:36:23 -0000 1.221 @@ -1,3 +1,7 @@ +2005-07-18 Lutz Mueller <lu...@us...> + + * doc/Makefile.am: Make distcheck work again. + 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: |
|
From: Lutz M. <lu...@us...> - 2005-07-14 22:14:25
|
Update of /cvsroot/libexif/libexif/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30190/test Modified Files: test-mnote.c test-value.c Log Message: 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: * po/de.po: * po/fr.po: * po/es.po: Added license. Index: test-value.c =================================================================== RCS file: /cvsroot/libexif/libexif/test/test-value.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- test-value.c 7 Jan 2004 23:36:46 -0000 1.1 +++ test-value.c 14 Jul 2005 22:14:07 -0000 1.2 @@ -1,3 +1,23 @@ +/* test-value.c + * + * Copyright 2002 Lutz M\uffffller <lu...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include <libexif/exif-utils.h> #include <libexif/exif-data.h> Index: test-mnote.c =================================================================== RCS file: /cvsroot/libexif/libexif/test/test-mnote.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- test-mnote.c 7 Jan 2004 23:36:16 -0000 1.4 +++ test-mnote.c 14 Jul 2005 22:14:07 -0000 1.5 @@ -1,3 +1,23 @@ +/* exif-mnote.c + * + * Copyright 2002 Lutz M\uffffller <lu...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include <config.h> #include <stdio.h> |
|
From: Lutz M. <lu...@us...> - 2005-07-14 22:14:25
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30190/po Modified Files: de.po es.po fr.po Log Message: 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: * po/de.po: * po/fr.po: * po/es.po: Added license. Index: es.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/es.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- es.po 11 Jul 2005 20:31:52 -0000 1.15 +++ es.po 14 Jul 2005 22:13:43 -0000 1.16 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-03 13:31+0200\n" +"POT-Creation-Date: 2005-07-11 22:36+0200\n" "PO-Revision-Date: 2005-03-12 05:43+0100\n" "Last-Translator: Fabian Mandelbaum <fa...@ma...>\n" "Language-Team: Spanish <es...@li...>\n" @@ -153,12 +153,12 @@ msgid "Standard" msgstr "Estándar" #: libexif/exif-entry.c:406 libexif/exif-entry.c:483 -#: libexif/canon/mnote-canon-entry.c:217 +#: libexif/canon/mnote-canon-entry.c:116 msgid "Landscape" msgstr "Paisaje" #: libexif/exif-entry.c:406 libexif/exif-entry.c:481 -#: libexif/canon/mnote-canon-entry.c:235 +#: libexif/canon/mnote-canon-entry.c:122 msgid "Portrait" msgstr "Retrato" @@ -168,8 +168,8 @@ msgstr "Escena nocturna" #: libexif/exif-entry.c:409 libexif/exif-entry.c:412 libexif/exif-entry.c:413 #: libexif/exif-entry.c:414 libexif/exif-entry.c:473 -#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:258 -#: libexif/canon/mnote-canon-entry.c:275 libexif/canon/mnote-canon-entry.c:292 +#: libexif/canon/mnote-canon-entry.c:88 libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:132 libexif/canon/mnote-canon-entry.c:136 #: libexif/olympus/mnote-olympus-entry.c:103 #: libexif/olympus/mnote-olympus-entry.c:148 #: libexif/olympus/mnote-olympus-entry.c:154 @@ -254,7 +254,7 @@ msgstr "Multi Lugar" msgid "Pattern" msgstr "Patrón" -#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:334 +#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:146 msgid "Partial" msgstr "Parcial" @@ -289,14 +289,14 @@ msgstr "Fluorescente" msgid "Tungsten incandescent light" msgstr "Tungsteno (luz incandescente)" -#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:468 +#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:297 #: libexif/pentax/mnote-pentax-entry.c:87 #, fuzzy msgid "Tungsten" msgstr "tungsteno" #: libexif/exif-entry.c:445 libexif/exif-tag.c:439 -#: libexif/canon/mnote-canon-entry.c:474 +#: libexif/canon/mnote-canon-entry.c:303 msgid "Flash" msgstr "Flash" @@ -376,8 +376,8 @@ msgstr "CentÃmetro" msgid "cm" msgstr "cm" -#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:214 -#: libexif/canon/mnote-canon-entry.c:383 +#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:115 +#: libexif/canon/mnote-canon-entry.c:159 #: libexif/olympus/mnote-olympus-entry.c:76 #: libexif/pentax/mnote-pentax-entry.c:67 #: libexif/pentax/mnote-pentax-entry.c:89 @@ -581,7 +581,7 @@ msgstr "" msgid "?" msgstr "" -#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:98 +#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:87 #: libexif/olympus/mnote-olympus-tag.c:107 msgid "Macro" msgstr "Macro" @@ -2244,340 +2244,337 @@ msgstr "Cantidad de componentes no váli msgid "Invalid number of components (%i, expected %i or %i)." msgstr "Cantidad de componentes no válida (%i, se esperaba %i)." -#: libexif/canon/mnote-canon-entry.c:95 -msgid "Macro mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:143 -#: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:186 -#: libexif/canon/mnote-canon-entry.c:203 libexif/canon/mnote-canon-entry.c:247 -#: libexif/canon/mnote-canon-entry.c:264 libexif/canon/mnote-canon-entry.c:281 -#: libexif/canon/mnote-canon-entry.c:298 libexif/canon/mnote-canon-entry.c:322 -#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:389 -#: libexif/canon/mnote-canon-entry.c:429 libexif/canon/mnote-canon-entry.c:480 +#: libexif/canon/mnote-canon-entry.c:89 libexif/canon/mnote-canon-entry.c:98 +#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:109 +#: libexif/canon/mnote-canon-entry.c:113 libexif/canon/mnote-canon-entry.c:126 +#: libexif/canon/mnote-canon-entry.c:130 libexif/canon/mnote-canon-entry.c:134 +#: libexif/canon/mnote-canon-entry.c:138 libexif/canon/mnote-canon-entry.c:144 +#: libexif/canon/mnote-canon-entry.c:148 libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:161 libexif/canon/mnote-canon-entry.c:164 +#: libexif/canon/mnote-canon-entry.c:309 #, c-format msgid "%i???" msgstr "" -#: libexif/canon/mnote-canon-entry.c:111 -#, c-format -msgid " / Self Timer : %i (ms)" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:116 -msgid " / Flash mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:119 +#: libexif/canon/mnote-canon-entry.c:90 #, fuzzy msgid "Flash not fired" msgstr "El flash no disparó." -#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:307 +#: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:139 #, fuzzy msgid "auto" msgstr "acción" -#: libexif/canon/mnote-canon-entry.c:125 +#: libexif/canon/mnote-canon-entry.c:92 msgid "on" msgstr "" -#: libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:93 #, fuzzy msgid "red eyes reduction" msgstr "El flash disparó, modo de reducción de ojos rojos." -#: libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:94 msgid "slow synchro" msgstr "" -#: libexif/canon/mnote-canon-entry.c:134 +#: libexif/canon/mnote-canon-entry.c:95 #, fuzzy -msgid "auto + red eyes reduction" +msgid "auto + red yes reduction" msgstr "El flash disparó, modo de reducción de ojos rojos." -#: libexif/canon/mnote-canon-entry.c:137 +#: libexif/canon/mnote-canon-entry.c:96 #, fuzzy msgid "on + red eyes reduction" msgstr "El flash disparó, modo de reducción de ojos rojos." -#: libexif/canon/mnote-canon-entry.c:140 +#: libexif/canon/mnote-canon-entry.c:97 msgid "external" msgstr "" -#: libexif/canon/mnote-canon-entry.c:148 -msgid " / Continuous drive mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:151 +#: libexif/canon/mnote-canon-entry.c:99 msgid "single or timer" msgstr "" -#: libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:100 msgid "continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:162 -msgid " / Focus mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:165 +#: libexif/canon/mnote-canon-entry.c:102 msgid "One-Shot" msgstr "" -#: libexif/canon/mnote-canon-entry.c:168 +#: libexif/canon/mnote-canon-entry.c:103 msgid "AI Servo" msgstr "" -#: libexif/canon/mnote-canon-entry.c:171 +#: libexif/canon/mnote-canon-entry.c:104 msgid "AI Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:174 libexif/canon/mnote-canon-entry.c:183 +#: libexif/canon/mnote-canon-entry.c:105 libexif/canon/mnote-canon-entry.c:108 msgid "MF" msgstr "" -#: libexif/canon/mnote-canon-entry.c:177 libexif/canon/mnote-canon-entry.c:423 +#: libexif/canon/mnote-canon-entry.c:106 libexif/canon/mnote-canon-entry.c:162 msgid "Single" msgstr "" -#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:426 +#: libexif/canon/mnote-canon-entry.c:107 libexif/canon/mnote-canon-entry.c:163 msgid "Continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:191 -msgid " / Image size : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:194 +#: libexif/canon/mnote-canon-entry.c:110 #, fuzzy msgid "Large" msgstr "promedio" -#: libexif/canon/mnote-canon-entry.c:197 +#: libexif/canon/mnote-canon-entry.c:111 msgid "Medium" msgstr "" -#: libexif/canon/mnote-canon-entry.c:200 +#: libexif/canon/mnote-canon-entry.c:112 msgid "Small" msgstr "" -#: libexif/canon/mnote-canon-entry.c:208 -msgid " / Easy shooting mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:211 +#: libexif/canon/mnote-canon-entry.c:114 msgid "Full Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:220 +#: libexif/canon/mnote-canon-entry.c:117 #, fuzzy msgid "Fast Shutter" msgstr "obturador" -#: libexif/canon/mnote-canon-entry.c:223 +#: libexif/canon/mnote-canon-entry.c:118 #, fuzzy msgid "Slow Shutter" msgstr "obturador" -#: libexif/canon/mnote-canon-entry.c:226 +#: libexif/canon/mnote-canon-entry.c:119 #, fuzzy msgid "Night" msgstr "Escena nocturna" -#: libexif/canon/mnote-canon-entry.c:229 +#: libexif/canon/mnote-canon-entry.c:120 #: libexif/pentax/mnote-pentax-entry.c:114 msgid "Black & White" msgstr "" -#: libexif/canon/mnote-canon-entry.c:232 +#: libexif/canon/mnote-canon-entry.c:121 #: libexif/pentax/mnote-pentax-entry.c:115 msgid "Sepia" msgstr "" -#: libexif/canon/mnote-canon-entry.c:238 +#: libexif/canon/mnote-canon-entry.c:123 #, fuzzy msgid "Sports" msgstr "Lugar" -#: libexif/canon/mnote-canon-entry.c:241 +#: libexif/canon/mnote-canon-entry.c:124 msgid "Macro / Close-Up" msgstr "" -#: libexif/canon/mnote-canon-entry.c:244 +#: libexif/canon/mnote-canon-entry.c:125 msgid "Pan Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:252 -#, fuzzy -msgid " / Contrast : " -msgstr "Contraste" - -#: libexif/canon/mnote-canon-entry.c:255 libexif/canon/mnote-canon-entry.c:272 -#: libexif/canon/mnote-canon-entry.c:289 +#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:135 #: libexif/pentax/mnote-pentax-entry.c:98 #: libexif/pentax/mnote-pentax-entry.c:103 msgid "Low" msgstr "" -#: libexif/canon/mnote-canon-entry.c:261 libexif/canon/mnote-canon-entry.c:278 -#: libexif/canon/mnote-canon-entry.c:295 +#: libexif/canon/mnote-canon-entry.c:129 libexif/canon/mnote-canon-entry.c:133 +#: libexif/canon/mnote-canon-entry.c:137 #: libexif/pentax/mnote-pentax-entry.c:99 #: libexif/pentax/mnote-pentax-entry.c:104 msgid "High" msgstr "" -#: libexif/canon/mnote-canon-entry.c:269 -#, fuzzy -msgid " / Saturation : " -msgstr "Saturación" - -#: libexif/canon/mnote-canon-entry.c:286 -#, fuzzy -msgid " / Sharpness : " -msgstr "Nitidez" - -#: libexif/canon/mnote-canon-entry.c:304 -msgid " / ISO : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:310 +#: libexif/canon/mnote-canon-entry.c:140 msgid "50" msgstr "" -#: libexif/canon/mnote-canon-entry.c:313 +#: libexif/canon/mnote-canon-entry.c:141 #: libexif/pentax/mnote-pentax-entry.c:107 #: libexif/pentax/mnote-pentax-entry.c:109 msgid "100" msgstr "" -#: libexif/canon/mnote-canon-entry.c:316 +#: libexif/canon/mnote-canon-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:108 #: libexif/pentax/mnote-pentax-entry.c:110 msgid "200" msgstr "" -#: libexif/canon/mnote-canon-entry.c:319 +#: libexif/canon/mnote-canon-entry.c:143 msgid "400" msgstr "" -#: libexif/canon/mnote-canon-entry.c:328 -#, fuzzy -msgid " / Metering mode : " -msgstr "Modo de métrica" - -#: libexif/canon/mnote-canon-entry.c:331 +#: libexif/canon/mnote-canon-entry.c:145 msgid "Evaluative" msgstr "" -#: libexif/canon/mnote-canon-entry.c:337 +#: libexif/canon/mnote-canon-entry.c:147 #, fuzzy msgid "Center-weighted" msgstr "peso centrado" -#: libexif/canon/mnote-canon-entry.c:345 -msgid " / AF point selected : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:348 +#: libexif/canon/mnote-canon-entry.c:149 msgid "none (MF)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:351 +#: libexif/canon/mnote-canon-entry.c:150 msgid "auto-selected" msgstr "" -#: libexif/canon/mnote-canon-entry.c:354 +#: libexif/canon/mnote-canon-entry.c:151 #, fuzzy msgid "right" msgstr "Copyright" -#: libexif/canon/mnote-canon-entry.c:357 +#: libexif/canon/mnote-canon-entry.c:152 #, fuzzy msgid "center" msgstr "centrado" -#: libexif/canon/mnote-canon-entry.c:360 +#: libexif/canon/mnote-canon-entry.c:153 msgid "left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:363 -#, c-format -msgid "0x%x???" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:368 -#, fuzzy -msgid " / Exposure mode : " -msgstr "Modo de exposición" - -#: libexif/canon/mnote-canon-entry.c:371 +#: libexif/canon/mnote-canon-entry.c:155 msgid "Easy shooting" msgstr "" -#: libexif/canon/mnote-canon-entry.c:374 +#: libexif/canon/mnote-canon-entry.c:156 msgid "Program" msgstr "" -#: libexif/canon/mnote-canon-entry.c:377 +#: libexif/canon/mnote-canon-entry.c:157 msgid "Tv-priority" msgstr "" -#: libexif/canon/mnote-canon-entry.c:380 +#: libexif/canon/mnote-canon-entry.c:158 #, fuzzy msgid "Av-priority" msgstr "Prioridad de apertura" -#: libexif/canon/mnote-canon-entry.c:386 +#: libexif/canon/mnote-canon-entry.c:160 msgid "A-DEP" msgstr "" -#: libexif/canon/mnote-canon-entry.c:394 +#: libexif/canon/mnote-canon-entry.c:173 +#, fuzzy +msgid "Macro mode" +msgstr "Macro" + +#: libexif/canon/mnote-canon-entry.c:174 +msgid " / Flash mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:175 +msgid " / Continuous drive mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:176 +msgid " / Focus mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:177 +msgid " / Image size : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:178 +msgid " / Easy shooting mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:179 +#, fuzzy +msgid " / Contrast : " +msgstr "Contraste" + +#: libexif/canon/mnote-canon-entry.c:180 +#, fuzzy +msgid " / Saturation : " +msgstr "Saturación" + +#: libexif/canon/mnote-canon-entry.c:181 +#, fuzzy +msgid " / Sharpness : " +msgstr "Nitidez" + +#: libexif/canon/mnote-canon-entry.c:182 +msgid " / ISO : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:183 +#, fuzzy +msgid " / Metering mode : " +msgstr "Modo de métrica" + +#: libexif/canon/mnote-canon-entry.c:184 +msgid " / AF point selected : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:185 +#, fuzzy +msgid " / Exposure mode : " +msgstr "Modo de exposición" + +#: libexif/canon/mnote-canon-entry.c:186 +#, fuzzy +msgid " / Focus mode2 : " +msgstr "Modo de exposición" + +#: libexif/canon/mnote-canon-entry.c:211 +#, c-format +msgid " / Self Timer : %i (ms)" +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:216 #, c-format msgid " / long focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:398 +#: libexif/canon/mnote-canon-entry.c:220 #, c-format msgid " / short focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:402 +#: libexif/canon/mnote-canon-entry.c:224 #, c-format msgid " / focal units per mm : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:406 +#: libexif/canon/mnote-canon-entry.c:228 msgid " / Flash details : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:408 +#: libexif/canon/mnote-canon-entry.c:230 msgid "External E-TTL" msgstr "" -#: libexif/canon/mnote-canon-entry.c:410 +#: libexif/canon/mnote-canon-entry.c:232 msgid "Internal flash" msgstr "" -#: libexif/canon/mnote-canon-entry.c:412 +#: libexif/canon/mnote-canon-entry.c:234 msgid "FP sync used" msgstr "" -#: libexif/canon/mnote-canon-entry.c:414 +#: libexif/canon/mnote-canon-entry.c:236 msgid "FP sync enabled" msgstr "" -#: libexif/canon/mnote-canon-entry.c:420 -#, fuzzy -msgid " / Focus mode2 : " -msgstr "Modo de exposición" - -#: libexif/canon/mnote-canon-entry.c:456 +#: libexif/canon/mnote-canon-entry.c:285 #, fuzzy msgid "White balance : " msgstr "Balance de blanco" -#: libexif/canon/mnote-canon-entry.c:459 +#: libexif/canon/mnote-canon-entry.c:288 #: libexif/olympus/mnote-olympus-entry.c:116 #: libexif/olympus/mnote-olympus-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:65 @@ -2587,67 +2584,67 @@ msgstr "Balance de blanco" msgid "Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:462 +#: libexif/canon/mnote-canon-entry.c:291 #, fuzzy msgid "Sunny" msgstr "soleado" -#: libexif/canon/mnote-canon-entry.c:465 +#: libexif/canon/mnote-canon-entry.c:294 #: libexif/olympus/mnote-olympus-entry.c:121 #, fuzzy msgid "Cloudy" msgstr "nublado" -#: libexif/canon/mnote-canon-entry.c:471 +#: libexif/canon/mnote-canon-entry.c:300 #, fuzzy msgid "Flourescent" msgstr "Fluorescente" -#: libexif/canon/mnote-canon-entry.c:477 +#: libexif/canon/mnote-canon-entry.c:306 #: libexif/pentax/mnote-pentax-entry.c:74 #, fuzzy msgid "Custom" msgstr "Proceso personalizado" -#: libexif/canon/mnote-canon-entry.c:485 +#: libexif/canon/mnote-canon-entry.c:314 #, c-format msgid " / Sequence number : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:491 +#: libexif/canon/mnote-canon-entry.c:320 msgid " / AF point used : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:493 +#: libexif/canon/mnote-canon-entry.c:322 #, fuzzy msgid "Right" msgstr "Luz de dÃa" -#: libexif/canon/mnote-canon-entry.c:495 +#: libexif/canon/mnote-canon-entry.c:324 #, fuzzy msgid "Center" msgstr "CentÃmetro" -#: libexif/canon/mnote-canon-entry.c:497 +#: libexif/canon/mnote-canon-entry.c:326 msgid "Left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:498 +#: libexif/canon/mnote-canon-entry.c:327 #, c-format msgid " (%u available focus point)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:506 +#: libexif/canon/mnote-canon-entry.c:335 #, fuzzy, c-format msgid " / Flash bias : %.2f EV" msgstr "Flash" -#: libexif/canon/mnote-canon-entry.c:511 +#: libexif/canon/mnote-canon-entry.c:340 #, fuzzy, c-format msgid " / Subject Distance (mm) : %u" msgstr "Distancia del sujeto" -#: libexif/canon/mnote-canon-entry.c:564 +#: libexif/canon/mnote-canon-entry.c:393 #, c-format msgid "C.F%d : %u" msgstr "" Index: fr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/fr.po,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -d -r1.16 -r1.17 --- fr.po 11 Jul 2005 20:31:57 -0000 1.16 +++ fr.po 14 Jul 2005 22:13:58 -0000 1.17 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-03 13:31+0200\n" +"POT-Creation-Date: 2005-07-11 22:36+0200\n" "PO-Revision-Date: 2005-03-12 05:42+0100\n" "Last-Translator: Arnaud Launay <as...@la...>\n" "Language-Team: Français <tr...@tr...>\n" @@ -153,12 +153,12 @@ msgid "Standard" msgstr "Standard" #: libexif/exif-entry.c:406 libexif/exif-entry.c:483 -#: libexif/canon/mnote-canon-entry.c:217 +#: libexif/canon/mnote-canon-entry.c:116 msgid "Landscape" msgstr "Paysage" #: libexif/exif-entry.c:406 libexif/exif-entry.c:481 -#: libexif/canon/mnote-canon-entry.c:235 +#: libexif/canon/mnote-canon-entry.c:122 msgid "Portrait" msgstr "Portrait" @@ -168,8 +168,8 @@ msgstr "Scène de nuit" #: libexif/exif-entry.c:409 libexif/exif-entry.c:412 libexif/exif-entry.c:413 #: libexif/exif-entry.c:414 libexif/exif-entry.c:473 -#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:258 -#: libexif/canon/mnote-canon-entry.c:275 libexif/canon/mnote-canon-entry.c:292 +#: libexif/canon/mnote-canon-entry.c:88 libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:132 libexif/canon/mnote-canon-entry.c:136 #: libexif/olympus/mnote-olympus-entry.c:103 #: libexif/olympus/mnote-olympus-entry.c:148 #: libexif/olympus/mnote-olympus-entry.c:154 @@ -254,7 +254,7 @@ msgstr "Multi spot" msgid "Pattern" msgstr "Motif" -#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:334 +#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:146 msgid "Partial" msgstr "Partiel" @@ -289,14 +289,14 @@ msgstr "Fluorescent" msgid "Tungsten incandescent light" msgstr "Tungstène (lumière incandescente)" -#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:468 +#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:297 #: libexif/pentax/mnote-pentax-entry.c:87 #, fuzzy msgid "Tungsten" msgstr "tungsten" #: libexif/exif-entry.c:445 libexif/exif-tag.c:439 -#: libexif/canon/mnote-canon-entry.c:474 +#: libexif/canon/mnote-canon-entry.c:303 msgid "Flash" msgstr "Flash" @@ -376,8 +376,8 @@ msgstr "Centimère" msgid "cm" msgstr "cm" -#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:214 -#: libexif/canon/mnote-canon-entry.c:383 +#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:115 +#: libexif/canon/mnote-canon-entry.c:159 #: libexif/olympus/mnote-olympus-entry.c:76 #: libexif/pentax/mnote-pentax-entry.c:67 #: libexif/pentax/mnote-pentax-entry.c:89 @@ -577,7 +577,7 @@ msgstr "" msgid "?" msgstr "" -#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:98 +#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:87 #: libexif/olympus/mnote-olympus-tag.c:107 msgid "Macro" msgstr "Macro" @@ -2018,340 +2018,337 @@ msgstr "Nombre invalide de composants (% msgid "Invalid number of components (%i, expected %i or %i)." msgstr "Nombre invalide de composants (%i, attendait %i)." -#: libexif/canon/mnote-canon-entry.c:95 -msgid "Macro mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:143 -#: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:186 -#: libexif/canon/mnote-canon-entry.c:203 libexif/canon/mnote-canon-entry.c:247 -#: libexif/canon/mnote-canon-entry.c:264 libexif/canon/mnote-canon-entry.c:281 -#: libexif/canon/mnote-canon-entry.c:298 libexif/canon/mnote-canon-entry.c:322 -#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:389 -#: libexif/canon/mnote-canon-entry.c:429 libexif/canon/mnote-canon-entry.c:480 +#: libexif/canon/mnote-canon-entry.c:89 libexif/canon/mnote-canon-entry.c:98 +#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:109 +#: libexif/canon/mnote-canon-entry.c:113 libexif/canon/mnote-canon-entry.c:126 +#: libexif/canon/mnote-canon-entry.c:130 libexif/canon/mnote-canon-entry.c:134 +#: libexif/canon/mnote-canon-entry.c:138 libexif/canon/mnote-canon-entry.c:144 +#: libexif/canon/mnote-canon-entry.c:148 libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:161 libexif/canon/mnote-canon-entry.c:164 +#: libexif/canon/mnote-canon-entry.c:309 #, c-format msgid "%i???" msgstr "" -#: libexif/canon/mnote-canon-entry.c:111 -#, c-format -msgid " / Self Timer : %i (ms)" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:116 -msgid " / Flash mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:119 +#: libexif/canon/mnote-canon-entry.c:90 #, fuzzy msgid "Flash not fired" msgstr "Le flash ne s'est pas déclenché." -#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:307 +#: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:139 #, fuzzy msgid "auto" msgstr "action" -#: libexif/canon/mnote-canon-entry.c:125 +#: libexif/canon/mnote-canon-entry.c:92 msgid "on" msgstr "" -#: libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:93 #, fuzzy msgid "red eyes reduction" msgstr "Flash déclenché, mode anti-yeux rouges." -#: libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:94 msgid "slow synchro" msgstr "" -#: libexif/canon/mnote-canon-entry.c:134 +#: libexif/canon/mnote-canon-entry.c:95 #, fuzzy -msgid "auto + red eyes reduction" +msgid "auto + red yes reduction" msgstr "Flash déclenché, mode anti-yeux rouges." -#: libexif/canon/mnote-canon-entry.c:137 +#: libexif/canon/mnote-canon-entry.c:96 #, fuzzy msgid "on + red eyes reduction" msgstr "Flash déclenché, mode anti-yeux rouges." -#: libexif/canon/mnote-canon-entry.c:140 +#: libexif/canon/mnote-canon-entry.c:97 msgid "external" msgstr "" -#: libexif/canon/mnote-canon-entry.c:148 -msgid " / Continuous drive mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:151 +#: libexif/canon/mnote-canon-entry.c:99 msgid "single or timer" msgstr "" -#: libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:100 msgid "continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:162 -msgid " / Focus mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:165 +#: libexif/canon/mnote-canon-entry.c:102 msgid "One-Shot" msgstr "" -#: libexif/canon/mnote-canon-entry.c:168 +#: libexif/canon/mnote-canon-entry.c:103 msgid "AI Servo" msgstr "" -#: libexif/canon/mnote-canon-entry.c:171 +#: libexif/canon/mnote-canon-entry.c:104 msgid "AI Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:174 libexif/canon/mnote-canon-entry.c:183 +#: libexif/canon/mnote-canon-entry.c:105 libexif/canon/mnote-canon-entry.c:108 msgid "MF" msgstr "" -#: libexif/canon/mnote-canon-entry.c:177 libexif/canon/mnote-canon-entry.c:423 +#: libexif/canon/mnote-canon-entry.c:106 libexif/canon/mnote-canon-entry.c:162 msgid "Single" msgstr "" -#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:426 +#: libexif/canon/mnote-canon-entry.c:107 libexif/canon/mnote-canon-entry.c:163 msgid "Continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:191 -msgid " / Image size : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:194 +#: libexif/canon/mnote-canon-entry.c:110 #, fuzzy msgid "Large" msgstr "moyenne" -#: libexif/canon/mnote-canon-entry.c:197 +#: libexif/canon/mnote-canon-entry.c:111 msgid "Medium" msgstr "" -#: libexif/canon/mnote-canon-entry.c:200 +#: libexif/canon/mnote-canon-entry.c:112 msgid "Small" msgstr "" -#: libexif/canon/mnote-canon-entry.c:208 -msgid " / Easy shooting mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:211 +#: libexif/canon/mnote-canon-entry.c:114 msgid "Full Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:220 +#: libexif/canon/mnote-canon-entry.c:117 #, fuzzy msgid "Fast Shutter" msgstr "obturation" -#: libexif/canon/mnote-canon-entry.c:223 +#: libexif/canon/mnote-canon-entry.c:118 #, fuzzy msgid "Slow Shutter" msgstr "obturation" -#: libexif/canon/mnote-canon-entry.c:226 +#: libexif/canon/mnote-canon-entry.c:119 #, fuzzy msgid "Night" msgstr "Scène de nuit" -#: libexif/canon/mnote-canon-entry.c:229 +#: libexif/canon/mnote-canon-entry.c:120 #: libexif/pentax/mnote-pentax-entry.c:114 msgid "Black & White" msgstr "" -#: libexif/canon/mnote-canon-entry.c:232 +#: libexif/canon/mnote-canon-entry.c:121 #: libexif/pentax/mnote-pentax-entry.c:115 msgid "Sepia" msgstr "" -#: libexif/canon/mnote-canon-entry.c:238 +#: libexif/canon/mnote-canon-entry.c:123 #, fuzzy msgid "Sports" msgstr "Spot" -#: libexif/canon/mnote-canon-entry.c:241 +#: libexif/canon/mnote-canon-entry.c:124 msgid "Macro / Close-Up" msgstr "" -#: libexif/canon/mnote-canon-entry.c:244 +#: libexif/canon/mnote-canon-entry.c:125 msgid "Pan Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:252 -#, fuzzy -msgid " / Contrast : " -msgstr "Contraste" - -#: libexif/canon/mnote-canon-entry.c:255 libexif/canon/mnote-canon-entry.c:272 -#: libexif/canon/mnote-canon-entry.c:289 +#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:135 #: libexif/pentax/mnote-pentax-entry.c:98 #: libexif/pentax/mnote-pentax-entry.c:103 msgid "Low" msgstr "" -#: libexif/canon/mnote-canon-entry.c:261 libexif/canon/mnote-canon-entry.c:278 -#: libexif/canon/mnote-canon-entry.c:295 +#: libexif/canon/mnote-canon-entry.c:129 libexif/canon/mnote-canon-entry.c:133 +#: libexif/canon/mnote-canon-entry.c:137 #: libexif/pentax/mnote-pentax-entry.c:99 #: libexif/pentax/mnote-pentax-entry.c:104 msgid "High" msgstr "" -#: libexif/canon/mnote-canon-entry.c:269 -#, fuzzy -msgid " / Saturation : " -msgstr "Saturation" - -#: libexif/canon/mnote-canon-entry.c:286 -#, fuzzy -msgid " / Sharpness : " -msgstr "Netteté" - -#: libexif/canon/mnote-canon-entry.c:304 -msgid " / ISO : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:310 +#: libexif/canon/mnote-canon-entry.c:140 msgid "50" msgstr "" -#: libexif/canon/mnote-canon-entry.c:313 +#: libexif/canon/mnote-canon-entry.c:141 #: libexif/pentax/mnote-pentax-entry.c:107 #: libexif/pentax/mnote-pentax-entry.c:109 msgid "100" msgstr "" -#: libexif/canon/mnote-canon-entry.c:316 +#: libexif/canon/mnote-canon-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:108 #: libexif/pentax/mnote-pentax-entry.c:110 msgid "200" msgstr "" -#: libexif/canon/mnote-canon-entry.c:319 +#: libexif/canon/mnote-canon-entry.c:143 msgid "400" msgstr "" -#: libexif/canon/mnote-canon-entry.c:328 -#, fuzzy -msgid " / Metering mode : " -msgstr "Mode de mesure" - -#: libexif/canon/mnote-canon-entry.c:331 +#: libexif/canon/mnote-canon-entry.c:145 msgid "Evaluative" msgstr "" -#: libexif/canon/mnote-canon-entry.c:337 +#: libexif/canon/mnote-canon-entry.c:147 #, fuzzy msgid "Center-weighted" msgstr "Centre pondéré" -#: libexif/canon/mnote-canon-entry.c:345 -msgid " / AF point selected : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:348 +#: libexif/canon/mnote-canon-entry.c:149 msgid "none (MF)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:351 +#: libexif/canon/mnote-canon-entry.c:150 msgid "auto-selected" msgstr "" -#: libexif/canon/mnote-canon-entry.c:354 +#: libexif/canon/mnote-canon-entry.c:151 #, fuzzy msgid "right" msgstr "Copyright" -#: libexif/canon/mnote-canon-entry.c:357 +#: libexif/canon/mnote-canon-entry.c:152 #, fuzzy msgid "center" msgstr "centré" -#: libexif/canon/mnote-canon-entry.c:360 +#: libexif/canon/mnote-canon-entry.c:153 msgid "left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:363 -#, c-format -msgid "0x%x???" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:368 -#, fuzzy -msgid " / Exposure mode : " -msgstr "Mode d'exposition" - -#: libexif/canon/mnote-canon-entry.c:371 +#: libexif/canon/mnote-canon-entry.c:155 msgid "Easy shooting" msgstr "" -#: libexif/canon/mnote-canon-entry.c:374 +#: libexif/canon/mnote-canon-entry.c:156 msgid "Program" msgstr "" -#: libexif/canon/mnote-canon-entry.c:377 +#: libexif/canon/mnote-canon-entry.c:157 msgid "Tv-priority" msgstr "" -#: libexif/canon/mnote-canon-entry.c:380 +#: libexif/canon/mnote-canon-entry.c:158 #, fuzzy msgid "Av-priority" msgstr "Priorité ouverture" -#: libexif/canon/mnote-canon-entry.c:386 +#: libexif/canon/mnote-canon-entry.c:160 msgid "A-DEP" msgstr "" -#: libexif/canon/mnote-canon-entry.c:394 +#: libexif/canon/mnote-canon-entry.c:173 +#, fuzzy +msgid "Macro mode" +msgstr "Macro" + +#: libexif/canon/mnote-canon-entry.c:174 +msgid " / Flash mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:175 +msgid " / Continuous drive mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:176 +msgid " / Focus mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:177 +msgid " / Image size : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:178 +msgid " / Easy shooting mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:179 +#, fuzzy +msgid " / Contrast : " +msgstr "Contraste" + +#: libexif/canon/mnote-canon-entry.c:180 +#, fuzzy +msgid " / Saturation : " +msgstr "Saturation" + +#: libexif/canon/mnote-canon-entry.c:181 +#, fuzzy +msgid " / Sharpness : " +msgstr "Netteté" + +#: libexif/canon/mnote-canon-entry.c:182 +msgid " / ISO : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:183 +#, fuzzy +msgid " / Metering mode : " +msgstr "Mode de mesure" + +#: libexif/canon/mnote-canon-entry.c:184 +msgid " / AF point selected : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:185 +#, fuzzy +msgid " / Exposure mode : " +msgstr "Mode d'exposition" + +#: libexif/canon/mnote-canon-entry.c:186 +#, fuzzy +msgid " / Focus mode2 : " +msgstr "Mode d'exposition" + +#: libexif/canon/mnote-canon-entry.c:211 +#, c-format +msgid " / Self Timer : %i (ms)" +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:216 #, c-format msgid " / long focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:398 +#: libexif/canon/mnote-canon-entry.c:220 #, c-format msgid " / short focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:402 +#: libexif/canon/mnote-canon-entry.c:224 #, c-format msgid " / focal units per mm : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:406 +#: libexif/canon/mnote-canon-entry.c:228 msgid " / Flash details : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:408 +#: libexif/canon/mnote-canon-entry.c:230 msgid "External E-TTL" msgstr "" -#: libexif/canon/mnote-canon-entry.c:410 +#: libexif/canon/mnote-canon-entry.c:232 msgid "Internal flash" msgstr "" -#: libexif/canon/mnote-canon-entry.c:412 +#: libexif/canon/mnote-canon-entry.c:234 msgid "FP sync used" msgstr "" -#: libexif/canon/mnote-canon-entry.c:414 +#: libexif/canon/mnote-canon-entry.c:236 msgid "FP sync enabled" msgstr "" -#: libexif/canon/mnote-canon-entry.c:420 -#, fuzzy -msgid " / Focus mode2 : " -msgstr "Mode d'exposition" - -#: libexif/canon/mnote-canon-entry.c:456 +#: libexif/canon/mnote-canon-entry.c:285 #, fuzzy msgid "White balance : " msgstr "Balance des blancs" -#: libexif/canon/mnote-canon-entry.c:459 +#: libexif/canon/mnote-canon-entry.c:288 #: libexif/olympus/mnote-olympus-entry.c:116 #: libexif/olympus/mnote-olympus-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:65 @@ -2361,67 +2358,67 @@ msgstr "Balance des blancs" msgid "Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:462 +#: libexif/canon/mnote-canon-entry.c:291 #, fuzzy msgid "Sunny" msgstr "ensoleillé" -#: libexif/canon/mnote-canon-entry.c:465 +#: libexif/canon/mnote-canon-entry.c:294 #: libexif/olympus/mnote-olympus-entry.c:121 #, fuzzy msgid "Cloudy" msgstr "nuageux" -#: libexif/canon/mnote-canon-entry.c:471 +#: libexif/canon/mnote-canon-entry.c:300 #, fuzzy msgid "Flourescent" msgstr "Fluorescent" -#: libexif/canon/mnote-canon-entry.c:477 +#: libexif/canon/mnote-canon-entry.c:306 #: libexif/pentax/mnote-pentax-entry.c:74 #, fuzzy msgid "Custom" msgstr "Processus personnel" -#: libexif/canon/mnote-canon-entry.c:485 +#: libexif/canon/mnote-canon-entry.c:314 #, c-format msgid " / Sequence number : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:491 +#: libexif/canon/mnote-canon-entry.c:320 msgid " / AF point used : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:493 +#: libexif/canon/mnote-canon-entry.c:322 #, fuzzy msgid "Right" msgstr "Lumière du jour" -#: libexif/canon/mnote-canon-entry.c:495 +#: libexif/canon/mnote-canon-entry.c:324 #, fuzzy msgid "Center" msgstr "Centimère" -#: libexif/canon/mnote-canon-entry.c:497 +#: libexif/canon/mnote-canon-entry.c:326 msgid "Left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:498 +#: libexif/canon/mnote-canon-entry.c:327 #, c-format msgid " (%u available focus point)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:506 +#: libexif/canon/mnote-canon-entry.c:335 #, fuzzy, c-format msgid " / Flash bias : %.2f EV" msgstr "Flash" -#: libexif/canon/mnote-canon-entry.c:511 +#: libexif/canon/mnote-canon-entry.c:340 #, fuzzy, c-format msgid " / Subject Distance (mm) : %u" msgstr "Distance au sujet" -#: libexif/canon/mnote-canon-entry.c:564 +#: libexif/canon/mnote-canon-entry.c:393 #, c-format msgid "C.F%d : %u" msgstr "" Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -d -r1.25 -r1.26 --- de.po 11 Jul 2005 20:31:39 -0000 1.25 +++ de.po 14 Jul 2005 22:13:43 -0000 1.26 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-03 13:31+0200\n" +"POT-Creation-Date: 2005-07-11 22:36+0200\n" "PO-Revision-Date: 2005-03-17 05:04+0100\n" "Last-Translator: Marcus Meissner <ma...@je...>\n" "Language-Team: deutsch <de...@li...>\n" @@ -159,12 +159,12 @@ msgid "Standard" msgstr "Standard" #: libexif/exif-entry.c:406 libexif/exif-entry.c:483 -#: libexif/canon/mnote-canon-entry.c:217 +#: libexif/canon/mnote-canon-entry.c:116 msgid "Landscape" msgstr "Landschaft" #: libexif/exif-entry.c:406 libexif/exif-entry.c:481 -#: libexif/canon/mnote-canon-entry.c:235 +#: libexif/canon/mnote-canon-entry.c:122 msgid "Portrait" msgstr "Portrait" @@ -174,8 +174,8 @@ msgstr "Nachtszene" #: libexif/exif-entry.c:409 libexif/exif-entry.c:412 libexif/exif-entry.c:413 #: libexif/exif-entry.c:414 libexif/exif-entry.c:473 -#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:258 -#: libexif/canon/mnote-canon-entry.c:275 libexif/canon/mnote-canon-entry.c:292 +#: libexif/canon/mnote-canon-entry.c:88 libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:132 libexif/canon/mnote-canon-entry.c:136 #: libexif/olympus/mnote-olympus-entry.c:103 #: libexif/olympus/mnote-olympus-entry.c:148 #: libexif/olympus/mnote-olympus-entry.c:154 @@ -258,7 +258,7 @@ msgstr "Mehr-Punkt" msgid "Pattern" msgstr "Raster" -#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:334 +#: libexif/exif-entry.c:432 libexif/canon/mnote-canon-entry.c:146 msgid "Partial" msgstr "Partiell" @@ -291,13 +291,13 @@ msgstr "Leuchstoffröhre" msgid "Tungsten incandescent light" msgstr "weiÃglühendes Wolfram Licht" -#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:468 +#: libexif/exif-entry.c:444 libexif/canon/mnote-canon-entry.c:297 #: libexif/pentax/mnote-pentax-entry.c:87 msgid "Tungsten" msgstr "Wolframlicht" #: libexif/exif-entry.c:445 libexif/exif-tag.c:439 -#: libexif/canon/mnote-canon-entry.c:474 +#: libexif/canon/mnote-canon-entry.c:303 msgid "Flash" msgstr "Blitz" @@ -377,8 +377,8 @@ msgstr "Zentimeter" msgid "cm" msgstr "cm" -#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:214 -#: libexif/canon/mnote-canon-entry.c:383 +#: libexif/exif-entry.c:472 libexif/canon/mnote-canon-entry.c:115 +#: libexif/canon/mnote-canon-entry.c:159 #: libexif/olympus/mnote-olympus-entry.c:76 #: libexif/pentax/mnote-pentax-entry.c:67 #: libexif/pentax/mnote-pentax-entry.c:89 @@ -562,7 +562,7 @@ msgstr "" msgid "?" msgstr "?" -#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:98 +#: libexif/exif-entry.c:523 libexif/canon/mnote-canon-entry.c:87 #: libexif/olympus/mnote-olympus-tag.c:107 msgid "Macro" msgstr "Macro" @@ -1982,330 +1982,328 @@ msgstr "Ungültige Anzahl von Komponente msgid "Invalid number of components (%i, expected %i or %i)." msgstr "Ungültige Anzahl von Komponenten (%i, %i wurden erwartet)." -#: libexif/canon/mnote-canon-entry.c:95 -msgid "Macro mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:143 -#: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:186 -#: libexif/canon/mnote-canon-entry.c:203 libexif/canon/mnote-canon-entry.c:247 -#: libexif/canon/mnote-canon-entry.c:264 libexif/canon/mnote-canon-entry.c:281 -#: libexif/canon/mnote-canon-entry.c:298 libexif/canon/mnote-canon-entry.c:322 -#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:389 -#: libexif/canon/mnote-canon-entry.c:429 libexif/canon/mnote-canon-entry.c:480 +#: libexif/canon/mnote-canon-entry.c:89 libexif/canon/mnote-canon-entry.c:98 +#: libexif/canon/mnote-canon-entry.c:101 libexif/canon/mnote-canon-entry.c:109 +#: libexif/canon/mnote-canon-entry.c:113 libexif/canon/mnote-canon-entry.c:126 +#: libexif/canon/mnote-canon-entry.c:130 libexif/canon/mnote-canon-entry.c:134 +#: libexif/canon/mnote-canon-entry.c:138 libexif/canon/mnote-canon-entry.c:144 +#: libexif/canon/mnote-canon-entry.c:148 libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:161 libexif/canon/mnote-canon-entry.c:164 +#: libexif/canon/mnote-canon-entry.c:309 #, c-format msgid "%i???" msgstr "" -#: libexif/canon/mnote-canon-entry.c:111 -#, c-format -msgid " / Self Timer : %i (ms)" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:116 -msgid " / Flash mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:119 +#: libexif/canon/mnote-canon-entry.c:90 #, fuzzy msgid "Flash not fired" msgstr "Blitz löste nicht aus." -#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:307 +#: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:139 msgid "auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:125 +#: libexif/canon/mnote-canon-entry.c:92 msgid "on" msgstr "" -#: libexif/canon/mnote-canon-entry.c:128 +#: libexif/canon/mnote-canon-entry.c:93 msgid "red eyes reduction" msgstr "" -#: libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:94 msgid "slow synchro" msgstr "" -#: libexif/canon/mnote-canon-entry.c:134 -msgid "auto + red eyes reduction" -msgstr "" +#: libexif/canon/mnote-canon-entry.c:95 +#, fuzzy +msgid "auto + red yes reduction" +msgstr "Blitz ausgelöst, automatischer Modus, Rote Augen Reduktions Modus." -#: libexif/canon/mnote-canon-entry.c:137 +#: libexif/canon/mnote-canon-entry.c:96 msgid "on + red eyes reduction" msgstr "" -#: libexif/canon/mnote-canon-entry.c:140 +#: libexif/canon/mnote-canon-entry.c:97 msgid "external" msgstr "" -#: libexif/canon/mnote-canon-entry.c:148 -msgid " / Continuous drive mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:151 +#: libexif/canon/mnote-canon-entry.c:99 msgid "single or timer" msgstr "" -#: libexif/canon/mnote-canon-entry.c:154 +#: libexif/canon/mnote-canon-entry.c:100 msgid "continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:162 -msgid " / Focus mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:165 +#: libexif/canon/mnote-canon-entry.c:102 msgid "One-Shot" msgstr "" -#: libexif/canon/mnote-canon-entry.c:168 +#: libexif/canon/mnote-canon-entry.c:103 msgid "AI Servo" msgstr "" -#: libexif/canon/mnote-canon-entry.c:171 +#: libexif/canon/mnote-canon-entry.c:104 msgid "AI Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:174 libexif/canon/mnote-canon-entry.c:183 +#: libexif/canon/mnote-canon-entry.c:105 libexif/canon/mnote-canon-entry.c:108 msgid "MF" msgstr "" -#: libexif/canon/mnote-canon-entry.c:177 libexif/canon/mnote-canon-entry.c:423 +#: libexif/canon/mnote-canon-entry.c:106 libexif/canon/mnote-canon-entry.c:162 msgid "Single" msgstr "" -#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:426 +#: libexif/canon/mnote-canon-entry.c:107 libexif/canon/mnote-canon-entry.c:163 msgid "Continuous" msgstr "" -#: libexif/canon/mnote-canon-entry.c:191 -msgid " / Image size : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:194 +#: libexif/canon/mnote-canon-entry.c:110 msgid "Large" msgstr "" -#: libexif/canon/mnote-canon-entry.c:197 +#: libexif/canon/mnote-canon-entry.c:111 msgid "Medium" msgstr "" -#: libexif/canon/mnote-canon-entry.c:200 +#: libexif/canon/mnote-canon-entry.c:112 msgid "Small" msgstr "" -#: libexif/canon/mnote-canon-entry.c:208 -msgid " / Easy shooting mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:211 +#: libexif/canon/mnote-canon-entry.c:114 msgid "Full Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:220 +#: libexif/canon/mnote-canon-entry.c:117 msgid "Fast Shutter" msgstr "" -#: libexif/canon/mnote-canon-entry.c:223 +#: libexif/canon/mnote-canon-entry.c:118 msgid "Slow Shutter" msgstr "" -#: libexif/canon/mnote-canon-entry.c:226 +#: libexif/canon/mnote-canon-entry.c:119 #, fuzzy msgid "Night" msgstr "Lichtquelle" -#: libexif/canon/mnote-canon-entry.c:229 +#: libexif/canon/mnote-canon-entry.c:120 #: libexif/pentax/mnote-pentax-entry.c:114 msgid "Black & White" msgstr "" -#: libexif/canon/mnote-canon-entry.c:232 +#: libexif/canon/mnote-canon-entry.c:121 #: libexif/pentax/mnote-pentax-entry.c:115 msgid "Sepia" msgstr "" -#: libexif/canon/mnote-canon-entry.c:238 +#: libexif/canon/mnote-canon-entry.c:123 #, fuzzy msgid "Sports" msgstr "Weich" -#: libexif/canon/mnote-canon-entry.c:241 +#: libexif/canon/mnote-canon-entry.c:124 msgid "Macro / Close-Up" msgstr "" -#: libexif/canon/mnote-canon-entry.c:244 +#: libexif/canon/mnote-canon-entry.c:125 msgid "Pan Focus" msgstr "" -#: libexif/canon/mnote-canon-entry.c:252 -#, fuzzy -msgid " / Contrast : " -msgstr "Kontrast" - -#: libexif/canon/mnote-canon-entry.c:255 libexif/canon/mnote-canon-entry.c:272 -#: libexif/canon/mnote-canon-entry.c:289 +#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:131 +#: libexif/canon/mnote-canon-entry.c:135 #: libexif/pentax/mnote-pentax-entry.c:98 #: libexif/pentax/mnote-pentax-entry.c:103 msgid "Low" msgstr "" -#: libexif/canon/mnote-canon-entry.c:261 libexif/canon/mnote-canon-entry.c:278 -#: libexif/canon/mnote-canon-entry.c:295 +#: libexif/canon/mnote-canon-entry.c:129 libexif/canon/mnote-canon-entry.c:133 +#: libexif/canon/mnote-canon-entry.c:137 #: libexif/pentax/mnote-pentax-entry.c:99 #: libexif/pentax/mnote-pentax-entry.c:104 msgid "High" msgstr "" -#: libexif/canon/mnote-canon-entry.c:269 -#, fuzzy -msgid " / Saturation : " -msgstr "Sättigung" - -#: libexif/canon/mnote-canon-entry.c:286 -#, fuzzy -msgid " / Sharpness : " -msgstr "Schärfe" - -#: libexif/canon/mnote-canon-entry.c:304 -msgid " / ISO : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:310 +#: libexif/canon/mnote-canon-entry.c:140 msgid "50" msgstr "" -#: libexif/canon/mnote-canon-entry.c:313 +#: libexif/canon/mnote-canon-entry.c:141 #: libexif/pentax/mnote-pentax-entry.c:107 #: libexif/pentax/mnote-pentax-entry.c:109 msgid "100" msgstr "" -#: libexif/canon/mnote-canon-entry.c:316 +#: libexif/canon/mnote-canon-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:108 #: libexif/pentax/mnote-pentax-entry.c:110 msgid "200" msgstr "" -#: libexif/canon/mnote-canon-entry.c:319 +#: libexif/canon/mnote-canon-entry.c:143 msgid "400" msgstr "" -#: libexif/canon/mnote-canon-entry.c:328 -msgid " / Metering mode : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:331 +#: libexif/canon/mnote-canon-entry.c:145 msgid "Evaluative" msgstr "" -#: libexif/canon/mnote-canon-entry.c:337 +#: libexif/canon/mnote-canon-entry.c:147 #, fuzzy msgid "Center-weighted" msgstr "zentriert" -#: libexif/canon/mnote-canon-entry.c:345 -msgid " / AF point selected : " -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:348 +#: libexif/canon/mnote-canon-entry.c:149 msgid "none (MF)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:351 +#: libexif/canon/mnote-canon-entry.c:150 msgid "auto-selected" msgstr "" -#: libexif/canon/mnote-canon-entry.c:354 +#: libexif/canon/mnote-canon-entry.c:151 #, fuzzy msgid "right" msgstr "Copyright" -#: libexif/canon/mnote-canon-entry.c:357 +#: libexif/canon/mnote-canon-entry.c:152 #, fuzzy msgid "center" msgstr "zentriert" -#: libexif/canon/mnote-canon-entry.c:360 +#: libexif/canon/mnote-canon-entry.c:153 msgid "left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:363 -#, c-format -msgid "0x%x???" -msgstr "" - -#: libexif/canon/mnote-canon-entry.c:368 -#, fuzzy -msgid " / Exposure mode : " -msgstr "Belichtungsart" - -#: libexif/canon/mnote-canon-entry.c:371 +#: libexif/canon/mnote-canon-entry.c:155 msgid "Easy shooting" msgstr "" -#: libexif/canon/mnote-canon-entry.c:374 +#: libexif/canon/mnote-canon-entry.c:156 msgid "Program" msgstr "" -#: libexif/canon/mnote-canon-entry.c:377 +#: libexif/canon/mnote-canon-entry.c:157 msgid "Tv-priority" msgstr "" -#: libexif/canon/mnote-canon-entry.c:380 +#: libexif/canon/mnote-canon-entry.c:158 msgid "Av-priority" msgstr "" -#: libexif/canon/mnote-canon-entry.c:386 +#: libexif/canon/mnote-canon-entry.c:160 msgid "A-DEP" msgstr "" -#: libexif/canon/mnote-canon-entry.c:394 +#: libexif/canon/mnote-canon-entry.c:173 +#, fuzzy +msgid "Macro mode" +msgstr "Macro" + +#: libexif/canon/mnote-canon-entry.c:174 +msgid " / Flash mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:175 +msgid " / Continuous drive mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:176 +msgid " / Focus mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:177 +msgid " / Image size : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:178 +msgid " / Easy shooting mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:179 +#, fuzzy +msgid " / Contrast : " +msgstr "Kontrast" + +#: libexif/canon/mnote-canon-entry.c:180 +#, fuzzy +msgid " / Saturation : " +msgstr "Sättigung" + +#: libexif/canon/mnote-canon-entry.c:181 +#, fuzzy +msgid " / Sharpness : " +msgstr "Schärfe" + +#: libexif/canon/mnote-canon-entry.c:182 +msgid " / ISO : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:183 +msgid " / Metering mode : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:184 +msgid " / AF point selected : " +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:185 +#, fuzzy +msgid " / Exposure mode : " +msgstr "Belichtungsart" + +#: libexif/canon/mnote-canon-entry.c:186 +#, fuzzy +msgid " / Focus mode2 : " +msgstr "Belichtungsart" + +#: libexif/canon/mnote-canon-entry.c:211 +#, c-format +msgid " / Self Timer : %i (ms)" +msgstr "" + +#: libexif/canon/mnote-canon-entry.c:216 #, c-format msgid " / long focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:398 +#: libexif/canon/mnote-canon-entry.c:220 #, c-format msgid " / short focal length of lens (in focal units) : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:402 +#: libexif/canon/mnote-canon-entry.c:224 #, c-format msgid " / focal units per mm : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:406 +#: libexif/canon/mnote-canon-entry.c:228 msgid " / Flash details : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:408 +#: libexif/canon/mnote-canon-entry.c:230 msgid "External E-TTL" msgstr "" -#: libexif/canon/mnote-canon-entry.c:410 +#: libexif/canon/mnote-canon-entry.c:232 msgid "Internal flash" msgstr "" -#: libexif/canon/mnote-canon-entry.c:412 +#: libexif/canon/mnote-canon-entry.c:234 msgid "FP sync used" msgstr "" -#: libexif/canon/mnote-canon-entry.c:414 +#: libexif/canon/mnote-canon-entry.c:236 msgid "FP sync enabled" msgstr "" -#: libexif/canon/mnote-canon-entry.c:420 -#, fuzzy -msgid " / Focus mode2 : " -msgstr "Belichtungsart" - -#: libexif/canon/mnote-canon-entry.c:456 +#: libexif/canon/mnote-canon-entry.c:285 msgid "White balance : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:459 +#: libexif/canon/mnote-canon-entry.c:288 #: libexif/olympus/mnote-olympus-entry.c:116 #: libexif/olympus/mnote-olympus-entry.c:142 #: libexif/pentax/mnote-pentax-entry.c:65 @@ -2315,65 +2313,65 @@ msgstr "" msgid "Auto" msgstr "" -#: libexif/canon/mnote-canon-entry.c:462 +#: libexif/canon/mnote-canon-entry.c:291 msgid "Sunny" msgstr "" -#: libexif/canon/mnote-canon-entry.c:465 +#: libexif/canon/mnote-canon-entry.c:294 #: libexif/olympus/mnote-olympus-entry.c:121 #, fuzzy msgid "Cloudy" msgstr "Wolkiges Wetter" -#: libexif/canon/mnote-canon-entry.c:471 +#: libexif/canon/mnote-canon-entry.c:300 #, fuzzy msgid "Flourescent" msgstr "Dateiquelle" -#: libexif/canon/mnote-canon-entry.c:477 +#: libexif/canon/mnote-canon-entry.c:306 #: libexif/pentax/mnote-pentax-entry.c:74 msgid "Custom" msgstr "" -#: libexif/canon/mnote-canon-entry.c:485 +#: libexif/canon/mnote-canon-entry.c:314 #, c-format msgid " / Sequence number : %u" msgstr "" -#: libexif/canon/mnote-canon-entry.c:491 +#: libexif/canon/mnote-canon-entry.c:320 msgid " / AF point used : " msgstr "" -#: libexif/canon/mnote-canon-entry.c:493 +#: libexif/canon/mnote-canon-entry.c:322 #, fuzzy msgid "Right" msgstr "Tageslicht" -#: libexif/canon/mnote-canon-entry.c:495 +#: libexif/canon/mnote-canon-entry.c:324 #, fuzzy msgid "Center" msgstr "Zentimeter" -#: libexif/canon/mnote-canon-entry.c:497 +#: libexif/canon/mnote-canon-entry.c:326 msgid "Left" msgstr "" -#: libexif/canon/mnote-canon-entry.c:498 +#: libexif/canon/mnote-canon-entry.c:327 #, c-format msgid " (%u available focus point)" msgstr "" -#: libexif/canon/mnote-canon-entry.c:506 +#: libexif/canon/mnote-canon-entry.c:335 #, fuzzy, c-format msgid " / Flash bias : %.2f EV" msgstr "Blitz" -#: libexif/canon/mnote-canon-entry.c:511 +#: libexif/canon/mnote-canon-entry.c:340 #, fuzzy, c-format msgid " / Subject Distance (mm) : %u" msgstr "Entfernung des Objekts" -#: libexif/canon/mnote-canon-entry.c:564 +#: libexif/canon/mnote-canon-entry.c:393 #, c-format msgid "C.F%d : %u" msgstr "" |
|
From: Lutz M. <lu...@us...> - 2005-07-11 20:32:50
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29991 Modified Files: ChangeLog Log Message: 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: * po/de.po: * po/fr.po: * po/es.po: Added license. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.219 retrieving revision 1.220 diff -u -p -d -r1.219 -r1.220 --- ChangeLog 1 Jul 2005 23:28:44 -0000 1.219 +++ ChangeLog 11 Jul 2005 20:31:34 -0000 1.220 @@ -1,3 +1,10 @@ +2005-07-11 Lutz Mueller <lu...@us...> + + * libexif/exif-loader.c: + * po/de.po: + * po/fr.po: + * po/es.po: Added license. + 2005-07-02 Lutz Mueller <lu...@us...> * libexif/exif-data.c: Prevent infinite recursions (#1196787). |
|
From: Lutz M. <lu...@us...> - 2005-07-11 20:32:49
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29991/po Modified Files: de.po es.po fr.po Log Message: 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: * po/de.po: * po/fr.po: * po/es.po: Added license. Index: es.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/es.po,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -d -r1.14 -r1.15 --- es.po 16 Jun 2005 17:57:55 -0000 1.14 +++ es.po 11 Jul 2005 20:31:52 -0000 1.15 @@ -1,6 +1,8 @@ # libexif Spanish Translation. -# Copyright © 2002 Free Software Foundation, Inc. -# Fabian Mandelbaum <fa...@ma...>, 2002. +# Copyright: +# Free Software Foundation, Inc., 2002 +# Fabian Mandelbaum <fa...@ma...>, 2002 +# This file is distributed under the same license as the libexif package. # msgid "" msgstr "" Index: fr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/fr.po,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- fr.po 16 Jun 2005 17:57:56 -0000 1.15 +++ fr.po 11 Jul 2005 20:31:57 -0000 1.16 @@ -1,7 +1,8 @@ # LIBEXIF PO FILE -# Copyright © 2002 Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# Arnaud Launay <as...@la...>, 2002. +# Copyright: +# Free Software Foundation, Inc., 2002 +# Arnaud Launay <as...@la...>, 2002 +# This file is distributed under the same license as the libexif package. # msgid "" msgstr "" Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -d -r1.24 -r1.25 --- de.po 16 Jun 2005 17:57:55 -0000 1.24 +++ de.po 11 Jul 2005 20:31:39 -0000 1.25 @@ -1,8 +1,10 @@ # translation of de.po to deutsch # German Translation -# Copyright © YEAR Free Software Foundation, Inc. -# Lutz Müller <lu...@us...>, 2002. -# Marcus Meissner <ma...@je...>, 2004, 2005. +# Copyright: +# Free Software Foundation, Inc., 2002 +# Lutz Mueller <lu...@us...>, 2002 +# Marcus Meissner <ma...@je...>, 2004, 2005 +# This file is distributed under the same license as the libexif package. # msgid "" msgstr "" |
|
From: Lutz M. <lu...@us...> - 2005-07-11 20:32:26
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29991/libexif Modified Files: exif-loader.c Log Message: 2005-07-11 Lutz Mueller <lu...@us...> * libexif/exif-loader.c: * po/de.po: * po/fr.po: * po/es.po: Added license. Index: exif-loader.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -d -r1.18 -r1.19 --- exif-loader.c 30 Mar 2005 07:55:01 -0000 1.18 +++ exif-loader.c 11 Jul 2005 20:32:03 -0000 1.19 @@ -1,3 +1,23 @@ +/* exif-loader.c + * + * Copyright © 2002 Lutz Müller <lu...@us...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #include <config.h> #include <libexif/exif-loader.h> |
|
From: Jörg H. <ho...@us...> - 2005-07-05 08:29:42
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4764 Modified Files: exif-mnote-data-olympus.c exif-mnote-data-olympus.h Log Message: - fixed typo, which made the whole thing uncompileable ... - replaced constant numbers in code with their already defined names - tried to simplify code Index: exif-mnote-data-olympus.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- exif-mnote-data-olympus.h 4 Jul 2005 10:05:00 -0000 1.5 +++ exif-mnote-data-olympus.h 5 Jul 2005 08:29:32 -0000 1.6 @@ -26,7 +26,7 @@ #include <libexif/exif-byte-order.h> #include <libexif/exif-mem.h> -enum OlympusVersion {olympus=0, nikonV1=1, nikonV2=2}: +enum OlympusVersion {olympus = 0, nikonV1 = 1, nikonV2 = 2}; typedef struct _ExifMnoteDataOlympus ExifMnoteDataOlympus; Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -d -r1.24 -r1.25 --- exif-mnote-data-olympus.c 4 Jul 2005 10:05:00 -0000 1.24 +++ exif-mnote-data-olympus.c 5 Jul 2005 08:29:32 -0000 1.25 @@ -95,6 +95,7 @@ exif_mnote_data_olympus_save (ExifMnoteD * Allocate enough memory for all entries and the number of entries. */ *buf_size = 6 + 2 + 2 + n->count * 12; + o2 += 2; switch (n->version) { case olympus: *buf = exif_mem_alloc (ne->mem, *buf_size); @@ -102,7 +103,6 @@ exif_mnote_data_olympus_save (ExifMnoteD /* Write the header and the number of entries. */ strcpy ((char *)*buf, "OLYMP"); - o2 += 2; datao = n->offset; break; case nikonV1: @@ -119,7 +119,8 @@ exif_mnote_data_olympus_save (ExifMnoteD /* Write the header and the number of entries. */ strcpy ((char *)*buf, "Nikon"); (*buf)[6] = n->version; - o2 += 2; *buf_size += 2; + + *buf_size += 2; if (n->version == nikonV2) { exif_set_short (*buf + 10, n->order, (ExifShort) ( (n->order == EXIF_BYTE_ORDER_INTEL) ? @@ -131,6 +132,9 @@ exif_mnote_data_olympus_save (ExifMnoteD } datao = -10; break; + + default: + return; } exif_set_short (*buf + o2, n->order, (ExifShort) n->count); @@ -202,7 +206,7 @@ exif_mnote_data_olympus_load (ExifMnoteD "Parsing Olympus maker note..."); /* The number of entries is at position 8. */ - n->version = 0; + n->version = olympus; o2 += 8; } else if (!memcmp (buf + o2, "Nikon", 6)) { @@ -211,8 +215,7 @@ exif_mnote_data_olympus_load (ExifMnoteD "Parsing Nikon maker note (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]); - + 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]; @@ -222,12 +225,12 @@ exif_mnote_data_olympus_load (ExifMnoteD o2 += 1; switch (n->version) { - case 1: + case nikonV1: base = MNOTE_NIKON1_TAG_BASE; break; - case 2: + case nikonV2: /* Skip 2 unknown bytes (00 00). */ o2 += 2; @@ -266,7 +269,7 @@ exif_mnote_data_olympus_load (ExifMnoteD return; } } else if (!memcmp (buf + o2, "\0\x1b", 2)) { - n->version = 2; + n->version = nikonV2; } else { return; } |
|
From: Jörg H. <ho...@us...> - 2005-07-04 10:05:13
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6783 Modified Files: exif-mnote-data-olympus.c exif-mnote-data-olympus.h Log Message: - extracted constant numbers and gave them names - comment Index: exif-mnote-data-olympus.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -d -r1.4 -r1.5 --- exif-mnote-data-olympus.h 4 Oct 2004 06:26:59 -0000 1.4 +++ exif-mnote-data-olympus.h 4 Jul 2005 10:05:00 -0000 1.5 @@ -26,6 +26,9 @@ #include <libexif/exif-byte-order.h> #include <libexif/exif-mem.h> +enum OlympusVersion {olympus=0, nikonV1=1, nikonV2=2}: + + typedef struct _ExifMnoteDataOlympus ExifMnoteDataOlympus; struct _ExifMnoteDataOlympus { Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -d -r1.23 -r1.24 --- exif-mnote-data-olympus.c 5 May 2005 16:57:58 -0000 1.23 +++ exif-mnote-data-olympus.c 4 Jul 2005 10:05:00 -0000 1.24 @@ -71,6 +71,16 @@ exif_mnote_data_olympus_get_value (ExifM return mnote_olympus_entry_get_value (&n->entries[i], val, maxlen); } + + + +/** + * @brief save the MnoteData from ne to buf + * + * @param ne extract the data from this structure + * @param *buf write the mnoteData to this buffer (buffer will be allocated) + * @param buf_size the size of the buffer + */ static void exif_mnote_data_olympus_save (ExifMnoteData *ne, unsigned char **buf, unsigned int *buf_size) @@ -86,7 +96,7 @@ exif_mnote_data_olympus_save (ExifMnoteD */ *buf_size = 6 + 2 + 2 + n->count * 12; switch (n->version) { - case 0: /* Olympus */ + case olympus: *buf = exif_mem_alloc (ne->mem, *buf_size); if (!*buf) return; @@ -95,11 +105,13 @@ exif_mnote_data_olympus_save (ExifMnoteD o2 += 2; datao = n->offset; break; - case 1: /* Nikon v1 */ + case nikonV1: base = MNOTE_NIKON1_TAG_BASE; + + /* subtract the size here, so the increment in the next case will not harm us */ *buf_size -= 8; /* Fall through */ - case 2: /* Nikon v2 */ + case nikonV2: *buf_size += 8; *buf = exif_mem_alloc (ne->mem, *buf_size); if (!*buf) return; @@ -108,7 +120,7 @@ exif_mnote_data_olympus_save (ExifMnoteD strcpy ((char *)*buf, "Nikon"); (*buf)[6] = n->version; o2 += 2; *buf_size += 2; - if (n->version == 2) { + if (n->version == nikonV2) { exif_set_short (*buf + 10, n->order, (ExifShort) ( (n->order == EXIF_BYTE_ORDER_INTEL) ? ('I' << 8) | 'I' : |
|
From: Jörg H. <ho...@us...> - 2005-07-02 06:33:07
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20287 Modified Files: exif-data.c Log Message: - cleaned indentation - renamed l to recursion_depth Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -p -d -r1.83 -r1.84 --- exif-data.c 1 Jul 2005 23:28:45 -0000 1.83 +++ exif-data.c 2 Jul 2005 06:32:57 -0000 1.84 @@ -113,7 +113,10 @@ exif_data_new_mem (ExifMem *mem) data = exif_mem_alloc (mem, sizeof (ExifData)); if (!data) return (NULL); data->priv = exif_mem_alloc (mem, sizeof (ExifDataPrivate)); - if (!data->priv) { exif_mem_free (mem, data); return (NULL); } + if (!data->priv) { + exif_mem_free (mem, data); + return (NULL); + } data->priv->ref_count = 1; data->priv->mem = mem; @@ -300,7 +303,7 @@ if (data->ifd[(i)]->count) { \ static void exif_data_load_data_content (ExifData *data, ExifIfd ifd, const unsigned char *d, - unsigned int ds, unsigned int offset, unsigned int l) + unsigned int ds, unsigned int offset, unsigned int recursion_depth) { ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; ExifShort n; @@ -311,7 +314,7 @@ exif_data_load_data_content (ExifData *d if (!data || !data->priv) return; if ((ifd < 0) || (ifd >= EXIF_IFD_COUNT)) return; - if (l > 150) { + if (recursion_depth > 150) { exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", "Deep recursion detected!"); return; @@ -341,15 +344,15 @@ exif_data_load_data_content (ExifData *d switch (tag) { case EXIF_TAG_EXIF_IFD_POINTER: CHECK_REC (EXIF_IFD_EXIF); - exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, l + 1); + exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1); break; case EXIF_TAG_GPS_INFO_IFD_POINTER: CHECK_REC (EXIF_IFD_GPS); - exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, l + 1); + exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1); break; case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: CHECK_REC (EXIF_IFD_INTEROPERABILITY); - exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, l + 1); + exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1); break; case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: thumbnail_offset = o; |
|
From: Lutz M. <lu...@us...> - 2005-07-01 23:29:00
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1594/libexif Modified Files: exif-data.c Log Message: 2005-07-02 Lutz Mueller <lu...@us...> * libexif/exif-data.c: Prevent infinite recursions (#1196787). Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -p -d -r1.82 -r1.83 --- exif-data.c 1 May 2005 17:39:25 -0000 1.82 +++ exif-data.c 1 Jul 2005 23:28:45 -0000 1.83 @@ -300,7 +300,7 @@ if (data->ifd[(i)]->count) { \ static void exif_data_load_data_content (ExifData *data, ExifIfd ifd, const unsigned char *d, - unsigned int ds, unsigned int offset) + unsigned int ds, unsigned int offset, unsigned int l) { ExifLong o, thumbnail_offset = 0, thumbnail_length = 0; ExifShort n; @@ -311,6 +311,12 @@ exif_data_load_data_content (ExifData *d if (!data || !data->priv) return; if ((ifd < 0) || (ifd >= EXIF_IFD_COUNT)) return; + if (l > 150) { + exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData", + "Deep recursion detected!"); + return; + } + /* Read the number of entries */ if (offset >= ds - 1) return; n = exif_get_short (d + offset, data->priv->order); @@ -335,15 +341,15 @@ exif_data_load_data_content (ExifData *d switch (tag) { case EXIF_TAG_EXIF_IFD_POINTER: CHECK_REC (EXIF_IFD_EXIF); - exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o); + exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, l + 1); break; case EXIF_TAG_GPS_INFO_IFD_POINTER: CHECK_REC (EXIF_IFD_GPS); - exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o); + exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, l + 1); break; case EXIF_TAG_INTEROPERABILITY_IFD_POINTER: CHECK_REC (EXIF_IFD_INTEROPERABILITY); - exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o); + exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, l + 1); break; case EXIF_TAG_JPEG_INTERCHANGE_FORMAT: thumbnail_offset = o; @@ -782,7 +788,7 @@ exif_data_load_data (ExifData *data, con "IFD 0 at %i.", (int) offset); /* Parse the actual exif data (usually offset 14 from start) */ - exif_data_load_data_content (data, EXIF_IFD_0, d + 6, ds - 6, offset); + exif_data_load_data_content (data, EXIF_IFD_0, d + 6, ds - 6, offset, 0); /* IFD 1 offset */ if (offset + 6 + 2 > ds) { @@ -804,7 +810,7 @@ exif_data_load_data (ExifData *data, con return; } - exif_data_load_data_content (data, EXIF_IFD_1, d + 6, ds - 6, offset); + exif_data_load_data_content (data, EXIF_IFD_1, d + 6, ds - 6, offset, 0); } /* |
|
From: Lutz M. <lu...@us...> - 2005-07-01 23:29:00
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1594 Modified Files: ChangeLog NEWS Log Message: 2005-07-02 Lutz Mueller <lu...@us...> * libexif/exif-data.c: Prevent infinite recursions (#1196787). Index: NEWS =================================================================== RCS file: /cvsroot/libexif/libexif/NEWS,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- NEWS 26 Mar 2005 18:08:03 -0000 1.7 +++ NEWS 1 Jul 2005 23:28:44 -0000 1.8 @@ -1,6 +1,6 @@ New in CVS HEAD since 0.6.12 (2005-03-13): - * Bug fixes: #803191, #1051994, #1054321, #1054323 + * Bug fixes: #803191, #1051994, #1054321, #1054323, #1196787 * For pkg-config users, force usage of #include <libexif/exif-*.h> (disable #include <exif-.h>) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.218 retrieving revision 1.219 diff -u -p -d -r1.218 -r1.219 --- ChangeLog 20 Jun 2005 03:40:16 -0000 1.218 +++ ChangeLog 1 Jul 2005 23:28:44 -0000 1.219 @@ -1,3 +1,7 @@ +2005-07-02 Lutz Mueller <lu...@us...> + + * libexif/exif-data.c: Prevent infinite recursions (#1196787). + 2005-06-19 Hubert Figuiere <hfi...@te...> * test/Makefile.am (check_PROGRAMS): added check for make check |
|
From: Jörg H. <ho...@us...> - 2005-07-01 10:15:23
|
Update of /cvsroot/libexif/libexif/libexif/canon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30689 Modified Files: mnote-canon-entry.c Log Message: code cleanup: - reduced the big switch statement and moved the relevant data into a static structure - consistent variable checking - probably some subtile changes in the error handling Index: mnote-canon-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -d -r1.7 -r1.8 --- mnote-canon-entry.c 5 May 2005 16:57:48 -0000 1.7 +++ mnote-canon-entry.c 1 Jul 2005 10:14:56 -0000 1.8 @@ -76,12 +76,126 @@ mnote_canon_entry_get_value (const Mnote int i; unsigned char *data = entry->data; + +#define UNDEFINED 0xFF + +static struct { + int tag; + int subtag; + char* value; +} entries [] = { + {1,1,N_("Macro")}, + {1,2,N_("Normal")}, + {1,UNDEFINED,N_("%i???")}, + {4,0,N_("Flash not fired")}, + {4,1,N_("auto")}, + {4,2,N_("on")}, + {4,3,N_("red eyes reduction")}, + {4,4,N_("slow synchro")}, + {4,5,N_("auto + red yes reduction")}, + {4,6,N_("on + red eyes reduction")}, + {4,16,N_("external")}, + {4,UNDEFINED,N_("%i???")}, + {5,0,N_("single or timer")}, + {5,1,N_("continuous")}, + {5,UNDEFINED,N_("%i???")}, + {7,0,N_("One-Shot")}, + {7,1,N_("AI Servo")}, + {7,2,N_("AI Focus")}, + {7,3,N_("MF")}, + {7,4,N_("Single")}, + {7,5,N_("Continuous")}, + {7,6,N_("MF")}, + {7,UNDEFINED,N_("%i???")}, + {10,0,N_("Large")}, + {10,1,N_("Medium")}, + {10,2,N_("Small")}, + {10,UNDEFINED,N_("%i???")}, + {11,0,N_("Full Auto")}, + {11,1,N_("Manual")}, + {11,2,N_("Landscape")}, + {11,3,N_("Fast Shutter")}, + {11,4,N_("Slow Shutter")}, + {11,5,N_("Night")}, + {11,6,N_("Black & White")}, + {11,7,N_("Sepia")}, + {11,8,N_("Portrait")}, + {11,9,N_("Sports")}, + {11,10,N_("Macro / Close-Up")}, + {11,11,N_("Pan Focus")}, + {11,UNDEFINED,N_("%i???")}, + {13,0xffff,N_("Low")}, + {13,0x0000,N_("Normal")}, + {13,0x0001,N_("High")}, + {13,UNDEFINED,N_("%i???")}, + {14,0xffff,N_("Low")}, + {14,0x0000,N_("Normal")}, + {14,0x0001,N_("High")}, + {14,UNDEFINED,N_("%i???")}, + {15,0xffff,N_("Low")}, + {15,0x0000,N_("Normal")}, + {15,0x0001,N_("High")}, + {15,UNDEFINED,N_("%i???")}, + {16,15,N_("auto")}, + {16,16,N_("50")}, + {16,17,N_("100")}, + {16,18,N_("200")}, + {16,19,N_("400")}, + {16,UNDEFINED,N_("%i???")}, + {17,3,N_("Evaluative")}, + {17,4,N_("Partial")}, + {17,5,N_("Center-weighted")}, + {17,UNDEFINED,N_("%i???")}, + {19,0x3000,N_("none (MF)")}, + {19,0x3001,N_("auto-selected")}, + {19,0x3002,N_("right")}, + {19,0x3003,N_("center")}, + {19,0x3004,N_("left")}, + {19,UNDEFINED,N_("%i???")}, + {20,0,N_("Easy shooting")}, + {20,1,N_("Program")}, + {20,2,N_("Tv-priority")}, + {20,3,N_("Av-priority")}, + {20,4,N_("Manual")}, + {20,5,N_("A-DEP")}, + {20,UNDEFINED,N_("%i???")}, + {32,0,N_("Single")}, + {32,1,N_("Continuous")}, + {32,UNDEFINED,N_("%i???")}, + + {0,0,NULL} +}; + +static struct { + int index; + char* value; +} headings[] = { + {1,N_("Macro mode")}, + {4,N_(" / Flash mode : ")}, + {5,N_(" / Continuous drive mode : ")}, + {7,N_(" / Focus mode : ")}, + {10,N_(" / Image size : ")}, + {11,N_(" / Easy shooting mode : ")}, + {13,N_(" / Contrast : ")}, + {14,N_(" / Saturation : ")}, + {15,N_(" / Sharpness : ")}, + {16,N_(" / ISO : ")}, + {17,N_(" / Metering mode : ")}, + {19,N_(" / AF point selected : ")}, + {20,N_(" / Exposure mode : ")}, + {32,N_(" / Focus mode2 : ")}, + + {0,NULL} + +}; + + if (!entry) return NULL; memset (val, 0, maxlen); maxlen--; - switch (entry->tag) { + switch (entry->tag) { case MNOTE_CANON_TAG_SETTINGS_1: CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); n = exif_get_short (data, entry->order) / 2; @@ -91,351 +205,66 @@ mnote_canon_entry_get_value (const Mnote vs = exif_get_short (data, entry->order); data += 2; switch (i) { - case 1: - strncpy (val, _("Macro mode : "), maxlen); - switch (vs) { - case 1: - strncat (val, _("Macro"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("Normal"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; case 2: - if (vs) { - snprintf (buf, sizeof (buf), - _(" / Self Timer : %i (ms)"), vs*100); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 4: - strncat (val, _(" / Flash mode : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Flash not fired"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("auto"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("on"), maxlen - strlen(val)); - break; - case 3: - strncat (val, _("red eyes reduction"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("slow synchro"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("auto + red eyes reduction"), maxlen - strlen(val)); - break; - case 6: - strncat (val, _("on + red eyes reduction"), maxlen - strlen(val)); - break; - case 16: - strncat (val, _("external"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 5: - strncat (val, _(" / Continuous drive mode : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("single or timer"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("continuous"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 7: - strncat (val, _(" / Focus mode : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("One-Shot"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("AI Servo"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("AI Focus"), maxlen - strlen(val)); - break; - case 3: - strncat (val, _("MF"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("Single"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("Continuous"), maxlen - strlen(val)); - break; - case 6: - strncat (val, _("MF"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 10: - strncat (val, _(" / Image size : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Large"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("Medium"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("Small"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 11: - strncat (val, _(" / Easy shooting mode : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Full Auto"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("Manual"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("Landscape"), maxlen - strlen(val)); - break; - case 3: - strncat (val, _("Fast Shutter"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("Slow Shutter"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("Night"), maxlen - strlen(val)); - break; - case 6: - strncat (val, _("Black & White"), maxlen - strlen(val)); - break; - case 7: - strncat (val, _("Sepia"), maxlen - strlen(val)); - break; - case 8: - strncat (val, _("Portrait"), maxlen - strlen(val)); - break; - case 9: - strncat (val, _("Sports"), maxlen - strlen(val)); - break; - case 10: - strncat (val, _("Macro / Close-Up"), maxlen - strlen(val)); - break; - case 11: - strncat (val, _("Pan Focus"), maxlen - strlen(val)); + if (vs) { + snprintf (buf, sizeof (buf), + _(" / Self Timer : %i (ms)"), vs*100); + strncat (val, buf, maxlen - strlen(val)); + } break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); + case 23: + snprintf (buf, sizeof (buf), _(" / long focal length of lens (in focal units) : %u"), vs); strncat (val, buf, maxlen - strlen(val)); - } - break; - case 13: - strncat (val, _(" / Contrast : "), maxlen - strlen(val)); - switch (vs) { - case 0xffff: - strncat (val, _("Low"), maxlen - strlen(val)); - break; - case 0x0000: - strncat (val, _("Normal"), maxlen - strlen(val)); break; - case 0x0001: - strncat (val, _("High"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); + case 24: + snprintf (buf, sizeof (buf), _(" / short focal length of lens (in focal units) : %u"), vs); strncat (val, buf, maxlen - strlen(val)); - } - break; - case 14: - strncat (val, _(" / Saturation : "), maxlen - strlen(val)); - switch (vs) { - case 0xffff: - strncat (val, _("Low"), maxlen - strlen(val)); - break; - case 0x0000: - strncat (val, _("Normal"), maxlen - strlen(val)); - break; - case 0x0001: - strncat (val, _("High"), maxlen - strlen(val)); break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 15: - strncat (val, _(" / Sharpness : "), maxlen - strlen(val)); - switch (vs) { - case 0xffff: - strncat (val, _("Low"), maxlen - strlen(val)); - break; - case 0x0000: - strncat (val, _("Normal"), maxlen - strlen(val)); - break; - case 0x0001: - strncat (val, _("High"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); + case 25: + snprintf (buf, sizeof (buf), _(" / focal units per mm : %u"), vs); strncat (val, buf, maxlen - strlen(val)); - } - break; - case 16: - if (vs) { - strncat (val, _(" / ISO : "), maxlen - strlen(val)); - switch (vs) { - case 15: - strncat (val, _("auto"), maxlen - strlen(val)); - break; - case 16: - strncat (val, _("50"), maxlen - strlen(val)); - break; - case 17: - strncat (val, _("100"), maxlen - strlen(val)); - break; - case 18: - strncat (val, _("200"), maxlen - strlen(val)); - break; - case 19: - strncat (val, _("400"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } break; - } - case 17: - strncat (val, _(" / Metering mode : "), maxlen - strlen(val)); - switch (vs) { - case 3: - strncat (val, _("Evaluative"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("Partial"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("Center-weighted"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 19: - strncat (val, _(" / AF point selected : "), maxlen - strlen(val)); - switch (vs) { - case 0x3000: - strncat (val, _("none (MF)"), maxlen - strlen(val)); - break; - case 0x3001: - strncat (val, _("auto-selected"), maxlen - strlen(val)); - break; - case 0x3002: - strncat (val, _("right"), maxlen - strlen(val)); - break; - case 0x3003: - strncat (val, _("center"), maxlen - strlen(val)); - break; - case 0x3004: - strncat (val, _("left"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("0x%x???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 20: - strncat (val, _(" / Exposure mode : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Easy shooting"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("Program"), maxlen - strlen(val)); - break; - case 2: - strncat (val, _("Tv-priority"), maxlen - strlen(val)); - break; - case 3: - strncat (val, _("Av-priority"), maxlen - strlen(val)); - break; - case 4: - strncat (val, _("Manual"), maxlen - strlen(val)); - break; - case 5: - strncat (val, _("A-DEP"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); - } - break; - case 23: - snprintf (buf, sizeof (buf), _(" / long focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 24: - snprintf (buf, sizeof (buf), _(" / short focal length of lens (in focal units) : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 25: - snprintf (buf, sizeof (buf), _(" / focal units per mm : %u"), vs); - strncat (val, buf, maxlen - strlen(val)); - break; - case 29: - strncat (val, _(" / Flash details : "), maxlen - strlen(val)); - if ((vs>>14)&1) - strncat (val, _("External E-TTL"), maxlen - strlen(val)); - if ((vs>>13)&1) - strncat (val, _("Internal flash"), maxlen - strlen(val)); - if ((vs>>11)&1) - strncat (val, _("FP sync used"), maxlen - strlen(val)); - if ((vs>>4)&1) - strncat (val, _("FP sync enabled"), maxlen - strlen(val)); + case 29: + strncat (val, _(" / Flash details : "), maxlen - strlen(val)); + if ((vs>>14)&1) + strncat (val, _("External E-TTL"), maxlen - strlen(val)); + if ((vs>>13)&1) + strncat (val, _("Internal flash"), maxlen - strlen(val)); + if ((vs>>11)&1) + strncat (val, _("FP sync used"), maxlen - strlen(val)); + if ((vs>>4)&1) + strncat (val, _("FP sync enabled"), maxlen - strlen(val)); #ifdef DEBUG - printf ("Value29=0x%08x\n", vs); + printf ("Value29=0x%08x\n", vs); #endif - break; - case 32: - strncat (val, _(" / Focus mode2 : "), maxlen - strlen(val)); - switch (vs) { - case 0: - strncat (val, _("Single"), maxlen - strlen(val)); - break; - case 1: - strncat (val, _("Continuous"), maxlen - strlen(val)); - break; - default: - snprintf (buf, sizeof (buf), _("%i???"), vs); - strncat (val, buf, maxlen - strlen(val)); + break; + default: + { + int index; + int found = 0; + for (index=0; entries[index].tag <= i && entries[index].value && vs && !found; i++) { + if (entries[index].tag == i) { + int a=0; + for (a=0; headings[a].index != i; a++); + strncat (val, headings[a].value, maxlen - strlen(val)); + + if (entries[index].subtag == vs) { + strncat(val,entries[index].value, maxlen - strlen(val)); + found = 1; + } + if (entries[index].subtag == UNDEFINED) { + snprintf (buf, sizeof (buf), entries[index].value, vs); + strncat (val, buf, maxlen - strlen(val)); + found = 1; + + } } - break; -#ifdef DEBUG - default: - printf ("Value%d=%d\n", i, vs); -#endif } - } + if (!found) + printf ("Value%d=%d\n", i, vs); + } + } + } // for break; @@ -585,6 +414,5 @@ mnote_canon_entry_get_value (const Mnote #endif break; } - return val; } |
|
From: Lutz M. <lu...@us...> - 2005-06-28 05:58:35
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6016 Modified Files: README Log Message: New link. Index: README =================================================================== RCS file: /cvsroot/libexif/libexif/README,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -d -r1.11 -r1.12 --- README 30 Apr 2005 01:17:28 -0000 1.11 +++ README 28 Jun 2005 05:58:24 -0000 1.12 @@ -80,3 +80,5 @@ information about EXIF. - http://www.jeida.or.jp: Can't remember any more. Site is down as of 2002/12/31. - http://www.exif.org: information about the EXIF standard. + - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/index.html: Looks + like libexif in Perl. Seems to support a lot of MakerNotes. |
