libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/test test-parse.c,1.1,1.2

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

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10389

Modified Files:
	test-parse.c 
Log Message:
rename vars

Index: test-parse.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-parse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- test-parse.c	29 Jun 2007 11:37:36 -0000	1.1
+++ test-parse.c	29 Jun 2007 14:14:26 -0000	1.2
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 
 
-void content_foreach_func(ExifEntry *entry, void *user_data);
-void content_foreach_func(ExifEntry *entry, void *UNUSED(user_data))
+void content_foreach_func(ExifEntry *entry, void *callback_data);
+void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
 {
   char buf[2000];
   exif_entry_get_value(entry, buf, sizeof(buf));
@@ -44,31 +44,31 @@ void content_foreach_func(ExifEntry *ent
 }
 
 
-void data_foreach_func(ExifContent *content, void *user_data);
-void data_foreach_func(ExifContent *content, void *user_data)
+void data_foreach_func(ExifContent *content, void *callback_data);
+void data_foreach_func(ExifContent *content, void *callback_data)
 {
   printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
-  exif_content_foreach_entry(content, content_foreach_func, user_data);
+  exif_content_foreach_entry(content, content_foreach_func, callback_data);
 }
 
 
-void test_parse(const char *filename, void *data);
-void test_parse(const char *filename, void *data)
+void test_parse(const char *filename, void *callback_data);
+void test_parse(const char *filename, void *callback_data)
 {
   ExifData *d;
   printf("File %s\n", filename);
 
   d = exif_data_new_from_file(filename);
-  exif_data_foreach_content(d, data_foreach_func, data);
+  exif_data_foreach_content(d, data_foreach_func, callback_data);
   exif_data_unref(d);
 }
 
-typedef void (*test_parse_func) (const char *filename, void *data);
+typedef void (*test_parse_func) (const char *filename, void *callback_data);
 
 
 /** Split string at whitespace and call callback with each substring */
-void split_ws_string(const char *string, test_parse_func func, void *data);
-void split_ws_string(const char *string, test_parse_func func, void *data)
+void split_ws_string(const char *string, test_parse_func func, void *callback_data);
+void split_ws_string(const char *string, test_parse_func func, void *callback_data)
 {
   const char *start = string;
   const char *p = start;
@@ -100,11 +100,11 @@ void split_ws_string(const char *string,
 int main(const int argc, const char *argv[])
 {
   int i;
-  void *data = NULL;
+  void *callback_data = NULL;
 
   const char *envar = getenv("TEST_IMAGES");
   if (envar) {
-    split_ws_string(envar, test_parse, data);
+    split_ws_string(envar, test_parse, callback_data);
   }
 
   for (i=1; i<argc; i++) {

[libexif-cvs] libexif/test test-parse.c, NONE, 1.1 Makefile.am, 1.20, 1.21 test-integers.c, 1.1, 1.2

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

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10878

Modified Files:
	Makefile.am test-integers.c 
Added Files:
	test-parse.c 
Log Message:
new test/example: parse file and dump contents

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/test/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- Makefile.am	12 Jun 2007 13:51:59 -0000	1.20
+++ Makefile.am	29 Jun 2007 11:37:36 -0000	1.21
@@ -10,12 +10,17 @@ SUBDIRS = nls
 #      And this is just the lib - we don't have the program available
 #      here yet.
 
-TESTS = test-mem test-value test-integers
+TESTS = test-mem test-value test-integers test-parse
 
-check_PROGRAMS = test-mem test-mnote test-value test-integers
+TEST_IMAGES = $(top_srcdir)/daniel-andrews-sample.jpg
+export TEST_IMAGES
+
+check_PROGRAMS = test-mem test-mnote test-value test-integers test-parse
 
 test_mem_LDADD   = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
 
 test_mnote_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
 
 test_value_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
+
+test_parse_LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)

Index: test-integers.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-integers.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- test-integers.c	12 Jun 2007 13:51:58 -0000	1.1
+++ test-integers.c	29 Jun 2007 11:37:36 -0000	1.2
@@ -1,10 +1,64 @@
+/** \file test-integers.c
+ * \brief Check assumptions about integer types (sizes, ranges).
+ *
+ * Copyright (C) 2007 Hans Ulrich Niedermann <gp...@n-...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
 #include "libexif/_stdint.h"
+#include <stdlib.h>
+#include <stdio.h>
+
+
+typedef enum {
+   EN_A,
+   EN_B,
+   EN_C,
+   EN_D,
+   EN_E,
+   EN_F
+} enum_t;
+
+
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+# define CHECK(condition)					     \
+	if (!(condition)) {					     \
+		fprintf(stderr, "%s:%d: check failed: %s\n",	     \
+			__FILE__, __LINE__, #condition);	     \
+		errors++;					     \
+	}
+#else
+# define CHECK(condition)					     \
+	if (!(condition)) {					     \
+		abort();					     \
+	}
+#endif
+
 
 int main()
 {
-  /* libexif assumes that in very many places */
-  if (sizeof(unsigned int) < sizeof(uint32_t)) {
-    return 1;
-  }
-  return 0;
+  unsigned int errors = 0;
+
+  /* libexif assumes unsigned ints are not smaller than 32bit in many places */
+  CHECK(sizeof(unsigned int) >= sizeof(uint32_t));
+
+  /* libexif assumes that enums fit into ints */
+  CHECK(sizeof(enum_t) <= sizeof(int));
+  
+  return (errors>0)?1:0;
 }

--- NEW FILE: test-parse.c ---
/** \file test-parse.c
 * \brief Completely parse all files given on the command line.
 *
 * Copyright (C) 2007 Hans Ulrich Niedermann <gp...@n-...>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details. 
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */

#include "libexif/exif-data.h"
#include "libexif/exif-system.h"

#include <string.h>
#include <stdio.h>
#include <stdlib.h>


void content_foreach_func(ExifEntry *entry, void *user_data);
void content_foreach_func(ExifEntry *entry, void *UNUSED(user_data))
{
  char buf[2000];
  exif_entry_get_value(entry, buf, sizeof(buf));
  printf("    Entry %p: %s (%s)\n"
	 "      Size, Comps: %d, %d\n"
	 "      Value: %s\n", 
	 entry,
	 exif_tag_get_name(entry->tag),
	 exif_format_get_name(entry->format),
	 entry->size,
	 (int)(entry->components),
	 exif_entry_get_value(entry, buf, sizeof(buf)));
}


void data_foreach_func(ExifContent *content, void *user_data);
void data_foreach_func(ExifContent *content, void *user_data)
{
  printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
  exif_content_foreach_entry(content, content_foreach_func, user_data);
}


void test_parse(const char *filename, void *data);
void test_parse(const char *filename, void *data)
{
  ExifData *d;
  printf("File %s\n", filename);

  d = exif_data_new_from_file(filename);
  exif_data_foreach_content(d, data_foreach_func, data);
  exif_data_unref(d);
}

typedef void (*test_parse_func) (const char *filename, void *data);


/** Split string at whitespace and call callback with each substring */
void split_ws_string(const char *string, test_parse_func func, void *data);
void split_ws_string(const char *string, test_parse_func func, void *data)
{
  const char *start = string;
  const char *p = start;
  for (;;) {
    if (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || *p == '\0' ) {
      size_t len = p-start;
      if (len > 0) {
	/* emulate strndup */
	char *str = malloc(1+len);
	if (str) {
	  memcpy(str, start, len);
	  str[len] = '\0';
	  func(str, data);
	  free(str);
	  start = p+1;
	}
      } else {
	start = p+1;
      }
    }
    if (*p == '\0') {
      break;
    }
    p++;
  }  
}


int main(const int argc, const char *argv[])
{
  int i;
  void *data = NULL;

  const char *envar = getenv("TEST_IMAGES");
  if (envar) {
    split_ws_string(envar, test_parse, data);
  }

  for (i=1; i<argc; i++) {
    test_parse(argv[i], data);
  }

  return 0;
}

[libexif-cvs] libexif/libexif exif.c,1.5,NONE

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

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

Removed Files:
	exif.c 
Log Message:
Remove obsolete libexif/exif.c file


--- exif.c DELETED ---

[libexif-cvs] libexif Makefile.am,1.44,1.45

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

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

Modified Files:
	Makefile.am 
Log Message:
do not dist removed autogen.sh file

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -d -r1.44 -r1.45
--- Makefile.am	22 May 2007 08:40:12 -0000	1.44
+++ Makefile.am	27 Jun 2007 12:32:00 -0000	1.45
@@ -4,7 +4,7 @@ if SHIP_BINARIES
 README_W32_XDIST = README-Win32.txt
 endif
 
-EXTRA_DIST = @PACKAGE_TARNAME@.spec autogen.sh $(README_W32_XDIST)
+EXTRA_DIST = @PACKAGE_TARNAME@.spec $(README_W32_XDIST)
 
 pkgconfigdir = $(libdir)/pkgconfig
 

[libexif-cvs] libexif/libexif exif-loader.h,1.5,1.6

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

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

Modified Files:
	exif-loader.h 
Log Message:
no need for exif-loader.h to #include itself

Index: exif-loader.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- exif-loader.h	16 Sep 2006 23:26:54 -0000	1.5
+++ exif-loader.h	27 Jun 2007 12:30:24 -0000	1.6
@@ -24,7 +24,6 @@
 #define __EXIF_LOADER_H__
 
 #include <libexif/exif-data.h>
-#include <libexif/exif-loader.h>
 #include <libexif/exif-log.h>
 #include <libexif/exif-mem.h>
 

[libexif-cvs] libexif/libexif exif-entry.c,1.106,1.107

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

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

Modified Files:
	exif-entry.c 
Log Message:
Reverting zero termination patch, adding comment to avoid future confusion.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -d -r1.106 -r1.107
--- exif-entry.c	26 Jun 2007 02:58:28 -0000	1.106
+++ exif-entry.c	27 Jun 2007 11:15:50 -0000	1.107
@@ -581,9 +581,10 @@ exif_entry_get_value (ExifEntry *e, char
 		return val;
 	o = exif_data_get_byte_order (e->parent->parent);
 
+	/* make sure the returned string is zero terminated */
 	memset (val, 0, maxlen);
-	memset (b, 0, sizeof (b));
 	maxlen--;
+	memset (b, 0, sizeof (b));
 
 	/* Sanity check */
 	if (e->size != e->components * exif_format_get_size (e->format)) {
@@ -1095,10 +1096,13 @@ exif_entry_get_value (ExifEntry *e, char
 		}
 	}
 
-	val[maxlen-1] = '\0'; /* make sure the returned string is zero terminated */
 	return val;
 }
 
+
+/**
+ * \bug Log and report failed exif_mem_malloc() calls.
+ */
 void
 exif_entry_initialize (ExifEntry *e, ExifTag tag)
 {

[libexif-cvs] libexif/libexif exif-data.c, 1.97, 1.98 exif-ifd.h, 1.2, 1.3

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

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

Modified Files:
	exif-data.c exif-ifd.h 
Log Message:
Fix ifd validity check, comment on purpose of EXIF_IFD_COUNT


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -d -r1.97 -r1.98
--- exif-data.c	26 Jun 2007 02:19:13 -0000	1.97
+++ exif-data.c	27 Jun 2007 11:14:35 -0000	1.98
@@ -338,21 +338,10 @@ exif_data_load_data_content (ExifData *d
 
 	if (!data || !data->priv) 
 		return;
-	/* check for valid ExifIfd enum range
-	 * if ((((int)ifd) < 0) || (ifd >= EXIF_IFD_COUNT))
-	 * return;
-	*/
-	switch (ifd) {
-	case EXIF_IFD_0:
-	case EXIF_IFD_1:
-	case EXIF_IFD_EXIF:
-	case EXIF_IFD_GPS:
-	case EXIF_IFD_INTEROPERABILITY:
-	case EXIF_IFD_COUNT:
-	  break;
-	default:
+
+	/* check for valid ExifIfd enum range */
+	if (( ((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT))
 	  return;
-	}
 
 	if (recursion_depth > 150) {
 		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",

Index: exif-ifd.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-ifd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- exif-ifd.h	15 Dec 2002 11:41:11 -0000	1.2
+++ exif-ifd.h	27 Jun 2007 11:14:35 -0000	1.3
@@ -22,12 +22,12 @@
 #define __EXIF_IFD_H__
 
 typedef enum {
-	EXIF_IFD_0 = 0,
-	EXIF_IFD_1,
-	EXIF_IFD_EXIF,
-	EXIF_IFD_GPS,
-	EXIF_IFD_INTEROPERABILITY,
-	EXIF_IFD_COUNT
+	EXIF_IFD_0 = 0,                /*!< */
+	EXIF_IFD_1,                    /*!< */
+	EXIF_IFD_EXIF,                 /*!< */
+	EXIF_IFD_GPS,                  /*!< */
+	EXIF_IFD_INTEROPERABILITY,     /*!< */
+	EXIF_IFD_COUNT                 /*!< Not a real value, just (max_value + 1). */
 } ExifIfd;
 
 const char *exif_ifd_get_name (ExifIfd ifd);

[libexif-cvs] libexif NEWS,1.24,1.25 configure.ac,1.34,1.35

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

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

Modified Files:
	NEWS configure.ac 
Log Message:
call it 0.6.16.2

Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- NEWS	15 Jun 2007 04:10:25 -0000	1.24
+++ NEWS	26 Jun 2007 03:00:14 -0000	1.25
@@ -1,4 +1,4 @@
-libexif-0.6.16.1:
+libexif-0.6.16.2:
   * Updated translations: de, pl, vi
 
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.ac,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -d -r1.34 -r1.35
--- configure.ac	26 Jun 2007 01:57:08 -0000	1.34
+++ configure.ac	26 Jun 2007 03:00:15 -0000	1.35
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([EXIF library], [0.6.16.1], [lib...@li...], [libexif])
+AC_INIT([EXIF library], [0.6.16.2], [lib...@li...], [libexif])
 AC_CONFIG_SRCDIR([libexif/exif-data.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])

[libexif-cvs] libexif/libexif exif-entry.c,1.105,1.106

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

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

Modified Files:
	exif-entry.c 
Log Message:
exif_entry_initialize(): handle failed malloc() calls.
  Consistently void dereferencing NULL pointers.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -d -r1.105 -r1.106
--- exif-entry.c	26 Jun 2007 02:36:46 -0000	1.105
+++ exif-entry.c	26 Jun 2007 02:58:28 -0000	1.106
@@ -1127,6 +1127,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -1155,6 +1156,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -1166,6 +1168,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -1176,6 +1179,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -1185,6 +1189,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -1222,6 +1227,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -1242,6 +1248,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -1251,6 +1258,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -1262,6 +1270,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 6 components */

[libexif-cvs] libexif/libexif exif-entry.c,1.104,1.105

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

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

Modified Files:
	exif-entry.c 
Log Message:
make sure the returned string is zero terminated

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -d -r1.104 -r1.105
--- exif-entry.c	26 Jun 2007 02:35:35 -0000	1.104
+++ exif-entry.c	26 Jun 2007 02:36:46 -0000	1.105
@@ -1095,6 +1095,7 @@ exif_entry_get_value (ExifEntry *e, char
 		}
 	}
 
+	val[maxlen-1] = '\0'; /* make sure the returned string is zero terminated */
 	return val;
 }
 

[libexif-cvs] libexif/libexif exif-entry.c,1.103,1.104

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

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

Modified Files:
	exif-entry.c 
Log Message:
revert unintended commit

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -d -r1.103 -r1.104
--- exif-entry.c	26 Jun 2007 02:31:41 -0000	1.103
+++ exif-entry.c	26 Jun 2007 02:35:35 -0000	1.104
@@ -1095,7 +1095,6 @@ exif_entry_get_value (ExifEntry *e, char
 		}
 	}
 
-	val[maxlen-1] = '\0'; /* make sure the returned string is zero terminated */
 	return val;
 }
 
@@ -1127,7 +1126,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -1156,7 +1154,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -1168,7 +1165,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -1179,7 +1175,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -1189,7 +1184,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -1227,7 +1221,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -1248,7 +1241,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -1258,7 +1250,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -1270,7 +1261,6 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
-		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 6 components */

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c, 1.32, 1.33

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15133/libexif/olympus

Modified Files:
	mnote-olympus-entry.c 
Log Message:
use full initializers

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- mnote-olympus-entry.c	24 May 2007 06:47:14 -0000	1.32
+++ mnote-olympus-entry.c	26 Jun 2007 02:31:42 -0000	1.33
@@ -161,7 +161,7 @@ static struct {
     { {0, N_("No")},
       {1, N_("Yes")},
       {0, NULL}}},
-  { 0, }
+  { 0, 0, { { 0, NULL } } }
 };
 
 char *

[libexif-cvs] libexif/libexif exif-entry.c,1.102,1.103

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

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

Modified Files:
	exif-entry.c 
Log Message:
use full initializers

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -d -r1.102 -r1.103
--- exif-entry.c	15 Jun 2007 06:49:42 -0000	1.102
+++ exif-entry.c	26 Jun 2007 02:31:41 -0000	1.103
@@ -535,7 +535,7 @@ static struct {
       {2, {N_("Adobe RGB"), NULL}},
       {0xffff, {N_("Uncalibrated"), NULL}},
       {0x0000, {NULL}}}},
-  {0, }
+  {0, { { 0, {NULL}}} }
 };
 
 const char *
@@ -1095,6 +1095,7 @@ exif_entry_get_value (ExifEntry *e, char
 		}
 	}
 
+	val[maxlen-1] = '\0'; /* make sure the returned string is zero terminated */
 	return val;
 }
 
@@ -1126,6 +1127,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -1154,6 +1156,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -1165,6 +1168,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -1175,6 +1179,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -1184,6 +1189,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -1221,6 +1227,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -1241,6 +1248,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -1250,6 +1258,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -1261,6 +1270,7 @@ exif_entry_initialize (ExifEntry *e, Exi
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
 		e->data = exif_entry_alloc (e, e->size);
+		if (!e->data) break;
 		break;
 
 	/* RATIONAL, 6 components */

[libexif-cvs] libexif/libexif exif-loader.c,1.24,1.25

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

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

Modified Files:
	exif-loader.c 
Log Message:
use proper type ssize_t thus avoiding integer warnings

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- exif-loader.c	3 Oct 2006 19:41:36 -0000	1.24
+++ exif-loader.c	26 Jun 2007 02:30:32 -0000	1.25
@@ -263,7 +263,7 @@ exif_loader_write (ExifLoader *eld, unsi
 		default:
 			switch (eld->b[i]) {
 			case JPEG_MARKER_APP1:
-				if (!memcmp (eld->b + i + 3, ExifHeader, MIN(sizeof (ExifHeader), MAX(0, sizeof (eld->b) - i - 3)))) {
+			  if (!memcmp (eld->b + i + 3, ExifHeader, MIN((ssize_t)(sizeof(ExifHeader)), MAX(0, ((ssize_t)(sizeof(eld->b))) - ((ssize_t)i) - 3)))) {
 					eld->data_format = EL_DATA_FORMAT_EXIF;
 				} else {
 					eld->data_format = EL_DATA_FORMAT_JPEG; /* Probably JFIF - keep searching for APP1 EXIF*/

[libexif-cvs] libexif/test test-value.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11141/test

Modified Files:
	test-value.c 
Log Message:
avoid unused main() params, check for error values, unref/free all memory


Index: test-value.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-value.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- test-value.c	14 Jul 2005 22:14:07 -0000	1.2
+++ test-value.c	26 Jun 2007 02:23:29 -0000	1.3
@@ -22,9 +22,10 @@
 #include <libexif/exif-data.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 
 int
-main (int argc, char **argv)
+main ()
 {
 	ExifData *d;
 	ExifEntry *e;
@@ -33,15 +34,27 @@ main (int argc, char **argv)
 	unsigned int i;
 
 	d = exif_data_new ();
+	if (!d) {
+		printf ("Error running exif_data_new()\n");
+		exit(13);
+	}
+
 	e = exif_entry_new ();
+	if (!e) {
+		printf ("Error running exif_entry_new()\n");
+		exit(13);
+	}
+
 	exif_content_add_entry (d->ifd[EXIF_IFD_0], e);
 	exif_entry_initialize (e, EXIF_TAG_SHUTTER_SPEED_VALUE);
 	exif_set_srational (e->data, exif_data_get_byte_order (d), r);
 
-	for (i = 30; i > 0; i--)
+	for (i = 30; i > 0; i--) {
 		printf ("Length %2i: '%s'\n", i, 
 			exif_entry_get_value (e, v, i));
+	}
 
+	exif_entry_unref (e);
 	exif_data_unref (d);
 
 	return 0;

[libexif-cvs] libexif/libexif exif-data.c,1.96,1.97

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

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

Modified Files:
	exif-data.c 
Log Message:
log malloc failure, correct ifd validity check, UNUSED param


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -d -r1.96 -r1.97
--- exif-data.c	14 Jun 2007 16:17:46 -0000	1.96
+++ exif-data.c	26 Jun 2007 02:19:13 -0000	1.97
@@ -28,6 +28,7 @@
 #include <libexif/exif-loader.h>
 #include <libexif/exif-log.h>
 #include <libexif/i18n.h>
+#include <libexif/exif-system.h>
 
 #include <libexif/olympus/exif-mnote-data-olympus.h>
 #include <libexif/canon/exif-mnote-data-canon.h>
@@ -194,6 +195,9 @@ exif_data_load_data_entry (ExifData *dat
 	if (entry->data) {
 		entry->size = s;
 		memcpy (entry->data, d + doff, s);
+	} else {
+		/* FIXME: What do our callers do if (entry->data == NULL)? */
+		EXIF_LOG_NO_MEMORY(data->priv->log, "ExifData", s);
 	}
 
 	/* If this is the MakerNote, remember the offset */
@@ -202,8 +206,7 @@ exif_data_load_data_entry (ExifData *dat
 			exif_log (data->priv->log,
                                                EXIF_LOG_CODE_DEBUG, "ExifData",
                                                "MakerNote found with NULL data");	
-		}
-		else if (entry->size > 6) 
+		} else if (entry->size > 6) {
 			exif_log (data->priv->log,
 					       EXIF_LOG_CODE_DEBUG, "ExifData",
 					       "MakerNote found (%02x %02x %02x %02x "
@@ -211,6 +214,7 @@ exif_data_load_data_entry (ExifData *dat
 					       entry->data[0], entry->data[1], entry->data[2],
 					       entry->data[3], entry->data[4], entry->data[5],
 					       entry->data[6]);
+		}
 		data->priv->offset_mnote = doff;
 	}
 	return 1;
@@ -334,8 +338,21 @@ exif_data_load_data_content (ExifData *d
 
 	if (!data || !data->priv) 
 		return;
-	if ((ifd < 0) || (ifd >= EXIF_IFD_COUNT)) 
-		return;
+	/* check for valid ExifIfd enum range
+	 * if ((((int)ifd) < 0) || (ifd >= EXIF_IFD_COUNT))
+	 * return;
+	*/
+	switch (ifd) {
+	case EXIF_IFD_0:
+	case EXIF_IFD_1:
+	case EXIF_IFD_EXIF:
+	case EXIF_IFD_GPS:
+	case EXIF_IFD_INTEROPERABILITY:
+	case EXIF_IFD_COUNT:
+	  break;
+	default:
+	  return;
+	}
 
 	if (recursion_depth > 150) {
 		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
@@ -1171,7 +1188,7 @@ exif_data_unset_option (ExifData *d, Exi
 }
 
 static void
-fix_func (ExifContent *c, void *data)
+fix_func (ExifContent *c, void *UNUSED(data))
 {
 	switch (exif_content_get_ifd (c)) {
 	case EXIF_IFD_1:

[libexif-cvs] libexif/libexif exif-content.c,1.20,1.21

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

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

Modified Files:
	exif-content.c 
Log Message:
define param as UNUSED

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- exif-content.c	5 May 2006 05:25:20 -0000	1.20
+++ exif-content.c	26 Jun 2007 02:16:31 -0000	1.21
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include <libexif/exif-content.h>
+#include <libexif/exif-system.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -226,7 +227,7 @@ exif_content_get_ifd (ExifContent *c)
 }
 
 static void
-fix_func (ExifEntry *e, void *data)
+fix_func (ExifEntry *e, void *UNUSED(data))
 {
 	exif_entry_fix (e);
 }

[libexif-cvs] libexif/test test-mem.c,1.10,1.11

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

Update of /cvsroot/libexif/libexif/test
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6213/test

Modified Files:
	test-mem.c 
Log Message:
avoid unsued main() params

Index: test-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/test-mem.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- test-mem.c	5 May 2005 16:57:59 -0000	1.10
+++ test-mem.c	26 Jun 2007 02:10:23 -0000	1.11
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 int
-main (int argc, char **argv)
+main ()
 {
 	ExifData *ed;
 	/* ExifEntry *e; */

[libexif-cvs] libexif/test/nls print-localedir.c,1.3,1.4

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

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

Modified Files:
	print-localedir.c 
Log Message:
avoid unsued main() params

Index: print-localedir.c
===================================================================
RCS file: /cvsroot/libexif/libexif/test/nls/print-localedir.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- print-localedir.c	21 May 2007 16:15:20 -0000	1.3
+++ print-localedir.c	26 Jun 2007 02:10:24 -0000	1.4
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main()
 {
   puts(LOCALEDIR);
   puts("\n");

[libexif-cvs] libexif/libexif exif.h,1.6,1.7

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

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

Modified Files:
	exif.h 
Log Message:
Remove ancient completely obsolete exif.c file, make exif.h dox-only

Index: exif.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- exif.h	23 May 2007 13:04:47 -0000	1.6
+++ exif.h	26 Jun 2007 02:07:59 -0000	1.7
@@ -1,29 +1,7 @@
-/*
-
-Copyright © 2000 Curtis Galloway
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
 /*! \file exif.h exif/exif.h
+ * \brief Dummy header file
+ * \date 2007
+ * \author Hans Ulrich Niedermann
  *
  * \mainpage The libexif library
  *
@@ -33,7 +11,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
  *
  * \section using_libexif Using libexif
  *
- * ##include <libexif/exif.h>
+ * ##include <libexif/exif-data.h>
  *
  * libexif provides a libexif.pc file for use with pkgconfig on the
  * libexif installation. If you are using libtool to build your
@@ -60,65 +38,3 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
  * FIXME: Good question. Needs to be determined.
  *
  */
-
-typedef struct exif_rational {
-  int      num;
-  unsigned denom;
-} exif_rational_t;
-
-typedef union {
-  long            l;
-  float           f;
-  double          g;
-  char *          s;
-  exif_rational_t r;
-} exif_rec_data_t;
-
-typedef struct exif_record {
-  char *           rec_name;
-  char             rec_type;
-  int              exif_format;
-  exif_rec_data_t  rec_data;
-} exif_record_t;
-
-typedef struct exif_data {
-  int           n_recs;
-  int           n_alloc;
-  exif_record_t recs[0];
-} exif_data_t;
-
-
-/* EXIF data formats */
-
-#define EXIF_FMT_COMPUTED  -1 /* Not in raw data */
-#define EXIF_FMT_BYTE       1 
-#define EXIF_FMT_STRING     2
-#define EXIF_FMT_USHORT     3
-#define EXIF_FMT_ULONG      4
-#define EXIF_FMT_URATIONAL  5
-#define EXIF_FMT_SBYTE      6
-#define EXIF_FMT_UNDEFINED  7
-#define EXIF_FMT_SSHORT     8
-#define EXIF_FMT_SLONG      9
-#define EXIF_FMT_SRATIONAL 10
-#define EXIF_FMT_SINGLE    11
-#define EXIF_FMT_DOUBLE    12
-
-extern void
-exif_init(void *(*malloc_fn)(int),
-	  void (*free_fn)(void *),
-	  void *(*realloc_fn)(void *, int));
-
-extern exif_data_t *
-exif_parse_fd(int fd);
-
-extern exif_data_t *
-exif_parse_file(const char *filename);
-
-extern void
-exif_free_data(exif_data_t *d);
-
-extern exif_record_t *
-exif_find_record(exif_data_t *d, const char *rec_name);
-
-

[libexif-cvs] libexif/libexif exif-tag.c,1.32,1.33

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

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

Modified Files:
	exif-tag.c 
Log Message:
fix 'static const' keyword sequence

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- exif-tag.c	18 May 2007 19:53:43 -0000	1.32
+++ exif-tag.c	26 Jun 2007 02:06:51 -0000	1.33
@@ -773,7 +773,7 @@ typedef const char * (*get_stuff_func) (
 static const char *
 exif_tag_get_stuff (ExifTag tag, get_stuff_func func)
 {
-	const static ExifIfd ifds[5] = {
+	static const ExifIfd ifds[5] = {
 		EXIF_IFD_0,
 		EXIF_IFD_1,
 		EXIF_IFD_EXIF,

[libexif-cvs] libexif/libexif exif-data.h, 1.13, 1.14 exif-entry.h, 1.14, 1.15 exif-utils.h, 1.16, 1.17

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

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

Modified Files:
	exif-data.h exif-entry.h exif-utils.h 
Log Message:
dox comment cosmetics

Index: exif-utils.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- exif-utils.h	15 May 2007 18:23:28 -0000	1.16
+++ exif-utils.h	26 Jun 2007 02:06:00 -0000	1.17
@@ -39,9 +39,14 @@ typedef char *		ExifAscii;
 typedef uint16_t	ExifShort;         /* 2 bytes */
 typedef int16_t         ExifSShort;        /* 2 bytes */
 typedef uint32_t	ExifLong;          /* 4 bytes */
+
+/** EXIF Unsigned Rational */
 typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational;
+
 typedef char		ExifUndefined;     /* 1 byte  */
 typedef int32_t		ExifSLong;         /* 4 bytes */
+
+/** EXIF Signed Rational. */
 typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational;
 
 

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- exif-data.h	9 May 2007 06:09:05 -0000	1.13
+++ exif-data.h	26 Jun 2007 02:06:00 -0000	1.14
@@ -100,7 +100,7 @@ ExifDataType exif_data_get_data_type (Ex
 void exif_data_dump (ExifData *data);
 void exif_data_log  (ExifData *data, ExifLog *log);
 
-/* For your convenience */
+/** convenience macro. */
 #define exif_data_get_entry(d,t)					\
 	(exif_content_get_entry(d->ifd[EXIF_IFD_0],t) ?			\
 	 exif_content_get_entry(d->ifd[EXIF_IFD_0],t) :			\

Index: exif-entry.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- exif-entry.h	21 May 2007 13:53:34 -0000	1.14
+++ exif-entry.h	26 Jun 2007 02:06:00 -0000	1.15
@@ -33,7 +33,7 @@ typedef struct _ExifEntryPrivate ExifEnt
 #include <libexif/exif-format.h>
 #include <libexif/exif-mem.h>
 
-/*! \struct _ExifEntry exif-entry.h exif/exif-entry.h */
+/*! */
 struct _ExifEntry {
         ExifTag tag;
         ExifFormat format;

[libexif-cvs] libexif/libexif exif-system.h, NONE, 1.1 Makefile.am, 1.38, 1.39

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

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

Modified Files:
	Makefile.am 
Added Files:
	exif-system.h 
Log Message:
add exif-system.h header

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -d -r1.38 -r1.39
--- Makefile.am	17 May 2007 14:57:26 -0000	1.38
+++ Makefile.am	26 Jun 2007 02:03:47 -0000	1.39
@@ -1,3 +1,5 @@
+EXTRA_DIST =
+
 SUBDIRS = canon olympus pentax
 
 lib_LTLIBRARIES = libexif.la
@@ -62,7 +64,9 @@ libexifinclude_HEADERS = 	\
 	exif-utils.h		\
 	_stdint.h
 
-EXTRA_DIST = libexif.sym
+EXTRA_DIST += exif-system.h
+
+EXTRA_DIST += libexif.sym
 
 DISTCLEANFILES = _stdint.h
 

--- NEW FILE: exif-system.h ---
/** \file exif-system.h
 * \brief System specific definitions, not for installation!
 */

#ifndef EXIF_SYSTEM_H
#define EXIF_SYSTEM_H

#if defined(__GNUC__) && (__GNUC__ >= 2)
# define UNUSED(param) UNUSED_PARAM_##param __attribute__((unused))
#else
# define UNUSED(param) param
#endif

#endif /* !defined(EXIF_SYSTEM_H) */

[libexif-cvs] gexif configure.ac,1.7,1.8

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

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

Modified Files:
	configure.ac 
Log Message:
Define both LOCALEDIR and GETTEXT_PACKAGE using AM_CPPFLAGS in the GP_GETTEXT_HACK macro

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/gexif/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- configure.ac	21 May 2007 18:36:48 -0000	1.7
+++ configure.ac	26 Jun 2007 02:00:31 -0000	1.8
@@ -44,11 +44,6 @@ AM_PO_SUBDIRS()
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
-dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
-dnl we require make to do insert the proper $(datadir) value
-AC_SUBST([localedir],["\$(datadir)/locale"])
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
-
 
 # ---------------------------------------------------------------------------
 # libraries needed

[libexif-cvs] exif configure.ac,1.11,1.12

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

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

Modified Files:
	configure.ac 
Log Message:
Define both LOCALEDIR and GETTEXT_PACKAGE using AM_CPPFLAGS in the GP_GETTEXT_HACK macro

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/exif/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- configure.ac	23 May 2007 13:23:56 -0000	1.11
+++ configure.ac	26 Jun 2007 02:00:25 -0000	1.12
@@ -46,10 +46,6 @@ AM_PO_SUBDIRS()
 AM_ICONV()
 GP_GETTEXT_FLAGS()
 
-# We cannot use [AC_DEFINE_UNQUOTED()] for these definitions, as
-# we require make to do insert the proper $(datadir) value
-AC_SUBST([localedir],["\$(datadir)/locale"])
-AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\""
 
 # ---------------------------------------------------------------------------
 # locale.h: locale.h provides setlocale. It seems that some systems don't