Mercurial > geeqie
diff src/format_canon.h @ 51:276ea4c98d33
Sat Jun 4 22:24:00 2005 John Ellis <johne@verizon.net>
* exif.[ch]: Use glib provided data types and byte order functions for
consistency with rest of application. Made several more functions
available in the header. Use MakerNote parsing from format_raw.c.
* format_canon.[ch]: Changes to match exif.h and format_raw.h.
* format_fuji.[ch]: Add support for Fuji EXIF MakerNote.
* format_nikon.[ch]: New files, add support for Nikon EXIF MakerNote.
* format_raw.[ch]: Add EXIF MakerNote parser functions to gather all
camera formats here (similar to existing raw format list).
* src/Makefile.am: Add format_nikon.[ch].
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
##### an offical release when making enhancements and translation updates. #####
| author | gqview |
|---|---|
| date | Sun, 05 Jun 2005 02:48:54 +0000 |
| parents | aa4c0e1b54b0 |
| children | 00843150f7c8 |
line wrap: on
line diff
--- a/src/format_canon.h Sat Jun 04 08:06:47 2005 +0000 +++ b/src/format_canon.h Sun Jun 05 02:48:54 2005 +0000 @@ -15,23 +15,25 @@ * */ -#ifndef __FORMAT_RAW_CANON_H -#define __FORMAT_RAW_CANON_H +#ifndef __FORMAT_CANON_H +#define __FORMAT_CANON_H #include "exif.h" -gint format_raw_test_canon(const void *data, const guint len, - guint *image_offset, guint *exif_offset); +gint format_canon_raw(const void *data, const guint len, + guint *image_offset, guint *exif_offset); -#define FORMAT_RAW_CANON { "II", 2, "Canon crw format", format_raw_test_canon }, \ - { "\x49\x49\x2a\00", 4, "Canon cr2 format", format_raw_test_canon } +#define FORMAT_RAW_CANON { "II", 2, "Canon crw format", format_canon_raw }, \ + { "\x49\x49\x2a\00", 4, "Canon cr2 format", format_canon_raw } -gint format_exif_makernote_canon_parse(ExifData *exif, unsigned char *tiff, int offset, - int size, int byte_order); +gint format_canon_makernote(ExifData *exif, unsigned char *tiff, guint offset, + guint size, ExifByteOrder byte_order); + +#define FORMAT_EXIF_CANON { FORMAT_EXIF_MATCH_MAKE, "Canon", 5, format_canon_makernote } #endif