libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif exif-tag.c, 1.64, 1.65 exif-tag.h, 1.28, 1.29

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27323/libexif

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:
Added tag 0xEA1C, the Padding tag from the Microsoft HD Photo
specification.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- exif-tag.h	27 Oct 2009 06:06:11 -0000	1.28
+++ exif-tag.h	11 Dec 2009 08:13:19 -0000	1.29
@@ -147,7 +147,8 @@ typedef enum {
 	EXIF_TAG_SUBJECT_DISTANCE_RANGE		= 0xa40c,
 	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420,
 	EXIF_TAG_GAMMA				= 0xa500,
-	EXIF_TAG_PRINT_IMAGE_MATCHING		= 0xc4a5
+	EXIF_TAG_PRINT_IMAGE_MATCHING		= 0xc4a5,
+	EXIF_TAG_PADDING			= 0xea1c
 } ExifTag;
 
 /* GPS tags overlap with above ones. */

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -d -r1.64 -r1.65
--- exif-tag.c	9 Dec 2009 06:19:50 -0000	1.64
+++ exif-tag.c	11 Dec 2009 08:13:19 -0000	1.65
@@ -860,6 +860,14 @@ static const struct TagEntry {
 	/* Not in EXIF 2.2 */
 	{EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),
 	 N_("Related to Epson's PRINT Image Matching technology")},
+	/* Not in EXIF 2.2 (from the Microsoft HD Photo specification) */
+	{EXIF_TAG_PADDING, "Padding", N_("Padding"),
+	 N_("This tag reserves space that can be reclaimed later when "
+            "additional metadata are added. New metadata can be written "
+            "in place by replacing this tag with a smaller data element "
+            "and using the reclaimed space to store the new or expanded "
+            "metadata tags."),
+	 { ESL_OOOO, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 #endif
 	{0, NULL, NULL, NULL}
 };

[libexif-cvs] libexif ChangeLog,1.342,1.343

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27323

Modified Files:
	ChangeLog 
Log Message:
Added tag 0xEA1C, the Padding tag from the Microsoft HD Photo
specification.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -p -d -r1.342 -r1.343
--- ChangeLog	9 Dec 2009 06:17:17 -0000	1.342
+++ ChangeLog	11 Dec 2009 08:13:17 -0000	1.343
@@ -1,3 +1,8 @@
+2009-12-11  Dan Fandrich <da...@co...>
+
+	* Added tag 0xEA1C, the Padding tag from the Microsoft HD Photo
+	  specification.
+
 2009-12-08  Dan Fandrich <da...@co...>
 
 	* Fixed some memory leaks in the write-exif.c example program and

[libexif-cvs] exif ChangeLog, 1.108, 1.109 NEWS, 1.42, 1.43 exif.1, 1.19, 1.20

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

Update of /cvsroot/libexif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26346

Modified Files:
	ChangeLog NEWS exif.1 
Log Message:
Fixed a couple of memory leaks


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -d -r1.42 -r1.43
--- NEWS	24 Nov 2009 04:52:09 -0000	1.42
+++ NEWS	11 Dec 2009 08:09:27 -0000	1.43
@@ -3,7 +3,7 @@ exif-0.6.x:
   * --no-fixup now honoured during --create-exif to not create default tags
   * Fixed crash when not enough components were given to --set-value
   * Made --set-value more forgiving of whitespace
-  * Allow --set-value on UNDEFINED tags (treated as a byte array)
+  * Allow --set-value on UNDEFINED tags (treating them as byte arrays)
   * Honour --machine-readable with --show-mnote
 
 
@@ -12,6 +12,7 @@ exif-0.6.19 (2009-11-12):
   * Updated translations: sv, vi, zh_CN
   * Fixed alignment of --list-tags header with --width
 
+
 exif-0.6.18 (2009-10-08):
   * New translations: is, it, lv
   * Updated translations: da, de, id, nl, pl, sk, sv, vi, zh_CN

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -d -r1.108 -r1.109
--- ChangeLog	24 Nov 2009 04:52:09 -0000	1.108
+++ ChangeLog	11 Dec 2009 08:09:27 -0000	1.109
@@ -1,3 +1,7 @@
+2009-12-11  Dan Fandrich <da...@co...>
+
+	* Fixed a couple of memory leaks
+
 2009-11-23  Dan Fandrich <da...@co...>
 
 	* Honour --machine-readable with --show-mnote

Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- exif.1	22 Nov 2009 05:51:38 -0000	1.19
+++ exif.1	11 Dec 2009 08:09:27 -0000	1.20
@@ -96,8 +96,8 @@ are in a valid thumbnail format.
 .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
+will otherwise 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"

[libexif-cvs] exif/exif actions.c, 1.53, 1.54 actions.h, 1.13, 1.14 main.c, 1.79, 1.80

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

Update of /cvsroot/libexif/exif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26346/exif

Modified Files:
	actions.c actions.h main.c 
Log Message:
Fixed a couple of memory leaks


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -d -r1.79 -r1.80
--- main.c	24 Nov 2009 04:52:11 -0000	1.79
+++ main.c	11 Dec 2009 08:09:29 -0000	1.80
@@ -178,8 +178,8 @@ static unsigned int extract_thumbnail = 
 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;
-static const char *ifd_string = NULL, *tag_string = NULL;
+static char *output = NULL;
+static char *ifd_string = NULL, *tag_string = NULL;
 static ExifParams p = {EXIF_INVALID_TAG, EXIF_IFD_COUNT, 0, 0, 80,
 		      		   NULL, NULL,NULL};
 LogArg log_arg = {0, 0, 0};
@@ -434,6 +434,13 @@ main (int argc, const char **argv)
 		args++;
 	}
 
+	/* Free all libpopt string arguments */
+	free(tag_string);
+	free(ifd_string);
+	free(p.set_thumb);
+	free(output);
+	free(p.set_value);
+
 	exif_log_free (log);
 	poptFreeContext (ctx);
 

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -d -r1.53 -r1.54
--- actions.c	24 Nov 2009 04:52:11 -0000	1.53
+++ actions.c	11 Dec 2009 08:09:29 -0000	1.54
@@ -225,6 +225,8 @@ action_create_value (ExifData *ed, ExifL
 	    e = exif_entry_new ();
 	    exif_content_add_entry (ed->ifd[ifd], e);
 	    exif_entry_initialize (e, tag);
+	    /* The entry has been added to the IFD, so we can unref it */
+	    exif_entry_unref(e);
 	}
 	return e;
 }

Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- actions.h	27 Oct 2009 06:09:44 -0000	1.13
+++ actions.h	11 Dec 2009 08:09:29 -0000	1.14
@@ -33,8 +33,8 @@ typedef struct {
 
 	const char *fin;
 
-	const char *set_value;
-	const char *set_thumb;
+	char *set_value;
+	char *set_thumb;
 } ExifParams;
 
 void action_insert_thumb     (ExifData *, ExifLog *, ExifParams);

[libexif-cvs] libexif/libexif exif-tag.c, 1.63, 1.64 exif-data.h, 1.26, 1.27 exif-content.h, 1.21, 1.22

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28353/libexif

Modified Files:
	exif-tag.c exif-data.h exif-content.h 
Log Message:
Updated some comments


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -d -r1.63 -r1.64
--- exif-tag.c	25 Nov 2009 18:50:38 -0000	1.63
+++ exif-tag.c	9 Dec 2009 06:19:50 -0000	1.64
@@ -504,7 +504,7 @@ static const struct TagEntry {
 	 N_("Indicates the ISO Speed and ISO Latitude of the camera or "
 	    "input device as specified in ISO 12232."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-	{EXIF_TAG_OECF, "OECF", N_("OECF"),
+	{EXIF_TAG_OECF, "OECF", N_("Opto-Electronic Conversion Function"),
 	 N_("Indicates the Opto-Electronic Conversion Function (OECF) "
 	    "specified in ISO 14524. <OECF> is the relationship between "
 	    "the camera optical input and the image values."),

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -d -r1.26 -r1.27
--- exif-data.h	27 Oct 2009 06:06:11 -0000	1.26
+++ exif-data.h	9 Dec 2009 06:19:50 -0000	1.27
@@ -107,7 +107,8 @@ void      exif_data_load_data (ExifData 
 
 /*! Store raw EXIF data representing the #ExifData structure into a memory
  * buffer. The buffer is allocated by this function and must subsequently be
- * freed by the caller.
+ * freed by the caller using the matching free function as used by the #ExifMem
+ * in use by this #ExifData.
  *
  * \param[in] data EXIF data
  * \param[out] d pointer to buffer pointer containing raw EXIF data on return

Index: exif-content.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -d -r1.21 -r1.22
--- exif-content.h	27 Oct 2009 06:06:11 -0000	1.21
+++ exif-content.h	9 Dec 2009 06:19:50 -0000	1.22
@@ -42,7 +42,7 @@ struct _ExifContent
         ExifEntry **entries;
         unsigned int count;
 
-	/* Data containing this content */
+	/*! Data containing this content */
 	ExifData *parent;
 
 	ExifContentPrivate *priv;
@@ -57,6 +57,7 @@ void         exif_content_free    (ExifC
 
 /*! Add an EXIF tag to an IFD.
  * If this tag already exists in the IFD, this function does nothing.
+ * \pre The "tag" member of the entry must be set on entry.
  *
  * \param[out] c IFD
  * \param[in] entry EXIF entry to add
@@ -73,7 +74,7 @@ void         exif_content_remove_entry (
 
 /*! Return the #ExifEntry in this IFD corresponding to the given tag.
  * This is a pointer into a member of the #ExifContent array and must NOT be
- * freed by the caller.
+ * freed or unrefed by the caller.
  *
  * \param[in] content EXIF content for an IFD
  * \param[in] tag EXIF tag to return

[libexif-cvs] libexif/contrib/examples write-exif.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/contrib/examples
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27395/contrib/examples

Modified Files:
	write-exif.c 
Log Message:
Fixed some memory leaks in the write-exif.c example program and
added some examples of allocating a new tag.                   


Index: write-exif.c
===================================================================
RCS file: /cvsroot/libexif/libexif/contrib/examples/write-exif.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- write-exif.c	17 Jun 2009 19:07:45 -0000	1.2
+++ write-exif.c	9 Dec 2009 06:17:19 -0000	1.3
@@ -13,6 +13,8 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <libexif/exif-data.h>
 
@@ -114,21 +116,83 @@ static const unsigned char exif_header[]
 static const unsigned int exif_header_len = sizeof(exif_header);
 
 /* byte order to use in the EXIF block */
-#define BYTE_ORDER EXIF_BYTE_ORDER_INTEL
+#define FILE_BYTE_ORDER EXIF_BYTE_ORDER_INTEL
+
+/* comment to write into the EXIF block */
+#define FILE_COMMENT "libexif demonstration image"
+
+/* special header required for EXIF_TAG_USER_COMMENT */
+#define ASCII_COMMENT "ASCII\0\0\0"
+
 
 /* Get an existing tag, or create one if it doesn't exist */
 static ExifEntry *init_tag(ExifData *exif, ExifIfd ifd, ExifTag tag)
 {
 	ExifEntry *entry;
+	/* Return an existing tag if one exists */
 	if (!((entry = exif_content_get_entry (exif->ifd[ifd], tag)))) {
+	    /* Allocate a new entry */
 	    entry = exif_entry_new ();
 	    assert(entry != NULL); /* catch an out of memory condition */
+	    entry->tag = tag; /* tag must be set before calling
+				 exif_content_add_entry */
+
+	    /* Attach the ExifEntry to an IFD */
 	    exif_content_add_entry (exif->ifd[ifd], entry);
+
+	    /* Allocate memory for the entry and fill with default data */
 	    exif_entry_initialize (entry, tag);
+
+	    /* Ownership of the ExifEntry has now been passed to the IFD.
+	     * One must be very careful in accessing a structure after
+	     * unref'ing it; in this case, we know "entry" won't be freed
+	     * because the reference count was bumped when it was added to
+	     * the IFD.
+	     */
+	    exif_entry_unref(entry);
 	}
 	return entry;
 }
 
+/* Create a brand-new tag with a data field of the given length, in the
+ * given IFD. This is needed when exif_entry_initialize() isn't able to create
+ * this type of tag itself, or the default data length it creates isn't the
+ * correct length.
+ */
+static ExifEntry *create_tag(ExifData *exif, ExifIfd ifd, ExifTag tag, size_t len)
+{
+	void *buf;
+	ExifEntry *entry;
+	
+	/* Create a memory allocator to manage this ExifEntry */
+	ExifMem *mem = exif_mem_new_default();
+	assert(mem != NULL); /* catch an out of memory condition */
+
+	/* Create a new ExifEntry using our allocator */
+	entry = exif_entry_new_mem (mem);
+	assert(entry != NULL);
+
+	/* Allocate memory to use for holding the tag data */
+	buf = exif_mem_alloc(mem, len);
+	assert(buf != NULL);
+
+	/* Fill in the entry */
+	entry->data = buf;
+	entry->size = len;
+	entry->tag = tag;
+	entry->components = len;
+	entry->format = EXIF_FORMAT_UNDEFINED;
+
+	/* Attach the ExifEntry to an IFD */
+	exif_content_add_entry (exif->ifd[ifd], entry);
+
+	/* The ExifMem and ExifEntry are now owned elsewhere */
+	exif_mem_unref(mem);
+	exif_entry_unref(entry);
+
+	return entry;
+}
+
 int main(int argc, char **argv)
 {
 	int rc = 1;
@@ -145,7 +209,7 @@ int main(int argc, char **argv)
 	/* Set the image options */
 	exif_data_set_option(exif, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);
 	exif_data_set_data_type(exif, EXIF_DATA_TYPE_COMPRESSED);
-	exif_data_set_byte_order(exif, BYTE_ORDER);
+	exif_data_set_byte_order(exif, FILE_BYTE_ORDER);
 
 	/* Create the mandatory EXIF fields with default data */
 	exif_data_fix(exif);
@@ -153,22 +217,41 @@ int main(int argc, char **argv)
 	/* All these tags are created with default values by exif_data_fix() */
 	/* Change the data to the correct values for this image. */
 	entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION);
-	exif_set_long(entry->data, BYTE_ORDER, image_jpg_x);
+	exif_set_long(entry->data, FILE_BYTE_ORDER, image_jpg_x);
 
 	entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_PIXEL_Y_DIMENSION);
-	exif_set_long(entry->data, BYTE_ORDER, image_jpg_y);
+	exif_set_long(entry->data, FILE_BYTE_ORDER, image_jpg_y);
 
 	entry = init_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_COLOR_SPACE);
-	exif_set_short(entry->data, BYTE_ORDER, 1);
+	exif_set_short(entry->data, FILE_BYTE_ORDER, 1);
 
-	/* A good example to give here would be to add a new tag that isn't
-	 * automatically created by exif_data_fix() (such as
-	 * EXIF_TAG_USER_COMMENT) which requires allocating memory in
-	 * entry->data. This isn't so easy to do, unfortunately.
+	/* Create a EXIF_TAG_USER_COMMENT tag. This one must be handled
+	 * differently because that tag isn't automatically created and
+	 * allocated by exif_data_fix(), nor can it be created using
+	 * exif_entry_initialize() so it must be explicitly allocated here.
 	 */
+	entry = create_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_USER_COMMENT, 
+			sizeof(ASCII_COMMENT) + sizeof(FILE_COMMENT) - 2);
+	/* Write the special header needed for a comment tag */
+	memcpy(entry->data, ASCII_COMMENT, sizeof(ASCII_COMMENT)-1);
+	/* Write the actual comment text, without the trailing NUL character */
+	memcpy(entry->data+8, FILE_COMMENT, sizeof(FILE_COMMENT)-1);
+	/* create_tag() happens to set the format and components correctly for
+	 * EXIF_TAG_USER_COMMENT, so there is nothing more to do. */
+
+	/* Create a EXIF_TAG_SUBJECT_AREA tag */
+	entry = create_tag(exif, EXIF_IFD_EXIF, EXIF_TAG_SUBJECT_AREA,
+			   4 * exif_format_get_size(EXIF_FORMAT_SHORT));
+	entry->format = EXIF_FORMAT_SHORT;
+	entry->components = 4;
+	exif_set_short(entry->data, FILE_BYTE_ORDER, image_jpg_x / 2);
+	exif_set_short(entry->data+2, FILE_BYTE_ORDER, image_jpg_y / 2);
+	exif_set_short(entry->data+4, FILE_BYTE_ORDER, image_jpg_x);
+	exif_set_short(entry->data+6, FILE_BYTE_ORDER, image_jpg_y);
 
 	/* Get a pointer to the EXIF data block we just created */
 	exif_data_save_data(exif, &exif_data, &exif_data_len);
+	assert(exif_data != NULL);
 
 	f = fopen(FILE_NAME, "wb");
 	if (!f) {
@@ -181,7 +264,7 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Error writing to file %s\n", FILE_NAME);
 		goto errout;
 	}
-	/* Write EXIF block length */
+	/* Write EXIF block length in big-endian order */
 	if (fputc((exif_data_len+2) >> 8, f) < 0) {
 		fprintf(stderr, "Error writing to file %s\n", FILE_NAME);
 		goto errout;
@@ -195,7 +278,7 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Error writing to file %s\n", FILE_NAME);
 		goto errout;
 	}
-	/* Write JPEG image data */
+	/* Write JPEG image data, skipping the non-EXIF header */
 	if (fwrite(image_jpg+image_data_offset, image_data_len, 1, f) != 1) {
 		fprintf(stderr, "Error writing to file %s\n", FILE_NAME);
 		goto errout;
@@ -208,6 +291,10 @@ errout:
 		fprintf(stderr, "Error writing to file %s\n", FILE_NAME);
 		rc = 1;
 	}
+	/* The allocator we're using for ExifData is the standard one, so use
+	 * it directly to free this pointer.
+	 */
+	free(exif_data);
 	exif_data_unref(exif);
 
 	return rc;

[libexif-cvs] libexif ChangeLog,1.341,1.342

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27395

Modified Files:
	ChangeLog 
Log Message:
Fixed some memory leaks in the write-exif.c example program and
added some examples of allocating a new tag.                   


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -p -d -r1.341 -r1.342
--- ChangeLog	8 Dec 2009 00:15:45 -0000	1.341
+++ ChangeLog	9 Dec 2009 06:17:17 -0000	1.342
@@ -1,3 +1,8 @@
+2009-12-08  Dan Fandrich <da...@co...>
+
+	* Fixed some memory leaks in the write-exif.c example program and
+	  added some examples of allocating a new tag.
+
 2009-11-27  Dan Fandrich <da...@co...>
 
 	* po/ja.po: Updated Japanese translation by Tadashi Jokagi

[libexif-cvs] libexif-website/static index.html,1.26,1.27

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

Update of /cvsroot/libexif/libexif-website/static
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4417/static

Modified Files:
	index.html 
Log Message:
Mention CVE number of recent security fix


Index: index.html
===================================================================
RCS file: /cvsroot/libexif/libexif-website/static/index.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -d -r1.26 -r1.27
--- index.html	13 Nov 2009 17:08:56 -0000	1.26
+++ index.html	8 Dec 2009 00:14:15 -0000	1.27
@@ -74,7 +74,8 @@ metainformation from and to image files.
 	<a href="https://sourceforge.net/projects/libexif/files/libexif/0.6.19/">libexif</a>
 	and
 	<a href="https://sourceforge.net/projects/libexif/files/exif/0.6.19/">exif</a>
-	0.6.19 security/performance release.
+	0.6.19 security/performance release
+fixes <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3895">CVE-2009-3895</a>.
 	<a href="http://libexif.cvs.sourceforge.net/viewvc/libexif/libexif/NEWS?view=markup&amp;pathrev=libexif-0_6_19-release">Release notes</a>
 	<a href="http://sourceforge.net/mailarchive/message.php?msg_name=20091113072359.GA22681%40coneharvesters.com">Security advisory</a>
 	</li>
@@ -204,7 +205,7 @@ number of platforms. Here is a list of s
       style="border:0;width:88px;height:31px"
       src="http://jigsaw.w3.org/css-validator/images/vcss" 
       alt="Valid CSS!" /></a>
-<span>Last update: 2009-11-13</span>
+<span>Last update: 2009-12-07</span>
 </div>
 
 </body>

[libexif-cvs] libexif NEWS, 1.65, 1.66 README, 1.25, 1.26 ChangeLog, 1.340, 1.341

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4902

Modified Files:
	NEWS README ChangeLog 
Log Message:
Mention CVE number of recent security fix & other minor updates.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -d -r1.25 -r1.26
--- README	6 Nov 2009 06:58:08 -0000	1.25
+++ README	8 Dec 2009 00:15:45 -0000	1.26
@@ -143,7 +143,7 @@ must be made through their web site, but
 updated either through Launchpad (preferred) or by sending updates to
 the libexif developers mailing list directly.  As of this writing, the
 following languages must be updated through the Translation Project:
-da de es fr nl pl sk sv vi
+da de es fr ja nl pl sk sv vi
 
 If you are interested in translating libexif into a new language, we
 recommend that you join one of the above translation groups and take

Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -d -r1.65 -r1.66
--- NEWS	17 Nov 2009 19:22:55 -0000	1.65
+++ NEWS	8 Dec 2009 00:15:45 -0000	1.66
@@ -1,12 +1,12 @@
 libexif-0.6.x:
-  * Updated translations: ja
+  * Updated translations: da, ja
 
 
 libexif-0.6.19 (2009-11-12):
   * New translations: be, en_GB, it, ja, pt, sq, zh_CN
   * Updated translations: da, sv, vi
   * Now using a binary search to make searching through the tag table faster
-  * Fixed a heap buffer overflow during tag format conversion
+  * Fixed a heap buffer overflow during tag format conversion (CVE-2009-3895)
 
 
 libexif-0.6.18 (2009-10-09):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -p -d -r1.340 -r1.341
--- ChangeLog	25 Nov 2009 21:26:22 -0000	1.340
+++ ChangeLog	8 Dec 2009 00:15:45 -0000	1.341
@@ -1,3 +1,7 @@
+2009-11-27  Dan Fandrich <da...@co...>
+
+	* po/ja.po: Updated Japanese translation by Tadashi Jokagi
+
 2009-11-25  Dan Fandrich <da...@co...>
 
 	* po/da.po: Updated Danish translation by Joe Hansen

[libexif-cvs] libexif/po ja.po,1.2,1.3

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

Update of /cvsroot/libexif/libexif/po
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8165

Modified Files:
	ja.po 
Log Message:
po/ja.po: Updated Japanese translation by Tadashi Jokagi


Index: ja.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/ja.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- ja.po	17 Nov 2009 19:22:57 -0000	1.2
+++ ja.po	27 Nov 2009 18:06:08 -0000	1.3
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: libexif 0.6.19\n"
 "Report-Msgid-Bugs-To: lib...@li...\n"
 "POT-Creation-Date: 2009-11-12 22:15-0800\n"
-"PO-Revision-Date: 2009-11-17 01:44+0900\n"
+"PO-Revision-Date: 2009-11-25 11:06+0900\n"
 "Last-Translator: Tadashi Jokagi <el...@us...>\n"
 "Language-Team: Japanese <tra...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -947,7 +947,7 @@ msgstr "通常 AE"
 
 #: libexif/canon/mnote-canon-entry.c:297
 msgid "Exposure compensation"
-msgstr ""
+msgstr "露出補正"
 
 #: libexif/canon/mnote-canon-entry.c:298
 msgid "AE lock"
@@ -955,7 +955,7 @@ msgstr "AE ロック"
 
 #: libexif/canon/mnote-canon-entry.c:299
 msgid "AE lock + Exposure compensation"
-msgstr ""
+msgstr "AE ロック + 露出補正"
 
 #: libexif/canon/mnote-canon-entry.c:300
 msgid "No AE"
@@ -1003,14 +1003,14 @@ msgstr "ズーム"
 
 #: libexif/canon/mnote-canon-entry.c:329
 msgid "Sunny"
-msgstr ""
+msgstr "晴天"
 
 #: libexif/canon/mnote-canon-entry.c:330 libexif/canon/mnote-canon-entry.c:402
 #: libexif/exif-entry.c:718 libexif/fuji/mnote-fuji-entry.c:75
 #: libexif/olympus/mnote-olympus-entry.c:135
 #: libexif/pentax/mnote-pentax-entry.c:255
 msgid "Cloudy"
-msgstr ""
+msgstr "曇天"
 
 #: libexif/canon/mnote-canon-entry.c:331 libexif/canon/mnote-canon-entry.c:403
 #: libexif/exif-entry.c:715 libexif/pentax/mnote-pentax-entry.c:100
@@ -1022,7 +1022,7 @@ msgstr ""
 #: libexif/exif-entry.c:714 libexif/pentax/mnote-pentax-entry.c:101
 #: libexif/pentax/mnote-pentax-entry.c:248
 msgid "Fluorescent"
-msgstr ""
+msgstr "蛍光灯"
 
 #: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
 #: libexif/exif-entry.c:716 libexif/exif-tag.c:577
@@ -1042,15 +1042,15 @@ msgstr "マニュアル温度 (Kelvin)"
 
 #: libexif/canon/mnote-canon-entry.c:338
 msgid "PC set 1"
-msgstr "PC セット 1"
+msgstr "PC 設定 1"
 
 #: libexif/canon/mnote-canon-entry.c:339
 msgid "PC set 2"
-msgstr "PC セット 2"
+msgstr "PC 設定 2"
 
 #: libexif/canon/mnote-canon-entry.c:340
 msgid "PC set 3"
-msgstr "PC セット 3"
+msgstr "PC 設定 3"
 
 #: libexif/canon/mnote-canon-entry.c:341 libexif/exif-entry.c:720
 msgid "Daylight fluorescent"
@@ -1434,11 +1434,11 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-tag.c:78
 msgid "Maximal Aperture"
-msgstr ""
+msgstr "最大絞り"
 
 #: libexif/canon/mnote-canon-tag.c:79
 msgid "Minimal Aperture"
-msgstr ""
+msgstr "最小絞り"
 
 #: libexif/canon/mnote-canon-tag.c:80
 msgid "Flash Activity"
@@ -1482,7 +1482,7 @@ msgstr "色トーン"
 
 #: libexif/canon/mnote-canon-tag.c:91
 msgid "Focal Type"
-msgstr ""
+msgstr "焦点の種類"
 
 #: libexif/canon/mnote-canon-tag.c:93
 msgid "Focal Plane X Size"
@@ -1565,7 +1565,7 @@ msgstr "F 値"
 #: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
 #: libexif/pentax/mnote-pentax-tag.c:78
 msgid "Exposure Time"
-msgstr "開放時間"
+msgstr "露出時間"
 
 #: libexif/canon/mnote-canon-tag.c:113
 msgid "Bulb Duration"
@@ -1849,12 +1849,12 @@ msgstr "ハイ ゲインを下げる"
 
 #: libexif/exif-entry.c:678
 msgid "Low saturation"
-msgstr ""
+msgstr "低彩度"
 
 #: libexif/exif-entry.c:678 test/nls/test-codeset.c:48
 #: test/nls/test-codeset.c:61
 msgid "High saturation"
-msgstr ""
+msgstr "高彩度"
 
 #: libexif/exif-entry.c:679 libexif/exif-entry.c:680
 #: libexif/fuji/mnote-fuji-entry.c:63
@@ -2075,35 +2075,35 @@ msgstr "ストロボあり"
 
 #: libexif/exif-entry.c:763
 msgid "Flash fired, compulsory flash mode"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュ モード"
 
 #: libexif/exif-entry.c:764
 msgid "Flash fired, compulsory flash mode, return light not detected"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュモード、光の返り検出なし"
 
 #: libexif/exif-entry.c:766
 msgid "Flash fired, compulsory flash mode, return light detected"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュモード、光の返り検出あり"
 
 #: libexif/exif-entry.c:768
 msgid "Flash did not fire, compulsory flash mode"
-msgstr ""
+msgstr "フラッシュなし、強制フラッシュ モード"
 
 #: libexif/exif-entry.c:769
 msgid "Flash did not fire, auto mode"
-msgstr ""
+msgstr "フラッシュなし、自動モード"
 
 #: libexif/exif-entry.c:770
 msgid "Flash fired, auto mode"
-msgstr ""
+msgstr "フラッシュあり、自動モード"
 
 #: libexif/exif-entry.c:771
 msgid "Flash fired, auto mode, return light not detected"
-msgstr ""
+msgstr "フラッシュあり、自動モード、光の返り検出なし"
 
 #: libexif/exif-entry.c:773
 msgid "Flash fired, auto mode, return light detected"
-msgstr ""
+msgstr "フラッシュあり、自動モード、光の返り検出あり"
 
 #: libexif/exif-entry.c:774
 msgid "No flash function"
@@ -2111,43 +2111,43 @@ msgstr "フラッシュ機能なし"
 
 #: libexif/exif-entry.c:775
 msgid "Flash fired, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュあり、赤目軽減あり"
 
 #: libexif/exif-entry.c:776
 msgid "Flash fired, red-eye reduction mode, return light not detected"
-msgstr ""
+msgstr "フラッシュあり、赤目軽減あり、光の返り検出なし"
 
 #: libexif/exif-entry.c:778
 msgid "Flash fired, red-eye reduction mode, return light detected"
-msgstr ""
+msgstr "フラッシュあり、赤目軽減あり、光の返り検出あり"
 
 #: libexif/exif-entry.c:780
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュ モード、赤目軽減モード"
 
 #: libexif/exif-entry.c:782
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュ モード、赤目軽減モード、光の返り検出なし"
 
 #: libexif/exif-entry.c:784
 msgid "Flash fired, compulsory flash mode, red-eye reduction mode, return light detected"
-msgstr ""
+msgstr "フラッシュあり、強制フラッシュ モード、赤目軽減モード、光の返り検出あり"
 
 #: libexif/exif-entry.c:786
 msgid "Flash did not fire, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュなし、自動モード、赤目軽減モード"
 
 #: libexif/exif-entry.c:787
 msgid "Flash fired, auto mode, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュモード、自動モード、赤目軽減モード"
 
 #: libexif/exif-entry.c:788
 msgid "Flash fired, auto mode, return light not detected, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュあり、自動モード、光の返り検出なし、赤目軽減モード"
 
 #: libexif/exif-entry.c:790
 msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
-msgstr ""
+msgstr "フラッシュあり、自動モード、光の返り検出あり、赤目軽減モード"
 
 #: libexif/exif-entry.c:794
 msgid "?"
@@ -2527,7 +2527,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:125
 msgid "GPS receiver status"
-msgstr ""
+msgstr "GPS レシーバーの状態"
 
 #: libexif/exif-tag.c:126
 msgid "Indicates the status of the GPS receiver when the image is recorded. 'A' means measurement is in progress, and 'V' means the measurement is Interoperability."
@@ -2535,7 +2535,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:129
 msgid "GPS measurement mode"
-msgstr ""
+msgstr "GPS 測定モード"
 
 #: libexif/exif-tag.c:130
 msgid "Indicates the GPS measurement mode. '2' means two-dimensional measurement and '3' means three-dimensional measurement is in progress."
@@ -2727,7 +2727,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:231
 msgid "Bits per Sample"
-msgstr ""
+msgstr "サンプル毎ビット"
 
 #: libexif/exif-tag.c:232
 msgid "The number of bits per image component. In this standard each component of the image is 8 bits, so the value for this tag is 8. See also <SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of this tag."
@@ -2735,7 +2735,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:237
 msgid "Compression"
-msgstr ""
+msgstr "圧縮"
 
 #: libexif/exif-tag.c:238
 msgid "The compression scheme used for the image data. When a primary image is JPEG compressed, this designation is not necessary and is omitted. When thumbnails use JPEG compression, this tag value is set to 6."
@@ -2767,7 +2767,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:260
 msgid "Manufacturer"
-msgstr ""
+msgstr "製造"
 
 #: libexif/exif-tag.c:261
 msgid "The manufacturer of the recording equipment. This is the manufacturer of the DSC, scanner, video digitizer or other equipment that generated the image. When the field is left blank, it is treated as unknown."
@@ -2823,7 +2823,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:301
 msgid "x-Resolution"
-msgstr ""
+msgstr "X 解像度"
 
 #: libexif/exif-tag.c:302
 msgid "The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. When the image resolution is unknown, 72 [dpi] is designated."
@@ -2831,7 +2831,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:306
 msgid "y-Resolution"
-msgstr ""
+msgstr "Y 解像度"
 
 #: libexif/exif-tag.c:307
 msgid "The number of pixels per <ResolutionUnit> in the <ImageLength> direction. The same value as <XResolution> is designated."
@@ -2839,7 +2839,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:311
 msgid "Planar Configuration"
-msgstr ""
+msgstr "プランナー設定"
 
 #: libexif/exif-tag.c:312
 msgid "Indicates whether pixel components are recorded in a chunky or planar format. In JPEG compressed files a JPEG marker is used instead of this tag. If this field does not exist, the TIFF default of 1 (chunky) is assumed."
@@ -2847,7 +2847,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:317
 msgid "Resolution Unit"
-msgstr ""
+msgstr "解像度の単位"
 
 #: libexif/exif-tag.c:318
 msgid "The unit for measuring <XResolution> and <YResolution>. The same unit is used for both <XResolution> and <YResolution>. If the image resolution is unknown, 2 (inches) is designated."
@@ -2987,7 +2987,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:467
 msgid "Exposure time, given in seconds (sec)."
-msgstr ""
+msgstr "露出時間を秒で指定します。"
 
 #: libexif/exif-tag.c:470
 msgid "The F number."
@@ -2995,7 +2995,7 @@ msgstr "F 値です。"
 
 #: libexif/exif-tag.c:475
 msgid "Image Resources Block"
-msgstr ""
+msgstr "画像リソースのブロック"
 
 #: libexif/exif-tag.c:477
 msgid "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF."
@@ -3003,7 +3003,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:485
 msgid "Exposure Program"
-msgstr ""
+msgstr "露出プログラム"
 
 #: libexif/exif-tag.c:486
 msgid "The class of the program used by the camera to set exposure when the picture is taken."
@@ -3023,7 +3023,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:503
 msgid "ISO Speed Ratings"
-msgstr ""
+msgstr "ISO 速度評価"
 
 #: libexif/exif-tag.c:504
 msgid "Indicates the ISO Speed and ISO Latitude of the camera or input device as specified in ISO 12232."
@@ -3071,7 +3071,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:530
 msgid "Components Configuration"
-msgstr ""
+msgstr "コンポーネント設定"
 
 #: libexif/exif-tag.c:531
 msgid "Information specific to compressed data. The channels of each component are arranged in order from the 1st component to the 4th. For uncompressed data the data arrangement is given in the <PhotometricInterpretation> tag. However, since <PhotometricInterpretation> can only express the order of Y, Cb and Cr, this tag is provided for cases when compressed data uses components other than Y, Cb, and Cr and to enable support of other sequences."
@@ -3107,7 +3107,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:558
 msgid "Exposure Bias"
-msgstr ""
+msgstr "露出バイアス"
 
 #: libexif/exif-tag.c:559
 msgid "The exposure bias. The units is the APEX value. Ordinarily it is given in the range of -99.99 to 99.99."
@@ -3135,7 +3135,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:574
 msgid "Light Source"
-msgstr ""
+msgstr "光源"
 
 #: libexif/exif-tag.c:575
 msgid "The kind of light source."
@@ -3355,7 +3355,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:806
 msgid "Digital Zoom Ratio"
-msgstr ""
+msgstr "デジタル ズーム率"
 
 #: libexif/exif-tag.c:807
 msgid "This tag indicates the digital zoom ratio when the image was shot. If the numerator of the recorded value is 0, this indicates that digital zoom was not used."
@@ -3399,7 +3399,7 @@ msgstr ""
 
 #: libexif/exif-tag.c:842
 msgid "Device Setting Description"
-msgstr ""
+msgstr "デバイス設定の説明"
 
 #: libexif/exif-tag.c:843
 msgid "This tag indicates information on the picture-taking conditions of a particular camera model. The tag is used only to indicate the picture-taking conditions in the reader."
@@ -3493,7 +3493,7 @@ msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:126
 msgid "Vibration reduction"
-msgstr ""
+msgstr "手振れ軽減"
 
 #: libexif/fuji/mnote-fuji-entry.c:127
 msgid "Sunset"
@@ -3737,15 +3737,15 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:91
 msgid "AF-D or AF-S Lens"
-msgstr ""
+msgstr "AF-D または AF-S レンズ"
 
 #: libexif/olympus/mnote-olympus-entry.c:92
 msgid "AF-D G Lens"
-msgstr ""
+msgstr "AF-D G レンズ"
 
 #: libexif/olympus/mnote-olympus-entry.c:93
 msgid "AF-D VR Lens"
-msgstr ""
+msgstr "AF-D VR レンズ"
 
 #: libexif/olympus/mnote-olympus-entry.c:97
 msgid "Flash unit unknown"
@@ -3970,7 +3970,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:191
 msgid "Internal + External"
-msgstr ""
+msgstr "内部 + 外部"
 
 #: libexif/olympus/mnote-olympus-entry.c:220
 msgid "Interlaced"
@@ -3978,7 +3978,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:221
 msgid "Progressive"
-msgstr ""
+msgstr "プログレッシブ"
 
 #: libexif/olympus/mnote-olympus-entry.c:227
 #: libexif/pentax/mnote-pentax-entry.c:85
@@ -4004,7 +4004,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-entry.c:236
 msgid "Press start, press stop"
-msgstr ""
+msgstr "押して開始、押して停止"
 
 #: libexif/olympus/mnote-olympus-entry.c:244
 msgid "ISO 50"
@@ -4213,23 +4213,23 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:44
 msgid "Flash Setting"
-msgstr ""
+msgstr "フラッシュ設定"
 
 #: libexif/olympus/mnote-olympus-tag.c:46
 msgid "White Balance Fine Adjustment"
-msgstr ""
+msgstr "ホワイト バランス微調整"
 
 #: libexif/olympus/mnote-olympus-tag.c:47
 msgid "White Balance RB"
-msgstr ""
+msgstr "ホワイト バランス RB"
 
 #: libexif/olympus/mnote-olympus-tag.c:49
 msgid "ISO Selection"
-msgstr ""
+msgstr "ISO 選択"
 
 #: libexif/olympus/mnote-olympus-tag.c:50
 msgid "Preview Image IFD"
-msgstr ""
+msgstr "プレビュー画像 IFD"
 
 #: libexif/olympus/mnote-olympus-tag.c:51
 msgid "Exposurediff ?"
@@ -4250,7 +4250,7 @@ msgstr ""
 #: libexif/olympus/mnote-olympus-tag.c:58
 #: libexif/olympus/mnote-olympus-tag.c:96
 msgid "Image Adjustment"
-msgstr ""
+msgstr "画像調整"
 
 #: libexif/olympus/mnote-olympus-tag.c:59
 msgid "Tone Compensation"
@@ -4258,11 +4258,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:60
 msgid "Adapter"
-msgstr ""
+msgstr "アダプター"
 
 #: libexif/olympus/mnote-olympus-tag.c:62
 msgid "Lens"
-msgstr ""
+msgstr "レンズ"
 
 #: libexif/olympus/mnote-olympus-tag.c:63
 #: libexif/olympus/mnote-olympus-tag.c:135
@@ -4288,13 +4288,13 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:70
 msgid "Contrast Curve"
-msgstr ""
+msgstr "コントラスト カーブ"
 
 #: libexif/olympus/mnote-olympus-tag.c:71
 #: libexif/olympus/mnote-olympus-tag.c:95
 #: libexif/pentax/mnote-pentax-tag.c:134
 msgid "Color Mode"
-msgstr ""
+msgstr "色モード"
 
 #: libexif/olympus/mnote-olympus-tag.c:72
 msgid "Light Type"
@@ -4326,7 +4326,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:86
 msgid "Optimize Image"
-msgstr ""
+msgstr "画像最適化"
 
 #: libexif/olympus/mnote-olympus-tag.c:88
 msgid "Vari Program"
@@ -4334,11 +4334,11 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:89
 msgid "Capture Editor Data"
-msgstr ""
+msgstr "エディター データの取り込み"
 
 #: libexif/olympus/mnote-olympus-tag.c:90
 msgid "Capture Editor Version"
-msgstr ""
+msgstr "エディター バージョンの取り込み"
 
 #: libexif/olympus/mnote-olympus-tag.c:97
 #: libexif/olympus/mnote-olympus-tag.c:183
@@ -4347,7 +4347,7 @@ msgstr ""
 
 #: libexif/olympus/mnote-olympus-tag.c:99
 msgid "Focus"
-msgstr ""
+msgstr "フォーカス"
 
 #: libexif/olympus/mnote-olympus-tag.c:102
 msgid "Converter"
@@ -4416,7 +4416,7 @@ msgstr "ISO 値"
 
 #: libexif/olympus/mnote-olympus-tag.c:125
 msgid "Aperture Value"
-msgstr ""
+msgstr "開放値"
 
 #: libexif/olympus/mnote-olympus-tag.c:126
 msgid "Brightness Value"
@@ -4530,7 +4530,7 @@ msgstr "シーン検出"
 
 #: libexif/olympus/mnote-olympus-tag.c:159
 msgid "Compression Ratio"
-msgstr ""
+msgstr "圧縮率"
 
 #: libexif/olympus/mnote-olympus-tag.c:160
 msgid "Preview Image Valid"
@@ -4664,7 +4664,7 @@ msgstr "TIFF"
 
 #: libexif/pentax/mnote-pentax-entry.c:150
 msgid "2560x1920 or 2304x1728"
-msgstr ""
+msgstr "2560×1920 または 2304×1728"
 
 #: libexif/pentax/mnote-pentax-entry.c:156
 msgid "2304x1728 or 2592x1944"
@@ -4693,11 +4693,11 @@ msgstr "冬"
 
 #: libexif/pentax/mnote-pentax-entry.c:178
 msgid "Self Portrait"
-msgstr ""
+msgstr "自画像"
 
 #: libexif/pentax/mnote-pentax-entry.c:179
 msgid "Illustrations"
-msgstr ""
+msgstr "イラスト"
 
 #: libexif/pentax/mnote-pentax-entry.c:180
 msgid "Digital Filter"
@@ -4705,11 +4705,11 @@ msgstr "デジタル フィルター"
 
 #: libexif/pentax/mnote-pentax-entry.c:182
 msgid "Food"
-msgstr ""
+msgstr "食品"
 
 #: libexif/pentax/mnote-pentax-entry.c:183
 msgid "Green Mode"
-msgstr ""
+msgstr "緑モード"
 
 #: libexif/pentax/mnote-pentax-entry.c:184
 msgid "Light Pet"
@@ -4913,27 +4913,27 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-tag.c:64
 msgid "Preview Size"
-msgstr ""
+msgstr "プレビューの大きさ"
 
 #: libexif/pentax/mnote-pentax-tag.c:65
 msgid "Preview Length"
-msgstr ""
+msgstr "プレビューの長さ"
 
 #: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
 msgid "Preview Start"
-msgstr ""
+msgstr "プレビュー開始"
 
 #: libexif/pentax/mnote-pentax-tag.c:67
 msgid "Model Identification"
-msgstr ""
+msgstr "モデル識別"
 
 #: libexif/pentax/mnote-pentax-tag.c:68
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #: libexif/pentax/mnote-pentax-tag.c:69
 msgid "Time"
-msgstr ""
+msgstr "時間"
 
 #: libexif/pentax/mnote-pentax-tag.c:72
 msgid "PictureMode"

[libexif-cvs] libexif/libexif exif-mnote-data-priv.h, 1.9, 1.10 exif-data.c, 1.124, 1.125

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19925/libexif

Modified Files:
	exif-mnote-data-priv.h exif-data.c 
Log Message:
Explicitly mark the definitions in exif-mnote-data-priv.h as internal


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -d -r1.124 -r1.125
--- exif-data.c	27 Oct 2009 06:06:11 -0000	1.124
+++ exif-data.c	26 Nov 2009 05:24:27 -0000	1.125
@@ -722,7 +722,7 @@ typedef enum {
 	EXIF_DATA_TYPE_MAKER_NOTE_NONE		= 0,
 	EXIF_DATA_TYPE_MAKER_NOTE_CANON		= 1,
 	EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS	= 2,
-	EXIF_DATA_TYPE_MAKER_NOTE_PENTAX		= 3,
+	EXIF_DATA_TYPE_MAKER_NOTE_PENTAX	= 3,
 	EXIF_DATA_TYPE_MAKER_NOTE_NIKON		= 4,
 	EXIF_DATA_TYPE_MAKER_NOTE_CASIO		= 5,
 	EXIF_DATA_TYPE_MAKER_NOTE_FUJI 		= 6

Index: exif-mnote-data-priv.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data-priv.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- exif-mnote-data-priv.h	27 Oct 2009 06:06:11 -0000	1.9
+++ exif-mnote-data-priv.h	26 Nov 2009 05:24:27 -0000	1.10
@@ -29,10 +29,13 @@ extern "C" {
 #include <libexif/exif-byte-order.h>
 #include <libexif/exif-log.h>
 
+/*! \internal */
 typedef struct _ExifMnoteDataMethods ExifMnoteDataMethods;
+
+/*! \internal */
 struct _ExifMnoteDataMethods {
 
-	/* Live cycle */
+	/* Life cycle */
 	void (* free) (ExifMnoteData *);
 
 	/* Modification */
@@ -50,8 +53,10 @@ struct _ExifMnoteDataMethods {
 	char * (* get_value)             (ExifMnoteData *, unsigned int, char *val, unsigned int maxlen);
 };
 
+/*! \internal */
 typedef struct _ExifMnoteDataPriv ExifMnoteDataPriv;
 
+/*! \internal */
 struct _ExifMnoteData 
 {
 	ExifMnoteDataPriv *priv;
@@ -65,8 +70,13 @@ struct _ExifMnoteData 
 	ExifMem *mem;
 };
 
+/*! \internal */
 void exif_mnote_data_construct      (ExifMnoteData *, ExifMem *mem);
+
+/*! \internal */
 void exif_mnote_data_set_byte_order (ExifMnoteData *, ExifByteOrder);
+
+/*! \internal */
 void exif_mnote_data_set_offset     (ExifMnoteData *, unsigned int);
 
 #ifdef __cplusplus

[libexif-cvs] libexif/po da.po,1.6,1.7

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

Update of /cvsroot/libexif/libexif/po
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29388/po

Modified Files:
	da.po 
Log Message:
po/da.po: Updated Danish translation by Joe Hansen


Index: da.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/da.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- da.po	12 Nov 2009 20:24:19 -0000	1.6
+++ da.po	25 Nov 2009 21:26:24 -0000	1.7
@@ -2,7 +2,7 @@
 # Copyright (C) 2009 Lutz Mueller and Joe Hansen.
 # This file is distributed under the same license as the libexif package.
 # Joe Hansen <joe...@ya...>, 2009.
-# Korrekturlæst Lars Christian Jensen 12. juni 2009.
+# Korrekturlæst Lars Christian Jensen 2009.
 #
 # Canon EF 50mm f/1.8 -> Canon EF 50mm f/1.8 (der er ikke oversat til 
 # dansk mellemrum: 50 mm etc.)
@@ -32,10 +32,10 @@
 #
 msgid ""
[...2781 lines suppressed...]
 msgid "Wide"
-msgstr ""
+msgstr "Bred"
 
 #: libexif/fuji/mnote-fuji-entry.c:167
 msgid "F0/Standard"
-msgstr ""
+msgstr "F0/standard"
 
 #: libexif/fuji/mnote-fuji-entry.c:168
 msgid "F1/Studio portrait"
@@ -4220,7 +4225,7 @@ msgstr "Manuelt: %liK"
 msgid "Manual: Unknown"
 msgstr "Manuelt: Ukendt"
 
-# Enkeltryk
+# Enkelttryk
 #: libexif/olympus/mnote-olympus-entry.c:734
 msgid "One-touch"
 msgstr "Et tryk"

[libexif-cvs] libexif ChangeLog,1.339,1.340

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29388

Modified Files:
	ChangeLog 
Log Message:
po/da.po: Updated Danish translation by Joe Hansen


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -p -d -r1.339 -r1.340
--- ChangeLog	23 Nov 2009 21:28:58 -0000	1.339
+++ ChangeLog	25 Nov 2009 21:26:22 -0000	1.340
@@ -1,3 +1,7 @@
+2009-11-25  Dan Fandrich <da...@co...>
+
+	* po/da.po: Updated Danish translation by Joe Hansen
+
 2009-11-23  Dan Fandrich <da...@co...>
 
 	* Include README-Win32.txt in all source distributions

[libexif-cvs] libexif/libexif exif-entry.c,1.136,1.137

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15594/libexif

Modified Files:
	exif-entry.c 
Log Message:
Add some comments


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -d -r1.136 -r1.137
--- exif-entry.c	13 Nov 2009 06:05:36 -0000	1.136
+++ exif-entry.c	25 Nov 2009 18:51:23 -0000	1.137
@@ -1459,8 +1459,8 @@ exif_entry_initialize (ExifEntry *e, Exi
 		exif_set_short (e->data, o, 3);
 		break;
 
-	case EXIF_TAG_COLOR_SPACE:
 	/* SHORT, 1 component, default 0xffff */
+	case EXIF_TAG_COLOR_SPACE:
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
@@ -1469,6 +1469,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		exif_set_short (e->data, o, 0xffff);
 		break;
 
+	/* SHORT, 3 components, default 8 8 8 */
 	case EXIF_TAG_BITS_PER_SAMPLE:
 		e->components = 3;
 		e->format = EXIF_FORMAT_SHORT;
@@ -1484,6 +1485,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 			o, 8);
 		break;
 
+	/* SHORT, 2 components, default 2 1 */
 	case EXIF_TAG_YCBCR_SUB_SAMPLING:
 		e->components = 2;
 		e->format = EXIF_FORMAT_SHORT;
@@ -1615,6 +1617,8 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->size = 0;
 		e->data = NULL;
 		break;
+
+	/* ASCII, default "[None]" */
 	case EXIF_TAG_IMAGE_DESCRIPTION:
 	case EXIF_TAG_MAKE:
 	case EXIF_TAG_MODEL:
@@ -1627,6 +1631,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		if (!e->data) break;
 		strncpy ((char *)e->data, _("[None]"), e->size);
 		break;
+	/* ASCII, default "[None]\0[None]\0" */
 	case EXIF_TAG_COPYRIGHT:
 		e->components = (strlen (_("[None]")) + 1) * 2;
 		e->format = EXIF_FORMAT_ASCII;
@@ -1637,17 +1642,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		strcpy (((char *)e->data) + strlen (_("[None]")) + 1, _("[None]"));
 		break;
 
-	/* UNDEFINED, no components, no default */
-	/* Use this if the tag is otherwise unsupported */
-	case EXIF_TAG_MAKER_NOTE:
-	case EXIF_TAG_USER_COMMENT:
-	default:
-		e->components = 0;
-		e->format = EXIF_FORMAT_UNDEFINED;
-		e->size = 0;
-		e->data = NULL;
-		break;
-
 	/* UNDEFINED, 1 component, default 1 */
 	case EXIF_TAG_SCENE_TYPE:
 		e->components = 1;
@@ -1668,7 +1662,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->data[0] = 0x03;
 		break;
 
-	/* UNDEFINED, 4 components, default 0 1 0 0 */
+	/* UNDEFINED, 4 components, default 48 49 48 48 */
         case EXIF_TAG_FLASH_PIX_VERSION:
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
@@ -1678,7 +1672,7 @@ exif_entry_initialize (ExifEntry *e, Exi
                 memcpy (e->data, "0100", 4);
                 break;
 
-        /* UNDEFINED, 4 components, default 0 2 1 0 */
+        /* UNDEFINED, 4 components, default 48 50 49 48 */
         case EXIF_TAG_EXIF_VERSION:
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
@@ -1688,7 +1682,7 @@ exif_entry_initialize (ExifEntry *e, Exi
                 memcpy (e->data, "0210", 4);
                 break;
 
-        /* UNDEFINED, 4 components, default 1,2,3,0 */
+        /* UNDEFINED, 4 components, default 1 2 3 0 */
         case EXIF_TAG_COMPONENTS_CONFIGURATION:
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
@@ -1700,5 +1694,16 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->data[2] = 3;
 		e->data[3] = 0;
                 break;
+
+	/* UNDEFINED, no components, no default */
+	/* Use this if the tag is otherwise unsupported */
+	case EXIF_TAG_MAKER_NOTE:
+	case EXIF_TAG_USER_COMMENT:
+	default:
+		e->components = 0;
+		e->format = EXIF_FORMAT_UNDEFINED;
+		e->size = 0;
+		e->data = NULL;
+		break;
 	}
 }

[libexif-cvs] libexif/libexif exif-tag.c,1.62,1.63

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

Update of /cvsroot/libexif/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15186/libexif

Modified Files:
	exif-tag.c 
Log Message:
Don't bother calling bindtextdomain in the error case


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -d -r1.62 -r1.63
--- exif-tag.c	8 Nov 2009 06:13:41 -0000	1.62
+++ exif-tag.c	25 Nov 2009 18:50:38 -0000	1.63
@@ -963,14 +963,6 @@ exif_tag_get_title_in_ifd (ExifTag tag, 
 	unsigned int i;
 	int first;
 
-	/* FIXME: This belongs to somewhere else. */
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	if (ifd >= EXIF_IFD_COUNT)
 		return NULL;
 	first = exif_tag_table_first(tag);
@@ -984,6 +976,14 @@ exif_tag_get_title_in_ifd (ExifTag tag, 
 		} else
 			return NULL; /* Recorded tag not found in the table */
 	}
+	/* FIXME: This belongs to somewhere else. */
+	/* libexif should use the default system locale.
+	 * If an application specifically requires UTF-8, then we
+	 * must give the application a way to tell libexif that.
+	 * 
+	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	 */
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].title);
 }
 
@@ -993,14 +993,6 @@ exif_tag_get_description_in_ifd (ExifTag
 	unsigned int i;
 	int first;
 
-	/* libexif should use the default system locale.
-	 * If an application specifically requires UTF-8, then we
-	 * must give the application a way to tell libexif that.
-	 * 
-	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	 */
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-
 	if (ifd >= EXIF_IFD_COUNT)
 		return NULL;
 	first = exif_tag_table_first(tag);
@@ -1018,6 +1010,14 @@ exif_tag_get_description_in_ifd (ExifTag
 	/* GNU gettext acts strangely when given an empty string */
 	if (!ExifTagTable[i].description || !*ExifTagTable[i].description)
 		return "";
+
+	/* libexif should use the default system locale.
+	 * If an application specifically requires UTF-8, then we
+	 * must give the application a way to tell libexif that.
+	 * 
+	 * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	 */
+	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	return _(ExifTagTable[i].description);
 }
 

[libexif-cvs] libexif-testsuite/tests check-add-tags.sh, NONE, 1.1 check-create-tags.sh, NONE, 1.1 check-remove-tags.sh, NONE, 1.1 Makefile.am, 1.28, 1.29

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

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32575/tests

Modified Files:
	Makefile.am 
Added Files:
	check-add-tags.sh check-create-tags.sh check-remove-tags.sh 
Log Message:
Added check-add-tags.sh to test correct adding of new tags
Added check-create-tags.sh to test correct creation of an EXIF tag block
Added check-remove-tags.sh to test correct removal of tags


--- NEW FILE: check-remove-tags.sh ---
#!/bin/sh
# Tests removal of existing tags.
# Tags within each sub-IFD are tested. Boundary conditions such as removing
# all tags within a sub-IFD, and all tags in file are also tested.

. check-vars.sh

originalimg="$SRCDIR/images/canon-powershot-g2-001.jpg"
srcimg="remove-tag-src.out.jpg"
dstimg="remove-tag.out.jpg"

append_image () {
	if [ -e "$dstimg" ] ; then
		mv -f "$dstimg" "$srcimg"
	fi
}

count_tags () {
	"$EXIFEXE" --no-fixup -m -i "$@" | grep '^0x' | wc -l
}

count_maker_tags () {
	env LANG=C LANGUAGE=C "$EXIFEXE" --no-fixup -m -i --show-mnote "$@" | grep "	" | wc -l
}

# Abort on any command failure
set -e

cp "$originalimg" "$srcimg"

# Count the number of tags
numtags=`count_tags "$srcimg"`
echo Starting with $numtags tags in the file
test "$numtags" -eq 46

nummaker=`count_maker_tags "$srcimg"`
echo and 78 MakerNote tags: $nummaker
test "$nummaker" -eq 78

# Remove tags in the order in which they appear in the IFD
TESTTAGS_Interoperability="0x0001 0x0002 0x1001 0x1002"
ifd=Interoperability
for tag in $TESTTAGS_Interoperability; do
	"$EXIFEXE" --no-fixup --tag=$tag --ifd=$ifd --remove -o "$dstimg" "$srcimg" >/dev/null
	append_image
done

numtags=`count_tags "$srcimg"`
echo Must be 42 tags remaining: $numtags
test "$numtags" -eq 42

nummaker=`count_maker_tags "$srcimg"`
echo and 78 MakerNote tags: $nummaker
test "$nummaker" -eq 78

# Remove tags in the reverse order in which they appear in the IFD
TESTTAGS_1="0x0128 0x011b 0x011a 0x0103"
ifd=1
for tag in $TESTTAGS_1; do
	"$EXIFEXE" --no-fixup --tag=$tag --ifd=$ifd --remove -o "$dstimg" "$srcimg" >/dev/null
	append_image
done

numtags=`count_tags "$srcimg"`
echo Must be 38 tags remaining: $numtags
test "$numtags" -eq 38

nummaker=`count_maker_tags "$srcimg"`
echo and 78 MakerNote tags: $nummaker
test "$nummaker" -eq 78

# Remove all tags in the 0 IFD (including the Make tag), leaving no tags
# except the EXIF sub-IFD tags
TESTTAGS_0="0x010f 0x0110 0x0112 0x011a	0x011b 0x0128 0x0132 0x0213"
ifd=0
for tag in $TESTTAGS_0; do
	"$EXIFEXE" --no-fixup --tag=$tag --ifd=$ifd --remove -o "$dstimg" "$srcimg" >/dev/null
	append_image
done

numtags=`count_tags "$srcimg"`
echo Must be 30 tags remaining: $numtags
test "$numtags" -eq 30

# Without the Make tag, the Canon MakerNote can't be decoded
nummaker=`count_maker_tags "$srcimg"`
echo and 0 MakerNote tags: $nummaker
test "$nummaker" -eq 0

# Remove all tags in the EXIF IFD (including MakerNote), leaving no tags at all
TESTTAGS_EXIF="0x829a 0x829d 0x9000 0x9003 0x9004 0x9101 0x9102 0x9201 0x9202 0x9204 0x9205 0x9207 0x9209 0x920a 0x927c 0x9286 0xa000 0xa001 0xa002 0xa003 0xa20e 0xa20f 0xa210 0xa217 0xa300 0xa401 0xa402 0xa403 0xa404 0xa406"
ifd=EXIF
for tag in $TESTTAGS_EXIF; do
	"$EXIFEXE" --no-fixup --tag=$tag --ifd=$ifd --remove -o "$dstimg" "$srcimg" >/dev/null
	append_image
done

numtags=`count_tags "$srcimg"`
echo Must be 0 tags remaining: $numtags
test "$numtags" -eq 0

nummaker=`count_maker_tags "$srcimg"`
echo and 0 MakerNote tags: $nummaker
test "$nummaker" -eq 0

rm -f "$srcimg" "$dstimg"

--- NEW FILE: check-add-tags.sh ---
#!/bin/sh
# Adds tags to an exiting EXIF file. Checks that the tag data is interpreted
# correctly from the command line. Tags representative of as many different
# data types as possible are included. Data inputs with extra spaces,
# plus and minus signs are tested.

. check-vars.sh

srcimg="add-tag-src.out.jpg"
dstimg="add-tag.out.jpg"
tmpfile="output.tmp"

error=0

check_result () {
	s="$?"
	if test "$s" -ne 0; then
		echo " FAILED (${s})."
		error=1
	fi
}

append_image () {
	if [ -e "$dstimg" ] ; then
		mv -f "$dstimg" "$srcimg"
	fi
}

echo Create an empty EXIF tag block
"$EXIFEXE" --create-exif --no-fixup -o "$srcimg" "$SRCDIR/images/no-exif.jpg"
check_result

echo Create SHORT value
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=FocalLengthIn35mmFilm --set-value='12345' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create SHORT value array
"$EXIFEXE" --no-fixup --ifd=0 --tag=YCbCrSubSampling --set-value='2 2' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo 'Create SHORT value (enum)'
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=SceneCaptureType --set-value='3' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo 'Create SHORT value (hex tag)'
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=0xa401 --set-value='2' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo 'Create SHORT value (decimal tag)'
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=41986 --set-value=1 -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo 'Create SHORT value (tag title)'
"$EXIFEXE" --no-fixup --ifd=EXIF --tag='White Balance' --set-value=1 -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create LONG value
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=PixelXDimension --set-value=64 -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create RATIONAL value
"$EXIFEXE" --no-fixup --ifd=0 --tag=XResolution --set-value=' 99  1' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create RATIONAL value array
"$EXIFEXE" --no-fixup --ifd=0 --tag=WhitePoint --set-value='+9 2   19  3 ' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create SRATIONAL value
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=ExposureBiasValue --set-value='-3 2' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create UNDEFINED value
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=SceneType --set-value=1 -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create UNDEFINED value array
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=FlashPixVersion --set-value='49 50 51 52' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo Create ASCII value
"$EXIFEXE" --no-fixup --ifd=0 --tag=ImageDescription --set-value='The image description' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

echo 'Create ASCII value (User Comment)'
"$EXIFEXE" --no-fixup --ifd=EXIF --tag=UserComment --set-value='The user comment' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

# Count the number of tags
numtags=`"$EXIFEXE" --no-fixup -m -i "$srcimg" | wc -l`
echo Must be 14 tags: $numtags
test "$numtags" -eq 14
check_result

# The remaining tests are failure mode tests

echo Test invalid RATIONAL--not enough components
"$EXIFEXE" --no-fixup --ifd=0 --tag=XResolution --set-value=99 -o "$dstimg" "$srcimg" >/dev/null || 
test "$?" -eq 1
check_result
append_image

echo Test invalid RATIONAL--not digits
"$EXIFEXE" --no-fixup --ifd=0 --tag=YResolution --set-value='9 b' -o "$dstimg" "$srcimg" >/dev/null
test "$?" -eq 1
check_result
append_image

echo Test invalid SHORT--no value
"$EXIFEXE" --no-fixup --ifd=0 --tag=FocalLengthIn35mmFilm --set-value='' -o "$dstimg" "$srcimg" >/dev/null
test "$?" -eq 1
check_result
append_image

echo Test invalid SHORT--invalid tag
"$EXIFEXE" --no-fixup --ifd=0 --tag=0xbbbb --set-value=1 -o "$dstimg" "$srcimg" >/dev/null
test "$?" -eq 1
check_result
append_image

echo Test invalid RATIONAL--too many components
# exif treats this as a warning and doesn't report an error code
"$EXIFEXE" --no-fixup --ifd=0 --tag=XResolution --set-value='12 2 3' -o "$dstimg" "$srcimg" >/dev/null
check_result
append_image

# Check the resulting EXIF file
env LANG=C LANGUAGE=C "$EXIFEXE" -m -i "$srcimg" >"$tmpfile"
"$DIFFEXE" "$tmpfile" - <<EOF
0x010e	The image description
0x011a	6.00
0x013e	4.50, 6.33
0x0212	YCbCr4:2:0
0x011b	72.00
0x0128	Inch
0x9204	-1.50 EV
0x9286	The user comment
0xa000	Unknown FlashPix Version
0xa002	64
0xa301	Directly photographed
0xa401	2
0xa402	Manual exposure
0xa403	Manual white balance
0xa405	12345
0xa406	Night scene
0x9000	Exif Version 2.1
0xa001	Uncalibrated
EOF

rm -f "$srcimg" "$dstimg" "$tmpfile"

echo Test complete: status $error
exit "$error"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -d -r1.28 -r1.29
--- Makefile.am	19 Nov 2009 01:44:52 -0000	1.28
+++ Makefile.am	24 Nov 2009 05:31:31 -0000	1.29
@@ -23,7 +23,10 @@ EXTRA_DIST = \
 	check-1054323.sh 1054323.jpg \
 	check-1169170.sh \
 	check-bid37022.sh bid37022.jpg \
-	check-tag-description.sh
+	check-tag-description.sh \
+	check-add-tags.sh \
+	check-create-tags.sh \
+	check-remove-tags.sh
 
 if HAVE_EXIF_CLI
 
@@ -34,15 +37,18 @@ check_SCRIPTS = \
 	check-1054322.sh \
 	check-1054323.sh \
 	check-1169170.sh \
-	check-bid37022.sh
+	check-bid37022.sh \
+	check-tag-description.sh \
+	check-add-tags.sh \
+	check-create-tags.sh \
+	check-remove-tags.sh
 
 # These check scripts may take a little longer - but are invaluable. :)
 check_SCRIPTS += check-general-images.sh \
 	check-readwrite-identity.sh \
 	check-readwrite-identity-nofixup.sh \
 	check-no-unknown-tags.sh \
-	check-all-mandatory-tags.sh \
-	check-tag-description.sh
+	check-all-mandatory-tags.sh
 
 TESTS = $(check_SCRIPTS)
 

--- NEW FILE: check-create-tags.sh ---
#!/bin/sh
# Tests the creation of new EXIF data.
# Checks that the expected tags are created, and that the --no-fixup option
# creates no tags, just an empty EXIF structure.

. check-vars.sh

dstimg="./create-tags.out.jpg"

# Abort on any command failure
set -e

echo Create an empty EXIF tag block
"$EXIFEXE" --create-exif --no-fixup -o "$dstimg" "$SRCDIR/images/no-exif.jpg"

# Count the number of tags
numtags=`"$EXIFEXE" --no-fixup -m -i "$dstimg" | wc -l`

echo Must be 0 tags: $numtags
test "$numtags" = 0

rm -f "$dstimg"

echo Create a EXIF tag block with mandatory and default tags
"$EXIFEXE" --create-exif -o "$dstimg" "$SRCDIR/images/no-exif.jpg"

# Count the number of tags
numtags=`"$EXIFEXE" --no-fixup -m -i "$dstimg" | wc -l`

echo Must be 11 tags: $numtags
test "$numtags" = 11

rm -f "$dstimg"

[libexif-cvs] libexif-testsuite NEWS,1.18,1.19

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

Update of /cvsroot/libexif/libexif-testsuite
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32575

Modified Files:
	NEWS 
Log Message:
Added check-add-tags.sh to test correct adding of new tags
Added check-create-tags.sh to test correct creation of an EXIF tag block
Added check-remove-tags.sh to test correct removal of tags


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -d -r1.18 -r1.19
--- NEWS	17 Nov 2009 05:46:36 -0000	1.18
+++ NEWS	24 Nov 2009 05:31:29 -0000	1.19
@@ -1,6 +1,8 @@
 New in 0.7.x:
   * Added check-tag-description.sh to test proper lookup of tag documentation
-
+  * Added check-add-tags.sh to test correct adding of new tags
+  * Added check-create-tags.sh to test correct creation of an EXIF tag block
+  * Added check-remove-tags.sh to test correct removal of tags
 
 New in 0.7.15:
   * Working with libexif and exif ver. 0.6.19

[libexif-cvs] libexif-testsuite/tests/images no-exif.jpg, NONE, 1.1 Makefile.am, 1.3, 1.4

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

Update of /cvsroot/libexif/libexif-testsuite/tests/images
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32575/tests/images

Modified Files:
	Makefile.am 
Added Files:
	no-exif.jpg 
Log Message:
Added check-add-tags.sh to test correct adding of new tags
Added check-create-tags.sh to test correct creation of an EXIF tag block
Added check-remove-tags.sh to test correct removal of tags


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/images/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- Makefile.am	5 May 2005 12:25:41 -0000	1.3
+++ Makefile.am	24 Nov 2009 05:31:31 -0000	1.4
@@ -1,7 +1,8 @@
 images = \
 	canon-digital-rebel-001.jpg	\
 	canon-powershot-g2-001.jpg	\
-	canon-powershot-a400-001.jpg
+	canon-powershot-a400-001.jpg	\
+	no-exif.jpg
 
 EXTRA_DIST = $(images)
 

--- NEW FILE: no-exif.jpg ---
(This appears to be a binary file; contents omitted.)

[libexif-cvs] libexif-testsuite .cvsignore,1.2,1.3

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

Update of /cvsroot/libexif/libexif-testsuite
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32121

Modified Files:
	.cvsignore 
Log Message:
Ignore a few more autotools files


Index: .cvsignore
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- .cvsignore	26 Mar 2005 19:19:59 -0000	1.2
+++ .cvsignore	24 Nov 2009 05:28:45 -0000	1.3
@@ -7,8 +7,12 @@ build-config.cm
 build-config.cvsroot*
 config.h
 config.h.in
+config.log
+config.status
 config.rpath
 configure
+libtool
 mkinstalldirs
+stamp-h1
 cvs2cl.usermap
 ChangeLog.cvs

[libexif-cvs] exif ChangeLog,1.107,1.108 NEWS,1.41,1.42

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

Update of /cvsroot/libexif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23760

Modified Files:
	ChangeLog NEWS 
Log Message:
Honour --machine-readable with --show-mnote


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -d -r1.41 -r1.42
--- NEWS	22 Nov 2009 05:52:52 -0000	1.41
+++ NEWS	24 Nov 2009 04:52:09 -0000	1.42
@@ -4,6 +4,7 @@ exif-0.6.x:
   * Fixed crash when not enough components were given to --set-value
   * Made --set-value more forgiving of whitespace
   * Allow --set-value on UNDEFINED tags (treated as a byte array)
+  * Honour --machine-readable with --show-mnote
 
 
 exif-0.6.19 (2009-11-12):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -d -r1.107 -r1.108
--- ChangeLog	22 Nov 2009 05:53:07 -0000	1.107
+++ ChangeLog	24 Nov 2009 04:52:09 -0000	1.108
@@ -1,3 +1,7 @@
+2009-11-23  Dan Fandrich <da...@co...>
+
+	* Honour --machine-readable with --show-mnote
+
 2009-11-21  Dan Fandrich <da...@co...>
 
 	* Increased the description width for the --list-tags command

[libexif-cvs] exif/exif actions.c,1.52,1.53 main.c,1.78,1.79

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

Update of /cvsroot/libexif/exif/exif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23760/exif

Modified Files:
	actions.c main.c 
Log Message:
Honour --machine-readable with --show-mnote


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -d -r1.78 -r1.79
--- main.c	20 Nov 2009 21:04:36 -0000	1.78
+++ main.c	24 Nov 2009 04:52:11 -0000	1.79
@@ -409,12 +409,17 @@ main (int argc, const char **argv)
 			action_set_value (ed, log, p);
 		else if (remove_tag)
 			action_remove_tag (ed, log, p);
-		else if (p.machine_readable)
+		else if (list_mnote) {
+			if (xml_output) {
+				exif_log (log, -1, "exif", _("XML format is "
+				  "not available for Maker Notes"));
+				return 1;
+			}
+			action_mnote_list (ed, p);
+		} else if (p.machine_readable)
 			action_tag_list_machine (ed, p);
 		else if (xml_output)
 			action_tag_list_xml (ed, p);
-		else if (list_mnote)
-			action_mnote_list (ed, p);
 		else if (create_exif)
 			/* Nothing here. Data will be saved later. */
 			;

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -d -r1.52 -r1.53
--- actions.c	22 Nov 2009 05:52:53 -0000	1.52
+++ actions.c	24 Nov 2009 04:52:11 -0000	1.53
@@ -472,14 +472,16 @@ action_mnote_list (ExifData *ed, ExifPar
 	}
 
 	c = exif_mnote_data_count (n);
-	switch (c) {
-	case 0:
-		printf (_("MakerNote does not contain any value.\n"));
-		break;
-	default:
-		printf (ngettext("MakerNote contains %i value:\n",
-			         "MakerNote contains %i values:\n",
-			 	 c), c);
+	if (!p.machine_readable) {
+		switch (c) {
+		case 0:
+			printf (_("MakerNote does not contain any value.\n"));
+			break;
+		default:
+			printf (ngettext("MakerNote contains %i value:\n",
+					 "MakerNote contains %i values:\n",
+					 c), c);
+		}
 	}
 	for (i = 0; i < c; i++) {
 	        if (p.use_ids) {
@@ -490,10 +492,13 @@ action_mnote_list (ExifData *ed, ExifPar
 			strncpy (b1, s && *s ? s : _("Unknown tag"), TAG_VALUE_BUF);
 			b1[sizeof(b1)-1] = 0;
 		}
-		fieldwidth = width = p.use_ids ? 6 : 20;
-		bytes = exif_mbstrlen(b1, &width);
-                printf ("%.*s%*s", bytes, b1, fieldwidth-width, "");
-		fputc ('|', stdout);
+		if (p.machine_readable) {
+			printf ("%s\t", b1);
+		} else {
+			fieldwidth = width = p.use_ids ? 6 : 20;
+			bytes = exif_mbstrlen(b1, &width);
+			printf ("%.*s%*s|", bytes, b1, fieldwidth-width, "");
+		}
 
 		s = C (exif_mnote_data_get_value (n, i, b, TAG_VALUE_BUF));
 		strncpy (b2, s ? s : _("Unknown value"), TAG_VALUE_BUF);

[libexif-cvs] libexif Makefile.am,1.46,1.47 ChangeLog,1.338,1.339

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

Update of /cvsroot/libexif/libexif
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10738

Modified Files:
	Makefile.am ChangeLog 
Log Message:
Include README-Win32.txt in all source distributions


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- Makefile.am	6 Nov 2008 06:54:48 -0000	1.46
+++ Makefile.am	23 Nov 2009 21:28:58 -0000	1.47
@@ -1,10 +1,6 @@
 SUBDIRS = m4m po libexif test doc binary contrib
 
-if SHIP_BINARIES
-README_W32_XDIST = README-Win32.txt
-endif
-
-EXTRA_DIST = @PACKAGE_TARNAME@.spec $(README_W32_XDIST)
+EXTRA_DIST = @PACKAGE_TARNAME@.spec README-Win32.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -p -d -r1.338 -r1.339
--- ChangeLog	17 Nov 2009 19:22:55 -0000	1.338
+++ ChangeLog	23 Nov 2009 21:28:58 -0000	1.339
@@ -1,3 +1,7 @@
+2009-11-23  Dan Fandrich <da...@co...>
+
+	* Include README-Win32.txt in all source distributions
+
 2009-11-16  Dan Fandrich <da...@co...>
 
 	* po/ja.po: Updated Japanese translation by Tadashi Jokagi

[libexif-cvs] exif ChangeLog,1.106,1.107

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

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

Modified Files:
	ChangeLog 
Log Message:
Allow --set-value on UNDEFINED tags (treated as a byte array)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -d -r1.106 -r1.107
--- ChangeLog	21 Nov 2009 23:47:13 -0000	1.106
+++ ChangeLog	22 Nov 2009 05:53:07 -0000	1.107
@@ -1,6 +1,7 @@
 2009-11-21  Dan Fandrich <da...@co...>
 
 	* Increased the description width for the --list-tags command
+	* Allow --set-value on UNDEFINED tags (treated as a byte array)
 
 2009-11-20  Dan Fandrich <da...@co...>
 

[libexif-cvs] exif NEWS,1.40,1.41

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

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

Modified Files:
	NEWS 
Log Message:
Allow --set-value on UNDEFINED tags (treated as a byte array)


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -d -r1.40 -r1.41
--- NEWS	21 Nov 2009 01:28:03 -0000	1.40
+++ NEWS	22 Nov 2009 05:52:52 -0000	1.41
@@ -3,6 +3,7 @@ exif-0.6.x:
   * --no-fixup now honoured during --create-exif to not create default tags
   * Fixed crash when not enough components were given to --set-value
   * Made --set-value more forgiving of whitespace
+  * Allow --set-value on UNDEFINED tags (treated as a byte array)
 
 
 exif-0.6.19 (2009-11-12):

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

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

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

Modified Files:
	actions.c 
Log Message:
Allow --set-value on UNDEFINED tags (treated as a byte array)


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -d -r1.51 -r1.52
--- actions.c	22 Nov 2009 00:32:21 -0000	1.51
+++ actions.c	22 Nov 2009 05:52:53 -0000	1.52
@@ -44,7 +44,7 @@ convert_arg_to_entry (const char *set_va
 	unsigned int i, numcomponents;
 	char *value_p, *buf;
 
-        /*
+	 /*
 	 * ASCII strings are handled separately,
 	 * since they don't require any conversion.
 	 */
@@ -63,6 +63,7 @@ convert_arg_to_entry (const char *set_va
                 }
 		if (e->tag == EXIF_TAG_USER_COMMENT) {
 			/* assume ASCII charset */
+			/* TODO: get this from the current locale */
 			memcpy ((char *) e->data, "ASCII\0\0\0", 8);
 			memcpy ((char *) e->data + 8, set_value, 
 				strlen (set_value));
@@ -135,11 +136,11 @@ convert_arg_to_entry (const char *set_va
 			break;
 		case EXIF_FORMAT_BYTE:
 		case EXIF_FORMAT_SBYTE:
+		case EXIF_FORMAT_UNDEFINED: /* treat as byte array */
 			e->data[s * i] = atoi (value_p);
 			break;
 		case EXIF_FORMAT_FLOAT:
 		case EXIF_FORMAT_DOUBLE:
-		case EXIF_FORMAT_UNDEFINED:
 		default:
 			fprintf (stderr, _("Not yet implemented!"));
 			fputc ('\n', stderr);