ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using it, add parameter to llimage_libtest to use filters

2 files changed, 36 insertions, 10 deletions

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index e5281feff0..73e6f48a8d 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -30,6 +30,8 @@
 
 #include "llmath.h"
 #include "v4coloru.h"
+#include "m3math.h"
+#include "v3math.h"
 
 #include "llimagebmp.h"
 #include "llimagetga.h"
@@ -933,22 +935,42 @@ BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
 	return TRUE ;
 }
 
-// *TODO : Implement real color transform
-// Merov : This is temporary code for testing... 
-void LLImageRaw::colorTransform()
+// Filter Operations
+void LLImageRaw::filterGrayScale()
+{
+    LLMatrix3 gray_scale;
+    LLVector3 luminosity(0.2125, 0.7154, 0.0721);
+    gray_scale.setRows(luminosity, luminosity, luminosity);
+    gray_scale.transpose();
+    colorTransform(gray_scale);
+}
+
+void LLImageRaw::filterSepia()
+{
+    LLMatrix3 sepia;
+    sepia.setRows(LLVector3(0.3588, 0.7044, 0.1368),
+                  LLVector3(0.2990, 0.5870, 0.1140),
+                  LLVector3(0.2392, 0.4696, 0.0912));
+    sepia.transpose();
+    colorTransform(sepia);
+}
+
+// Filter Primitives
+void LLImageRaw::colorTransform(const LLMatrix3 &transform)
 {
 	const S32 components = getComponents();
 	llassert( components >= 1 && components <= 4 );
     
 	S32 pixels = getWidth() * getHeight();
 	U8* dst_data = getData();
-    llinfos << "Merov : Convert the image to Black and White!!! pixels = " << pixels << ", comp = " << components << llendl;
 	for( S32 i=0; i<pixels; i++ )
 	{
-        U8 gray = (U8)(((U32)(dst_data[0]) + (U32)(dst_data[1]) + (U32)(dst_data[2]))/3);
-		dst_data[0] = gray;
-		dst_data[1] = gray;
-		dst_data[2] = gray;
+        LLVector3 src((F32)(dst_data[VRED]),(F32)(dst_data[VGREEN]),(F32)(dst_data[VBLUE]));
+        LLVector3 dst = src * transform;
+        dst.clamp(0.0f,255.0f);
+		dst_data[VRED]   = dst.mV[VRED];
+		dst_data[VGREEN] = dst.mV[VGREEN];
+		dst_data[VBLUE]  = dst.mV[VBLUE];
 		dst_data += components;
 	}
 }
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index 96c37f5436..d6b7e65c76 100755
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -71,6 +71,7 @@ const S32 HTTP_PACKET_SIZE = 1496;
 class LLImageFormatted;
 class LLImageRaw;
 class LLColor4U;
+class LLMatrix3;
 class LLPrivateMemoryPool;
 
 typedef enum e_image_codec
@@ -256,8 +257,11 @@ public:
 	// Src and dst are same size.  Src has 4 components.  Dst has 3 components.
 	void compositeUnscaled4onto3( LLImageRaw* src );
     
-    // Filter operations
-    void colorTransform();
+    // Filter Operations
+    void filterGrayScale();
+    void filterSepia();
+    // Filter Primitives
+    void colorTransform(const LLMatrix3 &transform);
 
 protected:
 	// Create an image from a local file (generally used in tools)