summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llimage/llimage.cpp2
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/Grayscale.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/GreenGray.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/HLines.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/RedV.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/Saturate30.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/SepiaV.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/VividV.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/VividYellowV.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/app_settings/filters/YellowV.xml0
-rw-r--r--[-rwxr-xr-x]indra/newview/llimagefiltersmanager.cpp0
-rw-r--r--[-rwxr-xr-x]indra/newview/llimagefiltersmanager.h0
12 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index a30646d846..14fa71d828 100755
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1042,7 +1042,7 @@ void LLImageRaw::filterGamma(F32 gamma, const LLColor3& alpha)
for (S32 i = 0; i < 256; i++)
{
- F32 gamma_i = llclampf((float)(pow((float)(i)/255.0,gamma)));
+ F32 gamma_i = llclampf((float)(powf((float)(i)/255.0,gamma)));
// Blend in with alpha values
gamma_red_lut[i] = (U8)((1.0 - alpha.mV[0]) * (float)(i) + alpha.mV[0] * 255.0 * gamma_i);
gamma_green_lut[i] = (U8)((1.0 - alpha.mV[1]) * (float)(i) + alpha.mV[1] * 255.0 * gamma_i);
diff --git a/indra/newview/app_settings/filters/Grayscale.xml b/indra/newview/app_settings/filters/Grayscale.xml
index 101ed8233a..101ed8233a 100755..100644
--- a/indra/newview/app_settings/filters/Grayscale.xml
+++ b/indra/newview/app_settings/filters/Grayscale.xml
diff --git a/indra/newview/app_settings/filters/GreenGray.xml b/indra/newview/app_settings/filters/GreenGray.xml
index dce5ab3e9e..dce5ab3e9e 100755..100644
--- a/indra/newview/app_settings/filters/GreenGray.xml
+++ b/indra/newview/app_settings/filters/GreenGray.xml
diff --git a/indra/newview/app_settings/filters/HLines.xml b/indra/newview/app_settings/filters/HLines.xml
index ddff4d1977..ddff4d1977 100755..100644
--- a/indra/newview/app_settings/filters/HLines.xml
+++ b/indra/newview/app_settings/filters/HLines.xml
diff --git a/indra/newview/app_settings/filters/RedV.xml b/indra/newview/app_settings/filters/RedV.xml
index 5c47ca0f84..5c47ca0f84 100755..100644
--- a/indra/newview/app_settings/filters/RedV.xml
+++ b/indra/newview/app_settings/filters/RedV.xml
diff --git a/indra/newview/app_settings/filters/Saturate30.xml b/indra/newview/app_settings/filters/Saturate30.xml
index b77f07a037..b77f07a037 100755..100644
--- a/indra/newview/app_settings/filters/Saturate30.xml
+++ b/indra/newview/app_settings/filters/Saturate30.xml
diff --git a/indra/newview/app_settings/filters/SepiaV.xml b/indra/newview/app_settings/filters/SepiaV.xml
index d26df608b9..d26df608b9 100755..100644
--- a/indra/newview/app_settings/filters/SepiaV.xml
+++ b/indra/newview/app_settings/filters/SepiaV.xml
diff --git a/indra/newview/app_settings/filters/VividV.xml b/indra/newview/app_settings/filters/VividV.xml
index 203130bdee..203130bdee 100755..100644
--- a/indra/newview/app_settings/filters/VividV.xml
+++ b/indra/newview/app_settings/filters/VividV.xml
diff --git a/indra/newview/app_settings/filters/VividYellowV.xml b/indra/newview/app_settings/filters/VividYellowV.xml
index 2da27e53c1..2da27e53c1 100755..100644
--- a/indra/newview/app_settings/filters/VividYellowV.xml
+++ b/indra/newview/app_settings/filters/VividYellowV.xml
diff --git a/indra/newview/app_settings/filters/YellowV.xml b/indra/newview/app_settings/filters/YellowV.xml
index 0dab2489a0..0dab2489a0 100755..100644
--- a/indra/newview/app_settings/filters/YellowV.xml
+++ b/indra/newview/app_settings/filters/YellowV.xml
diff --git a/indra/newview/llimagefiltersmanager.cpp b/indra/newview/llimagefiltersmanager.cpp
index efc4f56ad3..efc4f56ad3 100755..100644
--- a/indra/newview/llimagefiltersmanager.cpp
+++ b/indra/newview/llimagefiltersmanager.cpp
diff --git a/indra/newview/llimagefiltersmanager.h b/indra/newview/llimagefiltersmanager.h
index 52b4a56b9b..52b4a56b9b 100755..100644
--- a/indra/newview/llimagefiltersmanager.h
+++ b/indra/newview/llimagefiltersmanager.h