libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/po cs.po,1.17,1.18

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

Update of /cvsroot/libexif/libexif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12335

Modified Files:
	cs.po 
Log Message:
Minor changes


Index: cs.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/cs.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -d -r1.17 -r1.18
--- cs.po	23 Sep 2009 06:45:19 -0000	1.17
+++ cs.po	6 Oct 2009 04:42:46 -0000	1.18
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.18-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 22:05-0700\n"
-"PO-Revision-Date: 2009-09-22 07:00+0000\n"
+"POT-Creation-Date: 2009-10-01 22:54-0700\n"
+"PO-Revision-Date: 2009-10-06 07:00+0000\n"
 "Last-Translator: Jan Patera <pa...@us...>\n"
 "Language-Team: Czech <tra...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgid "Invalid number of components (%i,
[...1246 lines suppressed...]
 
 #: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:427
+#: libexif/pentax/mnote-pentax-entry.c:439
 #, c-format
 msgid "%i bytes unknown data"
 msgstr "%i bajtů neznámých dat"
@@ -4666,12 +4664,6 @@ msgstr "Rychlý"
 msgid "panorama"
 msgstr "Panorama"
 
-#: libexif/olympus/mnote-olympus-entry.c:597
-#: libexif/olympus/mnote-olympus-entry.c:617
-#, c-format
-msgid "%li"
-msgstr "%li"
-
 #: libexif/olympus/mnote-olympus-entry.c:605
 msgid "left to right"
 msgstr "Zleva doprava"

[libexif-cvs] libexif/libexif Makefile.am,1.42,1.43

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14943/libexif

Modified Files:
	Makefile.am 
Log Message:
Added exif.h to the source tarball so users can generate full
Doxygen documentation.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -d -r1.42 -r1.43
--- Makefile.am	23 Dec 2008 08:24:46 -0000	1.42
+++ Makefile.am	2 Oct 2009 06:35:29 -0000	1.43
@@ -60,7 +60,7 @@ libexifinclude_HEADERS = 	\
 	exif-utils.h		\
 	_stdint.h
 
-EXTRA_DIST += exif-system.h
+EXTRA_DIST += exif-system.h exif.h
 
 EXTRA_DIST += libexif.sym
 

[libexif-cvs] libexif ChangeLog,1.323,1.324

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14943

Modified Files:
	ChangeLog 
Log Message:
Added exif.h to the source tarball so users can generate full
Doxygen documentation.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -p -d -r1.323 -r1.324
--- ChangeLog	2 Oct 2009 05:44:01 -0000	1.323
+++ ChangeLog	2 Oct 2009 06:35:27 -0000	1.324
@@ -2,6 +2,8 @@
 
 	* Bumped the library minor version number because of the addition
 	  of exif_loader_get_buf()
+	* Added exif.h to the source tarball so users can generate full
+	  Doxygen documentation.
 
 2009-09-30  Dan Fandrich <da...@co...>
 

[libexif-cvs] libexif ChangeLog, 1.322, 1.323 configure.ac, 1.52, 1.53

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7210

Modified Files:
	ChangeLog configure.ac 
Log Message:
Bumped the library minor version number because of the addition
of exif_loader_get_buf()


Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -d -r1.52 -r1.53
--- configure.ac	3 Jun 2009 19:21:24 -0000	1.52
+++ configure.ac	2 Oct 2009 05:44:01 -0000	1.53
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.17.1], [lib...@li...], [libexif])
+AC_INIT([EXIF library], [0.6.17.2], [lib...@li...], [libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
@@ -27,7 +27,7 @@ GP_CONFIG_MSG([Source code location],[${
 dnl ---------------------------------------------------------------------------
 dnl Advanced information about versioning:
 dnl   * "Writing shared libraries" by Mike Hearn
-dnl         http://navi.cx/~mike/writing-shared-libraries.html
+dnl         http://plan99.net/~mike/writing-shared-libraries.html
 dnl   * libtool.info chapter "Versioning"
 dnl   * libtool.info chapter "Updating library version information"
 dnl ---------------------------------------------------------------------------
@@ -51,9 +51,10 @@ dnl 12:0:1   0.6.13
 dnl 13:1:0   added EXIF_DATA_OPTION_DONT_CHANGE_MAKER_NOTE (for 0.6.14)
 dnl 14:2:0   added XP_ WinXP tags (for 0.6.15)
 dnl 14:2:1   0.6.17
-LIBEXIF_CURRENT=14
-LIBEXIF_AGE=2
-LIBEXIF_REVISION=1
+dnl 15:3:0   added exif_loader_get_buf (for 0.6.18)
+LIBEXIF_CURRENT=15
+LIBEXIF_AGE=3
+LIBEXIF_REVISION=0
 AC_SUBST([LIBEXIF_AGE])
 AC_SUBST([LIBEXIF_REVISION])
 AC_SUBST([LIBEXIF_CURRENT])

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -p -d -r1.322 -r1.323
--- ChangeLog	1 Oct 2009 05:07:12 -0000	1.322
+++ ChangeLog	2 Oct 2009 05:44:01 -0000	1.323
@@ -1,3 +1,8 @@
+2009-10-01  Dan Fandrich <da...@co...>
+
+	* Bumped the library minor version number because of the addition
+	  of exif_loader_get_buf()
+
 2009-09-30  Dan Fandrich <da...@co...>
 
 	* Added a new public API function, exif_loader_get_buf(), which

[libexif-cvs] exif/exif actions.c, 1.44, 1.45 actions.h, 1.11, 1.12 main.c, 1.74, 1.75

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15439/exif

Modified Files:
	actions.c actions.h main.c 
Log Message:
Added --width option to allow setting width of output


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -d -r1.74 -r1.75
--- main.c	1 Oct 2009 06:10:39 -0000	1.74
+++ main.c	1 Oct 2009 06:50:34 -0000	1.75
@@ -48,6 +48,12 @@
 #include <mcheck.h>
 #endif
 
+/*! The minimum width of output that we can support */
+#define MIN_WIDTH 52
+
+/*! A sane limit on output width */
+#define MAX_WIDTH 9999
+
 /* Old versions of popt.h don't define POPT_TABLEEND */
 #ifndef POPT_TABLEEND
 #  define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
@@ -174,7 +180,8 @@ static unsigned int list_mnote = 0;
 static unsigned int show_version = 0;
 static const char *output = NULL;
 static const char *ifd_string = NULL, *tag_string = NULL;
-static ExifParams p = {EXIF_INVALID_TAG, EXIF_IFD_COUNT, 0, 0, NULL, NULL,NULL};
+static ExifParams p = {EXIF_INVALID_TAG, EXIF_IFD_COUNT, 0, 0, 80,
+		      		   NULL, NULL,NULL};
 LogArg log_arg = {0, 0, 0};
 
 int
@@ -218,6 +225,8 @@ main (int argc, const char **argv)
 		{"machine-readable", 'm', POPT_ARG_NONE, &p.machine_readable, 0,
 		 N_("Output in a machine-readable (tab delimited) format"),
 		 NULL},
+		{"width", 'w', POPT_ARG_INT, &p.width, 0,
+		 N_("Width of output"), N_("WIDTH")},
 		{"xml-output", 'x', POPT_ARG_NONE, &xml_output, 0,
 		 N_("Output in a XML format"),
 		 NULL},
@@ -251,7 +260,10 @@ main (int argc, const char **argv)
 
 	ctx = poptGetContext (PACKAGE, argc, argv, options, 0);
 	poptSetOtherOptionHelp (ctx, _("[OPTION...] file"));
-	while (poptGetNextOpt (ctx) > 0);
+	while (poptGetNextOpt (ctx) > 0)
+		;
+
+	p.width = MIN(MAX_WIDTH, MAX(MIN_WIDTH, p.width));
 
 	log = exif_log_new ();
 	exif_log_set_func (log, log_func, &log_arg);

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -d -r1.44 -r1.45
--- actions.c	29 Sep 2009 04:31:04 -0000	1.44
+++ actions.c	1 Oct 2009 06:50:34 -0000	1.45
@@ -35,9 +35,6 @@
 
 #define TAG_VALUE_BUF 1024
 
-/* TODO: make this a member of ExifParams */
-#define SCREEN_WIDTH 80
-
 static void
 convert_arg_to_entry (const char *set_value, ExifEntry *e, ExifByteOrder o, ExifLog *log)
 {
@@ -400,7 +397,7 @@ action_tag_table (ExifData *ed, ExifPara
 		if (!name)
 			continue;
 
-		fieldwidth = width = SCREEN_WIDTH - 38 - 13;
+		fieldwidth = width = p.width - 38 - 13;
 		bytes = exif_mbstrlen(C(name), &width);
 		printf ("  0x%04x %.*s%*s",
 			tag, bytes, C(name), fieldwidth-width, "");
@@ -416,13 +413,13 @@ action_tag_table (ExifData *ed, ExifPara
 static void
 show_entry_list (ExifEntry *e, void *data)
 {
-	unsigned char *ids = data;
+	const ExifParams *p = data;
 	char v[TAG_VALUE_BUF];
 	ExifIfd ifd = exif_entry_get_ifd (e);
 	const char *str;
 	size_t fieldwidth, width, bytes;
 
-	if (*ids)
+	if (p->use_ids)
 		printf("0x%04x", e->tag);
 	else {
 		str = C(exif_tag_get_title_in_ifd (e->tag, ifd));
@@ -432,7 +429,7 @@ show_entry_list (ExifEntry *e, void *dat
 	}
 	printf ("|");
 
-	fieldwidth = width = *ids ? SCREEN_WIDTH-8 : SCREEN_WIDTH-22;
+	fieldwidth = width = p->use_ids ? p->width-8 : p->width-22;
 	str = C(exif_entry_get_value (e, v, sizeof(v)));
 	bytes = exif_mbstrlen(str, &width);
 	printf("%.*s", bytes, str);
@@ -446,7 +443,7 @@ show_ifd (ExifContent *content, void *da
 }
 
 static void
-print_hline (unsigned char ids)
+print_hline (unsigned char ids, unsigned int screenwidth)
 {
         unsigned int i, width;
 
@@ -454,7 +451,7 @@ print_hline (unsigned char ids)
         for (i = 0; i < width; i++)
 		fputc ('-', stdout);
         fputc ('+', stdout);
-        for (i = 0; i < SCREEN_WIDTH - 2 - width; i++)
+        for (i = 0; i < screenwidth - 2 - width; i++)
 		fputc ('-', stdout);
 	fputc ('\n', stdout);
 }
@@ -504,7 +501,7 @@ action_mnote_list (ExifData *ed, ExifPar
         	if (p.use_ids) {
 			fputs (b2, stdout);
         	} else {
-			fieldwidth = width = SCREEN_WIDTH-22;
+			fieldwidth = width = p.width-22;
 			bytes = exif_mbstrlen(b2, &width);
 			printf ("%.*s", bytes, b2);
 		}
@@ -526,7 +523,7 @@ action_tag_list (ExifData *ed, ExifParam
 	printf (_("EXIF tags in '%s' ('%s' byte order):"), p.fin,
 		exif_byte_order_get_name (order));
 	fputc ('\n', stdout);
-	print_hline (p.use_ids);
+	print_hline (p.use_ids, p.width);
 
 	fieldwidth = width = p.use_ids ? 6 : 20;
 	s = _("Tag");
@@ -534,21 +531,21 @@ action_tag_list (ExifData *ed, ExifParam
 	printf ("%.*s%*s", bytes, s, fieldwidth-width, "");
 	fputc ('|', stdout);
 
-	fieldwidth = width = p.use_ids ? SCREEN_WIDTH-8 : SCREEN_WIDTH-22;
+	fieldwidth = width = p.use_ids ? p.width-8 : p.width-22;
 	s = _("Value");
 	bytes = exif_mbstrlen(s, &width);
 	printf ("%.*s", bytes, s);
         fputc ('\n', stdout);
-        print_hline (p.use_ids);
+        print_hline (p.use_ids, p.width);
 
 	if (p.ifd < EXIF_IFD_COUNT)
 		/* Show only a single IFD */
-		show_ifd(ed->ifd[p.ifd], &p.use_ids);
+		show_ifd(ed->ifd[p.ifd], &p);
 	else
 		/* Show contents of all IFDs */
-		exif_data_foreach_content (ed, show_ifd, &p.use_ids);
+		exif_data_foreach_content (ed, show_ifd, &p);
 
-        print_hline (p.use_ids);
+        print_hline (p.use_ids, p.width);
         if (ed->size) {
                 printf (_("EXIF data contains a thumbnail "
 			  "(%i bytes)."), ed->size);

Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- actions.h	22 Jan 2009 07:41:11 -0000	1.11
+++ actions.h	1 Oct 2009 06:50:34 -0000	1.12
@@ -29,6 +29,7 @@ typedef struct {
 
 	unsigned int machine_readable;
 	unsigned int use_ids;
+	unsigned int width;
 
 	const char *fin;
 

[libexif-cvs] exif ChangeLog, 1.95, 1.96 NEWS, 1.31, 1.32 exif.1, 1.15, 1.16

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15439

Modified Files:
	ChangeLog NEWS exif.1 
Log Message:
Added --width option to allow setting width of output


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -d -r1.31 -r1.32
--- NEWS	1 Oct 2009 06:10:37 -0000	1.31
+++ NEWS	1 Oct 2009 06:50:32 -0000	1.32
@@ -7,6 +7,7 @@ exif-0.6.x:
   * --ifd is now honoured while displaying tag contents
   * --create-exif now creates mandatory EXIF tags with default data
   * --no-fixup disables attempts to fix tags in existing files
+  * --width option sets width of output lines
 
 exif-0.6.17 (2008-11-06):
   * Fixed the output of -s and -t when iconv is configured

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -d -r1.95 -r1.96
--- ChangeLog	1 Oct 2009 06:10:37 -0000	1.95
+++ ChangeLog	1 Oct 2009 06:50:32 -0000	1.96
@@ -4,6 +4,7 @@
 	  This involved creating a version of exif_loader_get_data
           (exif_get_data_opts) that allows ExifOption values to be set
           in the ExifData before it's used to store tags.
+	* Added --width option to allow setting width of output
 
 2009-09-28  Dan Fandrich <da...@co...>
 

Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- exif.1	1 Oct 2009 06:10:37 -0000	1.15
+++ exif.1	1 Oct 2009 06:50:32 -0000	1.16
@@ -1,4 +1,4 @@
-.\" © 2002-2009 by Thomas Pircher (tehpeh at gmx dot net) et. al.
+.\" Copyright © 2002-2009 by Thomas Pircher (tehpeh at gmx dot net) et. al.
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
@@ -13,7 +13,7 @@
 .\" the source, must acknowledge the copyright and authors of this work.
 .\" License.
 .\"
-.TH exif 1 "2009-09-30" "exif 0.6.17.1" "libexif command line front-end"
+.TH exif 1 "2009-09-30" "exif 0.6.18" "command line front-end to libexif"
 .SH "NAME"
 exif \- shows EXIF information in JPEG files
 .SH "SYNOPSIS"
@@ -119,6 +119,10 @@ Create EXIF data if it does not exist
 Produce output in a machine-readable (tab-delimited) format.
 The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.
 .TP
+.BI "\-w, \-\-width=" "N"
+Set the maximum width of the output to N characters (default 80). This does
+not apply to some output formats (e.g. XML).
+.TP
 .BI "\-x, \-\-xml-output"
 Produce output in an XML format (when possible).
 The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.

[libexif-cvs] exif ChangeLog, 1.94, 1.95 NEWS, 1.30, 1.31 exif.1, 1.14, 1.15

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11829

Modified Files:
	ChangeLog NEWS exif.1 
Log Message:
Added --no-fixup to disable attempts to fix tags in existing files.
This involved creating a version of exif_loader_get_data
(exif_get_data_opts) that allows ExifOption values to be set
in the ExifData before it's used to store tags.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- NEWS	29 Sep 2009 04:31:02 -0000	1.30
+++ NEWS	1 Oct 2009 06:10:37 -0000	1.31
@@ -6,6 +6,7 @@ exif-0.6.x:
   * Allow setting --tag=0 (needed for the GPS IFD)
   * --ifd is now honoured while displaying tag contents
   * --create-exif now creates mandatory EXIF tags with default data
+  * --no-fixup disables attempts to fix tags in existing files
 
 exif-0.6.17 (2008-11-06):
   * Fixed the output of -s and -t when iconv is configured

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -d -r1.94 -r1.95
--- ChangeLog	29 Sep 2009 00:36:36 -0000	1.94
+++ ChangeLog	1 Oct 2009 06:10:37 -0000	1.95
@@ -1,3 +1,10 @@
+2009-09-30  Dan Fandrich <da...@co...>
+
+	* Added --no-fixup to disable attempts to fix tags in existing files.
+	  This involved creating a version of exif_loader_get_data
+          (exif_get_data_opts) that allows ExifOption values to be set
+          in the ExifData before it's used to store tags.
+
 2009-09-28  Dan Fandrich <da...@co...>
 
 	* Added the text of the LGPL V2.1 in COPYING so there isn't any

Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- exif.1	14 Apr 2009 05:56:23 -0000	1.14
+++ exif.1	1 Oct 2009 06:10:37 -0000	1.15
@@ -13,7 +13,7 @@
 .\" the source, must acknowledge the copyright and authors of this work.
 .\" License.
 .\"
-.TH exif 1 "2009-01-21" "exif 0.6.17.1" "libexif command line front-end"
+.TH exif 1 "2009-09-30" "exif 0.6.17.1" "libexif command line front-end"
 .SH "NAME"
 exif \- shows EXIF information in JPEG files
 .SH "SYNOPSIS"
@@ -40,7 +40,9 @@ Corrupted MakerNote tags are also remove
 .SH "OPTIONS"
 .TP
 .BI "\-v, \-\-version"
-Display the exif version number.
+Display the
+.B exif
+version number.
 .TP
 .BI "\-i, \-\-ids"
 Show ID numbers instead of tag names.
@@ -91,6 +93,13 @@ as thumbnail.  No attempt is made to ens
 .I "FILE"
 are in a valid thumbnail format.
 .TP
+.BI "\-\-no-fixup"
+Do not attempt to fix EXIF specification violations when reading tags.
+.B exif
+will remove illegal or unknown tags, add some mandatory tags using default
+values, and change the data type of tags to match that required by the
+specification.
+.TP
 .BI "\-o, \-\-output=" "FILE"
 Write output image to
 .IR "FILE" .
@@ -116,7 +125,9 @@ The \-\-xml-output and \-\-machine\-read
 .TP
 .BI "\-d, \-\-debug"
 Show debugging messages. Also, when processing a file that contains corrupted
-data, this option cases exif to attempt to continue processing. Normally,
+data, this option causes
+.B exif
+to attempt to continue processing. Normally,
 corrupted data causes an abort.
 .SS "Help options"
 .TP
@@ -126,7 +137,8 @@ Show help message.
 .BI "\-\-usage"
 Display brief usage message.
 .SH "EXAMPLES"
-Display all recognized EXIF tags in an image and the tag contents:
+Display all recognized EXIF tags in an image and the tag contents, with bad
+tags fixed:
 .LP
 .RS
 exif image.jpg
@@ -136,7 +148,7 @@ Display a table listing all known EXIF t
 given image:
 .LP
 .RS
-exif --list-tags image.jpg
+exif --list-tags --no-fixup image.jpg
 .RE
 .LP
 Extract the thumbnail into the file thumbnail.jpg:
@@ -145,11 +157,11 @@ Extract the thumbnail into the file thum
 exif --extract-thumbnail --output=thumbnail.jpg image.jpg
 .RE
 .LP
-Display a list of the numeric values of all recognized EXIF tags and the
-tag contents:
+Display a list of the numeric values of only the EXIF tags in the thumbnail IFD
+(IFD 1) and the tag values:
 .LP
 .RS
-exif --ids image.jpg
+exif --ids --ifd=1 --no-fixup image.jpg
 .RE
 .LP
 Display the meaning of tag 0x9209 in the "EXIF" IFD according to the EXIF
@@ -162,18 +174,21 @@ exif --show-description --ifd=EXIF --tag
 Add an Orientation tag with value "bottom - left" to an existing image:
 .LP
 .RS
-exif --output=new.jpg --ifd=0 --tag=0x0112 --set-value=4 image.jpg
+exif --output=new.jpg --ifd=0 --tag=0x0112 --set-value=4 --no-fixup image.jpg
 .RE
 .LP
 Add a YCbCr Sub-Sampling tag with value 2,1 (a.k.a YCbCr 4:2:2) to an
-existing image:
+existing image and fix the existing tags, if necessary:
 .LP
 .RS
 exif --output=new.jpg --tag=YCbCrSubSampling --ifd=0 --set-value='2 1' image.jpg
 .RE
 .LP
 .SH "AUTHOR"
-Written by Lutz Mueller <lu...@us...>.
+.B exif
+was written by Lutz Mueller <lu...@us...>
+and numerous contributors.
+This man page is Copyright \(co 2002-2009 Thomas Pircher and others.
 .SH "SEE ALSO"
 .UR "http://www.sourceforge.net/projects/libexif"
 .BR "http://www.sourceforge.net/projects/libexif"

[libexif-cvs] exif/exif main.c, 1.73, 1.74 utils.c, 1.13, 1.14 utils.h, 1.8, 1.9

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11829/exif

Modified Files:
	main.c utils.c utils.h 
Log Message:
Added --no-fixup to disable attempts to fix tags in existing files.
This involved creating a version of exif_loader_get_data
(exif_get_data_opts) that allows ExifOption values to be set
in the ExifData before it's used to store tags.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -d -r1.73 -r1.74
--- main.c	22 Jan 2009 07:41:11 -0000	1.73
+++ main.c	1 Oct 2009 06:10:39 -0000	1.74
@@ -169,7 +169,7 @@ log_func (ExifLog *log, ExifLogCode code
 static unsigned int list_tags = 0, show_description = 0;
 static unsigned int xml_output = 0;
 static unsigned int extract_thumbnail = 0, remove_thumb = 0;
-static unsigned int remove_tag = 0, create_exif = 0;
+static unsigned int remove_tag = 0, create_exif = 0, no_fixup = 0;
 static unsigned int list_mnote = 0;
 static unsigned int show_version = 0;
 static const char *output = NULL;
@@ -207,6 +207,8 @@ main (int argc, const char **argv)
 		 N_("Remove thumbnail"), NULL},
 		{"insert-thumbnail", 'n', POPT_ARG_STRING, &p.set_thumb, 0,
 		 N_("Insert FILE as thumbnail"), N_("FILE")},
+		{"no-fixup", '\0', POPT_ARG_NONE, &no_fixup, 0,
+		 N_("Do not fix existing tags in files"), NULL},
 		{"output", 'o', POPT_ARG_STRING, &output, 0,
 		 N_("Write data to FILE"), N_("FILE")},
 		{"set-value", '\0', POPT_ARG_STRING, &p.set_value, 0,
@@ -351,7 +353,13 @@ main (int argc, const char **argv)
 		log_arg.ignore_corrupted = 0;
 		if (!log_arg.corrupted)
 			create_exif = 0;
-		ed = exif_loader_get_data (l);
+
+		if (no_fixup)
+			/* Override the default conversion options */
+			ed = exif_get_data_opts(l, log, 0, EXIF_DATA_TYPE_UNKNOWN);
+		else
+			ed = exif_loader_get_data(l);
+
 		exif_loader_unref (l);
 		if (!ed) {
 			if (create_exif) {

Index: utils.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- utils.c	20 Jan 2009 23:47:29 -0000	1.13
+++ utils.c	1 Oct 2009 06:10:39 -0000	1.14
@@ -74,6 +74,39 @@ exif_ifd_from_string (const char *string
 	return (-1);
 }
 
+/*! An alternative to exif_loader_get_data() that allows the options and
+ * data type to be set.
+ *
+ * \param[in] loader the loader
+ * \param[in] options one or more bitwise ORred options from ExifDataOption
+ * \param[in] dt image data type
+ * \return allocated ExifData
+ */
+ExifData *
+exif_get_data_opts(ExifLoader *loader, ExifLog *log,
+		   int options, ExifDataType dt)
+{
+	ExifData *ed;
+	const unsigned char *buf;
+	size_t buf_size;
+
+	if (!loader || !log)
+		return NULL;
+
+	exif_loader_get_buf (loader, &buf, &buf_size);
+	if (buf_size == 0)
+		return NULL;
+	ed = exif_data_new();
+	exif_data_log (ed, log);
+
+	/* Clear the slate before setting the requested options */
+	exif_data_unset_option (ed, ~0);
+	exif_data_set_option (ed, options);
+	exif_data_set_data_type (ed, dt);
+	exif_data_load_data (ed, buf, buf_size);
+
+	return ed;
+}
 
 /*! Returns the number of bytes of data needed to display n characters of
  * the given multibyte string in the current locale character encoding.
@@ -84,6 +117,7 @@ exif_ifd_from_string (const char *string
  * by the returned number of bytes (this may be less but never more than the
  * value on entry)
  * \return number of bytes starting at mbs make up len characters
+ * \note This can probably be rewritten using mbsrtowcs()
  */
 #ifdef HAVE_MBLEN
 size_t exif_mbstrlen(const char *mbs, size_t *len)

Index: utils.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- utils.h	13 Jan 2009 08:51:41 -0000	1.8
+++ utils.h	1 Oct 2009 06:10:39 -0000	1.9
@@ -24,11 +24,13 @@
 #include <sys/types.h>
 #include <libexif/exif-tag.h>
 #include <libexif/exif-ifd.h>
+#include <libexif/exif-loader.h>
 
 enum {EXIF_INVALID_TAG = 0xffff};
 
 ExifTag exif_tag_from_string (const char *string);
 ExifIfd exif_ifd_from_string (const char *string);
+ExifData *exif_get_data_opts(ExifLoader *loader, ExifLog *log, int options, ExifDataType dt);
 size_t exif_mbstrlen(const char *mbs, size_t *len);
 
 #endif /* __UTILS_H__ */

[libexif-cvs] libexif/libexif exif-loader.c,1.36,1.37

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10682/libexif

Modified Files:
	exif-loader.c 
Log Message:
Added missing parenthesis


Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -d -r1.36 -r1.37
--- exif-loader.c	1 Oct 2009 05:07:14 -0000	1.36
+++ exif-loader.c	1 Oct 2009 06:05:08 -0000	1.37
@@ -410,7 +410,7 @@ exif_loader_get_buf (ExifLoader *loader,
 	const unsigned char* b = NULL;
 	unsigned int s = 0;
 
-	if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN) {
+	if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN)) {
 		exif_log (loader->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
 			  "Loader format unknown");
 	} else {

[libexif-cvs] libexif NEWS,1.54,1.55 ChangeLog,1.321,1.322

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4193

Modified Files:
	NEWS ChangeLog 
Log Message:
Added a new public API function, exif_loader_get_buf(), which
returns a pointer to the raw data in the ExifLoader. Without this,
the only way to get the ExifLoader data out was as an
ExifData and using only the default set of ExifDataOptions.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -d -r1.54 -r1.55
--- NEWS	27 Sep 2009 04:48:53 -0000	1.54
+++ NEWS	1 Oct 2009 05:07:12 -0000	1.55
@@ -17,14 +17,16 @@ libexif-0.6.x:
     removed from a file when EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS is set
   * Changed exif_tag_get_support_level_in_ifd() to return a value when possible
     when the data type for the given EXIF data is unknown. This will cause
-    tags to be added or deleted when tag fixup is requested without a data
-    type being set.
+    tags to be added or deleted when tag fixup is requested even, without a
+    data type being set.
   * Added support for writing Pentax and Casio type2 MakerNotes
   * Improved display of Pentax and Casio type2 MakerNotes
   * Completely fixed bug #1617997 to display APEX values correctly
   * Stopped some crashes due to read-beyond-buffer accesses in MakerNotes
   * Don't abort MakerNote parsing after the first invalid tag
   * Sped up exif_content_fix()
+  * Fixed negative exposure values in Canon makernotes (bug #2797280)
+  * New API entry point: exif_loader_get_buf()
 
 libexif-0.6.17 (2008-11-06):
   * Updated translations: cs, de, pl, sk, vi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -p -d -r1.321 -r1.322
--- ChangeLog	30 Sep 2009 06:56:14 -0000	1.321
+++ ChangeLog	1 Oct 2009 05:07:12 -0000	1.322
@@ -1,3 +1,10 @@
+2009-09-30  Dan Fandrich <da...@co...>
+
+	* Added a new public API function, exif_loader_get_buf(), which
+	  returns a pointer to the raw data in the ExifLoader. Without this,
+	  the only way to get the ExifLoader data out was as an
+	  ExifData and using only the default set of ExifDataOptions.
+
 2009-09-29  Dan Fandrich <da...@co...>
 
 	* Added EXIF_DATA_TYPE_UNKNOWN as a backwards-compatible

[libexif-cvs] libexif/libexif exif-loader.c, 1.35, 1.36 exif-loader.h, 1.11, 1.12 libexif.sym, 1.1, 1.2

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4193/libexif

Modified Files:
	exif-loader.c exif-loader.h libexif.sym 
Log Message:
Added a new public API function, exif_loader_get_buf(), which
returns a pointer to the raw data in the ExifLoader. Without this,
the only way to get the ExifLoader data out was as an
ExifData and using only the default set of ExifDataOptions.


Index: libexif.sym
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/libexif.sym,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- libexif.sym	13 Jun 2005 21:07:39 -0000	1.1
+++ libexif.sym	1 Oct 2009 05:07:14 -0000	1.2
@@ -126,3 +126,4 @@ mnote_pentax_entry_get_value
 mnote_pentax_tag_get_description
 mnote_pentax_tag_get_name
 mnote_pentax_tag_get_title
+exif_loader_get_buf

Index: exif-loader.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- exif-loader.h	5 Dec 2008 07:07:15 -0000	1.11
+++ exif-loader.h	1 Oct 2009 05:07:14 -0000	1.12
@@ -95,7 +95,24 @@ void          exif_loader_reset (ExifLoa
  */
 ExifData     *exif_loader_get_data (ExifLoader *loader);
 
-void exif_loader_log (ExifLoader *, ExifLog *);
+/*! Return the data read by the loader.  The returned pointer is only
+ * guaranteed to be valid until the next call to a function modifying
+ * this #ExifLoader.  Either or both of buf and buf_size may be NULL on
+ * entry, in which case that value is not returned.
+ *
+ * \param[in] loader the loader
+ * \param[out] buf read-only pointer to the data read by the loader, or NULL
+ *                 in case of error
+ * \param[out] buf_size size of the data at buf, or 0 in case of error
+ */
+void exif_loader_get_buf (ExifLoader *loader, const unsigned char **buf,
+						  unsigned int *buf_size);
+
+/*! Set the log message object used by this #ExifLoader.
+ * \param[in] loader the loader
+ * \param[in] log #ExifLog
+ */
+void exif_loader_log (ExifLoader *loader, ExifLog *log);
 
 #ifdef __cplusplus
 }

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- exif-loader.c	11 Dec 2008 07:08:49 -0000	1.35
+++ exif-loader.c	1 Oct 2009 05:07:14 -0000	1.36
@@ -404,6 +404,26 @@ exif_loader_get_data (ExifLoader *loader
 }
 
 void
+exif_loader_get_buf (ExifLoader *loader, const unsigned char **buf,
+						  unsigned int *buf_size)
+{
+	const unsigned char* b = NULL;
+	unsigned int s = 0;
+
+	if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN) {
+		exif_log (loader->log, EXIF_LOG_CODE_DEBUG, "ExifLoader",
+			  "Loader format unknown");
+	} else {
+		b = loader->buf;
+		s = loader->bytes_read;
+	}
+	if (buf)
+		*buf = b;
+	if (buf_size)
+		*buf_size = s;
+}
+
+void
 exif_loader_log (ExifLoader *loader, ExifLog *log)
 {
 	if (!loader) 

[libexif-cvs] libexif/libexif exif-data-type.h, 1.2, 1.3 exif-data.c, 1.120, 1.121 exif-data.h, 1.24, 1.25 exif-tag.c, 1.55, 1.56 exif-tag.h, 1.25, 1.26

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3143/libexif

Modified Files:
	exif-data-type.h exif-data.c exif-data.h exif-tag.c exif-tag.h 
Log Message:
Added EXIF_DATA_TYPE_UNKNOWN as a backwards-compatible
replacement for most uses of EXIF_DATA_TYPE_COUNT since that's
a clearer name for how it's being used.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -d -r1.25 -r1.26
--- exif-tag.h	27 Sep 2009 04:48:56 -0000	1.25
+++ exif-tag.h	30 Sep 2009 06:56:16 -0000	1.26
@@ -236,13 +236,13 @@ const char      *exif_tag_get_descriptio
 /*! Return whether the given tag is mandatory or not in the given IFD and
  * data type according to the EXIF specification. If the IFD given is
  * EXIF_IFD_COUNT, the result is EXIF_SUPPORT_LEVEL_UNKNOWN. If the data
- * type is EXIF_DATA_TYPE_COUNT, the result is
+ * type is EXIF_DATA_TYPE_UNKNOWN, the result is
  * EXIF_SUPPORT_LEVEL_UNKNOWN unless the support level is the same for
  * all data types.
  *
  * \param[in] tag EXIF tag
  * \param[in] ifd IFD or EXIF_IFD_COUNT
- * \param[in] t data type or EXIF_DATA_TYPE_COUNT
+ * \param[in] t data type or EXIF_DATA_TYPE_UNKNOWN
  * \return the level of support for this tag
  */
 ExifSupportLevel exif_tag_get_support_level_in_ifd (ExifTag tag, ExifIfd ifd,

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -d -r1.55 -r1.56
--- exif-tag.c	27 Sep 2009 04:48:56 -0000	1.55
+++ exif-tag.c	30 Sep 2009 06:56:16 -0000	1.56
@@ -1006,7 +1006,7 @@ exif_tag_from_name (const char *name)
  *
  * \param[in] tag EXIF tag
  * \param[in] ifd a valid IFD (not EXIF_IFD_COUNT)
- * \param[in] t a valid data type (not EXIF_DATA_TYPE_COUNT)
+ * \param[in] t a valid data type (not EXIF_DATA_TYPE_UNKNOWN)
  * \return the level of support for this tag
  */
 static inline ExifSupportLevel

Index: exif-data-type.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data-type.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- exif-data-type.h	17 Feb 2008 18:31:55 -0000	1.2
+++ exif-data-type.h	30 Sep 2009 06:56:16 -0000	1.3
@@ -25,12 +25,18 @@
 extern "C" {
 #endif /* __cplusplus */
 
+/*! Represents the type of image data to which the EXIF data applies.
+ * The EXIF tags have different constraints depending on the type of
+ * image data.
+ */
 typedef enum {
 	EXIF_DATA_TYPE_UNCOMPRESSED_CHUNKY = 0,
 	EXIF_DATA_TYPE_UNCOMPRESSED_PLANAR,
 	EXIF_DATA_TYPE_UNCOMPRESSED_YCC,
 	EXIF_DATA_TYPE_COMPRESSED,
-	EXIF_DATA_TYPE_COUNT
+	EXIF_DATA_TYPE_COUNT,
+
+	EXIF_DATA_TYPE_UNKNOWN = EXIF_DATA_TYPE_COUNT
 } ExifDataType;
 
 #ifdef __cplusplus

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -d -r1.120 -r1.121
--- exif-data.c	26 Sep 2009 05:04:12 -0000	1.120
+++ exif-data.c	30 Sep 2009 06:56:16 -0000	1.121
@@ -1293,5 +1293,5 @@ exif_data_set_data_type (ExifData *d, Ex
 ExifDataType
 exif_data_get_data_type (ExifData *d)
 {
-	return (d && d->priv) ? d->priv->data_type : EXIF_DATA_TYPE_COUNT;
+	return (d && d->priv) ? d->priv->data_type : EXIF_DATA_TYPE_UNKNOWN;
 }

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- exif-data.h	14 Apr 2009 06:00:15 -0000	1.24
+++ exif-data.h	30 Sep 2009 06:56:16 -0000	1.25
@@ -58,7 +58,9 @@ struct _ExifData
 };
 
 /*! Allocate a new #ExifData. The #ExifData contains an empty
- * #ExifContent for each IFD and the default set of options.
+ * #ExifContent for each IFD and the default set of options,
+ * which has #EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS
+ * and #EXIF_DATA_OPTION_FOLLOW_SPECIFICATION set.
  *
  * \return allocated #ExifData, or NULL on error
  */
@@ -66,7 +68,8 @@ ExifData *exif_data_new           (void)
 
 /*! Allocate a new #ExifData using the given memory allocator.
  * The #ExifData contains an empty #ExifContent for each IFD and the default
- * set of options.
+ * set of options, which has #EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS and
+ * #EXIF_DATA_OPTION_FOLLOW_SPECIFICATION set.
  *
  * \return allocated #ExifData, or NULL on error
  */
@@ -215,7 +218,7 @@ void         exif_data_set_data_type (Ex
 /*! Return the data type for the given #ExifData.
  *
  * \param[in] d EXIF data
- * \return data type, or #EXIF_DATA_TYPE_COUNT on error
+ * \return data type, or #EXIF_DATA_TYPE_UNKNOWN on error
  */
 ExifDataType exif_data_get_data_type (ExifData *d);
 

[libexif-cvs] libexif ChangeLog,1.320,1.321

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3143

Modified Files:
	ChangeLog 
Log Message:
Added EXIF_DATA_TYPE_UNKNOWN as a backwards-compatible
replacement for most uses of EXIF_DATA_TYPE_COUNT since that's
a clearer name for how it's being used.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -p -d -r1.320 -r1.321
--- ChangeLog	27 Sep 2009 04:48:53 -0000	1.320
+++ ChangeLog	30 Sep 2009 06:56:14 -0000	1.321
@@ -1,3 +1,9 @@
+2009-09-29  Dan Fandrich <da...@co...>
+
+	* Added EXIF_DATA_TYPE_UNKNOWN as a backwards-compatible
+	  replacement for most uses of EXIF_DATA_TYPE_COUNT since that's
+	  a clearer name for how it's being used.
+
 2009-09-26  Dan Fandrich <da...@co...>
 
 	* libexif/exif-data.c: Added more error log messages and improved

[libexif-cvs] exif/exif actions.c,1.43,1.44

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3113/exif

Modified Files:
	actions.c 
Log Message:
Added comments


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -d -r1.43 -r1.44
--- actions.c	14 Apr 2009 05:57:23 -0000	1.43
+++ actions.c	29 Sep 2009 04:31:04 -0000	1.44
@@ -35,6 +35,7 @@
 
 #define TAG_VALUE_BUF 1024
 
+/* TODO: make this a member of ExifParams */
 #define SCREEN_WIDTH 80
 
 static void

[libexif-cvs] exif NEWS,1.29,1.30

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3113

Modified Files:
	NEWS 
Log Message:
Added comments


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -d -r1.29 -r1.30
--- NEWS	3 Sep 2009 17:20:22 -0000	1.29
+++ NEWS	29 Sep 2009 04:31:02 -0000	1.30
@@ -1,6 +1,6 @@
 exif-0.6.x:
-  * Added translations: is, it, lv
-  * Updated translations: da, id, nl, pl, sk, sv, vi, zh_CN
+  * New translations: is, it, lv
+  * Updated translations: da, de, id, nl, pl, sk, sv, vi, zh_CN
   * Fixed alignment of tables in locales with multibyte character encoding
     (bug #2034873)
   * Allow setting --tag=0 (needed for the GPS IFD)

[libexif-cvs] exif COPYING,NONE,1.1 ChangeLog,1.93,1.94

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13263

Modified Files:
	ChangeLog 
Added Files:
	COPYING 
Log Message:
Added the text of the LGPL V2.1 in COPYING so there isn't any
confusion as to the licensing terms of the project. GNU
autotools adds a GPL COPYING file by default if this doesn't
exist, which is wrong.


--- NEW FILE: COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.

  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    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.1 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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    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 Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -d -r1.93 -r1.94
--- ChangeLog	19 Sep 2009 04:12:20 -0000	1.93
+++ ChangeLog	29 Sep 2009 00:36:36 -0000	1.94
@@ -1,3 +1,10 @@
+2009-09-28  Dan Fandrich <da...@co...>
+
+	* Added the text of the LGPL V2.1 in COPYING so there isn't any
+	  confusion as to the licensing terms of the project. GNU
+	  autotools adds a GPL COPYING file by default if this doesn't
+	  exist, which is wrong.
+
 2009-09-18  Dan Fandrich <da...@co...>
 
 	* po/de.po: Updated German translation by Marcus Meissner

[libexif-cvs] libexif COPYING,1.3,1.4

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12930

Modified Files:
	COPYING 
Log Message:
Updated the FSF's address


Index: COPYING
===================================================================
RCS file: /cvsroot/libexif/libexif/COPYING,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- COPYING	17 Feb 2008 18:31:55 -0000	1.3
+++ COPYING	29 Sep 2009 00:33:21 -0000	1.4
@@ -1,8 +1,8 @@
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
- Copyright (c) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -146,7 +146,7 @@ such a program is covered only if its co
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -471,7 +471,7 @@ convey the exclusion of warranty; and ea
 "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the library's name and a brief idea of what it does.>
-    Copyright (c) <year>  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 

[libexif-cvs] libexif/libexif exif-content.h,1.19,1.20

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5408/libexif

Modified Files:
	exif-content.h 
Log Message:
Removed some redundant code. Renamed a variable to prevent shadowing another.


Index: exif-content.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- exif-content.h	3 Jan 2009 08:19:20 -0000	1.19
+++ exif-content.h	28 Sep 2009 23:09:12 -0000	1.20
@@ -93,6 +93,7 @@ void         exif_content_fix          (
 typedef void (* ExifContentForeachEntryFunc) (ExifEntry *, void *user_data);
 
 /*! Executes function on each EXIF tag in this IFD in turn.
+ * The tags will not necessarily be visited in numerical order.
  *
  * \param[in,out] content IFD over which to iterate
  * \param[in] func function to call for each entry

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.20, 1.21

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5408/libexif/pentax

Modified Files:
	mnote-pentax-entry.c 
Log Message:
Removed some redundant code. Renamed a variable to prevent shadowing another.


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- mnote-pentax-entry.c	26 Sep 2009 08:18:20 -0000	1.20
+++ mnote-pentax-entry.c	28 Sep 2009 23:09:14 -0000	1.21
@@ -400,10 +400,6 @@ mnote_pentax_entry_get_value (MnotePenta
 			entry->size);
 		break;
 	case MNOTE_PENTAX_TAG_TZ_CITY:
-		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		CC (entry->components, 4, val, maxlen);
-		strncpy (val, (char*)entry->data, MIN(maxlen, entry->size));
-		break;
 	case MNOTE_PENTAX_TAG_TZ_DST:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (entry->components, 4, val, maxlen);
@@ -417,12 +413,8 @@ mnote_pentax_entry_get_value (MnotePenta
 		case EXIF_FORMAT_SHORT:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t i, len = strlen(val);
-		  	for(i=0; i<entry->components; i++) {
-				if ((i+1)*2 > entry->size) {
-					// Prevent buffer overflow
-					break;
-				}
+		  	size_t k, len = strlen(val);
+		  	for(k=0; k<entry->components; k++) {
 				vs = exif_get_short (data, entry->order);
 				snprintf (val+len, maxlen-len, "%i ", vs);
 				len = strlen(val);
@@ -433,12 +425,8 @@ mnote_pentax_entry_get_value (MnotePenta
 		case EXIF_FORMAT_LONG:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t i, len = strlen(val);
-		  	for(i=0; i<entry->components; i++) {
-				if ((i+1)*4 > entry->size) {
-					// Prevent buffer overflow
-					break;
-				}
+		  	size_t k, len = strlen(val);
+		  	for(k=0; k<entry->components; k++) {
 				vl = exif_get_long (data, entry->order);
 				snprintf (val+len, maxlen-len, "%li", (long int) vl);
 				len = strlen(val);

[libexif-cvs] libexif/libexif exif-content.c, 1.31, 1.32 exif-tag.c, 1.54, 1.55 exif-tag.h, 1.24, 1.25

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19315/libexif

Modified Files:
	exif-content.c exif-tag.c exif-tag.h 
Log Message:
Sped up exif_content_fix() considerably by splitting the one giant
loop into two much smaller & faster loops.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- exif-tag.h	23 Jan 2009 00:06:36 -0000	1.24
+++ exif-tag.h	27 Sep 2009 04:48:56 -0000	1.25
@@ -259,6 +259,19 @@ const char     *exif_tag_get_title      
 /*! \deprecated Use #exif_tag_get_description_in_ifd instead */
 const char     *exif_tag_get_description (ExifTag tag);
 
+
+/* For now, do not use these functions. */
+
+/*! \internal */
+ExifTag      exif_tag_table_get_tag  (unsigned int n);
+
+/*! \internal */
+const char  *exif_tag_table_get_name (unsigned int n);
+
+/*! \internal */
+unsigned int exif_tag_table_count    (void);
+
+
 /* Don't use these definitions. They are here for compatibility only. */
 
 /*! \deprecated Use EXIF_TAG_PRINT_IMAGE_MATCHING instead. */

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -d -r1.54 -r1.55
--- exif-tag.c	23 Jan 2009 00:06:36 -0000	1.54
+++ exif-tag.c	27 Sep 2009 04:48:56 -0000	1.55
@@ -857,15 +857,6 @@ static const struct {
 
 /* For now, do not use these functions. */
 
-/*! \internal */
-ExifTag      exif_tag_table_get_tag  (unsigned int n);
-
-/*! \internal */
-const char  *exif_tag_table_get_name (unsigned int n);
-
-/*! \internal */
-unsigned int exif_tag_table_count    (void);
-
 ExifTag
 exif_tag_table_get_tag (unsigned int n)
 {

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -d -r1.31 -r1.32
--- exif-content.c	23 Sep 2009 18:00:15 -0000	1.31
+++ exif-content.c	27 Sep 2009 04:48:56 -0000	1.32
@@ -246,31 +246,71 @@ fix_func (ExifEntry *e, void *UNUSED(dat
 	exif_entry_fix (e);
 }
 
+/*!
+ * Check if this entry is unknown and if so, delete it.
+ * \note Be careful calling this function in a loop. Deleting an entry from
+ * an ExifContent changes the index of subsequent entries, as well as the
+ * total size of the entries array.
+ */
+static void
+remove_not_recorded (ExifEntry *e, void *UNUSED(data))
+{
+	ExifIfd ifd = exif_entry_get_ifd(e) ;
+	ExifContent *c = e->parent;
+	ExifDataType dt = exif_data_get_data_type (c->parent);
+	ExifTag t = e->tag;
+
+	if (exif_tag_get_support_level_in_ifd (t, ifd, dt) ==
+			 EXIF_SUPPORT_LEVEL_NOT_RECORDED) {
+		exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
+				"Tag 0x%04x is not recorded in IFD '%s' and has therefore been "
+				"removed.", t, exif_ifd_get_name (ifd));
+		exif_content_remove_entry (c, e);
+	}
+
+}
+
 void
 exif_content_fix (ExifContent *c)
 {
 	ExifIfd ifd = exif_content_get_ifd (c);
 	ExifDataType dt;
 	ExifEntry *e;
-	unsigned int i;
+	unsigned int i, num;
 
-	if (!c) return;
+	if (!c)
+		return;
 
 	dt = exif_data_get_data_type (c->parent);
 
-	/* First of all, fix all existing entries. */
+	/*
+	 * First of all, fix all existing entries.
+	 */
 	exif_content_foreach_entry (c, fix_func, NULL);
 
 	/*
-	 * Then check for existing tags that are not allowed and for
-	 * non-existing mandatory tags.
+	 * Go through each tag and if it's not recorded, remove it. If one
+	 * is removed, exif_content_foreach_entry() will skip the next entry,
+	 * so do the loop again from the beginning if this happens to ensure
+	 * they're all checked. This could be avoided if we stop relying on
+	 * exif_content_foreach_entry.
 	 */
-	for (i = 0; i <= 0xffff; i++) {
-		/* Index using an int because t might only be 16 bits */
-		const ExifTag t = (ExifTag) i;
-		switch (exif_tag_get_support_level_in_ifd (t, ifd, dt)) {
-		case EXIF_SUPPORT_LEVEL_MANDATORY:
-			if (exif_content_get_entry (c, t)) break;
+	do {
+		num = c->count;
+		exif_content_foreach_entry (c, remove_not_recorded, NULL);
+	} while (num != c->count);
+
+	/*
+	 * Then check for non-existing mandatory tags and create them if needed
+	 */
+	num = exif_tag_table_count();
+	for (i = 0; i < num; ++i) {
+		const ExifTag t = exif_tag_table_get_tag (i);
+		if (exif_tag_get_support_level_in_ifd (t, ifd, dt) ==
+			EXIF_SUPPORT_LEVEL_MANDATORY) {
+			if (exif_content_get_entry (c, t))
+				/* This tag already exists */
+				continue;
 			exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
 					"Tag '%s' is mandatory in IFD '%s' and has therefore been added.",
 					exif_tag_get_name_in_ifd (t, ifd), exif_ifd_get_name (ifd));
@@ -278,20 +318,6 @@ exif_content_fix (ExifContent *c)
 			exif_content_add_entry (c, e);
 			exif_entry_initialize (e, t);
 			exif_entry_unref (e);
-			break;
-		case EXIF_SUPPORT_LEVEL_NOT_RECORDED:
-			e = exif_content_get_entry (c, t);
-			if (!e) break;
-			exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
-					"Tag '%s' is not recorded in IFD '%s' and has therefore been "
-					"removed.", exif_tag_get_name_in_ifd (t, ifd),
-					exif_ifd_get_name (ifd));
-			exif_content_remove_entry (c, e);
-			break;
-		case EXIF_SUPPORT_LEVEL_OPTIONAL:
-		case EXIF_SUPPORT_LEVEL_UNKNOWN:
-		default:
-			break;
 		}
 	}
 }

[libexif-cvs] libexif ChangeLog,1.319,1.320 NEWS,1.53,1.54

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19315

Modified Files:
	ChangeLog NEWS 
Log Message:
Sped up exif_content_fix() considerably by splitting the one giant
loop into two much smaller & faster loops.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -d -r1.53 -r1.54
--- NEWS	25 Sep 2009 06:35:45 -0000	1.53
+++ NEWS	27 Sep 2009 04:48:53 -0000	1.54
@@ -14,14 +14,17 @@ libexif-0.6.x:
   * Added remaining GPS tags from the EXIF 2.2 spec to the tag table
   * Fixed the interpretation of some tags as being optional in IFD 1
     (to match the EXIF 2.2 spec) which stops them from being erroneously
-    removed from a file
+    removed from a file when EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS is set
   * Changed exif_tag_get_support_level_in_ifd() to return a value when possible
-    when the data type for the given tag is unknown
+    when the data type for the given EXIF data is unknown. This will cause
+    tags to be added or deleted when tag fixup is requested without a data
+    type being set.
   * Added support for writing Pentax and Casio type2 MakerNotes
   * Improved display of Pentax and Casio type2 MakerNotes
   * Completely fixed bug #1617997 to display APEX values correctly
   * Stopped some crashes due to read-beyond-buffer accesses in MakerNotes
   * Don't abort MakerNote parsing after the first invalid tag
+  * Sped up exif_content_fix()
 
 libexif-0.6.17 (2008-11-06):
   * Updated translations: cs, de, pl, sk, vi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -p -d -r1.319 -r1.320
--- ChangeLog	26 Sep 2009 05:04:09 -0000	1.319
+++ ChangeLog	27 Sep 2009 04:48:53 -0000	1.320
@@ -1,7 +1,9 @@
-2009-09-25  Dan Fandrich <da...@co...>
+2009-09-26  Dan Fandrich <da...@co...>
 
 	* libexif/exif-data.c: Added more error log messages and improved
 	  a few data boundary checks.
+	* Sped up exif_content_fix() considerably by splitting the one giant
+	  loop into two much smaller & faster loops.
 
 2009-09-24  Dan Fandrich <da...@co...>
 

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c, 1.19, 1.20

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

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29548

Modified Files:
	mnote-pentax-entry.c 
Log Message:
Avoid compiler warning signed/unsigned int mismatch.
But do we really need the checks "if ((i+1)*4 > entry->size)"?


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- mnote-pentax-entry.c	19 Sep 2009 05:16:04 -0000	1.19
+++ mnote-pentax-entry.c	26 Sep 2009 08:18:20 -0000	1.20
@@ -417,7 +417,7 @@ mnote_pentax_entry_get_value (MnotePenta
 		case EXIF_FORMAT_SHORT:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t len = strlen(val);
+		  	size_t i, len = strlen(val);
 		  	for(i=0; i<entry->components; i++) {
 				if ((i+1)*2 > entry->size) {
 					// Prevent buffer overflow
@@ -433,7 +433,7 @@ mnote_pentax_entry_get_value (MnotePenta
 		case EXIF_FORMAT_LONG:
 		  {
 			const unsigned char *data = entry->data;
-		  	size_t len = strlen(val);
+		  	size_t i, len = strlen(val);
 		  	for(i=0; i<entry->components; i++) {
 				if ((i+1)*4 > entry->size) {
 					// Prevent buffer overflow

[libexif-cvs] libexif ChangeLog,1.318,1.319

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13249

Modified Files:
	ChangeLog 
Log Message:
libexif/exif-data.c: Added more error log messages and improved
a few data boundary checks.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -p -d -r1.318 -r1.319
--- ChangeLog	25 Sep 2009 06:35:45 -0000	1.318
+++ ChangeLog	26 Sep 2009 05:04:09 -0000	1.319
@@ -1,3 +1,8 @@
+2009-09-25  Dan Fandrich <da...@co...>
+
+	* libexif/exif-data.c: Added more error log messages and improved
+	  a few data boundary checks.
+
 2009-09-24  Dan Fandrich <da...@co...>
 
 	* Fixed some problems in MakerNote parsing that could cause a

[libexif-cvs] libexif/libexif exif-data.c,1.119,1.120

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13249/libexif

Modified Files:
	exif-data.c 
Log Message:
libexif/exif-data.c: Added more error log messages and improved
a few data boundary checks.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -p -d -r1.119 -r1.120
--- exif-data.c	21 Mar 2009 22:03:09 -0000	1.119
+++ exif-data.c	26 Sep 2009 05:04:12 -0000	1.120
@@ -181,11 +181,10 @@ exif_data_load_data_entry (ExifData *dat
 	/* {0,1,2,4,8} x { 0x00000000 .. 0xffffffff } 
 	 *   -> { 0x000000000 .. 0x7fffffff8 } */
 	s = exif_format_get_size(entry->format) * entry->components;
-	if (s < entry->components) {
+	if ((s < entry->components) || (s == 0)){
 		return 0;
 	}
-	if (0 == s)
-		return 0;
+
 	/*
 	 * Size? If bigger than 4 bytes, the actual data is not
 	 * in the entry but somewhere else (offset).
@@ -196,8 +195,11 @@ exif_data_load_data_entry (ExifData *dat
 		doff = offset + 8;
 
 	/* Sanity checks */
-	if ((doff + s < doff) || (doff + s < s) || (doff + s > size))
+	if ((doff + s < doff) || (doff + s < s) || (doff + s > size)) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "Tag data past end of buffer (%u > %u)", doff+s, size);	
 		return 0;
+	}
 
 	entry->data = exif_data_alloc (data, s);
 	if (entry->data) {
@@ -211,9 +213,8 @@ exif_data_load_data_entry (ExifData *dat
 	/* If this is the MakerNote, remember the offset */
 	if (entry->tag == EXIF_TAG_MAKER_NOTE) {
 		if (!entry->data) {
-			exif_log (data->priv->log,
-                                               EXIF_LOG_CODE_DEBUG, "ExifData",
-                                               "MakerNote found with NULL data");	
+			exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+					  "MakerNote found with empty data");	
 		} else if (entry->size > 6) {
 			exif_log (data->priv->log,
 					       EXIF_LOG_CODE_DEBUG, "ExifData",
@@ -320,6 +321,7 @@ exif_data_load_data_thumbnail (ExifData 
 	if (data->data) 
 		exif_mem_free (data->priv->mem, data->data);
 	if (!(data->data = exif_data_alloc (data, s))) {
+		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", s);
 		data->size = 0;
 		return;
 	}
@@ -370,7 +372,7 @@ exif_data_load_data_content (ExifData *d
 		return;
 
 	/* check for valid ExifIfd enum range */
-	if (( ((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT))
+	if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT))
 	  return;
 
 	if (recursion_depth > 30) {
@@ -380,16 +382,22 @@ exif_data_load_data_content (ExifData *d
 	}
 
 	/* Read the number of entries */
-	if (offset >= ds - 1) 
+	if ((offset + 2 < offset) || (offset + 2 < 2) || (offset + 2 > ds)) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
+			  "Tag data past end of buffer (%u > %u)", offset+2, ds);
 		return;
+	}
 	n = exif_get_short (d + offset, data->priv->order);
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-	          "Loading %i entries...", n);
+	          "Loading %hu entries...", n);
 	offset += 2;
 
 	/* Check if we have enough data. */
-	if (offset + 12 * n > ds) 
+	if (offset + 12 * n > ds) {
 		n = (ds - offset) / 12;
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "Short data; only loading %hu entries...", n);
+	}
 
 	for (i = 0; i < n; i++) {
 
@@ -448,17 +456,17 @@ exif_data_load_data_content (ExifData *d
 			if (!exif_tag_get_name_in_ifd (tag, ifd)) {
 
 				/*
-				 * Special case: Tag and format 0. That's against specification.
-				 * At least up to 2.2. But Photoshop writes it anyways.
+				 * Special case: Tag and format 0. That's against specification
+				 * (at least up to 2.2). But Photoshop writes it anyways.
 				 */
 				if (!memcmp (d + offset + 12 * i, "\0\0\0\0", 4)) {
 					exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-						  "Skipping empty entry at position %i in '%s'.", i, 
+						  "Skipping empty entry at position %u in '%s'.", i, 
 						  exif_ifd_get_name (ifd));
 					break;
 				}
 				exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-					  "Unknown tag 0x%04x (entry %i in '%s'). Please report this tag "
+					  "Unknown tag 0x%04x (entry %u in '%s'). Please report this tag "
 					  "to <lib...@li...>.", tag, i,
 					  exif_ifd_get_name (ifd));
 				if (data->priv->options & EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS)

[libexif-cvs] libexif/libexif/pentax exif-mnote-data-pentax.c, 1.17, 1.18

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/pentax
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5544/libexif/pentax

Modified Files:
	exif-mnote-data-pentax.c 
Log Message:
Jan Patera's keen eyes noticed that my MakerNote unification changes
introduced a case where a NULL pointer would be dereferenced before
being checked for NULL.


Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -d -r1.17 -r1.18
--- exif-mnote-data-pentax.c	25 Sep 2009 06:35:48 -0000	1.17
+++ exif-mnote-data-pentax.c	25 Sep 2009 22:01:53 -0000	1.18
@@ -215,17 +215,22 @@ exif_mnote_data_pentax_load (ExifMnoteDa
 		const unsigned char *buf, unsigned int buf_size)
 {
 	ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) en;
-	size_t i, tcount, o, datao = 6 + n->offset, base = 0;
+	size_t i, tcount, o, datao, base = 0;
 	ExifShort c;
 
-	if (!n || !buf || !buf_size || (datao + 8 < datao) ||
-	    (datao + 8 < 8) || (datao + 8 > buf_size)) {
+	if (!n || !buf || !buf_size) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataPentax", "Short MakerNote");
+		return;
+	}
+	datao = 6 + n->offset;
+	if ((datao + 8 < datao) || (datao + 8 < 8) || (datao + 8 > buf_size)) {
 		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 			  "ExifMnoteDataPentax", "Short MakerNote");
 		return;
 	}
 
-	/* Detect varient of Pentax/Casio MakerNote found */
+	/* Detect variant of Pentax/Casio MakerNote found */
 	if (!memcmp(buf + datao, "AOC", 4)) {
 		if ((buf[datao + 4] == 'I') && (buf[datao + 5] == 'I')) {
 			n->version = pentaxV3;