Update pipeline code to use copyMetaDataFrom method

substarry · Jul 20, 2015 · 3ce4e16 · 3ce4e16
1 parent aa8bd4f
commit 3ce4e16
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/image/EncodedImage.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/image/EncodedImage.java
@@ -56,13 +56,12 @@ public class EncodedImage implements Closeable {
   private final @Nullable CloseableReference<PooledByteBuffer> mPooledByteBufferRef;
   private final @Nullable Supplier<FileInputStream> mInputStreamSupplier;
 
-  private int mStreamSize = -1;
-
   private ImageFormat mImageFormat = ImageFormat.UNKNOWN;
   private int mRotationAngle = UNKNOWN_ROTATION_ANGLE;
   private int mWidth = UNKNOWN_WIDTH;
   private int mHeight = UNKNOWN_HEIGHT;
   private int mSampleSize = DEFAULT_SAMPLE_SIZE;
+  private int mStreamSize = UNKNOWN_STREAM_SIZE;
 
   public EncodedImage(CloseableReference<PooledByteBuffer> pooledByteBufferRef) {
     Preconditions.checkArgument(CloseableReference.isValid(pooledByteBufferRef));
@@ -105,11 +104,7 @@ public EncodedImage cloneOrNull() {
       }
     }
     if (encodedImage != null) {
-      encodedImage.setImageFormat(mImageFormat);
-      encodedImage.setRotationAngle(mRotationAngle);
-      encodedImage.setWidth(mWidth);
-      encodedImage.setHeight(mHeight);
-      encodedImage.setSampleSize(mSampleSize);
+      encodedImage.copyMetaDataFrom(this);
     }
     return encodedImage;
   }

diff --git a/...peline/src/main/java/com/facebook/imagepipeline/producers/EncodedMemoryCacheProducer.java b/...peline/src/main/java/com/facebook/imagepipeline/producers/EncodedMemoryCacheProducer.java
@@ -101,6 +101,7 @@ public void onNewResultImpl(EncodedImage newResult, boolean isLast) {
               EncodedImage cachedEncodedImage;
               try {
                 cachedEncodedImage = new EncodedImage(cachedResult);
+                cachedEncodedImage.copyMetaDataFrom(newResult);
               } finally {
                 CloseableReference.closeSafely(cachedResult);
               }

diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/LocalFetchProducer.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/LocalFetchProducer.java
@@ -69,6 +69,7 @@ protected EncodedImage getResult() throws Exception {
                   try {
                     encodedImage = getByteBufferBackedEncodedImage(
                         oldEncodedImage.getInputStream(), oldEncodedImage.getSize());
+                    encodedImage.copyMetaDataFrom(oldEncodedImage);
                   } finally {
                     EncodedImage.closeSafely(oldEncodedImage);
                   }

diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/WebpTranscodeProducer.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/WebpTranscodeProducer.java
@@ -110,7 +110,9 @@ protected EncodedImage getResult() throws Exception {
               CloseableReference<PooledByteBuffer> ref =
                   CloseableReference.of(outputStream.toByteBuffer());
               try {
-                return new EncodedImage(ref);
+                EncodedImage encodedImage = new EncodedImage(ref);
+                encodedImage.copyMetaDataFrom(encodedImageCopy);
+                return encodedImage;
               } finally {
                 CloseableReference.closeSafely(ref);
               }