From 94011804bef01d33d3287cfe308062ff4d941d0b Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Mon, 20 Jan 2014 22:49:33 +0100 Subject: [PATCH] add isValid() to Bitmap interface --- vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java | 6 +++++- .../src/org/oscim/android/canvas/AndroidBitmap.java | 5 +++++ vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java | 5 +++++ vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java | 5 +++++ vtm/src/org/oscim/backend/canvas/Bitmap.java | 2 ++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java b/vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java index cbf6b41e..f49f7aff 100644 --- a/vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java +++ b/vtm-android/src/org/oscim/android/canvas/AndroidBitmap.java @@ -25,11 +25,15 @@ import android.opengl.GLUtils; public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap { final Bitmap mBitmap; - public AndroidBitmap(InputStream inputStream) { mBitmap = BitmapFactory.decodeStream(inputStream); } + @Override + public boolean isValid(){ + return mBitmap != null; + } + /** * @param format ignored always ARGB8888 */ diff --git a/vtm-gdx-android/src/org/oscim/android/canvas/AndroidBitmap.java b/vtm-gdx-android/src/org/oscim/android/canvas/AndroidBitmap.java index 04eb43d1..e062b53b 100644 --- a/vtm-gdx-android/src/org/oscim/android/canvas/AndroidBitmap.java +++ b/vtm-gdx-android/src/org/oscim/android/canvas/AndroidBitmap.java @@ -85,4 +85,9 @@ public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap { public void recycle() { mBitmap.recycle(); } + + @Override + public boolean isValid() { + return mBitmap != null; + } } diff --git a/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java b/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java index d183ea0b..6d96893d 100644 --- a/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java +++ b/vtm-gdx-desktop/src/org/oscim/awt/AwtBitmap.java @@ -134,4 +134,9 @@ public class AwtBitmap implements Bitmap { @Override public void recycle() { } + + @Override + public boolean isValid() { + return true; + } } diff --git a/vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java b/vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java index 242249c5..bbc8ac0e 100644 --- a/vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java +++ b/vtm-gdx-html/src/org/oscim/gdx/client/GwtBitmap.java @@ -88,4 +88,9 @@ public class GwtBitmap implements Bitmap { } } + @Override + public boolean isValid() { + return true; + } + } diff --git a/vtm/src/org/oscim/backend/canvas/Bitmap.java b/vtm/src/org/oscim/backend/canvas/Bitmap.java index 5387d70e..79c49a26 100644 --- a/vtm/src/org/oscim/backend/canvas/Bitmap.java +++ b/vtm/src/org/oscim/backend/canvas/Bitmap.java @@ -60,4 +60,6 @@ public interface Bitmap { * @param replace true, when glSubImage2D can be used for upload */ void uploadToTexture(boolean replace); + + boolean isValid(); }