Improve bitmap loading

- No force to loaded with a specific format (this avoid some bad formats
on exif jpegs)
- Remove unused comments and imports

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

1 files changed, 1 insertions, 11 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
index 3087a38..0332bc5 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/transitions/NullTransition.java
@@ -27,9 +27,6 @@ import org.cyanogenmod.wallpapers.photophase.TextureManager;
 import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.nio.FloatBuffer;
-
-import javax.microedition.khronos.opengles.GL10;
-
 /**
  * A special transition that does nothing other than draw the {@link PhotoFrame}
  * on the screen continually. No transition is done.
@@ -164,14 +161,7 @@ public class NullTransition extends Transition {
         GLESUtil.glesCheckError("glUniformMatrix4fv");
 
         // Draw the photo frame
-//        ShortBuffer vertexOrderBuffer = target.getVertexOrderBuffer();
-//        vertexOrderBuffer.position(0);
-//        GLES20.glDrawElements(
-//                GLES20.GL_TRIANGLE_FAN,
-//                6,
-//                GLES20.GL_UNSIGNED_SHORT,
-//                vertexOrderBuffer);
-        GLES20.glDrawArrays(GL10.GL_TRIANGLE_STRIP, 0, 4);
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLE_FAN, 0, 4);
         GLESUtil.glesCheckError("glDrawElements");
 
         // Disable attributes