Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: libexif/sources/libexif/exif-data.h

Issue 10792004: Fetch libexif 0.6.21 to include the security fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « libexif/sources/libexif/exif-byte-order.h ('k') | libexif/sources/libexif/exif-data.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /*! \file exif-data.h 1 /*! \file exif-data.h
2 * \brief Defines the ExifData type and the associated functions. 2 * \brief Defines the ExifData type and the associated functions.
3 */ 3 */
4 /* 4 /*
5 * \author Lutz Mueller <lutz@users.sourceforge.net> 5 * \author Lutz Mueller <lutz@users.sourceforge.net>
6 * \date 2001-2005 6 * \date 2001-2005
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 * \param[in] data pointer to raw JPEG or EXIF data 88 * \param[in] data pointer to raw JPEG or EXIF data
89 * \param[in] size number of bytes of data at data 89 * \param[in] size number of bytes of data at data
90 * \return allocated #ExifData, or NULL on error 90 * \return allocated #ExifData, or NULL on error
91 */ 91 */
92 ExifData *exif_data_new_from_data (const unsigned char *data, 92 ExifData *exif_data_new_from_data (const unsigned char *data,
93 unsigned int size); 93 unsigned int size);
94 94
95 /*! Load the #ExifData structure from the raw JPEG or EXIF data in the given 95 /*! Load the #ExifData structure from the raw JPEG or EXIF data in the given
96 * memory buffer. If the EXIF data contains a recognized MakerNote, it is 96 * memory buffer. If the EXIF data contains a recognized MakerNote, it is
97 * loaded and stored as well for later retrieval by #exif_data_get_mnote_data. 97 * loaded and stored as well for later retrieval by #exif_data_get_mnote_data.
98 * If the EXIF_DATA_OPTION_FOLLOW_SPECIFICATION has been set on this #ExifData, 98 * If the #EXIF_DATA_OPTION_FOLLOW_SPECIFICATION option has been set on this
99 * then the tags are fixed after loading. 99 * #ExifData, then the tags are automatically fixed after loading (by calling
100 * #exif_data_fix).
100 * 101 *
101 * \param[in,out] data EXIF data 102 * \param[in,out] data EXIF data
102 * \param[in] d pointer to raw JPEG or EXIF data 103 * \param[in] d pointer to raw JPEG or EXIF data
103 * \param[in] size number of bytes of data at d 104 * \param[in] size number of bytes of data at d
104 */ 105 */
105 void exif_data_load_data (ExifData *data, const unsigned char *d, 106 void exif_data_load_data (ExifData *data, const unsigned char *d,
106 unsigned int size); 107 unsigned int size);
107 108
108 /*! Store raw EXIF data representing the #ExifData structure into a memory 109 /*! Store raw EXIF data representing the #ExifData structure into a memory
109 * buffer. The buffer is allocated by this function and must subsequently be 110 * buffer. The buffer is allocated by this function and must subsequently be
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) ? \ 256 exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) ? \
256 exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) : \ 257 exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) : \
257 exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) ? \ 258 exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) ? \
258 exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) : NULL) 259 exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) : NULL)
259 260
260 #ifdef __cplusplus 261 #ifdef __cplusplus
261 } 262 }
262 #endif /* __cplusplus */ 263 #endif /* __cplusplus */
263 264
264 #endif /* __EXIF_DATA_H__ */ 265 #endif /* __EXIF_DATA_H__ */
OLDNEW
« no previous file with comments | « libexif/sources/libexif/exif-byte-order.h ('k') | libexif/sources/libexif/exif-data.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698