fixed syntax + remove PiscesRenderingEngine and only 1 copy of Reentr…

…antContext classes
bourgesl · Dec 20, 2016 · a8bb703 · a8bb703
1 parent 50fe7a9
commit a8bb703
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 473 deletions.
diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,8 @@
                     <!-- Skip the default running of this plug-in -->
                     <skip>true</skip>
                     <!--
-                    Marlin: -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine
+                    MarlinF: -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine
+                    MarlinD: -Dsun.java2d.renderer=org.marlin.pisces.DMarlinRenderingEngine
                     Pisces: -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
 
                     CrashTest may need large heap: -Xms4g -Xmx4g

diff --git a/src/main/java/org/marlin/pisces/ArrayCacheConst.java b/src/main/java/org/marlin/pisces/ArrayCacheConst.java
@@ -242,6 +242,8 @@ private int getByteFactor() {
             int factor = 1;
             if (name.contains("Int") || name.contains("Float")) {
                 factor = 4;
+            } else if (name.contains("Double")) {
+                factor = 8;
             }
             return factor;
         }

diff --git a/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java b/src/main/java/org/marlin/pisces/DMarlinRenderingEngine.java
@@ -43,8 +43,8 @@
 /**
  * Marlin RendererEngine implementation (derived from Pisces)
  */
-public class DMarlinRenderingEngine extends RenderingEngine
-                                   implements MarlinConst
+public final class DMarlinRenderingEngine extends RenderingEngine
+                                          implements MarlinConst
 {
     private static enum NormMode {
         ON_WITH_AA {

diff --git a/src/main/java/org/marlin/pisces/MarlinRenderingEngine.java b/src/main/java/org/marlin/pisces/MarlinRenderingEngine.java
@@ -44,8 +44,8 @@
 /**
  * Marlin RendererEngine implementation (derived from Pisces)
  */
-public class MarlinRenderingEngine extends RenderingEngine
-                                   implements MarlinConst
+public final class MarlinRenderingEngine extends RenderingEngine
+                                         implements MarlinConst
 {
     private static enum NormMode {
         ON_WITH_AA {

diff --git a/src/main/java/org/marlin/pisces/MergeSort.java b/src/main/java/org/marlin/pisces/MergeSort.java
@@ -32,11 +32,6 @@
  */
 final class MergeSort {
 
-    /** true to enable array data collection and serialization */
-    public static final boolean DO_COLLECT_ARRAY_DATA = (false) && MarlinConst.DO_STATS;
-
-    // 14 MapBench better results
-    // 20 MapSortTest better average results on 9000 arrays !
     // insertion sort threshold
     public static final int INSERTION_SORT_THRESHOLD = 14;
 

diff --git a/src/main/java/org/marlin/pisces/PiscesRenderingEngine.java b/src/main/java/org/marlin/pisces/PiscesRenderingEngine.java
diff --git a/src/main/java/sun/java2d/ReentrantContext.java b/src/main/java/sun/java2d/ReentrantContext.java
diff --git a/src/main/java/sun/java2d/ReentrantContextProvider.java b/src/main/java/sun/java2d/ReentrantContextProvider.java
diff --git a/src/main/java/sun/java2d/ReentrantContextProviderCLQ.java b/src/main/java/sun/java2d/ReentrantContextProviderCLQ.java