libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.41,1.42 configure.in,1.22,1.23

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

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv18423

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Renchi Raju <re...@po...> found another bug in 

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.6.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	29 Aug 2002 20:59:47 -0000	1.41
+++ ChangeLog	29 Aug 2002 21:47:09 -0000	1.42
@@ -1,5 +1,12 @@
 2002-08-29  Lutz Müller <lu...@us...>
 
+	Renchi Raju <re...@po...> found another bug in 
+
+	* libexif/exif-data.c: Correctly save the data.
+	* configure.in: Version 0.5.6.
+
+2002-08-29  Lutz Müller <lu...@us...>
+
 	Jason Sodergren <ja...@ta...> found a lot of bugs in
 
 	* libexif/exif-data.c: Correctly save the data.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.in	29 Aug 2002 20:59:47 -0000	1.22
+++ configure.in	29 Aug 2002 21:47:09 -0000	1.23
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.5.5)
+AM_INIT_AUTOMAKE(libexif, 0.5.6)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------

[libexif-cvs] libexif/libexif exif-data.c,1.18,1.19

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

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv18423/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Renchi Raju <re...@po...> found another bug in 

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.6.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- exif-data.c	29 Aug 2002 21:04:58 -0000	1.18
+++ exif-data.c	29 Aug 2002 21:47:09 -0000	1.19
@@ -32,7 +32,7 @@
 #undef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
 
-//#define DEBUG
+#define DEBUG
 
 static const unsigned char ExifHeader[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
 
@@ -261,14 +261,20 @@
 	/*
 	 * Check if we need some extra entries for pointers or the thumbnail.
 	 */
-	if (ifd == data->ifd[EXIF_IFD_1]) {
+	if (ifd == data->ifd[EXIF_IFD_0]) {
+
+		/*
+		 * The pointer to IFD_EXIF is in IFD_0. The pointer to
+		 * IFD_INTEROPERABILITY is in IFD_EXIF.
+		 */
 		if (data->ifd[EXIF_IFD_EXIF]->count || data->ifd[EXIF_IFD_INTEROPERABILITY]->count)
 			n_ptr++;
+
+		/* The pointer to IFD_GPS is in IFD_0. */
 		if (data->ifd[EXIF_IFD_GPS]->count)
 			n_ptr++;
-	} else if (ifd == data->ifd[EXIF_IFD_1]) {
-		if (data->size)
-			n_thumb = 2;
+	} else if ((ifd == data->ifd[EXIF_IFD_1]) && data->size) {
+		n_thumb = 2;
 	} else if (ifd == data->ifd[EXIF_IFD_EXIF]) {
 		if (data->ifd[EXIF_IFD_INTEROPERABILITY]->count)
 			n_ptr++;
@@ -344,7 +350,8 @@
 		offset += 12;
 	}
 
-	if (n_thumb) {
+	/* Information about the thumbnail (if any) is saved in IFD_1. */
+	if ((ifd == data->ifd[EXIF_IFD_1]) && data->size) {
 
 		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
@@ -365,12 +372,13 @@
 		exif_set_short (*d + 6 + offset + 2, data->priv->order,
 				EXIF_FORMAT_LONG);
 		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+		exif_set_long  (*d + 6 + offset + 8, data->priv->order, 
 				data->size);
 		offset += 12;
 	}
 
-	if (ifd == data->ifd[EXIF_IFD_0] && data->ifd[EXIF_IFD_1]->count) {
+	if (ifd == data->ifd[EXIF_IFD_0] && (data->ifd[EXIF_IFD_1]->count ||
+					     data->size)) {
 
 		/*
 		 * We are saving IFD 0. Tell where IFD 1 starts and save
@@ -521,6 +529,15 @@
 #ifdef DEBUG
 		printf ("IFD 1 at %i.\n", (int) offset);
 #endif
+
+		/* Sanity check. */
+		if (offset > size - 6) {
+#ifdef DEBUG
+			printf ("Bogus offset!\n");
+#endif
+			return;
+		}
+
 		exif_data_load_data_content (data, data->ifd[EXIF_IFD_1], d + 6,
 					     size - 6, offset);
 	}

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

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

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv3351/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Jason Sodergren <ja...@ta...> found a lot of bugs in

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.5.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exif-data.c	29 Aug 2002 20:59:47 -0000	1.17
+++ exif-data.c	29 Aug 2002 21:04:58 -0000	1.18
@@ -346,16 +346,6 @@
 
 	if (n_thumb) {
 
-		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
-		exif_set_short (*d + 6 + offset + 0, data->priv->order,
-				EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
-		exif_set_short (*d + 6 + offset + 2, data->priv->order,
-				EXIF_FORMAT_LONG);
-		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
-		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
-				data->size);
-		offset += 12;
-		
 		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT */
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_JPEG_INTERCHANGE_FORMAT);
@@ -367,6 +357,16 @@
 		*ds += data->size;
 		*d = realloc (*d, sizeof (char) * *ds);
 		memcpy (*d + *ds - data->size, data->data, data->size);
+		offset += 12;
+
+		/* EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH */
+		exif_set_short (*d + 6 + offset + 0, data->priv->order,
+				EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+		exif_set_short (*d + 6 + offset + 2, data->priv->order,
+				EXIF_FORMAT_LONG);
+		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
+		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
+				data->size);
 		offset += 12;
 	}
 

[libexif-cvs] libexif ChangeLog,1.40,1.41 configure.in,1.21,1.22

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

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv740

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Jason Sodergren <ja...@ta...> found a lot of bugs in

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.5.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	29 Aug 2002 16:52:29 -0000	1.40
+++ ChangeLog	29 Aug 2002 20:59:47 -0000	1.41
@@ -1,5 +1,12 @@
 2002-08-29  Lutz Müller <lu...@us...>
 
+	Jason Sodergren <ja...@ta...> found a lot of bugs in
+
+	* libexif/exif-data.c: Correctly save the data.
+	* configure.in: Version 0.5.5.
+
+2002-08-29  Lutz Müller <lu...@us...>
+
 	Another fixes related to #564019:
 
 	* libexif: Make code conform to ISO C standard, section 6.5.2.3.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.in	2 Aug 2002 14:47:26 -0000	1.21
+++ configure.in	29 Aug 2002 20:59:47 -0000	1.22
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.5.4dev)
+AM_INIT_AUTOMAKE(libexif, 0.5.5)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 dnl                      removals.
 dnl ---------------------------------------------------------------------------
 LIBEXIF_AGE=0
-LIBEXIF_REVISION=0
+LIBEXIF_REVISION=1
 LIBEXIF_CURRENT=7
 AC_SUBST(LIBEXIF_AGE)
 AC_SUBST(LIBEXIF_REVISION)

[libexif-cvs] libexif/libexif exif-data.c,1.16,1.17

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

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv740/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Jason Sodergren <ja...@ta...> found a lot of bugs in

	* libexif/exif-data.c: Correctly save the data.
	* configure.in: Version 0.5.5.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- exif-data.c	29 Aug 2002 09:18:12 -0000	1.16
+++ exif-data.c	29 Aug 2002 20:59:47 -0000	1.17
@@ -295,12 +295,15 @@
 				d, ds, offset + 12 * i);
 	offset += 12 * ifd->count;
 
-	/* Save special entries */
-	if (ifd == data->ifd[EXIF_IFD_1] && (
+	/*
+	 * The pointer to IFD_EXIF is in IFD_0.
+	 * However, the pointer to IFD_INTEROPERABILITY is in IFD_EXIF,
+	 * therefore, if IFD_INTEROPERABILITY is not empty, we need
+	 * IFD_EXIF even if latter is empty.
+	 */
+	if (ifd == data->ifd[EXIF_IFD_0] && (
 			data->ifd[EXIF_IFD_EXIF]->count ||
 			data->ifd[EXIF_IFD_INTEROPERABILITY]->count)) {
-
-		/* EXIF_TAG_EXIF_IFD_POINTER */
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_EXIF_IFD_POINTER);
 		exif_set_short (*d + 6 + offset + 2, data->priv->order,
@@ -308,14 +311,13 @@
 		exif_set_long  (*d + 6 + offset + 4, data->priv->order, 1);
 		exif_set_long  (*d + 6 + offset + 8, data->priv->order,
 				*ds - 6);
-		exif_data_save_data_content (data, data->ifd[EXIF_IFD_EXIF], d, ds,
-					     *ds - 6);
+		exif_data_save_data_content (data, data->ifd[EXIF_IFD_EXIF], d,
+					     ds, *ds - 6);
 		offset += 12;
 	}
 
-	if (ifd == data->ifd[EXIF_IFD_1] && data->ifd[EXIF_IFD_GPS]->count) {
-
-		/* EXIF_TAG_GPS_INFO_IFD_POINTER */
+	/* The pointer to IFD_GPS is in IFD_0. */
+	if (ifd == data->ifd[EXIF_IFD_0] && data->ifd[EXIF_IFD_GPS]->count) {
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_GPS_INFO_IFD_POINTER);
 		exif_set_short (*d + 6 + offset + 2, data->priv->order,
@@ -328,9 +330,8 @@
 		offset += 12;
 	}
 
+	/* The pointer to IFD_INTEROPERABILITY is in IFD_EXIF. See above. */
 	if (ifd == data->ifd[EXIF_IFD_EXIF] && data->ifd[EXIF_IFD_INTEROPERABILITY]->count) {
-
-		/* EXIF_TAG_INTEROPERABILITY_IFD_POINTER */
 		exif_set_short (*d + 6 + offset + 0, data->priv->order,
 				EXIF_TAG_INTEROPERABILITY_IFD_POINTER);
 		exif_set_short (*d + 6 + offset + 2, data->priv->order,
@@ -510,7 +511,7 @@
 #endif
 
 	/* Parse the actual exif data (offset 14) */
-	exif_data_load_data_content (data, data->ifd[EXIF_IFD_1], d + 6,
+	exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6,
 				     size - 6, offset);
 
 	/* IFD 1 offset */
@@ -566,7 +567,7 @@
 #ifdef DEBUG
 	printf ("Saving IFDs...\n");
 #endif
-	exif_data_save_data_content (data, data->ifd[EXIF_IFD_1], d, ds, *ds - 6);
+	exif_data_save_data_content (data, data->ifd[EXIF_IFD_0], d, ds, *ds - 6);
 
 #ifdef DEBUG
 	printf ("Saved %i byte(s) EXIF data.\n", *ds);

[libexif-cvs] libexif/libexif/olympus exif-olympus-tag.h,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory usw-pr-cvs1:/tmp/cvs-serv14185/libexif/olympus

Modified Files:
	exif-olympus-tag.h 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Another fixes related to #564019:

	* libexif: Make code conform to ISO C standard, section 6.5.2.3.


Index: exif-olympus-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-olympus-tag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-olympus-tag.h	26 Jun 2002 17:17:02 -0000	1.2
+++ exif-olympus-tag.h	29 Aug 2002 16:52:30 -0000	1.3
@@ -25,7 +25,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef enum _ExifOlympusTag ExifOlympusTag;
 enum _ExifOlympusTag {
 	EXIF_OLYMPUS_TAG_MODE		= 0x0200,
 	EXIF_OLYMPUS_TAG_QUALITY	= 0x0201,
@@ -39,6 +38,7 @@
 	EXIF_OLYMPUS_TAG_ID		= 0x0209,
 	EXIF_OLYMPUS_TAG_UNKNOWN_4	= 0x0f04
 };
+typedef enum _ExifOlympusTag ExifOlympusTag;
 
 const char *exif_olympus_tag_get_name (ExifOlympusTag tag);
 

[libexif-cvs] libexif/libexif/fuji exif-fuji-tag.h,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory usw-pr-cvs1:/tmp/cvs-serv14185/libexif/fuji

Modified Files:
	exif-fuji-tag.h 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Another fixes related to #564019:

	* libexif: Make code conform to ISO C standard, section 6.5.2.3.


Index: exif-fuji-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-fuji-tag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-fuji-tag.h	26 Jun 2002 17:17:02 -0000	1.2
+++ exif-fuji-tag.h	29 Aug 2002 16:52:30 -0000	1.3
@@ -25,7 +25,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef enum _ExifFujiTag ExifFujiTag;
 enum _ExifFujiTag {
 	EXIF_FUJI_TAG_VERSION			= 0x0000,
 	EXIF_FUJI_TAG_QUALITY			= 0x1000,
@@ -46,6 +45,7 @@
 	EXIF_FUJI_TAG_FOCUS_WARNING		= 0x1301,
 	EXIF_FUJI_TAG_AUTO_EXPOSURE_WARNING	= 0x1302
 };
+typedef enum _ExifFujiTag ExifFujiTag;
 
 const char *exif_fuji_tag_get_name (ExifFujiTag tag);
 

[libexif-cvs] libexif/libexif/canon exif-canon-tag.h,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/canon
In directory usw-pr-cvs1:/tmp/cvs-serv14185/libexif/canon

Modified Files:
	exif-canon-tag.h 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Another fixes related to #564019:

	* libexif: Make code conform to ISO C standard, section 6.5.2.3.


Index: exif-canon-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-canon-tag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-canon-tag.h	26 Jun 2002 17:17:02 -0000	1.2
+++ exif-canon-tag.h	29 Aug 2002 16:52:30 -0000	1.3
@@ -25,7 +25,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef enum _ExifCanonTag ExifCanonTag;
 enum _ExifCanonTag {
 	EXIF_CANON_TAG_UNKNOWN_0	= 0x0,
 	EXIF_CANON_TAG_SETTINGS_1	= 0x1,
@@ -40,6 +39,7 @@
 	EXIF_CANON_TAG_UNKNOWN_13	= 0xd,
 	EXIF_CANON_TAG_CUSTOM_FUNCS	= 0xf
 };
+typedef enum _ExifCanonTag ExifCanonTag;
 
 const char *exif_canon_tag_get_name (ExifCanonTag tag);
 

[libexif-cvs] libexif ChangeLog,1.39,1.40

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

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv14185

Modified Files:
	ChangeLog 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Another fixes related to #564019:

	* libexif: Make code conform to ISO C standard, section 6.5.2.3.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	29 Aug 2002 09:18:12 -0000	1.39
+++ ChangeLog	29 Aug 2002 16:52:29 -0000	1.40
@@ -1,5 +1,11 @@
 2002-08-29  Lutz Müller <lu...@us...>
 
+	Another fixes related to #564019:
+
+	* libexif: Make code conform to ISO C standard, section 6.5.2.3.
+
+2002-08-29  Lutz Müller <lu...@us...>
+
 	Bug reported by Jason Sodergren <ja...@ta...>:
 
 	* libexif/exif-data.c: EXIF_IFD_1 -> EXIF_IFD_0.

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

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

Update of /cvsroot/libexif/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv13784/libexif

Modified Files:
	exif-data.c 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Bug reported by Jason Sodergren <ja...@ta...>:

	* libexif/exif-data.c: EXIF_IFD_1 -> EXIF_IFD_0.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- exif-data.c	25 Jul 2002 15:52:07 -0000	1.15
+++ exif-data.c	29 Aug 2002 09:18:12 -0000	1.16
@@ -369,7 +369,7 @@
 		offset += 12;
 	}
 
-	if (ifd == data->ifd[EXIF_IFD_1] && data->ifd[EXIF_IFD_1]->count) {
+	if (ifd == data->ifd[EXIF_IFD_0] && data->ifd[EXIF_IFD_1]->count) {
 
 		/*
 		 * We are saving IFD 0. Tell where IFD 1 starts and save

[libexif-cvs] libexif ChangeLog,1.38,1.39

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

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv13784

Modified Files:
	ChangeLog 
Log Message:

2002-08-29  Lutz Müller <lu...@us...>

	Bug reported by Jason Sodergren <ja...@ta...>:

	* libexif/exif-data.c: EXIF_IFD_1 -> EXIF_IFD_0.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog	2 Aug 2002 14:50:04 -0000	1.38
+++ ChangeLog	29 Aug 2002 09:18:12 -0000	1.39
@@ -1,3 +1,9 @@
+2002-08-29  Lutz Müller <lu...@us...>
+
+	Bug reported by Jason Sodergren <ja...@ta...>:
+
+	* libexif/exif-data.c: EXIF_IFD_1 -> EXIF_IFD_0.
+
 2002-08-02  Hans Ulrich Niedermann <gp...@n-...>
 
 	* configure.in: Version 0.5.4dev

[libexif-cvs] exif/exif main.c,1.18,1.19

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

Update of /cvsroot/libexif/exif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv24270/exif

Modified Files:
	main.c 
Log Message:

2002-08-06  Lutz Müller <lu...@us...>

	* configure.in: Check for locale.h
	* exif/main.c: Only use setlocale if locale.h is availabe.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- main.c	25 Jul 2002 16:29:45 -0000	1.18
+++ main.c	6 Aug 2002 21:20:45 -0000	1.19
@@ -53,6 +53,10 @@
 #  define N_(String) (String)
 #endif
 
+#ifdef HAVE_LOCAL_H
+#  include <locale.h>
+#endif
+
 /* Old versions of popt.h don't define POPT_TABLEEND */
 #ifndef POPT_TABLEEND
 #  define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
@@ -208,7 +212,9 @@
 	char fname[1024];
 	FILE *f;
 
+#ifdef HAVE_LOCALE_H
 	setlocale (LC_ALL, "");
+#endif
 	bindtextdomain (PACKAGE, EXIF_LOCALEDIR);
 	textdomain (PACKAGE);
 

[libexif-cvs] exif ChangeLog,1.10,1.11 configure.in,1.6,1.7

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

Update of /cvsroot/libexif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv24270

Modified Files:
	ChangeLog configure.in 
Log Message:

2002-08-06  Lutz Müller <lu...@us...>

	* configure.in: Check for locale.h
	* exif/main.c: Only use setlocale if locale.h is availabe.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	25 Jul 2002 16:29:43 -0000	1.10
+++ ChangeLog	6 Aug 2002 21:20:44 -0000	1.11
@@ -1,3 +1,8 @@
+2002-08-06  Lutz Müller <lu...@us...>
+
+	* configure.in: Check for locale.h
+	* exif/main.c: Only use setlocale if locale.h is availabe.
+
 2002-07-25  Lutz Müller <lu...@us...>
 
 	* configure.in: Version 0.5. Require at least libexif-0.5.4.

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.in	25 Jul 2002 16:29:43 -0000	1.6
+++ configure.in	6 Aug 2002 21:20:44 -0000	1.7
@@ -19,6 +19,12 @@
 AC_SUBST(LIBEXIF_LIBS)
 AC_SUBST(LIBEXIF_CFLAGS)
 
+dnl ---------------------------------------------------------------------------
+dnl locale.h: locale.h provides setlocale. It seems that some systems don't
+dnl           have it (at least if configured --without-nls).
+dnl ---------------------------------------------------------------------------
+AC_CHECK_HEADERS(locale.h)
+
 CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Werror"
 AC_SUBST(CFLAGS)
 

[libexif-cvs] libexif ChangeLog,1.37,1.38

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv24589

Modified Files:
	ChangeLog 
Log Message:
distinguish CVS version number from release version

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ChangeLog	25 Jul 2002 15:51:54 -0000	1.37
+++ ChangeLog	2 Aug 2002 14:50:04 -0000	1.38
@@ -1,3 +1,8 @@
+2002-08-02  Hans Ulrich Niedermann <gp...@n-...>
+
+	* configure.in: Version 0.5.4dev
+		distinguish release versions from CVS versions
+
 2002-07-25  Lutz Müller <lu...@us...>
 
 	* libexif/exif-ifd.[c,h]: New.

[libexif-cvs] libexif configure.in,1.20,1.21

[<hu...@us...>]

Update of /cvsroot/libexif/libexif
In directory usw-pr-cvs1:/tmp/cvs-serv23663

Modified Files:
	configure.in 
Log Message:
distinguish CVS version number from release version

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.in	25 Jul 2002 15:51:54 -0000	1.20
+++ configure.in	2 Aug 2002 14:47:26 -0000	1.21
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.5.4)
+AM_INIT_AUTOMAKE(libexif, 0.5.4dev)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------

Re: [libexif-cvs] Administrativa

[Hans U. N. <gp...@n-...>]

Hi,

another test.

Uli

[libexif-cvs] Administrativa

[Hans U. N. <gp...@n-...>]

Hi,

just testing this list.

Uli