From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- image/jpeg.h | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'image/jpeg.h') diff --git a/image/jpeg.h b/image/jpeg.h index 70bae4a6b..57b82bdc1 100644 --- a/image/jpeg.h +++ b/image/jpeg.h @@ -28,24 +28,15 @@ #include -struct bitmap; -struct content; -struct rect; - -struct content_jpeg_data { - int dummy; /* NOT USED but to satisfy Norcroft */ -}; - -bool nsjpeg_convert(struct content *c); -void nsjpeg_destroy(struct content *c); -bool nsjpeg_redraw(struct content *c, int x, int y, - int width, int height, const struct rect *clip, - float scale, colour background_colour); -bool nsjpeg_redraw_tiled(struct content *c, int x, int y, - int width, int height, const struct rect *clip, - float scale, colour background_colour, - bool repeat_x, bool repeat_y); -bool nsjpeg_clone(const struct content *old, struct content *new_content); +#include "utils/errors.h" + +nserror nsjpeg_init(void); +void nsjpeg_fini(void); + +#else + +#define nsjpeg_init() NSERROR_OK +#define nsjpeg_fini() ((void) 0) #endif /* WITH_JPEG */ -- cgit v1.2.3