texlive[49499] Build/source/texk/web2c/xetexdir: Simplify the support

[commits+kakuto at tug.org]

Revision: 49499
          http://tug.org/svn/texlive?view=revision&revision=49499
Author:   kakuto
Date:     2018-12-25 05:04:10 +0100 (Tue, 25 Dec 2018)
Log Message:
-----------
Simplify the support of Rotate.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/xetexdir/ChangeLog
    trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp

Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog	2018-12-25 01:23:25 UTC (rev 49498)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog	2018-12-25 04:04:10 UTC (rev 49499)
@@ -1,3 +1,7 @@
+2018-12-25  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	* pdfimage.cpp: Simplify the support of Rotate.
+
 2018-12-24  Stefan Br\"uns  <stefan.bruens at rwth-aachen.de>
 
 	* pdfimage.cpp: Avoid modification of internal poppler object,

Modified: trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp	2018-12-25 01:23:25 UTC (rev 49498)
+++ trunk/Build/source/texk/web2c/xetexdir/pdfimage.cpp	2018-12-25 04:04:10 UTC (rev 49499)
@@ -1,7 +1,7 @@
 /****************************************************************************\
  Part of the XeTeX typesetting system
  Copyright (c) 1994-2008 by SIL International
- Copyright (c) 2009, 2017 by Jonathan Kew
+ Copyright (c) 2009, 2018 by Jonathan Kew
 
  SIL Author(s): Jonathan Kew
 
@@ -98,34 +98,20 @@
 			break;
 	}
 
-	PDFRectangle r2 = *r;
 	int RotAngle = 0;
 	RotAngle = (int)page->getRotate() % 360;
 	if (RotAngle < 0)
 		RotAngle += 360;
 	if (RotAngle == 90 || RotAngle == 270) {
-		double tmpvalue;
-		if (r2.x1 > r2.x2) {
-			tmpvalue = r2.x1;
-			r2.x1 = r2.x2;
-			r2.x2 = tmpvalue;
-		}
-		if (r2.y1 > r2.y2) {
-			tmpvalue = r2.y1;
-			r2.y1 = r2.y2;
-			r2.y2 = tmpvalue;
-		}
-
-		tmpvalue = r2.x2;
-		r2.x2 = r2.x1 + r2.y2 - r2.y1;
-		r2.y2 = r2.y1 + tmpvalue - r2.x1;
+		box->wd = 72.27 / 72 * fabs(r->y2 - r->y1);
+		box->ht = 72.27 / 72 * fabs(r->x2 - r->x1);
+	} else {
+		box->wd = 72.27 / 72 * fabs(r->x2 - r->x1);
+		box->ht = 72.27 / 72 * fabs(r->y2 - r->y1);
 	}
+	box->x  = 72.27 / 72 * my_fmin(r->x1, r->x2);
+	box->y  = 72.27 / 72 * my_fmin(r->y1, r->y2);
 
-	box->x  = 72.27 / 72 * my_fmin(r2.x1, r2.x2);
-	box->y  = 72.27 / 72 * my_fmin(r2.y1, r2.y2);
-	box->wd = 72.27 / 72 * fabs(r2.x2 - r2.x1);
-	box->ht = 72.27 / 72 * fabs(r2.y2 - r2.y1);
-
 	delete doc;
 
 	return 0;