diff options
author | Merov Linden <merov@lindenlab.com> | 2014-01-16 18:34:51 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-01-16 18:34:51 -0800 |
commit | fda7b94f490564568dee0ba6d6516943b0fd82a0 (patch) | |
tree | 15bd248eee608856779ddc42cf88f384392792d2 /indra/integration_tests/llimage_libtest | |
parent | 91f401fa2de8c78da7c83561501a1be993588867 (diff) |
ACME-1236 : Small LLImageFilter clean up
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
-rwxr-xr-x | indra/integration_tests/llimage_libtest/llimage_libtest.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp index d3373a61f2..3d27b4a5b5 100755 --- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp +++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp @@ -578,7 +578,10 @@ int main(int argc, char** argv) fast_timer_log_thread = new LogThread(LLFastTimer::sLogName); fast_timer_log_thread->start(); } - + + // Load the filter once and for all + LLImageFilter filter(filter_name); + // Perform action on each input file std::list<std::string>::iterator in_file = input_filenames.begin(); std::list<std::string>::iterator out_file = output_filenames.begin(); @@ -594,13 +597,8 @@ int main(int argc, char** argv) continue; } - if (filter_name != "") - { - // We're interpreting the filter as a filter file name - LLImageFilter filter; - filter.loadFromFile(filter_name); - filter.executeFilter(raw_image); - } + // Apply the filter + filter.executeFilter(raw_image); // Save file if (out_file != out_end) |