[Rawstudio-commit] r2964 - in branches/rawstudio-ng-color: librawstudio plugins/meta-ciff plugins/meta-tiff

[Anders Brander]

Author: abrander
Date: 2010-01-03 18:20:08 +0100 (Sun, 03 Jan 2010)
New Revision: 2964

Modified:
   branches/rawstudio-ng-color/librawstudio/rs-metadata.c
   branches/rawstudio-ng-color/librawstudio/rs-metadata.h
   branches/rawstudio-ng-color/plugins/meta-ciff/ciff-meta.c
   branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
Log:
Removed adobe_coeff from RSMetadata.

Modified: branches/rawstudio-ng-color/librawstudio/rs-metadata.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-metadata.c	2010-01-03 17:08:10 UTC (rev 2963)
+++ branches/rawstudio-ng-color/librawstudio/rs-metadata.c	2010-01-03 17:20:08 UTC (rev 2964)
@@ -95,7 +95,6 @@
 	metadata->focallength = -1;
 	for(i=0;i<4;i++)
 		metadata->cam_mul[i] = 1.0f;
-	matrix4_identity(&metadata->adobe_coeff);
 	metadata->thumbnail = NULL;
 
 	/* Lens info */

Modified: branches/rawstudio-ng-color/librawstudio/rs-metadata.h
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-metadata.h	2010-01-03 17:08:10 UTC (rev 2963)
+++ branches/rawstudio-ng-color/librawstudio/rs-metadata.h	2010-01-03 17:20:08 UTC (rev 2964)
@@ -79,7 +79,6 @@
 	gdouble saturation;
 	gdouble color_tone;
 	gshort focallength;
-	RS_MATRIX4 adobe_coeff;
 	GdkPixbuf *thumbnail;
 
 	/* Lens info */

Modified: branches/rawstudio-ng-color/plugins/meta-ciff/ciff-meta.c
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-ciff/ciff-meta.c	2010-01-03 17:08:10 UTC (rev 2963)
+++ branches/rawstudio-ng-color/plugins/meta-ciff/ciff-meta.c	2010-01-03 17:20:08 UTC (rev 2964)
@@ -226,8 +226,6 @@
 	raw_get_uint(rawfile, 2, &root);
 	raw_crw_walker(rawfile, root, raw_get_filesize(rawfile)-root, meta);
 
-	rs_adobe_coeff_set(&meta->adobe_coeff, meta->model_ascii, meta->model_ascii);
-
 	if ((meta->thumbnail_start>0) && (meta->thumbnail_length>0))
 	{
 		start = meta->thumbnail_start;

Modified: branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c
===================================================================
--- branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-03 17:08:10 UTC (rev 2963)
+++ branches/rawstudio-ng-color/plugins/meta-tiff/tiff-meta.c	2010-01-03 17:20:08 UTC (rev 2964)
@@ -1332,8 +1332,6 @@
 	} while (next>0);
 
 	rs_metadata_normalize_wb(meta);
-
-	rs_adobe_coeff_set(&meta->adobe_coeff, meta->make_ascii, meta->model_ascii);
 }
 
 /**