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

1st attempt to speed up getpixel and putpixel

Browse source
This commit is contained in:
Albert Cahalan 2004-12-18 17:02:11 +00:00
parent 85fb346304
commit bdeca0cc62
1 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/tuxpaint.c
View file

@ -8142,23 +8142,19 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
/* get the X/Y values within the bounds of this surface */ /* get the X/Y values within the bounds of this surface */
if (x < 0) if (unlikely(x < 0))
x = 0; x = 0;
if (x > surface->w - 1) if (unlikely(x > surface->w - 1))
x = surface->w - 1; x = surface->w - 1;
if (y > surface->h - 1) if (unlikely(y > surface->h - 1))
y = surface->h - 1; y = surface->h - 1;
if (y < 0) if (unlikely(y < 0))
y = 0; y = 0;
/* SDL_LockSurface(surface); */
/* Determine bytes-per-pixel for the surface in question: */ /* Determine bytes-per-pixel for the surface in question: */
bpp = surface->format->BytesPerPixel; bpp = surface->format->BytesPerPixel;
/* Set a pointer to the exact location in memory of the pixel /* Set a pointer to the exact location in memory of the pixel
in question: */ in question: */
@ -8171,6 +8167,9 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
* pixel's value (an 8-bit palette value, or a 16-, 24- or 32-bit * pixel's value (an 8-bit palette value, or a 16-, 24- or 32-bit
* RGB value) */ * RGB value) */
if (likely(bpp == 4))
return *(Uint32 *)p; // 32-bit display
if (bpp == 1) /* 8-bit display */ if (bpp == 1) /* 8-bit display */
pixel = *p; pixel = *p;
else if (bpp == 2) /* 16-bit display */ else if (bpp == 2) /* 16-bit display */
@ -8184,10 +8183,6 @@ static Uint32 getpixel(SDL_Surface * surface, int x, int y)
else else
pixel = p[0] | p[1] << 8 | p[2] << 16; pixel = p[0] | p[1] << 8 | p[2] << 16;
} }
else if (bpp == 4) /* 32-bit display */
pixel = *(Uint32 *)p;
/* SDL_UnlockSurface(surface); */
return pixel; return pixel;
} }
@ -8203,19 +8198,12 @@ static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel)
/* Assuming the X/Y values are within the bounds of this surface... */ /* Assuming the X/Y values are within the bounds of this surface... */
if (x >= 0 && y >= 0 && x < surface->w && y < surface->h) if (likely(likely(x>=0) && likely(y>=0) && likely(x<surface->w) && likely(y<surface->h)))
{ {
/* SDL_LockSurface(surface); */
/* Determine bytes-per-pixel for the surface in question: */ /* Determine bytes-per-pixel for the surface in question: */
bpp = surface->format->BytesPerPixel; bpp = surface->format->BytesPerPixel;
// Set a pointer to the exact location in memory of the pixel
/* Set a pointer to the exact location in memory of the pixel
* in question: */
p = (Uint8 *) (((Uint8 *)surface->pixels) + /* Start: beginning of RAM */ p = (Uint8 *) (((Uint8 *)surface->pixels) + /* Start: beginning of RAM */
(y * surface->pitch) + /* Go down Y lines */ (y * surface->pitch) + /* Go down Y lines */
(x * bpp)); /* Go in X pixels */ (x * bpp)); /* Go in X pixels */
@ -8224,7 +8212,9 @@ static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel)
/* Set the (correctly-sized) piece of data in the surface's RAM /* Set the (correctly-sized) piece of data in the surface's RAM
* to the pixel value sent in: */ * to the pixel value sent in: */
if (bpp == 1) if (likely(bpp == 4))
*(Uint32 *)p = pixel; // 32-bit display
else if (bpp == 1)
*p = pixel; *p = pixel;
else if (bpp == 2) else if (bpp == 2)
*(Uint16 *)p = pixel; *(Uint16 *)p = pixel;
@ -8243,12 +8233,6 @@ static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel)
p[2] = (pixel >> 16) & 0xff; p[2] = (pixel >> 16) & 0xff;
} }
} }
else if (bpp == 4)
{
*(Uint32 *)p = pixel;
}
/* SDL_UnlockSurface(surface); */
} }
} }