aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2015-01-02 06:13:39 +0800
committerkwm <kwm@FreeBSD.org>2015-01-02 06:13:39 +0800
commitd4562a0e3f6713d9f50a06929ae808a85b9c3fda (patch)
tree10e6e72d1b29922e9d48abe65a8a3da0252e427f /graphics
parentb03bdcad3700b2fd03a961fa13c1993c74c754aa (diff)
downloadfreebsd-ports-graphics-d4562a0e3f6713d9f50a06929ae808a85b9c3fda.tar.gz
freebsd-ports-graphics-d4562a0e3f6713d9f50a06929ae808a85b9c3fda.tar.zst
freebsd-ports-graphics-d4562a0e3f6713d9f50a06929ae808a85b9c3fda.zip
Fix some rarer build failures, that was hard to reproduce.
Submitted by: Tobias Berner
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/files/patch-coders_palm.c11
-rw-r--r--graphics/ImageMagick/files/patch-coders_rle.c20
2 files changed, 31 insertions, 0 deletions
diff --git a/graphics/ImageMagick/files/patch-coders_palm.c b/graphics/ImageMagick/files/patch-coders_palm.c
new file mode 100644
index 00000000000..a5cd0c32f71
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-coders_palm.c
@@ -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);
diff --git a/graphics/ImageMagick/files/patch-coders_rle.c b/graphics/ImageMagick/files/patch-coders_rle.c
new file mode 100644
index 00000000000..184ddb77c96
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-coders_rle.c
@@ -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))