Index: mapsforge-map-awt/src/main/java/org/mapsforge/map/awt/AwtCanvas.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- mapsforge-map-awt/src/main/java/org/mapsforge/map/awt/AwtCanvas.java (revision 67db7798058361e9d78bbf7aabb499f01a2b2df1) +++ mapsforge-map-awt/src/main/java/org/mapsforge/map/awt/AwtCanvas.java (revision ) @@ -14,13 +14,6 @@ */ package org.mapsforge.map.awt; -import java.awt.AlphaComposite; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.font.TextLayout; -import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; - import org.mapsforge.core.graphics.Bitmap; import org.mapsforge.core.graphics.Canvas; import org.mapsforge.core.graphics.Color; @@ -30,6 +23,11 @@ import org.mapsforge.core.graphics.Style; import org.mapsforge.core.model.Dimension; +import java.awt.*; +import java.awt.font.TextLayout; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; + class AwtCanvas implements Canvas { private static final String UNKNOWN_STYLE = "unknown style: "; @@ -52,8 +50,11 @@ @Override public void drawBitmap(Bitmap bitmap, Matrix matrix) { + Composite originalComposite = this.graphics2D.getComposite(); + this.graphics2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER)); - this.graphics2D.drawRenderedImage(AwtGraphicFactory.getBufferedImage(bitmap), + this.graphics2D.drawRenderedImage(AwtGraphicFactory.getBufferedImage(bitmap), AwtGraphicFactory.getAffineTransform(matrix)); + this.graphics2D.setComposite(originalComposite); } @Override @@ -211,9 +212,11 @@ } private void fillColor(java.awt.Color color) { + Composite originalComposite = this.graphics2D.getComposite(); this.graphics2D.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC)); this.graphics2D.setColor(color); this.graphics2D.fillRect(0, 0, getWidth(), getHeight()); + this.graphics2D.setComposite(originalComposite); } private void setColorAndStroke(AwtPaint awtPaint) {