Sample app set up to demonstrate problems with JPG decoding

cqululei · Jan 11, 2015 · cbef2b3 · cbef2b3
1 parent 5770dd7
commit cbef2b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/sample/assets/card_jpg.jpg b/sample/assets/card_jpg.jpg
diff --git a/sample/assets/squirrel_large.jpg b/sample/assets/squirrel_large.jpg
diff --git a/...e/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java b/...e/src/com/davemorrissey/labs/subscaleview/sample/basicfeatures/BasicFeaturesActivity.java
@@ -25,6 +25,7 @@
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
+import com.davemorrissey.labs.subscaleview.sample.imagedisplay.decoders.RapidImageRegionDecoder;
 
 import java.util.Arrays;
 import java.util.List;
@@ -84,7 +85,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void initialiseImage() {
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)findViewById(id.imageView);
-        imageView.setImageAsset("squirrel.jpg");
+        imageView.setDecoderClass(RapidImageRegionDecoder.class);
+        imageView.setDebug(true);
+        imageView.setImageAsset("squirrel_large.jpg");
     }
 
     private void updateNotes() {

diff --git a/...rc/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java b/...rc/com/davemorrissey/labs/subscaleview/sample/imagedisplay/ImageDisplayLargeFragment.java
@@ -26,6 +26,7 @@
 import com.davemorrissey.labs.subscaleview.sample.R.id;
 import com.davemorrissey.labs.subscaleview.sample.R.layout;
 import com.davemorrissey.labs.subscaleview.sample.extension.ExtensionActivity;
+import com.davemorrissey.labs.subscaleview.sample.imagedisplay.decoders.RapidImageRegionDecoder;
 
 public class ImageDisplayLargeFragment extends Fragment {
 
@@ -39,7 +40,9 @@ public void onClick(View view) {
             }
         });
         SubsamplingScaleImageView imageView = (SubsamplingScaleImageView)rootView.findViewById(id.imageView);
-        imageView.setImageAsset("card.png");
+        imageView.setDecoderClass(RapidImageRegionDecoder.class);
+        imageView.setDebug(true);
+        imageView.setImageAsset("card_jpg.jpg");
         return rootView;
     }
 

diff --git a/...davemorrissey/labs/subscaleview/sample/imagedisplay/decoders/RapidImageRegionDecoder.java b/...davemorrissey/labs/subscaleview/sample/imagedisplay/decoders/RapidImageRegionDecoder.java
@@ -45,9 +45,8 @@ private BitmapDecoder newDecoder() throws Exception {
         } else {
             decoder = BitmapDecoder.from(context, uri);
         }
-        // RapidDecoder's PNG library works well, the JPG library has serious problems. This is a crude check,
-        // and won't work for resources. An app should not use this decoder for JPGs.
-        return decoder.useBuiltInDecoder(uriString.toLowerCase().endsWith(".png"));
+        decoder.useBuiltInDecoder(true);
+        return decoder;
     }
 
     @Override