Revert "Avoid expanding buffer to fit entire image."

This reverts commit deef4ae. Fixes bumptech#231. Reopens bumptech#225.
herohd · Nov 3, 2014 · 1ba6cbc · 1ba6cbc
1 parent 64c9d90
commit 1ba6cbc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/load/engine/bitmap_recycle/LruBitmapPool.java b/library/src/main/java/com/bumptech/glide/load/engine/bitmap_recycle/LruBitmapPool.java
@@ -63,10 +63,6 @@ public synchronized void setSizeMultiplier(float sizeMultiplier) {
     @Override
     public synchronized boolean put(Bitmap bitmap) {
         if (!bitmap.isMutable() || strategy.getSize(bitmap) > maxSize) {
-            if (Log.isLoggable(TAG, Log.VERBOSE)) {
-                Log.v(TAG, "Reject bitmap from pool=" + strategy.logBitmap(bitmap) + " is mutable="
-                        + bitmap.isMutable());
-            }
             return false;
         }
 

diff --git a/.../src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java b/.../src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java
@@ -17,8 +17,6 @@
  *  limitations under the License.
  */
 
-import android.util.Log;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,7 +36,6 @@
  * </pre>
  */
 public class RecyclableBufferedInputStream extends FilterInputStream {
-    private static final String TAG = "BufferedIs";
 
     /**
      * The buffer containing the current bytes read from the target InputStream.
@@ -137,9 +134,6 @@ private int fillbuf(InputStream localIn, byte[] localBuf)
             if (newLength > marklimit) {
                 newLength = marklimit;
             }
-            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                Log.d(TAG, "allocate buffer of length: " + newLength);
-            }
             byte[] newbuf = new byte[newLength];
             System.arraycopy(localBuf, 0, newbuf, 0, localBuf.length);
             // Reassign buf, which will invalidate any local references
@@ -339,12 +333,6 @@ public synchronized void reset() throws IOException {
             throw new InvalidMarkException("Mark has been invalidated");
         }
         pos = markpos;
-        // TODO: This is a violation of the API because it requires that you call mark() once per call to reset().
-        // We reset markpos to -1 so that after reset is called, we no longer continue to allocate larger and larger
-        // buffers. If we don't do this, we continually allocate new buffers so that the entire stream is held in memory
-        // at once. We could use a fixed size buffer, but that limits our mark size. In practice requiring users to
-        // call mark once per call to reset seems to work. See issue #225.
-        markpos = -1;
     }
 
     /**