From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Wed, 14 Dec 2016 20:44:59 +0000 (-0500)
Subject: One more fix for asymmetric resolutions (Issue #4934)
X-Git-Tag: v2.2.2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10887d272a7edfbb774bc8173419b2281fe80aae;p=thirdparty%2Fcups.git

One more fix for asymmetric resolutions (Issue #4934)
---

diff --git a/filter/raster.c b/filter/raster.c
index febc0400b7..905a6628bd 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1111,6 +1111,8 @@ cupsRasterWriteHeader2(
     */
 
     unsigned char appleheader[32];	/* Raw page header */
+    unsigned height = r->header.cupsHeight * r->rowheight;
+					/* Computed page height */
 
     if (r->apple_page_count == 0xffffffffU)
     {
@@ -1146,10 +1148,10 @@ cupsRasterWriteHeader2(
     appleheader[13] = (unsigned char)(r->header.cupsWidth >> 16);
     appleheader[14] = (unsigned char)(r->header.cupsWidth >> 8);
     appleheader[15] = (unsigned char)(r->header.cupsWidth);
-    appleheader[16] = (unsigned char)(r->header.cupsHeight >> 24);
-    appleheader[17] = (unsigned char)(r->header.cupsHeight >> 16);
-    appleheader[18] = (unsigned char)(r->header.cupsHeight >> 8);
-    appleheader[19] = (unsigned char)(r->header.cupsHeight);
+    appleheader[16] = (unsigned char)(height >> 24);
+    appleheader[17] = (unsigned char)(height >> 16);
+    appleheader[18] = (unsigned char)(height >> 8);
+    appleheader[19] = (unsigned char)(height);
     appleheader[20] = (unsigned char)(r->header.HWResolution[0] >> 24);
     appleheader[21] = (unsigned char)(r->header.HWResolution[0] >> 16);
     appleheader[22] = (unsigned char)(r->header.HWResolution[0] >> 8);