notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lost an optimization because getpixel/putpixel used by thumbnail on 3-byte-per-pixel saved images

Browse source
This commit is contained in:
Albert Cahalan 2004-12-20 02:21:47 +00:00
parent 62d2f463ed
commit eb32e3361c
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tuxpaint.c
View file

@ -8275,11 +8275,9 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
{ {
Uint8 * p; Uint8 * p;
Uint32 pixel; Uint32 pixel;
#if VIDEO_BPP!=32
// Always 4, except 3 when loading a saved image.
int BytesPerPixel = surface->format->BytesPerPixel; int BytesPerPixel = surface->format->BytesPerPixel;
#else
#define BytesPerPixel 4
#endif
/* get the X/Y values within the bounds of this surface */ /* get the X/Y values within the bounds of this surface */
if (unlikely( (unsigned)x > (unsigned)surface->w - 1u )) if (unlikely( (unsigned)x > (unsigned)surface->w - 1u ))
@ -8318,7 +8316,6 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
return pixel; return pixel;
} }
#undef BytesPerPixel
/* Draw a single pixel into the surface: */ /* Draw a single pixel into the surface: */
@ -8326,11 +8323,8 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel) static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel)
{ {
Uint8 * p; Uint8 * p;
#if VIDEO_BPP!=32 // Always 4, except 3 when loading a saved image.
int BytesPerPixel = surface->format->BytesPerPixel; int BytesPerPixel = surface->format->BytesPerPixel;
#else
#define BytesPerPixel 4
#endif
/* Assuming the X/Y values are within the bounds of this surface... */ /* Assuming the X/Y values are within the bounds of this surface... */
@ -8368,7 +8362,6 @@ static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel)
} }
} }
} }
#undef BytesPerPixel
/* Should really clip at the line level, but oh well... */ /* Should really clip at the line level, but oh well... */