From ff3edd06d2c824a32753e689de3369abf593c684 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 23 Jan 2014 16:37:48 -0800
Subject: [PATCH] ACME-1275 : WIP : Clean up unwanted code and comments in
image filter
---
indra/llimage/llimagefilter.cpp | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index 4c6dd2faeeb..e0dae9fab2f 100755
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -77,7 +77,6 @@ LLImageFilter::~LLImageFilter()
*TODO
* Rename stencil to mask
* Test blend modes and name them correctly
- * Suppress old "blend", "fade" and "lines" stencil definition. Change all xml accordingly.
* Improve perf: use LUT for alpha blending in uniform case
* Improve perf: make sure filter is not called more than necessary in viewer (seems to be called 3 times per change)
* Add gradient coloring as a filter
@@ -154,18 +153,6 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
// Set the stencil
setStencil(shape,mode,min,max,params);
}
- else if (filter_name == "blend")
- {
- setStencil(STENCIL_BLEND_MODE_BLEND,STENCIL_SHAPE_VIGNETTE,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
- }
- else if (filter_name == "fade")
- {
- setStencil(STENCIL_BLEND_MODE_FADE,STENCIL_SHAPE_VIGNETTE,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
- }
- else if (filter_name == "lines")
- {
- setStencil(STENCIL_BLEND_MODE_BLEND,STENCIL_SHAPE_SCAN_LINES,(float)(mFilterData[i][1].asReal()),(float)(mFilterData[i][2].asReal()),1.0);
- }
else if (filter_name == "sepia")
{
filterSepia();
@@ -258,6 +245,10 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image)
kernel.mMatrix[1][1] = 8.0;
convolve(kernel,false,true);
}
+ else
+ {
+ llwarns << "Filter unknown, cannot execute filter command : " << filter_name << llendl;
+ }
}
}
--
GitLab