From 90c6ec2104df6ee54bfd4f5ef017a5dac93172e1 Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 13 May 2013 16:36:57 +0000 Subject: [PATCH] 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 --- CHANGES-1.6.txt | 2 ++ cups/pwg-media.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt index b1d718471..26151353d 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 + () - 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 cd392ef98..1272e7617 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)); -- 2.39.2