From 8c5506d97c620aa83b11056dd6cb1ff332f9921c Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 6 Aug 2009 21:32:44 +0200
Subject: Fixed messed up indentation and removed trailing spaces
---
src/resources/sdlrescalefacility.cpp | 480 ++++++++++++++++++-----------------
src/resources/sdlrescalefacility.h | 8 +-
2 files changed, 245 insertions(+), 243 deletions(-)
diff --git a/src/resources/sdlrescalefacility.cpp b/src/resources/sdlrescalefacility.cpp
index 54021bd0..49ba8aa4 100644
--- a/src/resources/sdlrescalefacility.cpp
+++ b/src/resources/sdlrescalefacility.cpp
@@ -17,52 +17,54 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ *
* Source code taken from:
*
* SDL_rotozoom - rotozoomer
- *
+ *
* LGPL (c) A. Schiffler
*
- */
+ */
#include "sdlrescalefacility.h"
#define VALUE_LIMIT 0.001
typedef struct tColorRGBA {
-Uint8 r;
-Uint8 g;
-Uint8 b;
-Uint8 a;
+ Uint8 r;
+ Uint8 g;
+ Uint8 b;
+ Uint8 a;
} tColorRGBA;
-void zoomSurfaceSize(int width, int height, double zoomx, double zoomy, int *dstwidth, int *dstheight)
+void zoomSurfaceSize(int width, int height, double zoomx, double zoomy,
+ int *dstwidth, int *dstheight)
{
/*
- * Sanity check zoom factors
+ * Sanity check zoom factors
*/
if (zoomx < VALUE_LIMIT) {
- zoomx = VALUE_LIMIT;
+ zoomx = VALUE_LIMIT;
}
if (zoomy < VALUE_LIMIT) {
- zoomy = VALUE_LIMIT;
+ zoomy = VALUE_LIMIT;
}
/*
- * Calculate target size
+ * Calculate target size
*/
*dstwidth = (int) ((double) width * zoomx);
*dstheight = (int) ((double) height * zoomy);
if (*dstwidth < 1) {
- *dstwidth = 1;
+ *dstwidth = 1;
}
if (*dstheight < 1) {
- *dstheight = 1;
+ *dstheight = 1;
}
}
-int zoomSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy, int smooth)
+int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface * dst,
+ int flipx, int flipy, int smooth)
{
int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy, ex, ey, t1, t2, sstep, lx, ly;
tColorRGBA *c00, *c01, *c10, *c11, *cswap;
@@ -70,35 +72,35 @@ int zoomSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy,
int dgap;
/*
- * Variable setup
+ * Variable setup
*/
if (smooth) {
- /*
- * For interpolation: assume source dimension is one pixel
- */
- /*
- * smaller to avoid overflow on right and bottom edge.
- */
- sx = (int) (65536.0 * (float) (src->w - 1) / (float) dst->w);
- sy = (int) (65536.0 * (float) (src->h - 1) / (float) dst->h);
+ /*
+ * For interpolation: assume source dimension is one pixel
+ */
+ /*
+ * smaller to avoid overflow on right and bottom edge.
+ */
+ sx = (int) (65536.0 * (float) (src->w - 1) / (float) dst->w);
+ sy = (int) (65536.0 * (float) (src->h - 1) / (float) dst->h);
} else {
- sx = (int) (65536.0 * (float) src->w / (float) dst->w);
- sy = (int) (65536.0 * (float) src->h / (float) dst->h);
+ sx = (int) (65536.0 * (float) src->w / (float) dst->w);
+ sy = (int) (65536.0 * (float) src->h / (float) dst->h);
}
/*
- * Allocate memory for row increments
+ * Allocate memory for row increments
*/
if ((sax = (int *) malloc((dst->w + 1) * sizeof(Uint32))) == NULL) {
- return (-1);
+ return (-1);
}
if ((say = (int *) malloc((dst->h + 1) * sizeof(Uint32))) == NULL) {
- free(sax);
- return (-1);
+ free(sax);
+ return (-1);
}
/*
- * Precalculate row increments
+ * Precalculate row increments
*/
sp = csp = (tColorRGBA *) src->pixels;
dp = (tColorRGBA *) dst->pixels;
@@ -109,152 +111,152 @@ int zoomSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy,
csx = 0;
csax = sax;
for (x = 0; x <= dst->w; x++) {
- *csax = csx;
- csax++;
- csx &= 0xffff;
- csx += sx;
+ *csax = csx;
+ csax++;
+ csx &= 0xffff;
+ csx += sx;
}
csy = 0;
csay = say;
for (y = 0; y <= dst->h; y++) {
- *csay = csy;
- csay++;
- csy &= 0xffff;
- csy += sy;
+ *csay = csy;
+ csay++;
+ csy &= 0xffff;
+ csy += sy;
}
dgap = dst->pitch - dst->w * 4;
/*
- * Switch between interpolating and non-interpolating code
+ * Switch between interpolating and non-interpolating code
*/
if (smooth) {
- /*
- * Interpolating Zoom
- */
+ /*
+ * Interpolating Zoom
+ */
- /*
- * Scan destination
- */
- ly = 0;
- csay = say;
- for (y = 0; y < dst->h; y++) {
+ /*
+ * Scan destination
+ */
+ ly = 0;
+ csay = say;
+ for (y = 0; y < dst->h; y++) {
/*
- * Setup color source pointers
+ * Setup color source pointers
*/
- c00 = csp;
+ c00 = csp;
c01 = csp;
- c01++;
+ c01++;
c10 = (tColorRGBA *) ((Uint8 *) csp + src->pitch);
c11 = c10;
c11++;
csax = sax;
if (flipx) {
- cswap = c00; c00=c01; c01=cswap;
- cswap = c10; c10=c11; c11=cswap;
+ cswap = c00; c00=c01; c01=cswap;
+ cswap = c10; c10=c11; c11=cswap;
}
if (flipy) {
- cswap = c00; c00=c10; c10=cswap;
- cswap = c01; c01=c11; c11=cswap;
+ cswap = c00; c00=c10; c10=cswap;
+ cswap = c01; c01=c11; c11=cswap;
}
lx = 0;
- for (x = 0; x < dst->w; x++) {
- /*
- * Interpolate colors
- */
- ex = (*csax & 0xffff);
- ey = (*csay & 0xffff);
- t1 = ((((c01->r - c00->r) * ex) >> 16) + c00->r) & 0xff;
- t2 = ((((c11->r - c10->r) * ex) >> 16) + c10->r) & 0xff;
- dp->r = (((t2 - t1) * ey) >> 16) + t1;
- t1 = ((((c01->g - c00->g) * ex) >> 16) + c00->g) & 0xff;
- t2 = ((((c11->g - c10->g) * ex) >> 16) + c10->g) & 0xff;
- dp->g = (((t2 - t1) * ey) >> 16) + t1;
- t1 = ((((c01->b - c00->b) * ex) >> 16) + c00->b) & 0xff;
- t2 = ((((c11->b - c10->b) * ex) >> 16) + c10->b) & 0xff;
- dp->b = (((t2 - t1) * ey) >> 16) + t1;
- t1 = ((((c01->a - c00->a) * ex) >> 16) + c00->a) & 0xff;
- t2 = ((((c11->a - c10->a) * ex) >> 16) + c10->a) & 0xff;
- dp->a = (((t2 - t1) * ey) >> 16) + t1;
-
- /*
- * Advance source pointers
- */
- csax++;
- sstep = (*csax >> 16);
- lx += sstep;
- if (lx >= src->w) sstep = 0;
- if (flipx) sstep = -sstep;
- c00 += sstep;
- c01 += sstep;
- c10 += sstep;
- c11 += sstep;
- /*
- * Advance destination pointer
- */
- dp++;
- }
- /*
- * Advance source pointer
- */
- csay++;
- sstep = (*csay >> 16);
+ for (x = 0; x < dst->w; x++) {
+ /*
+ * Interpolate colors
+ */
+ ex = (*csax & 0xffff);
+ ey = (*csay & 0xffff);
+ t1 = ((((c01->r - c00->r) * ex) >> 16) + c00->r) & 0xff;
+ t2 = ((((c11->r - c10->r) * ex) >> 16) + c10->r) & 0xff;
+ dp->r = (((t2 - t1) * ey) >> 16) + t1;
+ t1 = ((((c01->g - c00->g) * ex) >> 16) + c00->g) & 0xff;
+ t2 = ((((c11->g - c10->g) * ex) >> 16) + c10->g) & 0xff;
+ dp->g = (((t2 - t1) * ey) >> 16) + t1;
+ t1 = ((((c01->b - c00->b) * ex) >> 16) + c00->b) & 0xff;
+ t2 = ((((c11->b - c10->b) * ex) >> 16) + c10->b) & 0xff;
+ dp->b = (((t2 - t1) * ey) >> 16) + t1;
+ t1 = ((((c01->a - c00->a) * ex) >> 16) + c00->a) & 0xff;
+ t2 = ((((c11->a - c10->a) * ex) >> 16) + c10->a) & 0xff;
+ dp->a = (((t2 - t1) * ey) >> 16) + t1;
+
+ /*
+ * Advance source pointers
+ */
+ csax++;
+ sstep = (*csax >> 16);
+ lx += sstep;
+ if (lx >= src->w) sstep = 0;
+ if (flipx) sstep = -sstep;
+ c00 += sstep;
+ c01 += sstep;
+ c10 += sstep;
+ c11 += sstep;
+ /*
+ * Advance destination pointer
+ */
+ dp++;
+ }
+ /*
+ * Advance source pointer
+ */
+ csay++;
+ sstep = (*csay >> 16);
ly += sstep;
if (ly >= src->h) sstep = 0;
sstep *= src->pitch;
- if (flipy) sstep = -sstep;
- csp = (tColorRGBA *) ((Uint8 *) csp + sstep);
+ if (flipy) sstep = -sstep;
+ csp = (tColorRGBA *) ((Uint8 *) csp + sstep);
- /*
- * Advance destination pointers
- */
- dp = (tColorRGBA *) ((Uint8 *) dp + dgap);
- }
+ /*
+ * Advance destination pointers
+ */
+ dp = (tColorRGBA *) ((Uint8 *) dp + dgap);
+ }
} else {
- /*
- * Non-Interpolating Zoom
- */
-
- csay = say;
- for (y = 0; y < dst->h; y++) {
- sp = csp;
- csax = sax;
- for (x = 0; x < dst->w; x++) {
- /*
- * Draw
- */
- *dp = *sp;
- /*
- * Advance source pointers
- */
- csax++;
- sstep = (*csax >> 16);
- if (flipx) sstep = -sstep;
- sp += sstep;
- /*
- * Advance destination pointer
- */
- dp++;
- }
/*
- * Advance source pointer
+ * Non-Interpolating Zoom
*/
- csay++;
- sstep = (*csay >> 16) * src->pitch;
- if (flipy) sstep = -sstep;
- csp = (tColorRGBA *) ((Uint8 *) csp + sstep);
- /*
- * Advance destination pointers
- */
- dp = (tColorRGBA *) ((Uint8 *) dp + dgap);
- }
+ csay = say;
+ for (y = 0; y < dst->h; y++) {
+ sp = csp;
+ csax = sax;
+ for (x = 0; x < dst->w; x++) {
+ /*
+ * Draw
+ */
+ *dp = *sp;
+ /*
+ * Advance source pointers
+ */
+ csax++;
+ sstep = (*csax >> 16);
+ if (flipx) sstep = -sstep;
+ sp += sstep;
+ /*
+ * Advance destination pointer
+ */
+ dp++;
+ }
+ /*
+ * Advance source pointer
+ */
+ csay++;
+ sstep = (*csay >> 16) * src->pitch;
+ if (flipy) sstep = -sstep;
+ csp = (tColorRGBA *) ((Uint8 *) csp + sstep);
+
+ /*
+ * Advance destination pointers
+ */
+ dp = (tColorRGBA *) ((Uint8 *) dp + dgap);
+ }
}
/*
- * Remove temp arrays
+ * Remove temp arrays
*/
free(sax);
free(say);
@@ -272,25 +274,25 @@ int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy)
int dgap;
/*
- * Variable setup
+ * Variable setup
*/
sx = (Uint32) (65536.0 * (float) src->w / (float) dst->w);
sy = (Uint32) (65536.0 * (float) src->h / (float) dst->h);
-
- /*
- * Allocate memory for row increments
+
+ /*
+ * Allocate memory for row increments
*/
if ((sax = (Uint32 *) malloc((dst->w + 1) * sizeof(Uint32))) == NULL) {
- return (-1);
+ return (-1);
}
if ((say = (Uint32 *) malloc((dst->h + 1) * sizeof(Uint32))) == NULL) {
- free(sax);
- return (-1);
+ free(sax);
+ return (-1);
}
/*
- * Pointer setup
+ * Pointer setup
*/
sp = csp = (Uint8 *) src->pixels;
dp = (Uint8 *) dst->pixels;
@@ -300,66 +302,66 @@ int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy)
if (flipy) csp = ( (Uint8*)csp + src->pitch*(src->h-1) );
/*
- * Precalculate row increments
+ * Precalculate row increments
*/
csx = 0;
csax = sax;
for (x = 0; x <= dst->w; x++) {
- *csax = csx;
- csax++;
- csx &= 0xffff;
- csx += sx;
+ *csax = csx;
+ csax++;
+ csx &= 0xffff;
+ csx += sx;
}
csy = 0;
csay = say;
for (y = 0; y <= dst->h; y++) {
- *csay = csy;
- csay++;
- csy &= 0xffff;
- csy += sy;
+ *csay = csy;
+ csay++;
+ csy &= 0xffff;
+ csy += sy;
}
/*
- * Draw
+ * Draw
*/
csay = say;
for (y = 0; y < dst->h; y++) {
- csax = sax;
- sp = csp;
- for (x = 0; x < dst->w; x++) {
- /*
- * Draw
- */
- *dp = *sp;
- /*
- * Advance source pointers
- */
- csax++;
+ csax = sax;
+ sp = csp;
+ for (x = 0; x < dst->w; x++) {
+ /*
+ * Draw
+ */
+ *dp = *sp;
+ /*
+ * Advance source pointers
+ */
+ csax++;
sstep = (*csax >> 16);
if (flipx) sstep = -sstep;
sp += sstep;
+ /*
+ * Advance destination pointer
+ */
+ dp++;
+ }
/*
- * Advance destination pointer
+ * Advance source pointer (for row)
*/
- dp++;
- }
- /*
- * Advance source pointer (for row)
- */
- csay++;
+ csay++;
sstep = (*csay >> 16) * src->pitch;
if (flipy) sstep = -sstep;
csp = ((Uint8 *) csp + sstep);
- /*
- * Advance destination pointers
- */
- dp += dgap;
+ /*
+ * Advance destination pointers
+ */
+ dp += dgap;
}
/*
- * Remove temp arrays
+ * Remove temp arrays
*/
free(sax);
free(say);
@@ -379,36 +381,36 @@ SDL_Surface *_SDLzoomSurface(SDL_Surface * src, double zoomx, double zoomy, int
int flipx, flipy;
/*
- * Sanity check
+ * Sanity check
*/
if (src == NULL)
- return (NULL);
+ return (NULL);
/*
- * Determine if source surface is 32bit or 8bit
+ * Determine if source surface is 32bit or 8bit
*/
is32bit = (src->format->BitsPerPixel == 32);
if ((is32bit) || (src->format->BitsPerPixel == 8)) {
- /*
- * Use source surface 'as is'
- */
- rz_src = src;
- src_converted = 0;
+ /*
+ * Use source surface 'as is'
+ */
+ rz_src = src;
+ src_converted = 0;
} else {
- /*
- * New source surface is 32bit with a defined RGBA ordering
- */
- rz_src =
- SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32,
+ /*
+ * New source surface is 32bit with a defined RGBA ordering
+ */
+ rz_src =
+ SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32,
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
- 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000
+ 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000
#else
- 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff
+ 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff
#endif
- );
- SDL_BlitSurface(src, NULL, rz_src, NULL);
- src_converted = 1;
- is32bit = 1;
+ );
+ SDL_BlitSurface(src, NULL, rz_src, NULL);
+ src_converted = 1;
+ is32bit = 1;
}
flipx = (zoomx<0.0);
@@ -420,68 +422,68 @@ SDL_Surface *_SDLzoomSurface(SDL_Surface * src, double zoomx, double zoomy, int
zoomSurfaceSize(rz_src->w, rz_src->h, zoomx, zoomy, &dstwidth, &dstheight);
/*
- * Alloc space to completely contain the zoomed surface
+ * Alloc space to completely contain the zoomed surface
*/
rz_dst = NULL;
if (is32bit) {
- /*
- * Target surface is 32bit with source RGBA/ABGR ordering
- */
- rz_dst =
- SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 32,
- rz_src->format->Rmask, rz_src->format->Gmask,
- rz_src->format->Bmask, rz_src->format->Amask);
+ /*
+ * Target surface is 32bit with source RGBA/ABGR ordering
+ */
+ rz_dst =
+ SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 32,
+ rz_src->format->Rmask, rz_src->format->Gmask,
+ rz_src->format->Bmask, rz_src->format->Amask);
} else {
- /*
- * Target surface is 8bit
- */
- rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 8, 0, 0, 0, 0);
+ /*
+ * Target surface is 8bit
+ */
+ rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight, 8, 0, 0, 0, 0);
}
/*
- * Lock source surface
+ * Lock source surface
*/
SDL_LockSurface(rz_src);
/*
- * Check which kind of surface we have
+ * Check which kind of surface we have
*/
if (is32bit) {
- /*
- * Call the 32bit transformation routine to do the zooming (using alpha)
- */
- zoomSurfaceRGBA(rz_src, rz_dst, flipx, flipy, smooth);
- /*
- * Turn on source-alpha support
- */
- SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255);
+ /*
+ * Call the 32bit transformation routine to do the zooming (using alpha)
+ */
+ zoomSurfaceRGBA(rz_src, rz_dst, flipx, flipy, smooth);
+ /*
+ * Turn on source-alpha support
+ */
+ SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255);
} else {
- /*
- * Copy palette and colorkey info
- */
- for (i = 0; i < rz_src->format->palette->ncolors; i++) {
- rz_dst->format->palette->colors[i] = rz_src->format->palette->colors[i];
- }
- rz_dst->format->palette->ncolors = rz_src->format->palette->ncolors;
- /*
- * Call the 8bit transformation routine to do the zooming
- */
- zoomSurfaceY(rz_src, rz_dst, flipx, flipy);
- SDL_SetColorKey(rz_dst, SDL_SRCCOLORKEY | SDL_RLEACCEL, rz_src->format->colorkey);
+ /*
+ * Copy palette and colorkey info
+ */
+ for (i = 0; i < rz_src->format->palette->ncolors; i++) {
+ rz_dst->format->palette->colors[i] = rz_src->format->palette->colors[i];
+ }
+ rz_dst->format->palette->ncolors = rz_src->format->palette->ncolors;
+ /*
+ * Call the 8bit transformation routine to do the zooming
+ */
+ zoomSurfaceY(rz_src, rz_dst, flipx, flipy);
+ SDL_SetColorKey(rz_dst, SDL_SRCCOLORKEY | SDL_RLEACCEL, rz_src->format->colorkey);
}
/*
- * Unlock source surface
+ * Unlock source surface
*/
SDL_UnlockSurface(rz_src);
/*
- * Cleanup temp surface
+ * Cleanup temp surface
*/
if (src_converted) {
- SDL_FreeSurface(rz_src);
+ SDL_FreeSurface(rz_src);
}
/*
- * Return destination surface
+ * Return destination surface
*/
return (rz_dst);
-}
+}
diff --git a/src/resources/sdlrescalefacility.h b/src/resources/sdlrescalefacility.h
index 597e6933..971f5d73 100644
--- a/src/resources/sdlrescalefacility.h
+++ b/src/resources/sdlrescalefacility.h
@@ -17,14 +17,14 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ *
* Source code taken from:
*
* SDL_rotozoom - rotozoomer
- *
+ *
* LGPL (c) A. Schiffler
*
- */
+ */
#ifndef SDLRESCALEFACILITY_H
#define SDLRESCALEFACILITY_H
@@ -49,4 +49,4 @@
SDL_Surface *_SDLzoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth);
-#endif
\ No newline at end of file
+#endif
--
cgit v1.2.3-70-g09d2