Mercurial > geeqie.yaz

comparison src/format_olympus.c @ 1000:4fe8f9656107

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For the sake of consistency, use glib basic types everywhere.
author zas_
date Tue, 26 Aug 2008 22:22:51 +0000
parents 116346636d42
children 1646720364cf
comparison
equal deleted inserted replaced
999:bbed8e9a5d33 1000:4fe8f9656107
33 *----------------------------------------------------------------------------- 33 *-----------------------------------------------------------------------------
34 * Raw ORF embedded jpeg extraction for Olympus 34 * Raw ORF embedded jpeg extraction for Olympus
35 *----------------------------------------------------------------------------- 35 *-----------------------------------------------------------------------------
36 */ 36 */
37 37
38 static guint olympus_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo, 38 static guint olympus_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
39 gint level, 39 gint level,
40 guint *image_offset, guint *exif_offset); 40 guint *image_offset, guint *exif_offset);
41 41
42 42
43 static void olympus_tiff_entry(unsigned char *data, const guint len, guint offset, ExifByteOrder bo, 43 static void olympus_tiff_entry(guchar *data, const guint len, guint offset, ExifByteOrder bo,
44 gint level, 44 gint level,
45 guint *image_offset, guint *exif_offset) 45 guint *image_offset, guint *exif_offset)
46 { 46 {
47 guint tag; 47 guint tag;
48 guint type; 48 guint type;
79 /* This is the Exif info */ 79 /* This is the Exif info */
80 *exif_offset = exif_byte_get_int32(data + segment, bo); 80 *exif_offset = exif_byte_get_int32(data + segment, bo);
81 } 81 }
82 } 82 }
83 83
84 static guint olympus_tiff_table(unsigned char *data, const guint len, guint offset, ExifByteOrder bo, 84 static guint olympus_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo,
85 gint level, 85 gint level,
86 guint *image_offset, guint *exif_offset) 86 guint *image_offset, guint *exif_offset)
87 { 87 {
88 guint count; 88 guint count;
89 guint i; 89 guint i;
103 } 103 }
104 104
105 return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo); 105 return exif_byte_get_int32(data + offset + count * EXIF_TIFD_SIZE, bo);
106 } 106 }
107 107
108 gint format_olympus_raw(unsigned char *data, const guint len, 108 gint format_olympus_raw(guchar *data, const guint len,
109 guint *image_offset, guint *exif_offset) 109 guint *image_offset, guint *exif_offset)
110 { 110 {
111 guint i_off = 0; 111 guint i_off = 0;
112 guint e_off = 0; 112 guint e_off = 0;
113 guint offset; 113 guint offset;
292 { 7, "6500" }, 292 { 7, "6500" },
293 { 8, "7500" }, 293 { 8, "7500" },
294 EXIF_TEXT_LIST_END 294 EXIF_TEXT_LIST_END
295 }; 295 };
296 296
297 gint format_olympus_makernote(ExifData *exif, unsigned char *tiff, guint offset, 297 gint format_olympus_makernote(ExifData *exif, guchar *tiff, guint offset,
298 guint size, ExifByteOrder bo) 298 guint size, ExifByteOrder bo)
299 { 299 {
300 unsigned char *data; 300 guchar *data;
301 ExifItem *item; 301 ExifItem *item;
302 302
303 if (offset + 8 + 4 >= size) return FALSE; 303 if (offset + 8 + 4 >= size) return FALSE;
304 304
305 data = tiff + offset; 305 data = tiff + offset;