summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-09 08:18:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-09 08:18:45 +0000
commit42a2fc7afde5fd33015f696d08be7d03de1201bd (patch)
tree6cac6a8fc3c82e42a0259df1b4d89acf24cf6120
parent59951874ad4813b18c04011270ff5fdaa163a7bb (diff)
luatex: Bug fix from Akira
git-svn-id: svn://tug.org/texlive/trunk@32367 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writet3.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfpage.w4
3 files changed, 8 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index cd0f053611a..201ddbf2d8c 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-08 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * font/writet3.w: More cast arg2 of setpdffloat to int64_t.
+ * pdf/pdfpage.w: Fix i32round() => i64round().
+
2013-12-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* lua/liolibext.c: Large files in lua.
diff --git a/Build/source/texk/web2c/luatexdir/font/writet3.w b/Build/source/texk/web2c/luatexdir/font/writet3.w
index 4067205b28f..e2d8e597dfa 100644
--- a/Build/source/texk/web2c/luatexdir/font/writet3.w
+++ b/Build/source/texk/web2c/luatexdir/font/writet3.w
@@ -279,7 +279,7 @@ void writet3(PDF pdf, internal_font_number f)
get_pk_font_scale(f, pdf->decimal_digits, pdf->pk_scale_factor);
pdf_add_name(pdf, "FontMatrix");
pdf_begin_array(pdf);
- setpdffloat(pf, pk_font_scale, 5);
+ setpdffloat(pf, (int64_t) pk_font_scale, 5);
print_pdffloat(pdf, pf);
pdf_puts(pdf, " 0 0 ");
print_pdffloat(pdf, pf);
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
index 1eab44418fe..0b05d6a354e 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
@@ -127,7 +127,7 @@ boolean calc_pdfpos(pdfstructure * p, scaledpos pos)
new.h =
i32round((pos.h * p->k1 - (double) p->pdf_tj_pos.h.m) * p->k2);
new.v = i32round(pos.v * p->k1);
- p->tj_delta.m = -i32round((double)
+ p->tj_delta.m = -i64round((double)
((new.h - p->cw.m) / ten_pow[p->cw.e -
p->tj_delta.
e]));
@@ -140,7 +140,7 @@ boolean calc_pdfpos(pdfstructure * p, scaledpos pos)
new.v =
i32round(((double) p->pdf_tj_pos.v.m - pos.v * p->k1) * p->k2);
p->tm[4].m = new.h - p->pdf_bt_pos.h.m; /* p->tm[5] is meaningless */
- p->tj_delta.m = -i32round((double)
+ p->tj_delta.m = -i64round((double)
((new.v - p->cw.m) / ten_pow[p->cw.e -
p->tj_delta.
e]));