gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 01:12:30 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: Compile with either ImageMagick 6 and 7

Browse Source 
We dropped ImageMagick 6 support in 0.95.9.  However, ImageMagick 6 is
still widespread (e.g., ImageMagick 7 has not been packaged in Debian
yet), and upstream plans on maintaining it until at least 2028 [1].

In this patch, we detect the version of the MagickWand library installed
on the user's system and include the appropriate header file when
building wrlib.

Note: I've only tested this with ImageMagick 6, so I'd appreciate
confirmation that it works with ImageMagick 7.

[1] https://github.com/ImageMagick/ImageMagick6/blob/master/NEWS.txt
This commit is contained in:
Doug Torrance
2020-04-18 14:28:40 -04:00
committed by Carlos R. Mafra
parent 27dc5efd2e
commit dfa92906c0
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wrlib/load_magick.c
View File

@@ -22,7 +22,11 @@
#include "config.h"
#if USE_MAGIC < 7
#include <wand/magick_wand.h>
#else
#include <MagickWand/MagickWand.h>
#endif
#include "wraster.h"
#include "imgformat.h"