[Rawstudio-commit] r1973 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-09-01 20:27:11 +0200 (Mon, 01 Sep 2008)
New Revision: 1973

Modified:
   trunk/src/rs-cms.c
   trunk/src/rs-color-transform.c
Log:
Added a wrapper for cmsDoTransform().

Modified: trunk/src/rs-cms.c
===================================================================
--- trunk/src/rs-cms.c	2008-09-01 18:22:49 UTC (rev 1972)
+++ trunk/src/rs-cms.c	2008-09-01 18:27:11 UTC (rev 1973)
@@ -269,6 +269,13 @@
 	return;
 }
 
+void
+rs_cms_do_transform(gpointer transform, gpointer input, gpointer output, guint size)
+{
+	if (transform && input && output && size)
+		cmsDoTransform((cmsHTRANSFORM) transform, input, output, size);
+}
+
 RS_CMS *
 rs_cms_init()
 {

Modified: trunk/src/rs-color-transform.c
===================================================================
--- trunk/src/rs-color-transform.c	2008-09-01 18:22:49 UTC (rev 1972)
+++ trunk/src/rs-color-transform.c	2008-09-01 18:27:11 UTC (rev 1973)
@@ -771,7 +771,7 @@
 			buffer[destoffset++] = rct->table16[b];
 			s += 4;
 		}
-		cmsDoTransform((cmsHPROFILE) rct->cms_transform, buffer, out+height * out_rowstride, width);
+		rs_cms_do_transform(rct->cms_transform, buffer, out+height * out_rowstride, width);
 	}
 	asm volatile("emms\n\t");
 	g_free(buffer);
@@ -879,7 +879,7 @@
 			buffer[destoffset++] = rct->table16[g];
 			buffer[destoffset++] = rct->table16[b];
 		}
-		cmsDoTransform((cmsHPROFILE) rct->cms_transform, buffer, out+height * out_rowstride, width);
+		rs_cms_do_transform(rct->cms_transform, buffer, out+height * out_rowstride, width);
 	}
 	asm volatile ("femms\n\t");
 	g_free(buffer);
@@ -928,7 +928,7 @@
 			buffer[destoffset++] = rct->table16[b];
 			srcoffset+=4;
 		}
-		cmsDoTransform((cmsHPROFILE) rct->cms_transform, buffer, out+y * out_rowstride, width);
+		rs_cms_do_transform(rct->cms_transform, buffer, out+y * out_rowstride, width);
 	}
 	g_free(buffer);
 	return;
@@ -1055,7 +1055,7 @@
 		}
 		if (rct->cms_transform != NULL)
 		{
-			cmsDoTransform((cmsHPROFILE) rct->cms_transform, buffer16, buffer8, input->w);
+			rs_cms_do_transform(rct->cms_transform, buffer16, buffer8, input->w);
 			for(x=0 ; x<input->w ; x++)
 			{
 				histogram[R][buffer8[x*3+R]]++;