Mercurial > geeqie

comparison src/format_canon.c @ 1453:bc3f5c0432f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gint -> gboolean where applicable. The end (ouf!).
author zas_
date Mon, 16 Mar 2009 20:39:09 +0000
parents a3d3208b0c50
children 956aab097ea7
comparison
equal deleted inserted replaced
1452:67b40740122e 1453:bc3f5c0432f6
41 *----------------------------------------------------------------------------- 41 *-----------------------------------------------------------------------------
42 * Raw (CR2, CRW) embedded jpeg extraction for Canon 42 * Raw (CR2, CRW) embedded jpeg extraction for Canon
43 *----------------------------------------------------------------------------- 43 *-----------------------------------------------------------------------------
44 */ 44 */
45 45
46 static gint canon_cr2_tiff_entry(guchar *data, const guint len, guint offset, ExifByteOrder bo, 46 static gboolean canon_cr2_tiff_entry(guchar *data, const guint len, guint offset, ExifByteOrder bo,
47 guint *image_offset, gint *jpeg_encoding) 47 guint *image_offset, gint *jpeg_encoding)
48 { 48 {
49 guint tag; 49 guint tag;
50 guint type; 50 guint type;
51 guint count; 51 guint count;
52 guint jpeg_start; 52 guint jpeg_start;
115 } 115 }
116 116
117 return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo); 117 return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo);
118 } 118 }
119 119
120 gint format_canon_raw_cr2(guchar *data, const guint len, 120 gboolean format_canon_raw_cr2(guchar *data, const guint len,
121 guint *image_offset, guint *exif_offset) 121 guint *image_offset, guint *exif_offset)
122 { 122 {
123 guint jpeg_offset = 0; 123 guint jpeg_offset = 0;
124 ExifByteOrder bo; 124 ExifByteOrder bo;
125 guint offset; 125 guint offset;
126 gint level; 126 gint level;
148 148
149 #define CRW_BYTE_ORDER EXIF_BYTE_ORDER_INTEL 149 #define CRW_BYTE_ORDER EXIF_BYTE_ORDER_INTEL
150 #define CRW_HEADER_SIZE 26 150 #define CRW_HEADER_SIZE 26
151 #define CRW_DIR_ENTRY_SIZE 10 151 #define CRW_DIR_ENTRY_SIZE 10
152 152
153 gint format_canon_raw_crw(guchar *data, const guint len, 153 gboolean format_canon_raw_crw(guchar *data, const guint len,
154 guint *image_offset, guint *exif_offset) 154 guint *image_offset, guint *exif_offset)
155 { 155 {
156 guint block_offset; 156 guint block_offset;
157 guint data_length; 157 guint data_length;
158 guint offset; 158 guint offset;
159 guint count; 159 guint count;
599 exif->items = g_list_prepend(exif->items, item); 599 exif->items = g_list_prepend(exif->items, item);
600 } 600 }
601 } 601 }
602 #endif 602 #endif
603 603
604 gint format_canon_makernote(ExifData *exif, guchar *tiff, guint offset, 604 gboolean format_canon_makernote(ExifData *exif, guchar *tiff, guint offset,
605 guint size, ExifByteOrder bo) 605 guint size, ExifByteOrder bo)
606 { 606 {
607 ExifItem *item; 607 ExifItem *item;
608 608
609 if (exif_parse_IFD_table(exif, tiff, offset, size, bo, 0, CanonExifMarkersList) != 0) 609 if (exif_parse_IFD_table(exif, tiff, offset, size, bo, 0, CanonExifMarkersList) != 0)
610 { 610 {