gistfile1.diff

@@ -14,10 +14,12 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package org.oscim.android.canvas;
 
+import static android.graphics.Bitmap.Config.ARGB_8888;
+
 import java.io.InputStream;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
@@ -25,11 +27,17 @@ import android.opengl.GLUtils;
 
 public class AndroidBitmap implements org.oscim.backend.canvas.Bitmap {
 	final Bitmap mBitmap;
 
 	public AndroidBitmap(InputStream inputStream) {
-		mBitmap = BitmapFactory.decodeStream(inputStream);
+		Bitmap bitmap = BitmapFactory.decodeStream(inputStream);
+		try {
+			GLUtils.getType(bitmap);
+		} catch (IllegalArgumentException e) {
+			bitmap = bitmap.copy(ARGB_8888, false);
+		}
+		mBitmap = bitmap;
 	}
 
 	@Override
 	public boolean isValid() {
 		return mBitmap != null;