Fix some more issues with cupstestppd, and remove prc_5_110x220mm from the PWG

media list since it is a duplicate of iso_dl_110x220mm.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10743 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/pwg-media.c b/cups/pwg-media.c
index a1ec90028fc7abcd1e693aeac9c08e7fedbeae78..5802b84a10519d6b249fd2b56de1f0ee798f6341 100644 (file)
--- a/cups/pwg-media.c
+++ b/cups/pwg-media.c
@@ -225,7 +225,6 @@ static _pwg_media_t const cups_pwg_media[] =
   _PWG_MEDIA_MM("prc_1_102x165mm", NULL, "EnvPRC1", 102, 165),
   _PWG_MEDIA_MM("prc_2_102x176mm", NULL, "EnvPRC2", 102, 176),
   _PWG_MEDIA_MM("prc_4_110x208mm", NULL, "EnvPRC4", 110, 208),
-  _PWG_MEDIA_MM("prc_5_110x220mm", NULL, "EnvPRC5", 110, 220),
   _PWG_MEDIA_MM("prc_8_120x309mm", NULL, "EnvPRC8", 120, 309),
   _PWG_MEDIA_MM("prc_6_120x320mm", NULL, NULL, 120, 320),
   _PWG_MEDIA_MM("prc_3_125x176mm", NULL, "EnvPRC3", 125, 176),

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index b39c93ae16fd8b76bc4bfb2802362820a03272ae..9487fe8d3489ae3aa6ad431efa39635c2e7de94f 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -3238,6 +3238,8 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
             snprintf(buf, sizeof(buf), "%s.Transverse", pwg_media->ppd);
           else
             snprintf(buf, sizeof(buf), "%sRotated", pwg_media->ppd);
+
+         ppdlen = strlen(buf);
         }
 
         if (size->left == 0 && size->bottom == 0 &&
@@ -3306,7 +3308,7 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
         length_tmp = (fabs(size->length - ceil(size->length)) < 0.1) ?
                         ceil(size->length) : size->length;
 
-        if (fmod(width_tmp, 18.0) == 0.0 || fmod(length_tmp, 18.0) == 0.0)
+        if (fmod(width_tmp, 9.0) == 0.0 && fmod(length_tmp, 9.0) == 0.0)
         {
           width_inch  = width_tmp / 72.0;
           length_inch = length_tmp / 72.0;