[Rawstudio-commit] r3046 - branches/rawstudio-ng-color/plugins/meta-tiff

[Anders Brander]

Author: abrander
Date: 2010-01-22 00:39:12 +0100 (Fri, 22 Jan 2010)
New Revision: 3046

Modified:
   branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
Log:
Now gives makernote_olympus_equipment() correct base.

Modified: branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-20 20:53:55 UTC (rev 3045)
+++ branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-21 23:39:12 UTC (rev 3046)
@@ -824,12 +824,8 @@
 		switch(ifd.tag)
 		{
 			case 0x0202: /* LensSerialNumber */
-				/* magic spot, but this is the address for serial number in all Olympus files where it's present */
-				raw_get_ushort(rawfile, offset-4, &ushort_temp1);
-				temp = offset+ushort_temp1-212;
+				str = raw_strdup(rawfile, base + ifd.value_offset, 32);
 
-				str = raw_strdup(rawfile, temp, 32);
-
 				/* Make a number from the string we just got */
 				gint i = 0;
 				while(str[i])
@@ -910,7 +906,7 @@
 				break;
 			case 0x2010: /* Equipment2 */
 				raw_get_uint(rawfile, offset, &uint_temp1);
-				makernote_olympus_equipment(rawfile, base+uint_temp1, base+uint_temp1, meta);
+				makernote_olympus_equipment(rawfile, base, base+uint_temp1, meta);
 				break;
 			case 0x2020: /* Olympus CameraSettings Tags */
 				raw_get_uint(rawfile, offset, &uint_temp1);