changeset 1858:bba0f67aae5d

more compilation fixes
author Vladimir Nadvornik <nadvornik@suse.cz>
date Sun, 10 Apr 2011 21:11:50 +0200
parents afcbbc7f17a9
children 22fe1d41cfa1
files src/exif.c src/exif.h
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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))
 		{
--- 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 */