libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.90,1.91

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv4838

Modified Files:
	ChangeLog 
Log Message:

2003-12-09  Lutz Mueller <lu...@us...>

	A couple of fixes by Jan Patera <pa...@pi...>:

	* libexif


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ChangeLog	7 Dec 2003 23:26:05 -0000	1.90
+++ ChangeLog	9 Dec 2003 19:49:59 -0000	1.91
@@ -1,3 +1,9 @@
+2003-12-09  Lutz Mueller <lu...@us...>
+
+	A couple of fixes by Jan Patera <pa...@pi...>:
+
+	* libexif
+
 2003-12-08  Lutz Mueller <lu...@us...>
 
 	Suggestion by Jan Patera <pa...@pi...>:

[libexif-cvs] libexif/libexif exif-entry.c,1.40,1.41

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

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv14173/libexif

Modified Files:
	exif-entry.c 
Log Message:

2003-12-08  Lutz Mueller <lu...@us...>

	Suggestion by Jan Patera <pa...@pi...>:

	* libexif/exif-entry.c: Do not read beyond e->size.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- exif-entry.c	1 Dec 2003 18:09:28 -0000	1.40
+++ exif-entry.c	7 Dec 2003 23:26:05 -0000	1.41
@@ -177,7 +177,7 @@
 	case EXIF_TAG_USER_COMMENT:
 		CF (e->format, EXIF_FORMAT_UNDEFINED, v);
 		if (e->size < 8) break;
-		strncpy (v, e->data + 8, sizeof (v) - 1);
+		strncpy (v, e->data + 8, MIN (e->size, sizeof (v) - 1));
 		break;
 	case EXIF_TAG_EXIF_VERSION:
 		CF (e->format, EXIF_FORMAT_UNDEFINED, v);

[libexif-cvs] libexif ChangeLog,1.89,1.90

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv14173

Modified Files:
	ChangeLog 
Log Message:

2003-12-08  Lutz Mueller <lu...@us...>

	Suggestion by Jan Patera <pa...@pi...>:

	* libexif/exif-entry.c: Do not read beyond e->size.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- ChangeLog	1 Dec 2003 18:27:49 -0000	1.89
+++ ChangeLog	7 Dec 2003 23:26:05 -0000	1.90
@@ -1,3 +1,9 @@
+2003-12-08  Lutz Mueller <lu...@us...>
+
+	Suggestion by Jan Patera <pa...@pi...>:
+
+	* libexif/exif-entry.c: Do not read beyond e->size.
+
 2003-12-01  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus/mnote-olympus-entry.c: Now that EXIF_FORMAT_SSHORT

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.3,1.4

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv26332/libexif/olympus

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

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Now that EXIF_FORMAT_SSHORT
	  is in exif-format.h, we do not need to define it any longer.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-olympus-entry.c	1 Dec 2003 18:09:29 -0000	1.3
+++ mnote-olympus-entry.c	1 Dec 2003 18:27:50 -0000	1.4
@@ -51,7 +51,8 @@
         }                                                               \
 }
 
-#define EXIF_FORMAT_SSHORT 8
+#undef  MIN
+#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
 char *
 mnote_olympus_entry_get_value (MnoteOlympusEntry *entry)

[libexif-cvs] libexif ChangeLog,1.88,1.89

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv26332

Modified Files:
	ChangeLog 
Log Message:

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Now that EXIF_FORMAT_SSHORT
	  is in exif-format.h, we do not need to define it any longer.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- ChangeLog	1 Dec 2003 18:09:28 -0000	1.88
+++ ChangeLog	1 Dec 2003 18:27:49 -0000	1.89
@@ -1,5 +1,10 @@
 2003-12-01  Lutz Mueller <lu...@us...>
 
+	* libexif/olympus/mnote-olympus-entry.c: Now that EXIF_FORMAT_SSHORT
+	  is in exif-format.h, we do not need to define it any longer.
+
+2003-12-01  Lutz Mueller <lu...@us...>
+
 	* libexif: Various improvements by Jan Patera <pa...@pi...>.
 
 2003-10-30  Lutz Mueller <lu...@us...>

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.4,1.5 mnote-olympus-entry.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/libexif/olympus

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

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif: Various improvements by Jan Patera <pa...@pi...>.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-mnote-data-olympus.c	30 Oct 2003 22:10:45 -0000	1.4
+++ exif-mnote-data-olympus.c	1 Dec 2003 18:09:29 -0000	1.5
@@ -86,13 +86,15 @@
 
 	/* Write the header and the number of entries. */
 	strcpy (*buf, "OLYMP");
-	exif_set_short (*buf + 8, n->order, n->count);
+	exif_set_short (*buf + 8, n->order, (ExifShort) n->count);
 
 	/* Save each entry */
 	for (i = 0; i < n->count; i++) {
 		o = 6 + 2 + 2 + i * 12;
-		exif_set_short (*buf + o + 0, n->order, n->entries[i].tag);
-		exif_set_short (*buf + o + 2, n->order, n->entries[i].format);
+		exif_set_short (*buf + o + 0, n->order,
+				(ExifShort) n->entries[i].tag);
+		exif_set_short (*buf + o + 2, n->order,
+				(ExifShort) n->entries[i].format);
 		exif_set_long  (*buf + o + 4, n->order,
 				n->entries[i].components);
 		o += 8;

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-entry.c	28 Oct 2003 22:50:07 -0000	1.2
+++ mnote-olympus-entry.c	1 Dec 2003 18:09:29 -0000	1.3
@@ -182,6 +182,7 @@
 	case MNOTE_OLYMPUS_TAG_VERSION:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
 		CC (entry->components, 5, v);
+		strncpy (v, entry->data, MIN (sizeof (v), entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_INFO:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
@@ -190,6 +191,7 @@
 	case MNOTE_OLYMPUS_TAG_ID:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v);
 		CC (entry->components, 32, v);
+		strncpy (v, entry->data, MIN (sizeof (v), entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
 		CF (entry->format, EXIF_FORMAT_LONG, v);

[libexif-cvs] libexif/libexif exif-data.c,1.33,1.34 exif-entry.c,1.39,1.40 exif-format.c,1.8,1.9 exif-format.h,1.5,1.6

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

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/libexif

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

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif: Various improvements by Jan Patera <pa...@pi...>.


Index: exif-format.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-format.c	28 Apr 2003 18:22:17 -0000	1.8
+++ exif-format.c	1 Dec 2003 18:09:28 -0000	1.9
@@ -34,8 +34,12 @@
         {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_UNDEFINED, N_("Undefined"), 1},
         {0, NULL, 0}
 };

Index: exif-format.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-format.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-format.h	15 Dec 2002 11:41:11 -0000	1.5
+++ exif-format.h	1 Dec 2003 18:09:28 -0000	1.6
@@ -31,9 +31,13 @@
         EXIF_FORMAT_SHORT      =  3,
         EXIF_FORMAT_LONG       =  4,
         EXIF_FORMAT_RATIONAL   =  5,
+	EXIF_FORMAT_SBYTE      =  6,
         EXIF_FORMAT_UNDEFINED  =  7,
+	EXIF_FORMAT_SSHORT     =  8,
         EXIF_FORMAT_SLONG      =  9,
-        EXIF_FORMAT_SRATIONAL  = 10
+        EXIF_FORMAT_SRATIONAL  = 10,
+	EXIF_FORMAT_FLOAT      = 11,
+	EXIF_FORMAT_DOUBLE     = 12
 } ExifFormat;
 
 const char   *exif_format_get_name (ExifFormat format);

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- exif-entry.c	8 Oct 2003 16:40:11 -0000	1.39
+++ exif-entry.c	1 Dec 2003 18:09:28 -0000	1.40
@@ -899,6 +899,7 @@
 		case EXIF_FORMAT_UNDEFINED:
 			break;
 		case EXIF_FORMAT_BYTE:
+		case EXIF_FORMAT_SBYTE:
 			v_byte = e->data[0];
 			snprintf (v, sizeof (v), "0x%02x", v_byte);
 			for (i = 1; i < e->components; i++) {
@@ -909,6 +910,7 @@
 			}
 			break;
 		case EXIF_FORMAT_SHORT:
+		case EXIF_FORMAT_SSHORT:
 			v_short = exif_get_short (e->data, o);
 			snprintf (v, sizeof (v), "%i", v_short);
 			for (i = 1; i < e->components; i++) {

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- exif-data.c	30 Oct 2003 17:43:52 -0000	1.33
+++ exif-data.c	1 Dec 2003 18:09:28 -0000	1.34
@@ -931,6 +931,7 @@
 		break;
 	case EXIF_FORMAT_UNDEFINED:
 	case EXIF_FORMAT_BYTE:
+	case EXIF_FORMAT_SBYTE:
 	case EXIF_FORMAT_ASCII:
 	default:
 		/* Nothing here. */

[libexif-cvs] libexif ChangeLog,1.87,1.88

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv23146

Modified Files:
	ChangeLog 
Log Message:

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif: Various improvements by Jan Patera <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ChangeLog	30 Oct 2003 21:26:30 -0000	1.87
+++ ChangeLog	1 Dec 2003 18:09:28 -0000	1.88
@@ -1,3 +1,7 @@
+2003-12-01  Lutz Mueller <lu...@us...>
+
+	* libexif: Various improvements by Jan Patera <pa...@pi...>.
+
 2003-10-30  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-loader.c: Handle APP13.

[libexif-cvs] libexif/libexif/pentax exif-mnote-data-pentax.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory sc8-pr-cvs1:/tmp/cvs-serv2013/libexif/pentax

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


Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-mnote-data-pentax.c	26 Oct 2003 22:30:27 -0000	1.2
+++ exif-mnote-data-pentax.c	30 Oct 2003 22:10:45 -0000	1.3
@@ -31,22 +31,32 @@
 /* #define DEBUG */
 
 static void
-exif_mnote_data_pentax_free (ExifMnoteData *n)
+exif_mnote_data_pentax_clear (ExifMnoteDataPentax *n)
 {
-	ExifMnoteDataPentax *note = (ExifMnoteDataPentax *) n;
 	unsigned int i;
 
-	if (note->entries) {
-		for (i = 0; i < note->count; i++) {
-			free (note->entries[i].data);
-			note->entries[i].data = NULL;
-		}
-		free (note->entries);
-		note->entries = NULL;
-		note->count = 0;
+	if (!n) return;
+
+	if (n->entries) {
+		for (i = 0; i < n->count; i++)
+			if (n->entries[i].data) {
+				free (n->entries[i].data);
+				n->entries[i].data = NULL;
+			}
+		free (n->entries);
+		n->entries = NULL;
+		n->count = 0;
 	}
 }
 
+static void
+exif_mnote_data_pentax_free (ExifMnoteData *n)
+{
+	if (!n) return;
+
+	exif_mnote_data_pentax_clear ((ExifMnoteDataPentax *) n);
+}
+
 static char *
 exif_mnote_data_pentax_get_value (ExifMnoteData *d, unsigned int i)
 {
@@ -58,71 +68,48 @@
 }
 
 static void
-exif_mnote_data_pentax_load_entry (ExifMnoteDataPentax *note,
-				  MnotePentaxEntry *entry,
-				  const unsigned char *d,
-				  unsigned int size, unsigned int offset)
-{
-	unsigned int s, doff;
-
-	entry->tag        = exif_get_short (d + offset + 0, note->order);
-	entry->format     = exif_get_short (d + offset + 2, note->order);
-	entry->components = exif_get_long  (d + offset + 4, note->order);
-	entry->order      = note->order;
-
-        /*
-         * Size? If bigger than 4 bytes, the actual data is not
-         * in the entry but somewhere else (offset).
-         */
-        s = exif_format_get_size (entry->format) * entry->components;
-        if (!s)
-                return;
-        if (s > 4)
-                doff = exif_get_long (d + offset + 8, note->order);
-        else
-                doff = offset + 8;
-
-        /* Sanity check */
-        if (size < doff + s)
-                return;
-
-        entry->data = malloc (sizeof (char) * s);
-        if (!entry->data)
-                return;
-        entry->size = s;
-        memcpy (entry->data, d + doff, s);
-}
-
-static void
 exif_mnote_data_pentax_load (ExifMnoteData *en,
-		const unsigned char *data, unsigned int size)
+		const unsigned char *buf, unsigned int buf_size)
 {
-	ExifMnoteDataPentax *note = (ExifMnoteDataPentax *) en;
-	MnotePentaxTag tag;
-	unsigned int i, n;
+	ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) en;
+	unsigned int i, o, s;
+	ExifShort c;
 
 	/* Number of entries */
-	if (size < 2)
+	if (buf_size < 2)
 		return;
-	n = exif_get_short (data, note->order);
-#ifdef DEBUG
-	printf ("Reading %i entries...\n", n);
-#endif
-	data += 2;
-	size -= 2;
+	c = exif_get_short (buf + 6 + n->offset, n->order);
 
-	for (i = 0; i < n; i++) {
-		tag = exif_get_short (data + 12 * i, note->order);
-#ifdef DEBUG
-		printf ("Loading entry '%s' (%i)...\n",
-			mnote_pentax_tag_get_name (tag), i + 1);
-#endif
-		note->count++;
-		note->entries = realloc (note->entries,
-				sizeof (MnotePentaxEntry) * note->count);
-		exif_mnote_data_pentax_load_entry (note,
-			&note->entries[note->count - 1], data, size, 12 * i);
-	}
+	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].format     = exif_get_short (buf + o + 2, n->order);
+	    n->entries[i].components = exif_get_long (buf + o + 4, n->order);
+	    n->entries[i].order      = n->order;
+
+            /*
+             * Size? If bigger than 4 bytes, the actual data is not
+             * in the entry but somewhere else (offset).
+             */
+            s = exif_format_get_size (n->entries[i].format) *
+                                      n->entries[i].components;
+            if (!s) return;
+            o += 8;
+            if (s > 4) o = exif_get_long (buf + o, n->order) + 6;
+            if (o + s > buf_size) return;
+                                                                                
+            /* Sanity check */
+            n->entries[i].data = malloc (sizeof (char) * 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);
+        }
 }
 
 static unsigned int
@@ -170,7 +157,70 @@
 static void
 exif_mnote_data_pentax_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 {
-	if (d) ((ExifMnoteDataPentax *) d)->order = o;
+	ExifByteOrder o_orig;
+        ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) d;
+        unsigned int i, fs;
+        ExifShort s;
+        ExifLong l;
+        ExifSLong sl;
+        ExifRational r;
+        ExifSRational sr;
+                                                                                
+        if (!n) return;
+                                                                                
+        o_orig = n->order;
+        n->order = o;
+        for (i = 0; i < n->count; i++) {
+                n->entries[i].order = o;
+                fs = exif_format_get_size (n->entries[i].format);
+                switch (n->entries[i].format) {
+                case EXIF_FORMAT_SHORT:
+                        for (i = 0; i < n->entries[i].components; i++) {
+                                s = exif_get_short (n->entries[i].data + (i*fs),                                                    o_orig);
+                                exif_set_short (n->entries[i].data + (i * fs),
+                                                o, s);
+                        }
+                        break;
+                case EXIF_FORMAT_LONG:
+                        for (i = 0; i < n->entries[i].components; i++) {
+                                l = exif_get_long (n->entries[i].data + (i*fs),
+                                                   o_orig);
+                                exif_set_long (n->entries[i].data + (i * fs),
+                                               o, l);
+                        }
+                        break;
+                case EXIF_FORMAT_RATIONAL:
+                        for (i = 0; i < n->entries[i].components; i++) {
+                                r = exif_get_rational (n->entries[i].data +
+                                                       (i * fs), o_orig);
+                                exif_set_rational (n->entries[i].data +
+                                        (i * fs), o, r);
+                        }
+                        break;
+                case EXIF_FORMAT_SLONG:
+                        for (i = 0; i < n->entries[i].components; i++) {
+                                sl = exif_get_slong (n->entries[i].data +
+                                                (i * fs), o_orig);
+                                exif_set_slong (n->entries[i].data +
+                                                (i * fs), o, sl);
+                        }
+                        break;
+                case EXIF_FORMAT_SRATIONAL:
+                        for (i = 0; i < n->entries[i].components; i++) {
+                                sr = exif_get_srational (n->entries[i].data +
+                                                (i * fs), o_orig);
+                                exif_set_srational (n->entries[i].data +
+                                                (i * fs), o, sr);
+                        }
+                        break;
+                case EXIF_FORMAT_UNDEFINED:
+                case EXIF_FORMAT_BYTE:
+                case EXIF_FORMAT_ASCII:
+                default:
+                        /* Nothing here. */
+                        break;
+                }
+        }
 }
 
 ExifMnoteData *

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.3,1.4

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv2013/libexif/olympus

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


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-mnote-data-olympus.c	28 Oct 2003 22:50:07 -0000	1.3
+++ exif-mnote-data-olympus.c	30 Oct 2003 22:10:45 -0000	1.4
@@ -52,18 +52,9 @@
 static void
 exif_mnote_data_olympus_free (ExifMnoteData *n)
 {
-	ExifMnoteDataOlympus *note = (ExifMnoteDataOlympus *) n;
-	unsigned int i;
+	if (!n) return;
 
-	if (note->entries) {
-		for (i = 0; i < note->count; i++) {
-			free (note->entries[i].data);
-			note->entries[i].data = NULL;
-		}
-		free (note->entries);
-		note->entries = NULL;
-		note->count = 0;
-	}
+	exif_mnote_data_olympus_clear ((ExifMnoteDataOlympus *) n);
 }
 
 static char *

[libexif-cvs] libexif/libexif exif-loader.c,1.4,1.5

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

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv24570/libexif

Modified Files:
	exif-loader.c 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-loader.c: Handle APP13.


Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-loader.c	30 Oct 2003 21:10:35 -0000	1.4
+++ exif-loader.c	30 Oct 2003 21:26:30 -0000	1.5
@@ -63,6 +63,7 @@
 
 			switch (eld->last_marker) {
 			case JPEG_MARKER_APP0:
+			case JPEG_MARKER_APP13:
 				eld->state = EL_SKIP_BYTES;
 				eld->size -= 2;
 				break;
@@ -88,8 +89,9 @@
 
 		default:
 			if (buf[i] != 0xff) {
-				if (buf [i] == JPEG_MARKER_APP0 ||
-				    buf [i] == JPEG_MARKER_APP1) {
+				if (buf[i] == JPEG_MARKER_APP0 ||
+				    buf[i] == JPEG_MARKER_APP1 ||
+				    buf[i] == JPEG_MARKER_APP13) {
 					eld->state = EL_READ_SIZE_HIGH_BYTE;
 					eld->last_marker = buf [i];
 

[libexif-cvs] libexif ChangeLog,1.86,1.87

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv24570

Modified Files:
	ChangeLog 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-loader.c: Handle APP13.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- ChangeLog	30 Oct 2003 21:10:34 -0000	1.86
+++ ChangeLog	30 Oct 2003 21:26:30 -0000	1.87
@@ -1,5 +1,9 @@
 2003-10-30  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-loader.c: Handle APP13.
+
+2003-10-30  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-loader.c: Fix APP0-bug. Patch by Jan Patera
 	  <pa...@pi...>.
 

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

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

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv21169/libexif

Modified Files:
	exif-loader.c 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-loader.c: Fix APP0-bug. Patch by Jan Patera
	  <pa...@pi...>.


Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-loader.c	29 Apr 2003 20:13:50 -0000	1.3
+++ exif-loader.c	30 Oct 2003 21:10:35 -0000	1.4
@@ -18,10 +18,10 @@
 struct _ExifLoader {
 	ExifLoaderState state;
 
-	int      size;
-	int      last_marker;
+	unsigned int size;
+	int last_marker;
 	unsigned char *buf;
-	int      bytes_read;
+	unsigned int bytes_read;
 
 	unsigned int ref_count;
 };
@@ -29,23 +29,22 @@
 #undef  MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
-/* This function imitates code from libexif, written by Lutz
+/*
+ * This function imitates code from libexif, written by Lutz
  * Müller. See libexif/exif-data.c:exif_data_new_from_file. Here, it
  * can cope with a sequence of data chunks.
  */
 unsigned char
 exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
 {
-	int i;
-	int len_remain;
+	int i, len_remain;
 
 	if (!eld) return 0;
 	if (eld->state == EL_FAILED) return 0;
 	if (eld->size && eld->bytes_read == eld->size) return 0;
 
 	for (i = 0; (i < len) && (eld->state != EL_EXIF_FOUND) &&
-				 (eld->state != EL_FAILED); i++) {
-
+				 (eld->state != EL_FAILED); i++) 
 		switch (eld->state) {
 		case EL_SKIP_BYTES:
 			eld->size--;
@@ -65,6 +64,7 @@
 			switch (eld->last_marker) {
 			case JPEG_MARKER_APP0:
 				eld->state = EL_SKIP_BYTES;
+				eld->size -= 2;
 				break;
 
 			case JPEG_MARKER_APP1:
@@ -107,7 +107,6 @@
 				}
 			}
 		}
-	}
 
 	len_remain = len - i;
 	if (!len_remain) return 1;

[libexif-cvs] libexif ChangeLog,1.85,1.86

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv21169

Modified Files:
	ChangeLog 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-loader.c: Fix APP0-bug. Patch by Jan Patera
	  <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ChangeLog	30 Oct 2003 17:43:52 -0000	1.85
+++ ChangeLog	30 Oct 2003 21:10:34 -0000	1.86
@@ -1,5 +1,10 @@
 2003-10-30  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-loader.c: Fix APP0-bug. Patch by Jan Patera
+	  <pa...@pi...>.
+
+2003-10-30  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-data.c: Add explicit typecasts to ExifShort.
 	  Suggested by Jan Patera <pa...@pi...>.
 

[libexif-cvs] libexif/libexif exif-data.c,1.32,1.33

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

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv6092/libexif

Modified Files:
	exif-data.c 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c: Add explicit typecasts to ExifShort.
	  Suggested by Jan Patera <pa...@pi...>.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- exif-data.c	27 Oct 2003 22:34:29 -0000	1.32
+++ exif-data.c	30 Oct 2003 17:43:52 -0000	1.33
@@ -158,9 +158,9 @@
 	 * already been allocated.
 	 */
 	exif_set_short (*d + 6 + offset + 0,
-			data->priv->order, e->tag);
+			data->priv->order, (ExifShort) e->tag);
 	exif_set_short (*d + 6 + offset + 2,
-			data->priv->order, e->format);
+			data->priv->order, (ExifShort) e->format);
 	exif_set_long  (*d + 6 + offset + 4,
 			data->priv->order, e->components);
 
@@ -353,7 +353,7 @@
 
 	/* Save the number of entries */
 	exif_set_short (*d + 6 + offset, data->priv->order,
-			ifd->count + n_ptr + n_thumb);
+			(ExifShort) (ifd->count + n_ptr + n_thumb));
 	offset += 2;
 
 #ifdef DEBUG

[libexif-cvs] libexif ChangeLog,1.84,1.85

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv6092

Modified Files:
	ChangeLog 
Log Message:

2003-10-30  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c: Add explicit typecasts to ExifShort.
	  Suggested by Jan Patera <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	28 Oct 2003 22:50:07 -0000	1.84
+++ ChangeLog	30 Oct 2003 17:43:52 -0000	1.85
@@ -1,3 +1,8 @@
+2003-10-30  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-data.c: Add explicit typecasts to ExifShort.
+	  Suggested by Jan Patera <pa...@pi...>.
+
 2003-10-28  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus: Fix. I've got one Olympus file and this gets

[libexif-cvs] libexif ChangeLog,1.83,1.84

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv32281

Modified Files:
	ChangeLog 
Log Message:

2003-10-28  Lutz Mueller <lu...@us...>

	* libexif/olympus: Fix. I've got one Olympus file and this gets
	  parsed now.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	28 Oct 2003 18:49:47 -0000	1.83
+++ ChangeLog	28 Oct 2003 22:50:07 -0000	1.84
@@ -1,5 +1,10 @@
 2003-10-28  Lutz Mueller <lu...@us...>
 
+	* libexif/olympus: Fix. I've got one Olympus file and this gets
+	  parsed now.
+
+2003-10-28  Lutz Mueller <lu...@us...>
+
 	* libjpeg/jpeg-data.c: Do not depend on unistd.h. Reported by
 	  Jan Patera <pa...@pi...>.
 

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.2,1.3 mnote-olympus-entry.c,1.1,1.2

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv32281/libexif/olympus

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

2003-10-28  Lutz Mueller <lu...@us...>

	* libexif/olympus: Fix. I've got one Olympus file and this gets
	  parsed now.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-mnote-data-olympus.c	26 Oct 2003 22:30:26 -0000	1.2
+++ exif-mnote-data-olympus.c	28 Oct 2003 22:50:07 -0000	1.3
@@ -31,6 +31,25 @@
 #define DEBUG
 
 static void
+exif_mnote_data_olympus_clear (ExifMnoteDataOlympus *n)
+{
+	unsigned int i;
+
+	if (!n) return;
+
+	if (n->entries) {
+		for (i = 0; i < n->count; i++)
+			if (n->entries[i].data) {
+				free (n->entries[i].data);
+				n->entries[i].data = NULL;
+			}
+		free (n->entries);
+		n->entries = NULL;
+		n->count = 0;
+	}
+}
+
+static void
 exif_mnote_data_olympus_free (ExifMnoteData *n)
 {
 	ExifMnoteDataOlympus *note = (ExifMnoteDataOlympus *) n;
@@ -57,133 +76,105 @@
 	return mnote_olympus_entry_get_value (&n->entries[i]);
 }
 
-#ifdef DEBUG
-/* Look at memory around p */
-static void dump_memory_around(const unsigned char *p)
-{
-	static char *format = "%xl %xl %xl %xl\n";
-	static unsigned buf[4];
-	unsigned int i;
-
-	for (i = 0; i < 5; i++) {
-		memcpy(buf, p - 32 + (16 * i), sizeof(buf));
-		printf(format, buf[0], buf[1], buf[2], buf[3]);
-	}
-
-}
-#endif
-
-
 static void
-exif_mnote_data_olympus_load_entry (ExifMnoteDataOlympus *note,
-	MnoteOlympusEntry *entry, const unsigned char *d,
-	unsigned int size, unsigned int offset)
+exif_mnote_data_olympus_save (ExifMnoteData *ne,
+		unsigned char **buf, unsigned int *buf_size)
 {
-	unsigned int s, doff;
-	const unsigned char *d_orig = d;
-
-	entry->tag        = exif_get_short (d + offset + 0, note->order);
-	entry->format     = exif_get_short (d + offset + 2, note->order);
-	entry->components = exif_get_long  (d + offset + 4, note->order);
-	entry->order      = note->order;
+	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) ne;
+	unsigned int i, o, s, doff;
 
-        /*
-         * Size? If bigger than 4 bytes, the actual data is not
-         * in the entry but somewhere else (offset).
-         */
-        s = exif_format_get_size (entry->format) * entry->components;
-#ifdef DEBUG
-        printf ("exif get size is %i ", exif_format_get_size (entry->format));
-        printf ("entry format is %i, #components is %li, ",
-		entry->format, entry->components);
-        printf ("entry size is %i\n", s);
-#endif
-        if (!s)
-                return;
-        if (s > 4) {
+	if (!n || !buf || !buf_size) return;
 
-        		/*
-        			THIS DOES NOT WORK!
-        			The problem is that d points to the first MakerNote Tag.
-        			According to the EXIF 2.1 spec, it should point to the
-        			TIFF header preceding the EXIF information.
-        			I have tried rolling it back by 10 bytes (pointing to the
-        			OLYMP) and by 18 bytes (assuming the TIFF header immediately
-        			precedes the OLYMP). Neither of these hacks produced any
-        			meaningful data within 32 bytes of the pointer, for a
-        			case in which I know the desired values of the numerator
-        			and denominator of a rational.
-        		*/
-                doff = exif_get_long (d + offset + 8, note->order);
-                d_orig = d + doff;
-#ifdef DEBUG
-                printf ("**** data offset is %i\n", doff);
-                dump_memory_around (d_orig);
-#endif
-        }
-        else {
-                doff = offset + 8;
-               	d_orig = d + doff;
-        }
+	/*
+	 * 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);
+	if (!*buf) return;
+	memset (*buf, 0, sizeof (char) * *buf_size);
 
+	/* Write the header and the number of entries. */
+	strcpy (*buf, "OLYMP");
+	exif_set_short (*buf + 8, n->order, n->count);
 
-        /* Sanity check */
-        /* This doesn't work if the data is outside the tag!! */
-        if ((s <= 4) && (size < doff + s))
-                return;
+	/* Save each entry */
+	for (i = 0; i < n->count; i++) {
+		o = 6 + 2 + 2 + i * 12;
+		exif_set_short (*buf + o + 0, n->order, n->entries[i].tag);
+		exif_set_short (*buf + o + 2, n->order, n->entries[i].format);
+		exif_set_long  (*buf + o + 4, n->order,
+				n->entries[i].components);
+		o += 8;
+		s = exif_format_get_size (n->entries[i].format) *
+						n->entries[i].components;
+		if (s > 4) {
+			*buf_size += s;
+			*buf = realloc (*buf, sizeof (char) * *buf_size);
+			if (!*buf) return;
+			doff = *buf_size - s;
+			exif_set_long (*buf + o, n->order, n->offset + doff);
+		} else
+			doff = o;
 
-        entry->data = malloc (sizeof (char) * s);
-        if (!entry->data)
-                return;
-        entry->size = s;
-        memcpy (entry->data, d_orig, s);
+		/* Write the data. Fill unneeded bytes with 0. */
+		memcpy (*buf + doff, n->entries[i].data, s);
+		if (s < 4) memset (*buf + doff + s, 0, (4 - s));
+	}
 }
 
 static void
 exif_mnote_data_olympus_load (ExifMnoteData *en,
-			      const unsigned char *data, unsigned int size)
+			      const unsigned char *buf, unsigned int buf_size)
 {
-	ExifMnoteDataOlympus *note = (ExifMnoteDataOlympus *) en;
-	MnoteOlympusTag tag;
-	const unsigned char *p = data;
-	ExifData *ed = NULL;
-	ExifEntry *e = NULL;
-	short nEntries;
-	const unsigned char *tagEntries;
-	unsigned int i;
+	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) en;
+	ExifShort c;
+	unsigned int i, s, o;
 
-	/* If we got EXIF data, go to the MakerNote tag. */
-	ed = exif_data_new_from_data (data, size);
-	if (ed) {
-		e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
-					    EXIF_TAG_MAKER_NOTE);
-		if (e) p = e->data;
-	}
+	if (!n || !buf) return;
 
 	/*
 	 * Olympus headers start with "OLYMP" and need to have at least
-	 * a size of 22 bytes.
+	 * a size of 22 bytes (6 for 'OLYMP', 2 other bytes, 2 for the
+	 * number of entries, and 12 for one entry.
 	 */
-	if ((size < 22) || memcmp (p, "OLYMP", 5)) {
-		exif_data_unref (ed);
-		return;
-	}
+	if (buf_size - n->offset < 22) return;
+	if (memcmp (buf + 6 + n->offset, "OLYMP", 5)) return;
 
-	nEntries = exif_get_short (p + 8, note->order);
-	tagEntries = p + 10;
+	/* Read the number of entries and remove old ones. */
+	c = exif_get_short (buf + 6 + n->offset + 8, n->order);
+	exif_mnote_data_olympus_clear (n);
 
-	for (i = 0; i < nEntries; i++) {
-		tag = exif_get_short (tagEntries + 12 * i, note->order);
-#ifdef DEBUG
-		printf ("Loading entry '%s' (%x) (%i)...\n",
-			mnote_olympus_tag_get_name (tag), tag, i + 1);
-#endif
-		note->count++;
-		note->entries = realloc (note->entries,
-			sizeof (MnoteOlympusEntry) * note->count);
-		exif_mnote_data_olympus_load_entry (note,
-			&note->entries[note->count - 1],
-			tagEntries, size, 12 * i);
+	/* 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);
+	    n->entries[i].order      = n->order;
+
+	    /*
+	     * Size? If bigger than 4 bytes, the actual data is not
+	     * in the entry but somewhere else (offset).
+	     */
+	    s = exif_format_get_size (n->entries[i].format) *
+		   			 n->entries[i].components;
+	    if (!s) return;
+	    o += 8;
+	    if (s > 4) o = exif_get_long (buf + o, n->order) + 6;
+	    if (o + s > buf_size) return;
+
+	    /* Sanity check */
+	    n->entries[i].data = malloc (sizeof (char) * 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);
 	}
 }
 
@@ -224,9 +215,73 @@
 }
 
 static void
-exif_mnote_data_olympus_set_byte_order (ExifMnoteData *n, ExifByteOrder o)
+exif_mnote_data_olympus_set_byte_order (ExifMnoteData *d, ExifByteOrder o)
 {
-	if (n) ((ExifMnoteDataOlympus *) n)->order = o;
+	ExifByteOrder o_orig;
+	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) d;
+	unsigned int i, fs;
+	ExifShort s;
+	ExifLong l;
+	ExifSLong sl;
+	ExifRational r;
+	ExifSRational sr;
+
+	if (!n) return;
+
+	o_orig = n->order;
+	n->order = o;
+	for (i = 0; i < n->count; i++) {
+		n->entries[i].order = o;
+		fs = exif_format_get_size (n->entries[i].format);
+		switch (n->entries[i].format) {
+		case EXIF_FORMAT_SHORT:
+			for (i = 0; i < n->entries[i].components; i++) {
+				s = exif_get_short (n->entries[i].data + (i*fs),
+						o_orig);
+				exif_set_short (n->entries[i].data + (i * fs),
+						o, s);
+			}
+			break;
+		case EXIF_FORMAT_LONG:
+			for (i = 0; i < n->entries[i].components; i++) {
+				l = exif_get_long (n->entries[i].data + (i*fs),
+						o_orig);
+				exif_set_long (n->entries[i].data + (i * fs),
+						o, l);
+			}
+			break;
+		case EXIF_FORMAT_RATIONAL:
+			for (i = 0; i < n->entries[i].components; i++) {
+				r = exif_get_rational (n->entries[i].data +
+						(i * fs), o_orig);
+				exif_set_rational (n->entries[i].data +
+						(i * fs), o, r);
+			}
+			break;
+		case EXIF_FORMAT_SLONG:
+			for (i = 0; i < n->entries[i].components; i++) {
+				sl = exif_get_slong (n->entries[i].data +
+						(i * fs), o_orig);
+				exif_set_slong (n->entries[i].data +
+						(i * fs), o, sl);
+			}
+			break;
+		case EXIF_FORMAT_SRATIONAL:
+			for (i = 0; i < n->entries[i].components; i++) {
+				sr = exif_get_srational (n->entries[i].data +
+						(i * fs), o_orig);
+				exif_set_srational (n->entries[i].data +
+						(i * fs), o, sr);
+			}
+			break;
+		case EXIF_FORMAT_UNDEFINED:
+		case EXIF_FORMAT_BYTE:
+		case EXIF_FORMAT_ASCII:
+		default:
+			/* Nothing here. */
+			break;
+		}
+	}
 }
 
 static void
@@ -251,6 +306,7 @@
 	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;

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mnote-olympus-entry.c	26 Oct 2003 10:06:17 -0000	1.1
+++ mnote-olympus-entry.c	28 Oct 2003 22:50:07 -0000	1.2
@@ -29,36 +29,6 @@
 #include <libexif/exif-utils.h>
 #include <libexif/i18n.h>
 
-#if 0
-void
-mnote_olympus_entry_dump (MnoteEntry *e, unsigned int indent)
-{
-	MnoteOlympusEntry *entry = (MnoteOlympusEntry *)e;
-
-	char buf[1024];
-	unsigned int i;
-
-	for (i = 0; i < 2 * indent; i++)
-		buf[i] = ' ';
-	buf[i] = '\0';
-
-	if (!e) {
-		printf("No entry in mnote_olympus_entry_dump!\n");
-		return;
-	}
-
-	printf ("%sTag: 0x%x ('%s')\n", buf, entry->tag,
-		mnote_olympus_tag_get_name (entry->tag));
-	printf ("%s  Format: %i ('%s')\n", buf, entry->format,
-		exif_format_get_name (entry->format));
-	printf ("%s  Components: %i\n", buf, (int) entry->components);
-	printf ("%s  Size: %i\n", buf, entry->size);
-	if (entry->size > 0) {
-		printf ("%s  Value: %s\n", buf, mnote_olympus_entry_get_value (entry));
-	}
-}
-#endif
-
 #define CF(format,target,v)                                     \
 {                                                               \
         if (format != target) {                                 \

[libexif-cvs] libexif/libjpeg jpeg-data.c,1.14,1.15

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

Update of /cvsroot/libexif/libexif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv5561/libjpeg

Modified Files:
	jpeg-data.c 
Log Message:

2003-10-28  Lutz Mueller <lu...@us...>

	* libjpeg/jpeg-data.c: Do not depend on unistd.h. Reported by
	  Jan Patera <pa...@pi...>.


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jpeg-data.c	28 Oct 2003 18:49:47 -0000	1.14
+++ jpeg-data.c	28 Oct 2003 18:53:44 -0000	1.15
@@ -25,10 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 /* #define DEBUG */
 
 struct _JPEGDataPrivate
@@ -84,9 +80,7 @@
 	if (!d)
 		return;
 
-#ifdef HAVE_UNISTD_H
-	unlink (path);
-#endif
+	remove (path);
 	f = fopen (path, "wb");
 	if (!f) {
 		free (d);

[libexif-cvs] libexif/libjpeg jpeg-data.c,1.13,1.14

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

Update of /cvsroot/libexif/libexif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv5033/libjpeg

Modified Files:
	jpeg-data.c 
Log Message:

2003-10-28  Lutz Mueller <lu...@us...>

	* libjpeg/jpeg-data.c: Do not depend on unistd.h. Reported by
	  Jan Patera <pa...@pi...>.


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jpeg-data.c	28 Sep 2003 18:00:06 -0000	1.13
+++ jpeg-data.c	28 Oct 2003 18:49:47 -0000	1.14
@@ -23,9 +23,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 /* #define DEBUG */
 
 struct _JPEGDataPrivate
@@ -81,7 +84,9 @@
 	if (!d)
 		return;
 
+#ifdef HAVE_UNISTD_H
 	unlink (path);
+#endif
 	f = fopen (path, "wb");
 	if (!f) {
 		free (d);

[libexif-cvs] libexif ChangeLog,1.82,1.83

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

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv5033

Modified Files:
	ChangeLog 
Log Message:

2003-10-28  Lutz Mueller <lu...@us...>

	* libjpeg/jpeg-data.c: Do not depend on unistd.h. Reported by
	  Jan Patera <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ChangeLog	27 Oct 2003 22:34:29 -0000	1.82
+++ ChangeLog	28 Oct 2003 18:49:47 -0000	1.83
@@ -1,3 +1,8 @@
+2003-10-28  Lutz Mueller <lu...@us...>
+
+	* libjpeg/jpeg-data.c: Do not depend on unistd.h. Reported by
+	  Jan Patera <pa...@pi...>.
+
 2003-10-27  Lutz Mueller <lu...@us...>
 
 	* libexif: Canon maker notes seem to work now (both loading and

[libexif-cvs] libexif-gtk/tests Makefile.am,1.4,1.5

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

Update of /cvsroot/libexif/libexif-gtk/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv9794/tests

Modified Files:
	Makefile.am 
Log Message:
use $(top_builddir) instead of .../

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/tests/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	27 Oct 2002 22:04:29 -0000	1.4
+++ Makefile.am	27 Oct 2003 22:46:56 -0000	1.5
@@ -1,4 +1,4 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl $(LIBEXIF_GTK_CFLAGS)
 
 noinst_PROGRAMS = test-libexif-gtk
-test_libexif_gtk_LDADD = ../libexif-gtk/libexif-gtk.la $(LIBEXIF_GTK_LIBS) $(INTLLIBS)
+test_libexif_gtk_LDADD = $(top_builddir)/libexif-gtk/libexif-gtk.la $(LIBEXIF_GTK_LIBS) $(INTLLIBS)

[libexif-cvs] libexif/po .cvsignore,1.3,1.4

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

Update of /cvsroot/libexif/libexif/po
In directory sc8-pr-cvs1:/tmp/cvs-serv9718/po

Modified Files:
	.cvsignore 
Log Message:
no relative files in .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/libexif/libexif/po/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	26 Oct 2003 10:24:26 -0000	1.3
+++ .cvsignore	27 Oct 2003 22:46:21 -0000	1.4
@@ -1,4 +1,4 @@
 ChangeLog
 *.gmo
 libexif.pot
-po/Makevars
+Makevars

[libexif-cvs] libexif/test Makefile.am,1.8,1.9

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

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs1:/tmp/cvs-serv9667/test

Modified Files:
	Makefile.am 
Log Message:
use $(top_builddir) instead of .../

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	26 Oct 2003 22:30:27 -0000	1.8
+++ Makefile.am	27 Oct 2003 22:46:08 -0000	1.9
@@ -5,6 +5,6 @@
 
 noinst_PROGRAMS = test-mem test-tree test-mnote
 
-test_tree_LDADD = ../libjpeg/libjpeg.la	../libexif/libexif.la $(INTLLIBS)
-test_mem_LDADD = ../libexif/libexif.la $(INTLLIBS)
-test_mnote_LDADD = ../libexif/libexif.la $(INTLLIBS)
+test_tree_LDADD = $(top_builddir)/libjpeg/libjpeg.la $(top_builddir)/libexif/libexif.la $(INTLLIBS)
+test_mem_LDADD = $(top_builddir)/libexif/libexif.la $(INTLLIBS)
+test_mnote_LDADD = $(top_builddir)/libexif/libexif.la $(INTLLIBS)

[libexif-cvs] libexif/libjpeg Makefile.am,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libjpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv9667/libjpeg

Modified Files:
	Makefile.am 
Log Message:
use $(top_builddir) instead of .../

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	22 Nov 2002 16:47:56 -0000	1.2
+++ Makefile.am	27 Oct 2003 22:46:08 -0000	1.3
@@ -7,4 +7,4 @@
 libjpeg_la_SOURCES =			\
 	jpeg-data.c jpeg-data.h		\
 	jpeg-marker.c jpeg-marker.h
-libjpeg_la_LIBADD = ../libexif/libexif.la
+libjpeg_la_LIBADD = $(top_builddir)/libexif/libexif.la