From 4082d8ea27a6d386a01681e51e9776b552f6cb5c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 21 Jan 2014 16:39:23 -0800
Subject: ACME-1236 : Fixes gamma and brightness code. Also fixes example xml
 filter files.

---
 indra/integration_tests/llimage_libtest/brighten.xml |  2 +-
 indra/integration_tests/llimage_libtest/colorize.xml | 16 ++++++++++------
 indra/integration_tests/llimage_libtest/contrast.xml |  7 -------
 indra/integration_tests/llimage_libtest/darken.xml   |  2 +-
 indra/integration_tests/llimage_libtest/gamma.xml    |  9 +--------
 5 files changed, 13 insertions(+), 23 deletions(-)

(limited to 'indra/integration_tests')

diff --git a/indra/integration_tests/llimage_libtest/brighten.xml b/indra/integration_tests/llimage_libtest/brighten.xml
index d17b96d2d7..9b4232229f 100755
--- a/indra/integration_tests/llimage_libtest/brighten.xml
+++ b/indra/integration_tests/llimage_libtest/brighten.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>brighten</string>
-            <real>50.0</real>
+            <real>0.5</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
diff --git a/indra/integration_tests/llimage_libtest/colorize.xml b/indra/integration_tests/llimage_libtest/colorize.xml
index 18c6cd3425..72e58b0ffe 100644
--- a/indra/integration_tests/llimage_libtest/colorize.xml
+++ b/indra/integration_tests/llimage_libtest/colorize.xml
@@ -1,20 +1,24 @@
 <llsd>
     <array>
         <array>
-            <string>linearize</string>
+            <string>stencil</string>
+            <string>vignette</string>
+            <string>blend</string>
             <real>0.0</real>
             <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
             <real>1.0</real>
-            <real>1.0</real>
+            <real>10.0</real>
         </array>
         <array>
             <string>colorize</string>
             <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>0.2</real>
             <real>0.0</real>
-            <real>0.2</real>
+            <real>0.0</real>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.0</real>
         </array>
     </array>
 </llsd>
diff --git a/indra/integration_tests/llimage_libtest/contrast.xml b/indra/integration_tests/llimage_libtest/contrast.xml
index 8dcdd1a9a9..00746b8a9e 100644
--- a/indra/integration_tests/llimage_libtest/contrast.xml
+++ b/indra/integration_tests/llimage_libtest/contrast.xml
@@ -1,12 +1,5 @@
 <llsd>
     <array>
-        <array>
-            <string>linearize</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
         <array>
             <string>contrast</string>
             <real>1.5</real>
diff --git a/indra/integration_tests/llimage_libtest/darken.xml b/indra/integration_tests/llimage_libtest/darken.xml
index 8d110452e9..5cec3589b6 100755
--- a/indra/integration_tests/llimage_libtest/darken.xml
+++ b/indra/integration_tests/llimage_libtest/darken.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>darken</string>
-            <real>50.0</real>
+            <real>0.5</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
diff --git a/indra/integration_tests/llimage_libtest/gamma.xml b/indra/integration_tests/llimage_libtest/gamma.xml
index 7505a03027..19af09b046 100644
--- a/indra/integration_tests/llimage_libtest/gamma.xml
+++ b/indra/integration_tests/llimage_libtest/gamma.xml
@@ -1,15 +1,8 @@
 <llsd>
     <array>
-        <array>
-            <string>linearize</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
         <array>
             <string>gamma</string>
-            <real>1.5</real>
+            <real>1.7</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
-- 
cgit v1.2.3