libcupsfilters: Changed the default ppi from 128 to 200

This is for image input files which have no PPI resolution in their metadata and are printed without scaling ("print-scaling=none"). In this case the default resolution is used. Formerly it was set to 128 PPI but we change it to 200 PPI now as many shipping labels come as image files with 200 PPI and so it is easier to print them in their original size. For photos this default value is not important though, as photos are usually printed with scaling ("print-scaling=fill" or "print-scaling=fit").

Pull request #446

(cherry picked from commit 70970df3c78a0a690d3f99597a3a5eec0bce8c02)

diff --git a/cupsfilters/image-bmp.c b/cupsfilters/image-bmp.c
index 4a90cd5f154658f1b983da83343ea641cd808650..c726278fa7e67e755031f015360adb582926408c 100644 (file)
--- a/cupsfilters/image-bmp.c
+++ b/cupsfilters/image-bmp.c
@@ -138,7 +138,7 @@ _cupsImageReadBMP(
   {
     fprintf(stderr, "DEBUG: Bad BMP resolution %dx%d PPI.\n",
             img->xppi, img->yppi);
-    img->xppi = img->yppi = 128;
+    img->xppi = img->yppi = 200;
   }
 
  /*

diff --git a/cupsfilters/image-jpeg.c b/cupsfilters/image-jpeg.c
index 81d9a9d5d1791fd9c430fc1220a13fbcdd2c83d3..caa13b2bad4d1297a5a6c3f501ec2d10d0224dc7 100644 (file)
--- a/cupsfilters/image-jpeg.c
+++ b/cupsfilters/image-jpeg.c
@@ -151,7 +151,7 @@ _cupsImageReadJPEG(
     {
       fprintf(stderr, "DEBUG: Bad JPEG image resolution %dx%d PPI.\n",
               img->xppi, img->yppi);
-      img->xppi = img->yppi = 128;
+      img->xppi = img->yppi = 200;
     }
   }
 

diff --git a/cupsfilters/image-photocd.c b/cupsfilters/image-photocd.c
index 9c1bb440f4d4a07aa166679bd61f93501d340e95..073046ec273246dd229e1987c55f086d4382333d 100644 (file)
--- a/cupsfilters/image-photocd.c
+++ b/cupsfilters/image-photocd.c
@@ -77,8 +77,8 @@ _cupsImageReadPhotoCD(
   */
 
   img->colorspace = (primary == CUPS_IMAGE_RGB_CMYK) ? CUPS_IMAGE_RGB : primary;
-  img->xppi       = 128;
-  img->yppi       = 128;
+  img->xppi       = 200;
+  img->yppi       = 200;
 
   if (rotation)
   {

diff --git a/cupsfilters/image-png.c b/cupsfilters/image-png.c
index 0c5255ece1436ffaac9f2274511185b84c12d938..9eb5618188a05b185b49aec93c60c170e1abe90f 100644 (file)
--- a/cupsfilters/image-png.c
+++ b/cupsfilters/image-png.c
@@ -126,7 +126,7 @@ _cupsImageReadPNG(
       fprintf(stderr, "DEBUG: PNG image has invalid resolution %dx%d PPI\n",
               img->xppi, img->yppi);
 
-      img->xppi = img->yppi = 128;
+      img->xppi = img->yppi = 200;
     }
   }
 

diff --git a/cupsfilters/image-tiff.c b/cupsfilters/image-tiff.c
index 4fd875663ac99ac5937186207d468f22ec985828..b41a87be7b1a37754061f9768a538f348f9af227 100644 (file)
--- a/cupsfilters/image-tiff.c
+++ b/cupsfilters/image-tiff.c
@@ -156,8 +156,8 @@ _cupsImageReadTIFF(
     }
     else
     {
-      img->xppi = 128;
-      img->yppi = 128;
+      img->xppi = 200;
+      img->yppi = 200;
     }
 
     if (img->xppi == 0 || img->yppi == 0)

diff --git a/cupsfilters/image.c b/cupsfilters/image.c
index ac96541be9c959c8103874b675a2ba4d8f7d7ee0..e97dafd78e4bdd9d34b646fd9ee2e15d54955235 100644 (file)
--- a/cupsfilters/image.c
+++ b/cupsfilters/image.c
@@ -347,8 +347,8 @@ cupsImageOpen(
 
   img->cachefile = -1;
   img->max_ics   = CUPS_TILE_MINIMUM;
-  img->xppi      = 128;
-  img->yppi      = 128;
+  img->xppi      = 200;
+  img->yppi      = 200;
 
   if (!memcmp(header, "GIF87a", 6) || !memcmp(header, "GIF89a", 6))
     status = _cupsImageReadGIF(img, fp, primary, secondary, saturation, hue,