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 --- cocoa/apple_image.h | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'cocoa/apple_image.h') diff --git a/cocoa/apple_image.h b/cocoa/apple_image.h index 1611cf52a..5d329c1c5 100644 --- a/cocoa/apple_image.h +++ b/cocoa/apple_image.h @@ -20,34 +20,18 @@ #ifndef _NETSURF_COCOA_APPLE_IMAGE_H_ #define _NETSURF_COCOA_APPLE_IMAGE_H_ -#ifdef WITH_APPLE_IMAGE - -#ifdef WITH_JPEG -#error "Don't define WITH_JPEG and WITH_APPLE_IMAGE" -#endif - #include "utils/config.h" -#include "desktop/plot_style.h" - -struct bitmap; -struct content; -struct rect; +#include "utils/errors.h" -struct content_apple_image_data { -}; +#ifdef WITH_APPLE_IMAGE -bool apple_image_convert(struct content *c); -void apple_image_destroy(struct content *c); +nserror apple_image_init(void); +void apple_image_fini(void); -bool apple_image_redraw(struct content *c, int x, int y, - int width, int height, const struct rect *clip, - float scale, colour background_colour); -bool apple_image_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); +#else -bool apple_image_clone(const struct content *old, struct content *new_content); +#define apple_image_init() NSERROR_OK +#define apple_image_fini() ((void) 0) #endif /* WITH_APPLE_IMAGE */ -- cgit v1.2.3