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...> - 2004-04-06 13:29:07
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14837 Modified Files: configure.in Log Message: prepare versions for 0.7.0 release Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- configure.in 2 Mar 2004 18:11:06 -0000 1.61 +++ configure.in 6 Apr 2004 13:16:19 -0000 1.62 @@ -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.13) +AM_INIT_AUTOMAKE(libexif, 0.6.9) AM_MAINTAINER_MODE dnl --------------------------------------------------------------------------- |
|
From: Hans U. N. <hu...@us...> - 2004-04-06 13:26:38
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14282 Modified Files: configure.in Log Message: prepare versions for 0.7.0 release Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- configure.in 4 Apr 2004 17:43:35 -0000 1.30 +++ configure.in 6 Apr 2004 13:13:50 -0000 1.31 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT(exif/main.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(exif,0.6) +AM_INIT_AUTOMAKE(exif,0.6.9) AM_MAINTAINER_MODE AM_PROG_LIBTOOL @@ -18,7 +18,7 @@ dnl --------------------------------------------------------------------------- dnl libraries needed dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.5.13) +PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.9) AC_SUBST(LIBEXIF_LIBS) AC_SUBST(LIBEXIF_CFLAGS) |
|
From: Hans U. N. <hu...@us...> - 2004-04-04 17:56:14
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11822 Modified Files: configure.in Log Message: remove gettextize stuff Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- configure.in 4 Apr 2004 08:45:43 -0000 1.29 +++ configure.in 4 Apr 2004 17:43:35 -0000 1.30 @@ -80,7 +80,7 @@ AC_SUBST(CFLAGS) fi -AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile +AC_OUTPUT([ Makefile exif.spec libjpeg/Makefile |
|
From: Lutz M?l. <lu...@us...> - 2004-04-04 09:13:28
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18617/libexif Modified Files: exif-data.c Log Message: 2004-04-04 Lutz Mueller lu...@us... * libexif/exif-data.c: If we don't know a tag we are going to parse, stop loading. This should fix bug #138238. Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- exif-data.c 7 Jan 2004 15:12:11 -0000 1.35 +++ exif-data.c 4 Apr 2004 09:01:01 -0000 1.36 @@ -287,6 +287,12 @@ } break; default: + + /* + * If we don't know the tag, changes are high + * that the EXIF data does not follow the standard. + */ + if (!exif_tag_get_name (tag)) return; entry = exif_entry_new (); exif_content_add_entry (ifd, entry); exif_data_load_data_entry (data, entry, d, ds, |
|
From: Lutz M?l. <lu...@us...> - 2004-04-04 09:13:27
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18617 Modified Files: ChangeLog Log Message: 2004-04-04 Lutz Mueller lu...@us... * libexif/exif-data.c: If we don't know a tag we are going to parse, stop loading. This should fix bug #138238. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- ChangeLog 2 Apr 2004 15:59:34 -0000 1.104 +++ ChangeLog 4 Apr 2004 09:01:01 -0000 1.105 @@ -1,3 +1,8 @@ +2004-04-04 Lutz Mueller lu...@us... + + * libexif/exif-data.c: If we don't know a tag we are going to parse, + stop loading. This should fix bug #138238. + 2004-04-02 Jan Patera <pa...@us...> * libexif/pentax/exif-mnote-data-pentax.c: correct search for values |
|
From: Lutz M?l. <lu...@us...> - 2004-04-04 08:58:10
|
Update of /cvsroot/libexif/exif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15546 Modified Files: ChangeLog configure.in Log Message: 2004-04-04 Lutz Mueller lu...@us... * configure.in: libmnote is no longer separate from libexif. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/exif/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- ChangeLog 7 Jan 2004 23:38:07 -0000 1.34 +++ ChangeLog 4 Apr 2004 08:45:43 -0000 1.35 @@ -1,3 +1,7 @@ +2004-04-04 Lutz Mueller lu...@us... + + * configure.in: libmnote is no longer separate from libexif. + 2004-01-08 Lutz Mueller <lu...@us...> * exif/actions.c: Adapt to new API Index: configure.in =================================================================== RCS file: /cvsroot/libexif/exif/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- configure.in 10 Jan 2004 21:08:59 -0000 1.28 +++ configure.in 4 Apr 2004 08:45:43 -0000 1.29 @@ -23,25 +23,6 @@ AC_SUBST(LIBEXIF_CFLAGS) dnl --------------------------------------------------------------------------- -dnl libmnote: Useful for parsing MakerNote-tags. -dnl --------------------------------------------------------------------------- -mnote_msg=no -try_mnote=true -AC_ARG_WITH(mnote, [ --without-mnote Don't use libmnote], - if test x$withval = xno; then - try_mnote=false - fi) -if $try_mnote; then - if ${PKG_CONFIG} --exists libmnote > /dev/null 2>&1; then - PKG_CHECK_MODULES(LIBMNOTE, libmnote >= 0.5.6) - AC_DEFINE(HAVE_MNOTE,1,[whether we have mnote]) - AC_SUBST(LIBMNOTE_LIBS) - AC_SUBST(LIBMNOTE_CFLAGS) - mnote_msg="yes" - fi -fi - -dnl --------------------------------------------------------------------------- dnl locale.h: locale.h provides setlocale. It seems that some systems don't dnl have it (at least if configured --without-nls). dnl --------------------------------------------------------------------------- @@ -99,7 +80,7 @@ AC_SUBST(CFLAGS) fi -AC_OUTPUT([ +AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile Makefile exif.spec libjpeg/Makefile @@ -112,6 +93,4 @@ Source code location: ${srcdir} Compiler: ${CC} - - Support for MakerNotes: $mnote_msg " |
|
From: Jan P. <pa...@us...> - 2004-04-02 16:22:40
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18428 Modified Files: exif-mnote-data-olympus.c Log Message: Please don't crash whenever calling memset Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- exif-mnote-data-olympus.c 19 Mar 2004 19:57:30 -0000 1.7 +++ exif-mnote-data-olympus.c 2 Apr 2004 16:10:30 -0000 1.8 @@ -137,7 +137,7 @@ exif_mnote_data_olympus_clear (n); n->entries = malloc (sizeof (MnoteOlympusEntry) * c); - memset (&n->entries, 0, sizeof (MnoteOlympusEntry) * c); + memset (n->entries, 0, sizeof (MnoteOlympusEntry) * c); /* Parse the entries */ for (i = 0; i < c; i++) { |
|
From: Jan P. <pa...@us...> - 2004-04-02 16:21:21
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18123 Modified Files: exif-entry.c Log Message: Fix of a recently introduced typo: "Stanard" -> "Standard" Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- exif-entry.c 3 Mar 2004 20:45:16 -0000 1.48 +++ exif-entry.c 2 Apr 2004 16:09:12 -0000 1.49 @@ -164,7 +164,7 @@ { EXIF_TAG_WHITE_BALANCE, { N_("Auto white balance"), N_("Manual white balance"), NULL}}, { EXIF_TAG_SCENE_CAPTURE_TYPE, - { N_("Stanard"), N_("Landscape"), N_("Portrait"), + { N_("Standard"), N_("Landscape"), N_("Portrait"), N_("Night scene"), NULL}}, { EXIF_TAG_GAIN_CONTROL, { N_("Normal"), N_("Low gain up"), N_("High gain up"), |
|
From: Jan P. <pa...@us...> - 2004-04-02 16:11:44
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16471 Modified Files: ChangeLog Log Message: 2004-04-02 Jan Patera <pa...@us...> * libexif/pentax/exif-mnote-data-pentax.c: correct search for values Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- ChangeLog 20 Mar 2004 11:24:25 -0000 1.103 +++ ChangeLog 2 Apr 2004 15:59:34 -0000 1.104 @@ -1,3 +1,7 @@ +2004-04-02 Jan Patera <pa...@us...> + + * libexif/pentax/exif-mnote-data-pentax.c: correct search for values + 2004-03-19 Joerg Hoh <ho...@us...> * libexif/olympus/exif-mnote-data-olympus.c: code simplification |
|
From: Jan P. <pa...@us...> - 2004-04-02 16:08:00
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15901 Modified Files: mnote-pentax-entry.c Log Message: A few changes & fixes of the code compaction dated 2004-03-15: 1) maxlen instead of maxlen-1 (it has been decreased by one for that reason) 2) items[i].elem[j] searched while items[i].elem[j].string is not NULL and not index (nothing would have been found) 3) MNOTE_PENTAX_TAG_ISO_SPEED: value of 100: used to get printed as "100", now it was unknown value -> added to items.elem I am afraid 200 would also have the same problem (I don't have any sample file) -> also added to items.elem 4) items.elem[10] -> items.elem[7]: 7 is enough, less static memory & smaller executable Index: mnote-pentax-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mnote-pentax-entry.c 15 Mar 2004 21:42:20 -0000 1.3 +++ mnote-pentax-entry.c 2 Apr 2004 15:55:51 -0000 1.4 @@ -59,7 +59,7 @@ struct { int index; const char *string; - } elem[10]; + } elem[7]; } items[] = { { MNOTE_PENTAX_TAG_MODE, { {0, N_("Auto")}, @@ -104,9 +104,11 @@ {2, N_("High")}, {0, NULL}}}, { MNOTE_PENTAX_TAG_ISO_SPEED, - { {10, N_("100")}, - {16, N_("200")}, - { 0, NULL}}}, + { {10, N_("100")}, + {16, N_("200")}, + {100, N_("100")}, + {200, N_("200")}, + { 0, NULL}}}, { MNOTE_PENTAX_TAG_COLOR, { {1, N_("Full")}, {2, N_("Black & White")}, @@ -145,19 +147,19 @@ /* search the tag */ for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++); if (!items[i].tag) { - strncpy (val, "Internal error", maxlen - 1); + strncpy (val, "Internal error", maxlen); break; } /* find the value */ - for (j = 0; items[i].elem[j].index && + for (j = 0; items[i].elem[j].string && (items[i].elem[j].index < vs); j++); if (items[i].elem[j].index != vs) { - snprintf (val, maxlen - 1, + snprintf (val, maxlen, "Internal error (unknown value %i)", vs); break; } - snprintf (val, maxlen - 1, items[i].elem[j].string); + snprintf (val, maxlen, items[i].elem[j].string); break; case MNOTE_PENTAX_TAG_ZOOM: |
|
From: J?rg H. <ho...@us...> - 2004-04-01 20:49:40
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3941 Modified Files: exif-utils.h Log Message: do include inttypes.h not stdint.h Index: exif-utils.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- exif-utils.h 1 Apr 2004 20:24:22 -0000 1.7 +++ exif-utils.h 1 Apr 2004 20:37:39 -0000 1.8 @@ -31,7 +31,7 @@ * sizeof(long) == 4 */ #ifdef HAVE_INTTYPES_H -#include <stdint.h> +#include <inttypes.h> typedef char ExifByte; /* 1 byte */ typedef char * ExifAscii; typedef uint16_t ExifShort; /* 2 bytes */ |
|
From: J?rg H. <ho...@us...> - 2004-04-01 20:36:23
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1319 Modified Files: exif-utils.h Log Message: - use types of appropriate size if stdint.h is available Index: exif-utils.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- exif-utils.h 6 Aug 2003 19:47:53 -0000 1.6 +++ exif-utils.h 1 Apr 2004 20:24:22 -0000 1.7 @@ -27,6 +27,21 @@ #include <libexif/exif-byte-order.h> +/* Works correct only on machines with a stdint.h, otherwise it assumes + * sizeof(long) == 4 */ + +#ifdef HAVE_INTTYPES_H +#include <stdint.h> +typedef char ExifByte; /* 1 byte */ +typedef char * ExifAscii; +typedef uint16_t ExifShort; /* 2 bytes */ +typedef uint32_t ExifLong; /* 4 bytes */ +typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational; +typedef char ExifUndefined; /* 1 byte */ +typedef int32_t ExifSLong; /* 4 bytes */ +typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; + +#else typedef char ExifByte; /* 1 byte */ typedef char * ExifAscii; typedef unsigned short ExifShort; /* 2 bytes */ @@ -35,7 +50,7 @@ typedef char ExifUndefined; /* 1 byte */ typedef signed long ExifSLong; /* 4 bytes */ typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; - +#endif ExifShort exif_get_short (const unsigned char *b, ExifByteOrder order); ExifLong exif_get_long (const unsigned char *b, ExifByteOrder order); |
|
From: Hans U. N. <hu...@us...> - 2004-03-20 11:34:24
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18747 Modified Files: ChangeLog Log Message: No gettextize messages, please Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- ChangeLog 19 Mar 2004 19:57:27 -0000 1.102 +++ ChangeLog 20 Mar 2004 11:24:25 -0000 1.103 @@ -2,13 +2,6 @@ * libexif/olympus/exif-mnote-data-olympus.c: code simplification -2004-03-19 gettextize <bug...@gn...> - - * Makefile.am (SUBDIRS): Add intl, - (ACLOCAL_AMFLAGS): New variable. - (EXTRA_DIST): Add config.rpath mkinstalldirs. - * configure.in (AC_OUTPUT): Add intl/Makefile, - 2004-03-16 Lutz Mueller <lu...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by |
|
From: J?rg H. <ho...@us...> - 2004-03-19 20:07:20
|
Update of /cvsroot/libexif/libexif/libexif/olympus In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18771/libexif/olympus Modified Files: exif-mnote-data-olympus.c Log Message: - Code simplification - sizeof(char) == 1 (according to the C standard) Index: exif-mnote-data-olympus.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- exif-mnote-data-olympus.c 7 Jan 2004 14:57:38 -0000 1.6 +++ exif-mnote-data-olympus.c 19 Mar 2004 19:57:30 -0000 1.7 @@ -80,9 +80,9 @@ * Allocate enough memory for all entries and the number of entries. */ *buf_size = 6 + 2 + 2 + n->count * 12; - *buf = malloc (sizeof (char) * *buf_size); + *buf = malloc (*buf_size); if (!*buf) return; - memset (*buf, 0, sizeof (char) * *buf_size); + memset (*buf, 0, *buf_size); /* Write the header and the number of entries. */ strcpy (*buf, "OLYMP"); @@ -102,16 +102,15 @@ n->entries[i].components; if (s > 4) { *buf_size += s; - *buf = realloc (*buf, sizeof (char) * *buf_size); + *buf = realloc (*buf, *buf_size); if (!*buf) return; doff = *buf_size - s; exif_set_long (*buf + o, n->order, n->offset + doff); } else doff = o; - /* Write the data. Fill unneeded bytes with 0. */ + /* Write the data. */ memcpy (*buf + doff, n->entries[i].data, s); - if (s < 4) memset (*buf + doff + s, 0, (4 - s)); } } @@ -137,15 +136,15 @@ c = exif_get_short (buf + 6 + n->offset + 8, n->order); exif_mnote_data_olympus_clear (n); + n->entries = malloc (sizeof (MnoteOlympusEntry) * c); + memset (&n->entries, 0, sizeof (MnoteOlympusEntry) * c); + /* Parse the entries */ for (i = 0; i < c; i++) { o = 6 + n->offset + 8 + 2 + 12 * i; if (o + 12 > buf_size) return; n->count = i + 1; - n->entries = realloc (n->entries, sizeof (MnoteOlympusEntry) * - (i + 1)); - memset (&n->entries[i], 0, sizeof (MnoteOlympusEntry)); n->entries[i].tag = exif_get_short (buf + o, n->order); n->entries[i].format = exif_get_short (buf + o + 2, n->order); n->entries[i].components = exif_get_long (buf + o + 4, n->order); @@ -163,9 +162,8 @@ if (o + s > buf_size) return; /* Sanity check */ - n->entries[i].data = malloc (sizeof (char) * s); + n->entries[i].data = malloc (s); if (!n->entries[i].data) return; - memset (n->entries[i].data, 0, sizeof (char) * s); n->entries[i].size = s; memcpy (n->entries[i].data, buf + o, s); } |
|
From: J?rg H. <ho...@us...> - 2004-03-19 20:07:20
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18771 Modified Files: ChangeLog Log Message: - Code simplification - sizeof(char) == 1 (according to the C standard) Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- ChangeLog 15 Mar 2004 23:14:49 -0000 1.101 +++ ChangeLog 19 Mar 2004 19:57:27 -0000 1.102 @@ -1,3 +1,14 @@ +2004-03-19 Joerg Hoh <ho...@us...> + * libexif/olympus/exif-mnote-data-olympus.c: code + simplification + +2004-03-19 gettextize <bug...@gn...> + + * Makefile.am (SUBDIRS): Add intl, + (ACLOCAL_AMFLAGS): New variable. + (EXTRA_DIST): Add config.rpath mkinstalldirs. + * configure.in (AC_OUTPUT): Add intl/Makefile, + 2004-03-16 Lutz Mueller <lu...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by |
|
From: Lutz M?l. <lu...@us...> - 2004-03-15 23:24:04
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1040/libexif/pentax Modified Files: exif-mnote-data-pentax.c Log Message: 2004-03-16 Lutz Mueller <lu...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by Joerg Hoh <jo...@de...>. Index: exif-mnote-data-pentax.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- exif-mnote-data-pentax.c 1 Mar 2004 11:56:37 -0000 1.5 +++ exif-mnote-data-pentax.c 15 Mar 2004 23:14:49 -0000 1.6 @@ -76,20 +76,19 @@ ExifShort c; /* Number of entries */ - if (buf_size < 2) - return; + if (buf_size < 2) return; c = exif_get_short (buf + 6 + n->offset, n->order); + n->entries = malloc (sizeof (MnotePentaxEntry) * c); + memset (n->entries, 0, sizeof (MnotePentaxEntry) * c); for (i = 0; i < c; i++) { o = 6 + 2 + n->offset + 12 * i; if (o + 8 > buf_size) return; n->count = i + 1; - n->entries = realloc (n->entries, sizeof (MnotePentaxEntry)*(i+1)); - memset (&n->entries[i], 0, sizeof (MnotePentaxEntry)); - n->entries[i].tag = exif_get_short (buf + o, n->order); + n->entries[i].tag = exif_get_short (buf + o + 0, n->order); n->entries[i].format = exif_get_short (buf + o + 2, n->order); - n->entries[i].components = exif_get_long (buf + o + 4, n->order); + n->entries[i].components = exif_get_long (buf + o + 4, n->order); n->entries[i].order = n->order; /* |
|
From: Lutz M?l. <lu...@us...> - 2004-03-15 23:24:04
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1040 Modified Files: ChangeLog Log Message: 2004-03-16 Lutz Mueller <lu...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by Joerg Hoh <jo...@de...>. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- ChangeLog 15 Mar 2004 21:42:19 -0000 1.100 +++ ChangeLog 15 Mar 2004 23:14:49 -0000 1.101 @@ -1,3 +1,8 @@ +2004-03-16 Lutz Mueller <lu...@us...> + + * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by + Joerg Hoh <jo...@de...>. + 2004-03-15 Lutz Mueller <lu...@us...> * libexif/pentax/mnote-pentax-entry.c: Joerg Hoh <jo...@de...> |
|
From: Lutz M?l. <lu...@us...> - 2004-03-15 21:51:32
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12958/libexif/pentax Modified Files: mnote-pentax-entry.c Log Message: 2004-03-15 Lutz Mueller <lu...@us...> * libexif/pentax/mnote-pentax-entry.c: Joerg Hoh <jo...@de...> did it again. Index: mnote-pentax-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mnote-pentax-entry.c 7 Jan 2004 15:01:39 -0000 1.2 +++ mnote-pentax-entry.c 15 Mar 2004 21:42:20 -0000 1.3 @@ -29,6 +29,7 @@ #include <libexif/exif-format.h> #include <libexif/exif-utils.h> +#include <libexif/exif-entry.h> #define CF(format,target,v,maxlen) \ @@ -53,197 +54,123 @@ } \ } +static struct { + ExifTag tag; + struct { + int index; + const char *string; + } elem[10]; +} items[] = { + { MNOTE_PENTAX_TAG_MODE, + { {0, N_("Auto")}, + {1, N_("Night-scene")}, + {2, N_("Manual")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_QUALITY, + { {0, N_("Good")}, + {1, N_("Better")}, + {2, N_("Best")},{0,NULL}}}, + { MNOTE_PENTAX_TAG_FOCUS, + { {2, N_("Custom")}, + {3, N_("Auto")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_FLASH, + { {1, N_("Auto")}, + {2, N_("Flash on")}, + {4, N_("Flash off")}, + {6, N_("Red-eye Reduction")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_WHITE_BALANCE, + { {0, N_("Auto")}, + {1, N_("Daylight")}, + {2, N_("Shade")}, + {3, N_("Tungsten")}, + {4, N_("Fluorescent")}, + {5, N_("Manual")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_SHARPNESS, + { {0, N_("Normal")}, + {1, N_("Soft")}, + {2, N_("Hard")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_CONTRAST, + { {0, N_("Normal")}, + {1, N_("Low")}, + {2, N_("High")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_SATURATION, + { {0, N_("Normal")}, + {1, N_("Low")}, + {2, N_("High")}, + {0, NULL}}}, + { MNOTE_PENTAX_TAG_ISO_SPEED, + { {10, N_("100")}, + {16, N_("200")}, + { 0, NULL}}}, + { MNOTE_PENTAX_TAG_COLOR, + { {1, N_("Full")}, + {2, N_("Black & White")}, + {3, N_("Sepia")}, + {0, NULL}}}, +}; + char * -mnote_pentax_entry_get_value (MnotePentaxEntry *entry, char *val, unsigned int maxlen) +mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + char *val, unsigned int maxlen) { ExifLong vl; ExifShort vs; + int i = 0, j = 0; - if (!entry) - return (NULL); + if (!entry) return (NULL); memset (val, 0, maxlen); maxlen--; switch (entry->tag) { - case MNOTE_PENTAX_TAG_MODE: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Auto"), maxlen); - break; - case 1: - strncpy (val, _("Night-scene"), maxlen); - break; - case 2: - strncpy (val, _("Manual"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_QUALITY: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Good"), maxlen); - break; - case 1: - strncpy (val, _("Better"), maxlen); - break; - case 2: - strncpy (val, _("Best"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_FOCUS: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 3: - strncpy (val, _("Auto"), maxlen); - break; - case 2: - strncpy (val, _("Custom"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_FLASH: + case MNOTE_PENTAX_TAG_MODE: + case MNOTE_PENTAX_TAG_QUALITY: + case MNOTE_PENTAX_TAG_FOCUS: + case MNOTE_PENTAX_TAG_FLASH: + case MNOTE_PENTAX_TAG_WHITE_BALANCE: + case MNOTE_PENTAX_TAG_SHARPNESS: + case MNOTE_PENTAX_TAG_CONTRAST: + case MNOTE_PENTAX_TAG_SATURATION: + case MNOTE_PENTAX_TAG_ISO_SPEED: + case MNOTE_PENTAX_TAG_COLOR: CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); CC (entry->components, 1, val, maxlen); vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 1: - strncpy (val, _("Auto"), maxlen); - break; - case 2: - strncpy (val, _("Flash On"), maxlen); - break; - case 4: - strncpy (val, _("Flash Off"), maxlen); - break; - case 6: - strncpy (val, _("Red-eye Reduction"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); + + /* search the tag */ + for (i = 0; (items[i].tag && items[i].tag != entry->tag); i++); + if (!items[i].tag) { + strncpy (val, "Internal error", maxlen - 1); + break; } - break; - case MNOTE_PENTAX_TAG_WHITE_BALANCE: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Auto"), maxlen); - break; - case 1: - strncpy (val, _("Daylight"), maxlen); - break; - case 2: - strncpy (val, _("Shade"), maxlen); - break; - case 3: - strncpy (val, _("Tungsten"), maxlen); - break; - case 4: - strncpy (val, _("Fluorescent"), maxlen); - break; - case 5: - strncpy (val, _("Manual"), maxlen); + + /* find the value */ + for (j = 0; items[i].elem[j].index && + (items[i].elem[j].index < vs); j++); + if (items[i].elem[j].index != vs) { + snprintf (val, maxlen - 1, + "Internal error (unknown value %i)", vs); break; - default: - snprintf (val, maxlen, "%i", vs); } + snprintf (val, maxlen - 1, items[i].elem[j].string); break; + case MNOTE_PENTAX_TAG_ZOOM: CF (entry->format, EXIF_FORMAT_LONG, val, maxlen); CC (entry->components, 1, val, maxlen); vl = exif_get_long (entry->data, entry->order); snprintf (val, maxlen, "%li", vl); break; - case MNOTE_PENTAX_TAG_SHARPNESS: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Normal"), maxlen); - break; - case 1: - strncpy (val, _("Soft"), maxlen); - break; - case 2: - strncpy (val, _("Hard"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_CONTRAST: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Normal"), maxlen); - break; - case 1: - strncpy (val, _("Low"), maxlen); - break; - case 2: - strncpy (val, _("High"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_SATURATION: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 0: - strncpy (val, _("Normal"), maxlen); - break; - case 1: - strncpy (val, _("Low"), maxlen); - break; - case 2: - strncpy (val, _("High"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; - case MNOTE_PENTAX_TAG_ISO_SPEED: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 10: - strncpy (val, _("100"), maxlen); - break; - case 16: - strncpy (val, _("200"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; case MNOTE_PENTAX_TAG_PRINTIM: CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen); CC (entry->components, 124, val, maxlen); - snprintf (val, maxlen, "%li bytes unknown data", entry->components); + snprintf (val, maxlen, "%li bytes unknown data", + entry->components); break; case MNOTE_PENTAX_TAG_TZ_CITY: CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen); @@ -255,24 +182,6 @@ CC (entry->components, 4, val, maxlen); snprintf (val, entry->components, "%s", entry->data); break; - case MNOTE_PENTAX_TAG_COLOR: - CF (entry->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (entry->components, 1, val, maxlen); - vs = exif_get_short (entry->data, entry->order); - switch (vs) { - case 1: - strncpy (val, _("Full"), maxlen); - break; - case 2: - strncpy (val, _("Black & White"), maxlen); - break; - case 3: - strncpy (val, _("Sepia"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", vs); - } - break; default: switch (entry->format) { case EXIF_FORMAT_ASCII: |
|
From: Lutz M?l. <lu...@us...> - 2004-03-15 21:51:32
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12958 Modified Files: ChangeLog Log Message: 2004-03-15 Lutz Mueller <lu...@us...> * libexif/pentax/mnote-pentax-entry.c: Joerg Hoh <jo...@de...> did it again. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- ChangeLog 3 Mar 2004 20:45:16 -0000 1.99 +++ ChangeLog 15 Mar 2004 21:42:19 -0000 1.100 @@ -1,3 +1,8 @@ +2004-03-15 Lutz Mueller <lu...@us...> + + * libexif/pentax/mnote-pentax-entry.c: Joerg Hoh <jo...@de...> + did it again. + 2004-03-03 Lutz Mueller <lu...@us...> * libexif/exif-entry.c: Patch by Joerg Hoh <jo...@de...>, |
|
From: Lutz M?l. <lu...@us...> - 2004-03-03 21:05:57
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15584/libexif Modified Files: exif-entry.c Log Message: 2004-03-03 Lutz Mueller <lu...@us...> * libexif/exif-entry.c: Patch by Joerg Hoh <jo...@de...>, enhanced by myself. Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- exif-entry.c 3 Mar 2004 15:38:36 -0000 1.47 +++ exif-entry.c 3 Mar 2004 20:45:16 -0000 1.48 @@ -142,7 +142,7 @@ const char *strings[10]; } list[] = { { EXIF_TAG_PLANAR_CONFIGURATION, - {N_("chunky format"), N_("planar format"), NULL}}, + { N_("chunky format"), N_("planar format"), NULL}}, { EXIF_TAG_SENSING_METHOD, { "", N_("Not defined"), N_("One-chip color area sensor"), N_("Two-chip color area sensor"), N_("Three-chip color area sensor"), @@ -173,15 +173,124 @@ { N_("Normal"), N_("Low saturation"), N_("High saturation"), NULL}}, { EXIF_TAG_CONTRAST , {N_("Normal"), N_("Soft"), N_("Hard"), NULL}}, { EXIF_TAG_SHARPNESS, {N_("Normal"), N_("Soft"), N_("Hard"), NULL}}, + { EXIF_TAG_SUBJECT_DISTANCE_RANGE, + {N_("Unknown"), N_("Macro"),N_("Close view"),N_("Distant view"), NULL}}, { 0, {NULL}} }; -static char* sdr_entries[] = {"Unknown", "Macro", "Close view", "Distant view"}; +static struct { + ExifTag tag; + struct { + int index; + const char *values[4]; + } elem[25]; +} list2[] = { + { EXIF_TAG_METERING_MODE, + { { 0, {N_("Unknown"), NULL}}, + { 1, {N_("Average"), N_("avg"), NULL}}, + { 2, {N_("Center-Weighted Average"), N_("Center-Weight"), NULL}}, + { 3, {N_("Spot"), NULL}}, + { 4, {N_("Multi Spot"), NULL}}, + { 5, {N_("Pattern"), NULL}}, + { 6, {N_("Partial"), NULL}}, + {255, {N_("Other"), NULL}}, + { 0, {NULL}}}}, + { EXIF_TAG_COMPRESSION, + { {1, {N_("Uncompressed"), NULL}}, + {6, {N_("JPEG compression"), NULL}}, + {0, {NULL}}}}, + { EXIF_TAG_LIGHT_SOURCE, + { { 0, {N_("Unknown"), NULL}}, + { 1, {N_("Daylight"), NULL}}, + { 2, {N_("Fluorescent"), NULL}}, + { 3, {N_("Tungsten incandescent light"), N_("Tungsten"), NULL}}, + { 4, {N_("Flash"), NULL}}, + { 9, {N_("Fine weather"), NULL}}, + { 10, {N_("Cloudy weather"), N_("cloudy"), NULL}}, + { 11, {N_("Shade"), NULL}}, + { 12, {N_("Daylight fluorescent"), NULL}}, + { 13, {N_("Day white fluorescent"), NULL}}, + { 14, {N_("Cool white fluorescent"), NULL}}, + { 15, {N_("White fluorescent"), NULL}}, + { 17, {N_("Standard light A"), NULL}}, + { 18, {N_("Standard light B"), NULL}}, + { 19, {N_("Standard light C"), NULL}}, + { 20, {N_("D55"), NULL}}, + { 21, {N_("D65"), NULL}}, + { 22, {N_("D75"), NULL}}, + { 24, {N_("ISO studio tungsten"),NULL}}, + {255, {N_("Other"), NULL}}, + { 0, {NULL}}}}, + { EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT, + { {2, {N_("Inch"), N_("in"), NULL}}, + {3, {N_("Centimeter"), N_("cm"), NULL}}, + {0, {NULL}}}}, + { EXIF_TAG_RESOLUTION_UNIT, + { {2, {N_("Inch"), N_("in"), NULL}}, + {3, {N_("Centimeter"), N_("cm"), NULL}}, + {0, {NULL}}}}, + { EXIF_TAG_EXPOSURE_PROGRAM, + { {0, {N_("Not defined"), NULL}}, + {1, {N_("Manual"), NULL}}, + {2, {N_("Normal program"), N_("Normal"), NULL}}, + {3, {N_("Aperture priority"), N_("Aperture"), NULL}}, + {4, {N_("Shutter priority"),N_("Shutter"), NULL}}, + {5, {N_("Creative program (biased toward depth of field)"), + N_("Creative"), NULL}}, + {6, {N_("Creative program (biased toward fast shutter speed"), + N_("Action"), NULL}}, + {7, {N_("Portrait mode (for closeup photos with the background out " + "of focus)"), N_("Portrait"), NULL}}, + {8, {N_("Landscape mode (for landscape photos with the background " + "in focus)"), N_("Landscape"), NULL}}, + {0, {NULL}}}}, + { EXIF_TAG_FLASH, + { {0x0000, {N_("Flash did not fire."), N_("no flash"), NULL}}, + {0x0001, {N_("Flash fired."), N_("flash"), N_("Yes"), NULL}}, + {0x0005, {N_("Strobe return light not detected."), N_("W/o strobe"), + NULL}}, + {0x0007, {N_("Strobe return light detected."), N_("W. strobe"), NULL}}, + {0x000d, {N_("Flash fired, compulsatory flash mode, return light " + "not detected."), NULL}}, + {0x000f, {N_("Flash fired, compulsatory flash mode, return light " + "detected."), NULL}}, + {0x0010, {N_("Flash did not fire, compulsatory flash mode."), NULL}}, + {0x0018, {N_("Flash did not fire, auto mode."), NULL}}, + {0x0019, {N_("Flash fired, auto mode."), NULL}}, + {0x001d, {N_("Flash fired, auto mode, return light not detected."), + NULL}}, + {0x001f, {N_("Flash fired, auto mode, return light detected."), NULL}}, + {0x0020, {N_("No flash function."),NULL}}, + {0x0041, {N_("Flash fired, red-eye reduction mode."), NULL}}, + {0x0045, {N_("Flash fired, red-eye reduction mode, return light " + "not detected."), NULL}}, + {0x0047, {N_("Flash fired, red-eye reduction mode, return light " + "detected."), NULL}}, + {0x0049, {N_("Flash fired, compulsory flash mode, red-eye reduction " + "mode."), NULL}}, + {0x004d, {N_("Flash fired, compulsory flash mode, red-eye reduction " + "mode, return light not detected"), NULL}}, + {0x004f, {N_("Flash fired, compulsory flash mode, red-eye reduction, " + "return light detected"), NULL}}, + {0x0059, {N_("Flash fired, auto mode, red-eye reduction mode"), NULL}}, + {0x005d, {N_("Flash fired, auto mode, return light not detected, " + "red-eye reduction mode."), NULL}}, + {0x005f, {N_("Flash fired, auto mode, return light detected, " + "red-eye reduction mode."), NULL}}, + {0x0000, {NULL}}}}, + {EXIF_TAG_SUBJECT_DISTANCE_RANGE, + { {0, {N_("Unknown"), N_("?"), NULL}}, + {1, {N_("Macro"), NULL}}, + {2, {N_("Close view"), N_("close"), NULL}}, + {3, {N_("Distant view"), N_("distant"), NULL}}, + {0, {NULL}}}}, + {0, } +}; const char * exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) { - unsigned int i, j; + unsigned int i, j, k, l; ExifByte v_byte; ExifShort v_short, v_short2, v_short3, v_short4; ExifLong v_long; @@ -382,38 +491,6 @@ (int) v_srat.denominator); /* FIXME: How do I calculate the APEX value? */ break; - case EXIF_TAG_METERING_MODE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Unknown"), maxlen - 1); break; - case 1: strncpy (val, _("Average"), maxlen - 1); break; - case 2: - if (maxlen > strlen (_("Center-Weighted Average"))) - strncpy (val, _("Center-Weighted Average"), - maxlen - 1); - else - strncpy (val, _("Center-Weight"), maxlen - 1); - break; - case 3: strncpy (val, _("Spot"), maxlen - 1); break; - case 4: strncpy (val, _("Multi Spot"), maxlen - 1); break; - case 5: strncpy (val, _("Pattern"), maxlen - 1); break; - case 6: strncpy (val, _("Partial"), maxlen - 1); break; - case 255: strncpy (val, _("Other"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_COMPRESSION: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (val, _("Uncompressed"), maxlen); break; - case 6: strncpy (val, _("JPEG compression"), maxlen); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_FILE_SOURCE: CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen); CC (e->components, 1, val, maxlen); @@ -440,108 +517,6 @@ if (i < 3) strncat (val, " ", maxlen - strlen (val)); } break; - case EXIF_TAG_LIGHT_SOURCE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Unknown" ), maxlen - 1); break; - case 1: strncpy (val, _("Daylight" ), maxlen - 1); break; - case 2: strncpy (val, _("Fluorescent"), maxlen - 1); break; - case 3: - strncpy (val, _("Tungsten" ), maxlen - 1); - c = _(" (incandescent light)"); - if (maxlen > strlen (val) + strlen (c)) - strncat (val, c, maxlen - strlen (val) - 1); - break; - case 4: strncpy (val, _("Flash" ), maxlen - 1); break; - case 9: strncpy (val, _("Fine weather" ), maxlen - 1); break; - case 10: strncpy (val, _("Cloudy weather"), maxlen - 1); break; - case 11: strncpy (val, _("Shade" ), maxlen - 1); break; - case 12: - strncpy (val, _("Daylight fluorescent" ), maxlen - 1); - break; - case 13: - strncpy (val, _("Day white fluorescent" ), maxlen - 1); - break; - case 14: - strncpy (val, _("Cool white fluorescent"), maxlen - 1); - break; - case 15: - strncpy (val, _("White fluorescent" ), maxlen - 1); - break; - case 17: strncpy (val, _("Standard light A"), maxlen-1); break; - case 18: strncpy (val, _("Standard light B"), maxlen-1); break; - case 19: strncpy (val, _("Standard light C"), maxlen-1); break; - case 20: strncpy (val, _("D55"), maxlen - 1); break; - case 21: strncpy (val, _("D65"), maxlen - 1); break; - case 22: strncpy (val, _("D75"), maxlen - 1); break; - case 24: - strncpy (val, _("ISO studio tungsten"), maxlen - 1); - break; - case 255: strncpy (val, _("Other"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT: - case EXIF_TAG_RESOLUTION_UNIT: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 2: c = _("Inch"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("in"), maxlen - 1); - break; - case 3: c = _("Centimeter"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("cm"), maxlen - 1); - break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_EXPOSURE_PROGRAM: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Not defined"), maxlen - 1); break; - case 1: strncpy (val, _("Manual"), maxlen - 1); break; - case 2: c = _("Normal program"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Normal"), maxlen - 1); - break; - case 3: c = _("Aperture priority"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Aperture"), maxlen - 1); - break; - case 4: c = _("Shutter priority"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Shutter"), maxlen - 1); - break; - case 5: c = _("Creative program (biased toward " - "depth of field)"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Creative"), maxlen - 1); - break; - case 6: c = _("Action program (biased toward " - "fast shutter speed)"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Action"), maxlen - 1); - break; - case 7: c = _("Portrait mode (for closeup photos " - "with the background out of focus"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Portrait"), maxlen - 1); - break; - case 8: c = _("Landscape mode (for landscape " - "photos with the background in focus"); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Landscape"), maxlen - 1); - break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_EXPOSURE_BIAS_VALUE: CF (e->format, EXIF_FORMAT_SRATIONAL, val, maxlen); CC (e->components, 1, val, maxlen); @@ -567,117 +542,11 @@ else snprintf (val, maxlen, "%i, %i", v_short, v_short2); break; - case EXIF_TAG_FLASH: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0x0000: - strncpy (val, _("Flash did not fire."), maxlen); - break; - case 0x0001: - c = _("Flash fired."); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("Yes"), maxlen - 1); - break; - case 0x0005: - c = _("Strobe return light not detected."); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("W/o strobe"), maxlen - 1); - break; - case 0x0007: - c = _("Strobe return light detected."); - if (maxlen > strlen (c)) strncpy (val, c, maxlen - 1); - else strncpy (val, _("W. strobe"), maxlen - 1); - break; - case 0x000d: - strncpy (val, _("Flash fired, compulsory flash mode, " - "return light not detected."), maxlen - 1); - break; - case 0x000f: - strncpy (val, _("Flash fired, compulsory flash mode, " - "return light detected."), maxlen - 1); - break; - case 0x0010: - strncpy (val, _("Flash did not fire, compulsory flash " - "mode."), maxlen - 1); - break; - case 0x0018: - strncpy (val, _("Flash did not fire, auto mode."), maxlen - 1); - break; - case 0x0019: - strncpy (val, _("Flash fired, auto mode."), maxlen - 1); - break; - case 0x001d: - strncpy (val, _("Flash fired, auto mode, return light " - "not detected."), maxlen - 1); - break; - case 0x001f: - strncpy (val, _("Flash fired, auto mode, return light " - "detected."), maxlen - 1); - break; - case 0x0020: - strncpy (val, _("No flash function."), maxlen - 1); - break; - case 0x0041: - strncpy (val, _("Flash fired, red-eye reduction " - "mode."), maxlen - 1); - break; - case 0x0045: - strncpy (val, _("Flash fired, red-eye reduction mode, " - "return light not detected."), maxlen - 1); - break; - case 0x0047: - strncpy (val, _("Flash fired, red-eye reduction mode, " - "return light detected."), maxlen - 1); - break; - case 0x0049: - strncpy (val, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode."), maxlen - 1); - break; - case 0x004d: - strncpy (val, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode, return light not " - "detected."), maxlen - 1); - break; - case 0x004f: - strncpy (val, _("Flash fired, compulsory flash mode, " - "red-eye reduction mode, return light " - "detected."), maxlen - 1); - break; - case 0x0059: - strncpy (val, _("Flash fired, auto mode, red-eye " - "reduction mode."), maxlen - 1); - break; - case 0x005d: - strncpy (val, _("Flash fired, auto mode, return light " - "not detected, red-eye reduction mode."), - maxlen - 1); - break; - case 0x005f: - strncpy (val, _("Flash fired, auto mode, return light " - "detected, red-eye reduction mode."), - maxlen - 1); - break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_MAKER_NOTE: CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen); snprintf (val, maxlen, _("%i bytes unknown data"), (int) e->components); break; - case EXIF_TAG_SUBJECT_DISTANCE_RANGE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - if (v_short < 4) { - strncpy (val, _(sdr_entries[v_short]), maxlen -1); - } - else { - snprintf (val, maxlen, "%i", v_short); - } - break; case EXIF_TAG_SUBJECT_AREA: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); switch (e->components) { @@ -708,8 +577,49 @@ default: snprintf (val, maxlen, _("Unexpected number " "of components (%li, expected 2, 3, or 4)."), - e->components); + e->components); + } + break; + + case EXIF_TAG_METERING_MODE: + case EXIF_TAG_COMPRESSION: + case EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT: + case EXIF_TAG_RESOLUTION_UNIT: + case EXIF_TAG_EXPOSURE_PROGRAM: + case EXIF_TAG_FLASH: + case EXIF_TAG_SUBJECT_DISTANCE_RANGE: + CF (e->format,EXIF_FORMAT_SHORT, val, maxlen); + CC (e->components, 1, val, maxlen); + v_short = exif_get_short (e->data, o); + + /* Search the tag */ + for (i = 0; list2[i].tag && (list2[i].tag != e->tag); i++); + if (!list2[i].tag) { + strncpy (val, "Internal error.", maxlen - 1); + break; + } + + /* Find the value */ + for (j = 0; list2[i].elem[j].values && + (list2[i].elem[j].index < v_short); j++); + if (list2[i].elem[j].index != v_short) { + snprintf (val, maxlen, "Internal error (unknown " + "value %i).", v_short); + *((int *) 0) = 0; + break; } + + /* Find a short enough value */ + memset (val, 0, maxlen); + for (k = 0; list2[i].elem[j].values && + list2[i].elem[j].values[k]; k++) { + l = strlen (_(list2[i].elem[j].values[k])); + if ((maxlen > l) && (strlen (val) < l)) + strncpy (val, _(list2[i].elem[j].values[k]), maxlen - 1); + } + if (!strlen (val)) snprintf (val, maxlen, "%i", v_short); + + break; case EXIF_TAG_PLANAR_CONFIGURATION: case EXIF_TAG_SENSING_METHOD: case EXIF_TAG_ORIENTATION: @@ -727,11 +637,15 @@ CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 1, val, maxlen); v_short = exif_get_short (e->data, o); + + /* Search the tag */ for (i = 0; list[i].tag && (list[i].tag != e->tag); i++); if (!list[i].tag) { strncpy (val, "Internal error.", maxlen - 1); break; } + + /* Find the value */ for (j = 0; list[i].strings[j] && (j < v_short); j++); if (!list[i].strings[j]) snprintf (val, maxlen, "%i", v_short); |
|
From: Lutz M?l. <lu...@us...> - 2004-03-03 21:05:57
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15584 Modified Files: ChangeLog Log Message: 2004-03-03 Lutz Mueller <lu...@us...> * libexif/exif-entry.c: Patch by Joerg Hoh <jo...@de...>, enhanced by myself. Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- ChangeLog 3 Mar 2004 15:41:06 -0000 1.98 +++ ChangeLog 3 Mar 2004 20:45:16 -0000 1.99 @@ -1,3 +1,8 @@ +2004-03-03 Lutz Mueller <lu...@us...> + + * libexif/exif-entry.c: Patch by Joerg Hoh <jo...@de...>, + enhanced by myself. + 2004-03-03 Jan Patera <pa...@us...> * libexif/exif-entry.c: C-compilability & fix of the 2004/03/02 code |
|
From: Jan P. <pa...@us...> - 2004-03-03 16:01:37
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9123 Modified Files: ChangeLog Log Message: 2004-03-03 Jan Patera <pa...@us...> * libexif/exif-entry.c: C-compilability & fix of the 2004/03/02 code Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- ChangeLog 2 Mar 2004 18:11:06 -0000 1.97 +++ ChangeLog 3 Mar 2004 15:41:06 -0000 1.98 @@ -1,3 +1,7 @@ +2004-03-03 Jan Patera <pa...@us...> + + * libexif/exif-entry.c: C-compilability & fix of the 2004/03/02 code + 2004-03-02 Lutz Mueller <lu...@us...> * configure.in: No version on GETTEXT_PACKAGE. Requested by |
|
From: Jan P. <pa...@us...> - 2004-03-03 15:59:07
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8387 Modified Files: exif-entry.c Log Message: Fixes of changes "2004-03-02 Joerg Hoh<jo...@de...>": 1) EXIF_TAG_SUBJECT_DISTANCE_RANGE: entries made global static to be compilable with C 2) all values of the new code were shifted by one Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- exif-entry.c 2 Mar 2004 18:11:06 -0000 1.46 +++ exif-entry.c 3 Mar 2004 15:38:36 -0000 1.47 @@ -176,6 +176,8 @@ { 0, {NULL}} }; +static char* sdr_entries[] = {"Unknown", "Macro", "Close view", "Distant view"}; + const char * exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) { @@ -668,10 +670,9 @@ case EXIF_TAG_SUBJECT_DISTANCE_RANGE: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 1, val, maxlen); - char* entries[] = {"Unknown", "Macro", "Close view", "Distant view"}; v_short = exif_get_short (e->data, o); if (v_short < 4) { - strncpy (val, _(entries[v_short]), maxlen -1); + strncpy (val, _(sdr_entries[v_short]), maxlen -1); } else { snprintf (val, maxlen, "%i", v_short); @@ -731,7 +732,7 @@ strncpy (val, "Internal error.", maxlen - 1); break; } - for (j = 0; list[i].strings[j] && (j <= v_short); j++); + for (j = 0; list[i].strings[j] && (j < v_short); j++); if (!list[i].strings[j]) snprintf (val, maxlen, "%i", v_short); else |
|
From: Lutz M?l. <lu...@us...> - 2004-03-02 18:30:56
|
Update of /cvsroot/libexif/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22084/libexif Modified Files: exif-entry.c Log Message: 2004-03-02 Lutz Mueller <lu...@us...> * configure.in: No version on GETTEXT_PACKAGE. Requested by ge...@bi.... * libexif/exif-entry.c: Some formatting. 2004-03-02 Joerg Hoh<jo...@de...> * libexif/exif-entry.c: moved redundant code into a static structure Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- exif-entry.c 7 Jan 2004 23:36:16 -0000 1.45 +++ exif-entry.c 2 Mar 2004 18:11:06 -0000 1.46 @@ -137,10 +137,49 @@ } \ } +static struct { + ExifTag tag; + const char *strings[10]; +} list[] = { + { EXIF_TAG_PLANAR_CONFIGURATION, + {N_("chunky format"), N_("planar format"), NULL}}, + { EXIF_TAG_SENSING_METHOD, + { "", N_("Not defined"), N_("One-chip color area sensor"), + N_("Two-chip color area sensor"), N_("Three-chip color area sensor"), + N_("Color sequential area sensor"), "", N_("Trilinear sensor"), + N_("Color sequential linear sensor"), NULL}}, + { EXIF_TAG_ORIENTATION, + { "", N_("top - left"), N_("top - right"), N_("bottom - right"), + N_("bottom - left"), N_("left - top"), N_("right - top"), + N_("right - bottom"), N_("left - bottom"), NULL}}, + { EXIF_TAG_YCBCR_POSITIONING, + { "", N_("centered"), N_("co-sited"), NULL}}, + { EXIF_TAG_PHOTOMETRIC_INTERPRETATION, {"", N_("RGB"), N_("YCbCr"), NULL}}, + { EXIF_TAG_COLOR_SPACE, + { "", N_("sRGB"), N_("Uncalibrated"), NULL}}, + { EXIF_TAG_CUSTOM_RENDERED, + { "", N_("Normal process"), N_("Custom process"), NULL}}, + { EXIF_TAG_EXPOSURE_MODE, + { N_("Auto exposure"), N_("Manual exposure"), N_("Auto bracket"), NULL}}, + { EXIF_TAG_WHITE_BALANCE, + { N_("Auto white balance"), N_("Manual white balance"), NULL}}, + { EXIF_TAG_SCENE_CAPTURE_TYPE, + { N_("Stanard"), N_("Landscape"), N_("Portrait"), + N_("Night scene"), NULL}}, + { EXIF_TAG_GAIN_CONTROL, + { N_("Normal"), N_("Low gain up"), N_("High gain up"), + N_("Low gain down"), N_("High gain down"), NULL}}, + { EXIF_TAG_SATURATION, + { N_("Normal"), N_("Low saturation"), N_("High saturation"), NULL}}, + { EXIF_TAG_CONTRAST , {N_("Normal"), N_("Soft"), N_("Hard"), NULL}}, + { EXIF_TAG_SHARPNESS, {N_("Normal"), N_("Soft"), N_("Hard"), NULL}}, + { 0, {NULL}} +}; + const char * exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) { - unsigned int i; + unsigned int i, j; ExifByte v_byte; ExifShort v_short, v_short2, v_short3, v_short4; ExifLong v_long; @@ -381,16 +420,6 @@ default: snprintf (val, maxlen, "0x%02x", e->data[0]); break; } break; - case EXIF_TAG_PLANAR_CONFIGURATION: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (val, _("chunky format"), maxlen); break; - case 2: strncpy (val, _("planar format"), maxlen); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_COMPONENTS_CONFIGURATION: CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen); CC (e->components, 4, val, maxlen); @@ -409,31 +438,6 @@ if (i < 3) strncat (val, " ", maxlen - strlen (val)); } break; - case EXIF_TAG_SENSING_METHOD: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: strncpy (val, _("Not defined"), maxlen); break; - case 2: - strncpy (val, _("One-chip color area sensor"), maxlen); - break; - case 3: - strncpy (val, _("Two-chip color area sensor"), maxlen); - break; - case 4: - strncpy (val, _("Three-chip color area sensor"), maxlen); - break; - case 5: - strncpy (val, _("Color sequential area sensor"), maxlen); - break; - case 7: strncpy (val, _("Trilinear sensor"), maxlen); break; - case 8: - strncpy (val, _("Color sequential linear sensor"), maxlen); - break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_LIGHT_SOURCE: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 1, val, maxlen); @@ -547,56 +551,6 @@ (double) v_srat.numerator / (double) v_srat.denominator); break; - case EXIF_TAG_ORIENTATION: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (val, _("top - left"), maxlen); - break; - case 2: - strncpy (val, _("top - right"), maxlen); - break; - case 3: - strncpy (val, _("bottom - right"), maxlen); - break; - case 4: - strncpy (val, _("bottom - left"), maxlen); - break; - case 5: - strncpy (val, _("left - top"), maxlen); - break; - case 6: - strncpy (val, _("right - top"), maxlen); - break; - case 7: - strncpy (val, _("right - bottom"), maxlen); - break; - case 8: - strncpy (val, _("left - bottom"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; - case EXIF_TAG_YCBCR_POSITIONING: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (val, _("centered"), maxlen); - break; - case 2: - strncpy (val, _("co-sited"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; case EXIF_TAG_YCBCR_SUB_SAMPLING: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 2, val, maxlen); @@ -611,38 +565,6 @@ else snprintf (val, maxlen, "%i, %i", v_short, v_short2); break; - case EXIF_TAG_PHOTOMETRIC_INTERPRETATION: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 2: - strncpy (val, _("RGB"), maxlen); - break; - case 6: - strncpy (val, _("YCbCr"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; - case EXIF_TAG_COLOR_SPACE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 1: - strncpy (val, _("sRGB"), maxlen); - break; - case 0xffff: - strncpy (val, _("Uncalibrated"), maxlen); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; case EXIF_TAG_FLASH: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 1, val, maxlen); @@ -743,115 +665,16 @@ snprintf (val, maxlen, _("%i bytes unknown data"), (int) e->components); break; - case EXIF_TAG_CUSTOM_RENDERED: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (val, _("Normal process"), maxlen - 1); - break; - case 1: - strncpy (val, _("Custom process"), maxlen - 1); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; - case EXIF_TAG_EXPOSURE_MODE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (val, _("Auto exposure"), maxlen - 1); - break; - case 1: - strncpy (val, _("Manual exposure"), maxlen - 1); - break; - case 2: - strncpy (val, _("Auto bracket"), maxlen - 1); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; - case EXIF_TAG_WHITE_BALANCE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: - strncpy (val, _("Auto white balance"), maxlen - 1); - break; - case 1: - strncpy (val, _("Manual white balance"), maxlen - 1); - break; - default: - snprintf (val, maxlen, "%i", v_short); - break; - } - break; - case EXIF_TAG_SCENE_CAPTURE_TYPE: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Standard" ), maxlen - 1); break; - case 1: strncpy (val, _("Landscape" ), maxlen - 1); break; - case 2: strncpy (val, _("Portrait" ), maxlen - 1); break; - case 3: strncpy (val, _("Night scene"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_GAIN_CONTROL: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Normal" ), maxlen - 1); break; - case 1: strncpy (val, _("Low gain up" ), maxlen - 1); break; - case 2: strncpy (val, _("High gain up" ), maxlen - 1); break; - case 3: strncpy (val, _("Low gain down" ), maxlen - 1); break; - case 4: strncpy (val, _("High gain down"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_SATURATION: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Normal" ), maxlen - 1); break; - case 1: strncpy (val, _("Low saturation" ), maxlen - 1); break; - case 2: strncpy (val, _("High saturation"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; - case EXIF_TAG_CONTRAST: - case EXIF_TAG_SHARPNESS: - CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); - CC (e->components, 1, val, maxlen); - v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Normal"), maxlen - 1); break; - case 1: strncpy (val, _("Soft" ), maxlen - 1); break; - case 2: strncpy (val, _("Hard" ), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; - } - break; case EXIF_TAG_SUBJECT_DISTANCE_RANGE: CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); CC (e->components, 1, val, maxlen); + char* entries[] = {"Unknown", "Macro", "Close view", "Distant view"}; v_short = exif_get_short (e->data, o); - switch (v_short) { - case 0: strncpy (val, _("Unknown" ), maxlen - 1); break; - case 1: strncpy (val, _("Macro" ), maxlen - 1); break; - case 2: strncpy (val, _("Close view" ), maxlen - 1); break; - case 3: strncpy (val, _("Distant view"), maxlen - 1); break; - default: snprintf (val, maxlen, "%i", v_short); break; + if (v_short < 4) { + strncpy (val, _(entries[v_short]), maxlen -1); + } + else { + snprintf (val, maxlen, "%i", v_short); } break; case EXIF_TAG_SUBJECT_AREA: @@ -886,6 +709,34 @@ "of components (%li, expected 2, 3, or 4)."), e->components); } + case EXIF_TAG_PLANAR_CONFIGURATION: + case EXIF_TAG_SENSING_METHOD: + case EXIF_TAG_ORIENTATION: + case EXIF_TAG_YCBCR_POSITIONING: + case EXIF_TAG_PHOTOMETRIC_INTERPRETATION: + case EXIF_TAG_COLOR_SPACE: + case EXIF_TAG_CUSTOM_RENDERED: + case EXIF_TAG_EXPOSURE_MODE: + case EXIF_TAG_WHITE_BALANCE: + case EXIF_TAG_SCENE_CAPTURE_TYPE: + case EXIF_TAG_GAIN_CONTROL: + case EXIF_TAG_SATURATION: + case EXIF_TAG_CONTRAST: + case EXIF_TAG_SHARPNESS: + CF (e->format, EXIF_FORMAT_SHORT, val, maxlen); + CC (e->components, 1, val, maxlen); + v_short = exif_get_short (e->data, o); + for (i = 0; list[i].tag && (list[i].tag != e->tag); i++); + if (!list[i].tag) { + strncpy (val, "Internal error.", maxlen - 1); + break; + } + for (j = 0; list[i].strings[j] && (j <= v_short); j++); + if (!list[i].strings[j]) + snprintf (val, maxlen, "%i", v_short); + else + strncpy (val, _(list[i].strings[j]), maxlen - 1); + break; default: if (!e->components) break; switch (e->format) { |
|
From: Lutz M?l. <lu...@us...> - 2004-03-02 18:30:54
|
Update of /cvsroot/libexif/libexif In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22084 Modified Files: ChangeLog configure.in Log Message: 2004-03-02 Lutz Mueller <lu...@us...> * configure.in: No version on GETTEXT_PACKAGE. Requested by ge...@bi.... * libexif/exif-entry.c: Some formatting. 2004-03-02 Joerg Hoh<jo...@de...> * libexif/exif-entry.c: moved redundant code into a static structure Index: ChangeLog =================================================================== RCS file: /cvsroot/libexif/libexif/ChangeLog,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- ChangeLog 1 Mar 2004 11:58:34 -0000 1.96 +++ ChangeLog 2 Mar 2004 18:11:06 -0000 1.97 @@ -1,3 +1,13 @@ +2004-03-02 Lutz Mueller <lu...@us...> + + * configure.in: No version on GETTEXT_PACKAGE. Requested by + ge...@bi.... + * libexif/exif-entry.c: Some formatting. + +2004-03-02 Joerg Hoh<jo...@de...> + + * libexif/exif-entry.c: moved redundant code into a static structure + 2004-03-01 Jan Patera <pa...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Fixed flipped inequation Index: configure.in =================================================================== RCS file: /cvsroot/libexif/libexif/configure.in,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- configure.in 10 Jan 2004 19:24:33 -0000 1.60 +++ configure.in 2 Mar 2004 18:11:06 -0000 1.61 @@ -31,7 +31,7 @@ ALL_LINGUAS="de es fr" # EVIL HACKS AC_MSG_CHECKING([for po/Makevars requiring evil hack]) -GETTEXT_PACKAGE="${PACKAGE}-${LIBEXIF_CURRENT}" +GETTEXT_PACKAGE="${PACKAGE}" AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The gettext domain we're using]) AC_SUBST(GETTEXT_PACKAGE) if test -f po/Makevars.template |
