Author: akv
Date: 2010-01-24 00:02:44 +0100 (Sun, 24 Jan 2010)
New Revision: 3065
Modified:
branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
Log:
Reading LensIDNumber from D3000 and D5000.
Modified: branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c 2010-01-23
22:46:45 UTC (rev 3064)
+++ branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c 2010-01-23
23:02:44 UTC (rev 3065)
@@ -665,10 +665,7 @@
}
break;
case 0x00a7: /* white balance */
- if (g_str_equal(meta->model_ascii, "NIKON
D3000")
- || g_str_equal(meta->model_ascii, "NIKON
D5000"))
- break;
-
+ {
guchar ctmp[4];
raw_get_uchar(rawfile, offset++, ctmp);
raw_get_uchar(rawfile, offset++, ctmp+1);
@@ -693,6 +690,11 @@
meta->lens_id = buf98[0x0c];
}
+ /* Don't read WB from D3000 or D5000 */
+ if (g_str_equal(meta->model_ascii, "NIKON
D3000")
+ || g_str_equal(meta->model_ascii, "NIKON
D5000"))
+ break;
+
if (ver97 >> 8 == 2)
{
ci = xlat[0][serial & 0xff];
@@ -710,6 +712,7 @@
rs_metadata_normalize_wb(meta);
}
break;
+ }
case 0x00aa: /* Nikon Saturation */
if (meta->make == MAKE_NIKON)
{
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
