Import GNU Classpath (classpath-0_97_2-release).

libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.

From-SVN: r137223

1 files changed, 16 insertions, 13 deletions

diff --git a/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java b/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java
index 2693a0b70c7..cc4bbef28c0 100644
--- a/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java
+++ b/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java
@@ -62,11 +62,6 @@ public final class ScanlineConverter
   private static int ONE = Fixed.fixedValue(FIXED_DIGITS, 1);
 
   /**
-   * The number of significant bits for the Y resolution.
-   */
-  private static int Y_RESOLUTION = 4;
-
-  /**
    * The actual number of scanlines.
    */
   private int numScanlines;
@@ -94,6 +89,11 @@ public final class ScanlineConverter
   private int resolution;
 
   /**
+   * The number of significant bits for the 'Y' resolution.
+   */
+  private int yResolution;
+
+  /**
    * One half step according to the resolution. This is stored to avoid
    * unnecessary operations during rendering.
    */
@@ -145,14 +145,15 @@ public final class ScanlineConverter
    * @param trans the transform
    */
   public void renderShape(Pixelizer p, Shape shape, Shape clip,
-                          AffineTransform trans, int res, RenderingHints hints)
+                          AffineTransform trans, int res, int yRes,
+                          RenderingHints hints)
   {
     // TODO: Do something useful with the rendering hints. Like, adjusting
     // the resolution.
 
     // Prepare resolution and upper bounds.
     clear();
-    setResolution(res);
+    setResolution(res, yRes);
 
     boolean haveClip = clip != null;
 
@@ -278,10 +279,10 @@ public final class ScanlineConverter
             int frac0 = ONE - Fixed.trunc(FIXED_DIGITS, x0);
             int frac1 = ONE - Fixed.trunc(FIXED_DIGITS, x1);
             // Only keep the first 4 digits after the point.
-            frac0 = frac0 >> (FIXED_DIGITS - Y_RESOLUTION);
-            frac1 = frac1 >> (FIXED_DIGITS - Y_RESOLUTION);
-            scanlineCoverage.add(pix0, 1 * (1 << Y_RESOLUTION), frac0);
-            scanlineCoverage.add(pix1, -1 * (1 << Y_RESOLUTION), -frac1);
+            frac0 = frac0 >> (FIXED_DIGITS - yResolution);
+            frac1 = frac1 >> (FIXED_DIGITS - yResolution);
+            scanlineCoverage.add(pix0, 1 * (1 << yResolution), frac0);
+            scanlineCoverage.add(pix1, -1 * (1 << yResolution), -frac1);
           }
         if (edge.isClip)
           inClip = ! inClip;
@@ -306,14 +307,16 @@ public final class ScanlineConverter
    *
    * @param res the resolution
    */
-  private void setResolution(int res)
+  private void setResolution(int res, int yRes)
   {
     int scanlinesPerPixel = 1 << res;
     int one = Fixed.fixedValue(FIXED_DIGITS, 1);
     resolution = one / (scanlinesPerPixel);
     halfStep = resolution / 2;
 
-    scanlineCoverage.setMaxCoverage(scanlinesPerPixel << Y_RESOLUTION);
+    scanlineCoverage.setMaxCoverage(scanlinesPerPixel << yResolution);
+
+    yResolution = yRes;
   }
 
   /**