libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] exif/exif exif-i18n.c,1.3,1.4

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24699

Modified Files:
	exif-i18n.c 
Log Message:
Missing semicolon


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-i18n.c	27 Aug 2004 16:28:18 -0000	1.3
+++ exif-i18n.c	31 Aug 2004 13:19:13 -0000	1.4
@@ -28,6 +28,6 @@
 	iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
 	return buf;
 #else
-	return in	
+	return in;
 #endif
 }

[libexif-cvs] libexif ChangeLog,1.131,1.132

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16480

Modified Files:
	ChangeLog 
Log Message:

2004-08-31  Lutz Mueller <lu...@us...>

	* test/test-mem.c: Plug some memory leaks. Suggested by Angela Wrobel
	  (http://www.wrobelnet.de/contact.html).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- ChangeLog	27 Aug 2004 20:14:12 -0000	1.131
+++ ChangeLog	31 Aug 2004 06:11:02 -0000	1.132
@@ -1,3 +1,8 @@
+2004-08-31  Lutz Mueller <lu...@us...>
+
+	* test/test-mem.c: Plug some memory leaks. Suggested by Angela Wrobel
+	  (http://www.wrobelnet.de/contact.html).
+
 2004-08-27  Lutz Mueller <lu...@us...>
 
 	* configure.in: 0.6.10 -> 0.6.11, as libexif-0.6.10 has just been

[libexif-cvs] libexif/test test-mem.c,1.5,1.6

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16480/test

Modified Files:
	test-mem.c 
Log Message:

2004-08-31  Lutz Mueller <lu...@us...>

	* test/test-mem.c: Plug some memory leaks. Suggested by Angela Wrobel
	  (http://www.wrobelnet.de/contact.html).


Index: test-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-mem.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test-mem.c	17 Mar 2003 20:38:48 -0000	1.5
+++ test-mem.c	31 Aug 2004 06:11:03 -0000	1.6
@@ -44,16 +44,19 @@
 	e = exif_entry_new ();
 	exif_content_add_entry (ed->ifd[EXIF_IFD_0], e);
 	exif_entry_initialize (e, EXIF_TAG_EXIF_VERSION);
+	exif_entry_unref (e);
 
 	printf ("Creating another EXIF entry...\n");
 	e = exif_entry_new ();
 	exif_content_add_entry (ed->ifd[EXIF_IFD_0], e);
 	exif_entry_initialize (e, EXIF_TAG_DATE_TIME);
+	exif_entry_unref (e);
 
 	printf ("Creating an EXIF entry in the EXIF IFD...\n");
 	e = exif_entry_new ();
 	exif_content_add_entry (ed->ifd[EXIF_IFD_EXIF], e);
 	exif_entry_initialize (e, EXIF_TAG_FLASH_PIX_VERSION);
+	exif_entry_unref (e);
 
 	exif_data_dump (ed);
 

[libexif-cvs] libexif ChangeLog,1.130,1.131 configure.in,1.65,1.66

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21522

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-08-27  Lutz Mueller <lu...@us...>

	* configure.in: 0.6.10 -> 0.6.11, as libexif-0.6.10 has just been
	  released.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- ChangeLog	27 Aug 2004 15:28:42 -0000	1.130
+++ ChangeLog	27 Aug 2004 20:14:12 -0000	1.131
@@ -1,3 +1,8 @@
+2004-08-27  Lutz Mueller <lu...@us...>
+
+	* configure.in: 0.6.10 -> 0.6.11, as libexif-0.6.10 has just been
+	  released.
+
 2004-08-26  Lutz Mueller <lu...@us...>
 
 	Achim Bohnet found a spelling mistake:

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- configure.in	27 May 2004 17:56:23 -0000	1.65
+++ configure.in	27 Aug 2004 20:14:12 -0000	1.66
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.6.10)
+AM_INIT_AUTOMAKE(libexif, 0.6.11)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] exif/exif exif-i18n.c,1.2,1.3

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11735/exif

Modified Files:
	exif-i18n.c 
Log Message:

2004-08-27  Lutz Mueller <lu...@us...>

	* exif/exif-i18n.c: Some users don't have iconv.


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-i18n.c	30 Sep 2003 22:53:37 -0000	1.2
+++ exif-i18n.c	27 Aug 2004 16:28:18 -0000	1.3
@@ -1,7 +1,10 @@
 #include <config.h>
 #include "exif-i18n.h"
 
-#include <iconv.h>
+#ifdef HAVE_ICONV
+#  include <iconv.h>
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 
@@ -11,6 +14,7 @@
 const char *
 exif_i18n_convert_utf8_to_lat1 (const char *in)
 {
+#ifdef HAVE_ICONV
 	static iconv_t tr = 0;
 	size_t t = (in ? strlen (in) : 0);
 	static char buf[2048];
@@ -23,4 +27,7 @@
 	if (!tr) tr = iconv_open ("ISO-8859-1", "UTF-8");
 	iconv (tr, (char **) &in, &t, (char **) &out, &buf_size);
 	return buf;
+#else
+	return in	
+#endif
 }

[libexif-cvs] exif ChangeLog,1.43,1.44 configure.in,1.33,1.34

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11735

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-08-27  Lutz Mueller <lu...@us...>

	* exif/exif-i18n.c: Some users don't have iconv.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	22 Jun 2004 18:01:19 -0000	1.43
+++ ChangeLog	27 Aug 2004 16:28:18 -0000	1.44
@@ -1,3 +1,7 @@
+2004-08-27  Lutz Mueller <lu...@us...>
+
+	* exif/exif-i18n.c: Some users don't have iconv.
+
 2004-06-22  Lutz Mueller <lu...@us...>
 
 	* exif/actions.c: Don't crash if return value is NULL. Spotted by

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- configure.in	27 May 2004 17:50:08 -0000	1.33
+++ configure.in	27 Aug 2004 16:28:18 -0000	1.34
@@ -27,6 +27,8 @@
 dnl           have it (at least if configured --without-nls).
 dnl ---------------------------------------------------------------------------
 AC_CHECK_HEADERS(locale.h)
+AC_CHECK_HEADER(iconv.h, [
+	AC_DEFINE(HAVE_ICONV,1,[whether iconv is available])])
 
 dnl ---------------------------------------------------------------------------
 dnl popt.h: Simplifies handling of command-line options enormously.

[libexif-cvs] libexif ChangeLog,1.129,1.130

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32383

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- ChangeLog	26 Aug 2004 22:17:14 -0000	1.129
+++ ChangeLog	27 Aug 2004 15:28:42 -0000	1.130
@@ -6,7 +6,7 @@
 
 2004-08-26  Lutz Mueller <lu...@us...>
 
-	Suggestions from Angela Wrobel <Ang...@gm...>:
+	Suggestions from Angela Wrobel (http://www.wrobelnet.de/contact.html)
 
 	* libexif/exif-entry.c
 	* libexif/exif-loader.c

[libexif-cvs] libexif ChangeLog,1.128,1.129

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11347

Modified Files:
	ChangeLog 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Achim Bohnet found a spelling mistake:

	* libexif/exif-tag.c: 'colums' -> 'columns'


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- ChangeLog	26 Aug 2004 20:08:09 -0000	1.128
+++ ChangeLog	26 Aug 2004 22:17:14 -0000	1.129
@@ -1,5 +1,11 @@
 2004-08-26  Lutz Mueller <lu...@us...>
 
+	Achim Bohnet found a spelling mistake:
+
+	* libexif/exif-tag.c: 'colums' -> 'columns'
+
+2004-08-26  Lutz Mueller <lu...@us...>
+
 	Suggestions from Angela Wrobel <Ang...@gm...>:
 
 	* libexif/exif-entry.c

[libexif-cvs] libexif/libexif exif-tag.c,1.15,1.16

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11347/libexif

Modified Files:
	exif-tag.c 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Achim Bohnet found a spelling mistake:

	* libexif/exif-tag.c: 'colums' -> 'columns'


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exif-tag.c	3 May 2004 19:01:18 -0000	1.15
+++ exif-tag.c	26 Aug 2004 22:17:20 -0000	1.16
@@ -40,7 +40,7 @@
 	{EXIF_TAG_INTEROPERABILITY_VERSION, "InteroperabilityVersion",
 	 "InteroperabilityVersion", ""},
 	{EXIF_TAG_IMAGE_WIDTH, "ImageWidth", N_("Image Width"),
-	 N_("The number of colums of image data, equal to the number of "
+	 N_("The number of columns of image data, equal to the number of "
 	    "pixels per row. In JPEG compressed data a JPEG marker is "
 	    "used instead of this tag.")},
 	{EXIF_TAG_IMAGE_LENGTH, "ImageLength", N_("Image Length"),
@@ -87,7 +87,7 @@
 	    "data this designation is not needed and is omitted. See also "
 	    "<RowsPerStrip> and <StripByteCounts>.")},
 	{EXIF_TAG_ORIENTATION, "Orientation", N_("Orientation"),
-	 N_("The image orientation viewed in terms of rows and colums.")},
+	 N_("The image orientation viewed in terms of rows and columns.")},
 	{EXIF_TAG_SAMPLES_PER_PIXEL, "SamplesPerPixel",
 	 N_("Samples per Pixel"),
 	 N_("The number of components per pixel. Since this standard applies "

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.16,1.17

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18453/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Suggestions from Angela Wrobel <Ang...@gm...>:

	* libexif/exif-entry.c
	* libexif/exif-loader.c
	* libexif/exif-utils.c
	* olympus/exif-mnote-data-olympus.c
	* pentax/exif-mnote-data-pentax.c: Check if malloc returned NULL.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- exif-mnote-data-olympus.c	13 Jul 2004 15:16:38 -0000	1.16
+++ exif-mnote-data-olympus.c	26 Aug 2004 20:08:09 -0000	1.17
@@ -265,6 +265,7 @@
 	exif_mnote_data_olympus_clear (n);
 
 	n->entries = malloc (sizeof (MnoteOlympusEntry) * c);
+	if (!n->entries) return;
 	memset (n->entries, 0, sizeof (MnoteOlympusEntry) * c);
 
 	/* Parse the entries */

[libexif-cvs] libexif/libexif exif-entry.c,1.54,1.55 exif-loader.c,1.7,1.8 exif-utils.c,1.5,1.6

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18453/libexif

Modified Files:
	exif-entry.c exif-loader.c exif-utils.c 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Suggestions from Angela Wrobel <Ang...@gm...>:

	* libexif/exif-entry.c
	* libexif/exif-loader.c
	* libexif/exif-utils.c
	* olympus/exif-mnote-data-olympus.c
	* pentax/exif-mnote-data-pentax.c: Check if malloc returned NULL.


Index: exif-utils.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-utils.c	15 Dec 2002 11:41:11 -0000	1.5
+++ exif-utils.c	26 Aug 2004 20:08:09 -0000	1.6
@@ -26,6 +26,7 @@
 static ExifSShort
 exif_get_sshort (const unsigned char *buf, ExifByteOrder order)
 {
+	if (!buf) return 0;
         switch (order) {
         case EXIF_BYTE_ORDER_MOTOROLA:
                 return ((buf[0] << 8) | buf[1]);
@@ -46,6 +47,7 @@
 void
 exif_set_short (unsigned char *b, ExifByteOrder order, ExifShort value)
 {
+	if (!b) return;
 	switch (order) {
 	case EXIF_BYTE_ORDER_MOTOROLA:
 		b[0] = (unsigned char) (value >> 8);
@@ -61,6 +63,7 @@
 ExifSLong
 exif_get_slong (const unsigned char *b, ExifByteOrder order)
 {
+	if (!b) return 0;
         switch (order) {
         case EXIF_BYTE_ORDER_MOTOROLA:
                 return ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]);
@@ -75,6 +78,7 @@
 void
 exif_set_slong (unsigned char *b, ExifByteOrder order, ExifSLong value)
 {
+	if (!b) return;
 	switch (order) {
 	case EXIF_BYTE_ORDER_MOTOROLA:
 		b[0] = (unsigned char) (value >> 24);
@@ -108,8 +112,8 @@
 {
 	ExifSRational r;
 
-	r.numerator   = exif_get_slong (buf, order);
-	r.denominator = exif_get_slong (buf + 4, order);
+	r.numerator   = buf ? exif_get_slong (buf, order) : 0;
+	r.denominator = buf ? exif_get_slong (buf + 4, order) : 0;
 
 	return (r);
 }
@@ -119,8 +123,8 @@
 {
 	ExifRational r;
 
-	r.numerator   = exif_get_long (buf, order);
-	r.denominator = exif_get_long (buf + 4, order);
+	r.numerator   = buf ? exif_get_long (buf, order) : 0;
+	r.denominator = buf ? exif_get_long (buf + 4, order) : 0;
 
 	return (r);
 }
@@ -129,6 +133,7 @@
 exif_set_rational (unsigned char *buf, ExifByteOrder order,
 		   ExifRational value)
 {
+	if (!buf) return;
 	exif_set_long (buf, order, value.numerator);
 	exif_set_long (buf + 4, order, value.denominator);
 }
@@ -137,6 +142,7 @@
 exif_set_srational (unsigned char *buf, ExifByteOrder order,
 		    ExifSRational value)
 {
+	if (!buf) return;
 	exif_set_slong (buf, order, value.numerator);
 	exif_set_slong (buf + 4, order, value.denominator);
 }

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- exif-entry.c	27 May 2004 17:11:40 -0000	1.54
+++ exif-entry.c	26 Aug 2004 20:08:09 -0000	1.55
@@ -46,14 +46,10 @@
 	ExifEntry *e;
 
 	e = malloc (sizeof (ExifEntry));
-	if (!e)
-		return NULL;
+	if (!e) return NULL;
 	memset (e, 0, sizeof (ExifEntry));
 	e->priv = malloc (sizeof (ExifEntryPrivate));
-	if (!e->priv) {
-		free (e);
-		return NULL;
-	}
+	if (!e->priv) { free (e); return NULL; }
 	memset (e->priv, 0, sizeof (ExifEntryPrivate));
 	e->priv->ref_count = 1;
 
@@ -798,7 +794,7 @@
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
-		memset (e->data, 0, e->size);
+		if (e->data) memset (e->data, 0, e->size);
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -892,7 +888,7 @@
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
-		memset (e->data, 0, e->size);
+		if (e->data) memset (e->data, 0, e->size);
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -913,7 +909,7 @@
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
-		memset (e->data, 0, e->size);
+		if (e->data) memset (e->data, 0, e->size);
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -934,7 +930,7 @@
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
-		memset (e->data, 0, e->size);
+		if (e->data) memset (e->data, 0, e->size);
 		break;
 
 	/* RATIONAL, 6 components */

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exif-loader.c	20 May 2004 10:50:35 -0000	1.7
+++ exif-loader.c	26 Aug 2004 20:08:09 -0000	1.8
@@ -62,7 +62,7 @@
 {
 	int i, len_remain;
 
-	if (!eld) return 0;
+	if (!eld || !buf || !len) return 0;
 	if (eld->state == EL_FAILED) return 0;
 	if (eld->size && eld->bytes_read == eld->size) return 0;
 
@@ -144,6 +144,7 @@
 	if (eld->state == EL_EXIF_FOUND && len_remain > 0) {
 		if (eld->buf == NULL) {
 			eld->buf = malloc (sizeof (unsigned char) * eld->size);
+			if (!eld->buf) return 0;
 			eld->bytes_read = 0;
 		}
 
@@ -169,9 +170,10 @@
 {
 	ExifLoader *loader = malloc (sizeof (ExifLoader));
 
+	if (!loader) return NULL;
 	memset (loader, 0, sizeof (ExifLoader));
 	loader->ref_count = 1;
-	
+
 	return loader;
 }
 

[libexif-cvs] libexif/libexif/pentax exif-mnote-data-pentax.c,1.7,1.8

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18453/libexif/pentax

Modified Files:
	exif-mnote-data-pentax.c 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Suggestions from Angela Wrobel <Ang...@gm...>:

	* libexif/exif-entry.c
	* libexif/exif-loader.c
	* libexif/exif-utils.c
	* olympus/exif-mnote-data-olympus.c
	* pentax/exif-mnote-data-pentax.c: Check if malloc returned NULL.


Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exif-mnote-data-pentax.c	13 Jul 2004 15:16:38 -0000	1.7
+++ exif-mnote-data-pentax.c	26 Aug 2004 20:08:09 -0000	1.8
@@ -79,6 +79,7 @@
 	if (buf_size < 2) return;
 	c = exif_get_short (buf + 6 + n->offset, n->order);
 	n->entries = malloc (sizeof (MnotePentaxEntry) * c);
+	if (!n->entries) return;
 	memset (n->entries, 0, sizeof (MnotePentaxEntry) * c);
 
 	for (i = 0; i < c; i++) {

[libexif-cvs] libexif ChangeLog,1.127,1.128

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18453

Modified Files:
	ChangeLog 
Log Message:

2004-08-26  Lutz Mueller <lu...@us...>

	Suggestions from Angela Wrobel <Ang...@gm...>:

	* libexif/exif-entry.c
	* libexif/exif-loader.c
	* libexif/exif-utils.c
	* olympus/exif-mnote-data-olympus.c
	* pentax/exif-mnote-data-pentax.c: Check if malloc returned NULL.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- ChangeLog	13 Jul 2004 15:16:36 -0000	1.127
+++ ChangeLog	26 Aug 2004 20:08:09 -0000	1.128
@@ -1,3 +1,13 @@
+2004-08-26  Lutz Mueller <lu...@us...>
+
+	Suggestions from Angela Wrobel <Ang...@gm...>:
+
+	* libexif/exif-entry.c
+	* libexif/exif-loader.c
+	* libexif/exif-utils.c
+	* olympus/exif-mnote-data-olympus.c
+	* pentax/exif-mnote-data-pentax.c: Check if malloc returned NULL.
+
 2004-07-13  Jan Patera <pa...@us...>
 
 	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.16,1.17

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700

Modified Files:
	mnote-olympus-entry.c 
Log Message:
MNOTE_OLYMPUS_TAG_VERSION can have 5 or 8 chars


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- mnote-olympus-entry.c	23 Jun 2004 17:35:27 -0000	1.16
+++ mnote-olympus-entry.c	16 Aug 2004 14:48:14 -0000	1.17
@@ -426,7 +426,7 @@
 		break;
 	case MNOTE_OLYMPUS_TAG_VERSION:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
-		CC (entry->components, 5, v, maxlen);
+		CC2 (entry->components, 5, 8, v, maxlen);
 		strncpy (v, entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_INFO:

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.15,1.16

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exif-mnote-data-olympus.c	6 Jun 2004 03:04:21 -0000	1.15
+++ exif-mnote-data-olympus.c	13 Jul 2004 15:16:38 -0000	1.16
@@ -307,6 +307,16 @@
 	return n ? ((ExifMnoteDataOlympus *) n)->count : 0;
 }
 
+static unsigned int
+exif_mnote_data_olympus_get_id (ExifMnoteData *d, unsigned int n)
+{
+	ExifMnoteDataOlympus *note = (ExifMnoteDataOlympus *) d;
+
+	if (!note) return 0;
+	if (note->count <= n) return 0;
+	return note->entries[n].tag;
+}
+
 static const char *
 exif_mnote_data_olympus_get_name (ExifMnoteData *d, unsigned int i)
 {
@@ -416,25 +426,25 @@
 ExifMnoteData *
 exif_mnote_data_olympus_new (void)
 {
-	ExifMnoteData *n;
+	ExifMnoteData *d;
 
-	n = malloc (sizeof (ExifMnoteDataOlympus));
-	if (!n) return NULL;
-	memset (n, 0, sizeof (ExifMnoteDataOlympus));
+	d = calloc (1, sizeof (ExifMnoteDataOlympus));
+	if (!d) return NULL;
 
-	exif_mnote_data_construct (n);
+	exif_mnote_data_construct (d);
 
-	/* Set up the function pointers */
-	n->methods.free            = exif_mnote_data_olympus_free;
-	n->methods.set_byte_order  = exif_mnote_data_olympus_set_byte_order;
-	n->methods.set_offset      = exif_mnote_data_olympus_set_offset;
-	n->methods.load            = exif_mnote_data_olympus_load;
-	n->methods.save            = exif_mnote_data_olympus_save;
-	n->methods.count           = exif_mnote_data_olympus_count;
-	n->methods.get_name        = exif_mnote_data_olympus_get_name;
-	n->methods.get_title       = exif_mnote_data_olympus_get_title;
-	n->methods.get_description = exif_mnote_data_olympus_get_description;
-	n->methods.get_value       = exif_mnote_data_olympus_get_value;
+	/* Set up function pointers */
+	d->methods.free            = exif_mnote_data_olympus_free;
+	d->methods.set_byte_order  = exif_mnote_data_olympus_set_byte_order;
+	d->methods.set_offset      = exif_mnote_data_olympus_set_offset;
+	d->methods.load            = exif_mnote_data_olympus_load;
+	d->methods.save            = exif_mnote_data_olympus_save;
+	d->methods.count           = exif_mnote_data_olympus_count;
+	d->methods.get_id          = exif_mnote_data_olympus_get_id;
+	d->methods.get_name        = exif_mnote_data_olympus_get_name;
+	d->methods.get_title       = exif_mnote_data_olympus_get_title;
+	d->methods.get_description = exif_mnote_data_olympus_get_description;
+	d->methods.get_value       = exif_mnote_data_olympus_get_value;
 
-	return n;
+	return d;
 }

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c,1.5,1.6

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889/libexif/canon

Modified Files:
	exif-mnote-data-canon.c 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-mnote-data-canon.c	7 Jan 2004 14:53:04 -0000	1.5
+++ exif-mnote-data-canon.c	13 Jul 2004 15:16:37 -0000	1.6
@@ -244,6 +244,16 @@
 	return n ? ((ExifMnoteDataCanon *) n)->count : 0;
 }
 
+static unsigned int
+exif_mnote_data_canon_get_id (ExifMnoteData *d, unsigned int n)
+{
+	ExifMnoteDataCanon *note = (ExifMnoteDataCanon *) d;
+
+	if (!note) return 0;
+	if (note->count <= n) return 0;
+	return note->entries[n].tag;
+}
+
 static const char *
 exif_mnote_data_canon_get_name (ExifMnoteData *note, unsigned int i)
 {
@@ -278,9 +288,8 @@
 {
 	ExifMnoteData *d;
 
-	d = malloc (sizeof (ExifMnoteDataCanon));
+	d = calloc (1, sizeof (ExifMnoteDataCanon));
 	if (!d) return NULL;
-	memset (d, 0, sizeof (ExifMnoteDataCanon));
 
 	exif_mnote_data_construct (d);
 
@@ -291,6 +300,7 @@
 	d->methods.load            = exif_mnote_data_canon_load;
 	d->methods.save            = exif_mnote_data_canon_save;
 	d->methods.count           = exif_mnote_data_canon_count;
+	d->methods.get_id          = exif_mnote_data_canon_get_id;
 	d->methods.get_name        = exif_mnote_data_canon_get_name;
 	d->methods.get_title       = exif_mnote_data_canon_get_title;
 	d->methods.get_description = exif_mnote_data_canon_get_description;

[libexif-cvs] libexif/libexif exif-mnote-data-priv.h,1.5,1.6 exif-mnote-data.c,1.6,1.7 exif-mnote-data.h,1.3,1.4

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889/libexif

Modified Files:
	exif-mnote-data-priv.h exif-mnote-data.c exif-mnote-data.h 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: exif-mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exif-mnote-data.c	6 Jun 2004 03:04:20 -0000	1.6
+++ exif-mnote-data.c	13 Jul 2004 15:16:37 -0000	1.7
@@ -104,6 +104,13 @@
 	return d->methods.count (d);
 }
 
+unsigned int
+exif_mnote_data_get_id (ExifMnoteData *d, unsigned int n)
+{
+	if (!d || !d->methods.get_id) return 0;
+	return d->methods.get_id (d, n);
+}
+
 const char *
 exif_mnote_data_get_name (ExifMnoteData *d, unsigned int n)
 {

Index: exif-mnote-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-mnote-data.h	20 May 2004 10:50:35 -0000	1.3
+++ exif-mnote-data.h	13 Jul 2004 15:16:37 -0000	1.4
@@ -37,6 +37,7 @@
 void exif_mnote_data_save (ExifMnoteData *, unsigned char **, unsigned int *);
 
 unsigned int exif_mnote_data_count           (ExifMnoteData *);
+unsigned int exif_mnote_data_get_id          (ExifMnoteData *, unsigned int);
 const char  *exif_mnote_data_get_name        (ExifMnoteData *, unsigned int);
 const char  *exif_mnote_data_get_title       (ExifMnoteData *, unsigned int);
 const char  *exif_mnote_data_get_description (ExifMnoteData *, unsigned int);

Index: exif-mnote-data-priv.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data-priv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-mnote-data-priv.h	20 May 2004 10:50:35 -0000	1.5
+++ exif-mnote-data-priv.h	13 Jul 2004 15:16:37 -0000	1.6
@@ -43,6 +43,7 @@
 
 	/* Query */
 	unsigned int (* count)           (ExifMnoteData *);
+        unsigned int (* get_id)          (ExifMnoteData *, unsigned int);
 	const char * (* get_name)        (ExifMnoteData *, unsigned int);
 	const char * (* get_title)       (ExifMnoteData *, unsigned int);
 	const char * (* get_description) (ExifMnoteData *, unsigned int);

[libexif-cvs] libexif/libexif/pentax exif-mnote-data-pentax.c,1.6,1.7

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889/libexif/pentax

Modified Files:
	exif-mnote-data-pentax.c 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exif-mnote-data-pentax.c	15 Mar 2004 23:14:49 -0000	1.6
+++ exif-mnote-data-pentax.c	13 Jul 2004 15:16:38 -0000	1.7
@@ -117,6 +117,16 @@
 	return n ? ((ExifMnoteDataPentax *) n)->count : 0;
 }
 
+static unsigned int
+exif_mnote_data_pentax_get_id (ExifMnoteData *d, unsigned int n)
+{
+	ExifMnoteDataPentax *note = (ExifMnoteDataPentax *) d;
+
+	if (!note) return 0;
+	if (note->count <= n) return 0;
+	return note->entries[n].tag;
+}
+
 static const char *
 exif_mnote_data_pentax_get_name (ExifMnoteData *d, unsigned int n)
 {
@@ -225,24 +235,24 @@
 ExifMnoteData *
 exif_mnote_data_pentax_new (void)
 {
-	ExifMnoteData *n;
+	ExifMnoteData *d;
 
-	n = malloc (sizeof (ExifMnoteDataPentax));
-	if (!n) return NULL;
-	memset (n, 0, sizeof (ExifMnoteDataPentax));
+	d = calloc (1, sizeof (ExifMnoteDataPentax));
+	if (!d) return NULL;
 
-	exif_mnote_data_construct (n);
+	exif_mnote_data_construct (d);
 
 	/* Set up function pointers */
-	n->methods.free            = exif_mnote_data_pentax_free;
-	n->methods.set_byte_order  = exif_mnote_data_pentax_set_byte_order;
-	n->methods.set_offset      = exif_mnote_data_pentax_set_offset;
-	n->methods.load            = exif_mnote_data_pentax_load;
-	n->methods.count           = exif_mnote_data_pentax_count;
-	n->methods.get_name        = exif_mnote_data_pentax_get_name;
-	n->methods.get_title       = exif_mnote_data_pentax_get_title;
-	n->methods.get_description = exif_mnote_data_pentax_get_description;
-	n->methods.get_value       = exif_mnote_data_pentax_get_value;
+	d->methods.free            = exif_mnote_data_pentax_free;
+	d->methods.set_byte_order  = exif_mnote_data_pentax_set_byte_order;
+	d->methods.set_offset      = exif_mnote_data_pentax_set_offset;
+	d->methods.load            = exif_mnote_data_pentax_load;
+	d->methods.count           = exif_mnote_data_pentax_count;
+	d->methods.get_id          = exif_mnote_data_pentax_get_id;
+	d->methods.get_name        = exif_mnote_data_pentax_get_name;
+	d->methods.get_title       = exif_mnote_data_pentax_get_title;
+	d->methods.get_description = exif_mnote_data_pentax_get_description;
+	d->methods.get_value       = exif_mnote_data_pentax_get_value;
 
-	return n;
+	return d;
 }

[libexif-cvs] libexif ChangeLog,1.126,1.127

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29889

Modified Files:
	ChangeLog 
Log Message:
2004-07-13  Jan Patera <pa...@us...>

	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
	  returning actual mnote entry tag ID (suggested by Serge
	  Droz <ser...@ps...>)



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- ChangeLog	23 Jun 2004 17:35:27 -0000	1.126
+++ ChangeLog	13 Jul 2004 15:16:36 -0000	1.127
@@ -1,3 +1,9 @@
+2004-07-13  Jan Patera <pa...@us...>
+
+	* libexif/exif-mnote-*.*: added exif_mnote_data_get_id()
+	  returning actual mnote entry tag ID (suggested by Serge
+	  Droz <ser...@ps...>)
+
 2004-06-23  Serge Droz <ser...@ps...>
 
 	(committed by Lutz Mueller <lu...@us...>)

[libexif-cvs] libexif libexif.spec.in,1.4,1.5

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25933

Modified Files:
	libexif.spec.in 
Log Message:
Bugfix: [ 686847 ] Mistakes in libexif spec file file list


Index: libexif.spec.in
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libexif.spec.in	15 Oct 2003 18:04:03 -0000	1.4
+++ libexif.spec.in	1 Jul 2004 10:54:46 -0000	1.5
@@ -1,7 +1,7 @@
 Name: @PACKAGE@
 Summary: EXIF tag library
 Version: @VERSION@
-Release: 1
+Release: 2
 Source: http://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.gz
 Url: http://sourceforge.net/projects/libexif/
 Group: System Environment/Libraries
@@ -43,12 +43,13 @@
 %defattr(-,root,root)
 %doc ChangeLog README
 %{_libdir}/libexif.so.*
-%{_libdir}/libexif.la
-%{_libdir}/libexif.a
+%{_libdir}/libexif.so
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
 
 %files devel
 %defattr(-,root,root)
 %{_libdir}/pkgconfig/libexif.pc
-%{_includedir}/libexif/*.h
-%{_libdir}/libexif.so
+%{_includedir}/libexif
+%{_libdir}/libexif.la
+%{_libdir}/libexif.a
+

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.15,1.16

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21649/libexif/olympus

Modified Files:
	mnote-olympus-entry.c 
Log Message:

2004-06-23  Serge Droz <ser...@ps...>

	(committed by Lutz Mueller <lu...@us...>)

        * libexif/olympus/mnote-olympus-entry.c: Reapply Jan Patera's 
          change.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mnote-olympus-entry.c	22 Jun 2004 18:25:40 -0000	1.15
+++ mnote-olympus-entry.c	23 Jun 2004 17:35:27 -0000	1.16
@@ -164,7 +164,7 @@
 char *
 mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int maxlen)
 {
-	char         buf[300];
+	char         buf[30];
 	ExifLong     vl;
 	ExifShort    vs = 0;
 	ExifRational vr;
@@ -524,11 +524,11 @@
 			break;
 		case EXIF_FORMAT_UNDEFINED:
 		default:
-			snprintf (v, maxlen, "%li bytes unknown data:",
+			snprintf (v, maxlen, _("%li bytes unknown data: "),
 				  entry->size);
 			for (i = 0; i < entry->size; i++) {
-				sprintf (buf, " %02x", entry->data[i]);
-				strncat (v, buf, maxlen);
+				sprintf (buf, "%02x", entry->data[i]);
+				strncat (v, buf, maxlen - strlen (v));
 			}
 			break;
 		}

[libexif-cvs] libexif ChangeLog,1.125,1.126

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21649

Modified Files:
	ChangeLog 
Log Message:

2004-06-23  Serge Droz <ser...@ps...>

	(committed by Lutz Mueller <lu...@us...>)

        * libexif/olympus/mnote-olympus-entry.c: Reapply Jan Patera's 
          change.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- ChangeLog	22 Jun 2004 18:25:38 -0000	1.125
+++ ChangeLog	23 Jun 2004 17:35:27 -0000	1.126
@@ -1,3 +1,10 @@
+2004-06-23  Serge Droz <ser...@ps...>
+
+	(committed by Lutz Mueller <lu...@us...>)
+
+        * libexif/olympus/mnote-olympus-entry.c: Reapply Jan Patera's 
+          change.
+
 2004-06-22  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus/mnote-olympus-entry.c: Correct the usage of 

[libexif-cvs] libexif ChangeLog,1.124,1.125

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10042

Modified Files:
	ChangeLog 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Correct the usage of 
	  strncat. Fix pointed out by Serge Droz <ser...@ps...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- ChangeLog	22 Jun 2004 18:10:38 -0000	1.124
+++ ChangeLog	22 Jun 2004 18:25:38 -0000	1.125
@@ -1,5 +1,10 @@
 2004-06-22  Lutz Mueller <lu...@us...>
 
+	* libexif/olympus/mnote-olympus-entry.c: Correct the usage of 
+	  strncat. Fix pointed out by Serge Droz <ser...@ps...>.
+
+2004-06-22  Lutz Mueller <lu...@us...>
+
 	* libexif/olympus/mnote-olympus-tag.[c,h]: New tags discovered by
 	  Serge Droz <ser...@ps...>.
 

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.14,1.15

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10042/libexif/olympus

Modified Files:
	mnote-olympus-entry.c 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Correct the usage of 
	  strncat. Fix pointed out by Serge Droz <ser...@ps...>.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mnote-olympus-entry.c	15 Jun 2004 16:21:56 -0000	1.14
+++ mnote-olympus-entry.c	22 Jun 2004 18:25:40 -0000	1.15
@@ -164,7 +164,7 @@
 char *
 mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int maxlen)
 {
-	char         buf[32];
+	char         buf[300];
 	ExifLong     vl;
 	ExifShort    vs = 0;
 	ExifRational vr;
@@ -528,7 +528,7 @@
 				  entry->size);
 			for (i = 0; i < entry->size; i++) {
 				sprintf (buf, " %02x", entry->data[i]);
-				strncat (v, buf, maxlen - strlen (v));
+				strncat (v, buf, maxlen);
 			}
 			break;
 		}

[libexif-cvs] libexif/libexif/olympus mnote-olympus-tag.c,1.4,1.5 mnote-olympus-tag.h,1.3,1.4

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27199/libexif/olympus

Modified Files:
	mnote-olympus-tag.c mnote-olympus-tag.h 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-tag.[c,h]: New tags discovered by
	  Serge Droz <ser...@ps...>.


Index: mnote-olympus-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-olympus-tag.h	10 May 2004 12:28:48 -0000	1.3
+++ mnote-olympus-tag.h	22 Jun 2004 18:10:48 -0000	1.4
@@ -81,6 +81,9 @@
 	MNOTE_NIKON_TAG_UNKNOWN_0X00AA          = 0x00aa,
 	MNOTE_NIKON_TAG_UNKNOWN_0X00AB          = 0x00ab,
 	MNOTE_NIKON_TAG_CAPTUREEDITORDATA       = 0x0e01,
+	MNOTE_NIKON_TAG_CAPTUREEDITORVER	= 0x0e09,
+	MNOTE_NIKON_TAG_UNKNOWN_0X0E0E		= 0x0e0e,
+	MNOTE_NIKON_TAG_UNKNOWN_0X0E10		= 0x0e10,
 
 	/* Nikon v1: real values + our proprietary base to distinguish from v2 */
 	MNOTE_NIKON1_TAG_BASE                   = 0x8000,

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/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	6 Jun 2004 03:04:21 -0000	1.4
+++ mnote-olympus-tag.c	22 Jun 2004 18:10:48 -0000	1.5
@@ -86,8 +86,10 @@
 	{MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), ""},
 	{MNOTE_NIKON_TAG_UNKNOWN_0X00AA,  "UNKNOWN_0X00AA", N_("Unknown tag 0x00aa"), ""},
 	{MNOTE_NIKON_TAG_UNKNOWN_0X00AB,  "UNKNOWN_0X00AB", N_("Unknown tag 0x00ab"), ""},
-	{MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA,", N_("Capture Editor Data"), ""},
-
+	{MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), ""},
+	{MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), ""},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0E0E,  "UNKNOWN_0X0E0E", N_("Unknown tag 0x0e0e"), ""},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0E10,  "UNKNOWN_0X0E10", N_("Unknown tag 0x0Ee10"), ""},
 	{MNOTE_NIKON1_TAG_UNKNOWN_0X0002, "UNKNOWN_0X0002", N_("Unknown tag 0x0002"), ""},
 	{MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), ""},
 	{MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Colormode"), ""},