gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-03 06:45:51 +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

27
wrlib/convert.c
View File

@@ -68,8 +68,9 @@ extern int x86_check_mmx();
extern void x86_mmx_TrueColor_32_to_16(unsigned char *image,
unsigned short *ximage,
short *err, short *nerr,
short *rtable, short *gtable,
short *btable,
const unsigned short *rtable,
const unsigned short *gtable,
const unsigned short *btable,
int dr, int dg, int db,
unsigned int roffs,
unsigned int goffs,
@@ -175,9 +176,9 @@ computeStdTable(unsigned int mult, unsigned int max)
static void
convertTrueColor_generic(RXImage *ximg, RImage *image,
signed char *err, signed char *nerr,
const short *rtable,
const short *gtable,
const short *btable,
const unsigned short *rtable,
const unsigned short *gtable,
const unsigned short *btable,
const int dr, const int dg, const int db,
const unsigned short roffs,
const unsigned short goffs,
@@ -408,8 +409,8 @@ image2TrueColor(RContext *ctx, RImage *image)
} else
#endif /* ASM_X86_MMX */
{
char *err;
char *nerr;
signed char *err;
signed char *nerr;
int ch = (HAS_ALPHA(image) ? 4 : 3);
err = malloc(ch*(image->width+2));
@@ -447,9 +448,9 @@ image2TrueColor(RContext *ctx, RImage *image)
static void
convertPseudoColor_to_8(RXImage *ximg, RImage *image,
signed char *err, signed char *nerr,
const short *rtable,
const short *gtable,
const short *btable,
const unsigned short *rtable,
const unsigned short *gtable,
const unsigned short *btable,
const int dr, const int dg, const int db,
unsigned long *pixels,
int cpc)
@@ -459,7 +460,7 @@ convertPseudoColor_to_8(RXImage *ximg, RImage *image,
int pixel;
int rer, ger, ber;
unsigned char *ptr = image->data;
unsigned char *optr = ximg->image->data;
unsigned char *optr = (unsigned char*)ximg->image->data;
int channels = (HAS_ALPHA(image) ? 4 : 3);
int cpcpc = cpc*cpc;
@@ -573,8 +574,8 @@ image2PseudoColor(RContext *ctx, RImage *image)
}
} else {
/* dither */
char *err;
char *nerr;
signed char *err;
signed char *nerr;
const int dr=0xff/rmask;
const int dg=0xff/gmask;
const int db=0xff/bmask;