svn commit: r376032 - head/graphics/ImageMagick/files

[Koop Mast]

Author: kwm
Date: Thu Jan  1 22:13:39 2015
New Revision: 376032
URL: https://svnweb.freebsd.org/changeset/ports/376032
QAT: https://qat.redports.org/buildarchive/r376032/

Log:
  Fix some rarer build failures, that was hard to reproduce.
  
  Submitted by:	Tobias Berner

Added:
  head/graphics/ImageMagick/files/patch-coders_palm.c   (contents, props changed)
  head/graphics/ImageMagick/files/patch-coders_rle.c   (contents, props changed)

Added: head/graphics/ImageMagick/files/patch-coders_palm.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ImageMagick/files/patch-coders_palm.c	Thu Jan  1 22:13:39 2015	(r376032)
@@ -0,0 +1,11 @@
+--- coders/palm.c	2014-12-25 19:05:34.000000000 +0100
++++ coders/palm.c	2014-12-31 09:38:35.499493971 +0100
+@@ -510,7 +510,7 @@
+       {
+         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
+         if (bits_per_pixel != 16)
+-          SetMagickPixelPacket(image,image->colormap+index,
++          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
+             (const IndexPacket *) NULL,&transpix);
+         (void) TransparentPaintImage(image,&transpix,(Quantum)
+           TransparentOpacity,MagickFalse);

Added: head/graphics/ImageMagick/files/patch-coders_rle.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ImageMagick/files/patch-coders_rle.c	Thu Jan  1 22:13:39 2015	(r376032)
@@ -0,0 +1,20 @@
+--- coders/rle.c.orig	2015-01-01 22:58:53.775440763 +0100
++++ coders/rle.c	2015-01-01 23:00:50.825507571 +0100
+@@ -456,7 +456,7 @@
+             if (IsValidColormapIndex(image,*p & mask,&index,exception) ==
+                 MagickFalse)
+               break;
+-            *p=colormap[index];
++            *p=colormap[(ssize_t)index];
+             p++;
+           }
+         else
+@@ -467,7 +467,7 @@
+                 if (IsValidColormapIndex(image,(size_t) (x*map_length+
+                     (*p & mask)),&index,exception) == MagickFalse)
+                   break;
+-                *p=colormap[index];
++                *p=colormap[(ssize_t)index];
+                 p++;
+               }
+         if ((i < (ssize_t) number_pixels) || (x < (ssize_t) number_planes))