libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif exif-log.c,1.5,1.6

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

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

Modified Files:
	exif-log.c 
Log Message:

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/exif-log.c: Plug another memory leak. Detected by 
	  Angela Wrobel.


Index: exif-log.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-log.c	10 Nov 2004 18:53:39 -0000	1.5
+++ exif-log.c	11 Nov 2004 20:24:39 -0000	1.6
@@ -111,9 +111,12 @@
 void
 exif_log_free (ExifLog *log)
 {
+	ExifMem *mem = log ? log->mem : NULL;
+
 	if (!log) return;
 
-	exif_mem_free (log->mem, log);
+	exif_mem_free (mem, log);
+	exif_mem_unref (mem);
 }
 
 void

[libexif-cvs] libexif ChangeLog,1.166,1.167

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/exif-log.c: Plug another memory leak. Detected by 
	  Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- ChangeLog	11 Nov 2004 20:19:27 -0000	1.166
+++ ChangeLog	11 Nov 2004 20:24:38 -0000	1.167
@@ -1,5 +1,10 @@
 2004-11-11  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-log.c: Plug another memory leak. Detected by 
+	  Angela Wrobel.
+
+2004-11-11  Lutz Mueller <lu...@us...>
+
 	* libexif/canon/exif-mnote-data-canon.c: Do not crash on strange
 	  data. Pointed out by Angela Wrobel.
 

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c,1.8,1.9

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

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

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

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/canon/exif-mnote-data-canon.c: Do not crash on strange
	  data. Pointed out by Angela Wrobel.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-mnote-data-canon.c	11 Nov 2004 20:13:27 -0000	1.8
+++ exif-mnote-data-canon.c	11 Nov 2004 20:19:28 -0000	1.9
@@ -186,8 +186,12 @@
 		} else
 			doff = o;
 
-		/* Write the data. Fill unneeded bytes with 0. */
-		memcpy (*buf + doff, n->entries[i].data, s);
+		/*
+		 * Write the data. Fill unneeded bytes with 0. Do not
+		 * crash if data is NULL.
+		 */
+		if (!n->entries[i].data) memset (*buf + doff, 0, s);
+		else memcpy (*buf + doff, n->entries[i].data, s);
 		if (s < 4) memset (*buf + doff + s, 0, (4 - s));
 	}
 }

[libexif-cvs] libexif ChangeLog,1.165,1.166

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/canon/exif-mnote-data-canon.c: Do not crash on strange
	  data. Pointed out by Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- ChangeLog	11 Nov 2004 20:13:26 -0000	1.165
+++ ChangeLog	11 Nov 2004 20:19:27 -0000	1.166
@@ -1,6 +1,12 @@
 2004-11-11  Lutz Mueller <lu...@us...>
 
+	* libexif/canon/exif-mnote-data-canon.c: Do not crash on strange
+	  data. Pointed out by Angela Wrobel.
+
+2004-11-11  Lutz Mueller <lu...@us...>
+
 	* libexif/*: Replace another few realloc by exif_mem_realloc.
+	  Pointed out by Angela Wrobel.
 
 2004-11-10  Lutz Mueller <lu...@us...>
 

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.20,1.21

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

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

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

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/*: Replace another few realloc by exif_mem_realloc.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- exif-mnote-data-olympus.c	4 Oct 2004 06:26:59 -0000	1.20
+++ exif-mnote-data-olympus.c	11 Nov 2004 20:13:27 -0000	1.21
@@ -139,7 +139,8 @@
 		if (s > 4) {
 			doff = *buf_size;
 			*buf_size += s;
-			*buf = realloc (*buf, *buf_size);
+			*buf = exif_mem_realloc (ne->mem, *buf,
+						 sizeof (char) * *buf_size);
 			if (!*buf) return;
 			exif_set_long (*buf + o, n->order, datao + doff);
 		} else

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

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

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

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

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/*: Replace another few realloc by exif_mem_realloc.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exif-mnote-data-canon.c	4 Oct 2004 06:26:59 -0000	1.7
+++ exif-mnote-data-canon.c	11 Nov 2004 20:13:27 -0000	1.8
@@ -178,7 +178,8 @@
 						n->entries[i].components;
 		if (s > 4) {
 			*buf_size += s;
-			*buf = realloc (*buf, sizeof (char) * *buf_size);
+			*buf = exif_mem_realloc (ne->mem, *buf,
+						 sizeof (char) * *buf_size);
 			if (!*buf) return;
 			doff = *buf_size - s;
 			exif_set_long (*buf + o, n->order, n->offset + doff);
@@ -211,7 +212,8 @@
 	    if (o + 8 > buf_size) return;
 
 	    n->count = i + 1;
-	    n->entries = realloc (n->entries, sizeof (MnoteCanonEntry) * (i+1));
+	    n->entries = exif_mem_realloc (ne->mem, n->entries,
+					   sizeof (MnoteCanonEntry) * (i+1));
 	    memset (&n->entries[i], 0, sizeof (MnoteCanonEntry));
 	    n->entries[i].tag        = exif_get_short (buf + o, n->order);
 	    n->entries[i].format     = exif_get_short (buf + o + 2, n->order);

[libexif-cvs] libexif ChangeLog,1.164,1.165

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-11  Lutz Mueller <lu...@us...>

	* libexif/*: Replace another few realloc by exif_mem_realloc.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- ChangeLog	10 Nov 2004 18:53:38 -0000	1.164
+++ ChangeLog	11 Nov 2004 20:13:26 -0000	1.165
@@ -1,3 +1,7 @@
+2004-11-11  Lutz Mueller <lu...@us...>
+
+	* libexif/*: Replace another few realloc by exif_mem_realloc.
+
 2004-11-10  Lutz Mueller <lu...@us...>
 
 	* libexif/*.c: Change #include "" to #include <>.

[libexif-cvs] libexif/libexif Makefile.am,1.27,1.28 exif-byte-order.c,1.4,1.5 exif-content.c,1.13,1.14 exif-data.c,1.54,1.55 exif-entry.c,1.70,1.71 exif-format.c,1.10,1.11 exif-ifd.c,1.4,1.5 exif-loader.c,1.12,1.13 exif-log.c,1.4,1.5 exif-mem.c,1.3,1.4 exif-mnote-data.c,1.8,1.9 exif-tag.c,1.19,1.20 exif-utils.c,1.6,1.7 exif-result.h,1.4,NONE

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

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

Modified Files:
	Makefile.am exif-byte-order.c exif-content.c exif-data.c 
	exif-entry.c exif-format.c exif-ifd.c exif-loader.c exif-log.c 
	exif-mem.c exif-mnote-data.c exif-tag.c exif-utils.c 
Removed Files:
	exif-result.h 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/*.c: Change #include "" to #include <>.
	* Makefile.am:
	* exif-result.h: Removed.


Index: exif-mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-mnote-data.c	4 Oct 2004 06:26:59 -0000	1.8
+++ exif-mnote-data.c	10 Nov 2004 18:53:39 -0000	1.9
@@ -19,8 +19,9 @@
  */
 
 #include <config.h>
-#include "exif-mnote-data.h"
-#include "exif-mnote-data-priv.h"
+
+#include <libexif/exif-mnote-data.h>
+#include <libexif/exif-mnote-data-priv.h>
 
 #include <stdlib.h>
 #include <string.h>

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- exif-tag.c	10 Nov 2004 18:38:34 -0000	1.19
+++ exif-tag.c	10 Nov 2004 18:53:39 -0000	1.20
@@ -18,9 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-tag.h"
-#include "i18n.h"
+#include <config.h>
+
+#include <libexif/exif-tag.h>
+#include <libexif/i18n.h>
 
 #include <stdlib.h>
 

Index: exif-utils.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- exif-utils.c	26 Aug 2004 20:08:09 -0000	1.6
+++ exif-utils.c	10 Nov 2004 18:53:39 -0000	1.7
@@ -18,8 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-utils.h"
+#include <config.h>
+
+#include <libexif/exif-utils.h>
 
 typedef signed short ExifSShort;
 

Index: exif-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-mem.c	2 Nov 2004 08:25:59 -0000	1.3
+++ exif-mem.c	10 Nov 2004 18:53:39 -0000	1.4
@@ -1,4 +1,4 @@
-#include "exif-mem.h"
+#include <libexif/exif-mem.h>
 
 #include <stdlib.h>
 

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- exif-loader.c	4 Oct 2004 06:26:59 -0000	1.12
+++ exif-loader.c	10 Nov 2004 18:53:39 -0000	1.13
@@ -1,12 +1,12 @@
 #include <config.h>
-#include "exif-loader.h"
+
+#include <libexif/exif-loader.h>
+#include <libexif/i18n.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <libexif/i18n.h>
-
 #include <libjpeg/jpeg-marker.h>
 
 typedef enum {

Index: exif-byte-order.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-byte-order.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-byte-order.c	15 Dec 2002 11:41:11 -0000	1.4
+++ exif-byte-order.c	10 Nov 2004 18:53:39 -0000	1.5
@@ -18,9 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-byte-order.h"
-#include "i18n.h"
+#include <config.h>
+
+#include <libexif/exif-byte-order.h>
+#include <libexif/i18n.h>
 
 #include <stdlib.h>
 

Index: exif-log.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-log.c	4 Oct 2004 06:26:59 -0000	1.4
+++ exif-log.c	10 Nov 2004 18:53:39 -0000	1.5
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+
 #include <libexif/exif-log.h>
 #include <libexif/i18n.h>
 

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exif-content.c	5 Oct 2004 19:16:00 -0000	1.13
+++ exif-content.c	10 Nov 2004 18:53:39 -0000	1.14
@@ -18,8 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-content.h"
+#include <config.h>
+
+#include <libexif/exif-content.h>
 
 #include <stdlib.h>
 #include <stdio.h>

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	2 Oct 2004 05:55:25 -0000	1.27
+++ Makefile.am	10 Nov 2004 18:53:38 -0000	1.28
@@ -41,7 +41,6 @@
 	exif-log.h		\
 	exif-mem.h		\
 	exif-mnote-data.h	\
-	exif-result.h		\
 	exif-tag.h		\
 	exif-utils.h		\
 	_stdint.h

Index: exif-ifd.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-ifd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-ifd.c	15 Dec 2002 11:41:11 -0000	1.4
+++ exif-ifd.c	10 Nov 2004 18:53:39 -0000	1.5
@@ -18,8 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-ifd.h"
+#include <config.h>
+
+#include <libexif/exif-ifd.h>
 
 #include <stdlib.h>
 

--- exif-result.h DELETED ---

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- exif-entry.c	2 Nov 2004 21:05:37 -0000	1.70
+++ exif-entry.c	10 Nov 2004 18:53:39 -0000	1.71
@@ -18,11 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-entry.h"
-#include "exif-ifd.h"
-#include "exif-utils.h"
-#include "i18n.h"
+#include <config.h>
+
+#include <libexif/exif-entry.h>
+#include <libexif/exif-ifd.h>
+#include <libexif/exif-utils.h>
+#include <libexif/i18n.h>
 
 #include <ctype.h>
 #include <stdlib.h>

Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exif-format.c	3 Nov 2004 06:54:42 -0000	1.10
+++ exif-format.c	10 Nov 2004 18:53:39 -0000	1.11
@@ -18,9 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "config.h"
-#include "exif-format.h"
-#include "i18n.h"
+#include <config.h>
+
+#include <libexif/exif-format.h>
+#include <libexif/i18n.h>
 
 #include <stdlib.h>
 

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- exif-data.c	10 Nov 2004 18:30:34 -0000	1.54
+++ exif-data.c	10 Nov 2004 18:53:39 -0000	1.55
@@ -19,16 +19,17 @@
  */
 
 #include <config.h>
-#include "exif-mnote-data.h"
 
-#include "exif-data.h"
-#include "exif-ifd.h"
-#include "exif-mnote-data-priv.h"
-#include "exif-utils.h"
-#include "exif-loader.h"
-#include "jpeg-marker.h"
+#include <libexif/exif-mnote-data.h>
+#include <libexif/exif-data.h>
+#include <libexif/exif-ifd.h>
+#include <libexif/exif-mnote-data-priv.h>
+#include <libexif/exif-utils.h>
+#include <libexif/exif-loader.h>
 #include <libexif/exif-log.h>
 
+#include <libjpeg/jpeg-marker.h>
+
 #include <libexif/olympus/exif-mnote-data-olympus.h>
 #include <libexif/canon/exif-mnote-data-canon.h>
 #include <libexif/pentax/exif-mnote-data-pentax.h>

[libexif-cvs] libexif ChangeLog,1.163,1.164

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/*.c: Change #include "" to #include <>.
	* Makefile.am:
	* exif-result.h: Removed.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- ChangeLog	10 Nov 2004 18:38:33 -0000	1.163
+++ ChangeLog	10 Nov 2004 18:53:38 -0000	1.164
@@ -1,5 +1,11 @@
 2004-11-10  Lutz Mueller <lu...@us...>
 
+	* libexif/*.c: Change #include "" to #include <>.
+	* Makefile.am:
+	* exif-result.h: Removed.
+
+2004-11-10  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-tag.[c,h] (exif_tag_from_name): New. Suggested by
 	  Angela Wrobel.
 

[libexif-cvs] libexif/libexif exif-tag.c,1.18,1.19 exif-tag.h,1.10,1.11

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

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

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/exif-tag.[c,h] (exif_tag_from_name): New. Suggested by
	  Angela Wrobel.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exif-tag.h	2 Nov 2004 08:32:14 -0000	1.10
+++ exif-tag.h	10 Nov 2004 18:38:34 -0000	1.11
@@ -136,6 +136,7 @@
 	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420
 } ExifTag;
 
+ExifTag         exif_tag_from_name       (const char *);
 const char     *exif_tag_get_name        (ExifTag tag);
 const char     *exif_tag_get_title       (ExifTag tag);
 const char     *exif_tag_get_description (ExifTag tag);

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- exif-tag.c	2 Nov 2004 08:32:14 -0000	1.18
+++ exif-tag.c	10 Nov 2004 18:38:34 -0000	1.19
@@ -629,7 +629,7 @@
 		if (ExifTagTable[i].tag == tag)
 			break;
 
-	return (ExifTagTable[i].name);
+	return ExifTagTable[i].name;
 }
 
 const char *
@@ -641,10 +641,8 @@
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
 
 	for (i = 0; ExifTagTable[i].title; i++)
-		if (ExifTagTable[i].tag == tag)
-			break;
-
-	return (_(ExifTagTable[i].title));
+		if (ExifTagTable[i].tag == tag) break;
+	return _(ExifTagTable[i].title);
 }
 
 const char *
@@ -656,8 +654,18 @@
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
 
 	for (i = 0; ExifTagTable[i].description; i++)
-		if (ExifTagTable[i].tag == tag)
-			break;
+		if (ExifTagTable[i].tag == tag) break;
+	return _(ExifTagTable[i].description);
+}
 
-	return (_(ExifTagTable[i].description));
+ExifTag 
+exif_tag_from_name (const char *name)
+{
+	unsigned int i;
+
+	if (!name) return 0;
+
+	for (i = 0; ExifTagTable[i].name; i++)
+		if (!strcmp (ExifTagTable[i].name, name)) break;
+	return ExifTagTable[i].tag;
 }

[libexif-cvs] libexif ChangeLog,1.162,1.163

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/exif-tag.[c,h] (exif_tag_from_name): New. Suggested by
	  Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- ChangeLog	10 Nov 2004 18:30:33 -0000	1.162
+++ ChangeLog	10 Nov 2004 18:38:33 -0000	1.163
@@ -1,5 +1,10 @@
 2004-11-10  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-tag.[c,h] (exif_tag_from_name): New. Suggested by
+	  Angela Wrobel.
+
+2004-11-10  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-data.c (exif_data_free): Fix memleak found by 
 	  Angela Wrobel.
 	* contrib/watcom: Updated files contributed by Angela Wrobel.

[libexif-cvs] libexif/libexif exif-data.c,1.53,1.54

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

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

Modified Files:
	exif-data.c 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c (exif_data_free): Fix memleak found by 
	  Angela Wrobel.
	* contrib/watcom: Updated files contributed by Angela Wrobel.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- exif-data.c	2 Nov 2004 21:05:37 -0000	1.53
+++ exif-data.c	10 Nov 2004 18:30:34 -0000	1.54
@@ -811,6 +811,7 @@
 exif_data_free (ExifData *data)
 {
 	unsigned int i;
+	ExifMem *mem = (data && data->priv) ? data->priv->mem : NULL;
 
 	if (!data) return;
 
@@ -821,20 +822,21 @@
 		}
 	}
 
+	if (data->data) {
+		exif_mem_free (mem, data->data);
+		data->data = NULL;
+	}
+
 	if (data->priv) {
-		ExifMem *mem = data->priv->mem;
-		if (data->data) {
-			exif_mem_free (data->priv->mem, data->data);
-			data->data = NULL;
-		}
 		if (data->priv->md) {
 			exif_mnote_data_unref (data->priv->md);
 			data->priv->md = NULL;
 		}
 		exif_mem_free (mem, data->priv);
 		exif_mem_free (mem, data);
-		exif_mem_unref (mem);
 	}
+
+	exif_mem_unref (mem);
 }
 
 void

[libexif-cvs] libexif/contrib/watcom Makefile,NONE,1.1 _stdint.h,NONE,1.1 Makefile.wat,1.1,NONE _stdint_watcom.h,1.1,NONE

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

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

Added Files:
	Makefile _stdint.h 
Removed Files:
	Makefile.wat _stdint_watcom.h 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c (exif_data_free): Fix memleak found by 
	  Angela Wrobel.
	* contrib/watcom: Updated files contributed by Angela Wrobel.


--- Makefile.wat DELETED ---

--- NEW FILE: Makefile ---
# This makefile is made for OpenWatcom/NT and runs on my system.
# It should not be too hard to make it run on other systems, too.
#
# FIRST, move this makefile and _stdint.h to the libexif main
# directory (the place where you find README and COPYING etc.)
#
# WARNING: I used another makefile as template, so some things might be
# thrown away. Don't hesitate to improve this makefile!
#
# WARNING: This makefile has been made mainly for myself, I didn't
# waste time to make it look "nice".
#
# LICENSE: no restrictions at all, but USE ON YOUR OWN RISK ONLY.
#
# USAGE: Simply type "wmake" or "wmake -f <makefilename>" when
#        being in the libexif main directory. This makefile should
#        be in that directory, too, of course.
#
#   Angela Wrobel <http://www.wrobelnet.de/>


# Uncomment line for desired system
#SYSTEM=DOS
#SYSTEM=OS2
SYSTEM=NT

# The name of your C compiler:
CC= wcl386

# We're using similar constants like wxWidgets
!ifeq FINAL 1
OPTFLAGS= -5r -zp8 -otexan
!else
OPTFLAGS= -5r -od -d2
!endif

LIBEXIFDIR=libexif
TESTEXIFDIR=test

IFLAGS= -i=.
WINVERFLAGS=
EXTRACPPFLAGS=-dEXIF_DONT_CHANGE_MAKER_NOTE
DEBUGCFLAGS=
EXTRACFLAGS=
OUTPUTDIR=$(LIBEXIFDIR)
CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr -zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)

# zm and zv as well as the linker options below are used to make the resulting
# .exe smaller
CFLAGS = $(CPPFLAGS) $(DEBUGCFLAGS) $(EXTRACFLAGS) /zm

# Link-time cc options:
!ifeq SYSTEM DOS
LDFLAGS= -zq -l=dos4g
!else ifeq SYSTEM OS2
LDFLAGS= -zq -l=os2v2
!else ifeq SYSTEM NT
LDFLAGS= -zq -l=nt
!endif

# End of configurable options.



LIBOBJECTS = &
	$(LIBEXIFDIR)\exif-byte-order.obj $(LIBEXIFDIR)\exif-content.obj &
	$(LIBEXIFDIR)\exif-data.obj $(LIBEXIFDIR)\exif-entry.obj &
	$(LIBEXIFDIR)\exif-format.obj $(LIBEXIFDIR)\exif-ifd.obj &
	$(LIBEXIFDIR)\exif-loader.obj $(LIBEXIFDIR)\exif-log.obj &
	$(LIBEXIFDIR)\exif-mem.obj &
	$(LIBEXIFDIR)\exif-mnote-data.obj $(LIBEXIFDIR)\exif-tag.obj &
        $(LIBEXIFDIR)\exif-utils.obj &
	$(LIBEXIFDIR)\exif-mnote-data-olympus.obj &
	$(LIBEXIFDIR)\mnote-olympus-entry.obj &
	$(LIBEXIFDIR)\mnote-olympus-tag.obj &
	$(LIBEXIFDIR)\exif-mnote-data-pentax.obj &
	$(LIBEXIFDIR)\mnote-pentax-entry.obj &
	$(LIBEXIFDIR)\mnote-pentax-tag.obj &
	$(LIBEXIFDIR)\exif-mnote-data-canon.obj &
	$(LIBEXIFDIR)\mnote-canon-entry.obj &
	$(LIBEXIFDIR)\mnote-canon-tag.obj 


#CFLAGS = /dWIN32 /bm /fr -zq -i=. -5r -od -d2 /d2 /zm /fo=$(LIBEXIFDIR)\

all : libexif.lib test-mem.exe test-mnote.exe test-value.exe
#	test-tree.exe 

libexif.lib: $(LIBOBJECTS)
	- del libexif.lib
	* wlib -n libexif.lib $(LIBOBJECTS)

$(LIBEXIFDIR)\exif-byte-order.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-byte-order.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-content.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-content.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-data.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-data.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-entry.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-entry.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-format.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-format.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-ifd.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-ifd.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-loader.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-loader.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-log.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-log.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-mem.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-mem.c
	$(CC) -c $(CFLAGS) $[*

$(LIBEXIFDIR)\exif-mnote-data.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-mnote-data.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-tag.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-tag.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-utils.obj : .AUTODEPEND $(LIBEXIFDIR)\exif-utils.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-mnote-data-olympus.obj : .AUTODEPEND $(LIBEXIFDIR)\olympus\exif-mnote-data-olympus.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-olympus-entry.obj : .AUTODEPEND $(LIBEXIFDIR)\olympus\mnote-olympus-entry.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-olympus-tag.obj : .AUTODEPEND $(LIBEXIFDIR)\olympus\mnote-olympus-tag.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-mnote-data-pentax.obj : .AUTODEPEND $(LIBEXIFDIR)\pentax\exif-mnote-data-pentax.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-pentax-entry.obj : .AUTODEPEND $(LIBEXIFDIR)\pentax\mnote-pentax-entry.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-pentax-tag.obj : .AUTODEPEND $(LIBEXIFDIR)\pentax\mnote-pentax-tag.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\exif-mnote-data-canon.obj : .AUTODEPEND $(LIBEXIFDIR)\canon\exif-mnote-data-canon.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-canon-entry.obj : .AUTODEPEND $(LIBEXIFDIR)\canon\mnote-canon-entry.c
	$(CC) -c $(CFLAGS) $[*  

$(LIBEXIFDIR)\mnote-canon-tag.obj : .AUTODEPEND $(LIBEXIFDIR)\canon\mnote-canon-tag.c
	$(CC) -c $(CFLAGS) $[*  


test-mem.exe : .AUTODEPEND $(TESTEXIFDIR)\test-mem.c
	$(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib

test-mnote.exe : .AUTODEPEND $(TESTEXIFDIR)\test-mnote.c
	$(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib

test-tree.exe : .AUTODEPEND $(TESTEXIFDIR)\test-tree.c
	$(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib

test-value.exe : .AUTODEPEND $(TESTEXIFDIR)\test-value.c
	$(CC) $(CFLAGS) $(LDFRLAGS) $< libexif.lib


clean: .SYMBOLIC
	- del $(LIBEXIFDIR)\*.obj
	- del *.exe
	- del libexif.lib


--- _stdint_watcom.h DELETED ---

--- NEW FILE: _stdint.h ---
/* This file is generated automatically by configure */
#ifndef __STDINT_H
#define __STDINT_H
#include <sys/types.h>
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned long uint32_t;
typedef signed long int32_t;
#endif

[libexif-cvs] libexif ChangeLog,1.161,1.162

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-10  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c (exif_data_free): Fix memleak found by 
	  Angela Wrobel.
	* contrib/watcom: Updated files contributed by Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- ChangeLog	3 Nov 2004 06:54:41 -0000	1.161
+++ ChangeLog	10 Nov 2004 18:30:33 -0000	1.162
@@ -1,3 +1,9 @@
+2004-11-10  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-data.c (exif_data_free): Fix memleak found by 
+	  Angela Wrobel.
+	* contrib/watcom: Updated files contributed by Angela Wrobel.
+
 2004-11-03  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-format.c: More translatable strings.

[libexif-cvs] libexif/libexif exif-format.c,1.9,1.10

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

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

Modified Files:
	exif-format.c 
Log Message:

2004-11-03  Lutz Mueller <lu...@us...>

	* libexif/exif-format.c: More translatable strings.


Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exif-format.c	1 Dec 2003 18:09:28 -0000	1.9
+++ exif-format.c	3 Nov 2004 06:54:42 -0000	1.10
@@ -29,17 +29,17 @@
 	const char *name;
         unsigned char size;
 } ExifFormatTable[] = {
-        {EXIF_FORMAT_BYTE,      "Byte",      1},
-        {EXIF_FORMAT_ASCII,     "Ascii",     1},
-        {EXIF_FORMAT_SHORT,     "Short",     2},
-        {EXIF_FORMAT_LONG,      "Long",      4},
-        {EXIF_FORMAT_RATIONAL,  "Rational",  8},
-	{EXIF_FORMAT_SBYTE,     "SByte",     1},
-	{EXIF_FORMAT_SSHORT,    "SShort",    2},
-        {EXIF_FORMAT_SLONG,     "SLong",     4},
-        {EXIF_FORMAT_SRATIONAL, "SRational", 8},
-	{EXIF_FORMAT_FLOAT,     "Float",     4},
-	{EXIF_FORMAT_DOUBLE,    "Double",    8},
+        {EXIF_FORMAT_BYTE,      N_("Byte"),      1},
+        {EXIF_FORMAT_ASCII,     N_("Ascii"),     1},
+        {EXIF_FORMAT_SHORT,     N_("Short"),     2},
+        {EXIF_FORMAT_LONG,      N_("Long"),      4},
+        {EXIF_FORMAT_RATIONAL,  N_("Rational"),  8},
+	{EXIF_FORMAT_SBYTE,     N_("SByte"),     1},
+	{EXIF_FORMAT_SSHORT,    N_("SShort"),    2},
+        {EXIF_FORMAT_SLONG,     N_("SLong"),     4},
+        {EXIF_FORMAT_SRATIONAL, N_("SRational"), 8},
+	{EXIF_FORMAT_FLOAT,     N_("Float"),     4},
+	{EXIF_FORMAT_DOUBLE,    N_("Double"),    8},
         {EXIF_FORMAT_UNDEFINED, N_("Undefined"), 1},
         {0, NULL, 0}
 };
@@ -54,8 +54,8 @@
 
 	for (i = 0; ExifFormatTable[i].name; i++)
 		if (ExifFormatTable[i].format == format)
-			return (_(ExifFormatTable[i].name));
-	return (NULL);
+			return _(ExifFormatTable[i].name);
+	return NULL;
 }
 
 unsigned char
@@ -65,6 +65,6 @@
 
 	for (i = 0; ExifFormatTable[i].size; i++)
 		if (ExifFormatTable[i].format == format)
-			return (ExifFormatTable[i].size);
-	return (0);
+			return ExifFormatTable[i].size;
+	return 0;
 }

[libexif-cvs] libexif ChangeLog,1.160,1.161

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-03  Lutz Mueller <lu...@us...>

	* libexif/exif-format.c: More translatable strings.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- ChangeLog	2 Nov 2004 21:05:36 -0000	1.160
+++ ChangeLog	3 Nov 2004 06:54:41 -0000	1.161
@@ -1,3 +1,7 @@
+2004-11-03  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-format.c: More translatable strings.
+
 2004-11-02  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_fix): Detect more wrong stuff.

[libexif-cvs] libexif/libexif exif-data.c,1.52,1.53 exif-entry.c,1.69,1.70

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

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

Modified Files:
	exif-data.c exif-entry.c 
Log Message:

2004-11-02  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): Detect more wrong stuff.
	* libexif/exif-data.c: Detect recursive calls.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- exif-entry.c	1 Nov 2004 17:16:12 -0000	1.69
+++ exif-entry.c	2 Nov 2004 21:05:37 -0000	1.70
@@ -159,6 +159,8 @@
 {
 	unsigned int i;
 	ExifByteOrder o;
+	ExifRational r;
+	ExifSRational sr;
 
 	if (!e || !e->priv) return;
 
@@ -212,6 +214,39 @@
 		}
 		break;
 
+	/* All these tags need to be of format 'Rational'. */
+	case EXIF_TAG_FNUMBER:
+	case EXIF_TAG_APERTURE_VALUE:
+	case EXIF_TAG_EXPOSURE_TIME:
+	case EXIF_TAG_FOCAL_LENGTH:
+		switch (e->format) {
+		case EXIF_FORMAT_SRATIONAL:
+			if (!e->parent || !e->parent->parent) break;
+			o = exif_data_get_byte_order (e->parent->parent);
+			for (i = 0; i < e->components; i++) {
+				sr = exif_get_srational (e->data + i * 
+					exif_format_get_size (
+						EXIF_FORMAT_SRATIONAL), o);
+				r.numerator = (ExifLong) sr.numerator;
+				r.denominator = (ExifLong) sr.denominator;
+				exif_set_rational (e->data + i *
+					exif_format_get_size (
+						EXIF_FORMAT_RATIONAL), o, r);
+			}
+			e->format = EXIF_FORMAT_RATIONAL;
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag '%s' was of format '%s' (which is "
+				"against specification) and has been "
+				"changed to format '%s'.",
+				exif_tag_get_name (e->tag),
+				exif_format_get_name (EXIF_FORMAT_SRATIONAL),
+				exif_format_get_name (EXIF_FORMAT_RATIONAL));
+			break;
+		default:
+			break;
+		}
+		break;
+
 	case EXIF_TAG_USER_COMMENT:
 
 		/* Format needs to be UNDEFINED. */

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- exif-data.c	2 Nov 2004 08:33:40 -0000	1.52
+++ exif-data.c	2 Nov 2004 21:05:37 -0000	1.53
@@ -256,6 +256,16 @@
 	memcpy (data->data, d + offset, data->size);
 }
 
+#undef CHECK_REC
+#define CHECK_REC(i) 					\
+if (data->ifd[(i)] == ifd) {				\
+	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, \
+		"ExifData", "Recursive entry in IFD "	\
+		"'%s' detected. Skipping...",		\
+		exif_ifd_get_name (i));			\
+	break;						\
+}
+
 static void
 exif_data_load_data_content (ExifData *data, ExifContent *ifd,
 			     const unsigned char *d,
@@ -292,14 +302,17 @@
 					   data->priv->order);
 			switch (tag) {
 			case EXIF_TAG_EXIF_IFD_POINTER:
+				CHECK_REC (EXIF_IFD_EXIF);
 				exif_data_load_data_content (data,
 					data->ifd[EXIF_IFD_EXIF], d, ds, o);
 				break;
 			case EXIF_TAG_GPS_INFO_IFD_POINTER:
+				CHECK_REC (EXIF_IFD_GPS);
 				exif_data_load_data_content (data,
 					data->ifd[EXIF_IFD_GPS], d, ds, o);
 				break;
 			case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
+				CHECK_REC (EXIF_IFD_INTEROPERABILITY);
 				exif_data_load_data_content (data,
 					data->ifd[EXIF_IFD_INTEROPERABILITY], d, ds, o);
 				break;

[libexif-cvs] libexif ChangeLog,1.159,1.160

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-11-02  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): Detect more wrong stuff.
	* libexif/exif-data.c: Detect recursive calls.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- ChangeLog	2 Nov 2004 08:39:20 -0000	1.159
+++ ChangeLog	2 Nov 2004 21:05:36 -0000	1.160
@@ -1,3 +1,8 @@
+2004-11-02  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c (exif_entry_fix): Detect more wrong stuff.
+	* libexif/exif-data.c: Detect recursive calls.
+
 2004-11-02  Jan Patera <pa...@us...>
 
 	* libexif/exif-entry.c: added LZW

[libexif-cvs] libexif ChangeLog,1.158,1.159

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

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

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

	* libexif/exif-entry.c: added LZW
	* libexif/exif-tag.*: added few tags used by .NEF
	* libexif/exif-data.c: logging unknown tags



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- ChangeLog	20 Oct 2004 06:13:58 -0000	1.158
+++ ChangeLog	2 Nov 2004 08:39:20 -0000	1.159
@@ -1,3 +1,9 @@
+2004-11-02  Jan Patera <pa...@us...>
+
+	* libexif/exif-entry.c: added LZW
+	* libexif/exif-tag.*: added few tags used by .NEF
+	* libexif/exif-data.c: logging unknown tags
+
 2004-10-20  Lutz Mueller <lu...@us...>
 
 	* Makefile.am: Add intl

[libexif-cvs] libexif/libexif exif-data.c,1.51,1.52

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

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

Modified Files:
	exif-data.c 
Log Message:
Unknown tag ID and its position in IFD are logged before
exif_data_load_data_content() gives up.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- exif-data.c	5 Oct 2004 19:14:12 -0000	1.51
+++ exif-data.c	2 Nov 2004 08:33:40 -0000	1.52
@@ -40,7 +40,7 @@
 #undef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
-#ifdef __WATCOMC__
+#if defined(__WATCOMC__) || defined(_MSC_VER)
 #      define strncasecmp strnicmp
 #endif
 
@@ -327,7 +327,11 @@
 			 * 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;
+			if (!exif_tag_get_name (tag)) {
+				exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "Unknown tag %x (entry %i)", tag, i);
+				return;
+			}
 			entry = exif_entry_new_mem (data->priv->mem);
 			exif_content_add_entry (ifd, entry);
 			exif_data_load_data_entry (data, entry, d, ds,

[libexif-cvs] libexif/libexif exif-tag.c,1.17,1.18 exif-tag.h,1.9,1.10

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

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

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:
Added these tags:
 EXIF_TAG_NEW_SUBFILE_TYPE     = 0x00fe
 EXIF_TAG_SUB_IFDS             = 0x014a
 EXIF_TAG_XML_PACKET           = 0x02bc
 EXIF_TAG_IMAGE_RESOURCES      = 0x8649
 EXIF_TAG_TIFF_EP_STANDARD_ID  = 0x9216

These tags are used in the Nikon Raw format .NEF.
The primary reason why I added these items is that exif_data_load_data_content()
gives parsing IFD up when it encounters an unknown tag.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exif-tag.h	6 Aug 2003 19:47:53 -0000	1.9
+++ exif-tag.h	2 Nov 2004 08:32:14 -0000	1.10
@@ -28,6 +28,7 @@
 typedef enum {
 	EXIF_TAG_INTEROPERABILITY_INDEX		= 0x0001,
 	EXIF_TAG_INTEROPERABILITY_VERSION	= 0x0002,
+	EXIF_TAG_NEW_SUBFILE_TYPE		= 0x00fe,
 	EXIF_TAG_IMAGE_WIDTH 			= 0x0100,
 	EXIF_TAG_IMAGE_LENGTH 			= 0x0101,
 	EXIF_TAG_BITS_PER_SAMPLE 		= 0x0102,
@@ -54,6 +55,7 @@
 	EXIF_TAG_WHITE_POINT			= 0x013e,
 	EXIF_TAG_PRIMARY_CHROMATICITIES		= 0x013f,
 	EXIF_TAG_TRANSFER_RANGE			= 0x0156,
+	EXIF_TAG_SUB_IFDS			= 0x014a,
 	EXIF_TAG_JPEG_PROC			= 0x0200,
 	EXIF_TAG_JPEG_INTERCHANGE_FORMAT	= 0x0201,
 	EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH	= 0x0202,
@@ -61,6 +63,7 @@
 	EXIF_TAG_YCBCR_SUB_SAMPLING		= 0x0212,
 	EXIF_TAG_YCBCR_POSITIONING		= 0x0213,
 	EXIF_TAG_REFERENCE_BLACK_WHITE		= 0x0214,
+	EXIF_TAG_XML_PACKET			= 0x02bc,
 	EXIF_TAG_RELATED_IMAGE_FILE_FORMAT	= 0x1000,
 	EXIF_TAG_RELATED_IMAGE_WIDTH		= 0x1001,
 	EXIF_TAG_RELATED_IMAGE_LENGTH		= 0x1002,
@@ -71,6 +74,7 @@
 	EXIF_TAG_EXPOSURE_TIME			= 0x829a,
 	EXIF_TAG_FNUMBER			= 0x829d,
 	EXIF_TAG_IPTC_NAA			= 0x83bb,
+	EXIF_TAG_IMAGE_RESOURCES		= 0x8649,
 	EXIF_TAG_EXIF_IFD_POINTER		= 0x8769,
 	EXIF_TAG_INTER_COLOR_PROFILE		= 0x8773,
 	EXIF_TAG_EXPOSURE_PROGRAM		= 0x8822,
@@ -94,6 +98,7 @@
 	EXIF_TAG_FLASH				= 0x9209,
 	EXIF_TAG_FOCAL_LENGTH			= 0x920a,
 	EXIF_TAG_SUBJECT_AREA			= 0x9214,
+	EXIF_TAG_TIFF_EP_STANDARD_ID		= 0x9216,
 	EXIF_TAG_MAKER_NOTE			= 0x927c,
 	EXIF_TAG_USER_COMMENT			= 0x9286,
 	EXIF_TAG_SUB_SEC_TIME			= 0x9290,

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exif-tag.c	1 Sep 2004 20:15:06 -0000	1.17
+++ exif-tag.c	2 Nov 2004 08:32:14 -0000	1.18
@@ -38,6 +38,9 @@
 	const char *description;
 	ExifSL esl_0[4], esl_1[4], esl_exif[4], esl_gps[4];
 } ExifTagTable[] = {
+	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
+	 "New Subfile Type", N_("A general indication of the kind of data "
+	    "contained in this subfile.")},
 	{EXIF_TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex",
 	 "InteroperabilityIndex",
 	 N_("Indicates the identification of the Interoperability rule. "
@@ -169,6 +172,8 @@
 	    "Normally this tag is not necessary, since colorspace is "
 	    "specified in the colorspace information tag (<ColorSpace>).")},
 	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
+	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "
+	    "to enable TIFF Trees within a TIFF file.")},
 	{EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""},
 	{EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat",
 	 N_("JPEG Interchange Format"),
@@ -221,6 +226,7 @@
 	    "in a color space information tag, with the default "
 	    "being the value that gives the optimal image characteristics "
 	    "Interoperability these conditions.")},
+	{EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata")},
 	{EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat",
 	 "RelatedImageFileFormat", ""},
 	{EXIF_TAG_RELATED_IMAGE_WIDTH, "RelatedImageWidth",
@@ -261,6 +267,7 @@
 	{EXIF_TAG_FNUMBER, "FNumber", "FNumber",
 	 N_("The F number.")},
 	{EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""},
+	{EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""},
 	{EXIF_TAG_EXIF_IFD_POINTER, "ExifIFDPointer", "ExifIFDPointer",
 	 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
 	    "same structure as that of the IFD specified in TIFF. "
@@ -532,6 +539,7 @@
 	{EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"),
 	 N_("This tag indicates the location and area of the main subject "
 	    "in the overall scene.")},
+	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""},
 	{EXIF_TAG_CUSTOM_RENDERED, "CustomRendered", N_("Custom Rendered"),
 	 N_("This tag indicates the use of special processing on image "
 	    "data, such as rendering geared to output. When special "

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

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

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

Modified Files:
	exif-mem.c 
Log Message:
#include <exif-mem.h>
changed to
#include "exif-mem.h"


Index: exif-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mem.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-mem.c	4 Oct 2004 06:26:59 -0000	1.2
+++ exif-mem.c	2 Nov 2004 08:25:59 -0000	1.3
@@ -1,4 +1,4 @@
-#include <exif-mem.h>
+#include "exif-mem.h"
 
 #include <stdlib.h>
 

[libexif-cvs] libexif/libexif exif-entry.c,1.68,1.69

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

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

Modified Files:
	exif-entry.c 
Log Message:
Tag 0x103 (Compression): Value 5 (LZW) recognized


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- exif-entry.c	20 Oct 2004 06:06:47 -0000	1.68
+++ exif-entry.c	1 Nov 2004 17:16:12 -0000	1.69
@@ -397,6 +397,7 @@
       {  0, {NULL}}}},
   { EXIF_TAG_COMPRESSION,
     { {1, {N_("Uncompressed"), NULL}},
+      {5, {N_("LZW compression"), NULL}},
       {6, {N_("JPEG compression"), NULL}},
       {0, {NULL}}}},
   { EXIF_TAG_LIGHT_SOURCE,

[libexif-cvs] libexif ChangeLog,1.157,1.158 configure.in,1.70,1.71 Makefile.am,1.29,1.30

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

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

Modified Files:
	ChangeLog configure.in Makefile.am 
Log Message:

2004-10-20  Lutz Mueller <lu...@us...>

	* Makefile.am: Add intl
	* configure.in: Add intl/Makefile. Now "make distcheck" works.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- ChangeLog	19 Oct 2004 05:55:46 -0000	1.157
+++ ChangeLog	20 Oct 2004 06:13:58 -0000	1.158
@@ -1,3 +1,8 @@
+2004-10-20  Lutz Mueller <lu...@us...>
+
+	* Makefile.am: Add intl
+	* configure.in: Add intl/Makefile. Now "make distcheck" works.
+
 2004-10-18  Lutz Mueller <lu...@us...>
 
 	Patch by Krisztian VASAS <ir...@ir...>:

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile.am	9 Sep 2004 06:27:21 -0000	1.29
+++ Makefile.am	20 Oct 2004 06:13:58 -0000	1.30
@@ -1,4 +1,4 @@
-SUBDIRS =  libexif libjpeg test po m4
+SUBDIRS = intl po libexif libjpeg test m4
 
 EXTRA_DIST = @PACKAGE@.spec
 

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- configure.in	19 Oct 2004 05:55:46 -0000	1.70
+++ configure.in	20 Oct 2004 06:13:58 -0000	1.71
@@ -60,6 +60,7 @@
 fi
 
 AC_OUTPUT([
+  intl/Makefile 
   po/Makefile.in
   Makefile
   libexif.spec

[libexif-cvs] libexif/libexif exif-entry.c,1.67,1.68

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

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

Modified Files:
	exif-entry.c 
Log Message:
2004-10-16  Lutz Mueller <lu...@us...>

	Martin Willers <wi...@xm...> found an off-by-one error:

	* libexif/exif-entry.c: libexif forget to add 1 
	  to tm_mon from struct tm


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- exif-entry.c	5 Oct 2004 19:16:00 -0000	1.67
+++ exif-entry.c	20 Oct 2004 06:06:47 -0000	1.68
@@ -1224,7 +1224,7 @@
 		if (!e->data) break;
 		snprintf ((char *) e->data, e->size,
 			  "%04i:%02i:%02i %02i:%02i:%02i",
-			  tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
+			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
 			  tm->tm_hour, tm->tm_min, tm->tm_sec);
 		break;