summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/jdk15/files/patch-j2se::ttHints::HintScan.c17
-rw-r--r--java/jdk16/files/patch-j2se::ttHints::HintScan.c17
2 files changed, 28 insertions, 6 deletions
diff --git a/java/jdk15/files/patch-j2se::ttHints::HintScan.c b/java/jdk15/files/patch-j2se::ttHints::HintScan.c
index 12375f1cdfbc..10f4a6c176a8 100644
--- a/java/jdk15/files/patch-j2se::ttHints::HintScan.c
+++ b/java/jdk15/files/patch-j2se::ttHints::HintScan.c
@@ -2,12 +2,23 @@ $FreeBSD$
--- ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 6 Mar 2007 16:53:10 -0000 1.1.1.2
+++ ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 31 Jul 2007 04:07:56 -0000
-@@ -34,7 +34,7 @@
+@@ -34,8 +34,6 @@
#include "HintScan.h"
-#include "cpu.h" //for fastint
-+#include "Hint.h" //for fastint
-
+-
/* copy macros as temporal solution - straightforward including cause compilation issues */
#define F26Dot6ToFixed(x) ((x) << 10)
+ #define IntToFixed(a) ((Fixed)(a) << 16)
+@@ -208,8 +206,8 @@
+ F26Dot6 *v, tv, vmin, vmax, ctr;
+ F26Dot6 xmin, xmax, ymin, ymax;
+ tt_int32 n;
+- fastInt aPoint, startPoint, endPoint;
+- fastInt firstTime = true;
++ short aPoint, startPoint, endPoint;
++ short firstTime = true;
+ tt_int32 numPts = 0;
+
+ if (t->numberOfContours > 0) {
diff --git a/java/jdk16/files/patch-j2se::ttHints::HintScan.c b/java/jdk16/files/patch-j2se::ttHints::HintScan.c
index 12375f1cdfbc..10f4a6c176a8 100644
--- a/java/jdk16/files/patch-j2se::ttHints::HintScan.c
+++ b/java/jdk16/files/patch-j2se::ttHints::HintScan.c
@@ -2,12 +2,23 @@ $FreeBSD$
--- ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 6 Mar 2007 16:53:10 -0000 1.1.1.2
+++ ../../j2se/src/share/native/sun/font/t2k/ttHints/HintScan.c 31 Jul 2007 04:07:56 -0000
-@@ -34,7 +34,7 @@
+@@ -34,8 +34,6 @@
#include "HintScan.h"
-#include "cpu.h" //for fastint
-+#include "Hint.h" //for fastint
-
+-
/* copy macros as temporal solution - straightforward including cause compilation issues */
#define F26Dot6ToFixed(x) ((x) << 10)
+ #define IntToFixed(a) ((Fixed)(a) << 16)
+@@ -208,8 +206,8 @@
+ F26Dot6 *v, tv, vmin, vmax, ctr;
+ F26Dot6 xmin, xmax, ymin, ymax;
+ tt_int32 n;
+- fastInt aPoint, startPoint, endPoint;
+- fastInt firstTime = true;
++ short aPoint, startPoint, endPoint;
++ short firstTime = true;
+ tt_int32 numPts = 0;
+
+ if (t->numberOfContours > 0) {