adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bilinear scaling fix (post optimization)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1066 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-07-18 17:46:35 +00:00
parent c969ebe7d9
commit 70a9f5b97e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/graphics/sdl/2xscalers.c
+12 -12
View File
@@ -2510,16 +2510,16 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = src_p[0]; p[0] = src_p[0];
if (y < h - 2) if (y < h - 1)
p[2] = src_p[src->w]; p[2] = src_p[src->w];
else else
p[2] = 0; p[2] = 0;
for (x = region->x; x < xend; ++x, ++src_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (y < h - 2) if (y < h - 1)
{ {
if (x < w - 2) if (x < w - 1)
{ {
p[1] = src_p[1]; p[1] = src_p[1];
p[3] = src_p[src->w + 1]; p[3] = src_p[src->w + 1];
@@ -2532,7 +2532,7 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
} }
else else
{ {
if (x < w - 2) if (x < w - 1)
p[1] = src_p[1]; p[1] = src_p[1];
else else
p[1] = 0; p[1] = 0;
@@ -2578,16 +2578,16 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = GET_PIX_24BIT (src_p); p[0] = GET_PIX_24BIT (src_p);
if (y < h - 2) if (y < h - 1)
p[2] = GET_PIX_24BIT (src_p + src->w); p[2] = GET_PIX_24BIT (src_p + src->w);
else else
p[2] = 0; p[2] = 0;
for (x = region->x; x < xend; ++x, ++src_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (y < h - 2) if (y < h - 1)
{ {
if (x < w - 2) if (x < w - 1)
{ {
p[1] = GET_PIX_24BIT (src_p + 1); p[1] = GET_PIX_24BIT (src_p + 1);
p[3] = GET_PIX_24BIT (src_p + src->w + 1); p[3] = GET_PIX_24BIT (src_p + src->w + 1);
@@ -2600,7 +2600,7 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
} }
else else
{ {
if (x < w - 2) if (x < w - 1)
p[1] = GET_PIX_24BIT (src_p + 1); p[1] = GET_PIX_24BIT (src_p + 1);
else else
p[1] = 0; p[1] = 0;
@@ -2646,16 +2646,16 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc) for (y = region->y; y < yend; ++y, dst_p += ddst, src_p += dsrc)
{ {
p[0] = src_p[0]; p[0] = src_p[0];
if (y < h - 2) if (y < h - 1)
p[2] = src_p[src->w]; p[2] = src_p[src->w];
else else
p[2] = 0; p[2] = 0;
for (x = region->x; x < xend; ++x, ++src_p) for (x = region->x; x < xend; ++x, ++src_p)
{ {
if (y < h - 2) if (y < h - 1)
{ {
if (x < w - 2) if (x < w - 1)
{ {
p[1] = src_p[1]; p[1] = src_p[1];
p[3] = src_p[src->w + 1]; p[3] = src_p[src->w + 1];
@@ -2668,7 +2668,7 @@ void Scale_BilinearFilter (SDL_Surface *src, SDL_Surface *dst, SDL_Rect *r)
} }
else else
{ {
if (x < w - 2) if (x < w - 1)
p[1] = src_p[1]; p[1] = src_p[1];
else else
p[1] = 0; p[1] = 0;