[libexif-cvs] libexif/libexif exif-data.c, 1.115, 1.116 exif-data.h, 1.22, 1.23

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

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

Modified Files:
	exif-data.c exif-data.h 
Log Message:
Log when a subsidiary IFD (EXIF, GPS, Interoperability, thumbnail) is found


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -d -r1.115 -r1.116
--- exif-data.c	11 Dec 2008 07:08:49 -0000	1.115
+++ exif-data.c	13 Jan 2009 01:48:39 -0000	1.116
@@ -171,6 +171,9 @@ exif_data_load_data_entry (ExifData *dat
 	entry->format     = exif_get_short (d + offset + 2, data->priv->order);
 	entry->components = exif_get_long  (d + offset + 4, data->priv->order);
 
+	/* FIXME: should use exif_tag_get_name_in_ifd here but entry->parent 
+	 * has not been set yet
+	 */
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
 		  "Loading entry 0x%x ('%s')...", entry->tag,
 		  exif_tag_get_name (entry->tag));
@@ -398,6 +401,11 @@ exif_data_load_data_content (ExifData *d
 		case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
 			o = exif_get_long (d + offset + 12 * i + 8,
 					   data->priv->order);
+			/* FIXME: IFD_POINTER tags aren't marked as being in a
+			 * specific IFD, so exif_tag_get_name_in_ifd won't work
+			 */
+			exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "IFD entry 0x%x at %u.", tag, o);
 			switch (tag) {
 			case EXIF_TAG_EXIF_IFD_POINTER:
 				CHECK_REC (EXIF_IFD_EXIF);

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-data.h	23 Dec 2008 08:33:55 -0000	1.22
+++ exif-data.h	13 Jan 2009 01:48:39 -0000	1.23
@@ -127,6 +127,8 @@ void          exif_data_set_byte_order  
 
 /*! Return the MakerNote data out of the EXIF data.  Only certain
  * MakerNote formats that are recognized by libexif are supported.
+ * The pointer references a member of the #ExifData structure and must NOT be
+ * freed by the caller.
  *
  * \param[in] d EXIF data
  * \return MakerNote data, or NULL if not found or not supported