summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2015-05-05 21:05:13 +0300
committerruslantproductengine <ruslantproductengine@lindenlab.com>2015-05-05 21:05:13 +0300
commitc3affc4d6b514d1c0ce9e22c11c9c16334b9b375 (patch)
tree8365145418291d5ba6cf7761f250b132bccb6e5a /indra/llimage
parenteb70b5e7e016c1f767461a7266b9fa56603627d2 (diff)
Hotfix for build on OSX with -Werror,-Wtautological-compare
Diffstat (limited to 'indra/llimage')
-rwxr-xr-xindra/llimage/llimage.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 7645034bd9..08462c7834 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -197,9 +197,7 @@ private:
{
pos = val >> 16;
- if (pos < 0)
- vp[j] = 0;
- else if (pos >= (srcSz - 1))
+ if (pos >= (srcSz - 1))
vp[j] = 0;
else
vp[j] = (val >> 8) - ((val >> 8) & 0xffffff00);