xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AwtCanvas draw bitmap pixel perfect (#328)

Browse Source
This commit is contained in:
Longri
2017-03-07 11:26:15 +01:00
committed by Emux
parent d08ef59278
commit e562ebdff6
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vtm-desktop/src/org/oscim/awt/AwtBitmap.java
View File

@@ -1,7 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86 * Copyright 2016 devemux86
* Copyright 2016 Longri * Copyright 2016-2017 Longri
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@@ -47,7 +47,7 @@ public class AwtBitmap implements Bitmap {
boolean internal; boolean internal;
public AwtBitmap(int width, int height, int format) { public AwtBitmap(int width, int height, int format) {
bitmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); bitmap = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB_PRE);
this.width = width; this.width = width;
this.height = height; this.height = height;

14
vtm-desktop/src/org/oscim/awt/AwtCanvas.java
View File

@@ -3,6 +3,7 @@
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016-2017 devemux86 * Copyright 2016-2017 devemux86
* Copyright 2017 nebular * Copyright 2017 nebular
* Copyright 2017 Longri
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@@ -32,6 +33,7 @@ import java.awt.Shape;
import java.awt.font.TextLayout; import java.awt.font.TextLayout;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
public class AwtCanvas implements Canvas { public class AwtCanvas implements Canvas {
@@ -127,7 +129,17 @@ public class AwtCanvas implements Canvas {
@Override @Override
public void drawBitmap(Bitmap bitmap, float x, float y) { public void drawBitmap(Bitmap bitmap, float x, float y) {
this.canvas.drawImage(((AwtBitmap) bitmap).bitmap, (int) x, (int) y, null); int intX = (int) x;
int intY = (int) y;
BufferedImage src = ((AwtBitmap) bitmap).bitmap;
int[] srcbuf = ((DataBufferInt) src.getRaster().getDataBuffer()).getData();
int[] dstbuf = ((DataBufferInt) this.bitmap.getRaster().getDataBuffer()).getData();
int width = intX + src.getWidth() > this.bitmap.getWidth() ? this.getWidth() - intX : src.getWidth();
int height = intY + src.getHeight() > this.bitmap.getHeight() ? this.getHeight() - intY : src.getHeight();
int dstoffs = intX + intY * this.bitmap.getWidth();
int srcoffs = 0;
for (int i = 0; i < height; i++, dstoffs += this.bitmap.getWidth(), srcoffs += width)
System.arraycopy(srcbuf, srcoffs, dstbuf, dstoffs, width);
} }
@Override @Override