diff options
author | Sam Judd <judds@google.com> | 2014-11-03 10:32:31 -0800 |
---|---|---|
committer | Sam Judd <judds@google.com> | 2014-11-03 10:32:40 -0800 |
commit | 1ba6cbc27ceb69d097d0bba0e173ea96ecf41cac (patch) | |
tree | 4d209b5285ca10c2998d4e38e2909915d470d2ca /library/src/main/java/com | |
parent | 64c9d904d1b7a57c4fe2b9a513fd1c146d744a94 (diff) | |
download | glide-1ba6cbc27ceb69d097d0bba0e173ea96ecf41cac.tar.gz |
Revert "Avoid expanding buffer to fit entire image."
This reverts commit deef4ae2607fcbd32caffc03e2490cbca9134643.
Fixes #231.
Reopens #225.
Diffstat (limited to 'library/src/main/java/com')
2 files changed, 0 insertions, 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 index 79d8c6c4..8c5947bd 100644 --- 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 class LruBitmapPool implements BitmapPool { @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/library/src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java index 685a5074..b0811526 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/RecyclableBufferedInputStream.java @@ -17,8 +17,6 @@ package com.bumptech.glide.load.resource.bitmap; * limitations under the License. */ -import android.util.Log; - import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; @@ -38,7 +36,6 @@ import java.io.InputStream; * </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 @@ public class RecyclableBufferedInputStream extends FilterInputStream { 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 class RecyclableBufferedInputStream extends FilterInputStream { 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; } /** |