Mercurial > geeqie
comparison 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 |
comparison
equal
deleted
inserted
replaced
50:3b83fb81afc4 | 51:276ea4c98d33 |
---|---|
13 * | 13 * |
14 * you can find the sources for this patch at http://turingmachine.org/~dmg/libdcraw/gqview/ | 14 * you can find the sources for this patch at http://turingmachine.org/~dmg/libdcraw/gqview/ |
15 * | 15 * |
16 */ | 16 */ |
17 | 17 |
18 #ifndef __FORMAT_RAW_CANON_H | 18 #ifndef __FORMAT_CANON_H |
19 #define __FORMAT_RAW_CANON_H | 19 #define __FORMAT_CANON_H |
20 | 20 |
21 | 21 |
22 #include "exif.h" | 22 #include "exif.h" |
23 | 23 |
24 | 24 |
25 gint format_raw_test_canon(const void *data, const guint len, | 25 gint format_canon_raw(const void *data, const guint len, |
26 guint *image_offset, guint *exif_offset); | 26 guint *image_offset, guint *exif_offset); |
27 | 27 |
28 | 28 |
29 #define FORMAT_RAW_CANON { "II", 2, "Canon crw format", format_raw_test_canon }, \ | 29 #define FORMAT_RAW_CANON { "II", 2, "Canon crw format", format_canon_raw }, \ |
30 { "\x49\x49\x2a\00", 4, "Canon cr2 format", format_raw_test_canon } | 30 { "\x49\x49\x2a\00", 4, "Canon cr2 format", format_canon_raw } |
31 | 31 |
32 | 32 |
33 gint format_exif_makernote_canon_parse(ExifData *exif, unsigned char *tiff, int offset, | 33 gint format_canon_makernote(ExifData *exif, unsigned char *tiff, guint offset, |
34 int size, int byte_order); | 34 guint size, ExifByteOrder byte_order); |
35 | |
36 #define FORMAT_EXIF_CANON { FORMAT_EXIF_MATCH_MAKE, "Canon", 5, format_canon_makernote } | |
35 | 37 |
36 | 38 |
37 #endif | 39 #endif |
38 | 40 |