aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-01-23 04:06:04 +0100
committerSven Gothel <[email protected]>2012-01-23 04:06:04 +0100
commit6bdf15f28da748c974536e799a9f6541e3615948 (patch)
tree1f9f40e0d7c2aa0fdffad85eef34b0c4c7296f73
parentfc45c16c1442984a6e6e4ad308dbf15e91fd215c (diff)
javac - setup encoding to UTF-8
-rw-r--r--make/build-jogl.xml8
-rw-r--r--make/build-nativewindow.xml1
-rw-r--r--make/build-newt.xml4
-rw-r--r--make/build-staticglgen.xml4
-rw-r--r--make/build-test.xml1
-rw-r--r--make/build.xml5
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java8
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/t2/T2Interpreter.java6
8 files changed, 29 insertions, 8 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index ef2ca4820..2ddd2296a 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -695,6 +695,7 @@
fork="yes"
includeAntRuntime="true"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -708,6 +709,7 @@
fork="yes"
includeAntRuntime="true"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${host.sourcelevel}"
target="${host.targetlevel}"
bootclasspath="${host.rt.jar}"
@@ -1017,6 +1019,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -1034,6 +1037,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -1053,6 +1057,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -1665,6 +1670,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
@@ -1680,6 +1686,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
@@ -1695,6 +1702,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 336ab0277..40fd24def 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -318,6 +318,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 34ea50e6b..6e3d7b262 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -209,6 +209,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -766,6 +767,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
@@ -781,6 +783,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
@@ -796,6 +799,7 @@
sourcepath="${src.java};${src.generated.java}"
destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
linkoffline="${javadoc.link} 142-packages"
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index ea19bc6d2..6d1511058 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -32,6 +32,7 @@
<javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}">
@@ -57,7 +58,8 @@
<javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
includeAntRuntime="true"
memoryMaximumSize="${javac.memorymax}"
- source="1.6">
+ encoding="UTF-8"
+ source="${host.sourcelevel}">
<src path="${src.java}" />
<classpath refid="classpath" />
</javac>
diff --git a/make/build-test.xml b/make/build-test.xml
index 1462289ea..195681b5f 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -75,6 +75,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
diff --git a/make/build.xml b/make/build.xml
index 8d6d459b5..94fa5acdb 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -198,6 +198,7 @@
fork="yes"
includeAntRuntime="false"
memoryMaximumSize="${javac.memorymax}"
+ encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
bootclasspath="${target.rt.jar}"
@@ -419,6 +420,7 @@
windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
access="public"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
bottom="${javadoc.bottom}" >
@@ -440,6 +442,7 @@
windowtitle="${javadoc.spec.windowtitle}"
overview="${javadoc.overview}"
access="public"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
bottom="${javadoc.bottom}" >
@@ -462,6 +465,7 @@
windowtitle="${javadoc.windowtitle}"
overview="${javadoc.overview}"
access="protected"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
bottom="${javadoc.bottom}" >
@@ -483,6 +487,7 @@
windowtitle="${javadoc.nw.spec.windowtitle}"
overview="${javadoc.nw.overview}"
access="public"
+ encoding="UTF-8"
source="${target.sourcelevel}"
maxmemory="${javac.memorymax}"
bottom="${javadoc.bottom}" >
diff --git a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
index 286c70e54..10ea29168 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/PMVMatrix.java
@@ -571,9 +571,9 @@ public class PMVMatrix implements GLMatrixFunc {
x = vec3f[0]; y = vec3f[1]; z = vec3f[2];
// Rotation matrix:
- // xx(1−c)+c xy(1−c)+zs xz(1−c)-ys 0
- // xy(1−c)-zs yy(1−c)+c yz(1−c)+xs 0
- // xz(1−c)+ys yz(1−c)-xs zz(1−c)+c 0
+ // xx(1-c)+c xy(1-c)+zs xz(1-c)-ys 0
+ // xy(1-c)-zs yy(1-c)+c yz(1-c)+xs 0
+ // xz(1-c)+ys yz(1-c)-xs zz(1-c)+c 0
// 0 0 0 1
final float xy = x*y;
final float xz = x*z;
@@ -643,7 +643,7 @@ public class PMVMatrix implements GLMatrixFunc {
// 2*zNear/dx 0 A 0
// 0 2*zNear/dy B 0
// 0 0 C D
- // 0 0 −1 0
+ // 0 0 -1 0
final float zNear2 = 2.0f*zNear;
final float dx=right-left;
final float dy=top-bottom;
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/t2/T2Interpreter.java b/src/jogl/classes/jogamp/graph/font/typecast/t2/T2Interpreter.java
index a05bd3ba2..887f8c34f 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/t2/T2Interpreter.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/t2/T2Interpreter.java
@@ -478,7 +478,7 @@ public class T2Interpreter {
}
/**
- * Causes two B�zier curves, as described by the arguments (as
+ * Causes two Bezier curves, as described by the arguments (as
* shown in Figure 2 below), to be rendered as a straight line when
* the flex depth is less than fd /100 device pixels, and as curved lines
* when the flex depth is greater than or equal to fd/100 device
@@ -524,7 +524,7 @@ public class T2Interpreter {
/**
* Finishes a charstring outline definition, and must be the
- * last operator in a character�s outline.
+ * last operator in a character's outline.
*/
private void _endchar() {
endContour();
@@ -668,7 +668,7 @@ public class T2Interpreter {
}
/**
- * Performs a circular shift of the elements num(N�1) ... num0 on
+ * Performs a circular shift of the elements num(Nx1) ... num0 on
* the argument stack by the amount J. Positive J indicates upward
* motion of the stack; negative J indicates downward motion.
* The value N must be a non-negative integer, otherwise the