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: Hans U. N. <hu...@us...> - 2003-08-24 17:30:07
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv4658 Modified Files: configure.in Makefile.am Log Message: fix build system Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.am 4 Aug 2003 19:51:52 -0000 1.19 +++ Makefile.am 24 Aug 2003 17:30:05 -0000 1.20 @@ -1,4 +1,4 @@ -SUBDIRS = intl m4 libexif libjpeg test po +SUBDIRS = libexif libjpeg test EXTRA_DIST = config.rpath mkinstalldirs @PACKAGE@.spec Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- configure.in 4 Aug 2003 19:51:52 -0000 1.53 +++ configure.in 24 Aug 2003 17:30:05 -0000 1.54 @@ -58,9 +58,6 @@ libexif.spec libexif/Makefile libjpeg/Makefile - intl/Makefile - m4/Makefile - po/Makefile.in test/Makefile libexif/libexif.pc ]) |
|
From: Lutz M?l. <lu...@us...> - 2003-08-23 00:26:04
|
Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1:/tmp/cvs-serv18136/exif
Modified Files:
main.c
Log Message:
2003-08-21 Lutz Mueller <lu...@us...>
* exif/exif-main.c: Patch by Roberto Costa <rob...@en...>
without ChangeLog entry. Does something with --set-value and
compiles without warnings...
Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.c 5 May 2003 21:13:44 -0000 1.35
+++ main.c 21 Aug 2003 20:55:52 -0000 1.36
@@ -49,6 +49,16 @@
#endif
static void
+internal_error (void)
+{
+ fprintf (stderr, _("Internal error. Please "
+ "contact <libexif-devel@"
+ "lists.sourceforge.net>."));
+ fputc ('\n', stderr);
+ exit (1);
+}
+
+static void
show_entry (ExifEntry *entry, const char *caption)
{
printf (_("EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"),
@@ -87,6 +97,79 @@
}
}
+static void
+convert_arg_to_entry (const char *set_value, ExifEntry *e, ExifByteOrder o)
+{
+ unsigned int i;
+ char *value_p;
+
+ /*
+ * ASCII strings are handled separately,
+ * since they don't require any conversion.
+ */
+ if (e->format == EXIF_FORMAT_ASCII) {
+ if (e->data) free (e->data);
+ e->components = strlen (e->data) + 1;
+ e->size = strlen (set_value) + 1;
+ e->data = malloc (sizeof (char) * e->size);
+ if (!e->data) {
+ fprintf (stderr, _("Not enough memory."));
+ fputc ('\n', stderr);
+ exit (1);
+ }
+ strcpy (e->data, set_value);
+ return;
+ }
+
+ value_p = (char*) set_value;
+ for (i = 0; i < e->components; i++) {
+ const char *begin, *end;
+ unsigned char *buf, s;
+ const char comp_separ = ' ';
+
+ begin = value_p;
+ value_p = index (begin, comp_separ);
+ if (!value_p) {
+ if (i != e->components - 1) {
+ fprintf (stderr, _("Too few components "
+ "specified!"));
+ fputc ('\n', stderr);
+ exit (1);
+ }
+ end = begin + strlen (begin);
+ } else end = value_p++;
+
+ buf = malloc ((end - begin + 1) * sizeof (char));
+ strncpy (buf, begin, end - begin);
+ buf[end - begin] = '\0';
+
+ s = exif_format_get_size (e->format);
+ switch (e->format) {
+ case EXIF_FORMAT_ASCII:
+ internal_error (); /* Previously handled */
+ break;
+ case EXIF_FORMAT_SHORT:
+ exif_set_short (e->data + (s * i), o, atoi (buf));
+ break;
+ case EXIF_FORMAT_LONG:
+ exif_set_long (e->data + (s * i), o, atol (buf));
+ break;
+ case EXIF_FORMAT_SLONG:
+ exif_set_slong (e->data + (s * i), o, atol (buf));
+ break;
+ case EXIF_FORMAT_RATIONAL:
+ case EXIF_FORMAT_SRATIONAL:
+ case EXIF_FORMAT_BYTE:
+ default:
+ fprintf (stderr, _("Not yet implemented!"));
+ fputc ('\n', stderr);
+ exit (1);
+ }
+
+ free (buf);
+ }
+}
+
static int
save_exif_data_to_file (ExifData *ed, const char *fname, const char *target)
{
@@ -494,91 +577,17 @@
return (1);
}
+ /* If the entry doesn't exist, create it. */
e = exif_content_get_entry (ed->ifd[ifd], tag);
if (!e) {
e = exif_entry_new ();
exif_content_add_entry (ed->ifd[ifd], e);
exif_entry_initialize (e, tag);
}
-{
- unsigned int begin = 0, end = 0, i;
- unsigned char buf[1024], s;
- ExifByteOrder o;
- o = exif_data_get_byte_order (ed);
- for (i = 0; i < e->components; i++) {
- memset (buf, 0, sizeof (buf));
- for (begin = end; end < strlen (set_value); end++) {
- if (set_value[end] == '\\') {
- end++;
- if (set_value[end] == '\\') {
- buf[strlen(buf)] = set_value[end];
- } else if (set_value[end] == ' ') {
- buf[strlen(buf)] = set_value[end];
- } else {
- fprintf (stderr, "Wrong masking! "
- "'\\\\' will be interpreted "
- "as '\\', '\\ ' as ' '. "
- "'\\' followed by anything "
- "except '\\' or ' ' is "
- "invalid.");
- fputc ('\n', stderr);
- exit (1);
- }
- } else if (set_value[end] == ' ') {
- break;
- } else
- buf[strlen(buf)] = set_value[end];
- }
- s = exif_format_get_size (e->format);
- switch (e->format) {
- case EXIF_FORMAT_BYTE:
- /* e->data[s * i] = ; */
-
- fprintf (stderr, _("Not yet implemented!"));
- fputc ('\n', stderr);
- return (1);
-
- break;
- case EXIF_FORMAT_ASCII:
- if (i != 0) {
- fprintf (stderr, _("Internal error. Please "
- "contact <libexif-devel@"
- "lists.sourceforge.net>."));
- fputc ('\n', stderr);
- return (1);
- }
- if (e->data)
- free (e->data);
- e->size = strlen (buf) + 1;
- e->data = malloc (sizeof (char) * e->size);
- if (!e->data) {
- fprintf (stderr, _("Not enough memory."));
- fputc ('\n', stderr);
- return (1);
- }
- strcpy (e->data, buf);
- e->components = strlen(e->data) + 1;
- i = e->components - 1;
- break;
- case EXIF_FORMAT_SHORT:
- exif_set_short (e->data + (s * i), o, atoi (buf));
- break;
- case EXIF_FORMAT_LONG:
- exif_set_long (e->data + (s * i), o, atol (buf));
- break;
- case EXIF_FORMAT_SLONG:
- exif_set_slong (e->data + (s * i), o, atol (buf));
- break;
- case EXIF_FORMAT_RATIONAL:
- case EXIF_FORMAT_SRATIONAL:
- default:
- fprintf (stderr, _("Not yet implemented!"));
- fputc ('\n', stderr);
- return (1);
- }
- }
-}
+ /* Now set the value and save the data. */
+ convert_arg_to_entry (set_value, e,
+ exif_data_get_byte_order (ed));
save_exif_data_to_file (ed, *args, fname);
} else if (remove_tag) {
|
|
From: Lutz M?l. <lu...@us...> - 2003-08-22 02:17:43
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1:/tmp/cvs-serv18136 Modified Files: ChangeLog Log Message: 2003-08-21 Lutz Mueller <lu...@us...> * exif/exif-main.c: Patch by Roberto Costa <rob...@en...> without ChangeLog entry. Does something with --set-value and compiles without warnings... Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ChangeLog 5 May 2003 21:13:43 -0000 1.29 +++ ChangeLog 21 Aug 2003 20:55:52 -0000 1.30 @@ -1,3 +1,9 @@ +2003-08-21 Lutz Mueller <lu...@us...> + + * exif/exif-main.c: Patch by Roberto Costa <rob...@en...> + without ChangeLog entry. Does something with --set-value and + compiles without warnings... + 2003-05-05 Lutz Mueller <lu...@us...> * exif/exif-i18n.[c,h]: New. Suggested by Gernot Jander |
|
From: Lutz M?l. <lu...@us...> - 2003-08-06 19:53:44
|
Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv6373/libexif
Modified Files:
exif-entry.c exif-tag.c exif-tag.h exif-utils.h
Log Message:
2003-08-06 Lutz Mueller <lu...@us...>
* libexif/exif-entry.c (exif_entry_initialize): Support some more
tags.
* libexif/exif-tag.[c,h]: Cosmetic fix.
* libexif/exif-utils.h: Do not let above cosmetic fix break the API.
Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- exif-entry.c 29 Jul 2003 22:19:40 -0000 1.36
+++ exif-entry.c 6 Aug 2003 19:47:53 -0000 1.37
@@ -1374,6 +1374,8 @@
exif_set_rational (
e->data + 5 * exif_format_get_size (e->format), o, r);
break;
+
+ /* ASCII, 20 components */
case EXIF_TAG_DATE_TIME:
case EXIF_TAG_DATE_TIME_ORIGINAL:
case EXIF_TAG_DATE_TIME_DIGITIZED:
@@ -1388,6 +1390,16 @@
tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
break;
+
+ /* ASCII, no default */
+ case EXIF_TAG_SUB_SEC_TIME:
+ case EXIF_TAG_SUB_SEC_TIME_ORIGINAL:
+ case EXIF_TAG_SUB_SEC_TIME_DIGITIZED:
+ e->components = 0;
+ e->format = EXIF_FORMAT_ASCII;
+ e->size = 0;
+ e->data = NULL;
+ break;
case EXIF_TAG_IMAGE_DESCRIPTION:
case EXIF_TAG_MAKE:
case EXIF_TAG_MODEL:
@@ -1409,6 +1421,7 @@
break;
/* UNDEFINED, no components, no default */
+ case EXIF_TAG_MAKER_NOTE:
case EXIF_TAG_USER_COMMENT:
e->components = 0;
e->format = EXIF_FORMAT_UNDEFINED;
Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exif-tag.c 28 Apr 2003 18:22:18 -0000 1.13
+++ exif-tag.c 6 Aug 2003 19:47:53 -0000 1.14
@@ -383,7 +383,7 @@
"When a <UserComment> area is set aside, it is recommended that "
"the ID code be ASCII and that the following user comment "
"part be filled with blank characters [20.H].")},
- {EXIF_TAG_SUBSEC_TIME, "SubsecTime", "SubsecTime",
+ {EXIF_TAG_SUB_SEC_TIME, "SubsecTime", "SubsecTime",
N_("A tag used to record fractions of seconds for the "
"<DateTime> tag.")},
{EXIF_TAG_SUB_SEC_TIME_ORIGINAL, "SubSecTimeOriginal",
Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-tag.h 15 Dec 2002 11:41:11 -0000 1.8
+++ exif-tag.h 6 Aug 2003 19:47:53 -0000 1.9
@@ -96,7 +96,7 @@
EXIF_TAG_SUBJECT_AREA = 0x9214,
EXIF_TAG_MAKER_NOTE = 0x927c,
EXIF_TAG_USER_COMMENT = 0x9286,
- EXIF_TAG_SUBSEC_TIME = 0x9290,
+ EXIF_TAG_SUB_SEC_TIME = 0x9290,
EXIF_TAG_SUB_SEC_TIME_ORIGINAL = 0x9291,
EXIF_TAG_SUB_SEC_TIME_DIGITIZED = 0x9292,
EXIF_TAG_FLASH_PIX_VERSION = 0xa000,
Index: exif-utils.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-utils.h 15 Dec 2002 11:41:11 -0000 1.5
+++ exif-utils.h 6 Aug 2003 19:47:53 -0000 1.6
@@ -54,6 +54,9 @@
void exif_set_srational (unsigned char *b, ExifByteOrder order,
ExifSRational value);
+/* For compatibility with older versions */
+#define EXIF_TAG_SUBSEC_TIME EXIF_TAG_SUB_SEC_TIME
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
|
|
From: Lutz M?l. <lu...@us...> - 2003-08-06 19:53:44
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv6373 Modified Files: ChangeLog Log Message: 2003-08-06 Lutz Mueller <lu...@us...> * libexif/exif-entry.c (exif_entry_initialize): Support some more tags. * libexif/exif-tag.[c,h]: Cosmetic fix. * libexif/exif-utils.h: Do not let above cosmetic fix break the API. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- ChangeLog 4 Aug 2003 19:51:52 -0000 1.70 +++ ChangeLog 6 Aug 2003 19:47:53 -0000 1.71 @@ -1,3 +1,10 @@ +2003-08-06 Lutz Mueller <lu...@us...> + + * libexif/exif-entry.c (exif_entry_initialize): Support some more + tags. + * libexif/exif-tag.[c,h]: Cosmetic fix. + * libexif/exif-utils.h: Do not let above cosmetic fix break the API. + 2003-08-04 Lutz Mueller <lu...@us...> * po/*.po: Updated. |
|
From: Lutz M?l. <lu...@us...> - 2003-08-04 19:51:56
|
Update of /cvsroot/libexif/libexif/po In directory sc8-pr-cvs1:/tmp/cvs-serv1236/po Modified Files: de.po es.po fr.po Log Message: 2003-08-04 Lutz Mueller <lu...@us...> * po/*.po: Updated. * Makefile.am: Add m4 and intl to SUBDIRS. automake complains otherwise. * configure.in: Add m4/Makefile. make distcheck complains otherwise. Version 0.5.12 Index: de.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/de.po,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- de.po 17 Mar 2003 20:38:41 -0000 1.13 +++ de.po 4 Aug 2003 19:51:53 -0000 1.14 @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libexif vers\n" -"POT-Creation-Date: 2002-12-07 01:20+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-07-30 23:40+0200\n" "PO-Revision-Date: 2002-09-12 19:48+0200\n" "Last-Translator: Hans Ulrich Niedermann <gp...@n-...>\n" "Language-Team: Deutsch <de...@li...>\n" @@ -31,608 +32,634 @@ msgid "Invalid number of components (%i, expected %i)." msgstr "Ungültige Anzahl von Komponenten (%i, %i wurden erwartet)." -#: libexif/exif-entry.c:249 +#: libexif/exif-entry.c:170 +#, fuzzy, c-format +msgid "Invalid size of entry (%i, expected %li x %i)." +msgstr "Ungültige Anzahl von Komponenten (%i, %i wurden erwartet)." + +#: libexif/exif-entry.c:191 +#, fuzzy +msgid "Unknown Exif Version" +msgstr "Exif Version" + +#: libexif/exif-entry.c:199 +msgid "Unknown FlashPix Version" +msgstr "" + +#: libexif/exif-entry.c:212 libexif/exif-entry.c:224 +msgid "[None]" +msgstr "" + +#: libexif/exif-entry.c:214 +msgid "(Photographer)" +msgstr "" + +#: libexif/exif-entry.c:226 +msgid "(Editor)" +msgstr "" + +#: libexif/exif-entry.c:273 #, c-format msgid " (35 equivalent: %d mm)" msgstr "" -#: libexif/exif-entry.c:274 +#: libexif/exif-entry.c:296 #, c-format msgid "1/%d sec." msgstr "" -#: libexif/exif-entry.c:277 +#: libexif/exif-entry.c:299 #, c-format msgid "%d sec." msgstr "" -#: libexif/exif-entry.c:305 libexif/exif-entry.c:449 libexif/exif-entry.c:923 +#: libexif/exif-entry.c:325 libexif/exif-entry.c:418 libexif/exif-entry.c:846 msgid "Unknown" msgstr "Unbekannt" -#: libexif/exif-entry.c:308 +#: libexif/exif-entry.c:326 msgid "Average" msgstr "Durchschnitt" -#: libexif/exif-entry.c:311 +#: libexif/exif-entry.c:327 msgid "Center-Weighted Average" msgstr "" -#: libexif/exif-entry.c:314 +#: libexif/exif-entry.c:329 msgid "Spot" msgstr "" -#: libexif/exif-entry.c:317 +#: libexif/exif-entry.c:330 msgid "Multi Spot" msgstr "" -#: libexif/exif-entry.c:320 +#: libexif/exif-entry.c:331 msgid "Pattern" msgstr "" -#: libexif/exif-entry.c:323 +#: libexif/exif-entry.c:332 msgid "Partial" msgstr "Partiell" -#: libexif/exif-entry.c:326 libexif/exif-entry.c:507 +#: libexif/exif-entry.c:333 libexif/exif-entry.c:451 msgid "Other" msgstr "Andere" -#: libexif/exif-entry.c:339 +#: libexif/exif-entry.c:342 msgid "Uncompressed" msgstr "Unkomprimiert" -#: libexif/exif-entry.c:342 +#: libexif/exif-entry.c:343 msgid "JPEG compression" msgstr "JPEG Kompression" -#: libexif/exif-entry.c:354 +#: libexif/exif-entry.c:351 msgid "DSC" msgstr "" -#: libexif/exif-entry.c:367 +#: libexif/exif-entry.c:360 msgid "chunky format" msgstr "" -#: libexif/exif-entry.c:370 +#: libexif/exif-entry.c:361 msgid "planar format" msgstr "" -#: libexif/exif-entry.c:383 +#: libexif/exif-entry.c:370 msgid "-" msgstr "" -#: libexif/exif-entry.c:386 +#: libexif/exif-entry.c:371 msgid "Y" msgstr "" -#: libexif/exif-entry.c:389 +#: libexif/exif-entry.c:372 msgid "Cb" msgstr "" -#: libexif/exif-entry.c:392 +#: libexif/exif-entry.c:373 msgid "Cr" msgstr "" -#: libexif/exif-entry.c:395 +#: libexif/exif-entry.c:374 msgid "R" msgstr "" -#: libexif/exif-entry.c:398 +#: libexif/exif-entry.c:375 msgid "G" msgstr "" -#: libexif/exif-entry.c:401 +#: libexif/exif-entry.c:376 msgid "B" msgstr "" -#: libexif/exif-entry.c:404 +#: libexif/exif-entry.c:377 msgid "reserved" msgstr "" -#: libexif/exif-entry.c:418 libexif/exif-entry.c:537 +#: libexif/exif-entry.c:388 libexif/exif-entry.c:471 msgid "Not defined" msgstr "Undefiniert" -#: libexif/exif-entry.c:421 +#: libexif/exif-entry.c:390 msgid "One-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:424 +#: libexif/exif-entry.c:394 msgid "Two-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:427 +#: libexif/exif-entry.c:398 msgid "Three-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:430 +#: libexif/exif-entry.c:402 msgid "Color sequential area sensor" msgstr "" -#: libexif/exif-entry.c:433 +#: libexif/exif-entry.c:405 msgid "Trilinear sensor" msgstr "" -#: libexif/exif-entry.c:436 +#: libexif/exif-entry.c:407 msgid "Color sequential linear sensor" msgstr "" -#: libexif/exif-entry.c:452 +#: libexif/exif-entry.c:419 msgid "Daylight" msgstr "Tageslicht" -#: libexif/exif-entry.c:455 +#: libexif/exif-entry.c:420 msgid "Fluorescent" msgstr "" -#: libexif/exif-entry.c:458 +#: libexif/exif-entry.c:422 msgid "Tungsten (incandescent light)" msgstr "" -#: libexif/exif-entry.c:462 libexif/exif-tag.c:353 +#: libexif/exif-entry.c:425 libexif/exif-tag.c:353 msgid "Flash" msgstr "Blitz" -#: libexif/exif-entry.c:465 +#: libexif/exif-entry.c:426 msgid "Fine weather" msgstr "Gutes Wetter" -#: libexif/exif-entry.c:468 +#: libexif/exif-entry.c:427 msgid "Cloudy weather" msgstr "Wolkiges Wetter" -#: libexif/exif-entry.c:471 +#: libexif/exif-entry.c:428 msgid "Shade" msgstr "" -#: libexif/exif-entry.c:474 +#: libexif/exif-entry.c:430 msgid "Daylight fluorescent" msgstr "" -#: libexif/exif-entry.c:477 +#: libexif/exif-entry.c:433 msgid "Day white fluorescent" msgstr "" -#: libexif/exif-entry.c:480 +#: libexif/exif-entry.c:436 msgid "Cool white fluorescent" msgstr "" -#: libexif/exif-entry.c:483 +#: libexif/exif-entry.c:439 msgid "White fluorescent" msgstr "" -#: libexif/exif-entry.c:486 +#: libexif/exif-entry.c:442 msgid "Standard light A" msgstr "" -#: libexif/exif-entry.c:489 +#: libexif/exif-entry.c:443 msgid "Standard light B" msgstr "" -#: libexif/exif-entry.c:492 +#: libexif/exif-entry.c:444 msgid "Standard light C" msgstr "" -#: libexif/exif-entry.c:495 +#: libexif/exif-entry.c:445 msgid "D55" msgstr "" -#: libexif/exif-entry.c:498 +#: libexif/exif-entry.c:446 msgid "D65" msgstr "" -#: libexif/exif-entry.c:501 +#: libexif/exif-entry.c:447 msgid "D75" msgstr "" -#: libexif/exif-entry.c:504 +#: libexif/exif-entry.c:449 msgid "ISO studio tungsten" msgstr "" -#: libexif/exif-entry.c:521 +#: libexif/exif-entry.c:461 msgid "Inch" msgstr "" -#: libexif/exif-entry.c:524 +#: libexif/exif-entry.c:462 msgid "Centimeter" msgstr "Zentimeter" -#: libexif/exif-entry.c:540 +#: libexif/exif-entry.c:472 msgid "Manual" msgstr "Manuell" -#: libexif/exif-entry.c:543 +#: libexif/exif-entry.c:473 msgid "Normal program" msgstr "Normalprogramm" -#: libexif/exif-entry.c:546 +#: libexif/exif-entry.c:474 msgid "Aperture priority" msgstr "" -#: libexif/exif-entry.c:549 +#: libexif/exif-entry.c:475 msgid "Shutter priority" msgstr "" -#: libexif/exif-entry.c:552 +#: libexif/exif-entry.c:477 msgid "Creative program (biased toward depth of field)" msgstr "" -#: libexif/exif-entry.c:556 +#: libexif/exif-entry.c:481 msgid "Action program (biased toward fast shutter speed)" msgstr "" -#: libexif/exif-entry.c:560 +#: libexif/exif-entry.c:485 msgid "Portrait mode (for closeup photos with the background out of focus" msgstr "" -#: libexif/exif-entry.c:565 +#: libexif/exif-entry.c:490 msgid "Landscape mode (for landscape photos with the background in focus" msgstr "" -#: libexif/exif-entry.c:591 +#: libexif/exif-entry.c:514 msgid "top - left" msgstr "oben - links" -#: libexif/exif-entry.c:594 +#: libexif/exif-entry.c:517 msgid "top - right" msgstr "oben - rechts" -#: libexif/exif-entry.c:597 +#: libexif/exif-entry.c:520 msgid "bottom - right" msgstr "unten - rechts" -#: libexif/exif-entry.c:600 +#: libexif/exif-entry.c:523 msgid "bottom - left" msgstr "unten - links" -#: libexif/exif-entry.c:603 +#: libexif/exif-entry.c:526 msgid "left - top" msgstr "links - oben" -#: libexif/exif-entry.c:606 +#: libexif/exif-entry.c:529 msgid "right - top" msgstr "rechts - oben" -#: libexif/exif-entry.c:609 +#: libexif/exif-entry.c:532 msgid "right - bottom" msgstr "rechts - unten" -#: libexif/exif-entry.c:612 +#: libexif/exif-entry.c:535 msgid "left - bottom" msgstr "links - unten" -#: libexif/exif-entry.c:625 +#: libexif/exif-entry.c:548 msgid "centered" msgstr "zentriert" -#: libexif/exif-entry.c:628 +#: libexif/exif-entry.c:551 msgid "co-sited" msgstr "" -#: libexif/exif-entry.c:643 +#: libexif/exif-entry.c:566 msgid "YCbCr4:2:2" msgstr "" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:568 msgid "YCbCr4:2:0" msgstr "" -#: libexif/exif-entry.c:655 +#: libexif/exif-entry.c:578 msgid "RGB" msgstr "" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:581 msgid "YCbCr" msgstr "" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:594 msgid "sRGB" msgstr "" -#: libexif/exif-entry.c:674 +#: libexif/exif-entry.c:597 msgid "Uncalibrated" msgstr "Unkalibriert" -#: libexif/exif-entry.c:687 +#: libexif/exif-entry.c:610 msgid "Flash did not fire." msgstr "Blitz löste nicht aus." -#: libexif/exif-entry.c:690 +#: libexif/exif-entry.c:613 msgid "Flash fired." msgstr "Blitz löste aus." -#: libexif/exif-entry.c:693 +#: libexif/exif-entry.c:616 msgid "Strobe return light not detected." msgstr "Blitzlicht nicht erkannt." -#: libexif/exif-entry.c:697 +#: libexif/exif-entry.c:620 msgid "Strobe return light detected." msgstr "Blitzlicht erkannt." -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:624 msgid "Flash fired, compulsory flash mode, return light not detected." msgstr "" -#: libexif/exif-entry.c:705 +#: libexif/exif-entry.c:628 msgid "Flash fired, compulsory flash mode, return light detected." msgstr "" -#: libexif/exif-entry.c:709 +#: libexif/exif-entry.c:632 msgid "Flash did not fire, compulsory flash mode." msgstr "" -#: libexif/exif-entry.c:713 +#: libexif/exif-entry.c:636 msgid "Flash did not fire, auto mode." msgstr "" -#: libexif/exif-entry.c:717 +#: libexif/exif-entry.c:640 msgid "Flash fired, auto mode." msgstr "" -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:643 msgid "Flash fired, auto mode, return light not detected." msgstr "" -#: libexif/exif-entry.c:724 +#: libexif/exif-entry.c:647 msgid "Flash fired, auto mode, return light detected." msgstr "" -#: libexif/exif-entry.c:728 +#: libexif/exif-entry.c:651 msgid "No flash function." msgstr "Keine Blitzlichtfunktion." -#: libexif/exif-entry.c:731 +#: libexif/exif-entry.c:654 msgid "Flash fired, red-eye reduction mode." msgstr "" -#: libexif/exif-entry.c:735 +#: libexif/exif-entry.c:658 msgid "Flash fired, red-eye reduction mode, return light not detected." msgstr "" -#: libexif/exif-entry.c:739 +#: libexif/exif-entry.c:662 msgid "Flash fired, red-eye reduction mode, return light detected." msgstr "" -#: libexif/exif-entry.c:743 +#: libexif/exif-entry.c:666 msgid "Flash fired, compulsory flash mode, red-eye reduction mode." msgstr "" -#: libexif/exif-entry.c:747 +#: libexif/exif-entry.c:670 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " "detected." msgstr "" -#: libexif/exif-entry.c:752 +#: libexif/exif-entry.c:675 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light " "detected." msgstr "" -#: libexif/exif-entry.c:757 +#: libexif/exif-entry.c:680 msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "" -#: libexif/exif-entry.c:761 +#: libexif/exif-entry.c:684 msgid "" "Flash fired, auto mode, return light not detected, red-eye reduction mode." msgstr "" -#: libexif/exif-entry.c:766 +#: libexif/exif-entry.c:689 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode." msgstr "" -#: libexif/exif-entry.c:777 +#: libexif/exif-entry.c:700 #, c-format msgid "%i bytes unknown data" msgstr "%i Byte(s) unbekannte Daten" -#: libexif/exif-entry.c:786 +#: libexif/exif-entry.c:709 msgid "Normal process" msgstr "" -#: libexif/exif-entry.c:789 +#: libexif/exif-entry.c:712 msgid "Custom process" msgstr "" -#: libexif/exif-entry.c:802 +#: libexif/exif-entry.c:725 msgid "Auto exposure" msgstr "Automatische Belichtungzeit" -#: libexif/exif-entry.c:805 +#: libexif/exif-entry.c:728 msgid "Manual exposure" msgstr "Manuelle Belichtungszeit" -#: libexif/exif-entry.c:808 +#: libexif/exif-entry.c:731 msgid "Auto bracket" msgstr "" -#: libexif/exif-entry.c:821 +#: libexif/exif-entry.c:744 msgid "Auto white balance" msgstr "" -#: libexif/exif-entry.c:824 +#: libexif/exif-entry.c:747 msgid "Manual white balance" msgstr "" -#: libexif/exif-entry.c:837 +#: libexif/exif-entry.c:760 msgid "Standard" msgstr "Standard" -#: libexif/exif-entry.c:840 +#: libexif/exif-entry.c:763 msgid "Landscape" msgstr "Landschaft" -#: libexif/exif-entry.c:843 +#: libexif/exif-entry.c:766 msgid "Portrait" msgstr "Portrait" -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:769 #, fuzzy msgid "Night scene" msgstr "Lichtquelle" -#: libexif/exif-entry.c:859 libexif/exif-entry.c:884 libexif/exif-entry.c:904 +#: libexif/exif-entry.c:782 libexif/exif-entry.c:807 libexif/exif-entry.c:827 msgid "Normal" msgstr "" -#: libexif/exif-entry.c:862 +#: libexif/exif-entry.c:785 msgid "Low gain up" msgstr "" -#: libexif/exif-entry.c:865 +#: libexif/exif-entry.c:788 msgid "High gain up" msgstr "" -#: libexif/exif-entry.c:868 +#: libexif/exif-entry.c:791 msgid "Low gain down" msgstr "" -#: libexif/exif-entry.c:871 +#: libexif/exif-entry.c:794 msgid "High gain down" msgstr "" -#: libexif/exif-entry.c:887 +#: libexif/exif-entry.c:810 msgid "Low saturation" msgstr "Geringe Sättigung" -#: libexif/exif-entry.c:890 +#: libexif/exif-entry.c:813 msgid "High saturation" msgstr "Hohe Sättigung" -#: libexif/exif-entry.c:907 +#: libexif/exif-entry.c:830 msgid "Soft" msgstr "Weich" -#: libexif/exif-entry.c:910 +#: libexif/exif-entry.c:833 msgid "Hard" msgstr "Hart" -#: libexif/exif-entry.c:926 +#: libexif/exif-entry.c:849 msgid "Macro" msgstr "Macro" -#: libexif/exif-entry.c:929 +#: libexif/exif-entry.c:852 msgid "Close view" msgstr "Geringe Entfernung" -#: libexif/exif-entry.c:932 +#: libexif/exif-entry.c:855 msgid "Distant view" msgstr "Hohe Entfernung" -#: libexif/exif-entry.c:952 +#: libexif/exif-entry.c:875 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Innerhalb einer Entfernung %i von (x,y) = (%i,%i)" -#: libexif/exif-entry.c:961 +#: libexif/exif-entry.c:884 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Innerhalb eines Rechtecks (Breite %i, Höhe %i) um (x,y) = (%i,%i)" -#: libexif/exif-entry.c:967 +#: libexif/exif-entry.c:890 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Unerwartete Nummer von Komponenten (%li, erwartete 2, 3 oder 4)." -#: libexif/exif-entry.c:1141 +#: libexif/exif-entry.c:1065 msgid "unknown" msgstr "unbekannt" -#: libexif/exif-entry.c:1144 +#: libexif/exif-entry.c:1068 msgid "average" msgstr "" -#: libexif/exif-entry.c:1147 +#: libexif/exif-entry.c:1071 msgid "center-weight" msgstr "" -#: libexif/exif-entry.c:1150 +#: libexif/exif-entry.c:1074 msgid "spot" msgstr "" -#: libexif/exif-entry.c:1153 +#: libexif/exif-entry.c:1077 msgid "multi-spot" msgstr "" -#: libexif/exif-entry.c:1156 +#: libexif/exif-entry.c:1080 msgid "matrix" msgstr "" -#: libexif/exif-entry.c:1159 +#: libexif/exif-entry.c:1083 msgid "partial" msgstr "" -#: libexif/exif-entry.c:1162 +#: libexif/exif-entry.c:1086 msgid "other" msgstr "" -#: libexif/exif-entry.c:1175 +#: libexif/exif-entry.c:1099 msgid "sunny" msgstr "" -#: libexif/exif-entry.c:1178 +#: libexif/exif-entry.c:1102 msgid "fluorescent" msgstr "" -#: libexif/exif-entry.c:1181 +#: libexif/exif-entry.c:1105 msgid "tungsten" msgstr "" -#: libexif/exif-entry.c:1184 +#: libexif/exif-entry.c:1108 msgid "cloudy" msgstr "" -#: libexif/exif-entry.c:1196 +#: libexif/exif-entry.c:1120 msgid "in" msgstr "" -#: libexif/exif-entry.c:1199 +#: libexif/exif-entry.c:1123 msgid "cm" msgstr "" -#: libexif/exif-entry.c:1211 +#: libexif/exif-entry.c:1135 msgid "manual" msgstr "" -#: libexif/exif-entry.c:1214 +#: libexif/exif-entry.c:1138 msgid "normal" msgstr "" -#: libexif/exif-entry.c:1217 +#: libexif/exif-entry.c:1141 msgid "aperture" msgstr "" -#: libexif/exif-entry.c:1220 +#: libexif/exif-entry.c:1144 msgid "shutter" msgstr "" -#: libexif/exif-entry.c:1223 +#: libexif/exif-entry.c:1147 msgid "creative" msgstr "" -#: libexif/exif-entry.c:1226 +#: libexif/exif-entry.c:1150 msgid "action" msgstr "" -#: libexif/exif-entry.c:1229 +#: libexif/exif-entry.c:1153 msgid "portrait" msgstr "Portrait" -#: libexif/exif-entry.c:1232 +#: libexif/exif-entry.c:1156 msgid "landscape" msgstr "Landschaft" -#: libexif/exif-entry.c:1244 +#: libexif/exif-entry.c:1168 msgid "yes" msgstr "Ja" -#: libexif/exif-entry.c:1247 +#: libexif/exif-entry.c:1171 msgid "w/o strobe" msgstr "" -#: libexif/exif-entry.c:1250 +#: libexif/exif-entry.c:1174 msgid "w. strobe" msgstr "" @@ -1315,12 +1342,11 @@ #: libexif/exif-tag.c:400 msgid "" -"The color space information tag (<ColorSpace>) is always recorede as the " -"color space specifier. Normally sRGB (=1) is used to define the color space " -"based on the PC monitor conditions and environment. If a color space other " -"than sRGB is used, Uncalibrated (=FFFF.H) is set. Image data recorded as " -"Uncalibrated can be treated as sRGB when it is converted to FlashPix. On " -"sRGB see Appendix E." +"The color space information tag is always recorded as the color space " +"specifier. Normally sRGB (=1) is used to define the color space based on the " +"PC monitor conditions and environment. If a color space other than sRGB is " +"used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated can " +"be treated as sRGB when it is converted to FlashPix. On sRGB see Appendix E." msgstr "" #: libexif/exif-tag.c:408 Index: es.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/es.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- es.po 17 Mar 2003 20:38:42 -0000 1.6 +++ es.po 4 Aug 2003 19:51:53 -0000 1.7 @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"POT-Creation-Date: 2002-12-07 01:20+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-07-30 23:40+0200\n" "PO-Revision-Date: 2002-09-05 22:28-0300\n" "Last-Translator: Fabian Mandelbaum <fa...@ma...>\n" "Language-Team: Spanish <es...@li...>\n" @@ -31,379 +32,405 @@ msgid "Invalid number of components (%i, expected %i)." msgstr "Cantidad de componentes no válida (%i, se esperaba %i)." -#: libexif/exif-entry.c:249 +#: libexif/exif-entry.c:170 +#, fuzzy, c-format +msgid "Invalid size of entry (%i, expected %li x %i)." +msgstr "Cantidad de componentes no válida (%i, se esperaba %i)." + +#: libexif/exif-entry.c:191 +#, fuzzy +msgid "Unknown Exif Version" +msgstr "Versión Exif" + +#: libexif/exif-entry.c:199 +msgid "Unknown FlashPix Version" +msgstr "" + +#: libexif/exif-entry.c:212 libexif/exif-entry.c:224 +msgid "[None]" +msgstr "" + +#: libexif/exif-entry.c:214 +msgid "(Photographer)" +msgstr "" + +#: libexif/exif-entry.c:226 +msgid "(Editor)" +msgstr "" + +#: libexif/exif-entry.c:273 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (equivalente 35: %d mm)" -#: libexif/exif-entry.c:274 +#: libexif/exif-entry.c:296 #, c-format msgid "1/%d sec." msgstr "1/%d seg." -#: libexif/exif-entry.c:277 +#: libexif/exif-entry.c:299 #, c-format msgid "%d sec." msgstr "%d seg." -#: libexif/exif-entry.c:305 libexif/exif-entry.c:449 libexif/exif-entry.c:923 +#: libexif/exif-entry.c:325 libexif/exif-entry.c:418 libexif/exif-entry.c:846 msgid "Unknown" msgstr "Desconocido" -#: libexif/exif-entry.c:308 +#: libexif/exif-entry.c:326 msgid "Average" msgstr "Promedio" -#: libexif/exif-entry.c:311 +#: libexif/exif-entry.c:327 msgid "Center-Weighted Average" msgstr "Promedio Ponderado en el Centro" -#: libexif/exif-entry.c:314 +#: libexif/exif-entry.c:329 msgid "Spot" msgstr "Lugar" -#: libexif/exif-entry.c:317 +#: libexif/exif-entry.c:330 msgid "Multi Spot" msgstr "Multi Lugar" -#: libexif/exif-entry.c:320 +#: libexif/exif-entry.c:331 msgid "Pattern" msgstr "Patrón" -#: libexif/exif-entry.c:323 +#: libexif/exif-entry.c:332 msgid "Partial" msgstr "Parcial" -#: libexif/exif-entry.c:326 libexif/exif-entry.c:507 +#: libexif/exif-entry.c:333 libexif/exif-entry.c:451 msgid "Other" msgstr "Otro" -#: libexif/exif-entry.c:339 +#: libexif/exif-entry.c:342 msgid "Uncompressed" msgstr "Descomprimido" -#: libexif/exif-entry.c:342 +#: libexif/exif-entry.c:343 msgid "JPEG compression" msgstr "compresión JPEG" -#: libexif/exif-entry.c:354 +#: libexif/exif-entry.c:351 msgid "DSC" msgstr "DSC" -#: libexif/exif-entry.c:367 +#: libexif/exif-entry.c:360 msgid "chunky format" msgstr "formato por trozos" -#: libexif/exif-entry.c:370 +#: libexif/exif-entry.c:361 msgid "planar format" msgstr "formato planar" -#: libexif/exif-entry.c:383 +#: libexif/exif-entry.c:370 msgid "-" msgstr "-" -#: libexif/exif-entry.c:386 +#: libexif/exif-entry.c:371 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:389 +#: libexif/exif-entry.c:372 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:392 +#: libexif/exif-entry.c:373 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:395 +#: libexif/exif-entry.c:374 msgid "R" msgstr "R" -#: libexif/exif-entry.c:398 +#: libexif/exif-entry.c:375 msgid "G" msgstr "V" -#: libexif/exif-entry.c:401 +#: libexif/exif-entry.c:376 msgid "B" msgstr "A" -#: libexif/exif-entry.c:404 +#: libexif/exif-entry.c:377 msgid "reserved" msgstr "reservado" -#: libexif/exif-entry.c:418 libexif/exif-entry.c:537 +#: libexif/exif-entry.c:388 libexif/exif-entry.c:471 msgid "Not defined" msgstr "No definido" -#: libexif/exif-entry.c:421 +#: libexif/exif-entry.c:390 msgid "One-chip color area sensor" msgstr "Sensor de área de color de un chip" -#: libexif/exif-entry.c:424 +#: libexif/exif-entry.c:394 msgid "Two-chip color area sensor" msgstr "Sensor de área de color de dos chips" -#: libexif/exif-entry.c:427 +#: libexif/exif-entry.c:398 msgid "Three-chip color area sensor" msgstr "Sensor de área de color de tres chips" -#: libexif/exif-entry.c:430 +#: libexif/exif-entry.c:402 msgid "Color sequential area sensor" msgstr "Sensor de área de color secuencial" -#: libexif/exif-entry.c:433 +#: libexif/exif-entry.c:405 msgid "Trilinear sensor" msgstr "Sensor tri-lineal" -#: libexif/exif-entry.c:436 +#: libexif/exif-entry.c:407 msgid "Color sequential linear sensor" msgstr "Sensor lineal secuencial de color" -#: libexif/exif-entry.c:452 +#: libexif/exif-entry.c:419 msgid "Daylight" msgstr "Luz de día" -#: libexif/exif-entry.c:455 +#: libexif/exif-entry.c:420 msgid "Fluorescent" msgstr "Fluorescente" -#: libexif/exif-entry.c:458 +#: libexif/exif-entry.c:422 msgid "Tungsten (incandescent light)" msgstr "Tungsteno (luz incandescente)" -#: libexif/exif-entry.c:462 libexif/exif-tag.c:353 +#: libexif/exif-entry.c:425 libexif/exif-tag.c:353 msgid "Flash" msgstr "Flash" -#: libexif/exif-entry.c:465 +#: libexif/exif-entry.c:426 msgid "Fine weather" msgstr "Tiempo bueno" -#: libexif/exif-entry.c:468 +#: libexif/exif-entry.c:427 msgid "Cloudy weather" msgstr "Tiempo nublado" -#: libexif/exif-entry.c:471 +#: libexif/exif-entry.c:428 msgid "Shade" msgstr "Sombra" -#: libexif/exif-entry.c:474 +#: libexif/exif-entry.c:430 msgid "Daylight fluorescent" msgstr "Luz de día fluorescente" -#: libexif/exif-entry.c:477 +#: libexif/exif-entry.c:433 msgid "Day white fluorescent" msgstr "Día blanco fluorescente" -#: libexif/exif-entry.c:480 +#: libexif/exif-entry.c:436 msgid "Cool white fluorescent" msgstr "Blanco frío fluorescente" -#: libexif/exif-entry.c:483 +#: libexif/exif-entry.c:439 msgid "White fluorescent" msgstr "Blanco fluorescente" -#: libexif/exif-entry.c:486 +#: libexif/exif-entry.c:442 msgid "Standard light A" msgstr "Luz estándar A" -#: libexif/exif-entry.c:489 +#: libexif/exif-entry.c:443 msgid "Standard light B" msgstr "Luz estándar B" -#: libexif/exif-entry.c:492 +#: libexif/exif-entry.c:444 msgid "Standard light C" msgstr "Luz estándar C" -#: libexif/exif-entry.c:495 +#: libexif/exif-entry.c:445 msgid "D55" msgstr "D55" -#: libexif/exif-entry.c:498 +#: libexif/exif-entry.c:446 msgid "D65" msgstr "D65" -#: libexif/exif-entry.c:501 +#: libexif/exif-entry.c:447 msgid "D75" msgstr "D75" -#: libexif/exif-entry.c:504 +#: libexif/exif-entry.c:449 msgid "ISO studio tungsten" msgstr "tungsteno de estudio ISO" -#: libexif/exif-entry.c:521 +#: libexif/exif-entry.c:461 msgid "Inch" msgstr "Pulgada" -#: libexif/exif-entry.c:524 +#: libexif/exif-entry.c:462 msgid "Centimeter" msgstr "Centímetro" -#: libexif/exif-entry.c:540 +#: libexif/exif-entry.c:472 msgid "Manual" msgstr "Manual" -#: libexif/exif-entry.c:543 +#: libexif/exif-entry.c:473 msgid "Normal program" msgstr "Programa normal" -#: libexif/exif-entry.c:546 +#: libexif/exif-entry.c:474 msgid "Aperture priority" msgstr "Prioridad de apertura" -#: libexif/exif-entry.c:549 +#: libexif/exif-entry.c:475 msgid "Shutter priority" msgstr "Prioridad del obturador" -#: libexif/exif-entry.c:552 +#: libexif/exif-entry.c:477 msgid "Creative program (biased toward depth of field)" msgstr "Programa creativo (orientado a la profundidad del campo)" -#: libexif/exif-entry.c:556 +#: libexif/exif-entry.c:481 msgid "Action program (biased toward fast shutter speed)" msgstr "Programa de acción (orientado a velocidad rápida del obturador)" -#: libexif/exif-entry.c:560 +#: libexif/exif-entry.c:485 msgid "Portrait mode (for closeup photos with the background out of focus" msgstr "Modo retrato (para fotos de cerca con el fondo fuera de foco" -#: libexif/exif-entry.c:565 +#: libexif/exif-entry.c:490 msgid "Landscape mode (for landscape photos with the background in focus" msgstr "Modo paisaje (para fotos de paisaje con el fondo en foco" -#: libexif/exif-entry.c:591 +#: libexif/exif-entry.c:514 msgid "top - left" msgstr "arriba - izquierda" -#: libexif/exif-entry.c:594 +#: libexif/exif-entry.c:517 msgid "top - right" msgstr "arriba - derecha" -#: libexif/exif-entry.c:597 +#: libexif/exif-entry.c:520 msgid "bottom - right" msgstr "abajo - derecha" -#: libexif/exif-entry.c:600 +#: libexif/exif-entry.c:523 msgid "bottom - left" msgstr "abajo - izquierda" -#: libexif/exif-entry.c:603 +#: libexif/exif-entry.c:526 msgid "left - top" msgstr "izquierda - arriba" -#: libexif/exif-entry.c:606 +#: libexif/exif-entry.c:529 msgid "right - top" msgstr "derecha - arriba" -#: libexif/exif-entry.c:609 +#: libexif/exif-entry.c:532 msgid "right - bottom" msgstr "derecha - abajo" -#: libexif/exif-entry.c:612 +#: libexif/exif-entry.c:535 msgid "left - bottom" msgstr "izquierda - abajo" -#: libexif/exif-entry.c:625 +#: libexif/exif-entry.c:548 msgid "centered" msgstr "centrado" -#: libexif/exif-entry.c:628 +#: libexif/exif-entry.c:551 msgid "co-sited" msgstr "co-situado" -#: libexif/exif-entry.c:643 +#: libexif/exif-entry.c:566 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:568 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:655 +#: libexif/exif-entry.c:578 msgid "RGB" msgstr "RVA" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:581 msgid "YCbCr" msgstr "TCvCr" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:594 msgid "sRGB" msgstr "sRVA" -#: libexif/exif-entry.c:674 +#: libexif/exif-entry.c:597 msgid "Uncalibrated" msgstr "Descalibrado" -#: libexif/exif-entry.c:687 +#: libexif/exif-entry.c:610 msgid "Flash did not fire." msgstr "El flash no disparó." -#: libexif/exif-entry.c:690 +#: libexif/exif-entry.c:613 msgid "Flash fired." msgstr "El flash disparó." -#: libexif/exif-entry.c:693 +#: libexif/exif-entry.c:616 msgid "Strobe return light not detected." msgstr "Luz de retorno estrosboscópica no detectada." -#: libexif/exif-entry.c:697 +#: libexif/exif-entry.c:620 msgid "Strobe return light detected." msgstr "Luz de retorno estrosboscópica detectada." -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:624 msgid "Flash fired, compulsory flash mode, return light not detected." msgstr "" "El flash disparó, modo compulsivo del flash, luz de retorno no detectada." -#: libexif/exif-entry.c:705 +#: libexif/exif-entry.c:628 msgid "Flash fired, compulsory flash mode, return light detected." msgstr "El flash disparó, modo compulsivo del flash, luz de retorno detectada." -#: libexif/exif-entry.c:709 +#: libexif/exif-entry.c:632 msgid "Flash did not fire, compulsory flash mode." msgstr "El flash no disparó, modo compulsivo del flash." -#: libexif/exif-entry.c:713 +#: libexif/exif-entry.c:636 msgid "Flash did not fire, auto mode." msgstr "El flash no disparó, modo automático." -#: libexif/exif-entry.c:717 +#: libexif/exif-entry.c:640 msgid "Flash fired, auto mode." msgstr "El flash disparó, modo automático." -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:643 msgid "Flash fired, auto mode, return light not detected." msgstr "El flash disparó, modo automático, luz de retorno no detectada." -#: libexif/exif-entry.c:724 +#: libexif/exif-entry.c:647 msgid "Flash fired, auto mode, return light detected." msgstr "El flash disparó, modo automático, luz de retorno detectada." -#: libexif/exif-entry.c:728 +#: libexif/exif-entry.c:651 msgid "No flash function." msgstr "Sin función de flash." -#: libexif/exif-entry.c:731 +#: libexif/exif-entry.c:654 msgid "Flash fired, red-eye reduction mode." msgstr "El flash disparó, modo de reducción de ojos rojos." -#: libexif/exif-entry.c:735 +#: libexif/exif-entry.c:658 msgid "Flash fired, red-eye reduction mode, return light not detected." msgstr "" "El flash disparó, modo de reducción de ojos rojos, luz de retorno no " "detectada." -#: libexif/exif-entry.c:739 +#: libexif/exif-entry.c:662 msgid "Flash fired, red-eye reduction mode, return light detected." msgstr "" "El flash disparó, modo de reducción de ojos rojos, luz de retorno detectada." -#: libexif/exif-entry.c:743 +#: libexif/exif-entry.c:666 msgid "Flash fired, compulsory flash mode, red-eye reduction mode." msgstr "" "El flash disparó, modo compulsivo del flash, modo de reducción de ojos rojos." -#: libexif/exif-entry.c:747 +#: libexif/exif-entry.c:670 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " "detected." @@ -411,7 +438,7 @@ "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " "rojos, luz de retorno no detectada." -#: libexif/exif-entry.c:752 +#: libexif/exif-entry.c:675 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light " "detected." @@ -419,232 +446,232 @@ "El flash disparó, modo compulsivo del flash, modo de reducción de ojos " "rojos, luz de retorno detectada." -#: libexif/exif-entry.c:757 +#: libexif/exif-entry.c:680 msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "El flash disparó, modo automático, modo de reducción de ojos rojos." -#: libexif/exif-entry.c:761 +#: libexif/exif-entry.c:684 msgid "" "Flash fired, auto mode, return light not detected, red-eye reduction mode." msgstr "" "El flash disparó, modo automático, modo de reducción de ojos rojos, luz de " "retorno no detectada." -#: libexif/exif-entry.c:766 +#: libexif/exif-entry.c:689 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode." msgstr "" "El flash disparó, modo automático, modo de reducción de ojos rojos, luz de " "retorno detectada." -#: libexif/exif-entry.c:777 +#: libexif/exif-entry.c:700 #, c-format msgid "%i bytes unknown data" msgstr "%i bytes de datos desconocidos" -#: libexif/exif-entry.c:786 +#: libexif/exif-entry.c:709 msgid "Normal process" msgstr "Proceso normal" -#: libexif/exif-entry.c:789 +#: libexif/exif-entry.c:712 msgid "Custom process" msgstr "Proceso personalizado" -#: libexif/exif-entry.c:802 +#: libexif/exif-entry.c:725 msgid "Auto exposure" msgstr "Exposición automática" -#: libexif/exif-entry.c:805 +#: libexif/exif-entry.c:728 msgid "Manual exposure" msgstr "Exposición manual" -#: libexif/exif-entry.c:808 +#: libexif/exif-entry.c:731 msgid "Auto bracket" msgstr "Auto bracket" -#: libexif/exif-entry.c:821 +#: libexif/exif-entry.c:744 msgid "Auto white balance" msgstr "Balance de blanco automático" -#: libexif/exif-entry.c:824 +#: libexif/exif-entry.c:747 msgid "Manual white balance" msgstr "Balance de blanco manual" -#: libexif/exif-entry.c:837 +#: libexif/exif-entry.c:760 msgid "Standard" msgstr "Estándar" -#: libexif/exif-entry.c:840 +#: libexif/exif-entry.c:763 msgid "Landscape" msgstr "Paisaje" -#: libexif/exif-entry.c:843 +#: libexif/exif-entry.c:766 msgid "Portrait" msgstr "Retrato" -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:769 msgid "Night scene" msgstr "Escena nocturna" -#: libexif/exif-entry.c:859 libexif/exif-entry.c:884 libexif/exif-entry.c:904 +#: libexif/exif-entry.c:782 libexif/exif-entry.c:807 libexif/exif-entry.c:827 msgid "Normal" msgstr "Normal" -#: libexif/exif-entry.c:862 +#: libexif/exif-entry.c:785 msgid "Low gain up" msgstr "Ganancia baja alta" -#: libexif/exif-entry.c:865 +#: libexif/exif-entry.c:788 msgid "High gain up" msgstr "Ganancia alta alta" -#: libexif/exif-entry.c:868 +#: libexif/exif-entry.c:791 msgid "Low gain down" msgstr "Ganancia baja baja" -#: libexif/exif-entry.c:871 +#: libexif/exif-entry.c:794 msgid "High gain down" msgstr "Ganancia alta baja" -#: libexif/exif-entry.c:887 +#: libexif/exif-entry.c:810 msgid "Low saturation" msgstr "Baja saturación" -#: libexif/exif-entry.c:890 +#: libexif/exif-entry.c:813 msgid "High saturation" msgstr "Alta saturación" -#: libexif/exif-entry.c:907 +#: libexif/exif-entry.c:830 msgid "Soft" msgstr "Suave" -#: libexif/exif-entry.c:910 +#: libexif/exif-entry.c:833 msgid "Hard" msgstr "Duro" -#: libexif/exif-entry.c:926 +#: libexif/exif-entry.c:849 msgid "Macro" msgstr "Macro" -#: libexif/exif-entry.c:929 +#: libexif/exif-entry.c:852 msgid "Close view" msgstr "Vista cercana" -#: libexif/exif-entry.c:932 +#: libexif/exif-entry.c:855 msgid "Distant view" msgstr "Vista distante" -#: libexif/exif-entry.c:952 +#: libexif/exif-entry.c:875 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Dentro de la distancia %i de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:961 +#: libexif/exif-entry.c:884 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Dentro del rectángulo (ancho %i, alto %i) alrededor de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:967 +#: libexif/exif-entry.c:890 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Cantidad de componentes inesperada (%li, esperados 2, 3, o 4)." -#: libexif/exif-entry.c:1141 +#: libexif/exif-entry.c:1065 msgid "unknown" msgstr "desconocido" -#: libexif/exif-entry.c:1144 +#: libexif/exif-entry.c:1068 msgid "average" msgstr "promedio" -#: libexif/exif-entry.c:1147 +#: libexif/exif-entry.c:1071 msgid "center-weight" msgstr "peso centrado" -#: libexif/exif-entry.c:1150 +#: libexif/exif-entry.c:1074 msgid "spot" msgstr "lugar" -#: libexif/exif-entry.c:1153 +#: libexif/exif-entry.c:1077 msgid "multi-spot" msgstr "multi-lugar" -#: libexif/exif-entry.c:1156 +#: libexif/exif-entry.c:1080 msgid "matrix" msgstr "matriz" -#: libexif/exif-entry.c:1159 +#: libexif/exif-entry.c:1083 msgid "partial" msgstr "parcial" -#: libexif/exif-entry.c:1162 +#: libexif/exif-entry.c:1086 msgid "other" msgstr "otro" -#: libexif/exif-entry.c:1175 +#: libexif/exif-entry.c:1099 msgid "sunny" msgstr "soleado" -#: libexif/exif-entry.c:1178 +#: libexif/exif-entry.c:1102 msgid "fluorescent" msgstr "fluorescente" -#: libexif/exif-entry.c:1181 +#: libexif/exif-entry.c:1105 msgid "tungsten" msgstr "tungsteno" -#: libexif/exif-entry.c:1184 +#: libexif/exif-entry.c:1108 msgid "cloudy" msgstr "nublado" -#: libexif/exif-entry.c:1196 +#: libexif/exif-entry.c:1120 msgid "in" msgstr "pulg" -#: libexif/exif-entry.c:1199 +#: libexif/exif-entry.c:1123 msgid "cm" msgstr "cm" -#: libexif/exif-entry.c:1211 +#: libexif/exif-entry.c:1135 msgid "manual" msgstr "manual" -#: libexif/exif-entry.c:1214 +#: libexif/exif-entry.c:1138 msgid "normal" msgstr "normal" -#: libexif/exif-entry.c:1217 +#: libexif/exif-entry.c:1141 msgid "aperture" msgstr "apertura" -#: libexif/exif-entry.c:1220 +#: libexif/exif-entry.c:1144 msgid "shutter" msgstr "obturador" -#: libexif/exif-entry.c:1223 +#: libexif/exif-entry.c:1147 msgid "creative" msgstr "creativo" -#: libexif/exif-entry.c:1226 +#: libexif/exif-entry.c:1150 msgid "action" msgstr "acción" -#: libexif/exif-entry.c:1229 +#: libexif/exif-entry.c:1153 msgid "portrait" msgstr "retrato" -#: libexif/exif-entry.c:1232 +#: libexif/exif-entry.c:1156 msgid "landscape" msgstr "paisaje" -#: libexif/exif-entry.c:1244 +#: libexif/exif-entry.c:1168 msgid "yes" msgstr "sí" -#: libexif/exif-entry.c:1247 +#: libexif/exif-entry.c:1171 msgid "w/o strobe" msgstr "sin estrosboscópica" -#: libexif/exif-entry.c:1250 +#: libexif/exif-entry.c:1174 msgid "w. strobe" msgstr "con estrosboscópica" @@ -1540,13 +1567,13 @@ msgstr "Espacio de color" #: libexif/exif-tag.c:400 +#, fuzzy msgid "" -"The color space information tag (<ColorSpace>) is always recorede as the " -"color space specifier. Normally sRGB (=1) is used to define the color space " -"based on the PC monitor conditions and environment. If a color space other " -"than sRGB is used, Uncalibrated (=FFFF.H) is set. Image data recorded as " -"Uncalibrated can be treated as sRGB when it is converted to FlashPix. On " -"sRGB see Appendix E." +"The color space information tag is always recorded as the color space " +"specifier. Normally sRGB (=1) is used to define the color space based on the " +"PC monitor conditions and environment. If a color space other than sRGB is " +"used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated can " +"be treated as sRGB when it is converted to FlashPix. On sRGB see Appendix E." msgstr "" "La etiqueta de información de espacio de color (<ColorSpace>) siempre se " "registra como el especificador de espacio de color. Normalmente se utiliza " Index: fr.po =================================================================== RCS file: /cvsroot/libexif/libexif/po/fr.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- fr.po 17 Mar 2003 20:38:44 -0000 1.7 +++ fr.po 4 Aug 2003 19:51:53 -0000 1.8 @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libexif\n" -"POT-Creation-Date: 2002-12-07 01:20+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-07-30 23:40+0200\n" "PO-Revision-Date: 2002-11-21 10:02+0100\n" "Last-Translator: Arnaud Launay <as...@la...>\n" "Language-Team: Français <tr...@tr...>\n" @@ -32,377 +33,403 @@ msgid "Invalid number of components (%i, expected %i)." msgstr "Nombre invalide de composants (%i, attendait %i)." -#: libexif/exif-entry.c:249 +#: libexif/exif-entry.c:170 +#, fuzzy, c-format +msgid "Invalid size of entry (%i, expected %li x %i)." +msgstr "Nombre invalide de composants (%i, attendait %i)." + +#: libexif/exif-entry.c:191 +#, fuzzy +msgid "Unknown Exif Version" +msgstr "Version d'exif" + +#: libexif/exif-entry.c:199 +msgid "Unknown FlashPix Version" +msgstr "" + +#: libexif/exif-entry.c:212 libexif/exif-entry.c:224 +msgid "[None]" +msgstr "" + +#: libexif/exif-entry.c:214 +msgid "(Photographer)" +msgstr "" + +#: libexif/exif-entry.c:226 +msgid "(Editor)" +msgstr "" + +#: libexif/exif-entry.c:273 #, c-format msgid " (35 equivalent: %d mm)" msgstr " (équivalent 35mm: %d mm)" -#: libexif/exif-entry.c:274 +#: libexif/exif-entry.c:296 #, c-format msgid "1/%d sec." msgstr "1/%d sec." -#: libexif/exif-entry.c:277 +#: libexif/exif-entry.c:299 #, c-format msgid "%d sec." msgstr "%d sec." -#: libexif/exif-entry.c:305 libexif/exif-entry.c:449 libexif/exif-entry.c:923 +#: libexif/exif-entry.c:325 libexif/exif-entry.c:418 libexif/exif-entry.c:846 msgid "Unknown" msgstr "Inconnu" -#: libexif/exif-entry.c:308 +#: libexif/exif-entry.c:326 msgid "Average" msgstr "Moyenne" -#: libexif/exif-entry.c:311 +#: libexif/exif-entry.c:327 msgid "Center-Weighted Average" msgstr "Mesure pondérée centrale" -#: libexif/exif-entry.c:314 +#: libexif/exif-entry.c:329 msgid "Spot" msgstr "Spot" -#: libexif/exif-entry.c:317 +#: libexif/exif-entry.c:330 msgid "Multi Spot" msgstr "Multi spot" -#: libexif/exif-entry.c:320 +#: libexif/exif-entry.c:331 msgid "Pattern" msgstr "Motif" -#: libexif/exif-entry.c:323 +#: libexif/exif-entry.c:332 msgid "Partial" msgstr "Partiel" -#: libexif/exif-entry.c:326 libexif/exif-entry.c:507 +#: libexif/exif-entry.c:333 libexif/exif-entry.c:451 msgid "Other" msgstr "Autre" -#: libexif/exif-entry.c:339 +#: libexif/exif-entry.c:342 msgid "Uncompressed" msgstr "Non compressé" -#: libexif/exif-entry.c:342 +#: libexif/exif-entry.c:343 msgid "JPEG compression" msgstr "Compression JPEG" -#: libexif/exif-entry.c:354 +#: libexif/exif-entry.c:351 msgid "DSC" msgstr "" -#: libexif/exif-entry.c:367 +#: libexif/exif-entry.c:360 msgid "chunky format" msgstr "" -#: libexif/exif-entry.c:370 +#: libexif/exif-entry.c:361 msgid "planar format" msgstr "" -#: libexif/exif-entry.c:383 +#: libexif/exif-entry.c:370 msgid "-" msgstr "-" -#: libexif/exif-entry.c:386 +#: libexif/exif-entry.c:371 msgid "Y" msgstr "Y" -#: libexif/exif-entry.c:389 +#: libexif/exif-entry.c:372 msgid "Cb" msgstr "Cb" -#: libexif/exif-entry.c:392 +#: libexif/exif-entry.c:373 msgid "Cr" msgstr "Cr" -#: libexif/exif-entry.c:395 +#: libexif/exif-entry.c:374 msgid "R" msgstr "R" -#: libexif/exif-entry.c:398 +#: libexif/exif-entry.c:375 msgid "G" msgstr "G" -#: libexif/exif-entry.c:401 +#: libexif/exif-entry.c:376 msgid "B" msgstr "B" -#: libexif/exif-entry.c:404 +#: libexif/exif-entry.c:377 msgid "reserved" msgstr "réservé" -#: libexif/exif-entry.c:418 libexif/exif-entry.c:537 +#: libexif/exif-entry.c:388 libexif/exif-entry.c:471 msgid "Not defined" msgstr "Non défini" -#: libexif/exif-entry.c:421 +#: libexif/exif-entry.c:390 msgid "One-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:424 +#: libexif/exif-entry.c:394 msgid "Two-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:427 +#: libexif/exif-entry.c:398 msgid "Three-chip color area sensor" msgstr "" -#: libexif/exif-entry.c:430 +#: libexif/exif-entry.c:402 msgid "Color sequential area sensor" msgstr "" -#: libexif/exif-entry.c:433 +#: libexif/exif-entry.c:405 msgid "Trilinear sensor" msgstr "Capteur trilinéaire" -#: libexif/exif-entry.c:436 +#: libexif/exif-entry.c:407 msgid "Color sequential linear sensor" msgstr "Capteur linéaire séquentiel de couleur" -#: libexif/exif-entry.c:452 +#: libexif/exif-entry.c:419 msgid "Daylight" msgstr "Lumière du jour" -#: libexif/exif-entry.c:455 +#: libexif/exif-entry.c:420 msgid "Fluorescent" msgstr "Fluorescent" -#: libexif/exif-entry.c:458 +#: libexif/exif-entry.c:422 msgid "Tungsten (incandescent light)" msgstr "Tungstène (lumière incandescente)" -#: libexif/exif-entry.c:462 libexif/exif-tag.c:353 +#: libexif/exif-entry.c:425 libexif/exif-tag.c:353 msgid "Flash" msgstr "Flash" -#: libexif/exif-entry.c:465 +#: libexif/exif-entry.c:426 msgid "Fine weather" msgstr "Temps clair" -#: libexif/exif-entry.c:468 +#: libexif/exif-entry.c:427 msgid "Cloudy weather" msgstr "Temps couvert" -#: libexif/exif-entry.c:471 +#: libexif/exif-entry.c:428 msgid "Shade" msgstr "Ombragé" -#: libexif/exif-entry.c:474 +#: libexif/exif-entry.c:430 msgid "Daylight fluorescent" msgstr "" -#: libexif/exif-entry.c:477 +#: libexif/exif-entry.c:433 msgid "Day white fluorescent" msgstr "" -#: libexif/exif-entry.c:480 +#: libexif/exif-entry.c:436 msgid "Cool white fluorescent" msgstr "" -#: libexif/exif-entry.c:483 +#: libexif/exif-entry.c:439 msgid "White fluorescent" msgstr "" -#: libexif/exif-entry.c:486 +#: libexif/exif-entry.c:442 msgid "Standard light A" msgstr "Lumière standard A" -#: libexif/exif-entry.c:489 +#: libexif/exif-entry.c:443 msgid "Standard light B" msgstr "Lumière standard B" -#: libexif/exif-entry.c:492 +#: libexif/exif-entry.c:444 msgid "Standard light C" msgstr "Lumière standard C" -#: libexif/exif-entry.c:495 +#: libexif/exif-entry.c:445 msgid "D55" msgstr "D55" -#: libexif/exif-entry.c:498 +#: libexif/exif-entry.c:446 msgid "D65" msgstr "D65" -#: libexif/exif-entry.c:501 +#: libexif/exif-entry.c:447 msgid "D75" msgstr "D75" -#: libexif/exif-entry.c:504 +#: libexif/exif-entry.c:449 msgid "ISO studio tungsten" msgstr "Tungstène de studio ISO" -#: libexif/exif-entry.c:521 +#: libexif/exif-entry.c:461 msgid "Inch" msgstr "Pouce" -#: libexif/exif-entry.c:524 +#: libexif/exif-entry.c:462 msgid "Centimeter" msgstr "Centimère" -#: libexif/exif-entry.c:540 +#: libexif/exif-entry.c:472 msgid "Manual" msgstr "Manuel" -#: libexif/exif-entry.c:543 +#: libexif/exif-entry.c:473 msgid "Normal program" msgstr "Programme normal" -#: libexif/exif-entry.c:546 +#: libexif/exif-entry.c:474 msgid "Aperture priority" msgstr "Priorité ouverture" -#: libexif/exif-entry.c:549 +#: libexif/exif-entry.c:475 msgid "Shutter priority" msgstr "Priorité obturation" -#: libexif/exif-entry.c:552 +#: libexif/exif-entry.c:477 msgid "Creative program (biased toward depth of field)" msgstr "Programme créatif (grande profondeur de champ)" -#: libexif/exif-entry.c:556 +#: libexif/exif-entry.c:481 msgid "Action program (biased toward fast shutter speed)" msgstr "Programme action (vitesse d'obturation élevée)" -#: libexif/exif-entry.c:560 +#: libexif/exif-entry.c:485 msgid "Portrait mode (for closeup photos with the background out of focus" msgstr "Mode portrait (photos en gros plan avec arrière-plan flou)" -#: libexif/exif-entry.c:565 +#: libexif/exif-entry.c:490 msgid "Landscape mode (for landscape photos with the background in focus" msgstr "Mode paysage (paysages avec arrière-plan net)" -#: libexif/exif-entry.c:591 +#: libexif/exif-entry.c:514 msgid "top - left" msgstr "haut - gauche" -#: libexif/exif-entry.c:594 +#: libexif/exif-entry.c:517 msgid "top - right" msgstr "haut - droit" -#: libexif/exif-entry.c:597 +#: libexif/exif-entry.c:520 msgid "bottom - right" msgstr "bas - droit" -#: libexif/exif-entry.c:600 +#: libexif/exif-entry.c:523 msgid "bottom - left" msgstr "bas - gauche" -#: libexif/exif-entry.c:603 +#: libexif/exif-entry.c:526 msgid "left - top" msgstr "gauche - haut" -#: libexif/exif-entry.c:606 +#: libexif/exif-entry.c:529 msgid "right - top" msgstr "droit - haut" -#: libexif/exif-entry.c:609 +#: libexif/exif-entry.c:532 msgid "right - bottom" msgstr "droit - bas" -#: libexif/exif-entry.c:612 +#: libexif/exif-entry.c:535 msgid "left - bottom" msgstr "gauche - bas" -#: libexif/exif-entry.c:625 +#: libexif/exif-entry.c:548 msgid "centered" msgstr "centré" -#: libexif/exif-entry.c:628 +#: libexif/exif-entry.c:551 msgid "co-sited" msgstr "" -#: libexif/exif-entry.c:643 +#: libexif/exif-entry.c:566 msgid "YCbCr4:2:2" msgstr "YCbCr4:2:2" -#: libexif/exif-entry.c:645 +#: libexif/exif-entry.c:568 msgid "YCbCr4:2:0" msgstr "YCbCr4:2:0" -#: libexif/exif-entry.c:655 +#: libexif/exif-entry.c:578 msgid "RGB" msgstr "RGB" -#: libexif/exif-entry.c:658 +#: libexif/exif-entry.c:581 msgid "YCbCr" msgstr "YCbCr" -#: libexif/exif-entry.c:671 +#: libexif/exif-entry.c:594 msgid "sRGB" msgstr "sRGB" -#: libexif/exif-entry.c:674 +#: libexif/exif-entry.c:597 msgid "Uncalibrated" msgstr "Non calibré" -#: libexif/exif-entry.c:687 +#: libexif/exif-entry.c:610 msgid "Flash did not fire." msgstr "Le flash ne s'est pas déclenché." -#: libexif/exif-entry.c:690 +#: libexif/exif-entry.c:613 msgid "Flash fired." msgstr "Le flash s'est déclenché." -#: libexif/exif-entry.c:693 +#: libexif/exif-entry.c:616 msgid "Strobe return light not detected." msgstr "" -#: libexif/exif-entry.c:697 +#: libexif/exif-entry.c:620 msgid "Strobe return light detected." msgstr "" -#: libexif/exif-entry.c:701 +#: libexif/exif-entry.c:624 msgid "Flash fired, compulsory flash mode, return light not detected." msgstr "" "Flash déclenché, mode de flash obligatoire, lumière de retour non détectée." -#: libexif/exif-entry.c:705 +#: libexif/exif-entry.c:628 msgid "Flash fired, compulsory flash mode, return light detected." msgstr "" "Flash déclenché, mode de flash obligatoire, lumière de retour détectée." -#: libexif/exif-entry.c:709 +#: libexif/exif-entry.c:632 msgid "Flash did not fire, compulsory flash mode." msgstr "Flash non déclenché, mode de flash obligatoire." -#: libexif/exif-entry.c:713 +#: libexif/exif-entry.c:636 msgid "Flash did not fire, auto mode." msgstr "Flash non déclenché, mode auto." -#: libexif/exif-entry.c:717 +#: libexif/exif-entry.c:640 msgid "Flash fired, auto mode." msgstr "Flash déclenché, mode auto." -#: libexif/exif-entry.c:720 +#: libexif/exif-entry.c:643 msgid "Flash fired, auto mode, return light not detected." msgstr "Flash déclenché, mode auto, lumière de retour non détectée." -#: libexif/exif-entry.c:724 +#: libexif/exif-entry.c:647 msgid "Flash fired, auto mode, return light detected." msgstr "Flash déclenché, mode auto, lumière de retour détectée." -#: libexif/exif-entry.c:728 +#: libexif/exif-entry.c:651 msgid "No flash function." msgstr "Pas de fonction flash." -#: libexif/exif-entry.c:731 +#: libexif/exif-entry.c:654 msgid "Flash fired, red-eye reduction mode." msgstr "Flash déclenché, mode anti-yeux rouges." -#: libexif/exif-entry.c:735 +#: libexif/exif-entry.c:658 msgid "Flash fired, red-eye reduction mode, return light not detected." msgstr "" "Flash déclenché, mode anti-yeux rouges, lumière de retour non détectée." -#: libexif/exif-entry.c:739 +#: libexif/exif-entry.c:662 msgid "Flash fired, red-eye reduction mode, return light detected." msgstr "Flash déclenché, mode anti-yeux rouges, lumière de retour détectée." -#: libexif/exif-entry.c:743 +#: libexif/exif-entry.c:666 msgid "Flash fired, compulsory flash mode, red-eye reduction mode." msgstr "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges." -#: libexif/exif-entry.c:747 +#: libexif/exif-entry.c:670 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light not " "detected." @@ -410,7 +437,7 @@ "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière " "de retour non détectée." -#: libexif/exif-entry.c:752 +#: libexif/exif-entry.c:675 msgid "" "Flash fired, compulsory flash mode, red-eye reduction mode, return light " "detected." @@ -418,232 +445,232 @@ "Flash déclenché, mode de flash obligatoire, mode anti-yeux rouges, lumière " "de retour détectée" -#: libexif/exif-entry.c:757 +#: libexif/exif-entry.c:680 msgid "Flash fired, auto mode, red-eye reduction mode." msgstr "Flash déclenché, mode auto, mode anti-yeux rouges." -#: libexif/exif-entry.c:761 +#: libexif/exif-entry.c:684 msgid "" "Flash fired, auto mode, return light not detected, red-eye reduction mode." msgstr "" "Flash déclenché, mode auto, lumière de retour non détectée, mode anti-yeux " "rouges." -#: libexif/exif-entry.c:766 +#: libexif/exif-entry.c:689 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode." msgstr "" "Flash déclenché, mode auto, lumière de retour détectée, mode anti-yeux " "rouges." -#: libexif/exif-entry.c:777 +#: libexif/exif-entry.c:700 #, c-format msgid "%i bytes unknown data" msgstr "%i de données inconnues" -#: libexif/exif-entry.c:786 +#: libexif/exif-entry.c:709 msgid "Normal process" msgstr "Processus normal" -#: libexif/exif-entry.c:789 +#: libexif/exif-entry.c:712 msgid "Custom process" msgstr "Processus personnel" -#: libexif/exif-entry.c:802 +#: libexif/exif-entry.c:725 msgid "Auto exposure" msgstr "Exposition automatique" -#: libexif/exif-entry.c:805 +#: libexif/exif-entry.c:728 msgid "Manual exposure" msgstr "Exposition manuel" -#: libexif/exif-entry.c:808 +#: libexif/exif-entry.c:731 msgid "Auto bracket" msgstr "Bracketing automatique" -#: libexif/exif-entry.c:821 +#: libexif/exif-entry.c:744 msgid "Auto white balance" msgstr "Balance des blancs automatique" -#: libexif/exif-entry.c:824 +#: libexif/exif-entry.c:747 msgid "Manual white balance" msgstr "Balance des blancs manuelle" -#: libexif/exif-entry.c:837 +#: libexif/exif-entry.c:760 msgid "Standard" msgstr "Standard" -#: libexif/exif-entry.c:840 +#: libexif/exif-entry.c:763 msgid "Landscape" msgstr "Paysage" -#: libexif/exif-entry.c:843 +#: libexif/exif-entry.c:766 msgid "Portrait" msgstr "Portrait" -#: libexif/exif-entry.c:846 +#: libexif/exif-entry.c:769 msgid "Night scene" msgstr "Scène de nuit" -#: libexif/exif-entry.c:859 libexif/exif-entry.c:884 libexif/exif-entry.c:904 +#: libexif/exif-entry.c:782 libexif/exif-entry.c:807 libexif/exif-entry.c:827 msgid "Normal" msgstr "Normal" -#: libexif/exif-entry.c:862 +#: libexif/exif-entry.c:785 msgid "Low gain up" msgstr "" -#: libexif/exif-entry.c:865 +#: libexif/exif-entry.c:788 msgid "High gain up" msgstr "" -#: libexif/exif-entry.c:868 +#: libexif/exif-entry.c:791 msgid "Low gain down" msgstr "" -#: libexif/exif-entry.c:871 +#: libexif/exif-entry.c:794 msgid "High gain down" msgstr "" -#: libexif/exif-entry.c:887 +#: libexif/exif-entry.c:810 msgid "Low saturation" msgstr "Saturation faible" -#: libexif/exif-entry.c:890 +#: libexif/exif-entry.c:813 msgid "High saturation" msgstr "Saturation forte" -#: libexif/exif-entry.c:907 +#: libexif/exif-entry.c:830 msgid "Soft" msgstr "Doux" -#: libexif/exif-entry.c:910 +#: libexif/exif-entry.c:833 msgid "Hard" msgstr "Dur" -#: libexif/exif-entry.c:926 +#: libexif/exif-entry.c:849 msgid "Macro" msgstr "Macro" -#: libexif/exif-entry.c:929 +#: libexif/exif-entry.c:852 msgid "Close view" msgstr "Vue de près" -#: libexif/exif-entry.c:932 +#: libexif/exif-entry.c:855 msgid "Distant view" msgstr "Vue de loin" -#: libexif/exif-entry.c:952 +#: libexif/exif-entry.c:875 #, c-format msgid "Within distance %i of (x,y) = (%i,%i)" msgstr "Dans la distance %i de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:961 +#: libexif/exif-entry.c:884 #, c-format msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)" msgstr "Dans le rectangle (largeur %i, hauteur %i) autour de (x,y) = (%i,%i)" -#: libexif/exif-entry.c:967 +#: libexif/exif-entry.c:890 #, c-format msgid "Unexpected number of components (%li, expected 2, 3, or 4)." msgstr "Nombre inattendu de composants (%li, attendait 2, 3, ou 4)." -#: libexif/exif-entry.c:1141 +#: libexif/exif-entry.c:1065 msgid "unknown" msgstr "inconnu" -#: libexif/exif-entry.c:1144 +#: libexif/exif-entry.c:1068 msgid "average" msgstr "moyenne" -#: libexif/exif-entry.c:1147 +#: libexif/exif-entry.c:1071 msgid "center-weight" msgstr "Centre pondéré" -#: libexif/exif-entry.c:1150 +#: libexif/exif-entry.c:1074 msgid "spot" msgstr "spot" -#: libexif/exif-entry.c:1153 +#: libexif/exif-entry.c:1077 msgid "multi-spot" msgstr "multi-spots" -#: libexif/exif-entry.c:1156 +#: libexif/exif-entry.c:1080 msgid "matrix" msgstr "matrice" -#: libexif/exif-entry.c:1159 +#: libexif/exif-entry.c:1083 msgid "partial" msgstr "partiel" -#: libexif/exif-entry.c:1162 +#: libexif/exif-entry.c:1086 msgid "other" msgstr "autre" -#: libexif/exif-entry.c:1175 +#: libexif/exif-entry.c:1099 msgid "sunny" msgstr "ensoleillé" -#: libexif/exif-entry.c:1178 +#: libexif/exif-entry.c:1102 msgid "fluorescent" msgstr "fluorescent" -#: libexif/exif-entry.c:1181 +#: libexif/exif-entry.c:1105 msgid "tungsten" msgstr "tungsten" -#: libexif/exif-entry.c:1184 +#: libexif/exif-entry.c:1108 msgid "cloudy" msgstr "nuageux" -#: libexif/exif-entry.c:1196 +#: libexif/exif-entry.c:1120 msgid "in" msgstr "pouces" -#: libexif/exif-entry.c:1199 +#: libexif/exif-entry.c:1123 msgid "cm" msgstr "cm" -#: libexif/exif-entry.c:1211 +#: libexif/exif-entry.c:1135 msgid "manual" msgstr "manuel" -#: libexif/exif-entry.c:1214 +#: libexif/exif-entry.c:1138 msgid "normal" msgstr "normal" -#: libexif/exif-entry.c:1217 +#: libexif/exif-entry.c:1141 msgid "aperture" msgstr "ouverture" -#: libexif/exif-entry.c:1220 +#: libexif/exif-entry.c:1144 msgid "shutter" msgstr "obturation" -#: libexif/exif-entry.c:1223 +#: libexif/exif-entry.c:1147 msgid "creative" msgstr "créatif" -#: libexif/exif-entry.c:1226 +#: libexif/exif-entry.c:1150 msgid "action" msgstr "action" -#: libexif/exif-entry.c:1229 +#: libexif/exif-entry.c:1153 msgid "portrait" msgstr "portrait" -#: libexif/exif-entry.c:1232 +#: libexif/exif-entry.c:1156 msgid "landscape" msgstr "paysage" -#: libexif/exif-entry.c:1244 +#: libexif/exif-entry.c:1168 msgid "yes" msgstr "oui" -#: libexif/exif-entry.c:1247 +#: libexif/exif-entry.c:1171 msgid "w/o strobe" msgstr "" -#: libexif/exif-entry.c:1250 +#: libexif/exif-entry.c:1174 msgid "w. strobe" msgstr "" @@ -1403,12 +1430,11 @@ #: libexif/exif-tag.c:400 msgid "" -"The color space information tag (<ColorSpace>) is always recorede as the " -"color space specifier. Normally sRGB (=1) is used to define the color space " -"based on the PC monitor conditions and environment. If a color space other " -"than sRGB is used, Uncalibrated (=FFFF.H) is set. Image data recorded as " -"Uncalibrated can be treated as sRGB when it is converted to FlashPix. On " -"sRGB see Appendix E." +"The color space information tag is always recorded as the color space " +"specifier. Normally sRGB (=1) is used to define the color space based on the " +"PC monitor conditions and environment. If a color space other than sRGB is " +"used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated can " +"be treated as sRGB when it is converted to FlashPix. On sRGB see Appendix E." msgstr "" #: libexif/exif-tag.c:408 |
|
From: Lutz M?l. <lu...@us...> - 2003-08-04 19:51:56
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv1236 Modified Files: ChangeLog Makefile.am configure.in Log Message: 2003-08-04 Lutz Mueller <lu...@us...> * po/*.po: Updated. * Makefile.am: Add m4 and intl to SUBDIRS. automake complains otherwise. * configure.in: Add m4/Makefile. make distcheck complains otherwise. Version 0.5.12 Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- configure.in 30 Jul 2003 20:39:28 -0000 1.52 +++ configure.in 4 Aug 2003 19:51:52 -0000 1.53 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT(libexif/exif-data.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libexif, 0.5.11) +AM_INIT_AUTOMAKE(libexif, 0.5.12) AM_MAINTAINER_MODE dnl --------------------------------------------------------------------------- @@ -58,6 +58,9 @@ libexif.spec libexif/Makefile libjpeg/Makefile + intl/Makefile + m4/Makefile + po/Makefile.in test/Makefile libexif/libexif.pc ]) Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Makefile.am 3 Jan 2003 14:06:46 -0000 1.18 +++ Makefile.am 4 Aug 2003 19:51:52 -0000 1.19 @@ -1,3 +1,5 @@ -SUBDIRS = libexif libjpeg test po +SUBDIRS = intl m4 libexif libjpeg test po -EXTRA_DIST = @PACKAGE@.spec +EXTRA_DIST = config.rpath mkinstalldirs @PACKAGE@.spec + +ACLOCAL_AMFLAGS = -I m4 Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- ChangeLog 30 Jul 2003 20:39:28 -0000 1.69 +++ ChangeLog 4 Aug 2003 19:51:52 -0000 1.70 @@ -1,3 +1,11 @@ +2003-08-04 Lutz Mueller <lu...@us...> + + * po/*.po: Updated. + * Makefile.am: Add m4 and intl to SUBDIRS. automake complains + otherwise. + * configure.in: Add m4/Makefile. make distcheck complains otherwise. + Version 0.5.12 + 2003-07-30 Lutz Mueller <lu...@us...> * configure.in: Version 0.5.11 |
|
From: Lutz M?l. <lu...@us...> - 2003-08-01 20:43:03
|
Update of /cvsroot/libexif/libexif-gtk/libexif-gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv8346/libexif-gtk
Modified Files:
gtk-exif-browser.c gtk-exif-content-list.c
gtk-exif-content-list.h gtk-exif-entry-resolution.c
Log Message:
2003-08-01 Lutz Mueller <lu...@us...>
* libexif-gtk/gtk-exif-browser.c: Implement removal of entries.
Index: gtk-exif-content-list.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-content-list.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtk-exif-content-list.c 15 Dec 2002 11:41:28 -0000 1.8
+++ gtk-exif-content-list.c 1 Aug 2003 20:43:00 -0000 1.9
@@ -363,31 +363,58 @@
}
static gboolean
-update_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
- void *data)
+gtk_exif_content_list_get_iter (GtkExifContentList *list, ExifEntry *e,
+ GtkTreeIter *iter)
{
- ExifEntry *e = data;
+ GtkTreeModel *model;
GValue value = {0};
+ g_return_val_if_fail (GTK_EXIF_IS_CONTENT_LIST (list), FALSE);
+ g_return_val_if_fail (e != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ model = GTK_TREE_MODEL (list->priv->store);
+ if (!gtk_tree_model_get_iter_first (model, iter)) return FALSE;
gtk_tree_model_get_value (model, iter, ENTRY_COLUMN, &value);
if (g_value_peek_pointer (&value) == e) {
g_value_unset (&value);
- gtk_list_store_set (GTK_LIST_STORE (model), iter,
- VALUE_COLUMN, exif_entry_get_value (e), -1);
- return (TRUE);
+ return TRUE;
}
g_value_unset (&value);
- return (FALSE);
+ while (gtk_tree_model_iter_next (model, iter)) {
+ gtk_tree_model_get_value (model, iter, ENTRY_COLUMN, &value);
+ if (g_value_peek_pointer (&value) == e) {
+ g_value_unset (&value);
+ return TRUE;
+ }
+ g_value_unset (&value);
+ }
+ return FALSE;
}
void
-gtk_exif_content_list_update_entry (GtkExifContentList *list, ExifEntry *entry)
+gtk_exif_content_list_update_entry (GtkExifContentList *list, ExifEntry *e)
{
+ GtkTreeIter iter;
+
+ g_return_if_fail (GTK_EXIF_IS_CONTENT_LIST (list));
+ g_return_if_fail (e != NULL);
+
+ if (!gtk_exif_content_list_get_iter (list, e, &iter)) return;
+ gtk_list_store_set (list->priv->store, &iter,
+ VALUE_COLUMN, exif_entry_get_value (e), -1);
+}
+
+void
+gtk_exif_content_list_remove_entry (GtkExifContentList *list, ExifEntry *entry)
+{
+ GtkTreeIter iter;
+
g_return_if_fail (GTK_EXIF_IS_CONTENT_LIST (list));
g_return_if_fail (entry != NULL);
- gtk_tree_model_foreach (GTK_TREE_MODEL (list->priv->store),
- update_foreach_func, entry);
+ if (!gtk_exif_content_list_get_iter (list, entry, &iter)) return;
+ gtk_list_store_remove (list->priv->store, &iter);
}
void
Index: gtk-exif-content-list.h
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-content-list.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtk-exif-content-list.h 15 Dec 2002 11:41:28 -0000 1.3
+++ gtk-exif-content-list.h 1 Aug 2003 20:43:00 -0000 1.4
@@ -60,6 +60,8 @@
ExifEntry *entry);
void gtk_exif_content_list_update_entry (GtkExifContentList *,
ExifEntry *);
+void gtk_exif_content_list_remove_entry (GtkExifContentList *,
+ ExifEntry *);
void gtk_exif_content_list_set_content (GtkExifContentList *,
ExifContent *);
Index: gtk-exif-browser.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-browser.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gtk-exif-browser.c 13 Apr 2003 10:47:58 -0000 1.15
+++ gtk-exif-browser.c 1 Aug 2003 20:43:00 -0000 1.16
@@ -143,7 +143,7 @@
gtk_object_sink (GTK_OBJECT (browser->priv->tooltips));
/* Placeholder */
- browser->priv->empty = gtk_label_new (g_locale_to_utf8 (_("Nothing selected."), -1, NULL, NULL, NULL));
+ browser->priv->empty = gtk_label_new (_("Nothing selected."));
gtk_widget_show (browser->priv->empty);
g_object_ref (G_OBJECT (browser->priv->empty));
}
@@ -157,18 +157,19 @@
GtkWidget *swin, *viewport;
GtkExifContentList *list = NULL;
+ g_return_val_if_fail (GTK_EXIF_IS_BROWSER (b), NULL);
+ g_return_val_if_fail (entry != NULL, NULL);
+
n = g_list_length (b->priv->notebook->children);
for (i = 0; i < n; i++) {
swin = gtk_notebook_get_nth_page (b->priv->notebook, i);
+ if (!GTK_IS_SCROLLED_WINDOW (swin)) continue;
viewport = GTK_BIN (swin)->child;
list = GTK_EXIF_CONTENT_LIST (GTK_BIN (viewport)->child);
if (list->content == entry->parent)
break;
}
- if (i == n)
- return NULL;
-
- return (list);
+ return (i == n) ? NULL : list;
}
static void
@@ -177,6 +178,8 @@
if (browser->priv->current)
gtk_container_remove (GTK_CONTAINER (browser->priv->info),
browser->priv->current);
+ if (!w) return;
+
gtk_box_pack_start (GTK_BOX (browser->priv->info), w, TRUE, FALSE, 0);
browser->priv->current = w;
}
@@ -210,6 +213,23 @@
static void
on_entry_removed (GtkExifEntry *entry, ExifEntry *e, GtkExifBrowser *b)
{
+ GtkExifContentList *list;
+
+ list = gtk_exif_browser_get_content_list (b, e);
+ if (!list) return;
+
+ switch (e->tag) {
+ case EXIF_TAG_RESOLUTION_UNIT:
+ case EXIF_TAG_X_RESOLUTION:
+ case EXIF_TAG_Y_RESOLUTION:
+ /* Do nothing. */
+ break;
+ default:
+ gtk_exif_browser_set_widget (b, b->priv->empty);
+ break;
+ }
+
+ gtk_exif_content_list_remove_entry (list, e);
}
static void
@@ -224,6 +244,11 @@
{
GtkWidget *w;
+ if (!entry) {
+ gtk_exif_browser_set_widget (browser, browser->priv->empty);
+ return;
+ }
+
switch (entry->tag) {
case EXIF_TAG_EXIF_VERSION:
case EXIF_TAG_FLASH_PIX_VERSION:
@@ -368,7 +393,7 @@
}
if (!b->priv->data->data) {
- b->priv->thumb = gtk_label_new (g_locale_to_utf8 (_("No thumbnail available."), -1, NULL, NULL, NULL));
+ b->priv->thumb = gtk_label_new (_("No thumbnail available."));
} else {
GdkPixbufLoader *loader;
GtkWidget *image;
@@ -376,8 +401,8 @@
loader = gdk_pixbuf_loader_new ();
if (!gdk_pixbuf_loader_write (loader,
b->priv->data->data, b->priv->data->size, NULL)) {
- b->priv->thumb = gtk_label_new (g_locale_to_utf8 (_("Could not parse "
- "thumbnail data."), -1, NULL, NULL, NULL));
+ b->priv->thumb = gtk_label_new (_("Could not parse "
+ "thumbnail data."));
} else {
gdk_pixbuf_loader_close (loader, NULL);
image = gtk_image_new_from_pixbuf (
@@ -391,7 +416,7 @@
GTK_SCROLLED_WINDOW (b->priv->thumb), image);
}
g_object_unref (G_OBJECT (loader));
- tip = g_strdup_printf (g_locale_to_utf8 (_("Size: %i byte(s)."), -1, NULL, NULL, NULL),
+ tip = g_strdup_printf (_("Size: %i byte(s)."),
b->priv->data->size);
gtk_tooltips_set_tip (b->priv->tooltips, b->priv->thumb,
tip, NULL);
@@ -460,7 +485,7 @@
{
GtkWidget *fsel;
- fsel = gtk_file_selection_new (g_locale_to_utf8 (_("Load..."), -1, NULL, NULL, NULL));
+ fsel = gtk_file_selection_new (_("Load..."));
gtk_widget_show (fsel);
g_signal_connect (GTK_OBJECT (fsel), "delete_event",
G_CALLBACK (gtk_object_destroy), NULL);
@@ -500,7 +525,7 @@
{
GtkWidget *fsel;
- fsel = gtk_file_selection_new (g_locale_to_utf8 (_("Save As..."), -1, NULL, NULL, NULL));
+ fsel = gtk_file_selection_new (_("Save As..."));
gtk_widget_show (fsel);
g_signal_connect (GTK_OBJECT (fsel), "delete_event",
G_CALLBACK (gtk_object_destroy), NULL);
@@ -550,7 +575,7 @@
/* Create the thumbnail page */
vbox = gtk_vbox_new (FALSE, 5);
gtk_widget_show (vbox);
- label = gtk_label_new (g_locale_to_utf8 (_("Thumbnail"), -1, NULL, NULL, NULL));
+ label = gtk_label_new (_("Thumbnail"));
gtk_widget_show (label);
gtk_notebook_append_page (b->priv->notebook, vbox, label);
@@ -567,17 +592,17 @@
gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
gtk_box_set_spacing (GTK_BOX (bbox), 5);
gtk_box_pack_end (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
- button = gtk_button_new_with_label (g_locale_to_utf8 (_("Load"), -1, NULL, NULL, NULL));
+ button = gtk_button_new_with_label (_("Load"));
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (bbox), button);
g_signal_connect (GTK_OBJECT (button), "clicked",
G_CALLBACK (on_load_clicked), b);
- button = gtk_button_new_with_label (g_locale_to_utf8 (_("Save"), -1, NULL, NULL, NULL));
+ button = gtk_button_new_with_label (_("Save"));
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (bbox), button);
g_signal_connect (GTK_OBJECT (button), "clicked",
G_CALLBACK (on_save_clicked), b);
- button = gtk_button_new_with_label (g_locale_to_utf8 (_("Delete"), -1, NULL, NULL, NULL));
+ button = gtk_button_new_with_label (_("Delete"));
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (bbox), button);
g_signal_connect (GTK_OBJECT (button), "clicked",
Index: gtk-exif-entry-resolution.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-entry-resolution.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtk-exif-entry-resolution.c 1 Aug 2003 19:40:51 -0000 1.9
+++ gtk-exif-entry-resolution.c 1 Aug 2003 20:43:00 -0000 1.10
@@ -307,10 +307,10 @@
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
} else if (!toggle->active && e) {
- exif_entry_ref (e);
- exif_content_remove_entry (entry->priv->content, e);
+ g_object_ref (entry);
gtk_exif_entry_removed (GTK_EXIF_ENTRY (entry), e);
- exif_entry_unref (e);
+ exif_content_remove_entry (entry->priv->content, e);
+ g_object_unref (entry);
}
}
@@ -331,10 +331,10 @@
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
} else if (!toggle->active && e) {
- exif_entry_ref (e);
- exif_content_remove_entry (entry->priv->content, e);
+ g_object_ref (entry);
gtk_exif_entry_removed (GTK_EXIF_ENTRY (entry), e);
- exif_entry_unref (e);
+ exif_content_remove_entry (entry->priv->content, e);
+ g_object_unref (entry);
}
}
@@ -355,10 +355,10 @@
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
} else if (!toggle->active && e) {
- exif_entry_ref (e);
- exif_content_remove_entry (entry->priv->content, e);
+ g_object_ref (entry);
gtk_exif_entry_removed (GTK_EXIF_ENTRY (entry), e);
- exif_entry_unref (e);
+ exif_content_remove_entry (entry->priv->content, e);
+ g_object_unref (entry);
}
}
|
|
From: Lutz M?l. <lu...@us...> - 2003-08-01 20:43:03
|
Update of /cvsroot/libexif/libexif-gtk In directory sc8-pr-cvs1:/tmp/cvs-serv8346 Modified Files: ChangeLog Log Message: 2003-08-01 Lutz Mueller <lu...@us...> * libexif-gtk/gtk-exif-browser.c: Implement removal of entries. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChangeLog 1 Aug 2003 19:40:51 -0000 1.15 +++ ChangeLog 1 Aug 2003 20:43:00 -0000 1.16 @@ -1,5 +1,9 @@ 2003-08-01 Lutz Mueller <lu...@us...> + * libexif-gtk/gtk-exif-browser.c: Implement removal of entries. + +2003-08-01 Lutz Mueller <lu...@us...> + * libexif-gtk/gtk-exif-entry-resolution.c: An entry must have a parent before initialization. |
|
From: Lutz M?l. <lu...@us...> - 2003-08-01 19:40:54
|
Update of /cvsroot/libexif/libexif-gtk/libexif-gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv26518/libexif-gtk
Modified Files:
gtk-exif-entry-resolution.c
Log Message:
2003-08-01 Lutz Mueller <lu...@us...>
* libexif-gtk/gtk-exif-entry-resolution.c: An entry must have a
parent before initialization.
Index: gtk-exif-entry-resolution.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-entry-resolution.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gtk-exif-entry-resolution.c 3 Jan 2003 14:32:20 -0000 1.8
+++ gtk-exif-entry-resolution.c 1 Aug 2003 19:40:51 -0000 1.9
@@ -301,8 +301,8 @@
gtk_widget_set_sensitive (entry->priv->ox.sq, toggle->active);
if (toggle->active && !e) {
e = exif_entry_new ();
- exif_entry_initialize (e, entry->priv->tag_x);
exif_content_add_entry (entry->priv->content, e);
+ exif_entry_initialize (e, entry->priv->tag_x);
gtk_exif_entry_resolution_load (entry, e);
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
@@ -325,8 +325,8 @@
gtk_widget_set_sensitive (entry->priv->oy.sq, toggle->active);
if (toggle->active && !e) {
e = exif_entry_new ();
- exif_entry_initialize (e, entry->priv->tag_y);
exif_content_add_entry (entry->priv->content, e);
+ exif_entry_initialize (e, entry->priv->tag_y);
gtk_exif_entry_resolution_load (entry, e);
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
@@ -349,8 +349,8 @@
toggle->active);
if (toggle->active && !e) {
e = exif_entry_new ();
- exif_entry_initialize (e, entry->priv->tag_u);
exif_content_add_entry (entry->priv->content, e);
+ exif_entry_initialize (e, entry->priv->tag_u);
gtk_exif_entry_resolution_load_unit (entry, e);
exif_entry_unref (e);
gtk_exif_entry_added (GTK_EXIF_ENTRY (entry), e);
|
|
From: Lutz M?l. <lu...@us...> - 2003-08-01 19:40:54
|
Update of /cvsroot/libexif/libexif-gtk In directory sc8-pr-cvs1:/tmp/cvs-serv26518 Modified Files: ChangeLog Log Message: 2003-08-01 Lutz Mueller <lu...@us...> * libexif-gtk/gtk-exif-entry-resolution.c: An entry must have a parent before initialization. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChangeLog 11 Dec 2002 21:59:16 -0000 1.14 +++ ChangeLog 1 Aug 2003 19:40:51 -0000 1.15 @@ -1,3 +1,8 @@ +2003-08-01 Lutz Mueller <lu...@us...> + + * libexif-gtk/gtk-exif-entry-resolution.c: An entry must have a + parent before initialization. + 2002-12-11 Lutz Müller <lu...@us...> * libexif-gtk/gtk-exif-content-list.c: Split the endless list of tags. |
|
From: Lutz M?l. <lu...@us...> - 2003-07-30 20:39:31
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv26474 Modified Files: ChangeLog configure.in Log Message: 2003-07-30 Lutz Mueller <lu...@us...> * configure.in: Version 0.5.11 Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- configure.in 20 Jul 2003 19:27:40 -0000 1.51 +++ configure.in 30 Jul 2003 20:39:28 -0000 1.52 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT(libexif/exif-data.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libexif, 0.5.10) +AM_INIT_AUTOMAKE(libexif, 0.5.11) AM_MAINTAINER_MODE dnl --------------------------------------------------------------------------- @@ -15,7 +15,7 @@ dnl removals. dnl --------------------------------------------------------------------------- LIBEXIF_AGE=2 -LIBEXIF_REVISION=0 +LIBEXIF_REVISION=1 LIBEXIF_CURRENT=9 AC_SUBST(LIBEXIF_AGE) AC_SUBST(LIBEXIF_REVISION) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- ChangeLog 29 Jul 2003 22:45:10 -0000 1.68 +++ ChangeLog 30 Jul 2003 20:39:28 -0000 1.69 @@ -1,5 +1,9 @@ 2003-07-30 Lutz Mueller <lu...@us...> + * configure.in: Version 0.5.11 + +2003-07-30 Lutz Mueller <lu...@us...> + * libexif/exif-data.c: Patch by Torgeir Hansen <to...@tr...> to prevent endless loops. |
|
From: Lutz M?l. <lu...@us...> - 2003-07-29 22:45:13
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv30106 Modified Files: ChangeLog Log Message: 2003-07-30 Lutz Mueller <lu...@us...> * libexif/exif-data.c: Patch by Torgeir Hansen <to...@tr...> to prevent endless loops. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- ChangeLog 29 Jul 2003 22:19:40 -0000 1.67 +++ ChangeLog 29 Jul 2003 22:45:10 -0000 1.68 @@ -1,5 +1,10 @@ 2003-07-30 Lutz Mueller <lu...@us...> + * libexif/exif-data.c: Patch by Torgeir Hansen <to...@tr...> + to prevent endless loops. + +2003-07-30 Lutz Mueller <lu...@us...> + * libexif/exif-entry.c: Don't crash if entries are totally insane. 2003-07-20 Lutz Mueller <lu...@us...> |
|
From: Lutz M?l. <lu...@us...> - 2003-07-29 22:45:13
|
Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv30106/libexif
Modified Files:
exif-data.c
Log Message:
2003-07-30 Lutz Mueller <lu...@us...>
* libexif/exif-data.c: Patch by Torgeir Hansen <to...@tr...>
to prevent endless loops.
Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- exif-data.c 18 Mar 2003 07:13:24 -0000 1.24
+++ exif-data.c 29 Jul 2003 22:45:10 -0000 1.25
@@ -660,7 +660,7 @@
loader = exif_loader_new ();
while (1) {
size = fread (data, 1, 1024, f);
- if (size < 0) break;
+ if (size <= 0) break;
if (!exif_loader_write (loader, data, size)) break;
}
fclose (f);
|
|
From: Lutz M?l. <lu...@us...> - 2003-07-29 22:19:43
|
Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv25869/libexif
Modified Files:
exif-entry.c
Log Message:
2003-07-30 Lutz Mueller <lu...@us...>
* libexif/exif-entry.c: Don't crash if entries are totally insane.
Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- exif-entry.c 30 Apr 2003 23:51:44 -0000 1.35
+++ exif-entry.c 29 Jul 2003 22:19:40 -0000 1.36
@@ -165,6 +165,14 @@
memset (v, 0, sizeof (v));
memset (b, 0, sizeof (b));
+ /* Sanity check */
+ if (e->size != e->components * exif_format_get_size (e->format)) {
+ snprintf (v, sizeof (v), _("Invalid size of entry (%i, "
+ "expected %li x %i)."), e->size, e->components,
+ exif_format_get_size (e->format));
+ return v;
+ }
+
switch (e->tag) {
case EXIF_TAG_USER_COMMENT:
CF (e->format, EXIF_FORMAT_UNDEFINED, v);
@@ -884,6 +892,7 @@
e->components);
}
default:
+ if (!e->components) break;
switch (e->format) {
case EXIF_FORMAT_UNDEFINED:
break;
|
|
From: Lutz M?l. <lu...@us...> - 2003-07-29 22:19:43
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv25869 Modified Files: ChangeLog Log Message: 2003-07-30 Lutz Mueller <lu...@us...> * libexif/exif-entry.c: Don't crash if entries are totally insane. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- ChangeLog 20 Jul 2003 19:27:40 -0000 1.66 +++ ChangeLog 29 Jul 2003 22:19:40 -0000 1.67 @@ -1,3 +1,7 @@ +2003-07-30 Lutz Mueller <lu...@us...> + + * libexif/exif-entry.c: Don't crash if entries are totally insane. + 2003-07-20 Lutz Mueller <lu...@us...> * configure.in: Version 0.5.10 |
|
From: Lutz M?l. <lu...@us...> - 2003-07-24 20:18:15
|
Update of /cvsroot/libexif/libmnote/libmnote/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv21220/libmnote/olympus
Modified Files:
mnote-olympus-data.c mnote-olympus-entry.c
mnote-olympus-entry.h mnote-olympus-tag.c mnote-olympus-tag.h
Log Message:
2003-07-24 Lutz Mueller <lu...@us...>
* libmnote: Lots of improvements from Al Evans <al...@tb...>.
Index: mnote-olympus-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-data.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-olympus-data.c 15 Dec 2002 11:44:19 -0000 1.3
+++ mnote-olympus-data.c 24 Jul 2003 20:18:11 -0000 1.4
@@ -77,6 +77,23 @@
return (value);
}
+#ifdef DEBUG
+// Look at memory around p
+static void dump_memory_around(const unsigned char *p)
+{
+ static char *format = "%xl %xl %xl %xl\n";
+ static unsigned buf[4];
+ unsigned int i;
+
+ for (i = 0; i < 5; i++) {
+ memcpy(buf, p - 32 + (16 * i), sizeof(buf));
+ printf(format, buf[0], buf[1], buf[2], buf[3]);
+ }
+
+}
+#endif
+
+
static void
mnote_olympus_data_load_data_entry (MNoteOlympusData *note,
MNoteOlympusEntry *entry,
@@ -85,6 +102,7 @@
{
unsigned int s, doff;
ExifByteOrder order = mnote_data_get_byte_order ((MNoteData *) note);
+ const unsigned char *d_orig = d;
entry->tag = exif_get_short (d + offset + 0, order);
entry->format = exif_get_short (d + offset + 2, order);
@@ -95,24 +113,54 @@
* in the entry but somewhere else (offset).
*/
s = exif_format_get_size (entry->format) * entry->components;
+#ifdef DEBUG
+ printf ("exif get size is %i ", exif_format_get_size (entry->format));
+ printf ("entry format is %i, #components is %li, ",
+ entry->format, entry->components);
+ printf ("entry size is %i\n", s);
+#endif
if (!s)
return;
- if (s > 4)
+ if (s > 4) {
+
+ /*
+ THIS DOES NOT WORK!
+ The problem is that d points to the first MakerNote Tag.
+ According to the EXIF 2.1 spec, it should point to the
+ TIFF header preceding the EXIF information.
+ I have tried rolling it back by 10 bytes (pointing to the
+ OLYMP) and by 18 bytes (assuming the TIFF header immediately
+ precedes the OLYMP). Neither of these hacks produced any
+ meaningful data within 32 bytes of the pointer, for a
+ case in which I know the desired values of the numerator
+ and denominator of a rational.
+ */
doff = exif_get_long (d + offset + 8, order);
- else
+ d_orig = d + doff;
+#ifdef DEBUG
+ printf("**** data offset is %i\n", doff);
+ dump_memory_around(d_orig);
+#endif
+ }
+ else {
doff = offset + 8;
+ d_orig = d + doff;
+ }
+
/* Sanity check */
- if (size < doff + s)
+ /* This doesn't work if the data is outside the tag!! */
+ if ((s <= 4) && (size < doff + s))
return;
entry->data = malloc (sizeof (char) * s);
if (!entry->data)
return;
entry->size = s;
- memcpy (entry->data, d + doff, s);
+ memcpy (entry->data, d_orig, s);
}
+
static void
mnote_olympus_data_load_data (MNoteData *en, const unsigned char *data,
unsigned int size)
@@ -120,51 +168,84 @@
MNoteOlympusData *note = (MNoteOlympusData *) en;
MNoteOlympusTag tag;
MNoteOlympusEntry *entry;
- unsigned int i, n;
- ExifByteOrder order = mnote_data_get_byte_order (en);
- /* Verify the header */
- if ((size < 5) || memcmp (data, "OLYMP", 5))
- return;
- data += 5;
- size -= 5;
-
- /* 2 unknown bytes */
- if ((size < 2) || (data[0] != 0x00) || (data[1] != 0x01))
- return;
- data += 2;
- size -= 2;
-
- /* Number of entries */
- if (size < 2)
- return;
- n = exif_get_short (data, order);
+ // Check for reality and usefulness
+ // -- needs to start with OLYMP
+ // -- if < 22 bytes, hasn't got space for any entries
+ if ((size < 22) || memcmp(data, "OLYMP", 5)) {
#ifdef DEBUG
- printf ("Reading %i entries...\n", n);
+ printf("Olympus maker note malformed or too small\n");
#endif
- data += 2;
- size -= 2;
-
- /* 2 unknown bytes */
- if ((size < 2) || (data[0] != 0x00) || (data[1] != 0x00))
return;
- data += 2;
- size -= 2;
+ }
+ else {
+ ExifByteOrder order = mnote_data_get_byte_order (en);
+ short nEntries = exif_get_short (data + 8, order);
+ const unsigned char *tagEntries = data + 10;
+ unsigned int i;
- for (i = 0; i < n; i++) {
- tag = exif_get_short (data + 12 * i, order);
+ for (i = 0; i < nEntries; i++) {
+ tag = exif_get_short (tagEntries + 12 * i, order);
#ifdef DEBUG
- printf ("Loading entry '%s' (%i)...\n",
- mnote_olympus_tag_get_name (tag), i + 1);
+ printf ("Loading entry '%s' (%x) (%i)...\n",
+ mnote_olympus_tag_get_name (tag), tag, i + 1);
#endif
entry = mnote_olympus_entry_new ();
mnote_olympus_data_add_entry (note, entry);
- mnote_olympus_data_load_data_entry (note, entry, data, size,
+ mnote_olympus_data_load_data_entry (note, entry, tagEntries, size,
12 * i);
mnote_olympus_entry_unref (entry);
}
+ }
+
+
+}
+static unsigned int
+mnote_olympus_get_count (MNoteData *n)
+{
+ MNoteOlympusData *note = (MNoteOlympusData *) n;
+
+ return (note->count);
}
+static MNoteEntry *
+mnote_olympus_get_entry (MNoteData *n, MNoteTag t)
+{
+ MNoteOlympusData *note = (MNoteOlympusData *) n;
+ MNoteOlympusTag tag = (MNoteOlympusTag) t;
+ unsigned int i;
+ MNoteEntry *entry = NULL;
+
+ for (i = 0; !entry && i < note->count; i++) {
+ if (note->entries[i]->tag == tag) {
+ entry = note->entries[i];
+ }
+ }
+
+ return (entry);
+}
+
+static void
+mnote_olympus_foreach_entry (MNoteData *n, MNoteDataForeachEntryFunc func, void *data)
+{
+ MNoteOlympusData *note = (MNoteOlympusData *) n;
+ unsigned int i;
+
+ if (!note || !func) {
+#ifdef DEBUG
+ if (!note) printf("No note in foreach_entry\n");
+ if (!func) printf("No func in foreach_entry\n");
+#endif
+ return;
+ }
+ printf("In mnote_olympus_foreach_entry for %d entries\n", note->count);
+ for (i = 0; i < note->count; i++) {
+ printf ("Calling func for i = %i\n", i);
+ func (n, (MNoteTag)note->entries[i]->tag, data);
+ }
+}
+
+
MNoteData *
mnote_olympus_data_new (void)
{
@@ -177,8 +258,12 @@
mnote_data_construct ((MNoteData *) note);
((MNoteData *) note)->methods.free = mnote_olympus_data_free;
((MNoteData *) note)->methods.load_data = mnote_olympus_data_load_data;
+ ((MNoteData *) note)->methods.get_count = mnote_olympus_get_count;
+ ((MNoteData *) note)->methods.get_entry = mnote_olympus_get_entry;
+ ((MNoteData *) note)->methods.foreach_entry = mnote_olympus_foreach_entry;
((MNoteData *) note)->methods.get_tag_name = mnote_olympus_tag_get_name;
((MNoteData *) note)->methods.get_value = mnote_olympus_data_get_value;
+ ((MNoteData *) note)->methods.dump_entry = mnote_olympus_entry_dump;
return ((MNoteData *) note);
}
Index: mnote-olympus-entry.h
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-entry.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-entry.h 15 Dec 2002 11:44:19 -0000 1.2
+++ mnote-olympus-entry.h 24 Jul 2003 20:18:11 -0000 1.3
@@ -51,4 +51,6 @@
char *mnote_olympus_entry_get_value (MNoteOlympusEntry *entry);
+void mnote_olympus_entry_dump (MNoteEntry *entry, unsigned int indent);
+
#endif /* __MNOTE_OLYMPUS_ENTRY_H__ */
Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-tag.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mnote-olympus-tag.c 15 Dec 2002 11:44:19 -0000 1.4
+++ mnote-olympus-tag.c 24 Jul 2003 20:18:11 -0000 1.5
@@ -34,13 +34,19 @@
{MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), ""},
{MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), ""},
{MNOTE_OLYMPUS_TAG_UNKNOWN_1, "Unknown1", N_("Unknown 1"), ""},
- {MNOTE_OLYMPUS_TAG_ZOOM, "Zoom", N_("Zoom"), ""},
+ {MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""},
{MNOTE_OLYMPUS_TAG_UNKNOWN_2, "Unknown2", N_("Unknown 2"), ""},
{MNOTE_OLYMPUS_TAG_UNKNOWN_3, "Unknown3", N_("Unknown 3"), ""},
{MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), ""},
{MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), ""},
{MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), ""},
{MNOTE_OLYMPUS_TAG_UNKNOWN_4, "Unknown4", N_("Unknown 4"), ""},
+ {MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), ""},
+ {MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
+ {MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), ""},
+ {MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), ""},
+ {MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), ""},
+ {MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), ""},
{0, NULL, NULL, NULL}
};
Index: mnote-olympus-tag.h
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-tag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-tag.h 15 Dec 2002 11:44:19 -0000 1.2
+++ mnote-olympus-tag.h 24 Jul 2003 20:18:11 -0000 1.3
@@ -32,13 +32,19 @@
MNOTE_OLYMPUS_TAG_QUALITY = 0x0201,
MNOTE_OLYMPUS_TAG_MACRO = 0x0202,
MNOTE_OLYMPUS_TAG_UNKNOWN_1 = 0x0203,
- MNOTE_OLYMPUS_TAG_ZOOM = 0x0204,
+ MNOTE_OLYMPUS_TAG_DIGIZOOM = 0x0204,
MNOTE_OLYMPUS_TAG_UNKNOWN_2 = 0x0205,
MNOTE_OLYMPUS_TAG_UNKNOWN_3 = 0x0206,
MNOTE_OLYMPUS_TAG_VERSION = 0x0207,
MNOTE_OLYMPUS_TAG_INFO = 0x0208,
MNOTE_OLYMPUS_TAG_ID = 0x0209,
- MNOTE_OLYMPUS_TAG_UNKNOWN_4 = 0x0f04
+ MNOTE_OLYMPUS_TAG_UNKNOWN_4 = 0x0f04,
+ MNOTE_OLYMPUS_TAG_FLASHMODE = 0x1004,
+ MNOTE_OLYMPUS_TAG_MANFOCUS = 0x100b,
+ MNOTE_OLYMPUS_TAG_FOCUSDIST = 0x100c,
+ MNOTE_OLYMPUS_TAG_SHARPNESS = 0x100f,
+ MNOTE_OLYMPUS_TAG_WBALANCE = 0x1015,
+ MNOTE_OLYMPUS_TAG_CONTRAST = 0x1029
};
typedef enum _MNoteOlympusTag MNoteOlympusTag;
Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mnote-olympus-entry.c 15 Dec 2002 11:44:19 -0000 1.4
+++ mnote-olympus-entry.c 24 Jul 2003 20:18:11 -0000 1.5
@@ -43,7 +43,7 @@
return (NULL);
memset (entry, 0, sizeof (MNoteOlympusEntry));
- entry->priv = malloc (sizeof (MNoteOlympusEntry));
+ entry->priv = malloc (sizeof (MNoteOlympusEntryPrivate));
if (!entry->priv) {
mnote_olympus_entry_free (entry);
return (NULL);
@@ -94,6 +94,34 @@
free (entry);
}
+void
+mnote_olympus_entry_dump (MNoteEntry *e, unsigned int indent)
+{
+ MNoteOlympusEntry *entry = (MNoteOlympusEntry *)e;
+
+ char buf[1024];
+ unsigned int i;
+
+ for (i = 0; i < 2 * indent; i++)
+ buf[i] = ' ';
+ buf[i] = '\0';
+
+ if (!e) {
+ printf("No entry in mnote_olympus_entry_dump!\n");
+ return;
+ }
+
+ printf ("%sTag: 0x%x ('%s')\n", buf, entry->tag,
+ mnote_olympus_tag_get_name (entry->tag));
+ printf ("%s Format: %i ('%s')\n", buf, entry->format,
+ exif_format_get_name (entry->format));
+ printf ("%s Components: %i\n", buf, (int) entry->components);
+ printf ("%s Size: %i\n", buf, entry->size);
+ if (entry->size > 0) {
+ printf ("%s Value: %s\n", buf, mnote_olympus_entry_get_value (entry));
+ }
+}
+
#define CF(format,target,v) \
{ \
if (format != target) { \
@@ -125,6 +153,7 @@
ExifByteOrder order;
ExifLong vl;
ExifShort vs;
+ ExifRational vr;
if (!entry)
return (NULL);
@@ -219,7 +248,7 @@
CC (entry->components, 1, v);
strncpy (v, _("Unknown tag."), sizeof (v));
break;
- case MNOTE_OLYMPUS_TAG_ZOOM:
+ case MNOTE_OLYMPUS_TAG_DIGIZOOM:
CF (entry->format, EXIF_FORMAT_SHORT, v);
CC (entry->components, 1, v);
vs = exif_get_short (entry->data, order);
@@ -258,6 +287,147 @@
case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
CF (entry->format, EXIF_FORMAT_LONG, v);
CC (entry->components, 30, v);
+ break;
+ case MNOTE_OLYMPUS_TAG_FLASHMODE:
+ CF (entry->format, EXIF_FORMAT_SHORT, v);
+ CC (entry->components, 1, v);
+ vs = exif_get_short (entry->data, order);
+ switch (vs) {
+ case 0:
+ strncpy (v, _("Auto"), sizeof (v));
+ break;
+ case 1:
+ strncpy (v, _("Red-eye reduction"), sizeof (v));
+ break;
+ case 2:
+ strncpy (v, _("Fill"), sizeof (v));
+ break;
+ case 3:
+ strncpy (v, _("Off"), sizeof (v));
+ break;
+ default:
+ snprintf (buf, sizeof (buf), "%i", vs);
+ strncpy (v, buf, sizeof (v));
+ }
+ break;
+ case MNOTE_OLYMPUS_TAG_FOCUSDIST:
+ CF (entry->format, EXIF_FORMAT_RATIONAL, v);
+ CC (entry->components, 1, v);
+ vr = exif_get_rational (entry->data, order);
+ if (vr.numerator == 0) {
+ strncpy (v, _("Unknown"), sizeof (v));
+ }
+ else {
+ unsigned long tmp = vr.numerator / vr.denominator;
+// printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator);
+ snprintf (v, sizeof (v), "%li mm", tmp);
+ }
+ break;
+ case MNOTE_OLYMPUS_TAG_SHARPNESS:
+ CF (entry->format, EXIF_FORMAT_SHORT, v);
+ CC (entry->components, 1, v);
+ vs = exif_get_short (entry->data, order);
+ switch (vs) {
+ case 0:
+ strncpy (v, _("Normal"), sizeof (v));
+ break;
+ case 1:
+ strncpy (v, _("Hard"), sizeof (v));
+ break;
+ case 2:
+ strncpy (v, _("Soft"), sizeof (v));
+ break;
+ default:
+ snprintf (buf, sizeof (buf), "%i", vs);
+ strncpy (v, buf, sizeof (v));
+ }
+ break;
+ case MNOTE_OLYMPUS_TAG_WBALANCE:
+ CF (entry->format, EXIF_FORMAT_SHORT, v);
+ CC (entry->components, 2, v);
+ vs = exif_get_short (entry->data, order);
+ switch (vs) {
+ case 1:
+ strncpy (v, _("Automatic"), sizeof (v));
+ break;
+ case 2:
+ {
+ ExifShort v2 = exif_get_short (entry->data + 2, order);
+ unsigned long colorTemp = 0;
+ switch (v2) {
+ case 2:
+ colorTemp = 3000;
+ break;
+ case 3:
+ colorTemp = 3700;
+ break;
+ case 4:
+ colorTemp = 4000;
+ break;
+ case 5:
+ colorTemp = 4500;
+ break;
+ case 6:
+ colorTemp = 5500;
+ break;
+ case 7:
+ colorTemp = 6500;
+ break;
+ case 9:
+ colorTemp = 7500;
+ break;
+ }
+ if (colorTemp) {
+ snprintf (v, sizeof (v), "Manual: %liK", colorTemp);
+ }
+ else {
+ strncpy (v, _("Manual: Unknown"), sizeof (v));
+ }
+
+ }
+ break;
+ case 3:
+ strncpy (v, _("One-touch"), sizeof (v));
+ break;
+ default:
+ strncpy (v, _("Unknown"), sizeof (v));
+ break;
+ }
+ break;
+ case MNOTE_OLYMPUS_TAG_CONTRAST:
+ CF (entry->format, EXIF_FORMAT_SHORT, v);
+ CC (entry->components, 1, v);
+ vs = exif_get_short (entry->data, order);
+ switch (vs) {
+ case 0:
+ strncpy (v, _("Hard"), sizeof (v));
+ break;
+ case 1:
+ strncpy (v, _("Normal"), sizeof (v));
+ break;
+ case 2:
+ strncpy (v, _("Soft"), sizeof (v));
+ break;
+ default:
+ snprintf (buf, sizeof (buf), "%i", vs);
+ strncpy (v, buf, sizeof (v));
+ }
+ break;
+ case MNOTE_OLYMPUS_TAG_MANFOCUS:
+ CF (entry->format, EXIF_FORMAT_SHORT, v);
+ CC (entry->components, 1, v);
+ vs = exif_get_short (entry->data, order);
+ switch (vs) {
+ case 0:
+ strncpy (v, _("No"), sizeof (v));
+ break;
+ case 1:
+ strncpy (v, _("Yes"), sizeof (v));
+ break;
+ default:
+ snprintf (buf, sizeof (buf), "%i", vs);
+ strncpy (v, buf, sizeof (v));
+ }
break;
default:
break;
|
|
From: Lutz M?l. <lu...@us...> - 2003-07-24 20:18:15
|
Update of /cvsroot/libexif/libmnote/libmnote
In directory sc8-pr-cvs1:/tmp/cvs-serv21220/libmnote
Modified Files:
mnote-data.c
Log Message:
2003-07-24 Lutz Mueller <lu...@us...>
* libmnote: Lots of improvements from Al Evans <al...@tb...>.
Index: mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/mnote-data.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-data.c 15 Dec 2002 11:44:18 -0000 1.3
+++ mnote-data.c 24 Jul 2003 20:18:10 -0000 1.4
@@ -39,12 +39,10 @@
void
mnote_data_construct (MNoteData *note)
{
- if (!note)
- return;
+ if (!note) return;
note->priv = malloc (sizeof (MNoteDataPrivate));
- if (!note->priv)
- return;
+ if (!note->priv) return;
memset (note->priv, 0, sizeof (MNoteDataPrivate));
note->priv->ref_count = 1;
@@ -53,8 +51,7 @@
void
mnote_data_ref (MNoteData *note)
{
- if (!note || !note->priv)
- return;
+ if (!note || !note->priv) return;
note->priv->ref_count++;
}
@@ -62,19 +59,16 @@
void
mnote_data_unref (MNoteData *note)
{
- if (!note || !note->priv)
- return;
+ if (!note || !note->priv) return;
note->priv->ref_count--;
- if (!note->priv->ref_count)
- mnote_data_free (note);
+ if (!note->priv->ref_count) mnote_data_free (note);
}
void
mnote_data_free (MNoteData *note)
{
- if (!note)
- return;
+ if (!note) return;
if (note->priv) {
free (note->priv);
@@ -88,8 +82,7 @@
mnote_data_save_data (MNoteData *note,
unsigned char **data, unsigned int *size)
{
- if (!note)
- return;
+ if (!note) return;
if (note->methods.save_data)
note->methods.save_data (note, data, size);
@@ -99,8 +92,7 @@
mnote_data_load_data (MNoteData *note,
const unsigned char *data, unsigned int size)
{
- if (!note)
- return;
+ if (!note) return;
if (note->methods.load_data)
note->methods.load_data (note, data, size);
@@ -111,8 +103,7 @@
{
MNoteData *note = NULL;
- if (!size || !data)
- return (NULL);
+ if (!size || !data) return NULL;
/* Canon notes begin with 0x0000 */
if ((size > 1) && (data[0] == 0x00) && (data[1] == 0x00))
@@ -126,12 +117,9 @@
} else if (size >= 2 && (data[0] == 0x00) && (data[1] == 0x1b)) {
note = mnote_pentax_data_new ();
- } else {
- note = NULL;
- }
+ } else note = NULL;
- if (note)
- mnote_data_load_data (note, data, size);
+ if (note) mnote_data_load_data (note, data, size);
return (note);
}
@@ -140,44 +128,39 @@
mnote_data_save_to_data (MNoteData *note,
unsigned char **data, unsigned int *size)
{
- if (!note || !size || !data)
- return;
+ if (!note || !size || !data) return;
- mnote_data_save_data(note, data, size);
+ mnote_data_save_data (note, data, size);
}
const char *
mnote_tag_get_name (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_name)
- return (NULL);
+ if (!note || !note->methods.get_tag_name) return NULL;
- return (note->methods.get_tag_name (tag));
+ return note->methods.get_tag_name (tag);
}
const char *
mnote_tag_get_title (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_title)
- return (NULL);
+ if (!note || !note->methods.get_tag_title) return NULL;
- return (note->methods.get_tag_title (tag));
+ return note->methods.get_tag_title (tag);
}
const char *
mnote_tag_get_description (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_description)
- return (NULL);
+ if (!note || !note->methods.get_tag_description) return NULL;
- return (note->methods.get_tag_description (tag));
+ return note->methods.get_tag_description (tag);
}
char *
mnote_data_get_value (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_value)
- return (NULL);
+ if (!note || !note->methods.get_value) return (NULL);
return (note->methods.get_value (note, tag));
}
@@ -190,8 +173,7 @@
note->priv->order = order;
- if (!note->methods.set_order)
- return;
+ if (!note->methods.set_order) return;
note->methods.set_order (note, order);
}
@@ -199,17 +181,15 @@
ExifByteOrder
mnote_data_get_byte_order (MNoteData *note)
{
- if (!note || !note->priv)
- return (0);
+ if (!note || !note->priv) return 0;
- return (note->priv->order);
+ return note->priv->order;
}
void
mnote_data_foreach_entry (MNoteData *note, MNoteDataForeachEntryFunc func, void *user_data)
{
- if (!note || !note->methods.foreach_entry)
- return;
+ if (!note || !note->methods.foreach_entry) return;
note->methods.foreach_entry (note, func, user_data);
}
@@ -222,29 +202,28 @@
if (!note || !note->methods.get_entry || !note->methods.dump_entry)
return;
- entry = note->methods.get_entry(note, tag);
+ entry = note->methods.get_entry (note, tag);
- if (!entry)
- return;
+ if (!entry) return;
- note->methods.dump_entry(entry, indent);
+ note->methods.dump_entry (entry, indent);
}
void
mnote_data_dump (MNoteData *note, unsigned int indent)
{
char buf[1024];
- unsigned int i;
- if (!note || !note->methods.get_count || !note->methods.dump_entry)
- return;
+ if (!note || !note->methods.dump_entry) return;
- for (i = 0; i < 2 * indent; i++)
- buf[i] = ' ';
- buf[i] = '\0';
+ memset (buf, ' ', 2 * indent);
+ buf[2 * indent] = '\0';
- printf ("%sDumping MakerNote content (%i entries)...\n", buf,
- note->methods.get_count(note));
+ if (note->methods.get_count)
+ printf ("%sDumping MakerNote content (%i entries)...\n", buf,
+ note->methods.get_count (note));
- mnote_data_foreach_entry (note, (MNoteDataForeachEntryFunc)mnote_data_dump_entry, (void *)indent);
+ mnote_data_foreach_entry (note,
+ (MNoteDataForeachEntryFunc) mnote_data_dump_entry,
+ (void *) indent);
}
|
|
From: Lutz M?l. <lu...@us...> - 2003-07-24 20:18:15
|
Update of /cvsroot/libexif/libmnote In directory sc8-pr-cvs1:/tmp/cvs-serv21220 Modified Files: ChangeLog Log Message: 2003-07-24 Lutz Mueller <lu...@us...> * libmnote: Lots of improvements from Al Evans <al...@tb...>. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libmnote/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ChangeLog 19 Nov 2002 20:26:18 -0000 1.9 +++ ChangeLog 24 Jul 2003 20:18:10 -0000 1.10 @@ -1,3 +1,7 @@ +2003-07-24 Lutz Mueller <lu...@us...> + + * libmnote: Lots of improvements from Al Evans <al...@tb...>. + 2002-11-19 Lutz Müller <lu...@us...> * libmnote.spec.in |
|
From: Lutz M?l. <lu...@us...> - 2003-07-20 19:27:43
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1:/tmp/cvs-serv22487 Modified Files: configure.in ChangeLog Log Message: 2003-07-20 Lutz Mueller <lu...@us...> * configure.in: Version 0.5.10 Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- ChangeLog 30 Apr 2003 23:51:43 -0000 1.65 +++ ChangeLog 20 Jul 2003 19:27:40 -0000 1.66 @@ -1,3 +1,7 @@ +2003-07-20 Lutz Mueller <lu...@us...> + + * configure.in: Version 0.5.10 + 2003-05-01 Lutz Mueller <lu...@us...> Suggestion by Gernot Jander <ge...@bi...>: Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- configure.in 18 Mar 2003 07:13:23 -0000 1.50 +++ configure.in 20 Jul 2003 19:27:40 -0000 1.51 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT(libexif/exif-data.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libexif, 0.5.9) +AM_INIT_AUTOMAKE(libexif, 0.5.10) AM_MAINTAINER_MODE dnl --------------------------------------------------------------------------- @@ -14,9 +14,9 @@ dnl - CURRENT (Major): Increment if the interface has additions, changes, dnl removals. dnl --------------------------------------------------------------------------- -LIBEXIF_AGE=1 -LIBEXIF_REVISION=1 -LIBEXIF_CURRENT=8 +LIBEXIF_AGE=2 +LIBEXIF_REVISION=0 +LIBEXIF_CURRENT=9 AC_SUBST(LIBEXIF_AGE) AC_SUBST(LIBEXIF_REVISION) AC_SUBST(LIBEXIF_CURRENT) |
|
From: <as...@us...> - 2003-07-13 08:04:40
|
Update of /cvsroot/libexif/gexif/gexif In directory sc8-pr-cvs1:/tmp/cvs-serv22507/gexif Modified Files: gexif-thumbnail.c gexif-thumbnail.h Log Message: Update Lutz's email Index: gexif-thumbnail.c =================================================================== RCS file: /cvsroot/libexif/gexif/gexif/gexif-thumbnail.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gexif-thumbnail.c 15 Dec 2002 11:39:21 -0000 1.4 +++ gexif-thumbnail.c 13 Jul 2003 08:04:38 -0000 1.5 @@ -1,6 +1,6 @@ /* gexif-thumbnail.c * - * Copyright © 2001 Lutz Müller <ur...@rz...> + * Copyright © 2001 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 Index: gexif-thumbnail.h =================================================================== RCS file: /cvsroot/libexif/gexif/gexif/gexif-thumbnail.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gexif-thumbnail.h 15 Dec 2002 11:39:21 -0000 1.2 +++ gexif-thumbnail.h 13 Jul 2003 08:04:38 -0000 1.3 @@ -1,6 +1,6 @@ /* gexif-thumbnail.h * - * Copyright © 2001 Lutz Müller <ur...@rz...> + * Copyright © 2001 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 |
|
From: <as...@us...> - 2003-07-13 08:04:40
|
Update of /cvsroot/libexif/gexif/po In directory sc8-pr-cvs1:/tmp/cvs-serv22507/po Modified Files: de.po Log Message: Update Lutz's email Index: de.po =================================================================== RCS file: /cvsroot/libexif/gexif/po/de.po,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- de.po 23 Jul 2002 08:21:12 -0000 1.2 +++ de.po 13 Jul 2003 08:04:38 -0000 1.3 @@ -263,7 +263,7 @@ #~ "\n" #~ "gtKam was written by:\n" #~ " - Scott Fritzinger <sc...@un...>,\n" -#~ " - Lutz Mueller <ur...@rz...>,\n" +#~ " - Lutz Mueller <lu...@us...>,\n" #~ " - and many others.\n" #~ "\n" #~ "gtKam uses libgphoto2, a library to access a\n" @@ -277,7 +277,7 @@ #~ "\n" #~ "gtKam wurde geschrieben von:\n" #~ " - Scott Fritzinger <sc...@un...>,\n" -#~ " - Lutz Müller <ur...@rz...>\n" +#~ " - Lutz Müller <lu...@us...>\n" #~ "und vielen anderen.\n" #~ "\n" #~ "gtKam verwendet libgphoto2, eine Bibliothek,\n" |
|
From: <lu...@us...> - 2003-05-05 21:13:47
|
Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1:/tmp/cvs-serv32318/exif
Modified Files:
Makefile.am actions.c main.c
Added Files:
exif-i18n.c exif-i18n.h
Log Message:
2003-05-05 Lutz Mueller <lu...@us...>
* exif/exif-i18n.[c,h]: New. Suggested by Gernot Jander
<ge...@bi...>.
--- NEW FILE: exif-i18n.c ---
#include <config.h>
#include "exif-i18n.h"
#include <iconv.h>
#include <string.h>
#undef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
const char *
exif_i18n_convert_utf8_to_lat1 (const char *in)
{
static iconv_t tr = 0;
unsigned int t = (in ? strlen (in) : 0);
static char buf[2048];
unsigned int buf_size = sizeof (buf);
char *out = buf;
if (!in) return NULL;
memset (buf, 0, sizeof (buf));
if (!tr) tr = iconv_open ("ISO-8859-1", "UTF-8");
iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
return buf;
}
--- NEW FILE: exif-i18n.h ---
(This appears to be a binary file; contents omitted.)
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/exif/exif/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am 15 Nov 2002 21:32:20 -0000 1.12
+++ Makefile.am 5 May 2003 21:13:44 -0000 1.13
@@ -9,6 +9,7 @@
exif_SOURCES = \
actions.h actions.c \
+ exif-i18n.h exif-i18n.c \
main.c \
utils.h utils.c
exif_LDADD = \
Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- actions.c 15 Dec 2002 11:39:13 -0000 1.12
+++ actions.c 5 May 2003 21:13:44 -0000 1.13
@@ -20,6 +20,7 @@
#include "config.h"
#include "actions.h"
+#include "exif-i18n.h"
#include <stdio.h>
#include <stdlib.h>
@@ -27,25 +28,6 @@
#include <libexif/exif-ifd.h>
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define N_(String) (String)
-#endif
-
#define ENTRY_FOUND " * "
#define ENTRY_NOT_FOUND " - "
@@ -67,7 +49,7 @@
name = exif_tag_get_title (tag);
if (!name)
continue;
- fprintf (stdout, " 0x%04x %-29.29s", tag, name);
+ fprintf (stdout, " 0x%04x %-29.29s", tag, C(name));
for (i = 0; i < EXIF_IFD_COUNT; i++)
if (exif_content_get_entry (ed->ifd[i], tag))
printf (ENTRY_FOUND);
@@ -107,19 +89,19 @@
#endif
static void
-show_entry (ExifEntry *entry, void *data)
+show_entry (ExifEntry *e, void *data)
{
unsigned char *ids = data;
if (*ids)
- fprintf (stdout, "0x%04x", entry->tag);
+ fprintf (stdout, "0x%04x", e->tag);
else
- fprintf (stdout, "%-20.20s", exif_tag_get_title (entry->tag));
+ fprintf (stdout, "%-20.20s", C(exif_tag_get_title (e->tag)));
printf ("|");
if (*ids)
- fprintf (stdout, "%-72.72s", exif_entry_get_value (entry));
+ fprintf (stdout, "%-72.72s", C(exif_entry_get_value (e)));
else
- fprintf (stdout, "%-58.58s", exif_entry_get_value (entry));
+ fprintf (stdout, "%-58.58s", C(exif_entry_get_value (e)));
fputc ('\n', stdout);
}
Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- main.c 11 Feb 2003 06:47:02 -0000 1.34
+++ main.c 5 May 2003 21:13:44 -0000 1.35
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include "config.h"
+#include <config.h>
#include <errno.h>
#include <stdlib.h>
@@ -36,27 +36,9 @@
#include "libjpeg/jpeg-data.h"
#include "actions.h"
+#include "exif-i18n.h"
#include "utils.h"
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define N_(String) (String)
-#endif
-
#ifdef HAVE_LOCAL_H
# include <locale.h>
#endif
@@ -70,8 +52,8 @@
show_entry (ExifEntry *entry, const char *caption)
{
printf (_("EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"),
- exif_tag_get_title (entry->tag), entry->tag,
- exif_tag_get_name (entry->tag), caption);
+ C(exif_tag_get_title (entry->tag)), entry->tag,
+ C(exif_tag_get_name (entry->tag)), caption);
printf ("\n");
exif_entry_dump(entry, 0);
@@ -83,8 +65,8 @@
show_note_entry (MNoteData *note, MNoteTag tag)
{
printf (_("MakerNote entry '%s' (0x%x, '%s'):"),
- mnote_tag_get_title (note, tag), tag,
- mnote_tag_get_name (note, tag));
+ C(mnote_tag_get_title (note, tag)), tag,
+ C(mnote_tag_get_name (note, tag)));
printf ("\n");
mnote_data_dump_entry(note, tag, 0);
@@ -278,9 +260,9 @@
return (1);
}
printf (_("Tag '%s' (0x%04x, '%s'): %s"),
- exif_tag_get_title (eo.tag), eo.tag,
- exif_tag_get_name (eo.tag),
- exif_tag_get_description (eo.tag));
+ C(exif_tag_get_title (eo.tag)), eo.tag,
+ C(exif_tag_get_name (eo.tag)),
+ C(exif_tag_get_description (eo.tag)));
printf ("\n");
return (0);
}
|
|
From: <lu...@us...> - 2003-05-05 21:13:47
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1:/tmp/cvs-serv32318 Modified Files: ChangeLog Makefile.am configure.in Log Message: 2003-05-05 Lutz Mueller <lu...@us...> * exif/exif-i18n.[c,h]: New. Suggested by Gernot Jander <ge...@bi...>. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- ChangeLog 13 Apr 2003 20:42:38 -0000 1.28 +++ ChangeLog 5 May 2003 21:13:43 -0000 1.29 @@ -1,3 +1,8 @@ +2003-05-05 Lutz Mueller <lu...@us...> + + * exif/exif-i18n.[c,h]: New. Suggested by Gernot Jander + <ge...@bi...>. + 2003-03-13 Lutz Mueller <lu...@us...> * libjpeg/jpeg-data.c: Aravind ara...@us... found Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/exif/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 3 Jan 2003 14:04:33 -0000 1.11 +++ Makefile.am 5 May 2003 21:13:43 -0000 1.12 @@ -1,6 +1,8 @@ -SUBDIRS = libjpeg exif po +SUBDIRS = libjpeg exif po intl man_MANS = exif.1 # newer versions of automake/autoconf require this, OK? -EXTRA_DIST = exif.1 exif.spec +EXTRA_DIST = config.rpath exif.1 exif.spec + +ACLOCAL_AMFLAGS = -I m4 Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- configure.in 7 Jan 2003 17:49:37 -0000 1.24 +++ configure.in 5 May 2003 21:13:43 -0000 1.25 @@ -10,6 +10,8 @@ dnl --------------------------------------------------------------------------- dnl i18n support dnl --------------------------------------------------------------------------- +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The gettext domain we're +using]) ALL_LINGUAS="de es fr" AM_GNU_GETTEXT @@ -102,6 +104,7 @@ exif.spec libjpeg/Makefile exif/Makefile + po/Makefile.in ]) echo " |
|
From: <lu...@us...> - 2003-04-30 23:51:48
|
Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv9111/libexif
Modified Files:
exif-entry.c
Log Message:
2003-05-01 Lutz Mueller <lu...@us...>
Suggestion by Gernot Jander <ge...@bi...>:
* libexif/exif-entry.c: Ignore " " in EXIF_TAG_COPYRIGHT.
Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- exif-entry.c 29 Apr 2003 04:57:31 -0000 1.34
+++ exif-entry.c 30 Apr 2003 23:51:44 -0000 1.35
@@ -180,7 +180,7 @@
strncpy (v, "Exif Version 2.1", sizeof (v) - 1);
else if (!memcmp (e->data, "0220", 4))
strncpy (v, "Exif Version 2.2", sizeof (v) - 1);
- else strncpy (v, "Unknown Exif Version", sizeof (v) - 1);
+ else strncpy (v, _("Unknown Exif Version"), sizeof (v) - 1);
break;
case EXIF_TAG_FLASH_PIX_VERSION:
CF (e->format, EXIF_FORMAT_UNDEFINED, v);
@@ -188,22 +188,35 @@
if (!memcmp (e->data, "0100", 4))
strncpy (v, "FlashPix Version 1.0", sizeof (v));
else
- strncpy (v, "Unknown FlashPix Version", sizeof (v));
+ strncpy (v, _("Unknown FlashPix Version"), sizeof (v));
break;
case EXIF_TAG_COPYRIGHT:
CF (e->format, EXIF_FORMAT_ASCII, v);
- if (e->size && e->data)
+
+ /*
+ * First part: Photographer.
+ * Some cameras store a string like " " here. Ignore it.
+ */
+ if (e->size && e->data &&
+ (strspn (e->data, " ") != strlen ((char *) e->data)))
strncpy (v, e->data, MIN (sizeof (v) - 1, e->size));
else
- strncpy (v, "[None]", sizeof (v) - 1);
- strncat (v, " (Photographer) - ", sizeof (v) - 1);
+ strncpy (v, _("[None]"), sizeof (v) - 1);
+ strncat (v, " ", sizeof (v) - 1);
+ strncat (v, _("(Photographer)"), sizeof (v) - 1);
+
+ /* Second part: Editor. */
+ strncat (v, " - ", sizeof (v) - 1);
if (e->size && e->data &&
- (strlen ((char *) e->data) + 1 < e->size))
+ (strlen ((char *) e->data) + 1 < e->size) &&
+ (strspn (e->data, " ") != strlen ((char *) e->data)))
strncat (v, e->data + strlen (e->data) + 1,
sizeof (v) - 1);
else
- strncat (v, "[None]", sizeof (v));
- strncat (v, " (Editor)", sizeof (v));
+ strncat (v, _("[None]"), sizeof (v) - 1);
+ strncat (v, " ", sizeof (v) - 1);
+ strncat (v, _("(Editor)"), sizeof (v) - 1);
+
break;
case EXIF_TAG_FNUMBER:
CF (e->format, EXIF_FORMAT_RATIONAL, v);
|
