libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif exif-data.c,1.77,1.78 exif-tag.c,1.24,1.25 exif-tag.h,1.12,1.13

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

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

Modified Files:
	exif-data.c exif-tag.c exif-tag.h 
Log Message:
2005-04-26  Lutz Mueller <lu...@us...>

	* libexif/exif-tag.[c,h] (exif_tag_[name,title,description]_in_ifd): New.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- exif-tag.h	24 Apr 2005 19:01:12 -0000	1.12
+++ exif-tag.h	26 Apr 2005 20:17:46 -0000	1.13
@@ -25,6 +25,8 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <libexif/exif-ifd.h>
+
 typedef enum {
 	EXIF_TAG_INTEROPERABILITY_INDEX		= 0x0001,
 	EXIF_TAG_INTEROPERABILITY_VERSION	= 0x0002,
@@ -138,7 +140,46 @@ typedef enum {
 	EXIF_TAG_UNKNOWN_C4A5 = 0xc4a5
 } ExifTag;
 
-ExifTag         exif_tag_from_name       (const char *);
+/* GPS tags overlap with above ones. */
+#define EXIF_TAG_GPS_VERSION_ID        0x0000
+#define EXIF_TAG_GPS_LATITUDE_REF      0x0001 /* INTEROPERABILITY_INDEX   */
+#define EXIF_TAG_GPS_LATITUDE          0x0002 /* INTEROPERABILITY_VERSION */
+#define EXIF_TAG_GPS_LONGITUDE_REF     0x0003
+#define EXIF_TAG_GPS_LONGITUDE         0x0004
+#define EXIF_TAG_GPS_ALTITUDE_REF      0x0005
+#define EXIF_TAG_GPS_ALTITUDE          0x0006
+#define EXIF_TAG_GPS_TIME_STAMP        0x0007
+#define EXIF_TAG_GPS_SATELLITES        0x0008
+#define EXIF_TAG_GPS_STATUS            0x0009
+#define EXIF_TAG_GPS_MEASURE_MODE      0x000a
+#define EXIF_TAG_GPS_DOP               0x000b
+#define EXIF_TAG_GPS_SPEED_REF         0x000c
+#define EXIF_TAG_GPS_SPEED             0x000d
+#define EXIF_TAG_GPS_TRACK_REF         0x000e
+#define EXIF_TAG_GPS_TRACK             0x000f
+#define EXIF_TAG_GPS_IMG_DIRECTION_REF 0x0010
+#define EXIF_TAG_GPS_IMG_DIRECTION     0x0011
+#define EXIF_TAG_GPS_MAP_DATUM         0x0012
+#define EXIF_TAG_GPS_DEST_LATITUDE_REF 0x0013
+#define EXIF_TAG_GPS_DEST_LATITUDE     0x0014
+#define EXIF_TAG_GPS_DEST_LONGITUDE_REF 0x0015
+#define EXIF_TAG_GPS_DEST_LONGITUDE     0x0016
+#define EXIF_TAG_GPS_DEST_BEARING_REF   0x0017
+#define EXIF_TAG_GPS_DEST_BEARING       0x0018
+#define EXIF_TAG_GPS_DEST_DISTANCE_REF  0x0019
+#define EXIF_TAG_GPS_DEST_DISTANCE      0x001a
+#define EXIF_TAG_GPS_PROCESSING_METHOD  0x001b
+#define EXIF_TAG_GPS_AREA_INFORMATION   0x001c
+#define EXIF_TAG_GPS_DATE_STAMP         0x001d
+#define EXIF_TAG_GPS_DIFFERENTIAL       0x001e
+
+
+ExifTag         exif_tag_from_name              (const char *);
+const char     *exif_tag_get_name_in_ifd        (ExifTag, ExifIfd);
+const char     *exif_tag_get_title_in_ifd       (ExifTag, ExifIfd);
+const char     *exif_tag_get_description_in_ifd (ExifTag, ExifIfd);
+
+/* Don't use these functions. They are here for compatibility only. */
 const char     *exif_tag_get_name        (ExifTag tag);
 const char     *exif_tag_get_title       (ExifTag tag);
 const char     *exif_tag_get_description (ExifTag tag);

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- exif-tag.c	24 Apr 2005 19:01:12 -0000	1.24
+++ exif-tag.c	26 Apr 2005 20:17:46 -0000	1.25
@@ -30,7 +30,8 @@ typedef enum {
 	ESL_MANDATORY    = 1, /* Mandatory               */
 	ESL_CMANDATORY   = 2, /* Conditionally mandatory */
 	ESL_OPTIONAL     = 3, /* Optional                */
-	ESL_NOT_RECORDED = 4  /* Not recorded            */
+	ESL_COPTIONAL    = 5, /* Conditionally optional  */
+	ESL_NOT_RECORDED = 6  /* Not recorded            */
 } ExifSL;                     /* Exif Support Level      */
 
 static struct {
@@ -38,7 +39,7 @@ static struct {
 	const char *name;
 	const char *title;
 	const char *description;
-	ExifSL esl_0[4], esl_1[4], esl_exif[4], esl_gps[4];
+	ExifSL esl[EXIF_IFD_COUNT];
 } ExifTagTable[] = {
 	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
 	 "New Subfile Type", N_("A general indication of the kind of data "
@@ -49,9 +50,13 @@ static struct {
 	    "Use \"R98\" for stating ExifR98 Rules. Four bytes used "
 	    "including the termination code (NULL). see the separate "
 	    "volume of Recommended Exif Interoperability Rules (ExifR98) "
-	    "for other tags used for ExifR98.")},
+	    "for other tags used for ExifR98."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_NOT_RECORDED, ESL_COPTIONAL}},
 	{EXIF_TAG_INTEROPERABILITY_VERSION, "InteroperabilityVersion",
-	 "InteroperabilityVersion", ""},
+	 "InteroperabilityVersion", "",
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_NOT_RECORDED, ESL_OPTIONAL}},
 	{EXIF_TAG_IMAGE_WIDTH, "ImageWidth", N_("Image Width"),
 	 N_("The number of columns of image data, equal to the number of "
 	    "pixels per row. In JPEG compressed data a JPEG marker is "
@@ -270,7 +275,7 @@ static struct {
 	 N_("The F number.")},
 	{EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""},
 	{EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""},
-	{EXIF_TAG_EXIF_IFD_POINTER, "ExifIFDPointer", "ExifIFDPointer",
+	{EXIF_TAG_EXIF_IFD_POINTER, "ExifIfdPointer", "ExifIFDPointer",
 	 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
 	    "same structure as that of the IFD specified in TIFF. "
 	    "ordinarily, however, it does not contain image data as in "
@@ -290,36 +295,59 @@ static struct {
 	 N_("A pointer to the GPS Info IFD. The "
 	    "Interoperability structure of the GPS Info IFD, like that of "
 	    "Exif IFD, has no image data.")},
-#if 0
-	{EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", "",
+	{EXIF_TAG_GPS_VERSION_ID, "GPSVersionID", N_("GPS tag version"),
 	 N_("Indicates the version of <GPSInfoIFD>. The version is given "
 	    "as 2.0.0.0. This tag is mandatory when <GPSInfo> tag is "
 	    "present. (Note: The <GPSVersionID tag is given in bytes, "
 	    "unlike the <ExifVersion> tag. When the version is "
-	    "2.0.0.0, the tag value is 02000000.H).")},
-	{EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", ""
+	    "2.0.0.0, the tag value is 02000000.H)."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_LATITUDE_REF, "GPSLatitudeRef", N_("North or South Latitude"),
 	 N_("Indicates whether the latitude is north or south latitude. The "
 	    "ASCII value 'N' indicates north latitude, and 'S' is south "
-	    "latitude.")},
-	{EXIF_TAG_GPS_LATITUDE, "GPSLatitude", ""
+	    "latitude."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_LATITUDE, "GPSLatitude", N_("Latitude"),
 	 N_("Indicates the latitude. The latitude is expressed as three "
 	    "RATIONAL values giving the degrees, minutes, and seconds, "
 	    "respectively. When degrees, minutes and seconds are expressed, "
 	    "the format is dd/1,mm/1,ss/1. When degrees and minutes are used "
 	    "and, for example, fractions of minutes are given up to two "
-	    "two decimal places, the format is dd/1,mmmm/100,0/1.")},
-	{EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", ""
+	    "two decimal places, the format is dd/1,mmmm/100,0/1."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_LONGITUDE_REF, "GPSLongitudeRef", N_("East or West Longitude"),
 	 N_("Indicates whether the longitude is east or west longitude. "
 	    "ASCII 'E' indicates east longitude, and 'W' is west "
-	    "longitude.")},
-	{EXIF_TAG_GPS_LONGITUDE, "GPSLongitude", ""
+	    "longitude."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_LONGITUDE, "GPSLongitude", N_("Longitude"),
 	 N_("Indicates the longitude. The longitude is expressed as three "
 	    "RATIONAL values giving the degrees, minutes, and seconds, "
 	    "respectively. When degrees, minutes and seconds are expressed, "
 	    "the format is ddd/1,mm/1,ss/1. When degrees and minutes are "
 	    "used and, for example, fractions of minutes are given up to "
-	    "two decimal places, the format is ddd/1,mmmm/100,0/1.")}, 
-#endif
+	    "two decimal places, the format is ddd/1,mmmm/100,0/1."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+	  ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_ALTITUDE_REF, "GPSAltitudeRef", N_("Altitude reference"),
+	 N_("Indicates the altitude used as the reference altitude. If the "
+	    "reference is sea level and the altitude is above sea level, 0 "
+			"is given. If the altitude is below sea level, a value of 1 is given "
+			"and the altitude is indicated as an absolute value in the "
+			"GSPAltitude tag. The reference unit is meters. Note that this tag "
+			"is BYTE type, unlike other reference tags."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+		ESL_OPTIONAL, ESL_NOT_RECORDED}},
+	{EXIF_TAG_GPS_ALTITUDE, "GPSAltitude", N_("Altitude"),
+	 N_("Indicates the altitude based on the reference in GPSAltitudeRef. "
+			"Altitude is expressed as one RATIONAL value. The reference unit "
+			"is meters."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+		ESL_OPTIONAL, ESL_NOT_RECORDED}},
 	{EXIF_TAG_ISO_SPEED_RATINGS, "ISOSpeedRatings",
 	 N_("ISO Speed Ratings"),
 	 N_("Indicates the ISO Speed and ISO Latitude of the camera or "
@@ -488,7 +516,9 @@ static struct {
 	    "the same as TIFF defined IFD structure "
 	    "but does not contain the "
 	    "image data characteristically compared with normal TIFF "
-	    "IFD.")},
+	    "IFD."),
+	 {ESL_NOT_RECORDED, ESL_NOT_RECORDED, ESL_NOT_RECORDED,
+		ESL_NOT_RECORDED, ESL_OPTIONAL}},
 	{EXIF_TAG_FLASH_ENERGY, "FlashEnergy", N_("Flash Energy"),
 	 N_("Indicates the strobe energy at the time the image is "
 	    "captured, as measured in Beam Candle Power Seconds (BCPS).")},
@@ -627,19 +657,19 @@ exif_tag_table_count (void)
 }
 
 const char *
-exif_tag_get_name (ExifTag tag)
+exif_tag_get_name_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
 
+	if (ifd >= EXIF_IFD_COUNT) return NULL;
 	for (i = 0; ExifTagTable[i].name; i++)
-		if (ExifTagTable[i].tag == tag)
-			break;
-
+		if ((ExifTagTable[i].tag == tag) &&
+		    (ExifTagTable[i].esl[ifd] != ESL_NOT_RECORDED)) break;
 	return ExifTagTable[i].name;
 }
 
 const char *
-exif_tag_get_title (ExifTag tag)
+exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
 
@@ -647,24 +677,61 @@ exif_tag_get_title (ExifTag tag)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
+	if (ifd >= EXIF_IFD_COUNT) return NULL;
 	for (i = 0; ExifTagTable[i].title; i++)
-		if (ExifTagTable[i].tag == tag) break;
+		if ((ExifTagTable[i].tag == tag) &&
+		    (ExifTagTable[i].esl[ifd] != ESL_NOT_RECORDED)) break;
 	return _(ExifTagTable[i].title);
 }
 
 const char *
-exif_tag_get_description (ExifTag tag)
+exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
 {
 	unsigned int i;
 
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 
+	if (ifd >= EXIF_IFD_COUNT) return NULL;
 	for (i = 0; ExifTagTable[i].description; i++)
-		if (ExifTagTable[i].tag == tag) break;
+		if ((ExifTagTable[i].tag == tag) &&
+		    (ExifTagTable[i].esl[ifd] != ESL_NOT_RECORDED)) break;
 	return _(ExifTagTable[i].description);
 }
 
+const char *
+exif_tag_get_name (ExifTag tag)
+{
+	return
+		exif_tag_get_name_in_ifd (tag, EXIF_IFD_0) ? :
+		exif_tag_get_name_in_ifd (tag, EXIF_IFD_1) ? :
+		exif_tag_get_name_in_ifd (tag, EXIF_IFD_EXIF) ? :
+		exif_tag_get_name_in_ifd (tag, EXIF_IFD_INTEROPERABILITY) ? :
+		exif_tag_get_name_in_ifd (tag, EXIF_IFD_GPS);
+}
+
+const char *
+exif_tag_get_title (ExifTag tag)
+{
+	return
+		exif_tag_get_title_in_ifd (tag, EXIF_IFD_0) ? :
+		exif_tag_get_title_in_ifd (tag, EXIF_IFD_1) ? :
+		exif_tag_get_title_in_ifd (tag, EXIF_IFD_EXIF) ? :
+		exif_tag_get_title_in_ifd (tag, EXIF_IFD_INTEROPERABILITY) ? :
+		exif_tag_get_title_in_ifd (tag, EXIF_IFD_GPS);
+}
+
+const char *
+exif_tag_get_description (ExifTag tag)
+{
+	return
+		exif_tag_get_description_in_ifd (tag, EXIF_IFD_0) ? :
+		exif_tag_get_description_in_ifd (tag, EXIF_IFD_1) ? :
+		exif_tag_get_description_in_ifd (tag, EXIF_IFD_EXIF) ? :
+		exif_tag_get_description_in_ifd (tag, EXIF_IFD_INTEROPERABILITY) ? :
+		exif_tag_get_description_in_ifd (tag, EXIF_IFD_GPS);
+}
+
 ExifTag 
 exif_tag_from_name (const char *name)
 {

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -d -r1.77 -r1.78
--- exif-data.c	25 Apr 2005 20:50:05 -0000	1.77
+++ exif-data.c	26 Apr 2005 20:17:45 -0000	1.78
@@ -368,15 +368,10 @@ exif_data_load_data_content (ExifData *d
 
 			/*
 			 * If we don't know the tag, don't fail. It could be that new 
-			 * versions of the standard have defined additional tags. 0 is 
-			 * certainly not a valid tag.
+			 * versions of the standard have defined additional tags. Note that
+			 * 0 is a valid tag in the GPS IFD.
 			 */
 			if (!exif_tag_get_name (tag)) {
-				if (!tag) {
-					exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-							"Invalid tag 0x0000. Ignoring this entry.");
-					break;
-				}
 				exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
 				  "Unknown tag %x (entry %i). Please report this tag "
 					"to <lib...@li...>.", tag, i);

[libexif-cvs] libexif/libexif exif-entry.c,1.82,1.83

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

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

Modified Files:
	exif-entry.c 
Log Message:
2005-04-25  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c (exif_entry_fix): '\0...' as USER_COMMENT is ok, too.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -d -r1.82 -r1.83
--- exif-entry.c	24 Apr 2005 19:01:11 -0000	1.82
+++ exif-entry.c	25 Apr 2005 21:06:20 -0000	1.83
@@ -255,21 +255,27 @@ exif_entry_fix (ExifEntry *e)
 				exif_format_get_name (e->format));
 			e->format = EXIF_FORMAT_UNDEFINED;
 		}
+
+		/* If the tag is all empty, there's nothing to do. */
+		for (i = 0; (i < e->size) && !e->data[i]; i++);
+		if (i && (i == e->size) && (i >= 8)) break;
+
 		/* Some packages like Canon ZoomBrowser EX 4.5 store
 		   only one zero byte followed by 7 bytes of rubbish */
 		if ((e->size >= 8) && (e->data[0] == 0)) {
 			memcpy(e->data, "\0\0\0\0\0\0\0\0", 8);
 		}
 
-		/*
-		 * Some cameras fill the tag with '\0' or ' '. There is nothing
-		 * wrong about it.
-		 */
-		for (i = 0; i < e->size &&
-			    (!e->data[i] || (e->data[i] == ' ')); i++);
-		if (i && (i == e->size))
-			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
-				"Tag 'UserComment' is empty. This has not been changed.");
+		/* Some cameras fill the tag with ' '. This is wrong. */
+		for (i = 0; (i < e->size) && (e->data[i] == ' '); i++);
+		if (i && (i == e->size)) {
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG, 
+					"The value of 'UserComment' is against specification. The value "
+					"has been reset.");
+			exif_mem_free (e->priv->mem, e->data);
+			e->data = NULL;
+			e->size = 0;
+		}
 
 		/* There need to be at least 8 bytes. */
 		if (e->size < 8) {
@@ -297,7 +303,7 @@ exif_entry_fix (ExifEntry *e)
 		 * afterwards, let's assume ASCII and claim the 8 first
 		 * bytes for the format specifyer.
 		 */
-		if (i >= 8) {
+		if (e->size >= 8) {
 			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
 				"Tag 'UserComment' did not start with "
 				"format identifyer. This has been fixed.");

[libexif-cvs] libexif ChangeLog,1.206,1.207

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

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

Modified Files:
	ChangeLog 
Log Message:
2005-04-25  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c (exif_entry_fix): '\0...' as USER_COMMENT is ok, too.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -d -r1.206 -r1.207
--- ChangeLog	25 Apr 2005 20:50:04 -0000	1.206
+++ ChangeLog	25 Apr 2005 21:06:19 -0000	1.207
@@ -1,5 +1,9 @@
 2005-04-25  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-data.c (exif_entry_fix): '\0...' as USER_COMMENT is ok, too.
+
+2005-04-25  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-data.c: Make it compile again.
 
 2005-04-24  Lutz Mueller <lu...@us...>

[libexif-cvs] libexif ChangeLog,1.205,1.206

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

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

Modified Files:
	ChangeLog 
Log Message:

2005-04-25  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c: Make it compile again.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -p -d -r1.205 -r1.206
--- ChangeLog	24 Apr 2005 19:01:09 -0000	1.205
+++ ChangeLog	25 Apr 2005 20:50:04 -0000	1.206
@@ -1,3 +1,7 @@
+2005-04-25  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-data.c: Make it compile again.
+
 2005-04-24  Lutz Mueller <lu...@us...>
 
 	* exif-data.[c,h] (exif_data_option_get_[name,description]),

[libexif-cvs] libexif/libexif exif-data.c,1.76,1.77

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

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

Modified Files:
	exif-data.c 
Log Message:

2005-04-25  Lutz Mueller <lu...@us...>

	* libexif/exif-data.c: Make it compile again.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -d -r1.76 -r1.77
--- exif-data.c	24 Apr 2005 19:01:11 -0000	1.76
+++ exif-data.c	25 Apr 2005 20:50:05 -0000	1.77
@@ -1053,10 +1053,10 @@ exif_data_get_log (ExifData *data)
 	return data->priv->log;
 }
 
-typedef struct {
+static struct {
 	ExifDataOption option;
 	const char *name;
-	const char *description
+	const char *description;
 } exif_data_option[] = {
 	{EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS, N_("Ignore unknown tags"),
 		N_("Ignore unknown tags when loading EXIF data.")},

[libexif-cvs] exif configure.ac,1.2,1.3

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

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

Modified Files:
	configure.ac 
Log Message:
add hint about how to get a missing m4m/ directory

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/exif/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- configure.ac	18 Apr 2005 15:46:03 -0000	1.2
+++ configure.ac	25 Apr 2005 18:06:43 -0000	1.3
@@ -4,6 +4,21 @@ AC_CONFIG_SRCDIR([exif/main.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
 
+if test ! -d "$srcdir/m4m"; then
+AC_MSG_ERROR([
+You are missing the m4m/ directory in your top
+$PACKAGE_TARNAME source directory.
+
+You are probably using an ill-maintained CVS tree.
+Running
+
+    cd $srcdir
+    cvs co m4m
+
+and re-running autogen.sh might help.
+])
+fi
+
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
 GP_CONFIG_MSG([Source code location],[${srcdir}])

[libexif-cvs] libexif-gtk configure.ac,1.2,1.3

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

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

Modified Files:
	configure.ac 
Log Message:
add hint about how to get a missing m4m/ directory

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- configure.ac	15 Apr 2005 04:25:12 -0000	1.2
+++ configure.ac	25 Apr 2005 18:06:46 -0000	1.3
@@ -4,6 +4,21 @@ AC_CONFIG_SRCDIR([libexif-gtk/gtk-exif-b
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
 
+if test ! -d "$srcdir/m4m"; then
+AC_MSG_ERROR([
+You are missing the m4m/ directory in your top
+$PACKAGE_TARNAME source directory.
+
+You are probably using an ill-maintained CVS tree.
+Running
+
+    cd $srcdir
+    cvs co m4m
+
+and re-running autogen.sh might help.
+])
+fi
+
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
 GP_CONFIG_MSG([Source code location],[${srcdir}])

[libexif-cvs] libexif configure.ac,1.6,1.7

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

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

Modified Files:
	configure.ac 
Log Message:
add hint about how to get a missing m4m/ directory

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- configure.ac	24 Apr 2005 09:01:05 -0000	1.6
+++ configure.ac	25 Apr 2005 18:06:45 -0000	1.7
@@ -4,6 +4,21 @@ AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
 
+if test ! -d "$srcdir/m4m"; then
+AC_MSG_ERROR([
+You are missing the m4m/ directory in your top
+$PACKAGE_TARNAME source directory.
+
+You are probably using an ill-maintained CVS tree.
+Running
+
+    cd $srcdir
+    cvs co m4m
+
+and re-running autogen.sh might help.
+])
+fi
+
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
 GP_CONFIG_MSG([Source code location],[${srcdir}])

[libexif-cvs] gexif configure.ac,1.2,1.3

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

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

Modified Files:
	configure.ac 
Log Message:
add hint about how to get a missing m4m/ directory

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/gexif/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- configure.ac	18 Apr 2005 15:46:36 -0000	1.2
+++ configure.ac	25 Apr 2005 18:06:44 -0000	1.3
@@ -4,6 +4,21 @@ AC_CONFIG_SRCDIR([gexif/gexif.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([gnu 1.8 dist-bzip2])
 
+if test ! -d "$srcdir/m4m"; then
+AC_MSG_ERROR([
+You are missing the m4m/ directory in your top
+$PACKAGE_TARNAME source directory.
+
+You are probably using an ill-maintained CVS tree.
+Running
+
+    cd $srcdir
+    cvs co m4m
+
+and re-running autogen.sh might help.
+])
+fi
+
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
 GP_CONFIG_MSG([Source code location],[${srcdir}])

[libexif-cvs] libexif/libexif exif-data.c,1.75,1.76 exif-data.h,1.10,1.11 exif-entry.c,1.81,1.82 exif-tag.c,1.23,1.24 exif-tag.h,1.11,1.12

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

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

Modified Files:
	exif-data.c exif-data.h exif-entry.c exif-tag.c exif-tag.h 
Log Message:
2005-04-24  Lutz Mueller <lu...@us...>

	* exif-data.[c,h] (exif_data_option_get_[name,description]),
	(exif_data_[set,unset]_option): New
	* exif-tag.[c,h]: EXIF_TAG_GAMMA: New.
	* exif-entry.c: (exif_entry_fix) Accept empty entries.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- exif-tag.h	10 Nov 2004 18:38:34 -0000	1.11
+++ exif-tag.h	24 Apr 2005 19:01:12 -0000	1.12
@@ -133,7 +133,9 @@ typedef enum {
 	EXIF_TAG_SHARPNESS			= 0xa40a,
 	EXIF_TAG_DEVICE_SETTING_DESCRIPTION	= 0xa40b,
 	EXIF_TAG_SUBJECT_DISTANCE_RANGE		= 0xa40c,
-	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420
+	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420,
+	EXIF_TAG_GAMMA = 0xa500,
+	EXIF_TAG_UNKNOWN_C4A5 = 0xc4a5
 } ExifTag;
 
 ExifTag         exif_tag_from_name       (const char *);

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- exif-tag.c	25 Mar 2005 04:13:02 -0000	1.23
+++ exif-tag.c	24 Apr 2005 19:01:12 -0000	1.24
@@ -596,6 +596,10 @@ static struct {
 	 N_("This tag indicates an identifier assigned uniquely to "
 	    "each image. It is recorded as an ASCII string equivalent "
 	    "to hexadecimal notation and 128-bit fixed length.")},
+	{EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
+	 N_("Indicates the value of coefficient gamma.")},
+	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
+	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
 	{0, NULL, NULL, NULL}
 };
 

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -d -r1.81 -r1.82
--- exif-entry.c	25 Mar 2005 04:13:01 -0000	1.81
+++ exif-entry.c	24 Apr 2005 19:01:11 -0000	1.82
@@ -261,18 +261,15 @@ exif_entry_fix (ExifEntry *e)
 			memcpy(e->data, "\0\0\0\0\0\0\0\0", 8);
 		}
 
-		/* Some cameras fill the tag with '\0' or ' '. */
+		/*
+		 * Some cameras fill the tag with '\0' or ' '. There is nothing
+		 * wrong about it.
+		 */
 		for (i = 0; i < e->size &&
 			    (!e->data[i] || (e->data[i] == ' ')); i++);
-		if (i && (i == e->size)) {
+		if (i && (i == e->size))
 			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
-				"Tag 'UserComment' contained unnecessary "
-				"data which has been removed.");
-			exif_mem_free (e->priv->mem, e->data);
-			e->data = NULL;
-			e->size = 0;
-			e->components = 0;
-		}
+				"Tag 'UserComment' is empty. This has not been changed.");
 
 		/* There need to be at least 8 bytes. */
 		if (e->size < 8) {

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -d -r1.75 -r1.76
--- exif-data.c	24 Apr 2005 09:02:16 -0000	1.75
+++ exif-data.c	24 Apr 2005 19:01:11 -0000	1.76
@@ -66,6 +66,8 @@ struct _ExifDataPrivate
 
 	/* Temporarily used while loading data */
 	unsigned int offset_mnote;
+
+	ExifDataOption options;
 };
 
 static void *
@@ -125,6 +127,10 @@ exif_data_new_mem (ExifMem *mem)
 		data->ifd[i]->parent = data;
 	}
 
+	/* Standard options */
+	exif_data_set_option (data, EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS);
+	exif_data_set_option (data, EXIF_DATA_OPTION_FIX_INVALID_FORMAT);
+
 	return (data);
 }
 
@@ -187,7 +193,8 @@ exif_data_load_data_entry (ExifData *dat
 		data->priv->offset_mnote = doff;
 	}
 
-	exif_entry_fix (entry);
+	if (data->priv->options & EXIF_DATA_OPTION_FIX_INVALID_FORMAT)
+		exif_entry_fix (entry);
 }
 
 static void
@@ -360,13 +367,21 @@ exif_data_load_data_content (ExifData *d
 		default:
 
 			/*
-			 * If we don't know the tag, chances are high
-			 * that the EXIF data does not follow the standard.
+			 * If we don't know the tag, don't fail. It could be that new 
+			 * versions of the standard have defined additional tags. 0 is 
+			 * certainly not a valid tag.
 			 */
 			if (!exif_tag_get_name (tag)) {
+				if (!tag) {
+					exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+							"Invalid tag 0x0000. Ignoring this entry.");
+					break;
+				}
 				exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
-				  "Unknown tag %x (entry %i)", tag, i);
-				return;
+				  "Unknown tag %x (entry %i). Please report this tag "
+					"to <lib...@li...>.", tag, i);
+				if (data->priv->options & EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS)
+					break;
 			}
 			entry = exif_entry_new_mem (data->priv->mem);
 			exif_data_load_data_entry (data, entry, d, ds,
@@ -1037,3 +1052,52 @@ exif_data_get_log (ExifData *data)
 	if (!data || !data->priv) return NULL;
 	return data->priv->log;
 }
+
+typedef struct {
+	ExifDataOption option;
+	const char *name;
+	const char *description
+} exif_data_option[] = {
+	{EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS, N_("Ignore unknown tags"),
+		N_("Ignore unknown tags when loading EXIF data.")},
+	{EXIF_DATA_OPTION_FIX_INVALID_FORMAT, N_("Fix invalid format"),
+		N_("Automatically fix the format of entries "
+				"that are not in the correct format.")},
+	{0, NULL, NULL}
+};
+
+const char *
+exif_data_option_get_name (ExifDataOption o)
+{
+	unsigned int i;
+
+	for (i = 0; exif_data_option[i].name; i++)
+		if (exif_data_option[i].option == o) break;
+	return _(exif_data_option[i].name);
+}
+
+const char *
+exif_data_option_get_description (ExifDataOption o)
+{
+	unsigned int i;
+
+	for (i = 0; exif_data_option[i].description; i++)
+		if (exif_data_option[i].option == o) break;
+	return _(exif_data_option[i].description);
+}
+
+void
+exif_data_set_option (ExifData *d, ExifDataOption o)
+{
+	if (!d) return;
+
+	d->priv->options |= o;
+}
+
+void
+exif_data_unset_option (ExifData *d, ExifDataOption o)
+{
+	if (!d) return;
+
+	d->priv->options &= ~o;
+}

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- exif-data.h	12 Apr 2005 03:27:09 -0000	1.10
+++ exif-data.h	24 Apr 2005 19:01:11 -0000	1.11
@@ -80,6 +80,17 @@ void          exif_data_foreach_content 
 					 ExifDataForeachContentFunc func,
 					 void *user_data);
 
+typedef enum {
+	EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS = 1 << 0,
+	EXIF_DATA_OPTION_FIX_INVALID_FORMAT  = 1 << 1
+} ExifDataOption;
+
+const char *exif_data_option_get_name        (ExifDataOption);
+const char *exif_data_option_get_description (ExifDataOption);
+
+void exif_data_set_option   (ExifData *, ExifDataOption);
+void exif_data_unset_option (ExifData *, ExifDataOption);
+
 /* For debugging purposes and error reporting */
 void exif_data_dump (ExifData *data);
 void exif_data_log  (ExifData *data, ExifLog *log);

[libexif-cvs] libexif ChangeLog,1.204,1.205

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

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

Modified Files:
	ChangeLog 
Log Message:
2005-04-24  Lutz Mueller <lu...@us...>

	* exif-data.[c,h] (exif_data_option_get_[name,description]),
	(exif_data_[set,unset]_option): New
	* exif-tag.[c,h]: EXIF_TAG_GAMMA: New.
	* exif-entry.c: (exif_entry_fix) Accept empty entries.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -d -r1.204 -r1.205
--- ChangeLog	15 Apr 2005 19:37:41 -0000	1.204
+++ ChangeLog	24 Apr 2005 19:01:09 -0000	1.205
@@ -1,3 +1,10 @@
+2005-04-24  Lutz Mueller <lu...@us...>
+
+	* exif-data.[c,h] (exif_data_option_get_[name,description]),
+	(exif_data_[set,unset]_option): New
+	* exif-tag.[c,h]: EXIF_TAG_GAMMA: New.
+	* exif-entry.c: (exif_entry_fix) Accept empty entries.
+
 2005-04-15  Lutz Mueller <lu...@us...>
 
 	Submitted by Hongli Lai <h....@ch...>:

[libexif-cvs] libexif/test/nls Makefile.am,1.5,1.6

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

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

Modified Files:
	Makefile.am 
Log Message:
ship test-codeset.c in tarball

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/test/nls/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- Makefile.am	19 Apr 2005 01:49:05 -0000	1.5
+++ Makefile.am	24 Apr 2005 09:05:14 -0000	1.6
@@ -27,7 +27,7 @@ CLEANFILES = $(check_SCRIPTS)
 
 # test_nls_LDADD = $(top_builddir)/libexif/libexif.la $(INTLLIBS)
 
-EXTRA_DIST = check-localedir.in check-nls.in test-nls.c
+EXTRA_DIST = check-localedir.in check-nls.in test-nls.c test-codeset.c
 
 %.sh: %.in Makefile
 	sed 's|@top_builddir\@|$(top_builddir)|g;s|@localedir\@|$(localedir)|g;s|@PRINT_LOCALEDIR\@|./print-localedir$(EXEEXT)|g;s|@build_alias\@|$(build_alias)|g;s|@host_alias\@|$(host_alias)|g;s|@codeset_tests\@|$(codeset_tests)|g;s|@DESTDIR\@|$(DESTDIR)|g' < $< > $@

[libexif-cvs] libexif/test/nls check-localedir.in,1.1,1.2

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

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

Modified Files:
	check-localedir.in 
Log Message:
fix for non-POSIX sh

Index: check-localedir.in
===================================================================
RCS file: /cvsroot/libexif/libexif/test/nls/check-localedir.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-localedir.in	13 Mar 2005 01:55:42 -0000	1.1
+++ check-localedir.in	24 Apr 2005 09:04:41 -0000	1.2
@@ -4,7 +4,7 @@ localedir="@localedir@"
 build_alias="@build_alias@"
 host_alias="@host_alias@"
 
-binlocaledir="$(@PRINT_LOCALEDIR@ 2> /dev/null)"
+binlocaledir="`@PRINT_LOCALEDIR@ 2> /dev/null`"
 
 if test "${localedir}" = "${binlocaledir}"; then
     echo "Makefile and binary agree on localedir \`${localedir}'. Good."

[libexif-cvs] libexif/libexif exif-content.c,1.15,1.16

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

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

Modified Files:
	exif-content.c 
Log Message:
comment unused constant

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- exif-content.c	15 Nov 2004 22:41:05 -0000	1.15
+++ exif-content.c	24 Apr 2005 09:03:15 -0000	1.16
@@ -26,7 +26,9 @@
 #include <stdio.h>
 #include <string.h>
 
-static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
+/* unused constant
+ * static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
+ */
 
 struct _ExifContentPrivate
 {

[libexif-cvs] libexif/libexif exif-data.c,1.74,1.75

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

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

Modified Files:
	exif-data.c 
Log Message:
readability cosmetics

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -d -r1.74 -r1.75
--- exif-data.c	30 Mar 2005 09:04:40 -0000	1.74
+++ exif-data.c	24 Apr 2005 09:02:16 -0000	1.75
@@ -582,7 +582,7 @@ exif_data_save_data_content (ExifData *d
 	/* Sort the directory according to TIFF specification */
 	qsort (*d + 6 + offset - (ifd->count + n_ptr + n_thumb) * 12,
 			(ifd->count + n_ptr + n_thumb), 12,
-			data->priv->order == EXIF_BYTE_ORDER_INTEL ? cmp_func_intel : cmp_func_motorola);
+			(data->priv->order == EXIF_BYTE_ORDER_INTEL) ? cmp_func_intel : cmp_func_motorola);
 
 	/* Correctly terminate the directory */
 	if (i == EXIF_IFD_0 && (data->ifd[EXIF_IFD_1]->count ||

[libexif-cvs] libexif/po POTFILES.in,1.6,1.7

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

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

Modified Files:
	POTFILES.in 
Log Message:
add test/nls/test-codeset.c for translation

Index: POTFILES.in
===================================================================
RCS file: /cvsroot/libexif/libexif/po/POTFILES.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- POTFILES.in	12 Mar 2005 04:00:58 -0000	1.6
+++ POTFILES.in	24 Apr 2005 09:01:51 -0000	1.7
@@ -9,3 +9,4 @@ libexif/olympus/mnote-olympus-entry.c
 libexif/pentax/mnote-pentax-tag.c
 libexif/pentax/mnote-pentax-entry.c
 test/nls/test-nls.c
+test/nls/test-codeset.c

[libexif-cvs] libexif configure.ac,1.5,1.6

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

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

Modified Files:
	configure.ac 
Log Message:
make sqrt/libm detection work even in case of CPPFLAGS=-Werror

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- configure.ac	15 Apr 2005 21:51:41 -0000	1.5
+++ configure.ac	24 Apr 2005 09:01:05 -0000	1.6
@@ -49,10 +49,28 @@ dnl Whether -lm is required for our math
 dnl ---------------------------------------------------------------------------
 
 # we need sqrt and pow, but checking for sqrt should be sufficient
-AC_CHECK_FUNC([sqrt],,[
-AC_CHECK_LIB([m],[sqrt],[MATHLIBS="-lm"],AC_MSG_ERROR([
+AC_ARG_VAR([MATHLIBS],[The libraries required for mathematical functions, e.g. -lm])
+if test "x$MATHLIBS" = "x"; then
+	# We must not compile with -Wall -Werror here:
+	# char *sqrt() conflicts with double sin(const double xx) in any case.
+	CFLAGS_save="$CPPFLAGS"
+	CPPFLAGS_save="$CPPFLAGS"
+	CPPFLAGS=""
+	CFLAGS=""
+	AC_CHECK_FUNC([sqrt],[
+		MATHLIBS=""
+	],[
+		AC_CHECK_LIB([m],[sqrt],[
+			MATHLIBS="-lm"
+		],[
+			AC_MSG_ERROR([
 *** Could not find sqrt() function
-]))])
+])
+		])
+	])
+	CFLAGS="$CFLAGS_save"
+	CPPFLAGS="$CPPFLAGS_save"
+fi
 AC_SUBST([MATHLIBS])
 
 

[libexif-cvs] libexif/libexif Makefile.am,1.32,1.33

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

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

Modified Files:
	Makefile.am 
Log Message:
fix dependencies for recursive make

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- Makefile.am	9 Feb 2005 01:44:06 -0000	1.32
+++ Makefile.am	24 Apr 2005 09:00:29 -0000	1.33
@@ -29,6 +29,15 @@ libexif_la_LIBADD =			\
 	olympus/libmnote-olympus.la	\
 	pentax/libmnote-pentax.la
 
+canon/libmnote-canon.la:
+	cd canon && $(MAKE) libmnote-canon.la
+	
+olympus/libmnote-olympus.la:
+	cd olympus && $(MAKE) libmnote-olympus.la
+	
+pentax/libmnote-pentax.la:
+	cd pentax && $(MAKE) libmnote-pentax.la
+
 libexifincludedir = $(includedir)/libexif
 libexifinclude_HEADERS = 	\
 	exif-byte-order.h	\

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

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

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

Modified Files:
	Makefile.am 
Log Message:
fix dependencies for recursive make

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- Makefile.am	12 Apr 2005 04:53:31 -0000	1.2
+++ Makefile.am	24 Apr 2005 09:00:28 -0000	1.3
@@ -7,10 +7,14 @@ if HAVE_DOXYGEN
 DOXYGEN_FILES =
 DOXYGEN_STAMPS = $(DOXYGEN_OUTPUT_DIR).stamp
 
+# FIXME: Depending on the source files would be sufficient...
 $(DOXYGEN_OUTPUT_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
 	doxygen Doxyfile
 	echo > $@
 
+$(top_builddir)/libexif/libexif.la:
+	cd $(top_builddir)/libexif && $(MAKE) libexif.la
+
 $(HTML_APIDOC_DIR).tar.gz: $(DOXYGEN_OUTPUT_DIR).stamp
 	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
 

[libexif-cvs] libexif-testsuite/testlib testlib.c,1.1,1.2

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

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

Modified Files:
	testlib.c 
Log Message:
testlib.c: compile cleanly

Index: testlib.c
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/testlib/testlib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- testlib.c	24 Mar 2005 04:38:51 -0000	1.1
+++ testlib.c	24 Apr 2005 08:59:24 -0000	1.2
@@ -2,10 +2,10 @@
 
 #define N_(string) string
 
-static const char *testlib_string = N_("This is the dummy library");
+const char *testlib_test(void);
 
-const char *testlib_test();
+static const char *testlib_string = N_("This is the dummy library");
 
-const char *testlib_test() {
+const char *testlib_test(void) {
   return testlib_string;
 }

[libexif-cvs] m4m gp-check-library.m4,1.5,1.6

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

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

Modified Files:
	gp-check-library.m4 
Log Message:
new library test code, and solaris also uses .so

Index: gp-check-library.m4
===================================================================
RCS file: /cvsroot/libexif/m4m/gp-check-library.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- gp-check-library.m4	16 Apr 2005 04:27:59 -0000	1.5
+++ gp-check-library.m4	22 Apr 2005 15:02:20 -0000	1.6
@@ -65,6 +65,7 @@ soext=""
 case "$host" in
 	*linux*)	soext=".so" ;;
 	*sunos*)	soext=".so" ;;
+	*solaris*)	soext=".so" ;;
 	*bsd*)		soext=".so" ;;
 	*darwin*)	soext=".dylib" ;;
 	*w32*)		soext=".dll" ;;

[libexif-cvs] libexif autogen.sh,1.33,1.34

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

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

Modified Files:
	autogen.sh 
Log Message:
correctly handle changing to relative directories in recursive operation

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif/autogen.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -d -r1.33 -r1.34
--- autogen.sh	18 Apr 2005 15:44:29 -0000	1.33
+++ autogen.sh	22 Apr 2005 14:55:10 -0000	1.34
@@ -19,7 +19,7 @@ debug="false"
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.1"
+autogen_version="0.4.2"
 
 
 ########################################################################
@@ -118,7 +118,7 @@ init_vars() {
     #        OK, the "init" part is done recursively by autopoint, so that is easy.
     #        But the cleaning should also work recursively, but that is difficult
     #        with the current structure of the script.
-    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${dir}/${k}"; done)"
+    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${k}"; done)"
     AG_LIBLTDL_DIR="$(sed -n 's/^[[:space:]]*AC_LIBLTDL_\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\2/p' < "$CONFIGURE_AC")"
     if test "x$AG_LIBLTDL_DIR" = "x"; then
         tmp="$(sed -n 's/^[[:space:]]*\(AC_LIBLTDL_\)\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\1/p' < "$CONFIGURE_AC")"

[libexif-cvs] libexif-testsuite autogen.sh,1.12,1.13

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

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

Modified Files:
	autogen.sh 
Log Message:
correctly handle changing to relative directories in recursive operation

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/autogen.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -d -r1.12 -r1.13
--- autogen.sh	18 Apr 2005 15:44:29 -0000	1.12
+++ autogen.sh	22 Apr 2005 14:55:08 -0000	1.13
@@ -19,7 +19,7 @@ debug="false"
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.1"
+autogen_version="0.4.2"
 
 
 ########################################################################
@@ -118,7 +118,7 @@ init_vars() {
     #        OK, the "init" part is done recursively by autopoint, so that is easy.
     #        But the cleaning should also work recursively, but that is difficult
     #        with the current structure of the script.
-    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${dir}/${k}"; done)"
+    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${k}"; done)"
     AG_LIBLTDL_DIR="$(sed -n 's/^[[:space:]]*AC_LIBLTDL_\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\2/p' < "$CONFIGURE_AC")"
     if test "x$AG_LIBLTDL_DIR" = "x"; then
         tmp="$(sed -n 's/^[[:space:]]*\(AC_LIBLTDL_\)\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\1/p' < "$CONFIGURE_AC")"

[libexif-cvs] gexif autogen.sh,1.18,1.19

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

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

Modified Files:
	autogen.sh 
Log Message:
correctly handle changing to relative directories in recursive operation

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/gexif/autogen.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -d -r1.18 -r1.19
--- autogen.sh	18 Apr 2005 15:44:30 -0000	1.18
+++ autogen.sh	22 Apr 2005 14:55:13 -0000	1.19
@@ -19,7 +19,7 @@ debug="false"
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.1"
+autogen_version="0.4.2"
 
 
 ########################################################################
@@ -118,7 +118,7 @@ init_vars() {
     #        OK, the "init" part is done recursively by autopoint, so that is easy.
     #        But the cleaning should also work recursively, but that is difficult
     #        with the current structure of the script.
-    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${dir}/${k}"; done)"
+    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${k}"; done)"
     AG_LIBLTDL_DIR="$(sed -n 's/^[[:space:]]*AC_LIBLTDL_\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\2/p' < "$CONFIGURE_AC")"
     if test "x$AG_LIBLTDL_DIR" = "x"; then
         tmp="$(sed -n 's/^[[:space:]]*\(AC_LIBLTDL_\)\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\1/p' < "$CONFIGURE_AC")"

[libexif-cvs] exif autogen.sh,1.22,1.23

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

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

Modified Files:
	autogen.sh 
Log Message:
correctly handle changing to relative directories in recursive operation

Index: autogen.sh
===================================================================
RCS file: /cvsroot/libexif/exif/autogen.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- autogen.sh	18 Apr 2005 15:44:30 -0000	1.22
+++ autogen.sh	22 Apr 2005 14:55:12 -0000	1.23
@@ -19,7 +19,7 @@ debug="false"
 recursive="false"
 dryrun="false"
 self="$(basename "$0")"
-autogen_version="0.4.1"
+autogen_version="0.4.2"
 
 
 ########################################################################
@@ -118,7 +118,7 @@ init_vars() {
     #        OK, the "init" part is done recursively by autopoint, so that is easy.
     #        But the cleaning should also work recursively, but that is difficult
     #        with the current structure of the script.
-    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${dir}/${k}"; done)"
+    AG_SUBDIRS="$(for k in $(sed -n 's/^[[:space:]]*AC_CONFIG_SUBDIRS(\[\{0,1\}\([^])]*\).*/\1/p' "$CONFIGURE_AC"); do echo "${k}"; done)"
     AG_LIBLTDL_DIR="$(sed -n 's/^[[:space:]]*AC_LIBLTDL_\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\2/p' < "$CONFIGURE_AC")"
     if test "x$AG_LIBLTDL_DIR" = "x"; then
         tmp="$(sed -n 's/^[[:space:]]*\(AC_LIBLTDL_\)\(INSTALLABLE\|CONVENIENCE\)(\[\{0,1\}\([^])]*\).*/\1/p' < "$CONFIGURE_AC")"