Tue Nov 7 15:35:59 2006 John Ellis <johne@verizon.net>

[geeqie.git] / src / format_fuji.c

diff --git a/src/format_fuji.c b/src/format_fuji.c
index 6eef366..6bc99f8 100644 (file)
--- a/src/format_fuji.c
+++ b/src/format_fuji.c
@@ -48,8 +48,9 @@ gint format_fuji_raw(unsigned char *data, const guint len,
                return FALSE;
                }
 
+       /* offset to jpeg is embedded at bytes 84-87 */
        io = GUINT32_FROM_BE(*(guint32*)(data + 84));
-       eo = *image_offset + 12;
+       if (io + 4 > len) return FALSE;
 
        /* verify jpeg marker */
        if (memcmp(data + io, "\xff\xd8\xff\xe1", 4) != 0)
@@ -57,11 +58,12 @@ gint format_fuji_raw(unsigned char *data, const guint len,
                return FALSE;
                }
 
+       /* Exif is stored in the jpeg, so use the same offset */
+       eo=io;
+
        if (image_offset) *image_offset = io;
        if (exif_offset) *exif_offset = eo;
 
-       printf("raw Fuji format file\n");
-
        return TRUE;
 }