Mercurial > geeqie.yaz
diff src/format_canon.h @ 59:57f6da2510d9
Sun Jun 12 19:25:26 2005 John Ellis <johne@verizon.net>
* format_canon.[ch]: Reimplement canon raw parser to use convenience
functions from exif.c, also separated parsers into one per file type.
For the cr2 format also verify compression type in tiff field 0x0103.
* format_raw.c: Add FIXME comment noting current shortcomings.
| author | gqview |
|---|---|
| date | Sun, 12 Jun 2005 23:45:45 +0000 |
| parents | b58cac75ad12 |
| children | 847e4bc6b54c |
line wrap: on
line diff
--- a/src/format_canon.h Sat Jun 11 05:11:39 2005 +0000 +++ b/src/format_canon.h Sun Jun 12 23:45:45 2005 +0000 @@ -22,16 +22,18 @@ #include "exif.h" -gint format_canon_raw(unsigned char *data, const guint len, - guint *image_offset, guint *exif_offset); +gint format_canon_raw_crw(unsigned char *data, const guint len, + guint *image_offset, guint *exif_offset); +gint format_canon_raw_cr2(unsigned char *data, const guint len, + guint *image_offset, guint *exif_offset); #define FORMAT_RAW_CANON { "crw", \ FORMAT_RAW_MATCH_MAGIC, 6, "HEAPCCDR", 8, \ - "Canon crw", format_canon_raw }, \ + "Canon crw", format_canon_raw_crw }, \ { "cr2", \ FORMAT_RAW_MATCH_TIFF_MAKE, 0, "Canon", 5, \ - "Canon cr2", format_canon_raw } + "Canon cr2", format_canon_raw_cr2 } gint format_canon_makernote(ExifData *exif, unsigned char *tiff, guint offset,