jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Fix ImageMagick header path

Browse Source 
Since ImageMagick 7, the header path has been changed.  This commit
implements a check for the version being used, and includes the
header as is appropriate.

Special thanks to Hu.

Mantis-Bug: https://obsproject.com/mantis/view.php?id=966

Gentoo-Bug: https://bugs.gentoo.org/627520

Closes jp9000/obs-studio#1018
This commit is contained in:
Jimi Huotari
2017-09-05 23:30:24 +03:00
committed by jp9000
parent 1ef4de7ce3
commit fef71c4b7c
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/graphics/graphics-magick.c
View File

@@ -1,8 +1,14 @@
#include "graphics.h"
#include "obsconfig.h"
#define MAGICKCORE_QUANTUM_DEPTH 16
#define MAGICKCORE_HDRI_ENABLE 0
#if LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_6L
#include <magick/MagickCore.h>
#elif LIBOBS_IMAGEMAGICK_DIR_STYLE == LIBOBS_IMAGEMAGICK_DIR_STYLE_7GE
#include <MagickCore/MagickCore.h>
#endif
void gs_init_image_deps()
{