imagemagick7.patch

   1 diff -ur pstoedit-3.70/configure.ac pstoedit-3.70-im7/configure.ac
   2 --- pstoedit-3.70/configure.ac  2014-12-28 21:39:18.000000000 +0100
   3 +++ pstoedit-3.70-im7/configure.ac      2016-12-25 22:16:29.147826432 +0100
   4 @@ -299,7 +299,7 @@
   5  else
   6        if test -n "$PKG_CONFIG"; then
   7          AC_MSG_CHECKING(ImageMagick flags through pkg-config)
   8 -       PKG_CHECK_MODULES(LIBMAGICK, ImageMagick++,
   9 +       PKG_CHECK_MODULES(LIBMAGICK, Magick++,
  10                 HAVE_LIBMAGICK=yes
  11                 LIBMAGICK_CFLAGS="-DHAVE_MAGIC $LIBMAGICK_CFLAGS"
  12                 LIBMAGICK_LDFLAGS="$LIBMAGICK_LIBS" ,
  13 diff -ur pstoedit-3.70/src/drvmagick++.cpp pstoedit-3.70-im7/src/drvmagick++.cpp
  14 --- pstoedit-3.70/src/drvmagick++.cpp   2015-01-01 18:05:33.000000000 +0100
  15 +++ pstoedit-3.70-im7/src/drvmagick++.cpp       2016-12-26 23:26:10.491193646 +0100
  16 @@ -120,14 +120,14 @@
  17                 const basedrawingelement & elem = pathElement(n);
  18                 switch (elem.getType()) {
  19                 case moveto:{
  20 -                               const Point & p = elem.getPoint(0);
  21 +                                   const ::Point & p = elem.getPoint(0);
  22                                 const Magick::Coordinate coord(p.x_ + x_offset,
  23                                                                                            currentDeviceHeight - p.y_ + y_offset);
  24                                 vpath.push_back(PathMovetoAbs(coord));
  25                         }
  26                         break;
  27                 case lineto:{
  28 -                               const Point & p = elem.getPoint(0);
  29 +                                   const ::Point & p = elem.getPoint(0);
  30                                 const Magick::Coordinate coord(p.x_ + x_offset,
  31                                                                                            currentDeviceHeight - p.y_ + y_offset);
  32                                 vpath.push_back(PathLinetoAbs(coord));
  33 @@ -137,9 +137,9 @@
  34                         vpath.push_back(PathClosePath());
  35                         break;
  36                 case curveto:{
  37 -                               const Point & p0 = elem.getPoint(0);
  38 -                               const Point & p1 = elem.getPoint(1);
  39 -                               const Point & p2 = elem.getPoint(2);
  40 +                                    const ::Point & p0 = elem.getPoint(0);
  41 +                                    const ::Point & p1 = elem.getPoint(1);
  42 +                                    const ::Point & p2 = elem.getPoint(2);
  43                                 vpath.
  44                                         push_back(PathCurvetoAbs
  45                                                           (PathCurvetoArgs
  46 @@ -278,7 +278,7 @@
  47                         dasharray[i] = d_numbers[i];
  48                 }
  49                 dasharray[dp.nrOfEntries] = 0;  // mark last element
  50 -               drawList.push_back(DrawableDashArray(dasharray));       // pulls a copy, so we are the owner of dasharray
  51 +               drawList.push_back(DrawableStrokeDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray
  52  //??    DrawableDashOffset
  53                 delete[]dasharray;
  54         }
  55 @@ -300,7 +300,9 @@
  56  #ifndef onedrawlist
  57         drawList.push_back(DrawablePopGraphicContext());
  58         // Draw everything using completed drawing list
  59 -       imageptr->draw(drawList);
  60 +       std::vector<Magick::Drawable> drawVect;
  61 +       copy(drawList.begin(),drawList.end(),back_inserter(drawVect));
  62 +       imageptr->draw(drawVect);
  63  #endif
  64
  65  }