summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-01-07 22:10:23 -0800
committerMerov Linden <merov@lindenlab.com>2014-01-07 22:10:23 -0800
commitc2a974f1556906f6ca69afb5942378c8dbf85169 (patch)
treec5493c04a1669d16dbc791e1e2f34d1ca081d45b /indra/integration_tests
parent57d9fa36bd3639713a639573a7ab0d11249fa107 (diff)
ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter
Diffstat (limited to 'indra/integration_tests')
-rwxr-xr-xindra/integration_tests/llimage_libtest/llimage_libtest.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index 009be0941e..69cea33911 100755
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -119,8 +119,7 @@ static bool sAllDone = false;
// Load filter from file
LLSD load_filter_from_file(const std::string& file_path)
{
- std::cout << "Loading filter settings from : " << file_path << std::endl;
-
+ //std::cout << "Loading filter settings from : " << file_path << std::endl;
llifstream filter_xml(file_path);
if (filter_xml.is_open())
{
@@ -213,6 +212,10 @@ void execute_filter(const LLSD& filter_data, LLPointer<LLImageRaw> raw_image)
LLColor3 color((float)(filter_data[i][2].asReal()),(float)(filter_data[i][3].asReal()),(float)(filter_data[i][4].asReal()));
raw_image->filterEqualize((S32)(filter_data[i][1].asReal()),color);
}
+ else if (filter_name == "screen")
+ {
+ raw_image->screenFilter((S32)(filter_data[i][1].asReal()));
+ }
}
}
@@ -818,6 +821,10 @@ int main(int argc, char** argv)
{
raw_image->filterEqualize((S32)(filter_param),LLColor3::white);
}
+ else if (filter_name == "screen")
+ {
+ raw_image->screenFilter((S32)(filter_param));
+ }
else if (filter_name != "")
{
// We're interpreting the filter as a filter file name