summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-07-28 12:22:19 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-07-28 12:22:19 +0000
commit33d0618b674351e54bab325707ece6c5ba734047 (patch)
treed482ffe455c25dd17e741c3abcf038bdc95a3fde /Build
parentea2cecc22b9678258ec0e4240a5e93055d18c9dc (diff)
texk/dvipdfm-x: Somewhat simplify to avoid compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@37980 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog4
-rw-r--r--Build/source/texk/dvipdfm-x/pdfdoc.c13
2 files changed, 8 insertions, 9 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 9a3a629b31c..42629c91c68 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdfdoc.c: Somewhat simplify to avoid compiler warnings.
+
2015-07-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* epdf.c. pdfdoc.c, pdfobj.h, pdfximage.c, spc_pdfm.c, spc_util.c, xbb.c:
diff --git a/Build/source/texk/dvipdfm-x/pdfdoc.c b/Build/source/texk/dvipdfm-x/pdfdoc.c
index 97eaab4f85a..e6beb5c83ae 100644
--- a/Build/source/texk/dvipdfm-x/pdfdoc.c
+++ b/Build/source/texk/dvipdfm-x/pdfdoc.c
@@ -1185,7 +1185,6 @@ pdf_doc_get_page (pdf_file *pf, long page_no, long *count_p,
*/
if (medbox && PageBox) {
#endif
- double mllx, mlly, murx, mury;
for (i = 4; i--; ) {
double x;
pdf_obj *tmp = pdf_deref_obj(pdf_get_array(medbox, i));
@@ -1195,17 +1194,13 @@ pdf_doc_get_page (pdf_file *pf, long page_no, long *count_p,
}
x = pdf_number_value(tmp);
switch (i) {
- case 0: mllx = x; break;
- case 1: mlly = x; break;
- case 2: murx = x; break;
- case 3: mury = x; break;
+ case 0: if (bbox->llx < x) bbox->llx = x; break;
+ case 1: if (bbox->lly < x) bbox->lly = x; break;
+ case 2: if (bbox->urx > x) bbox->urx = x; break;
+ case 3: if (bbox->ury > x) bbox->ury = x; break;
}
pdf_release_obj(tmp);
}
- if (bbox->llx < mllx) bbox->llx = mllx;
- if (bbox->lly < mlly) bbox->lly = mlly;
- if (bbox->urx > murx) bbox->urx = murx;
- if (bbox->ury > mury) bbox->ury = mury;
}
}