From 93f06d28b5499c713ef92ec355f6e281de1bb1e2 Mon Sep 17 00:00:00 2001 From: Florian Minjat Date: Thu, 11 Apr 2013 11:08:02 +0200 Subject: [PATCH 1/2] More explicit NullBitmapException - BitmapTexture: improved to display mInputStreamOpener.toString(); - Classes extending IInputStreamOpener: toString() methods added. --- src/org/andengine/opengl/texture/bitmap/BitmapTexture.java | 4 ++-- .../andengine/util/adt/io/in/AssetInputStreamOpener.java | 6 ++++++ .../util/adt/io/in/ByteArrayInputStreamOpener.java | 6 ++++++ .../andengine/util/adt/io/in/ResourceInputStreamOpener.java | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java b/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java index 86f935e13..9bbe44db8 100644 --- a/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java +++ b/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java @@ -104,10 +104,10 @@ protected void writeTextureToHardware(final GLState pGLState) throws IOException final Bitmap bitmap = this.onGetBitmap(bitmapConfig); if(bitmap == null) { - throw new NullBitmapException("Caused by: '" + this.toString() + "'."); + throw new NullBitmapException("Caused by: '" + this.toString() + "' (mInputStreamOpener=" + mInputStreamOpener + ")."); } - final boolean useDefaultAlignment = MathUtils.isPowerOfTwo(bitmap.getWidth()) && MathUtils.isPowerOfTwo(bitmap.getHeight()) && (this.mPixelFormat == PixelFormat.RGBA_8888); + final boolean useDefaultAlignment = MathUtils.isPowerOfTwo(bitmap.getWidth()) && MathUtils.isPowerOfTwo(bitmap.getHeight()) && this.mPixelFormat == PixelFormat.RGBA_8888; if(!useDefaultAlignment) { /* Adjust unpack alignment. */ GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1); diff --git a/src/org/andengine/util/adt/io/in/AssetInputStreamOpener.java b/src/org/andengine/util/adt/io/in/AssetInputStreamOpener.java index e33b7388c..c71ce7663 100644 --- a/src/org/andengine/util/adt/io/in/AssetInputStreamOpener.java +++ b/src/org/andengine/util/adt/io/in/AssetInputStreamOpener.java @@ -45,6 +45,12 @@ public InputStream open() throws IOException { return this.mAssetManager.open(this.mAssetPath); } + @Override + public String toString() { + return "AssetInputStreamOpener [mAssetManager=" + mAssetManager + ", mAssetPath=" + mAssetPath + "]"; + } + + // =========================================================== // Methods // =========================================================== diff --git a/src/org/andengine/util/adt/io/in/ByteArrayInputStreamOpener.java b/src/org/andengine/util/adt/io/in/ByteArrayInputStreamOpener.java index 460eb8763..928800ced 100644 --- a/src/org/andengine/util/adt/io/in/ByteArrayInputStreamOpener.java +++ b/src/org/andengine/util/adt/io/in/ByteArrayInputStreamOpener.java @@ -50,6 +50,12 @@ public InputStream open() throws IOException { return new ByteArrayInputStream(this.mBytes, this.mOffset, this.mLength); } + @Override + public String toString() { + return "ByteArrayInputStreamOpener [mBytes" + (mBytes == null ? "=null" : ".size=" + mBytes.length) + ", mOffset=" + mOffset + ", mLength=" + mLength + "]"; + } + + // =========================================================== // Methods // =========================================================== diff --git a/src/org/andengine/util/adt/io/in/ResourceInputStreamOpener.java b/src/org/andengine/util/adt/io/in/ResourceInputStreamOpener.java index a9ac64b71..26e5fda22 100644 --- a/src/org/andengine/util/adt/io/in/ResourceInputStreamOpener.java +++ b/src/org/andengine/util/adt/io/in/ResourceInputStreamOpener.java @@ -45,6 +45,11 @@ public InputStream open() throws IOException { return this.mResources.openRawResource(this.mResourceID); } + @Override + public String toString() { + return "ResourceInputStreamOpener [mResources=" + mResources + ", mResourceID=" + mResourceID + "]"; + } + // =========================================================== // Methods // =========================================================== From b36f2b85fa2debca30f1dc97942bb13ed006ddd0 Mon Sep 17 00:00:00 2001 From: Florian Minjat Date: Fri, 19 Apr 2013 19:15:04 +0200 Subject: [PATCH 2/2] - parenthesis added back --- src/org/andengine/opengl/texture/bitmap/BitmapTexture.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java b/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java index 9bbe44db8..42509092a 100644 --- a/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java +++ b/src/org/andengine/opengl/texture/bitmap/BitmapTexture.java @@ -107,7 +107,7 @@ protected void writeTextureToHardware(final GLState pGLState) throws IOException throw new NullBitmapException("Caused by: '" + this.toString() + "' (mInputStreamOpener=" + mInputStreamOpener + ")."); } - final boolean useDefaultAlignment = MathUtils.isPowerOfTwo(bitmap.getWidth()) && MathUtils.isPowerOfTwo(bitmap.getHeight()) && this.mPixelFormat == PixelFormat.RGBA_8888; + final boolean useDefaultAlignment = MathUtils.isPowerOfTwo(bitmap.getWidth()) && MathUtils.isPowerOfTwo(bitmap.getHeight()) && (this.mPixelFormat == PixelFormat.RGBA_8888); if(!useDefaultAlignment) { /* Adjust unpack alignment. */ GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);