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

eliminated gcc-4 compilation warnings

Browse Source
This commit is contained in:
dan
2005-08-22 23:58:19 +00:00
parent 91f5abc955
commit c0317ddae5
28 changed files with 143 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wrlib/raster.c
View File

@@ -283,31 +283,37 @@ RCombineImagesWithOpaqueness(RImage *image, RImage *src, int opaqueness)
int
calculateCombineArea(RImage *des, RImage *src, int *sx, int *sy,
int *swidth, int *sheight, int *dx, int *dy)
unsigned int *swidth, unsigned int *sheight, int *dx, int *dy)
{
int width = (int)*swidth, height = (int)*sheight;
if (*dx < 0) {
*sx = -*dx;
*swidth = *swidth + *dx;
width = width + *dx;
*dx = 0;
}
if (*dx + *swidth > des->width) {
*swidth = des->width - *dx;
if (*dx + width > des->width) {
width = des->width - *dx;
}
if (*dy < 0) {
*sy = -*dy;
*sheight = *sheight + *dy;
height = height + *dy;
*dy = 0;
}
if (*dy + *sheight > des->height) {
*sheight = des->height - *dy;
if (*dy + height > des->height) {
height = des->height - *dy;
}
if (*sheight > 0 && *swidth > 0) {
if (height>0 && width>0) {
*swidth = width;
*sheight = height;
return True;
} else return False;
}
return False;
}
void