1 files changed, 14 insertions, 12 deletions

diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
index 2b921f799..0600d99f5 100644
--- a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
+++ b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
@@ -88,10 +88,14 @@ public class AWTTilePainter {
               System.err.println("Hint["+count+"]: "+rEntry.getKey()+" -> "+rEntry.getValue());
           }
           final AffineTransform aTrans = g2d.getTransform();
-          System.err.println(" type "+aTrans.getType());
-          System.err.println(" scale "+aTrans.getScaleX()+" x "+aTrans.getScaleY());
-          System.err.println(" move "+aTrans.getTranslateX()+" x "+aTrans.getTranslateY());        
-          System.err.println(" mat  "+aTrans);
+          if( null != aTrans ) {
+              System.err.println(" type "+aTrans.getType());
+              System.err.println(" scale "+aTrans.getScaleX()+" x "+aTrans.getScaleY());
+              System.err.println(" move "+aTrans.getTranslateX()+" x "+aTrans.getTranslateY());        
+              System.err.println(" mat  "+aTrans);
+          } else {
+              System.err.println(" null transform");
+          }
     }
     
     /**
@@ -144,11 +148,6 @@ public class AWTTilePainter {
         flipVertical = v;
     }
     
-    private static Rectangle getRoundedRect(Rectangle2D r) {
-        if( null == r ) { return null; }
-        return new Rectangle((int)Math.round(r.getX()), (int)Math.round(r.getY()), 
-                             (int)Math.round(r.getWidth()), (int)Math.round(r.getHeight()));
-    }
     private static Rectangle2D getClipBounds2D(Graphics2D g) {
         final Shape shape = g.getClip();
         return null != shape ? shape.getBounds2D() : null;
@@ -188,6 +187,9 @@ public class AWTTilePainter {
     public void setupGraphics2DAndClipBounds(Graphics2D g2d, int width, int height) throws NoninvertibleTransformException {
         this.g2d = g2d;
         saveAT = g2d.getTransform();
+        if( null == saveAT ) {
+            saveAT = new AffineTransform(); // use identity
+        }
         // We use double precision for scaling
         //
         // Setup original rectangles
@@ -201,7 +203,7 @@ public class AWTTilePainter {
         {
             final AffineTransform scaledATI;
             {
-                final AffineTransform scaledAT = g2d.getTransform();
+                final AffineTransform scaledAT = new AffineTransform(saveAT);
                 scaledAT.scale(scaleMatX, scaleMatY);
                 scaledATI = scaledAT.createInverse(); // -> NoninvertibleTransformException
             }
@@ -214,8 +216,8 @@ public class AWTTilePainter {
                 dClipScaled = scaledATI.createTransformedShape(s0).getBounds2D(); // scaled out
             }
         }
-        final Rectangle iClipScaled = getRoundedRect(dClipScaled);
-        final Rectangle iImageSizeScaled = getRoundedRect(dImageSizeScaled);
+        final Rectangle iClipScaled = dClipScaled.getBounds();
+        final Rectangle iImageSizeScaled = dImageSizeScaled.getBounds();
         renderer.setImageSize(iImageSizeScaled.width, iImageSizeScaled.height);
         renderer.clipImageSize(iClipScaled.width, iClipScaled.height);
         final int clipH = Math.min(iImageSizeScaled.height, iClipScaled.height);