gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Tidy

Browse Source 
- Kill unused vars in wrlib
- Add missing initializers to defaults.c:staticOptionList
- Re-format it slightly
- Kill some dead code
- Kill stupid "if (const op var)"
This commit is contained in:
Tamas TEVESZ
2010-04-03 18:13:13 +02:00
committed by Carlos R. Mafra
parent 79e1bb53d3
commit 241e66ff0a
10 changed files with 211 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wrlib/raster.c
View File

@@ -292,7 +292,7 @@ void RCombineImagesWithOpaqueness(RImage * image, RImage * src, int opaqueness)
}
int
calculateCombineArea(RImage * des, RImage * src, int *sx, int *sy,
calculateCombineArea(RImage * des, int *sx, int *sy,
unsigned int *swidth, unsigned int *sheight, int *dx, int *dy)
{
int width = (int)*swidth, height = (int)*sheight;
@@ -333,7 +333,7 @@ void RCombineArea(RImage * image, RImage * src, int sx, int sy, unsigned width,
unsigned char *s;
int alpha, calpha;
if (!calculateCombineArea(image, src, &sx, &sy, &width, &height, &dx, &dy))
if (!calculateCombineArea(image, &sx, &sy, &width, &height, &dx, &dy))
return;
if (!HAS_ALPHA(src)) {
@@ -409,7 +409,7 @@ void RCopyArea(RImage * image, RImage * src, int sx, int sy, unsigned width, uns
unsigned char *d;
unsigned char *s;
if (!calculateCombineArea(image, src, &sx, &sy, &width, &height, &dx, &dy))
if (!calculateCombineArea(image, &sx, &sy, &width, &height, &dx, &dy))
return;
if (!HAS_ALPHA(src)) {
@@ -487,7 +487,7 @@ RCombineAreaWithOpaqueness(RImage * image, RImage * src, int sx, int sy,
int dalpha = HAS_ALPHA(image);
int dch = (dalpha ? 4 : 3);
if (!calculateCombineArea(image, src, &sx, &sy, &width, &height, &dx, &dy))
if (!calculateCombineArea(image, &sx, &sy, &width, &height, &dx, &dy))
return;
d = image->data + (dy * image->width + dx) * dch;