Attachment 24021 Details for Bug 20702 – second version of patch

[patch] second version of patch

poppler-non-square-pixels.patch (text/plain), 3.60 KB, created by Michael K. Johnson on 2009-03-18 19:28:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael K. Johnson

Created: 2009-03-18 19:28:42 UTC

Size: 3.60 KB

patch

obsolete

>diff --git a/utils/pdftoppm.1 b/utils/pdftoppm.1
>index e6497a9..5ad95ed 100644
>--- a/utils/pdftoppm.1
>+++ b/utils/pdftoppm.1
>@@ -30,10 +30,22 @@ Specifies the first page to convert.
> Specifies the last page to convert.
> .TP
> .BI \-r " number"
>-Specifies the resolution, in DPI.  The default is 150 DPI.
>+Specifies the X and Y resolution, in DPI.  The default is 150 DPI.
>+.TP
>+.BI \-rx " number"
>+Specifies the X resolution, in DPI.  The default is 150 DPI.
>+.TP
>+.BI \-ry " number"
>+Specifies the Y resolution, in DPI.  The default is 150 DPI.
> .TP
> .BI \-scale-to " number"
>-Scales each page to fit in scale-to*scale-to box
>+Scales each page to fit in scale-to*scale-to pixel box.
>+.TP
>+.BI \-scale-to-x " number"
>+Scales each page horizontally to fit in scale-to-x pixels.
>+.TP
>+.BI \-scale-to-y " number"
>+Scales each page vertically to fit in scale-to-y pixels.
> .TP
> .BI \-x " number"
> Specifies the x-coordinate of the crop area top left corner
>diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
>index de37b7d..88d8d48 100644
>--- a/utils/pdftoppm.cc
>+++ b/utils/pdftoppm.cc
>@@ -39,8 +39,12 @@
> 
> static int firstPage = 1;
> static int lastPage = 0;
>-static double resolution = 150.0;
>+static double resolution = 0.0;
>+static double x_resolution = 150.0;
>+static double y_resolution = 150.0;
> static int scaleTo = 0;
>+static int x_scaleTo = 0;
>+static int y_scaleTo = 0;
> static int x = 0;
> static int y = 0;
> static int w = 0;
>@@ -66,8 +70,16 @@ static const ArgDesc argDesc[] = {
> 
>   {"-r",      argFP,       &resolution,    0,
>    "resolution, in DPI (default is 150)"},
>+  {"-rx",      argFP,       &x_resolution,    0,
>+   "X resolution, in DPI (default is 150)"},
>+  {"-ry",      argFP,       &y_resolution,    0,
>+   "Y resolution, in DPI (default is 150)"},
>   {"-scale-to",      argInt,       &scaleTo,    0,
>-   "scales each page to fit in scale-to*scale-to box"},
>+   "scales each page to fit within scale-to*scale-to pixel box"},
>+  {"-scale-to-x",      argInt,       &x_scaleTo,    0,
>+   "scales each page horizontally to fit in scale-to-x pixels"},
>+  {"-scale-to-y",      argInt,       &y_scaleTo,    0,
>+   "scales each page vertically to fit in scale-to-y pixels"},
> 
>   {"-x",      argInt,      &x,             0,
>    "x-coordinate of the crop area top left corner"},
>@@ -127,7 +139,7 @@ static void savePageSlice(PDFDoc *doc,
>   w = (x+w > pg_w ? (int)ceil(pg_w-x) : w);
>   h = (y+h > pg_h ? (int)ceil(pg_h-y) : h);
>   doc->displayPageSlice(splashOut, 
>-    pg, resolution, resolution, 
>+    pg, x_resolution, y_resolution, 
>     0,
>     !useCropBox, gFalse, gFalse,
>     x, y, w, h
>@@ -159,6 +171,12 @@ int main(int argc, char *argv[]) {
>   if (mono && gray) {
>     ok = gFalse;
>   }
>+  if ( resolution != 0.0 &&
>+       (x_resolution == 150.0 ||
>+        y_resolution == 150.0)) {
>+    x_resolution = resolution;
>+    y_resolution = resolution;
>+  }
>   if (!ok || argc > 3 || printVersion || printHelp) {
>     fprintf(stderr, "pdftoppm version %s\n", PACKAGE_VERSION);
>     fprintf(stderr, "%s\n", popplerCopyright);
>@@ -250,9 +268,17 @@ int main(int argc, char *argv[]) {
> 
>     if (scaleTo != 0) {
>       resolution = (72.0 * scaleTo) / (pg_w > pg_h ? pg_w : pg_h);
>+      x_resolution = y_resolution = resolution;
>+    } else {
>+      if (x_scaleTo != 0) {
>+        x_resolution = (72.0 * x_scaleTo) / pg_w;
>+      }
>+      if (y_scaleTo != 0) {
>+        y_resolution = (72.0 * y_scaleTo) / pg_h;
>+      }
>     }
>-    pg_w = pg_w * (resolution / 72.0);
>-    pg_h = pg_h * (resolution / 72.0);
>+    pg_w = pg_w * (x_resolution / 72.0);
>+    pg_h = pg_h * (y_resolution / 72.0);
>     if (doc->getPageRotate(pg)) {
>       tmp = pg_w;
>       pg_w = pg_h;

Actions: View | Splinter Review

Attachments on bug 20702: 23944 | 24021

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.