From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 13 May 2013 16:36:57 +0000 (+0000)
Subject: <rdar://problem/ 13493241> APVT3.0 checks a custom size using a 1/100mm smaller size
X-Git-Tag: release-1.7rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c6ec2104df6ee54bfd4f5ef017a5dac93172e1;p=thirdparty%2Fcups.git

<rdar://problem/ 13493241> APVT3.0 checks a custom size using a 1/100mm smaller size


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10976 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index b1d718471f..26151353d4 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.6.3
 
 	- The configure script now prefers Clang over GCC.
 	- Fixed a compile problem on AIX (STR #4307)
+	- Fixed a rounding error in the PWG media size mapping code
+	  (<rdar://problem/13493241>)
 	- Fixed several ipptool test files that used old STATUS names.
 	- Kerberos credentials could get truncated when printing to a shared
 	  printer.
diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index cd392ef980..1272e76178 100644
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -868,13 +868,13 @@ pwgMediaForPWG(const char *pwg)		/* I - PWG size name */
 
 	if (!strcmp(ptr, "mm"))
 	{
-	  size->width  = (int)(w * 100);
-	  size->length = (int)(l * 100);
+	  size->width  = (int)(w * 100 + 0.5);
+	  size->length = (int)(l * 100 + 0.5);
 	}
 	else
 	{
-	  size->width  = (int)(w * 2540);
-	  size->length = (int)(l * 2540);
+	  size->width  = (int)(w * 2540 + 0.5);
+	  size->length = (int)(l * 2540 + 0.5);
 	}
 
         strlcpy(cg->pwg_name, pwg, sizeof(cg->pwg_name));