[Rawstudio-commit] r1974 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-02 07:00:21 +0200 (Tue, 02 Sep 2008)
New Revision: 1974

Modified:
   trunk/src/rawfile.c
   trunk/src/rawfile.h
Log:
Made raw_init_file_tiff() return tiff-version.

Modified: trunk/src/rawfile.c
===================================================================
--- trunk/src/rawfile.c	2008-09-01 18:27:11 UTC (rev 1973)
+++ trunk/src/rawfile.c	2008-09-02 05:00:21 UTC (rev 1974)
@@ -244,19 +244,22 @@
 	return(rawfile);
 }
 
-gboolean
+guchar
 raw_init_file_tiff(RAWFILE *rawfile, guint pos)
 {
-	guchar tmp;
+	guchar version = 0;
+
 	if((pos+12)>rawfile->size)
-		return(FALSE);
+		return version;
 	rawfile->byteorder = *((gushort *) (rawfile->map+pos));
 	raw_get_uint(rawfile, pos+4, &rawfile->first_ifd_offset);
 	if (rawfile->first_ifd_offset > rawfile->size)
-		return(FALSE);
-	raw_get_uchar(rawfile, pos+2, &tmp);
+		return version;
+
+	raw_get_uchar(rawfile, pos+2, &version);
+
 	rawfile->base = pos;
-	return(TRUE);
+	return version;
 }
 
 void

Modified: trunk/src/rawfile.h
===================================================================
--- trunk/src/rawfile.h	2008-09-01 18:27:11 UTC (rev 1973)
+++ trunk/src/rawfile.h	2008-09-02 05:00:21 UTC (rev 1974)
@@ -28,7 +28,7 @@
 
 void raw_init();
 RAWFILE *raw_open_file(const gchar *filename);
-gboolean raw_init_file_tiff(RAWFILE *rawfile, guint offset);
+guchar raw_init_file_tiff(RAWFILE *rawfile, guint pos);
 gboolean raw_get_uint(RAWFILE *rawfile, guint pos, guint *target);
 gboolean raw_get_ushort(RAWFILE *rawfile, guint pos, gushort *target);
 gushort raw_get_ushort_from_string(RAWFILE *rawfile, gchar *source);