X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=image.h;h=915357739ed24048a9dce598f41d34b4681f25ec;hb=a9a84f75ab0a80db056c8bcc34888489640ddc80;hp=442b5dc77d516fa3940a16d306cf947af8d3df56;hpb=154145cdd4e53712d7c69f1def94df479d4b7e34;p=xonotic%2Fdarkplaces.git

diff --git a/image.h b/image.h
index 442b5dc7..91535773 100644
--- a/image.h
+++ b/image.h
@@ -51,11 +51,9 @@ extern cvar_t r_fixtrans_auto;
 
 #define Image_LinearFloatFromsRGBFloat(c) (((c) <= 0.04045f) ? (c) * (1.0f / 12.92f) : (float)pow(((c) + 0.055f)*(1.0f/1.055f), 2.4f))
 #define Image_sRGBFloatFromLinearFloat(c) (((c) < 0.0031308f) ? (c) * 12.92f : 1.055f * (float)pow((c), 1.0f/2.4f) - 0.055f)
-
 #define Image_LinearFloatFromsRGB(c) Image_LinearFloatFromsRGBFloat((c) * (1.0f / 255.0f))
 #define Image_sRGBFloatFromLinear(c) Image_sRGBFloatFromLinearFloat((c) * (1.0f / 255.0f))
-
-#define Image_sRGBFloatFromLinear_Lightmap(c) (Image_sRGBFloatFromLinear(c*2.0f)*0.5f)
+#define Image_sRGBFloatFromLinear_Lightmap(c) Image_sRGBFloatFromLinearFloat((c) * (2.0f / 255.0f)) * 0.5f
 
 void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pin, int numpixels);
 void Image_MakesRGBColorsFromLinear_Lightmap(unsigned char *pout, const unsigned char *pin, int numpixels);