gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-06 13:54:12 +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

2
wrlib/gif.c
View File

@@ -37,7 +37,7 @@ static int InterlacedJumps[] = { 8, 8, 4, 2 };
/*
* Partially based on code in gif2rgb from giflib, by Gershon Elber.
*/
RImage *RLoadGIF(RContext * context, char *file, int index)
RImage *RLoadGIF(char *file, int index)
{
RImage *image = NULL;
unsigned char *cptr;

2
wrlib/jpeg.c
View File

@@ -89,7 +89,7 @@ static void my_error_exit(j_common_ptr cinfo)
longjmp(myerr->setjmp_buffer, 1);
}
RImage *RLoadJPEG(RContext * context, char *file_name, int index)
RImage *RLoadJPEG(RContext * context, char *file_name)
{
RImage *image = NULL;
struct jpeg_decompress_struct cinfo;

24
wrlib/load.c
View File

@@ -79,21 +79,21 @@ static RCachedImage *RImageCache;
static int identFile(char *path);
extern RImage *RLoadPPM(RContext * context, char *file_name, int index);
extern RImage *RLoadPPM(char *file_name);
extern RImage *RLoadXPM(RContext * context, char *file, int index);
extern RImage *RLoadXPM(RContext * context, char *file);
#ifdef USE_TIFF
extern RImage *RLoadTIFF(RContext * context, char *file, int index);
extern RImage *RLoadTIFF(char *file, int index);
#endif
#ifdef USE_PNG
extern RImage *RLoadPNG(RContext * context, char *file, int index);
extern RImage *RLoadPNG(RContext * context, char *file);
#endif
#ifdef USE_JPEG
extern RImage *RLoadJPEG(RContext * context, char *file_name, int index);
extern RImage *RLoadJPEG(RContext * context, char *file_name);
#endif
#ifdef USE_GIF
extern RImage *RLoadGIF(RContext * context, char *file_name, int index);
extern RImage *RLoadGIF(char *file_name, int index);
#endif
char **RSupportedFileFormats(void)
@@ -188,35 +188,35 @@ RImage *RLoadImage(RContext * context, char *file, int index)
return NULL;
case IM_XPM:
image = RLoadXPM(context, file, index);
image = RLoadXPM(context, file);
break;
#ifdef USE_TIFF
case IM_TIFF:
image = RLoadTIFF(context, file, index);
image = RLoadTIFF(file, index);
break;
#endif /* USE_TIFF */
#ifdef USE_PNG
case IM_PNG:
image = RLoadPNG(context, file, index);
image = RLoadPNG(context, file);
break;
#endif /* USE_PNG */
#ifdef USE_JPEG
case IM_JPEG:
image = RLoadJPEG(context, file, index);
image = RLoadJPEG(context, file);
break;
#endif /* USE_JPEG */
#ifdef USE_GIF
case IM_GIF:
image = RLoadGIF(context, file, index);
image = RLoadGIF(file, index);
break;
#endif /* USE_GIF */
case IM_PPM:
image = RLoadPPM(context, file, index);
image = RLoadPPM(file);
break;
default:

2
wrlib/nxpm.c
View File

@@ -226,7 +226,7 @@ RImage *RGetImageFromXPMData(RContext * context, char **data)
return NULL;
}
RImage *RLoadXPM(RContext * context, char *file, int index)
RImage *RLoadXPM(RContext * context, char *file)
{
RImage *image = NULL;
char line[LINEWIDTH + 1];

2
wrlib/png.c
View File

@@ -31,7 +31,7 @@
#include "wraster.h"
RImage *RLoadPNG(RContext * context, char *file, int index)
RImage *RLoadPNG(RContext * context, char *file)
{
char *tmp;
RImage *image = NULL;

10
wrlib/ppm.c
View File

@@ -28,7 +28,7 @@
#include "wraster.h"
static RImage *load_graymap(char *file_name, FILE * file, int w, int h, int max, int raw)
static RImage *load_graymap(FILE * file, int w, int h, int max, int raw)
{
RImage *image;
@@ -74,7 +74,7 @@ static RImage *load_graymap(char *file_name, FILE * file, int w, int h, int max,
return NULL;
}
static RImage *load_pixmap(char *file_name, FILE * file, int w, int h, int max, int raw)
static RImage *load_pixmap(FILE * file, int w, int h, int max, int raw)
{
RImage *image;
int i;
@@ -111,7 +111,7 @@ static RImage *load_pixmap(char *file_name, FILE * file, int w, int h, int max,
return NULL;
}
RImage *RLoadPPM(RContext * context, char *file_name, int index)
RImage *RLoadPPM(char *file_name)
{
FILE *file;
RImage *image = NULL;
@@ -156,9 +156,9 @@ RImage *RLoadPPM(RContext * context, char *file_name, int index)
goto bad_file;
if (type == '5')
image = load_graymap(file_name, file, w, h, m, type == '5');
image = load_graymap(file, w, h, m, type == '5');
else if (type == '6')
image = load_pixmap(file_name, file, w, h, m, type == '6');
image = load_pixmap(file, w, h, m, type == '6');
fclose(file);
return image;

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;

2
wrlib/tiff.c
View File

@@ -32,7 +32,7 @@
#include "wraster.h"
RImage *RLoadTIFF(RContext * context, char *file, int index)
RImage *RLoadTIFF(char *file, int index)
{
RImage *image = NULL;
TIFF *tif;

2
wrlib/xpm.c
View File

@@ -151,7 +151,7 @@ RImage *RGetImageFromXPMData(RContext * context, char **xpmData)
return image;
}
RImage *RLoadXPM(RContext * context, char *file, int index)
RImage *RLoadXPM(RContext * context, char *file)
{
Display *dpy = context->dpy;
Colormap cmap = context->cmap;