From: Dan F. <dfa...@us...> - 2009-09-30 06:56:28
|
Update of /cvsroot/libexif/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3143/libexif Modified Files: exif-data-type.h exif-data.c exif-data.h exif-tag.c exif-tag.h Log Message: Added EXIF_DATA_TYPE_UNKNOWN as a backwards-compatible replacement for most uses of EXIF_DATA_TYPE_COUNT since that's a clearer name for how it's being used. Index: exif-tag.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -d -r1.25 -r1.26 --- exif-tag.h 27 Sep 2009 04:48:56 -0000 1.25 +++ exif-tag.h 30 Sep 2009 06:56:16 -0000 1.26 @@ -236,13 +236,13 @@ const char *exif_tag_get_descriptio /*! Return whether the given tag is mandatory or not in the given IFD and * data type according to the EXIF specification. If the IFD given is * EXIF_IFD_COUNT, the result is EXIF_SUPPORT_LEVEL_UNKNOWN. If the data - * type is EXIF_DATA_TYPE_COUNT, the result is + * type is EXIF_DATA_TYPE_UNKNOWN, the result is * EXIF_SUPPORT_LEVEL_UNKNOWN unless the support level is the same for * all data types. * * \param[in] tag EXIF tag * \param[in] ifd IFD or EXIF_IFD_COUNT - * \param[in] t data type or EXIF_DATA_TYPE_COUNT + * \param[in] t data type or EXIF_DATA_TYPE_UNKNOWN * \return the level of support for this tag */ ExifSupportLevel exif_tag_get_support_level_in_ifd (ExifTag tag, ExifIfd ifd, Index: exif-tag.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -d -r1.55 -r1.56 --- exif-tag.c 27 Sep 2009 04:48:56 -0000 1.55 +++ exif-tag.c 30 Sep 2009 06:56:16 -0000 1.56 @@ -1006,7 +1006,7 @@ exif_tag_from_name (const char *name) * * \param[in] tag EXIF tag * \param[in] ifd a valid IFD (not EXIF_IFD_COUNT) - * \param[in] t a valid data type (not EXIF_DATA_TYPE_COUNT) + * \param[in] t a valid data type (not EXIF_DATA_TYPE_UNKNOWN) * \return the level of support for this tag */ static inline ExifSupportLevel Index: exif-data-type.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data-type.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -d -r1.2 -r1.3 --- exif-data-type.h 17 Feb 2008 18:31:55 -0000 1.2 +++ exif-data-type.h 30 Sep 2009 06:56:16 -0000 1.3 @@ -25,12 +25,18 @@ extern "C" { #endif /* __cplusplus */ +/*! Represents the type of image data to which the EXIF data applies. + * The EXIF tags have different constraints depending on the type of + * image data. + */ typedef enum { EXIF_DATA_TYPE_UNCOMPRESSED_CHUNKY = 0, EXIF_DATA_TYPE_UNCOMPRESSED_PLANAR, EXIF_DATA_TYPE_UNCOMPRESSED_YCC, EXIF_DATA_TYPE_COMPRESSED, - EXIF_DATA_TYPE_COUNT + EXIF_DATA_TYPE_COUNT, + + EXIF_DATA_TYPE_UNKNOWN = EXIF_DATA_TYPE_COUNT } ExifDataType; #ifdef __cplusplus Index: exif-data.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -p -d -r1.120 -r1.121 --- exif-data.c 26 Sep 2009 05:04:12 -0000 1.120 +++ exif-data.c 30 Sep 2009 06:56:16 -0000 1.121 @@ -1293,5 +1293,5 @@ exif_data_set_data_type (ExifData *d, Ex ExifDataType exif_data_get_data_type (ExifData *d) { - return (d && d->priv) ? d->priv->data_type : EXIF_DATA_TYPE_COUNT; + return (d && d->priv) ? d->priv->data_type : EXIF_DATA_TYPE_UNKNOWN; } Index: exif-data.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -d -r1.24 -r1.25 --- exif-data.h 14 Apr 2009 06:00:15 -0000 1.24 +++ exif-data.h 30 Sep 2009 06:56:16 -0000 1.25 @@ -58,7 +58,9 @@ struct _ExifData }; /*! Allocate a new #ExifData. The #ExifData contains an empty - * #ExifContent for each IFD and the default set of options. + * #ExifContent for each IFD and the default set of options, + * which has #EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS + * and #EXIF_DATA_OPTION_FOLLOW_SPECIFICATION set. * * \return allocated #ExifData, or NULL on error */ @@ -66,7 +68,8 @@ ExifData *exif_data_new (void) /*! Allocate a new #ExifData using the given memory allocator. * The #ExifData contains an empty #ExifContent for each IFD and the default - * set of options. + * set of options, which has #EXIF_DATA_OPTION_IGNORE_UNKNOWN_TAGS and + * #EXIF_DATA_OPTION_FOLLOW_SPECIFICATION set. * * \return allocated #ExifData, or NULL on error */ @@ -215,7 +218,7 @@ void exif_data_set_data_type (Ex /*! Return the data type for the given #ExifData. * * \param[in] d EXIF data - * \return data type, or #EXIF_DATA_TYPE_COUNT on error + * \return data type, or #EXIF_DATA_TYPE_UNKNOWN on error */ ExifDataType exif_data_get_data_type (ExifData *d); |