libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif/olympus .cvsignore,1.2,1.3 Makefile.am,1.4,1.5 exif-mnote-data-olympus.c,NONE,1.1 exif-mnote-data-olympus.h,NONE,1.1 mnote-olympus-entry.c,NONE,1.1 mnote-olympus-entry.h,NONE,1.1 mnote-olympus-tag.c,NONE,1.1 mnote-olympus-tag.h,NONE,1.1

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

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

Added Files:
	.cvsignore Makefile.am exif-mnote-data-olympus.c 
	exif-mnote-data-olympus.h mnote-olympus-entry.c 
	mnote-olympus-entry.h mnote-olympus-tag.c mnote-olympus-tag.h 
Log Message:

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

	* libexif/olympus
	* libexif/canon
	* libexif/pentax: Merge libmnote with libexif. The code compiles but
	  is completely untested.


--- NEW FILE: Makefile.am ---
INCLUDES =						\
	-DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\"	\
	-I$(top_srcdir)					\
	-I$(top_srcdir)/intl

noinst_LIBRARIES = libmnote-olympus.a
libmnote_olympus_a_SOURCES =					\
	mnote-olympus-entry.c mnote-olympus-entry.h		\
	exif-mnote-data-olympus.c exif-mnote-data-olympus.h	\
	mnote-olympus-tag.c mnote-olympus-tag.h

--- NEW FILE: .cvsignore ---
Makefile.in

--- NEW FILE: mnote-olympus-entry.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mnote-olympus-tag.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exif-mnote-data-olympus.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exif-mnote-data-olympus.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mnote-olympus-tag.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mnote-olympus-entry.c ---
(This appears to be a binary file; contents omitted.)

[libexif-cvs] libexif ChangeLog,1.77,1.78 README,1.6,1.7 configure.in,1.55,1.56

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

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

Modified Files:
	ChangeLog README configure.in 
Log Message:

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

	* libexif/olympus
	* libexif/canon
	* libexif/pentax: Merge libmnote with libexif. The code compiles but
	  is completely untested.


Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- configure.in	28 Sep 2003 17:35:13 -0000	1.55
+++ configure.in	26 Oct 2003 10:06:16 -0000	1.56
@@ -60,6 +60,9 @@
   Makefile
   libexif.spec
   libexif/Makefile
+  libexif/canon/Makefile
+  libexif/olympus/Makefile
+  libexif/pentax/Makefile
   libjpeg/Makefile
   test/Makefile
   libexif/libexif.pc

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- ChangeLog	15 Oct 2003 18:04:03 -0000	1.77
+++ ChangeLog	26 Oct 2003 10:06:16 -0000	1.78
@@ -1,3 +1,10 @@
+2003-10-26  Lutz Mueller <lu...@us...>
+
+	* libexif/olympus
+	* libexif/canon
+	* libexif/pentax: Merge libmnote with libexif. The code compiles but
+	  is completely untested.
+
 2003-10-15  Lutz Mueller <lu...@us...>
 
 	* libexif.spec.in: Patches by Peter Bieringer <pb...@bi...>.

Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	31 Dec 2002 10:11:23 -0000	1.6
+++ README	26 Oct 2003 10:06:16 -0000	1.7
@@ -23,8 +23,9 @@
 LIMITATIONS
 -----------
 
-If you are looking for a library to read/write MakerNotes, get libmnote. 
-libexif is about tags.
+libexif can only handle some maker notes, and even those not very well. More
+work needs to be done. Note that libmnote has been merged with libexif - it
+is no longer needed.
 
 FRONTENDS
 ---------

[libexif-cvs] libexif/libexif/canon .cvsignore,1.3,1.4 Makefile.am,1.4,1.5 exif-mnote-data-canon.c,NONE,1.1 exif-mnote-data-canon.h,NONE,1.1 mnote-canon-entry.c,NONE,1.1 mnote-canon-entry.h,NONE,1.1 mnote-canon-tag.c,NONE,1.1 mnote-canon-tag.h,NONE,1.1

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

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

Added Files:
	.cvsignore Makefile.am exif-mnote-data-canon.c 
	exif-mnote-data-canon.h mnote-canon-entry.c 
	mnote-canon-entry.h mnote-canon-tag.c mnote-canon-tag.h 
Log Message:

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

	* libexif/olympus
	* libexif/canon
	* libexif/pentax: Merge libmnote with libexif. The code compiles but
	  is completely untested.


--- NEW FILE: mnote-canon-entry.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exif-mnote-data-canon.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: Makefile.am ---
INCLUDES=						\
	-DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\"	\
	-I$(top_srcdir)					\
	-I$(top_srcdir)/intl

noinst_LIBRARIES = libmnote-canon.a
libmnote_canon_a_SOURCES =				\
	exif-mnote-data-canon.c exif-mnote-data-canon.h \
	mnote-canon-entry.c mnote-canon-entry.h		\
	mnote-canon-tag.c mnote-canon-tag.h

--- NEW FILE: mnote-canon-tag.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mnote-canon-entry.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mnote-canon-tag.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: exif-mnote-data-canon.c ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: .cvsignore ---
Makefile.in

[libexif-cvs] libexif/libexif/pentax - New directory

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

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

Log Message:
Directory /cvsroot/libexif/libexif/libexif/pentax added to the repository

[libexif-cvs] libexif ChangeLog,1.76,1.77 libexif.spec.in,1.3,1.4

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

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

Modified Files:
	ChangeLog libexif.spec.in 
Log Message:

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

	* libexif.spec.in: Patches by Peter Bieringer <pb...@bi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- ChangeLog	8 Oct 2003 18:08:00 -0000	1.76
+++ ChangeLog	15 Oct 2003 18:04:03 -0000	1.77
@@ -1,3 +1,7 @@
+2003-10-15  Lutz Mueller <lu...@us...>
+
+	* libexif.spec.in: Patches by Peter Bieringer <pb...@bi...>.
+
 2003-10-08  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-data.c: Patch by Jan Patera <pa...@pi...>.

Index: libexif.spec.in
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libexif.spec.in	3 Jan 2003 14:06:46 -0000	1.3
+++ libexif.spec.in	15 Oct 2003 18:04:03 -0000	1.4
@@ -5,7 +5,7 @@
 Source: http://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.gz
 Url: http://sourceforge.net/projects/libexif/
 Group: System Environment/Libraries
-Copyright: GPL
+License: GPL
 # replaced Packager: header, as most people making packages will be somebody
 # else. original spec file author is Mark Pulford <ma...@ky...>
 BuildRoot: %{_tmppath}/%{name}-%{version}-root

[libexif-cvs] exif ChangeLog,1.32,1.33 exif.spec.in,1.1,1.2

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

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

Modified Files:
	ChangeLog exif.spec.in 
Log Message:

2003-10-15  Lutz Mueller <lu...@us...>
                                                                                
        * exif.spec.in: Patches by Peter Bieringer <pb...@bi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	30 Sep 2003 22:53:37 -0000	1.32
+++ ChangeLog	15 Oct 2003 18:02:53 -0000	1.33
@@ -1,3 +1,7 @@
+2003-10-15  Lutz Mueller <lu...@us...>
+                                                                                
+        * exif.spec.in: Patches by Peter Bieringer <pb...@bi...>.
+                                                                                
 2003-10-01  Lutz Mueller <lu...@us...>
 
 	* exif/exif-i18n.c: Patch to fix 64bit related crash by

Index: exif.spec.in
===================================================================
RCS file: /cvsroot/libexif/exif/exif.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif.spec.in	3 Jan 2003 14:04:33 -0000	1.1
+++ exif.spec.in	15 Oct 2003 18:02:54 -0000	1.2
@@ -2,12 +2,13 @@
 Summary: A utility to display exif headers from jpeg files
 Version: @VERSION@
 Release: 1
-Source: http://prdownloads.sourceforge.net/libexif/exif-0.5.tar.gz
+Source: http://prdownloads.sourceforge.net/libexif/exif-%{version}.tar.gz
 Url: http://sourceforge.net/projects/libexif/
 Group: Applications/Multimedia
-Copyright: GPL
+License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libexif-devel, libmnote-devel
+Requires: libexif, libmnote
 
 %description
 'exif' is a small command-line utility to show EXIF information hidden

[libexif-cvs] libmnote ChangeLog,1.15,1.16 libmnote.spec.in,1.3,1.4

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

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

Modified Files:
	ChangeLog libmnote.spec.in 
Log Message:

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

	* libmnote.spec.in: Patches by Peter Bieringer <pb...@bi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libmnote/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	29 Aug 2003 11:18:19 -0000	1.15
+++ ChangeLog	15 Oct 2003 17:59:46 -0000	1.16
@@ -1,3 +1,7 @@
+2003-10-15  Lutz Mueller <lu...@us...>
+
+	* libmnote.spec.in: Patches by Peter Bieringer <pb...@bi...>.
+
 2003-08-29  Matthieu Castet <ma...@us...>
 
         * libmnote/olympus/mnote-olympus-entry.c: strncat fixe.

Index: libmnote.spec.in
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libmnote.spec.in	3 Jan 2003 14:05:14 -0000	1.3
+++ libmnote.spec.in	15 Oct 2003 17:59:46 -0000	1.4
@@ -5,10 +5,12 @@
 Source: http://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.gz
 Url: http://sourceforge.net/projects/libexif/
 Group: System Environment/Libraries
-Copyright: LGPL
+Licence: LGPL
 # replaced Packager: header, as most people making packages will be somebody
 # else. original spec file author is Mark Pulford <ma...@ky...>
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildPrereq: libexif-devel
+Prereq: libexif
 Prefix: %{_prefix}
 
 %description

[libexif-cvs] libexif/libexif exif-data.c,1.27,1.28

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

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

Modified Files:
	exif-data.c 
Log Message:

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

	* libexif/exif-data.c: Patch by Jan Patera <pa...@pi...>.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- exif-data.c	17 Sep 2003 11:31:06 -0000	1.27
+++ exif-data.c	8 Oct 2003 18:08:01 -0000	1.28
@@ -186,11 +186,16 @@
 	ExifTag tag;
 
 	/* Read the number of entries */
+	if (offset >= ds - 1) return;
 	n = exif_get_short (d + offset, data->priv->order);
 #ifdef DEBUG
 	printf ("Loading %i entries...\n", n);
 #endif
 	offset += 2;
+
+	/* Check if we have enough data. */
+	if (offset + 12 * n > ds) n = (ds - offset) / 12;
+
 	for (i = 0; i < n; i++) {
 
 		tag = exif_get_short (d + offset + 12 * i, data->priv->order);

[libexif-cvs] libexif ChangeLog,1.75,1.76

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-data.c: Patch by Jan Patera <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	8 Oct 2003 16:40:11 -0000	1.75
+++ ChangeLog	8 Oct 2003 18:08:00 -0000	1.76
@@ -1,5 +1,9 @@
 2003-10-08  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-data.c: Patch by Jan Patera <pa...@pi...>.
+
+2003-10-08  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: Patch by Jan Patera <pa...@pi...>.
 
 2003-09-28  Lutz Mueller <lu...@us...>

[libexif-cvs] libexif ChangeLog,1.74,1.75

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-entry.c: Patch by Jan Patera <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- ChangeLog	28 Sep 2003 17:35:13 -0000	1.74
+++ ChangeLog	8 Oct 2003 16:40:11 -0000	1.75
@@ -1,3 +1,7 @@
+2003-10-08  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c: Patch by Jan Patera <pa...@pi...>.
+
 2003-09-28  Lutz Mueller <lu...@us...>
 
 	* Makefile.am

[libexif-cvs] libexif/libexif exif-entry.c,1.38,1.39

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

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

Modified Files:
	exif-entry.c 
Log Message:

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

	* libexif/exif-entry.c: Patch by Jan Patera <pa...@pi...>.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- exif-entry.c	17 Sep 2003 11:31:06 -0000	1.38
+++ exif-entry.c	8 Oct 2003 16:40:11 -0000	1.39
@@ -182,7 +182,9 @@
 	case EXIF_TAG_EXIF_VERSION:
 		CF (e->format, EXIF_FORMAT_UNDEFINED, v);
 		CC (e->components, 4, v);
-		if (!memcmp (e->data, "0200", 4))
+		if (!memcmp (e->data, "0110", 4))
+			strncpy (v, "Exif Version 1.1", sizeof (v) - 1);
+		else if (!memcmp (e->data, "0200", 4))
 			strncpy (v, "Exif Version 2.0", sizeof (v) - 1);
 		else if (!memcmp (e->data, "0210", 4))
 			strncpy (v, "Exif Version 2.1", sizeof (v) - 1);

[libexif-cvs] exif ChangeLog,1.31,1.32

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* exif/exif-i18n.c: Patch to fix 64bit related crash by
	  Marcus Meissner (#784852).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	30 Sep 2003 22:43:00 -0000	1.31
+++ ChangeLog	30 Sep 2003 22:53:37 -0000	1.32
@@ -1,5 +1,10 @@
 2003-10-01  Lutz Mueller <lu...@us...>
 
+	* exif/exif-i18n.c: Patch to fix 64bit related crash by
+	  Marcus Meissner (#784852).
+
+2003-10-01  Lutz Mueller <lu...@us...>
+
 	* exif/actions.[c,h]:
 	* exif/main.c: Add option --machine-readable. Patch by
 	  Greg Baker (#761641).

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

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

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

Modified Files:
	exif-i18n.c 
Log Message:

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

	* exif/exif-i18n.c: Patch to fix 64bit related crash by
	  Marcus Meissner (#784852).


Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-i18n.c	5 May 2003 21:13:44 -0000	1.1
+++ exif-i18n.c	30 Sep 2003 22:53:37 -0000	1.2
@@ -3,6 +3,7 @@
 
 #include <iconv.h>
 #include <string.h>
+#include <sys/types.h>
 
 #undef MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
@@ -11,9 +12,9 @@
 exif_i18n_convert_utf8_to_lat1 (const char *in)
 {
 	static iconv_t tr = 0;
-	unsigned int t = (in ? strlen (in) : 0);
+	size_t t = (in ? strlen (in) : 0);
 	static char buf[2048];
-	unsigned int buf_size = sizeof (buf);
+	size_t buf_size = sizeof (buf);
 	char *out = buf;
 
 	if (!in) return NULL;

[libexif-cvs] exif/exif actions.c,1.13,1.14 actions.h,1.4,1.5 main.c,1.36,1.37

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

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

Modified Files:
	actions.c actions.h main.c 
Log Message:

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

	* exif/actions.[c,h]:
	* exif/main.c: Add option --machine-readable. Patch by
	  Greg Baker (#761641).


Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- actions.h	15 Dec 2002 11:39:13 -0000	1.4
+++ actions.h	30 Sep 2003 22:43:00 -0000	1.5
@@ -27,8 +27,11 @@
 #include <libmnote/mnote-data.h>
 #endif
 
-void action_tag_table (const char *filename, ExifData *ed);
-void action_tag_list  (const char *filename, ExifData *ed, unsigned char ids);
+void action_tag_table        (const char *filename, ExifData *);
+void action_tag_list         (const char *filename, ExifData *,
+			      unsigned char ids);
+void action_tag_list_machine (const char *filename, ExifData *,
+			      unsigned char ids);
 
 #ifdef HAVE_MNOTE
 void action_ntag_table (const char *filename, MNoteData *en);

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- actions.c	5 May 2003 21:13:44 -0000	1.13
+++ actions.c	30 Sep 2003 22:43:00 -0000	1.14
@@ -179,6 +179,35 @@
         }
 }
 
+static void
+show_entry_machine (ExifEntry *entry, void *data)
+{
+	unsigned char *ids = data;
+
+	if (*ids) fprintf (stdout, "0x%04x", entry->tag);
+	else fprintf (stdout, "%s", exif_tag_get_title (entry->tag));
+	printf ("\t");
+	if (*ids) fprintf (stdout, "%s", exif_entry_get_value (entry));
+	else fprintf (stdout, "%s", exif_entry_get_value (entry));
+	fputc ('\n', stdout);
+}
+
+static void
+show_ifd_machine (ExifContent *content, void *data)
+{
+	exif_content_foreach_entry (content, show_entry_machine, data);
+}
+
+void
+action_tag_list_machine (const char *filename, ExifData *ed, unsigned char ids)
+{
+	if (!ed) return;
+
+	exif_data_foreach_content (ed, show_ifd_machine, &ids);
+	if (ed->size)
+		fprintf (stdout, _("ThumbnailSize\t%i\n"), ed->size);
+}
+
 #ifdef HAVE_MNOTE
 
 void

Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- main.c	21 Aug 2003 20:55:52 -0000	1.36
+++ main.c	30 Sep 2003 22:43:00 -0000	1.37
@@ -225,7 +225,7 @@
  * with the "SGI MIPSpro C compiler". I don't understand and still think
  * these variables belong into main ().
  */
-static unsigned int list_tags = 0, show_description = 0;
+static unsigned int list_tags = 0, show_description = 0, machine_readable = 0;
 static unsigned int extract_thumbnail = 0, remove_thumbnail = 0;
 static unsigned int remove_tag = 0;
 #ifdef HAVE_MNOTE
@@ -283,6 +283,9 @@
 		 N_("Write data to FILE"), N_("FILE")},
 		{"set-value", '\0', POPT_ARG_STRING, &set_value, 0,
 		 N_("Value"), NULL},
+		{"machine-readable", 'm', POPT_ARG_NONE, &machine_readable, 0,
+		 N_("Output in a machine-readable (tab delimited) format"),
+		 NULL},
 		POPT_TABLEEND};
 	ExifData *ed;
 	ExifEntry *e;
@@ -625,6 +628,8 @@
 				/* Save modified data. */
 				save_exif_data_to_file (ed, *args, fname);
 
+			} else if (machine_readable) {
+				action_tag_list_machine (*args, ed, eo.use_ids);
 			} else
 				action_tag_list (*args, ed, eo.use_ids);
 			exif_data_unref (ed);

[libexif-cvs] exif ChangeLog,1.30,1.31

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* exif/actions.[c,h]:
	* exif/main.c: Add option --machine-readable. Patch by
	  Greg Baker (#761641).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ChangeLog	21 Aug 2003 20:55:52 -0000	1.30
+++ ChangeLog	30 Sep 2003 22:43:00 -0000	1.31
@@ -1,3 +1,9 @@
+2003-10-01  Lutz Mueller <lu...@us...>
+
+	* exif/actions.[c,h]:
+	* exif/main.c: Add option --machine-readable. Patch by
+	  Greg Baker (#761641).
+
 2003-08-21  Lutz Mueller <lu...@us...>
 
 	* exif/exif-main.c: Patch by Roberto Costa <rob...@en...>

[libexif-cvs] exif/libjpeg jpeg-data.c,1.7,1.8

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

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

Modified Files:
	jpeg-data.c 
Log Message:


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-data.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jpeg-data.c	17 Sep 2003 11:30:26 -0000	1.7
+++ jpeg-data.c	28 Sep 2003 18:01:00 -0000	1.8
@@ -206,6 +206,7 @@
 		jpeg_data_append_section (data);
 		s = &data->sections[data->count - 1];
 		s->marker = marker;
+		s->content.generic.data = NULL;
 		o += i + 1;
 
 		switch (s->marker) {
@@ -216,7 +217,9 @@
 
 			/* Read the length of the section */
 			len = ((d[o] << 8) | d[o + 1]) - 2;
+			if (len > size) { o = size; break; }
 			o += 2;
+			if (o + len > size) { o = size; break; }
 
 			switch (s->marker) {
 			case JPEG_MARKER_APP1:

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

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

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

Modified Files:
	jpeg-data.c 
Log Message:


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jpeg-data.c	17 Sep 2003 11:31:06 -0000	1.12
+++ jpeg-data.c	28 Sep 2003 18:00:06 -0000	1.13
@@ -206,6 +206,7 @@
 		jpeg_data_append_section (data);
 		s = &data->sections[data->count - 1];
 		s->marker = marker;
+		s->content.generic.data = NULL;
 		o += i + 1;
 
 		switch (s->marker) {
@@ -216,7 +217,9 @@
 
 			/* Read the length of the section */
 			len = ((d[o] << 8) | d[o + 1]) - 2;
+			if (len > size) { o = size; break; }
 			o += 2;
+			if (o + len > size) { o = size; break; }
 
 			switch (s->marker) {
 			case JPEG_MARKER_APP1:

[libexif-cvs] gexif/libjpeg jpeg-data.c,1.9,1.10

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

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

Modified Files:
	jpeg-data.c 
Log Message:


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/gexif/libjpeg/jpeg-data.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jpeg-data.c	17 Sep 2003 11:30:35 -0000	1.9
+++ jpeg-data.c	28 Sep 2003 17:59:40 -0000	1.10
@@ -206,6 +206,7 @@
 		jpeg_data_append_section (data);
 		s = &data->sections[data->count - 1];
 		s->marker = marker;
+		s->content.generic.data = NULL;
 		o += i + 1;
 
 		switch (s->marker) {
@@ -216,7 +217,9 @@
 
 			/* Read the length of the section */
 			len = ((d[o] << 8) | d[o + 1]) - 2;
+			if (len > size) { o = size; break; }
 			o += 2;
+			if (o + len > size) { o = size; break; }
 
 			switch (s->marker) {
 			case JPEG_MARKER_APP1:

[libexif-cvs] libexif ChangeLog,1.73,1.74 Makefile.am,1.22,1.23 configure.in,1.54,1.55

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

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

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

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

	* Makefile.am
	* configure.in: Patch #813420 by Chris Meyer <cm...@ma...>.


Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- configure.in	24 Aug 2003 17:30:05 -0000	1.54
+++ configure.in	28 Sep 2003 17:35:13 -0000	1.55
@@ -38,10 +38,13 @@
 then
 	sed -e "s/^DOMAIN.*/DOMAIN = ${GETTEXT_PACKAGE}/" < po/Makevars.template > po/Makevars
 	AC_MSG_RESULT([yes. done.])
+	PO_DIR=po
 else
 	AC_MSG_RESULT([no])
+	PO_DIR=
 fi
 AM_GNU_GETTEXT
+AC_SUBST([PO_DIR])
 
 dnl ---------------------------------------------------------------------------
 dnl Warnings

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am	24 Aug 2003 17:40:02 -0000	1.22
+++ Makefile.am	28 Sep 2003 17:35:13 -0000	1.23
@@ -1,3 +1,3 @@
-SUBDIRS = libexif libjpeg test po
+SUBDIRS = libexif libjpeg test $(PO_DIR)
 
 EXTRA_DIST = @PACKAGE@.spec

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- ChangeLog	5 Sep 2003 14:36:44 -0000	1.73
+++ ChangeLog	28 Sep 2003 17:35:13 -0000	1.74
@@ -1,3 +1,8 @@
+2003-09-28  Lutz Mueller <lu...@us...>
+
+	* Makefile.am
+	* configure.in: Patch #813420 by Chris Meyer <cm...@ma...>.
+
 2003-09-05  Lutz Mueller <lu...@us...>
 
 	* libjpeg/jpeg-data.c: Fix memory leak (discovered by 

[libexif-cvs] libexif/libjpeg jpeg-data.c,1.11,1.12

[Arnaud L. <as...@us...>]

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

Modified Files:
	jpeg-data.c 
Log Message:
Drop EOL blanks and // comments

Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libjpeg/jpeg-data.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jpeg-data.c	5 Sep 2003 14:36:44 -0000	1.11
+++ jpeg-data.c	17 Sep 2003 11:31:06 -0000	1.12
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 struct _JPEGDataPrivate
 {

[libexif-cvs] libexif/libexif exif-content.c,1.7,1.8 exif-data.c,1.26,1.27 exif-entry.c,1.37,1.38

[Arnaud L. <as...@us...>]

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

Modified Files:
	exif-content.c exif-data.c exif-entry.c 
Log Message:
Drop EOL blanks and // comments

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- exif-content.c	15 Dec 2002 11:41:11 -0000	1.7
+++ exif-content.c	17 Sep 2003 11:31:06 -0000	1.8
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
 

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- exif-data.c	25 Aug 2003 04:44:30 -0000	1.26
+++ exif-data.c	17 Sep 2003 11:31:06 -0000	1.27
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -32,7 +32,7 @@
 #undef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
-//#define DEBUG
+/* #define DEBUG */
 
 static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
 
@@ -421,7 +421,7 @@
 					EXIF_FORMAT_LONG);
 			exif_set_long  (*d + 6 + offset + 4, data->priv->order,
 					1);
-			exif_set_long  (*d + 6 + offset + 8, data->priv->order, 
+			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
 					data->size);
 			offset += 12;
 		}
@@ -628,7 +628,7 @@
 	/*
 	 * IFD 0 offset (4 bytes, offset 10).
 	 * We will start 8 bytes after the
-	 * EXIF header (2 bytes for order, another 2 for the test, and 
+	 * EXIF header (2 bytes for order, another 2 for the test, and
 	 * 4 bytes for the IFD 0 offset make 8 bytes together).
 	 */
 	*ds += 4;
@@ -793,7 +793,7 @@
 			s = exif_get_short (e->data +
 				(i * exif_format_get_size (e->format)),
 				d->old);
-			exif_set_short (e->data + 
+			exif_set_short (e->data +
 				(i * exif_format_get_size (e->format)),
 				d->new, s);
 		}

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- exif-entry.c	6 Aug 2003 19:47:53 -0000	1.37
+++ exif-entry.c	17 Sep 2003 11:31:06 -0000	1.38
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -30,7 +30,7 @@
 #include <time.h>
 #include <math.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 #undef  MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
@@ -201,9 +201,9 @@
 	case EXIF_TAG_COPYRIGHT:
 		CF (e->format, EXIF_FORMAT_ASCII, v);
 
-		/* 
+		/*
 		 * First part: Photographer.
-		 * Some cameras store a string like "   " here. Ignore it. 
+		 * Some cameras store a string like "   " here. Ignore it.
 		 */
 		if (e->size && e->data &&
 		    (strspn (e->data, " ") != strlen ((char *) e->data)))
@@ -313,9 +313,9 @@
 		CF (e->format, EXIF_FORMAT_SRATIONAL, v);
 		CC (e->components, 1, v);
 		v_srat = exif_get_srational (e->data, o);
-		snprintf (v, sizeof (v), "%i/%i", (int) v_srat.numerator, 
+		snprintf (v, sizeof (v), "%i/%i", (int) v_srat.numerator,
 						  (int) v_srat.denominator);
-		//FIXME: How do I calculate the APEX value?
+		/* FIXME: How do I calculate the APEX value? */
 		break;
 	case EXIF_TAG_METERING_MODE:
 		CF (e->format, EXIF_FORMAT_SHORT, v);
@@ -586,10 +586,10 @@
 		}
 		break;
 	case EXIF_TAG_COLOR_SPACE:
-		CF (e->format, EXIF_FORMAT_SHORT, v); 
-		CC (e->components, 1, v); 
-		v_short = exif_get_short (e->data, o); 
-		switch (v_short) { 
+		CF (e->format, EXIF_FORMAT_SHORT, v);
+		CC (e->components, 1, v);
+		v_short = exif_get_short (e->data, o);
+		switch (v_short) {
 		case 1:
 			strncpy (v, _("sRGB"), sizeof (v));
 			break;
@@ -602,7 +602,7 @@
 		}
 		break;
 	case EXIF_TAG_FLASH:
-		CF (e->format, EXIF_FORMAT_SHORT, v); 
+		CF (e->format, EXIF_FORMAT_SHORT, v);
 		CC (e->components, 1, v);
 		v_short = exif_get_short (e->data, o);
 		switch (v_short) {
@@ -1006,7 +1006,7 @@
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator)
 			return (NULL);
-		
+
 		/*
 		 * For calculation of the 35mm equivalent,
 		 * Minolta cameras need a multiplier that depends on the
@@ -1160,7 +1160,7 @@
 		}
 		break;
 	case EXIF_TAG_FLASH:
-		CF (e->format, EXIF_FORMAT_SHORT, v); 
+		CF (e->format, EXIF_FORMAT_SHORT, v);
 		CC (e->components, 1, v);
 		v_short = exif_get_short (e->data, o);
 		switch (v_short) {
@@ -1241,7 +1241,7 @@
 		e->data = malloc (e->size);
 		exif_set_short (e->data, o, 0);
 		break;
-	
+
 	/* SHORT, 1 component, default 1 */
         case EXIF_TAG_ORIENTATION:
         case EXIF_TAG_PLANAR_CONFIGURATION:
@@ -1305,7 +1305,7 @@
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
 		memset (e->data, 0, e->size);
-		break; 
+		break;
 
 	/* RATIONAL, 1 component, no default */
 	case EXIF_TAG_EXPOSURE_TIME:
@@ -1374,7 +1374,7 @@
 		exif_set_rational (
 			e->data + 5 * exif_format_get_size (e->format), o, r);
 		break;
-	
+
 	/* ASCII, 20 components */
 	case EXIF_TAG_DATE_TIME:
 	case EXIF_TAG_DATE_TIME_ORIGINAL:
@@ -1385,12 +1385,12 @@
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = malloc (e->size);
-		snprintf ((char *) e->data, e->size, 
+		snprintf ((char *) e->data, e->size,
 			  "%04i:%02i:%02i %02i:%02i:%02i",
 			  tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
 			  tm->tm_hour, tm->tm_min, tm->tm_sec);
 		break;
-	
+
 	/* ASCII, no default */
 	case EXIF_TAG_SUB_SEC_TIME:
 	case EXIF_TAG_SUB_SEC_TIME_ORIGINAL:

[libexif-cvs] gexif/libjpeg jpeg-data.c,1.8,1.9

[Arnaud L. <as...@us...>]

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

Modified Files:
	jpeg-data.c 
Log Message:
Drop EOL blanks and // comments

Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/gexif/libjpeg/jpeg-data.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jpeg-data.c	5 Sep 2003 14:37:40 -0000	1.8
+++ jpeg-data.c	17 Sep 2003 11:30:35 -0000	1.9
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 struct _JPEGDataPrivate
 {

[libexif-cvs] exif/libjpeg jpeg-data.c,1.6,1.7

[Arnaud L. <as...@us...>]

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

Modified Files:
	jpeg-data.c 
Log Message:
Drop EOL blanks and // comments

Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-data.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jpeg-data.c	5 Sep 2003 14:37:15 -0000	1.6
+++ jpeg-data.c	17 Sep 2003 11:30:26 -0000	1.7
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 struct _JPEGDataPrivate
 {

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

[Arnaud L. <as...@us...>]

Update of /cvsroot/libexif/libmnote/libmnote/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv24005/libmnote/canon

Modified Files:
	mnote-canon-data.c mnote-canon-entry.c 
Log Message:
Drop EOL blanks and // comments

Index: mnote-canon-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/canon/mnote-canon-data.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mnote-canon-data.c	29 Aug 2003 11:18:21 -0000	1.7
+++ mnote-canon-data.c	17 Sep 2003 11:25:59 -0000	1.8
@@ -1,17 +1,17 @@
 /* mnote-canon-data.c
  *
  * Copyright © 2002 Lutz Müller <lu...@us...>
- * Copyright © 2003 Matthieu Castet <ma...@us...> 
+ * Copyright © 2003 Matthieu Castet <ma...@us...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -30,14 +30,14 @@
 #include <libexif/exif-utils.h>
 #include <libexif/exif-data.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 static void
 mnote_canon_data_free (MNoteData *n)
 {
         MNoteCanonData *note = (MNoteCanonData *) n;
         unsigned int i;
-        
+
         if (note->entries) {
                 for (i = 0; i < note->count; i++)
                         mnote_canon_entry_unref (note->entries[i]);
@@ -50,7 +50,7 @@
 static char *
 mnote_canon_data_get_value (MNoteData *n, MNoteTag t)
 {
-	
+
         char *value = NULL;
         unsigned int i, count;
 
@@ -63,7 +63,7 @@
                 }
         }
 
-        return (value);	
+        return (value);
 }
 
 static void
@@ -77,10 +77,10 @@
 
 static void
 mnote_canon_data_add_entry (MNoteCanonData *note, MNoteCanonEntry *entry)
-{               
+{
         if (!note || !entry)
-                return;                            
-                
+                return;
+
         entry->parent = note;
         note->entries = realloc (note->entries,
                                 sizeof (MNoteCanonEntry) * (note->count + 1));
@@ -94,13 +94,13 @@
                                             MNoteCanonEntry *entry,
                                             const unsigned char *d,
                                             unsigned int size, unsigned int offset,
-				            const unsigned char *exifdata, 
+				            const unsigned char *exifdata,
 					    unsigned int exifsize)
 {
         unsigned int s, doff, sizetmp = size;
 	const unsigned char *temp = d;
         ExifByteOrder order = mnote_data_get_byte_order ((MNoteData *) note);
-	
+
         entry->tag        = exif_get_short (d + offset + 0, order);
         entry->format     = exif_get_short (d + offset + 2, order);
         entry->components = exif_get_long  (d + offset + 4, order);
@@ -113,7 +113,7 @@
         if (!s)
                 return;
         if (s > 4)
-        {        
+        {
 		doff = exif_get_long (d + offset + 8, order) + 0xC;
 		sizetmp = exifsize;
 		temp = exifdata;
@@ -132,10 +132,10 @@
                 return;
         entry->size = s;
         memcpy (entry->data, temp + doff, s);
-		
+
 }
 
-static void                
+static void
 mnote_canon_data_load_data_entry (MNoteCanonData *note,
                                    MNoteCanonEntry *entry,
                                    const unsigned char *d,
@@ -143,7 +143,7 @@
 {
         unsigned int s, doff;
         ExifByteOrder order = mnote_data_get_byte_order ((MNoteData *) note);
-        
+
         entry->tag        = exif_get_short (d + offset + 0, order);
         entry->format     = exif_get_short (d + offset + 2, order);
         entry->components = exif_get_long  (d + offset + 4, order);
@@ -156,7 +156,7 @@
         if (!s)
                 return;
         if (s > 4)
-                //FIXME works on g3, but other should send exif data...
+                /* FIXME works on g3, but other should send exif data... */
 		doff = exif_get_long (d + offset + 8, order)-0x3B0 ;
         else
                 doff = offset + 8;
@@ -180,7 +180,7 @@
 			   unsigned int size_exif)
 {
 	MNoteCanonData *data = (MNoteCanonData *) ne;
-	
+
 	const unsigned char *d = d_exif;
 	ExifData *ed = NULL;
 	ExifEntry *e = NULL;
@@ -190,19 +190,19 @@
 	unsigned int size = size_exif;
 	MNoteCanonEntry *entry;
 	MNoteCanonTag tag;
-	
+
 	if (!data)
 		return;
 	if (!d_exif || !size_exif)
 		return;
-		
+
 	/* If we got EXIF data, go to the MakerNote tag. */
 	ed = exif_data_new_from_data (d_exif, size);
 	if (ed) {
 		e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
 					    EXIF_TAG_MAKER_NOTE);
 		if (e)
-		{ 
+		{
 			d = e->data;
 			size = e->size;
 			order = exif_data_get_byte_order (ed);
@@ -211,13 +211,13 @@
 #endif
 		}
 	}
-	
+
 	mnote_data_set_byte_order (ne,order);
 
 #ifdef DEBUG
 	printf ("Parsing %i byte(s) Mnote data...\n", size);
 #endif
-#ifdef DEBUG    
+#ifdef DEBUG
         int j;
         for (j=0;j<size;j++)
         {
@@ -226,57 +226,57 @@
 
         printf("\n%d\n",size);
         printf("%d\n",order);
-#endif	
-	
+#endif
+
 	/* Read the number of entries */
 	n = exif_get_short (d ,order);
 #ifdef DEBUG
 	printf ("Loading %i entries...\n", n);
-#endif	
+#endif
 	d+=2;
 	size-=2;
-	
+
 	if ( 12 * n > size )
-		return;	
-	
+		return;
+
 	for (i = 0; i < n; i++) {
 
 		tag = exif_get_short (d + 12 * i, order);
 #ifdef DEBUG
 		printf ("Loading entry '%s' (%i of %i)...\n",
 			mnote_canon_tag_get_name (tag), i + 1, n);
-#endif	
+#endif
                 entry = mnote_canon_entry_new ();
 		mnote_canon_data_add_entry (data, entry);
-		if (e) //we have exif data
+		if (e) /* we have exif data */
 			mnote_canon_data_load_data_entry_with_exif (data, entry,
-					         d, size, 12 * i, 
+					         d, size, 12 * i,
 						 d_exif, size_exif);
 		else
 			mnote_canon_data_load_data_entry (data, entry, d, size,
 					    12 * i);
-		mnote_canon_entry_unref (entry);	
+		mnote_canon_entry_unref (entry);
 	}
 	exif_data_unref (ed);
 
 }
 
-static unsigned int 
+static unsigned int
 mnote_canon_get_count (MNoteData *n)
 {
         MNoteCanonData *note = (MNoteCanonData *) n;
-        
+
         return (note->count);
 }
 
-static MNoteEntry * 
+static MNoteEntry *
 mnote_canon_get_entry (MNoteData *n, MNoteTag t)
 {
         MNoteCanonData *note = (MNoteCanonData *) n;
         MNoteCanonTag tag = (MNoteCanonTag) t;
         unsigned int i;
         MNoteEntry *entry = NULL;
-        
+
         for (i = 0; !entry && i < note->count; i++) {
                 if (note->entries[i]->tag == tag) {
                         entry = note->entries[i];
@@ -321,6 +321,6 @@
 	((MNoteData *) note)->methods.get_tag_description = mnote_canon_tag_get_description;
 	((MNoteData *) note)->methods.get_value = mnote_canon_data_get_value;
 	((MNoteData *) note)->methods.dump_entry = mnote_canon_entry_dump;
-	
+
 	return ((MNoteData *) note);
 }

Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/canon/mnote-canon-entry.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mnote-canon-entry.c	29 Aug 2003 11:18:21 -0000	1.7
+++ mnote-canon-entry.c	17 Sep 2003 11:25:59 -0000	1.8
@@ -8,10 +8,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -31,7 +31,7 @@
 #include <libexif/exif-format.h>
 #include <libexif/exif-utils.h>
 
-//#define DEBUG
+/* #define DEBUG */
 
 struct _MNoteCanonEntryPrivate {
 	unsigned int ref_count;
@@ -171,8 +171,8 @@
         order = mnote_data_get_byte_order ((MNoteData *) &entry->parent->parent);
 #ifdef DEBUG
 	printf ("Processing Tag %x\n",entry->tag);
-#endif        	
-	switch (entry->tag) {	
+#endif
+	switch (entry->tag) {
 	case MNOTE_CANON_TAG_SETTINGS_1:
 		CF (entry->format, EXIF_FORMAT_SHORT, v);
 		n = exif_get_short (data, order)/2;
@@ -181,7 +181,7 @@
 #ifdef DEBUG
 		printf ("Setting1 size %d %d\n",n,entry->size);
 #endif
-		for (i=1;i<n;i++) 
+		for (i=1;i<n;i++)
 		{
 			vs = exif_get_short (data, order);
 			data+=2;
@@ -199,7 +199,7 @@
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
                 		}
-				break;	 
+				break;
 			case 2:
 				if (vs)
 				{
@@ -233,7 +233,7 @@
                         		break;
 				case 16:
                         		strncat (v, _("external"), sizeof (v) - 1 - strlen(v));
-                        		break;	
+                        		break;
 				default:
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -276,12 +276,12 @@
                         		break;
 				case 6:
                         		strncat (v, _("MF"), sizeof (v) - 1 - strlen(v));
-                        		break;	
+                        		break;
 				default:
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
                 		}
-				break;	
+				break;
 			case 10:
 				strncat (v, _(" / Image size : "), sizeof (v) - 1 - strlen(v));
 				switch (vs) {
@@ -337,7 +337,7 @@
                         		break;
 				case 11:
                         		strncat (v, _("Pan Focus"), sizeof (v) - 1 - strlen(v));
-                        		break;	
+                        		break;
 				default:
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -413,7 +413,7 @@
                         			break;
 					case 19:
                         			strncat (v, _("400"), sizeof (v) - 1 - strlen(v));
-                        			break;	
+                        			break;
 					default:
                         			snprintf (buf, sizeof (buf), "%i???", vs);
 						strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -480,7 +480,7 @@
                         		break;
 				case 5:
                         		strncat (v, _("A-DEP"), sizeof (v) - 1 - strlen(v));
-                        		break;	
+                        		break;
 				default:
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -493,7 +493,7 @@
 			case 24:
 				snprintf (buf, sizeof (buf), " / %s : %u", _("short focal length of lens (in focal units)"), vs);
 				strncat (v,buf, sizeof (v) - 1 - strlen(v));
-				break;	
+				break;
 			case 25:
 				snprintf (buf, sizeof (buf), " / %s : %u", _("focal units per mm"), vs);
 				strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -508,7 +508,7 @@
                         		strncat (v, _("FP sync used"), sizeof (v) - 1 - strlen(v));
 				if ((vs>>4)&1)
                         		strncat (v, _("FP sync enabled"), sizeof (v) - 1 - strlen(v));
-#ifdef DEBUG									
+#ifdef DEBUG
                         	printf ("Value29=0x%08x\n", vs);
 #endif
 				break;
@@ -527,15 +527,15 @@
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
                 		}
 				break;
-#ifdef DEBUG						
-			default:			
+#ifdef DEBUG
+			default:
                         	printf ("Value%d=%d\n", i, vs);
 #endif
 			}
-		}	
-			
+		}
+
                 break;
-		
+
 	case MNOTE_CANON_TAG_SETTINGS_2:
 		CF (entry->format, EXIF_FORMAT_SHORT, v);
 		n = exif_get_short (data, order)/2;
@@ -544,7 +544,7 @@
 #ifdef DEBUG
 		printf ("Setting2 size %d %d\n",n,entry->size);
 #endif
-		for (i=1;i<n;i++) 
+		for (i=1;i<n;i++)
 		{
 			vs = exif_get_short (data, order);
 			data+=2;
@@ -572,7 +572,7 @@
                         		break;
 				case 6:
                         		strncat (v, _("Custom"), sizeof (v) - 1 - strlen(v));
-                        		break;	
+                        		break;
 				default:
                         		snprintf (buf, sizeof (buf), "%i???", vs);
 					strncat (v,buf, sizeof (v) - 1 - strlen(v));
@@ -581,7 +581,7 @@
 			case 9:
 				snprintf (buf, sizeof (buf), " / %s : %u", _("Sequence number"), vs);
 				strncat (v, buf, sizeof (v) - 1 - strlen(v));
-				
+
 				break;
 			case 14:
 				if (vs>>12)
@@ -596,60 +596,60 @@
 					snprintf (buf, sizeof (buf), " (%u %s)", vs>>12, _("available focus point"));
 					strncat (v, buf, sizeof (v) - 1 - strlen(v));
 				}
-#ifdef DEBUG									
+#ifdef DEBUG
                         	printf ("0x%08x\n", vs);
 #endif
 				break;
 			case 15:
 				snprintf (buf, sizeof (buf), " / %s : %.2f EV", _("Flash bias"), vs/32.0);
 				strncat (v, buf, sizeof (v) - 1 - strlen(v));
-				
+
 				break;
 			case 19:
 			        snprintf (buf, sizeof (buf), " / %s : %u", _("Subject Distance (mm)"), vs);
 				strncat (v,buf, sizeof (v) - 1 - strlen(v));
-				break;			
+				break;
 #ifdef DEBUG
                         default:
                         	printf ("Value%d=%d\n", i, vs);
 #endif
 			}
-		}		
-		
+		}
+
 		break;
-		
+
 	case MNOTE_CANON_TAG_IMAGE_TYPE:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
 		CC (entry->components, 32, v);
 		strncpy (v,data,sizeof (v));
 		break;
-	
+
 	case MNOTE_CANON_TAG_FIRMWARE:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
 		CC (entry->components, 24, v);
 		strncpy (v,data,sizeof (v));
 		break;
-		
+
 	case MNOTE_CANON_TAG_IMAGE_NUMBER:
 		CF (entry->format, EXIF_FORMAT_LONG, v);
 		CC (entry->components, 1, v);
 		vl = exif_get_long (data, order);
 		snprintf (v, sizeof (v), "%03lu-%04lu", vl/10000,vl%10000);
 		break;
-	
+
 	case MNOTE_CANON_TAG_OWNER:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
 		CC (entry->components, 32, v);
 		strncpy (v,data,sizeof (v));
 		break;
-		
+
 	case MNOTE_CANON_TAG_SERIAL_NUMBER:
 		CF (entry->format, EXIF_FORMAT_LONG, v);
 		CC (entry->components, 1, v);
 		vl = exif_get_long (data, order);
 		snprintf (v, sizeof (v), "%04X-%05d", (int)vl>>16,(int)vl&0xffff);
 		break;
-		
+
 	case MNOTE_CANON_TAG_CUSTOM_FUNCS:
 		CF (entry->format, EXIF_FORMAT_SHORT, v);
 		n = exif_get_short (data, order)/2;
@@ -658,13 +658,13 @@
 #ifdef DEBUG
 		printf ("Custom Function size %d %d\n",n,entry->size);
 #endif
-		for (i=1;i<n;i++) 
+		for (i=1;i<n;i++)
 		{
 			vs = exif_get_short (data, order);
 			data += 2;
 			snprintf (buf, sizeof(buf), "C.F%d : %u", i, vs);
 			strncat (v,buf, sizeof (v) - 1 - strlen(v));
-		}		
+		}
 		break;
 
 	default:
@@ -685,7 +685,7 @@
 			strncpy (v, data, sizeof (v));
 #endif
 		break;
-        }       
-                
+        }
+
         return strdup (v);
 }

[libexif-cvs] libmnote/libmnote/olympus mnote-olympus-data.c,1.5,1.6 mnote-olympus-entry.c,1.6,1.7

[Arnaud L. <as...@us...>]

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

Modified Files:
	mnote-olympus-data.c mnote-olympus-entry.c 
Log Message:
Drop EOL blanks and // comments

Index: mnote-olympus-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-data.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mnote-olympus-data.c	25 Aug 2003 21:00:24 -0000	1.5
+++ mnote-olympus-data.c	17 Sep 2003 11:25:59 -0000	1.6
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -79,18 +79,18 @@
 }
 
 #ifdef DEBUG
-// Look at memory around p
+/* 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
 
@@ -123,8 +123,8 @@
         if (!s)
                 return;
         if (s > 4) {
-        
-        		/* 
+
+        		/*
         			THIS DOES NOT WORK!
         			The problem is that d points to the first MakerNote Tag.
         			According to the EXIF 2.1 spec, it should point to the
@@ -147,11 +147,11 @@
                 doff = offset + 8;
                	d_orig = d + doff;
         }
-        
+
 
         /* Sanity check */
         /* This doesn't work if the data is outside the tag!! */
-        if ((s <= 4) && (size < doff + s)) 
+        if ((s <= 4) && (size < doff + s))
                 return;
 
         entry->data = malloc (sizeof (char) * s);
@@ -192,7 +192,7 @@
 	if ((size < 22) || memcmp (p, "OLYMP", 5)) {
 		exif_data_unref (ed);
 		return;
-	} 
+	}
 
 	nEntries = exif_get_short (p + 8, o);
 	tagEntries = p + 10;

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-entry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mnote-olympus-entry.c	29 Aug 2003 09:36:19 -0000	1.6
+++ mnote-olympus-entry.c	17 Sep 2003 11:25:59 -0000	1.7
@@ -7,10 +7,10 @@
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
@@ -101,7 +101,7 @@
 
 	char buf[1024];
 	unsigned int i;
-	
+
 	for (i = 0; i < 2 * indent; i++)
 		buf[i] = ' ';
 	buf[i] = '\0';
@@ -192,11 +192,11 @@
 		vl = exif_get_long (entry->data + 4, order);
 		switch (vl) {
 		case 1:
-			strncat (v, _("left to right"), 
+			strncat (v, _("left to right"),
 					sizeof (v) - 1 - strlen(v));
 			break;
 		case 2:
-			strncat (v, _("right to left"), 
+			strncat (v, _("right to left"),
 					sizeof (v) - 1 - strlen(v));
 			break;
 		case 3:
@@ -323,7 +323,7 @@
 		}
 		else {
 			unsigned long tmp = vr.numerator / vr.denominator;
-//			printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator);
+			/* printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); */
 			snprintf (v, sizeof (v), "%li mm", tmp);
 		}
 		break;
@@ -387,10 +387,10 @@
 				else {
 					strncpy (v, _("Manual: Unknown"), sizeof (v));
 				}
-					
+
 			}
 			break;
-		case 3: 
+		case 3:
 			strncpy (v, _("One-touch"), sizeof (v));
 			break;
 		default: