0002780: Include image headers conditionally

View Issue Details [ Jump to Notes ]

[ Issue History ] [ Print ]

Project

Tags

No tags attached.

Fixed in CI build #

Reported in CI build #

URL of problem page

Attached Files

netsurf-3.9-conditionally-include-image-headers.patch (775 bytes) 2020-06-18 23:21

diff -rup a/content/handlers/image/image.c b/content/handlers/image/image.c
--- a/content/handlers/image/image.c	2019-07-17 10:28:13.000000000 +0000
+++ b/content/handlers/image/image.c	2019-09-27 15:09:03.860000000 +0000
@@ -27,15 +27,31 @@
 #include "netsurf/content.h"
 #include "desktop/gui_internal.h"

+#ifdef WITH_BMP
 #include "image/bmp.h"
+#endif
+#ifdef WITH_GIF
 #include "image/gif.h"
+#endif
 #include "image/ico.h"
+#ifdef WITH_JPEG
 #include "image/jpeg.h"
+#endif
+#ifdef WITH_NSSPRITE
 #include "image/nssprite.h"
+#endif
+#ifdef WITH_PNG
 #include "image/png.h"
+#endif
+#ifdef WITH_RSVG
 #include "image/rsvg.h"
+#endif
+#ifdef WITH_NS_SVG
 #include "image/svg.h"
+#endif
+#ifdef WITH_WEBP
 #include "image/webp.h"
+#endif
 #include "image/image.h"

 /**

netsurf-3.9-conditionally-include-image-headers.patch (775 bytes) 2020-06-18 23:21

Relationships

Relationships

Notes

~0002290

Vincent Sanders (administrator)

2020-09-18 08:11

Thank you for submitting this patch for consideration

Unfortunately there is no need for this patch.

The headers made conditional in the patch are *purely* internal interfaces which require no additional libraries to have included.

The *calls* to those functions and implementation are already conditional depending on the configured image libraries.

Notes

Date Modified	Username	Field	Change
Issue History
2020-06-18 23:21	Michael Orlitzky	New Issue
2020-06-18 23:21	Michael Orlitzky	File Added: netsurf-3.9-conditionally-include-image-headers.patch
2020-09-18 08:11	Vincent Sanders	Status	new => closed
2020-09-18 08:11	Vincent Sanders	Resolution	open => no change required
2020-09-18 08:11	Vincent Sanders	Note Added: 0002290

Issue History