Minor changes in AbstractRenderer & ImageRenderer

Rename method building  AffineTransform from css property; make createTransformationInsideOccupiedArea private; apply generic transformation when calculating AbsolutePdfBBox.

DEVSIX-1310

Author: LodrKumquat

layout/src/main/java/com/itextpdf/layout/renderer/AbstractRenderer.java

@@ -1523,17 +1523,8 @@ protected Rectangle calculateAbsolutePdfBBox() {
             }
 
             if (renderer.<List<String[]>>getProperty(Property.TRANSFORM) != null) {
-                if (renderer instanceof BlockRenderer) {
-                    BlockRenderer blockRenderer = (BlockRenderer) renderer;
-                    AffineTransform rotationTransform = blockRenderer.createTransformationInsideOccupiedArea();
-                    transformPoints(contentBoxPoints, rotationTransform);
-                } else if (renderer instanceof ImageRenderer) {
-                    ImageRenderer imageRenderer = (ImageRenderer) renderer;
-                    AffineTransform rotationTransform = imageRenderer.createTransformationInsideOccupiedArea();
-                    transformPoints(contentBoxPoints, rotationTransform);
-                } else if (renderer instanceof TableRenderer) {
-                    TableRenderer tableRenderer = (TableRenderer) renderer;
-                    AffineTransform rotationTransform = tableRenderer.createTransformationInsideOccupiedArea();
+                if (renderer instanceof BlockRenderer || renderer instanceof ImageRenderer || renderer instanceof TableRenderer) {
+                    AffineTransform rotationTransform = renderer.createTransformationInsideOccupiedArea();
                     transformPoints(contentBoxPoints, rotationTransform);
                 }
             }
@@ -1822,15 +1813,15 @@ private static float calculatePaddingBorderHeight(AbstractRenderer renderer) {
      *
      * @return {@link AffineTransform} that transforms the content and places it inside occupied area.
      */
-    protected AffineTransform createTransformationInsideOccupiedArea() {
+    private AffineTransform createTransformationInsideOccupiedArea() {
         Rectangle backgroundArea = applyMargins(occupiedArea.clone().getBBox(), false);
         float x = backgroundArea.getX();
         float y = backgroundArea.getY();
         float height = backgroundArea.getHeight();
         float width = backgroundArea.getWidth();
 
         AffineTransform transform = AffineTransform.getTranslateInstance(-1 * (x + width / 2), -1 * (y + height / 2));
-        transform.preConcatenate(new AffineTransform(this.getCssTransformMatrix(width, height)));
+        transform.preConcatenate(new AffineTransform(this.getTransformMatrix(width, height)));
         transform.preConcatenate(AffineTransform.getTranslateInstance(x + width / 2, y + height / 2));
 
         return transform;
@@ -1849,7 +1840,7 @@ protected void endTranformationIfApplied(PdfCanvas canvas) {
         }
     }
 
-    private AffineTransform getCssTransformMatrix(float width, float height) {
+    private AffineTransform getTransformMatrix(float width, float height) {
         List<String[]> multipleTransform = this.<List<String[]>>getProperty(Property.TRANSFORM);
         AffineTransform affineTransform = new AffineTransform();
         for (int k = multipleTransform.size() - 1; k >=0; k--) {

layout/src/main/java/com/itextpdf/layout/renderer/ImageRenderer.java

@@ -316,6 +316,8 @@ public void draw(DrawContext drawContext) {
             }
         }
 
+        beginTranformationIfApplied(drawContext.getCanvas());
+
         Float angle = this.getPropertyAsFloat(Property.ROTATION_ANGLE);
         if (angle != null) {
             fixedXPosition += rotatedDeltaX;
@@ -324,8 +326,6 @@ public void draw(DrawContext drawContext) {
             applyConcatMatrix(drawContext, angle);
         }
 
-        beginTranformationIfApplied(drawContext.getCanvas());
-
         super.draw(drawContext);
         if (angle != null) {
             drawContext.getCanvas().restoreState();
@@ -345,9 +345,8 @@ public void draw(DrawContext drawContext) {
         beginElementOpacityApplying(drawContext);
         canvas.addXObject(xObject, matrix[0], matrix[1], matrix[2], matrix[3], (float) fixedXPosition + deltaX, (float) fixedYPosition);
 
-        endTranformationIfApplied(drawContext.getCanvas());
-
         endElementOpacityApplying(drawContext);
+        endTranformationIfApplied(drawContext.getCanvas());
         if (Boolean.TRUE.equals(getPropertyAsBoolean(Property.FLUSH_ON_DRAW))) {
             xObject.flush();
         }