diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2008-09-15 22:45:44 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2008-09-15 22:45:44 +0000 |
| commit | 385d274f5b67a0db54929e204945fed129bc0730 (patch) | |
| tree | af28013a9890082309d8f659a57397a0efb50e06 /render | |
| parent | d9c7f033e6d6a6914fc4523cbc3226d448cdf6cf (diff) | |
| download | netsurf-385d274f5b67a0db54929e204945fed129bc0730.tar.gz netsurf-385d274f5b67a0db54929e204945fed129bc0730.tar.bz2 | |
A bunch of fixes to the libpng binding
svn path=/trunk/netsurf/; revision=5338
Diffstat (limited to 'render')
| -rw-r--r-- | render/box.c | 4 | ||||
| -rw-r--r-- | render/box_construct.c | 4 | ||||
| -rw-r--r-- | render/html.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/render/box.c b/render/box.c index ef8b43310..1d72da607 100644 --- a/render/box.c +++ b/render/box.c @@ -789,8 +789,10 @@ bool box_duplicate_main_tree(struct box *box, struct content *c, int *count) box->object->type == CONTENT_BMP || box->object->type == CONTENT_ICO || #endif -#ifdef WITH_MNG +#if defined(WITH_MNG) || defined(WITH_PNG) box->object->type == CONTENT_PNG || +#endif +#ifdef WITH_MNG box->object->type == CONTENT_JNG || box->object->type == CONTENT_MNG || #endif diff --git a/render/box_construct.c b/render/box_construct.c index 8df7ba016..29acfde11 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -62,8 +62,10 @@ static const content_type image_types[] = { #ifdef WITH_BMP CONTENT_BMP, #endif -#ifdef WITH_MNG +#if defined(WITH_MNG) || defined(WITH_PNG) CONTENT_PNG, +#endif +#ifdef WITH_MNG CONTENT_JNG, CONTENT_MNG, #endif diff --git a/render/html.c b/render/html.c index 627e39c4c..3e7779917 100644 --- a/render/html.c +++ b/render/html.c @@ -613,7 +613,7 @@ bool html_process_data(struct content *c, char *data, unsigned int size) } #ifdef WITH_HUBBUB - LOG(("Parsing %d bytes", (size - x))); + LOG(("Parsing %lu bytes", (size - x))); err = hubbub_parser_parse_chunk( c->data.html.parser, (uint8_t *) data + x, (size - x)); @@ -1679,7 +1679,6 @@ void html_convert_css_callback(content_msg msg, struct content *css, * \param available_width estimate of width of object * \param available_height estimate of height of object * \param background this is a background image - * \param frame name of frame, or 0 if not a frame (copied) * \return true on success, false on memory exhaustion */ |