Calculate border radii correctly. Fix dashed and dotted borders drawing algo. Update cmps.

DEVSIX-1911

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/borders/DashedBorder.java

@@ -257,7 +257,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 += borderWidthBefore / 2;
 
                 x3 -= innerRadiusSecond;
-                y3 -= borderWidthAfter;
+                y3 -= borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 + width, y1 + borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 - 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 + width, y2 -borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 - 10));
@@ -325,7 +325,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 -= borderWidthBefore / 2;
 
                 x3 += innerRadiusSecond;
-                y3 += borderWidthAfter;
+                y3 += borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 - width, y1 - borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 + 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 - width, y2 + borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 + 10));

layout/src/main/java/com/itextpdf/layout/borders/DottedBorder.java

@@ -224,7 +224,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 += borderWidthBefore / 2;
 
                 x3 -= innerRadiusSecond;
-                y3 -= borderWidthAfter;
+                y3 -= borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 + width, y1 + borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 - 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 + width, y2 - borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 - 10));
@@ -290,7 +290,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 -= borderWidthBefore / 2;
 
                 x3 += innerRadiusSecond;
-                y3 += borderWidthAfter;
+                y3 += borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 - width, y1 - borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 + 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 - width, y2 + borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 + 10));

layout/src/main/java/com/itextpdf/layout/borders/RoundDotsBorder.java

@@ -247,7 +247,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 += borderWidthBefore / 2;
 
                 x3 -= innerRadiusSecond;
-                y3 -= borderWidthAfter;
+                y3 -= borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 + width, y1 + borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 - 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 + width, y2 - borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 - 10));
@@ -313,7 +313,7 @@ public void draw(PdfCanvas canvas, float x1, float y1, float x2, float y2, float
                 y0 -= borderWidthBefore / 2;
 
                 x3 += innerRadiusSecond;
-                y3 += borderWidthAfter;
+                y3 += borderWidthAfter / 2;
 
                 clipPoint1 = getIntersectionPoint(new Point(x1 - width, y1 - borderWidthBefore), new Point(x1, y1), new Point(x0, y0), new Point(x0, y0 + 10));
                 clipPoint2 = getIntersectionPoint(new Point(x2 - width, y2 + borderWidthAfter), new Point(x2, y2), new Point(x3, y3), new Point(x3, y3 + 10));

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

@@ -907,7 +907,10 @@ public void drawBorder(DrawContext drawContext) {
             BorderRadius[] borderRadii = getBorderRadii();
             float[] verticalRadii = calculateRadii(borderRadii, borderRect, false);
             float[] horizontalRadii = calculateRadii(borderRadii, borderRect, true);
-
+            for (int i = 0; i < 4; i++) {
+                verticalRadii[i] = Math.min(verticalRadii[i], borderRect.getHeight() / 2);
+                horizontalRadii[i] = Math.min(horizontalRadii[i], borderRect.getWidth() / 2);
+            }
             if (borders[0] != null) {
                 if (0 != horizontalRadii[0] || 0 != verticalRadii[0] || 0 != horizontalRadii[1] || 0 != verticalRadii[1]) {
                     borders[0].draw(canvas, x1, y2, x2, y2, horizontalRadii[0], verticalRadii[0], horizontalRadii[1], verticalRadii[1], Border.Side.TOP, leftWidth, rightWidth);