From d6a8216e111cef129eaf1cc60ba6c8398cbd1c73 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 23 Jun 2008 11:58:48 +0000
Subject: [PATCH] - Applied patch from upstream to fix box_fill_path for shfill
 (bug     #452348).

---
 ghostscript-r8591.patch | 26 ++++++++++++++++++++++++++
 ghostscript.spec        |  7 +++++++
 2 files changed, 33 insertions(+)
 create mode 100644 ghostscript-r8591.patch

diff --git a/ghostscript-r8591.patch b/ghostscript-r8591.patch
new file mode 100644
index 0000000..3b78af1
--- /dev/null
+++ b/ghostscript-r8591.patch
@@ -0,0 +1,26 @@
+diff -up ghostscript-8.62/src/gdevbbox.c.r8591 ghostscript-8.62/src/gdevbbox.c
+--- ghostscript-8.62/src/gdevbbox.c.r8591	2007-09-25 14:31:24.000000000 +0100
++++ ghostscript-8.62/src/gdevbbox.c	2008-06-23 12:56:33.000000000 +0100
+@@ -755,7 +755,21 @@ bbox_fill_path(gx_device * dev, const gs
+ 	 dev_proc(tdev, fill_path));
+     int code;
+ 
+-    if (!GX_DC_IS_TRANSPARENT(pdevc, bdev) && !gx_path_is_void(ppath)) {
++    if (ppath == NULL) {
++	/* A special handling of shfill with no path. */
++	gs_fixed_rect ibox;
++	gs_fixed_point adjust;
++
++	if (pcpath == NULL)
++	    return 0;
++	gx_cpath_inner_box(pcpath, &ibox);
++	adjust = params->adjust;
++	if (params->fill_zero_width)
++	    gx_adjust_if_empty(&ibox, &adjust);
++	adjust_box(&ibox, adjust);
++	BBOX_ADD_RECT(bdev, ibox.p.x, ibox.p.y, ibox.q.x, ibox.q.y);
++	return 0;
++    } else if (!GX_DC_IS_TRANSPARENT(pdevc, bdev) && !gx_path_is_void(ppath)) {
+ 	gs_fixed_rect ibox;
+ 	gs_fixed_point adjust;
+ 
diff --git a/ghostscript.spec b/ghostscript.spec
index 8624fa1..a00bf79 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -21,6 +21,7 @@ Patch4: ghostscript-fPIC.patch
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
+Patch8: ghostscript-r8591.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -96,6 +97,9 @@ rm -rf libpng zlib jpeg jasper
 # Fix pksmraw output (bug #308211).
 %patch7 -p1 -b .pksmraw
 
+# Applied patch from upstream to fix box_fill_path for shfill (bug #452348).
+%patch8 -p1 -b .r8591
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -269,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Jun 23 2008 Tim Waugh <twaugh@redhat.com>
+- Applied patch from upstream to fix box_fill_path for shfill (bug #452348).
+
 * Mon Mar 31 2008 Tim Waugh <twaugh@redhat.com> 8.62-3
 - Fix pksmraw output (bug #308211).