summaryrefslogtreecommitdiffstats
path: root/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-11-12 14:55:24 +0100
committer Eric Hameleers <alien@slackware.com>2019-11-12 14:55:24 +0100
commit23cb90a06c856a9467862678c4870cb94f176c55 (patch)
treee18be37c814c91f1b0eeb8768615ad5052d53ffd /deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch
parentffe42649d1a7f108389ff2204d8f75bae44ed824 (diff)
downloadktown-23cb90a06c856a9467862678c4870cb94f176c55.tar.gz
ktown-23cb90a06c856a9467862678c4870cb94f176c55.tar.xz
Deps: update/recompile QScintilla and dvdauthor
Diffstat (limited to '')
-rw-r--r--deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch b/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch
new file mode 100644
index 0000000..0f6bed4
--- /dev/null
+++ b/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch
@@ -0,0 +1,75 @@
+--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100
++++ dvdauthor/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100
+@@ -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
+@@ -176,18 +176,18 @@
+ {
+ Image *im;
+ ImageInfo *ii;
+- ExceptionInfo ei;
++ ExceptionInfo *ei;
+ int x,y;
+ unsigned long magickver;
+ unsigned char amask;
+
+- GetExceptionInfo(&ei);
++ ei = AcquireExceptionInfo();
+ ii=CloneImageInfo(NULL);
+ strcpy(ii->filename,s->fname);
+- im=ReadImage(ii,&ei);
++ im=ReadImage(ii,ei);
+
+ if( !im ) {
+- MagickError(ei.severity,"Unable to load file",ii->filename);
++ MagickError(ei->severity,"Unable to load file",ii->filename);
+ return -1;
+ }
+
+@@ -202,10 +202,10 @@
+ for( y=0; y<im->rows; y++ ) {
+ char pdata[MAXX*4];
+
+- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+- fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
+- CatchException(&ei);
+- MagickError(ei.severity,ei.reason,ei.description);
++ if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++ fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
++ CatchException(ei);
++ MagickError(ei->severity,ei->reason,ei->description);
+ DestroyImage(im);
+ return -1;
+ }
+@@ -219,7 +219,7 @@
+ }
+ }
+ DestroyImage(im);
+- DestroyExceptionInfo(&ei);
++ DestroyExceptionInfo(ei);
+ fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+
+ return 0;
+@@ -1098,13 +1098,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
+ }
+