imagetoraster: Rotate image to fit output page best.

OpenPrinting · Aug 25, 2019 · 41e5626 · 41e5626
1 parent 106d3d9
commit 41e5626
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -3,6 +3,8 @@ NEWS - OpenPrinting CUPS Filters v1.25.3 - 2019-08-21
 
 CHANGES IN V1.25.4
 
+	- imagetoraster: Rotate image to fit output page best (Issue
+          #145).
 	- imagetoraster: Do not try to call imagetops and pstoraster
 	  any more but imagetopdf and pdftoraster instead, as the
 	  former filters do not exist any more.

diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c
@@ -717,7 +717,7 @@ main(int  argc,				/* I - Number of command-line arguments */
   }
   if(tempOrientation==0)
   {
-    if(min(pw,w)*min(ph,h)<min(pw,h)*min(ph,w))
+    if(((pw > ph) && (w < h)) || ((pw < ph) && (w > h)))
     {
       tempOrientation = 4;
     }
@@ -825,7 +825,7 @@ main(int  argc,				/* I - Number of command-line arguments */
       }
       if(tempOrientation==0)
       {
-        if(min(pw,w)*min(ph,h)<min(pw,h)*min(ph,w))
+        if(((pw > ph) && (w < h)) || ((pw < ph) && (w > h)))
         {
           int temp = pw;
           pw = ph;