blob: 9f9e3a0b301648dca3644dbd669b2c8916da0c15 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- dvdauthor/src/subgen-image.c
+++ dvdauthor/src/subgen-image.c
@@ -30,7 +30,7 @@
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
#include <stdarg.h>
-#include <magick/api.h>
+#include <MagickWand/MagickWand.h>
#else
#include <png.h>
#endif
@@ -181,7 +181,8 @@
unsigned long magickver;
unsigned char amask;
- GetExceptionInfo(&ei);
+ ExceptionInfo *exception_info;
+ exception_info = AcquireExceptionInfo();
ii=CloneImageInfo(NULL);
strcpy(ii->filename,s->fname);
im=ReadImage(ii,&ei);
@@ -1098,13 +1099,13 @@
void image_init()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- InitializeMagick(NULL);
+ MagickCoreGenesis("", MagickFalse);
#endif
}
void image_shutdown()
{
#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- DestroyMagick();
+ MagickCoreTerminus();
#endif
}
|
