Minor changes in AbstractRenderer & ImageRenderer

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

DEVSIX-1310

Autoported commit.
Original commit hash: [e5f8c0b9d]

Author: LodrKumquat

itext/itext.layout/itext/layout/renderer/AbstractRenderer.cs

@@ -1511,25 +1511,10 @@ protected internal virtual Rectangle CalculateAbsolutePdfBBox() {
                     }
                 }
                 if (renderer.GetProperty<IList<String[]>>(Property.TRANSFORM) != null) {
-                    if (renderer is BlockRenderer) {
-                        BlockRenderer blockRenderer = (BlockRenderer)renderer;
-                        AffineTransform rotationTransform = blockRenderer.CreateTransformationInsideOccupiedArea();
+                    if (renderer is BlockRenderer || renderer is ImageRenderer || renderer is TableRenderer) {
+                        AffineTransform rotationTransform = renderer.CreateTransformationInsideOccupiedArea();
                         TransformPoints(contentBoxPoints, rotationTransform);
                     }
-                    else {
-                        if (renderer is ImageRenderer) {
-                            ImageRenderer imageRenderer = (ImageRenderer)renderer;
-                            AffineTransform rotationTransform = imageRenderer.CreateTransformationInsideOccupiedArea();
-                            TransformPoints(contentBoxPoints, rotationTransform);
-                        }
-                        else {
-                            if (renderer is TableRenderer) {
-                                TableRenderer tableRenderer = (TableRenderer)renderer;
-                                AffineTransform rotationTransform = tableRenderer.CreateTransformationInsideOccupiedArea();
-                                TransformPoints(contentBoxPoints, rotationTransform);
-                            }
-                        }
-                    }
                 }
                 renderer = (iText.Layout.Renderer.AbstractRenderer)renderer.parent;
             }
@@ -1838,15 +1823,15 @@ private static float CalculatePaddingBorderHeight(iText.Layout.Renderer.Abstract
         /// <see cref="iText.Kernel.Geom.AffineTransform"/>
         /// that transforms the content and places it inside occupied area.
         /// </returns>
-        protected internal virtual 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;
         }
@@ -1864,7 +1849,7 @@ protected internal virtual void EndTranformationIfApplied(PdfCanvas canvas) {
             }
         }
 
-        private AffineTransform GetCssTransformMatrix(float width, float height) {
+        private AffineTransform GetTransformMatrix(float width, float height) {
             IList<String[]> multipleTransform = this.GetProperty<IList<String[]>>(Property.TRANSFORM);
             AffineTransform affineTransform = new AffineTransform();
             for (int k = multipleTransform.Count - 1; k >= 0; k--) {

itext/itext.layout/itext/layout/renderer/ImageRenderer.cs

@@ -304,14 +304,14 @@ public override void Draw(DrawContext drawContext) {
                     }
                 }
             }
+            BeginTranformationIfApplied(drawContext.GetCanvas());
             float? angle = this.GetPropertyAsFloat(Property.ROTATION_ANGLE);
             if (angle != null) {
                 fixedXPosition += rotatedDeltaX;
                 fixedYPosition -= rotatedDeltaY;
                 drawContext.GetCanvas().SaveState();
                 ApplyConcatMatrix(drawContext, angle);
             }
-            BeginTranformationIfApplied(drawContext.GetCanvas());
             base.Draw(drawContext);
             if (angle != null) {
                 drawContext.GetCanvas().RestoreState();
@@ -329,8 +329,8 @@ public override 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 (true.Equals(GetPropertyAsBoolean(Property.FLUSH_ON_DRAW))) {
                 xObject.Flush();
             }

port-hash

@@ -1 +1 @@
-b5a1ddfe81616c403015e74c54ada0ab9708f6bb
+e5f8c0b9d66274cc8153a84a66ba4f9451bf7c9e