excerpts from my local tree, part 8 tree a6be71e0c226 parent f2137306180b author Tamas TEVESZ <[email protected]> 1230274684 -3600 committer Tamas TEVESZ <[email protected]> 1230274684 -3600 revision 1623 branch ice
Fix up function decls diff --git a/wrlib/wraster.h b/wrlib/wraster.h --- a/wrlib/wraster.h +++ b/wrlib/wraster.h @@ -295,167 +295,100 @@ * Do not free the returned data. */ char **RSupportedFileFormats(void); - - -char *RGetImageFileFormat(char *file); +char *RGetImageFileFormat(char *); /* * Xlib contexts */ -RContext *RCreateContext(Display *dpy, int screen_number, - RContextAttributes *attribs); - -void RDestroyContext(RContext *context); - -Bool RGetClosestXColor(RContext *context, RColor *color, XColor *retColor); +RContext *RCreateContext(Display *, int, RContextAttributes *); +void RDestroyContext(RContext *); +Bool RGetClosestXColor(RContext *, RColor *, XColor *); /* * RImage creation */ -RImage *RCreateImage(unsigned width, unsigned height, int alpha); - -RImage *RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask); - -RImage *RCreateImageFromDrawable(RContext *context, Drawable drawable, - Pixmap mask); - -RImage *RLoadImage(RContext *context, char *file, int index); - -RImage* RRetainImage(RImage *image); - -void RReleaseImage(RImage *image); - -RImage *RGetImageFromXPMData(RContext *context, char **xpmData); +RImage *RCreateImage(unsigned, unsigned, int); +RImage *RCreateImageFromXImage(RContext *, XImage *, XImage *); +RImage *RCreateImageFromDrawable(RContext *, Drawable, Pixmap); +RImage *RLoadImage(RContext *, char *, int); +RImage* RRetainImage(RImage *); +void RReleaseImage(RImage *); +RImage *RGetImageFromXPMData(RContext *, char **); /* * RImage storing */ -Bool RSaveImage(RImage *image, char *filename, char *format); +Bool RSaveImage(RImage *, char *, char *); /* * Area manipulation */ -RImage *RCloneImage(RImage *image); - -RImage *RGetSubImage(RImage *image, int x, int y, unsigned width, - unsigned height); - -void RCombineImageWithColor(RImage *image, RColor *color); - -void RCombineImages(RImage *image, RImage *src); - -void RCombineArea(RImage *image, RImage *src, int sx, int sy, unsigned width, - unsigned height, int dx, int dy); - -void RCopyArea(RImage *image, RImage *src, int sx, int sy, unsigned width, - unsigned height, int dx, int dy); - -void RCombineImagesWithOpaqueness(RImage *image, RImage *src, int opaqueness); - -void RCombineAreaWithOpaqueness(RImage *image, RImage *src, int sx, int sy, - unsigned width, unsigned height, int dx, int dy, - int opaqueness); - -RImage *RScaleImage(RImage *image, unsigned new_width, unsigned new_height); - -RImage *RSmoothScaleImage(RImage *src, unsigned new_width, - unsigned new_height); - -RImage *RRotateImage(RImage *image, float angle); - - -RImage *RMakeTiledImage(RImage *tile, unsigned width, unsigned height); - -RImage* RMakeCenteredImage(RImage *image, unsigned width, unsigned height, - RColor *color); +RImage *RCloneImage(RImage *); +RImage *RGetSubImage(RImage *, int, int, unsigned, unsigned); +void RCombineImageWithColor(RImage *, RColor *); +void RCombineImages(RImage *, RImage *); +void RCombineArea(RImage *, RImage *, int, int, unsigned, unsigned, int, int); +void RCopyArea(RImage *, RImage *, int, int, unsigned, unsigned, int, int); +void RCombineImagesWithOpaqueness(RImage *, RImage *, int); +void RCombineAreaWithOpaqueness(RImage *, RImage *, int, int, unsigned, + unsigned, int, int, int); +RImage *RScaleImage(RImage *, unsigned, unsigned); +RImage *RSmoothScaleImage(RImage *, unsigned, unsigned); +RImage *RRotateImage(RImage *, float); +RImage *RMakeTiledImage(RImage *, unsigned, unsigned); +RImage* RMakeCenteredImage(RImage *, unsigned, unsigned, RColor *); /* * Drawing */ -Bool RGetPixel(RImage *image, int x, int y, RColor *color); - -void RPutPixel(RImage *image, int x, int y, RColor *color); - -void ROperatePixel(RImage *image, int operation, int x, int y, RColor *color); - -void RPutPixels(RImage *image, RPoint *points, int npoints, int mode, - RColor *color); - -void ROperatePixels(RImage *image, int operation, RPoint *points, - int npoints, int mode, RColor *color); - -int RDrawLine(RImage *image, int x0, int y0, int x1, int y1, RColor *color); - -int ROperateLine(RImage *image, int operation, int x0, int y0, int x1, int y1, - RColor *color); - -void RDrawLines(RImage *image, RPoint *points, int npoints, int mode, - RColor *color); - -void ROperateLines(RImage *image, int operation, RPoint *points, int npoints, - int mode, RColor *color); - -void RDrawSegments(RImage *image, RSegment *segs, int nsegs, RColor *color); - -void ROperateSegments(RImage *image, int operation, RSegment *segs, int nsegs, - RColor *color); +Bool RGetPixel(RImage *, int, int, RColor *); +void RPutPixel(RImage *, int, int, RColor *); +void ROperatePixel(RImage *, int, int, int, RColor *); +void RPutPixels(RImage *, RPoint *, int, int, RColor *); +void ROperatePixels(RImage *, int, RPoint *, int, int, RColor *); +int RDrawLine(RImage *, int, int, int, int, RColor *); +int ROperateLine(RImage *, int, int, int, int, int, RColor *); +void RDrawLines(RImage *, RPoint *, int, int, RColor *); +void ROperateLines(RImage *, int, RPoint *, int, int, RColor *); +void RDrawSegments(RImage *, RSegment *, int, RColor *); +void ROperateSegments(RImage *, int, RSegment *, int, RColor *); /* * Color convertion */ -void RRGBtoHSV(RColor *color, RHSVColor *hsv); -void RHSVtoRGB(RHSVColor *hsv, RColor *rgb); +void RRGBtoHSV(RColor *, RHSVColor *); +void RHSVtoRGB(RHSVColor *, RColor *); /* * Painting */ -void RClearImage(RImage *image, RColor *color); - -void RFillImage(RImage *image, RColor *color); - -void RBevelImage(RImage *image, int bevel_type); - -RImage *RRenderGradient(unsigned width, unsigned height, RColor *from, - RColor *to, int style); - - -RImage *RRenderMultiGradient(unsigned width, unsigned height, RColor **colors, - int style); - - -RImage *RRenderInterwovenGradient(unsigned width, unsigned height, - RColor colors1[2], int thickness1, - RColor colors2[2], int thickness2); - +void RClearImage(RImage *, RColor *); +void RFillImage(RImage *, RColor *); +void RBevelImage(RImage *, int); +RImage *RRenderGradient(unsigned, unsigned, RColor *, RColor *, int); +RImage *RRenderMultiGradient(unsigned, unsigned, RColor **, int); +RImage *RRenderInterwovenGradient(unsigned, unsigned, RColor *, int, + RColor *, int); /* * Convertion into X Pixmaps */ -int RConvertImage(RContext *context, RImage *image, Pixmap *pixmap); - -int RConvertImageMask(RContext *context, RImage *image, Pixmap *pixmap, - Pixmap *mask, int threshold); +int RConvertImage(RContext *, RImage *, Pixmap *); +int RConvertImageMask(RContext *, RImage *, Pixmap *, Pixmap *, int); /* * misc. utilities */ -RXImage *RCreateXImage(RContext *context, int depth, - unsigned width, unsigned height); - -RXImage *RGetXImage(RContext *context, Drawable d, int x, int y, - unsigned width, unsigned height); - -void RDestroyXImage(RContext *context, RXImage *ximage); - -void RPutXImage(RContext *context, Drawable d, GC gc, RXImage *ximage, - int src_x, int src_y, int dest_x, int dest_y, - unsigned width, unsigned height); +RXImage *RCreateXImage(RContext *, int, unsigned, unsigned); +RXImage *RGetXImage(RContext *, Drawable, int, int, unsigned, unsigned); +void RDestroyXImage(RContext *, RXImage *); +void RPutXImage(RContext *, Drawable, GC, RXImage *, int, int, int, int, + unsigned, unsigned); /* do not free the returned string! */ -const char *RMessageForError(int errorCode); - -int RBlurImage(RImage *image); +const char *RMessageForError(int); +int RBlurImage(RImage *); /****** Global Variables *******/ @@ -466,4 +399,3 @@ #endif /* __cplusplus */ #endif - -- [-] mkdir /nonexistent -- To unsubscribe, send mail to [email protected].
