Author: abrander
Date: 2009-08-07 02:29:23 +0200 (Fri, 07 Aug 2009)
New Revision: 2614
Modified:
trunk/plugins/meta-tiff/tiff-meta.c
Log:
Added camera wb support for Canon 1D and 1Ds.
Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c 2009-08-06 11:01:46 UTC (rev 2613)
+++ trunk/plugins/meta-tiff/tiff-meta.c 2009-08-07 00:29:23 UTC (rev 2614)
@@ -190,6 +190,7 @@
{
gushort number_of_entries = 0;
gushort ushort_temp1;
+ gushort wb_index = 0;
struct IFD ifd;
@@ -250,6 +251,19 @@
g_string_free(identifier, TRUE);
}
break;
+ case 0x0004: /* CanonShotInfo */
+ raw_get_ushort(rawfile, ifd.value_offset+14, &wb_index);
+ break;
+ case 0x00a4: /* WhiteBalanceTable */
+ raw_get_ushort(rawfile, ifd.value_offset+wb_index*48+0,
&ushort_temp1);
+ meta->cam_mul[0] = (gdouble) ushort_temp1;
+ raw_get_ushort(rawfile, ifd.value_offset+wb_index*48+2,
&ushort_temp1);
+ meta->cam_mul[1] = (gdouble) ushort_temp1;
+ raw_get_ushort(rawfile, ifd.value_offset+wb_index*48+4,
&ushort_temp1);
+ meta->cam_mul[2] = (gdouble) ushort_temp1;
+ meta->cam_mul[3] = meta->cam_mul[1];
+ rs_metadata_normalize_wb(meta);
+ break;
case 0x4001: /* white balance for mulpiple Canon cameras */
switch (ifd.count)
{
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
