Check for bad resolution options (NNNNNNNNdpi instead of NNNNxNNNNdpi).

Don't localize the Japanese home page since it no longer exists (for now).

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

diff --git a/CHANGES-1.3.txt b/CHANGES-1.3.txt
index 378e257208a8484c0681d4e6f4848caf4cff097b..ff1cb86fd3922266ee79a2b8e0aeab3b25c55b2c 100644 (file)
--- a/CHANGES-1.3.txt
+++ b/CHANGES-1.3.txt
@@ -5,6 +5,9 @@ CHANGES-1.3.txt
 CHANGES IN CUPS V1.3.1
 
        - Documentation updates.
+       - The cupstestppd utility now tests for resolutions greater
+         than 99999 DPI to detect a missing  "x" between the X and Y
+         resolutions.
        - Fixed many problems in the various translations and added
          a new "checkpo" utility to validate them.
        - The cupstestppd utility now tests the custom page size code

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 60b295b676d67881b1ed4c7cea6c493153ceeb5e..4ac4eba44ae8bef053e7441e0aa591c4567bb313 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -981,7 +981,8 @@ main(int  argc,                             /* I - Number of command-line args */
          else
            ydpi = xdpi;
 
-         if (xdpi <= 0 || ydpi <= 0 || strcmp(ptr, "dpi"))
+         if (xdpi <= 0 || xdpi > 99999 || ydpi <= 0 || ydpi > 99999 ||
+             strcmp(ptr, "dpi"))
          {
            if (verbose >= 0)
            {

diff --git a/tools/testosx b/tools/testosx
index 53d3ec2cdcaf09752ca7867235d5a4e878da6254..fe44a364ccc2eec84e9295a237fc7af4b058b127 100755 (executable)
--- a/tools/testosx
+++ b/tools/testosx
@@ -95,7 +95,7 @@ esac
 
 # Tag the current revision in the plist and web interface files...
 for file in packaging/cups-desc.plist packaging/cups-info.plist \
-               doc/index.html doc/ja/index.html templates/header.tmpl; do
+               doc/index.html templates/header.tmpl; do
        echo Updating $file...
        sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
                -e '1,$s/@CUPS_REVISION@//g' \