# HG changeset patch # User Vladimir Nadvornik # Date 1302462710 -7200 # Node ID bba0f67aae5db60e24f5bb9ed74623399d6cd2c4 # Parent afcbbc7f17a9dd1b84375fcd36c7bd26ad5e3fdd more compilation fixes diff -r afcbbc7f17a9 -r bba0f67aae5d src/exif.c --- a/src/exif.c Sun Apr 10 20:30:17 2011 +0200 +++ b/src/exif.c Sun Apr 10 21:11:50 2011 +0200 @@ -73,6 +73,7 @@ #include "main.h" #include "exif-int.h" +#include "jpeg_parser.h" #include "format_raw.h" #include "ui_fileops.h" @@ -1086,7 +1087,7 @@ return -2; } - if (exif_jpeg_segment_find(data, size, JPEG_MARKER_APP1, + if (jpeg_segment_find(data, size, JPEG_MARKER_APP1, "Exif\x00\x00", 6, &seg_offset, &seg_length)) { diff -r afcbbc7f17a9 -r bba0f67aae5d src/exif.h --- a/src/exif.h Sun Apr 10 20:30:17 2011 +0200 +++ b/src/exif.h Sun Apr 10 21:11:50 2011 +0200 @@ -161,9 +161,6 @@ void exif_add_jpeg_color_profile(ExifData *exif, guchar *cp_data, guint cp_length); -gboolean exif_jpeg_segment_find(guchar *data, guint size, - guchar app_marker, const gchar *magic, guint magic_len, - guint *seg_offset, guint *seg_length); gboolean exif_jpeg_parse_color(ExifData *exif, guchar *data, guint size); /*raw support */