[Rawstudio-commit] r4157 - in trunk/plugins: meta-raf meta-tiff

Klaus Post klauspost at gmail.com
Sun Feb 19 18:24:57 CET 2012


Author: post
Date: 2012-02-19 18:24:57 +0100 (Sun, 19 Feb 2012)
New Revision: 4157

Modified:
   trunk/plugins/meta-raf/raf-meta.c
   trunk/plugins/meta-tiff/tiff-meta.c
Log:
Add support for whitebalance on new FUJI cameras.

Modified: trunk/plugins/meta-raf/raf-meta.c
===================================================================
--- trunk/plugins/meta-raf/raf-meta.c	2012-02-19 14:47:57 UTC (rev 4156)
+++ trunk/plugins/meta-raf/raf-meta.c	2012-02-19 17:24:57 UTC (rev 4157)
@@ -67,8 +67,17 @@
 				offset = offset + 4 + length;
 			}
 		}
+		guint meta_offset = 0;
+		if (raw_get_uint(rawfile, 100, &meta_offset))
+		{
+			gushort order = raw_get_byteorder(rawfile);
+			rs_filetype_meta_load(".tiff", meta, rawfile, meta_offset);
+			raw_set_byteorder(rawfile, order);
+			raw_reset_base(rawfile);
+		}
 		meta->thumbnail = rs_raf_load_thumb(rawfile);
 		rs_filetype_meta_load(".tiff", meta, rawfile, meta->preview_start+12);
+
 		return TRUE;
 	}
 	return FALSE;

Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c	2012-02-19 14:47:57 UTC (rev 4156)
+++ trunk/plugins/meta-tiff/tiff-meta.c	2012-02-19 17:24:57 UTC (rev 4157)
@@ -1759,6 +1759,21 @@
 				if (raw_get_rational(rawfile, ifd.value_offset+24, &float_temp))
 					meta->lens_max_aperture = float_temp;
 				break;
+			case 61440: /* FUJI RAW TiffIFD */
+				if (meta->make == MAKE_FUJIFILM)
+					ifd_reader(rawfile, ifd.value_offset, meta);
+				break;
+			case 61454:
+				if (meta->make == MAKE_FUJIFILM)
+				{
+					raw_get_uint(rawfile, ifd.value_offset, &uint_temp1);
+					meta->cam_mul[1] = uint_temp1;
+					raw_get_uint(rawfile, ifd.value_offset+4, &uint_temp1);
+					meta->cam_mul[0] = uint_temp1;
+					raw_get_uint(rawfile, ifd.value_offset+8, &uint_temp1);
+					meta->cam_mul[2] = uint_temp1;
+					meta->cam_mul[3] = meta->cam_mul[1];
+				}
 		}
 	}
 




More information about the Rawstudio-commit mailing list