提交 1ba6cbc2 编写于 作者: S Sam Judd

Revert "Avoid expanding buffer to fit entire image."

This reverts commit deef4ae2.
Fixes #231.
Reopens #225.
上级 64c9d904
......@@ -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;
}
......
......@@ -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;
}
/**
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册