The function RLoadImage calls RDrawXPM and RDrawPNG to draw the image on the screen. Now the image creation uses two steps, image load and image draw.
For RGetImageFromXPMData, the RDrawXPM call continues at the end of the function, therefore we don't need change the files where the function is called. The argument RContext in RDrawPNG & RDrawXPM is not used, so the function prototype changes. Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- wrlib/imgformat.h | 4 ++-- wrlib/libwraster.map | 1 + wrlib/load.c | 6 ++++-- wrlib/png.c | 3 +-- wrlib/xpm.c | 4 +--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wrlib/imgformat.h b/wrlib/imgformat.h index ed200b2..63c13dd 100644 --- a/wrlib/imgformat.h +++ b/wrlib/imgformat.h @@ -34,7 +34,7 @@ */ RImage *RLoadPPM(const char *file); -RImage *RLoadXPM(RContext *context, const char *file); +RImage *RLoadXPM(const char *file); RImage *RDrawXPM(RContext *context, RImage *image); #ifdef USE_TIFF @@ -42,7 +42,7 @@ RImage *RLoadTIFF(const char *file, int index); #endif #ifdef USE_PNG -RImage *RLoadPNG(RContext *context, const char *file); +RImage *RLoadPNG(const char *file); RImage *RDrawPNG(RContext *context, RImage *image); #endif diff --git a/wrlib/libwraster.map b/wrlib/libwraster.map index 6282e2c..2abe767 100644 --- a/wrlib/libwraster.map +++ b/wrlib/libwraster.map @@ -40,6 +40,7 @@ LIBWRASTER3 RDestroyXImage; RDrawLine; RDrawLines; + RDrawImage; RDrawSegments; RErrorCode; RFillImage; diff --git a/wrlib/load.c b/wrlib/load.c index a8821e0..3b73c64 100644 --- a/wrlib/load.c +++ b/wrlib/load.c @@ -163,7 +163,8 @@ RImage *RLoadImage(RContext * context, const char *file, int index) return NULL; case IM_XPM: - image = RLoadXPM(context, file); + image = RLoadXPM(file); + image = RDrawXPM(context, image); break; #ifdef USE_TIFF @@ -174,7 +175,8 @@ RImage *RLoadImage(RContext * context, const char *file, int index) #ifdef USE_PNG case IM_PNG: - image = RLoadPNG(context, file); + image = RLoadPNG(file); + image = RDrawPNG(context, image); break; #endif /* USE_PNG */ diff --git a/wrlib/png.c b/wrlib/png.c index b2f9746..a78cd5c 100644 --- a/wrlib/png.c +++ b/wrlib/png.c @@ -49,7 +49,7 @@ static void read_xpm_from_buffer(png_structp png, png_byte *buffer, png_size_t c png->io_ptr = pnginfo; } -RImage *RLoadPNG(RContext *context, const char *file) +RImage *RLoadPNG(const char *file) { FILE *f; unsigned char *rawimage; @@ -172,7 +172,6 @@ RImage *RLoadPNG(RContext *context, const char *file) image->srcdata = rawimage; image->srcdatalen = newlen; - image = RDrawPNG(context, image); return image; } diff --git a/wrlib/xpm.c b/wrlib/xpm.c index 8f94ce8..2dadd55 100644 --- a/wrlib/xpm.c +++ b/wrlib/xpm.c @@ -184,7 +184,7 @@ RImage *RGetImageFromXPMData(RContext *context, char **xpmData) return image; } -RImage *RLoadXPM(RContext *context, const char *file) +RImage *RLoadXPM(const char *file) { RImage *image; XpmImage xpm; @@ -226,8 +226,6 @@ RImage *RLoadXPM(RContext *context, const char *file) image->srcdata = (unsigned char *) malloc(image->srcdatalen); memcpy(image->srcdata, &xpm, image->srcdatalen); - image = RDrawXPM(context, image); - return image; } -- 1.8.4.rc3 -- To unsubscribe, send mail to [email protected].
