exif-byte-order.h   exif-byte-order.h 
/* exif-byte-order.h /* exif-byte-order.h
* *
* Copyright * Copyright (c) 2002 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-content.h   exif-content.h 
/* exif-content.h /* exif-content.h
* *
* Copyright * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-data-type.h   exif-data-type.h 
/* exif-data-tag.h /* exif-data-tag.h
* *
* Copyright * Copyright (c) 2005 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-data.h   exif-data.h 
/*! \file exif-data.h /*! \file exif-data.h
* \brief FIXME foo bar blah * \brief Defines the ExifData type and the associated functions.
* *
* \author Lutz M * \author Lutz Mueller <lutz@users.sourceforge.net>
* \date 2001-2005 * \date 2001-2005
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
skipping to change at line 58 skipping to change at line 58
unsigned int size; unsigned int size;
ExifDataPrivate *priv; ExifDataPrivate *priv;
}; };
ExifData *exif_data_new (void); ExifData *exif_data_new (void);
ExifData *exif_data_new_mem (ExifMem *); ExifData *exif_data_new_mem (ExifMem *);
/*! \brief load exif data from file /*! \brief load exif data from file
* \param[in] path filename including path * \param[in] path filename including path
*
* Foo bar blah bleh baz.
*/ */
ExifData *exif_data_new_from_file (const char *path); ExifData *exif_data_new_from_file (const char *path);
ExifData *exif_data_new_from_data (const unsigned char *data, ExifData *exif_data_new_from_data (const unsigned char *data,
unsigned int size); unsigned int size);
void exif_data_load_data (ExifData *data, const unsigned char *d, void exif_data_load_data (ExifData *data, const unsigned char *d,
unsigned int size); unsigned int size);
void exif_data_save_data (ExifData *data, unsigned char **d, void exif_data_save_data (ExifData *data, unsigned char **d,
unsigned int *size); unsigned int *size);
skipping to change at line 103 skipping to change at line 101
void exif_data_set_option (ExifData *, ExifDataOption); void exif_data_set_option (ExifData *, ExifDataOption);
void exif_data_unset_option (ExifData *, ExifDataOption); void exif_data_unset_option (ExifData *, ExifDataOption);
void exif_data_set_data_type (ExifData *, ExifDataType); void exif_data_set_data_type (ExifData *, ExifDataType);
ExifDataType exif_data_get_data_type (ExifData *); ExifDataType exif_data_get_data_type (ExifData *);
/* For debugging purposes and error reporting */ /* For debugging purposes and error reporting */
void exif_data_dump (ExifData *data); void exif_data_dump (ExifData *data);
void exif_data_log (ExifData *data, ExifLog *log); void exif_data_log (ExifData *data, ExifLog *log);
/* For your convenience */ /** convenience macro. */
#define exif_data_get_entry(d,t) \ #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) ? \
exif_content_get_entry(d->ifd[EXIF_IFD_0],t) : \ exif_content_get_entry(d->ifd[EXIF_IFD_0],t) : \
exif_content_get_entry(d->ifd[EXIF_IFD_1],t) ? \ exif_content_get_entry(d->ifd[EXIF_IFD_1],t) ? \
exif_content_get_entry(d->ifd[EXIF_IFD_1],t) : \ exif_content_get_entry(d->ifd[EXIF_IFD_1],t) : \
exif_content_get_entry(d->ifd[EXIF_IFD_EXIF],t) ? \ exif_content_get_entry(d->ifd[EXIF_IFD_EXIF],t) ? \
exif_content_get_entry(d->ifd[EXIF_IFD_EXIF],t) : \ exif_content_get_entry(d->ifd[EXIF_IFD_EXIF],t) : \
exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) ? \ exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) ? \
exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) : \ exif_content_get_entry(d->ifd[EXIF_IFD_GPS],t) : \
exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) ? \ exif_content_get_entry(d->ifd[EXIF_IFD_INTEROPERABILITY],t) ? \
 End of changes. 4 change blocks. 
5 lines changed or deleted 3 lines changed or added


 exif-entry.h   exif-entry.h 
/*! \file exif-entry.h /*! \file exif-entry.h
* \brief Handling EXIF entries * \brief Handling EXIF entries
* *
* Copyright * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 36 skipping to change at line 36
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef struct _ExifEntry ExifEntry; typedef struct _ExifEntry ExifEntry;
typedef struct _ExifEntryPrivate ExifEntryPrivate; typedef struct _ExifEntryPrivate ExifEntryPrivate;
#include <libexif/exif-content.h> #include <libexif/exif-content.h>
#include <libexif/exif-format.h> #include <libexif/exif-format.h>
#include <libexif/exif-mem.h> #include <libexif/exif-mem.h>
/*! \struct _ExifEntry exif-entry.h exif/exif-entry.h */ /*! */
struct _ExifEntry { struct _ExifEntry {
ExifTag tag; ExifTag tag;
ExifFormat format; ExifFormat format;
unsigned long components; unsigned long components;
unsigned char *data; unsigned char *data;
unsigned int size; unsigned int size;
/* Content containing this entry */ /* Content containing this entry */
ExifContent *parent; ExifContent *parent;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 exif-format.h   exif-format.h 
/* exif-format.h /* exif-format.h
* *
* Copyright * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-ifd.h   exif-ifd.h 
/* exif-ifd.h /* exif-ifd.h
* *
* Copyright * Copyright (c) 2002 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 25 skipping to change at line 25
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __EXIF_IFD_H__ #ifndef __EXIF_IFD_H__
#define __EXIF_IFD_H__ #define __EXIF_IFD_H__
typedef enum { typedef enum {
EXIF_IFD_0 = 0, EXIF_IFD_0 = 0, /*!< */
EXIF_IFD_1, EXIF_IFD_1, /*!< */
EXIF_IFD_EXIF, EXIF_IFD_EXIF, /*!< */
EXIF_IFD_GPS, EXIF_IFD_GPS, /*!< */
EXIF_IFD_INTEROPERABILITY, EXIF_IFD_INTEROPERABILITY, /*!< */
EXIF_IFD_COUNT EXIF_IFD_COUNT /*!< Not a real value, just (max_valu
e + 1). */
} ExifIfd; } ExifIfd;
const char *exif_ifd_get_name (ExifIfd ifd); const char *exif_ifd_get_name (ExifIfd ifd);
#endif /* __EXIF_IFD_H__ */ #endif /* __EXIF_IFD_H__ */
 End of changes. 2 change blocks. 
7 lines changed or deleted 8 lines changed or added


 exif-loader.h   exif-loader.h 
/*! \file exif-loader.h /*! \file exif-loader.h
* \brief Defines the ExifLoader type * \brief Defines the ExifLoader type
*/ */
/* /*
* Copyright * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 27 skipping to change at line 27
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __EXIF_LOADER_H__ #ifndef __EXIF_LOADER_H__
#define __EXIF_LOADER_H__ #define __EXIF_LOADER_H__
#include <libexif/exif-data.h> #include <libexif/exif-data.h>
#include <libexif/exif-loader.h>
#include <libexif/exif-log.h> #include <libexif/exif-log.h>
#include <libexif/exif-mem.h> #include <libexif/exif-mem.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef struct _ExifLoader ExifLoader; typedef struct _ExifLoader ExifLoader;
/*! Allocate a new ExifLoader /*! Allocate a new ExifLoader
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 exif-log.h   exif-log.h 
/*! \file exif-log.h /*! \file exif-log.h
* \brief log message infrastructure * \brief log message infrastructure
* *
* Copyright * Copyright (c) 2004 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 58 skipping to change at line 58
/** Log callback function prototype. /** Log callback function prototype.
*/ */
typedef void (* ExifLogFunc) (ExifLog *log, ExifLogCode, const char *domain , typedef void (* ExifLogFunc) (ExifLog *log, ExifLogCode, const char *domain ,
const char *format, va_list args, void *data); const char *format, va_list args, void *data);
/** Register log callback function. /** Register log callback function.
*/ */
void exif_log_set_func (ExifLog *log, ExifLogFunc func, void *data); void exif_log_set_func (ExifLog *log, ExifLogFunc func, void *data);
#ifndef NO_VERBOSE_TAG_STRINGS
void exif_log (ExifLog *log, ExifLogCode, const char *domain, void exif_log (ExifLog *log, ExifLogCode, const char *domain,
const char *format, ...) const char *format, ...)
#ifdef __GNUC__ #ifdef __GNUC__
__attribute__((__format__(printf,4,5))) __attribute__((__format__(printf,4,5)))
#endif #endif
; ;
#else
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define exif_log(...) do { } while (0)
#elif defined(__GNUC__)
#define exif_log(x...) do { } while (0)
#else
#define exif_log (void)
#endif
#endif
void exif_logv (ExifLog *log, ExifLogCode, const char *domain, void exif_logv (ExifLog *log, ExifLogCode, const char *domain,
const char *format, va_list args); const char *format, va_list args);
/* For your convenience */ /* For your convenience */
#define EXIF_LOG_NO_MEMORY(l,d,s) exif_log (l, EXIF_LOG_CODE_NO_MEMORY, d, "Could not allocate %i byte(s).", s) #define EXIF_LOG_NO_MEMORY(l,d,s) exif_log ((l), EXIF_LOG_CODE_NO_MEMORY, ( d), "Could not allocate %lu byte(s).", (unsigned long)(s))
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __EXIF_LOG_H__ */ #endif /* __EXIF_LOG_H__ */
 End of changes. 4 change blocks. 
2 lines changed or deleted 12 lines changed or added


 exif-mem.h   exif-mem.h 
/*! \file exif-mem.h /*! \file exif-mem.h
* \brief Define the ExifMem data type and the associated functions. * \brief Define the ExifMem data type and the associated functions.
* ExifMem defines the memory management functions used by the ExifLoader. * ExifMem defines the memory management functions used by the ExifLoader.
*/ */
/* exif-mem.h /* exif-mem.h
* *
* Copyright * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-mnote-data.h   exif-mnote-data.h 
/* exif-mnote-data.h /* exif-mnote-data.h
* *
* Copyright * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 exif-tag.h   exif-tag.h 
/* exif-tag.h /* exif-tag.h
* *
* Copyright * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 145 skipping to change at line 145
EXIF_TAG_DIGITAL_ZOOM_RATIO = 0xa404, EXIF_TAG_DIGITAL_ZOOM_RATIO = 0xa404,
EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM = 0xa405, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM = 0xa405,
EXIF_TAG_SCENE_CAPTURE_TYPE = 0xa406, EXIF_TAG_SCENE_CAPTURE_TYPE = 0xa406,
EXIF_TAG_GAIN_CONTROL = 0xa407, EXIF_TAG_GAIN_CONTROL = 0xa407,
EXIF_TAG_CONTRAST = 0xa408, EXIF_TAG_CONTRAST = 0xa408,
EXIF_TAG_SATURATION = 0xa409, EXIF_TAG_SATURATION = 0xa409,
EXIF_TAG_SHARPNESS = 0xa40a, EXIF_TAG_SHARPNESS = 0xa40a,
EXIF_TAG_DEVICE_SETTING_DESCRIPTION = 0xa40b, EXIF_TAG_DEVICE_SETTING_DESCRIPTION = 0xa40b,
EXIF_TAG_SUBJECT_DISTANCE_RANGE = 0xa40c, EXIF_TAG_SUBJECT_DISTANCE_RANGE = 0xa40c,
EXIF_TAG_IMAGE_UNIQUE_ID = 0xa420, EXIF_TAG_IMAGE_UNIQUE_ID = 0xa420,
EXIF_TAG_GAMMA = 0xa500, EXIF_TAG_GAMMA = 0xa500,
EXIF_TAG_UNKNOWN_C4A5 = 0xc4a5 EXIF_TAG_PRINT_IMAGE_MATCHING = 0xc4a5
} ExifTag; } ExifTag;
/* GPS tags overlap with above ones. */ /* GPS tags overlap with above ones. */
#define EXIF_TAG_GPS_VERSION_ID 0x0000 #define EXIF_TAG_GPS_VERSION_ID 0x0000
#define EXIF_TAG_GPS_LATITUDE_REF 0x0001 /* INTEROPERABILITY_INDEX * / #define EXIF_TAG_GPS_LATITUDE_REF 0x0001 /* INTEROPERABILITY_INDEX * /
#define EXIF_TAG_GPS_LATITUDE 0x0002 /* INTEROPERABILITY_VERSION * / #define EXIF_TAG_GPS_LATITUDE 0x0002 /* INTEROPERABILITY_VERSION * /
#define EXIF_TAG_GPS_LONGITUDE_REF 0x0003 #define EXIF_TAG_GPS_LONGITUDE_REF 0x0003
#define EXIF_TAG_GPS_LONGITUDE 0x0004 #define EXIF_TAG_GPS_LONGITUDE 0x0004
#define EXIF_TAG_GPS_ALTITUDE_REF 0x0005 #define EXIF_TAG_GPS_ALTITUDE_REF 0x0005
#define EXIF_TAG_GPS_ALTITUDE 0x0006 #define EXIF_TAG_GPS_ALTITUDE 0x0006
skipping to change at line 201 skipping to change at line 201
const char *exif_tag_get_title_in_ifd (ExifTag, ExifIfd); const char *exif_tag_get_title_in_ifd (ExifTag, ExifIfd);
const char *exif_tag_get_description_in_ifd (ExifTag, ExifIfd); const char *exif_tag_get_description_in_ifd (ExifTag, ExifIfd);
ExifSupportLevel exif_tag_get_support_level_in_ifd (ExifTag, ExifIfd, ExifSupportLevel exif_tag_get_support_level_in_ifd (ExifTag, ExifIfd,
ExifDataType); ExifDataType);
/* Don't use these functions. They are here for compatibility only. */ /* Don't use these functions. They are here for compatibility only. */
const char *exif_tag_get_name (ExifTag tag); const char *exif_tag_get_name (ExifTag tag);
const char *exif_tag_get_title (ExifTag tag); const char *exif_tag_get_title (ExifTag tag);
const char *exif_tag_get_description (ExifTag tag); const char *exif_tag_get_description (ExifTag tag);
/* Don't use these definitions. They are here for compatibility only. */
#define EXIF_TAG_UNKNOWN_C4A5 EXIF_TAG_PRINT_IMAGE_MATCHING
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __EXIF_TAG_H__ */ #endif /* __EXIF_TAG_H__ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 6 lines changed or added


 exif-utils.h   exif-utils.h 
/* exif-utils.h /* exif-utils.h
* *
* Copyright * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 41 skipping to change at line 41
/* If these definitions don't work for you, please let us fix the /* If these definitions don't work for you, please let us fix the
* macro generating _stdint.h */ * macro generating _stdint.h */
typedef unsigned char ExifByte; /* 1 byte */ typedef unsigned char ExifByte; /* 1 byte */
typedef signed char ExifSByte; /* 1 byte */ typedef signed char ExifSByte; /* 1 byte */
typedef char * ExifAscii; typedef char * ExifAscii;
typedef uint16_t ExifShort; /* 2 bytes */ typedef uint16_t ExifShort; /* 2 bytes */
typedef int16_t ExifSShort; /* 2 bytes */ typedef int16_t ExifSShort; /* 2 bytes */
typedef uint32_t ExifLong; /* 4 bytes */ typedef uint32_t ExifLong; /* 4 bytes */
/** EXIF Unsigned Rational */
typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational; typedef struct {ExifLong numerator; ExifLong denominator;} ExifRational;
typedef char ExifUndefined; /* 1 byte */ typedef char ExifUndefined; /* 1 byte */
typedef int32_t ExifSLong; /* 4 bytes */ typedef int32_t ExifSLong; /* 4 bytes */
/** EXIF Signed Rational. */
typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational; typedef struct {ExifSLong numerator; ExifSLong denominator;} ExifSRational;
ExifShort exif_get_short (const unsigned char *b, ExifByteOrder ord er); ExifShort exif_get_short (const unsigned char *b, ExifByteOrder ord er);
ExifSShort exif_get_sshort (const unsigned char *b, ExifByteOrder ord er); ExifSShort exif_get_sshort (const unsigned char *b, ExifByteOrder ord er);
ExifLong exif_get_long (const unsigned char *b, ExifByteOrder ord er); ExifLong exif_get_long (const unsigned char *b, ExifByteOrder ord er);
ExifSLong exif_get_slong (const unsigned char *b, ExifByteOrder ord er); ExifSLong exif_get_slong (const unsigned char *b, ExifByteOrder ord er);
ExifRational exif_get_rational (const unsigned char *b, ExifByteOrder ord er); ExifRational exif_get_rational (const unsigned char *b, ExifByteOrder ord er);
ExifSRational exif_get_srational (const unsigned char *b, ExifByteOrder ord er); ExifSRational exif_get_srational (const unsigned char *b, ExifByteOrder ord er);
void exif_set_short (unsigned char *b, ExifByteOrder order, void exif_set_short (unsigned char *b, ExifByteOrder order,
 End of changes. 4 change blocks. 
1 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/