diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-05-06 20:40:09 +0000 |
commit | e71691bae890040b83cfd54a2d9a1097d5026866 (patch) | |
tree | 96b2680dc6559ca0ab88fa0b6a533c13b7c9487e /image/png.h | |
parent | e77b1a29550e4753f771848705975295a6ebe99e (diff) | |
download | netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.gz netsurf-e71691bae890040b83cfd54a2d9a1097d5026866.tar.bz2 |
Merge branches/jmb/content-factory to trunk
svn path=/trunk/netsurf/; revision=12283
Diffstat (limited to 'image/png.h')
-rw-r--r-- | image/png.h | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/image/png.h b/image/png.h index fb9efcfd4..1119b6a43 100644 --- a/image/png.h +++ b/image/png.h @@ -24,37 +24,17 @@ #ifdef WITH_PNG -#include "desktop/plot_style.h" - #include <stdbool.h> -#include <png.h> - -struct content; -struct bitmap; -struct http_parameter; -struct rect; - -struct content_png_data { - png_structp png; - png_infop info; - int interlace; - struct bitmap *bitmap; /**< Created NetSurf bitmap */ - size_t rowstride, bpp; /**< Bitmap rowstride and bpp */ - size_t rowbytes; /**< Number of bytes per row */ -}; - -bool nspng_create(struct content *c, const struct http_parameter *params); -bool nspng_process_data(struct content *c, const char *data, unsigned int size); -bool nspng_convert(struct content *c); -void nspng_destroy(struct content *c); -bool nspng_redraw(struct content *c, int x, int y, - int width, int height, const struct rect *clip, - float scale, colour background_colour); -bool nspng_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 nspng_clone(const struct content *old, struct content *new_content); + +#include "utils/errors.h" + +nserror nspng_init(void); +void nspng_fini(void); + +#else + +#define nspng_init() NSERROR_OK +#define nspng_fini() ((void) 0) #endif |