FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate some compiler warnings about converting float to int.

Browse Source
This commit is contained in:
ehofman
2005-01-15 11:57:34 +00:00
parent a26271e46e
commit 34320f5f20
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/screen/texture.cxx
+4 -4
View File
@@ -809,7 +809,7 @@ SGTexture::make_monochrome(float contrast, GLubyte r, GLubyte g, GLubyte b) {
if (contrast != 1.0) { if (contrast != 1.0) {
float pixcol = -1.0 + (avg/128); float pixcol = -1.0 + (avg/128);
avg = 128 + 128*powf(pixcol, contrast); avg = 128 + int(128*powf(pixcol, contrast));
} }
ap[0] = avg*r/255; ap[0] = avg*r/255;
@@ -837,7 +837,7 @@ SGTexture::make_grayscale(float contrast) {
if (contrast != 1.0) { if (contrast != 1.0) {
float pixcol = -1.0 + (avg/128); float pixcol = -1.0 + (avg/128);
avg = 128 + 128*powf(pixcol, contrast); avg = 128 + int(128*powf(pixcol, contrast));
} }
int pos = (x + y*texture_width)*colors; int pos = (x + y*texture_width)*colors;
@@ -877,7 +877,7 @@ SGTexture::make_maxcolorwindow() {
while (pos < texture_width * texture_height * num_colors) { while (pos < texture_width * texture_height * num_colors) {
for (int i=0; i < max; i++) { for (int i=0; i < max; i++) {
texture_data[pos+i] -= offs; texture_data[pos+i] -= offs;
texture_data[pos+i] *= factor; texture_data[pos+i] = int(factor * texture_data[pos+i]);
} }
pos += num_colors; pos += num_colors;
} }
@@ -923,7 +923,7 @@ SGTexture::make_normalmap(float brightness, float contrast) {
map[mpos+0] = (128+(cx1-c)/2); map[mpos+0] = (128+(cx1-c)/2);
map[mpos+1] = (128+(cy1-c)/2); map[mpos+1] = (128+(cy1-c)/2);
map[mpos+2] = 127+brightness*128; // 255-c/2; map[mpos+2] = 127+int(brightness*128); // 255-c/2;
mpos += colors; mpos += colors;
dpos += num_colors; dpos += num_colors;