|
From: Dan F. <dfa...@us...> - 2008-12-23 08:34:01
|
Update of /cvsroot/libexif/libexif/libexif In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30199 Modified Files: exif-content.h exif-data.h exif-entry.c exif-entry.h Log Message: Changed a few comments Index: exif-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -p -d -r1.124 -r1.125 --- exif-entry.c 10 Dec 2008 10:57:23 -0000 1.124 +++ exif-entry.c 23 Dec 2008 08:33:55 -0000 1.125 @@ -637,10 +637,12 @@ exif_entry_get_value (ExifEntry *e, char } if ((e->size >= 8) && !memcmp (e->data, "UNICODE\0", 8)) { strncpy (val, _("Unsupported UNICODE string"), maxlen); + /* FIXME: use iconv to convert into the locale encoding */ break; } if ((e->size >= 8) && !memcmp (e->data, "JIS\0\0\0\0\0", 8)) { strncpy (val, _("Unsupported JIS string"), maxlen); + /* FIXME: use iconv to convert into the locale encoding */ break; } @@ -988,7 +990,7 @@ exif_entry_get_value (ExifEntry *e, char case EXIF_TAG_XP_KEYWORDS: case EXIF_TAG_XP_SUBJECT: /* Warning! The texts are converted from UTF16 to UTF8 */ - /* TODO: use iconv to convert into the locale charmap instead */ + /* FIXME: use iconv to convert into the locale encoding */ exif_convert_utf16_to_utf8(val, (unsigned short*)e->data, MIN(maxlen, e->size)); break; case EXIF_TAG_INTEROPERABILITY_VERSION: Index: exif-content.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-content.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -d -r1.17 -r1.18 --- exif-content.h 27 Nov 2008 06:54:45 -0000 1.17 +++ exif-content.h 23 Dec 2008 08:33:55 -0000 1.18 @@ -90,7 +90,7 @@ void exif_content_fix ( typedef void (* ExifContentForeachEntryFunc) (ExifEntry *, void *user_data); -/*! Executes function on each EXIF tag in turn. +/*! Executes function on each EXIF tag in this IFD in turn. * * \param[in,out] content IFD over which to iterate * \param[in] func function to call for each entry Index: exif-data.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -d -r1.21 -r1.22 --- exif-data.h 11 Dec 2008 07:08:49 -0000 1.21 +++ exif-data.h 23 Dec 2008 08:33:55 -0000 1.22 @@ -45,6 +45,7 @@ typedef struct _ExifDataPrivate ExifData /*! Represents the entire EXIF data found in an image */ struct _ExifData { + /*! Data for each IFD */ ExifContent *ifd[EXIF_IFD_COUNT]; /*! Pointer to thumbnail image, or NULL if not available */ @@ -222,6 +223,8 @@ void exif_data_dump (ExifData *data); void exif_data_log (ExifData *data, ExifLog *log); /*! Return an #ExifEntry for the given tag if found in any IFD. + * Each IFD is searched in turn and the first containing a tag with + * this number is returned. * * \param[in] d #ExifData * \param[in] t #ExifTag Index: exif-entry.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -d -r1.20 -r1.21 --- exif-entry.h 5 Dec 2008 07:07:15 -0000 1.20 +++ exif-entry.h 23 Dec 2008 08:33:55 -0000 1.21 @@ -130,7 +130,7 @@ void exif_entry_initialize (ExifE * valid. This may involve, for example, converting an EXIF_FORMAT_LONG into a * EXIF_FORMAT_SHORT. If the tag is unknown, its value is untouched. * - * \note Unfortunately, some conversions are to a type with a more resticted + * \note Unfortunately, some conversions are to a type with a more restricted * range, which could have the side effect that the converted data becomes * invalid. This is unlikely as the range of each tag in the standard is * designed to encompass all likely data. |