actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix type-punning warning

Browse Source 
This should be a no-op (though I wouldn't be offended if someone checks
me on that).  I think the code's clearer without casting back and forth
anyway.
This commit is contained in:
Devin J. Pohly
2014-02-08 21:39:27 -05:00
parent 6ac4fcdbd3
commit 312d2b1226
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageSurfaceUtils_Zoom.cpp
+3 -5
View File
@@ -95,7 +95,7 @@ static void ZoomSurface( const RageSurface * src, RageSurface * dst )
const int width = dst->w; const int width = dst->w;
for( int y = 0; y < height; y++ ) for( int y = 0; y < height; y++ )
{ {
uint32_t *dp = (uint32_t *) (dst->pixels + dst->pitch*y); uint8_t *dp = (uint8_t *) (dst->pixels + dst->pitch*y);
/* current source pointer and next source pointer (first and second /* current source pointer and next source pointer (first and second
* rows sampled for this row): */ * rows sampled for this row): */
const uint8_t *csp = sp + esy0[y] * src->pitch; const uint8_t *csp = sp + esy0[y] * src->pitch;
@@ -109,7 +109,6 @@ static void ZoomSurface( const RageSurface * src, RageSurface * dst )
const uint8_t *c10 = ncsp + esx0[x]*4; const uint8_t *c10 = ncsp + esx0[x]*4;
const uint8_t *c11 = ncsp + esx1[x]*4; const uint8_t *c11 = ncsp + esx1[x]*4;
uint8_t color[4];
for( int c = 0; c < 4; ++c ) for( int c = 0; c < 4; ++c )
{ {
uint32_t x0 = uint32_t(c00[c]) * ex0[x]; uint32_t x0 = uint32_t(c00[c]) * ex0[x];
@@ -120,12 +119,11 @@ static void ZoomSurface( const RageSurface * src, RageSurface * dst )
x1 >>= 24; x1 >>= 24;
const uint32_t res = ((x0 * ey0[y]) + (x1 * (16777216-ey0[y])) + 8388608) >> 24; const uint32_t res = ((x0 * ey0[y]) + (x1 * (16777216-ey0[y])) + 8388608) >> 24;
color[c] = uint8_t(res); dp[c] = uint8_t(res);
} }
*dp = *(uint32_t *) color;
// Advance destination pointer. // Advance destination pointer.
++dp; dp += 4;
} }
} }
} }