From: Vladimir Nadvornik Date: Sun, 10 Apr 2011 19:11:50 +0000 (+0200) Subject: more compilation fixes X-Git-Tag: 1.1~47 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=c447b43b8f8291da9d941718afaa0b2c9d950efc more compilation fixes --- diff --git a/src/exif.c b/src/exif.c index 054fc41a..fe0c64f9 100644 --- a/src/exif.c +++ b/src/exif.c @@ -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 @@ static gint exif_jpeg_parse(ExifData *exif, 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 --git a/src/exif.h b/src/exif.h index 918ac5e7..5878a133 100644 --- a/src/exif.h +++ b/src/exif.h @@ -161,9 +161,6 @@ guchar *exif_get_color_profile(ExifData *exif, guint *data_len); 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 */