You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/02/16 20:03:34 UTC
[1/2] ant git commit: port image type bug fixes from Java8
refactoring in master
Repository: ant
Updated Branches:
refs/heads/master 3ae6f545d -> acd33fa8d
port image type bug fixes from Java8 refactoring in master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2a5857c3
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2a5857c3
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2a5857c3
Branch: refs/heads/master
Commit: 2a5857c384ef5a9e02b4264be44bf67f3a584d57
Parents: fc1ad44
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Feb 16 21:00:04 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Feb 16 21:00:04 2018 +0100
----------------------------------------------------------------------
.../org/apache/tools/ant/types/optional/image/Arc.java | 2 +-
.../apache/tools/ant/types/optional/image/Ellipse.java | 2 +-
.../tools/ant/types/optional/image/Rectangle.java | 2 +-
.../apache/tools/ant/types/optional/image/Text.java | 13 ++++++++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Arc.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Arc.java b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
index 3d8b29b..ce29bfd 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Arc.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Arc.java
@@ -112,10 +112,10 @@ public class Arc extends BasicShape implements DrawOperation {
PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
} else if (instr instanceof TransformOperation) {
- graphics = (Graphics2D) bi.getGraphics();
PlanarImage image = ((TransformOperation) instr)
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
bi = image.getAsBufferedImage();
+ graphics = (Graphics2D) bi.getGraphics();
}
}
return PlanarImage.wrapRenderedImage(bi);
http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
index 9fa1802..635d809 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Ellipse.java
@@ -76,10 +76,10 @@ public class Ellipse extends BasicShape implements DrawOperation {
PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
} else if (instr instanceof TransformOperation) {
- graphics = (Graphics2D) bi.getGraphics();
PlanarImage image = ((TransformOperation) instr)
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
bi = image.getAsBufferedImage();
+ graphics = (Graphics2D) bi.getGraphics();
}
}
return PlanarImage.wrapRenderedImage(bi);
http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
index e2d5bb1..836b6ca 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
@@ -107,11 +107,11 @@ public class Rectangle extends BasicShape implements DrawOperation {
PlanarImage img = ((DrawOperation) instr).executeDrawOperation();
graphics.drawImage(img.getAsBufferedImage(), null, 0, 0);
} else if (instr instanceof TransformOperation) {
- graphics = (Graphics2D) bi.getGraphics();
PlanarImage image
= ((TransformOperation) instr)
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
bi = image.getAsBufferedImage();
+ graphics = (Graphics2D) bi.getGraphics();
}
}
return PlanarImage.wrapRenderedImage(bi);
http://git-wip-us.apache.org/repos/asf/ant/blob/2a5857c3/src/main/org/apache/tools/ant/types/optional/image/Text.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/optional/image/Text.java b/src/main/org/apache/tools/ant/types/optional/image/Text.java
index 5ba010a..ac18ed4 100644
--- a/src/main/org/apache/tools/ant/types/optional/image/Text.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Text.java
@@ -103,7 +103,7 @@ public class Text extends ImageOperation implements DrawOperation {
RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
graphics.setRenderingHint(
RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
- Font f = new Font(font, Font.PLAIN, point);
+ Font f = createFont();
FontMetrics fmetrics = graphics.getFontMetrics(f);
height = fmetrics.getMaxAscent() + fmetrics.getMaxDescent();
width = fmetrics.stringWidth(strText);
@@ -123,4 +123,15 @@ public class Text extends ImageOperation implements DrawOperation {
PlanarImage image = PlanarImage.wrapRenderedImage(bi);
return image;
}
+
+ private Font createFont() {
+ int style = Font.PLAIN;
+ if (bold) {
+ style |= Font.BOLD;
+ }
+ if (italic) {
+ style |= Font.ITALIC;
+ }
+ return new Font(font, style, point);
+ }
}
[2/2] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/acd33fa8
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/acd33fa8
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/acd33fa8
Branch: refs/heads/master
Commit: acd33fa8df8e7e8aac57a409856eacf0427bb2f7
Parents: 3ae6f54 2a5857c
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Feb 16 21:02:22 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Feb 16 21:02:22 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/types/optional/image/Rectangle.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/acd33fa8/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
----------------------------------------------------------------------
diff --cc src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
index b15272f,836b6ca..d6392da
--- a/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
+++ b/src/main/org/apache/tools/ant/types/optional/image/Rectangle.java
@@@ -110,6 -111,7 +109,7 @@@ public class Rectangle extends BasicSha
= ((TransformOperation) instr)
.executeTransformOperation(PlanarImage.wrapRenderedImage(bi));
bi = image.getAsBufferedImage();
- graphics = (Graphics2D) bi.getGraphics();
++ graphics = bi.createGraphics();
}
}
return PlanarImage.wrapRenderedImage(bi);