diff options
Diffstat (limited to 'src/exif_cfg.h')
| -rw-r--r-- | src/exif_cfg.h | 100 |
1 files changed, 48 insertions, 52 deletions
diff --git a/src/exif_cfg.h b/src/exif_cfg.h index a961147..f93ab7b 100644 --- a/src/exif_cfg.h +++ b/src/exif_cfg.h @@ -28,78 +28,74 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <libexif/exif-data.h> -typedef struct -{ - ExifIfd ifd; /* section */ - ExifTag tag; /* tag */ +typedef struct { + ExifIfd ifd; /* section */ + ExifTag tag; /* tag */ } t_EXIF_INFO; /* show these standard tags. section must be given first, than the tag itself */ /* definition: http://libexif.sourceforge.net/api/exif-tag_8h.html */ -const t_EXIF_INFO Exif_tag_list [] = -{ - {EXIF_IFD_0, EXIF_TAG_MAKE}, - {EXIF_IFD_0, EXIF_TAG_MODEL}, - {EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION}, - {EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL}, - {EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_TIME}, - {EXIF_IFD_EXIF, EXIF_TAG_SHUTTER_SPEED_VALUE}, - {EXIF_IFD_EXIF, EXIF_TAG_FNUMBER}, - {EXIF_IFD_EXIF, EXIF_TAG_APERTURE_VALUE}, - {EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_BIAS_VALUE}, - {EXIF_IFD_EXIF, EXIF_TAG_ISO_SPEED_RATINGS}, - {EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH}, - {EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM}, - {EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_MODE}, - {EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_PROGRAM}, - {EXIF_IFD_EXIF, EXIF_TAG_SCENE_CAPTURE_TYPE}, - {EXIF_IFD_EXIF, EXIF_TAG_FLASH}, - - {EXIF_IFD_COUNT, 0} /* end marker */ +const t_EXIF_INFO Exif_tag_list[] = { + { EXIF_IFD_0, EXIF_TAG_MAKE }, + { EXIF_IFD_0, EXIF_TAG_MODEL }, + { EXIF_IFD_0, EXIF_TAG_IMAGE_DESCRIPTION }, + { EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL }, + { EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_TIME }, + { EXIF_IFD_EXIF, EXIF_TAG_SHUTTER_SPEED_VALUE }, + { EXIF_IFD_EXIF, EXIF_TAG_FNUMBER }, + { EXIF_IFD_EXIF, EXIF_TAG_APERTURE_VALUE }, + { EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_BIAS_VALUE }, + { EXIF_IFD_EXIF, EXIF_TAG_ISO_SPEED_RATINGS }, + { EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH }, + { EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM }, + { EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_MODE }, + { EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_PROGRAM }, + { EXIF_IFD_EXIF, EXIF_TAG_SCENE_CAPTURE_TYPE }, + { EXIF_IFD_EXIF, EXIF_TAG_FLASH }, + + { EXIF_IFD_COUNT, 0 } /* end marker */ }; /* Nikon */ -#define EXIF_NIKON_MAKERNOTE_END 0 /* end marker: if 0 used as a tag we must find something else */ +#define EXIF_NIKON_MAKERNOTE_END 0 /* end marker: if 0 used as a tag we must find something else */ /* show these nikon makernote tags */ -const unsigned int Exif_makernote_nikon_tag_list [] = -{ - - 6, - 8, /* Flash Setting */ - 9, /* Flash Mode */ - 135, /* Flash used */ - 18, /* Flash Exposure Comp */ - 168, /* Flash info: control mode */ - - 2, /* ISO. Has some more info than EXIF_TAG_ISO_SPEED_RATINGS but also fails on Lo.1 */ - 5, /* White Balance */ - 132, /* Lens */ - 171, /* Digital Vari-Program */ - 34, /* Active D-Lighting */ - - 35, /* PictureControlData */ - 183, /* AFInfo2 */ - - EXIF_NIKON_MAKERNOTE_END /* end marker */ +const unsigned int Exif_makernote_nikon_tag_list[] = { + + 6, + 8, /* Flash Setting */ + 9, /* Flash Mode */ + 135, /* Flash used */ + 18, /* Flash Exposure Comp */ + 168, /* Flash info: control mode */ + + 2, /* ISO. Has some more info than EXIF_TAG_ISO_SPEED_RATINGS but also fails on Lo.1 */ + 5, /* White Balance */ + 132, /* Lens */ + 171, /* Digital Vari-Program */ + 34, /* Active D-Lighting */ + + 35, /* PictureControlData */ + 183, /* AFInfo2 */ + + EXIF_NIKON_MAKERNOTE_END /* end marker */ }; /* Canon */ -#define EXIF_CANON_MAKERNOTE_END 0xFFFF /* end marker: if this is used as a tag we must find something else */ +#define EXIF_CANON_MAKERNOTE_END 0xFFFF /* end marker: if this is used as a tag we must find something else */ /* show these canon makernote tags */ -const unsigned int Exif_makernote_canon_tag_list [] = -{ - 8, /* Image Number */ - 9, /* Owner Name */ - - EXIF_CANON_MAKERNOTE_END /* end marker */ +const unsigned int Exif_makernote_canon_tag_list[] = { + 8, /* Image Number */ + 9, /* Owner Name */ + + EXIF_CANON_MAKERNOTE_END /* end marker */ }; |