From b8d382a9f3eca13ede048a04c03867f631b5ba92 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Fri, 17 Jun 2016 13:08:30 +0300
Subject: [PATCH]  Android / AWT interfaces improvements, closes #7

---
 .../src/org/oscim/android/canvas/AndroidGraphics.java  |  5 +++++
 .../src/org/oscim/android/canvas/AndroidGraphics.java  |  5 +++++
 vtm-desktop/src/org/oscim/awt/AwtBitmap.java           | 10 ++++++++++
 vtm-desktop/src/org/oscim/awt/AwtGraphics.java         |  5 +++++
 4 files changed, 25 insertions(+)

diff --git a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
index 35245558..4941634c 100644
--- a/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-android-gdx/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
+ * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -41,6 +42,10 @@ public final class AndroidGraphics extends CanvasAdapter {
 		return ((AndroidPaint) paint).mPaint;
 	}
 
+	public static android.graphics.Bitmap getBitmap(Bitmap bitmap) {
+		return ((AndroidBitmap) bitmap).mBitmap;
+	}
+
 	private AndroidGraphics() {
 		// do nothing
 	}
diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
index 35245558..4941634c 100644
--- a/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
+++ b/vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
+ * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -41,6 +42,10 @@ public final class AndroidGraphics extends CanvasAdapter {
 		return ((AndroidPaint) paint).mPaint;
 	}
 
+	public static android.graphics.Bitmap getBitmap(Bitmap bitmap) {
+		return ((AndroidBitmap) bitmap).mBitmap;
+	}
+
 	private AndroidGraphics() {
 		// do nothing
 	}
diff --git a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
index 34fbcb86..990cf04a 100644
--- a/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
+++ b/vtm-desktop/src/org/oscim/awt/AwtBitmap.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -58,6 +59,15 @@ public class AwtBitmap implements Bitmap {
 			this.bitmap.coerceData(true);
 	}
 
+	public AwtBitmap(BufferedImage bitmap) {
+		this.bitmap = bitmap;
+		this.width = this.bitmap.getWidth();
+		this.height = this.bitmap.getHeight();
+		if (!this.bitmap.isAlphaPremultiplied()
+				&& this.bitmap.getType() == BufferedImage.TYPE_INT_ARGB)
+			this.bitmap.coerceData(true);
+	}
+
 	@Override
 	public int getWidth() {
 		return width;
diff --git a/vtm-desktop/src/org/oscim/awt/AwtGraphics.java b/vtm-desktop/src/org/oscim/awt/AwtGraphics.java
index 97a404a6..7906f48f 100644
--- a/vtm-desktop/src/org/oscim/awt/AwtGraphics.java
+++ b/vtm-desktop/src/org/oscim/awt/AwtGraphics.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 devemux86
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -35,6 +36,10 @@ public class AwtGraphics extends CanvasAdapter {
 		CanvasAdapter.init(new AwtGraphics());
 	}
 
+	public static BufferedImage getBitmap(Bitmap bitmap) {
+		return ((AwtBitmap) bitmap).bitmap;
+	}
+
 	private AwtGraphics() {
 		// do nothing
 	}