summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-15 14:16:09 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-10-15 14:16:09 +0000
commit1bcb57e8de9159123669c32d0f7975aad73f41cd (patch)
tree6dbc8f91860efc8e7c7c1d10e2b0fc6f5c0c7c7b
parenteab9bcd8e4f7743f368e0e50cb44a779de7170c8 (diff)
ps2pkm: Reduce TL vs W32TeX diffs (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@27971 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog6
-rw-r--r--Build/source/texk/ps2pkm/mag.c3
-rw-r--r--Build/source/texk/ps2pkm/t1funcs.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 977e5ecd5a8..3c4a0b12a4f 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Reduce TL vs W32TeX diffs (from Akira).
+ * mag.c [WIN32]: Add '#include <fcntl.h>' for setmode().
+ * t1funcs.c: Add casts to avoid MSVC warnings.
+
2012-08-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* pfb2pfa.c (main): Drop unnecessary nested fatal() prototype.
diff --git a/Build/source/texk/ps2pkm/mag.c b/Build/source/texk/ps2pkm/mag.c
index af27eaa9c51..e31a8272b87 100644
--- a/Build/source/texk/ps2pkm/mag.c
+++ b/Build/source/texk/ps2pkm/mag.c
@@ -74,6 +74,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef WIN32
+#include <fcntl.h>
+#endif
#include "basics.h" /* fatal() */
diff --git a/Build/source/texk/ps2pkm/t1funcs.c b/Build/source/texk/ps2pkm/t1funcs.c
index fcb4ba7442a..263bb027c00 100644
--- a/Build/source/texk/ps2pkm/t1funcs.c
+++ b/Build/source/texk/ps2pkm/t1funcs.c
@@ -433,7 +433,7 @@ static void fill(dest, h, w, area, Byte, bit, wordsize)
rightP = edge->link->xvalues;
for (y = edge->ymin; y < edge->ymax; y++) {
- fillrun(p, *leftP++ - xmin, *rightP++ - xmin, bit);
+ fillrun(p, (pel)(*leftP++ - xmin), (pel)(*rightP++ - xmin), bit);
p += wbytes;
}
}