1 --- dvdauthor/src/subgen-image.c
2 +++ dvdauthor/src/subgen-image.c
3 @@ -30,7 +30,7 @@
4
5 #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
6 #include <stdarg.h>
7 -#include <magick/api.h>
8 +#include <MagickWand/MagickWand.h>
9 #else
10 #include <png.h>
11 #endif
12 @@ -176,18 +176,18 @@
13 {
14 Image *im;
15 ImageInfo *ii;
16 - ExceptionInfo ei;
17 + ExceptionInfo *ei;
18 int x,y;
19 unsigned long magickver;
20 unsigned char amask;
21
22 - GetExceptionInfo(&ei);
23 + ei = AcquireExceptionInfo();
24 ii=CloneImageInfo(NULL);
25 strcpy(ii->filename,s->fname);
26 - im=ReadImage(ii,&ei);
27 + im=ReadImage(ii,ei);
28
29 if( !im ) {
30 - MagickError(ei.severity,"Unable to load file",ii->filename);
31 + MagickError(ei->severity,"Unable to load file",ii->filename);
32 return -1;
33 }
34
35 @@ -202,10 +202,10 @@
36 for( y=0; y<im->rows; y++ ) {
37 char pdata[MAXX*4];
38
39 - if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
40 - fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
41 - CatchException(&ei);
42 - MagickError(ei.severity,ei.reason,ei.description);
43 + if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
44 + fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
45 + CatchException(ei);
46 + MagickError(ei->severity,ei->reason,ei->description);
47 DestroyImage(im);
48 return -1;
49 }
50 @@ -219,7 +219,7 @@
51 }
52 }
53 DestroyImage(im);
54 - DestroyExceptionInfo(&ei);
55 + DestroyExceptionInfo(ei);
56 fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
57
58 return 0;
59 @@ -1098,13 +1098,13 @@
60 void image_init()
61 {
62 #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
63 - InitializeMagick(NULL);
64 + MagickCoreGenesis("", MagickFalse);
65 #endif
66 }
67
68 void image_shutdown()
69 {
70 #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
71 - DestroyMagick();
72 + MagickCoreTerminus();
73 #endif
74 }
|
