summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-02-07 18:35:46 -0800
committerMerov Linden <merov@lindenlab.com>2014-02-07 18:35:46 -0800
commit51844473c00a7d620746c26af822aa7d41f53832 (patch)
treeaa4ddf5b0b9a8442a457e7848d3d108bb079c21e /indra/llimage
parent73c9e42fafc0ad21af1ed38735c0ed9212640dd2 (diff)
ACME-1315 : Fix anisotropy in filters applied to thumbnail. Deleted some unused code
Diffstat (limited to 'indra/llimage')
-rwxr-xr-xindra/llimage/llimagefilter.cpp25
-rwxr-xr-xindra/llimage/llimagefilter.h1
2 files changed, 0 insertions, 26 deletions
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp
index 742b0ad802..3d0c488768 100755
--- a/indra/llimage/llimagefilter.cpp
+++ b/indra/llimage/llimagefilter.cpp
@@ -542,31 +542,6 @@ void LLImageFilter::filterScreen(EScreenMode mode, const F32 wave_length, const
//============================================================================
// Procedural Stencils
//============================================================================
-
-void LLImageFilter::setStencil(EStencilBlendMode mode, EStencilShape type, F32 gamma, F32 min, F32 max)
-{
- mStencilBlendMode = mode;
- mStencilShape = type;
- mStencilGamma = gamma;
- mStencilMin = llmin(llmax(min, -1.0f), 1.0f);
- mStencilMax = llmin(llmax(max, -1.0f), 1.0f);
-
- // We center the vignette on the image and fits it in the image smallest dimension
- mStencilCenterX = mImage->getWidth()/2;
- mStencilCenterY = mImage->getHeight()/2;
- mStencilWidth = llmin(mImage->getWidth()/2,mImage->getHeight()/2);
-
- mStencilWavelength = gamma;
- mStencilSine = 0.0;
- mStencilCosine = 1.0;
-
- mStencilStartX = 0.0;
- mStencilStartY = 0.0;
- mStencilGradX = 0.0;
- mStencilGradY = (F32)(mImage->getHeight());
- mStencilGradN = (F32)(mImage->getHeight()*mImage->getHeight());
-}
-
void LLImageFilter::setStencil(EStencilShape shape, EStencilBlendMode mode, F32 min, F32 max, F32* params)
{
mStencilShape = shape;
diff --git a/indra/llimage/llimagefilter.h b/indra/llimage/llimagefilter.h
index d2650c2539..0f1cbc3fb8 100755
--- a/indra/llimage/llimagefilter.h
+++ b/indra/llimage/llimagefilter.h
@@ -94,7 +94,6 @@ private:
void convolve(const LLMatrix3 &kernel, bool normalize, bool abs_value);
// Procedural Stencils
- void setStencil(EStencilBlendMode mode, EStencilShape type, F32 gamma, F32 min, F32 max);
void setStencil(EStencilShape shape, EStencilBlendMode mode, F32 min, F32 max, F32* params);
F32 getStencilAlpha(S32 i, S32 j);