diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-01-21 16:39:23 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-01-21 16:39:23 -0800 |
| commit | 4082d8ea27a6d386a01681e51e9776b552f6cb5c (patch) | |
| tree | 6f27e3b86e2c5a8be68f3723850630de85515dce /indra/integration_tests | |
| parent | 6c630b73a825befb6eeef66d7ed0063b1b891df7 (diff) | |
ACME-1236 : Fixes gamma and brightness code. Also fixes example xml filter files.
Diffstat (limited to 'indra/integration_tests')
5 files changed, 13 insertions, 23 deletions
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,13 +1,6 @@ <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> <real>1.0</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> |