X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2Fcolors.hxx;h=1aa0ef47bc3474ce96dd0413db25a773a3636ec2;hb=dc09a50472890ac706d3c76d8af34cc3682ada0c;hp=40ce19e6945ecd71ad716fd640daf7f1b5199dff;hpb=44551dad2d636e1edb508b730f7a691a5ef4f33b;p=simgear.git

diff --git a/simgear/screen/colors.hxx b/simgear/screen/colors.hxx
index 40ce19e6..1aa0ef47 100644
--- a/simgear/screen/colors.hxx
+++ b/simgear/screen/colors.hxx
@@ -30,7 +30,7 @@
 const float system_gamma = 1.4;
 
 #elif defined (sgi)
-const float system_gamma = 1.7;
+const float system_gamma = 2.0/1.7;
 
 #else	// others
 const float system_gamma = 2.5;
@@ -47,13 +47,6 @@ inline void gamma_correct_rgb(float *color,
     color[0] = pow(color[0], tmp);
     color[1] = pow(color[1], tmp);
     color[2] = pow(color[2], tmp);
-
-    if ( color[0] < 0.0 ) { color[0] = 0.0; }
-    if ( color[1] < 0.0 ) { color[1] = 0.0; }
-    if ( color[2] < 0.0 ) { color[2] = 0.0; }
-    if ( color[0] > 1.0 ) { color[0] = 1.0; }
-    if ( color[1] > 1.0 ) { color[1] = 1.0; }
-    if ( color[2] > 1.0 ) { color[2] = 1.0; }
 };
 
 inline void gamma_correct_c(float *color,
@@ -63,8 +56,6 @@ inline void gamma_correct_c(float *color,
       return;
 
    *color = pow(*color, reff/system);
-   if ( *color < 0.0 ) { *color = 0.0; }
-   if ( *color > 1.0 ) { *color = 1.0; }
 };
 
 inline void gamma_restore_rgb(float *color,
@@ -77,13 +68,6 @@ inline void gamma_restore_rgb(float *color,
     color[0] = pow(color[0], tmp);
     color[1] = pow(color[1], tmp);
     color[2] = pow(color[2], tmp);
-
-    if ( color[0] < 0.0 ) { color[0] = 0.0; }
-    if ( color[1] < 0.0 ) { color[1] = 0.0; }
-    if ( color[2] < 0.0 ) { color[2] = 0.0; }
-    if ( color[0] > 1.0 ) { color[0] = 1.0; }
-    if ( color[1] > 1.0 ) { color[1] = 1.0; }
-    if ( color[2] > 1.0 ) { color[2] = 1.0; }
 };
 
 inline void gamma_restore_c(float *color,
@@ -93,8 +77,6 @@ inline void gamma_restore_c(float *color,
       return;
 
    *color = pow(*color, system/reff);
-   if ( *color < 0.0 ) { *color = 0.0; }
-   if ( *color > 1.0 ) { *color = 1.0; }
 };