diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-07-19 22:51:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-19 22:51:46 +0000 |
| commit | 76d39416cba8f8fe9f09f3387c324895d72b7afc (patch) | |
| tree | 0e962cbec3bd3a05dad7998689b937115d075051 /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
| parent | c19f078c8a65c0b90b1d1b88e6f60f521a54ed1d (diff) | |
| parent | 58019558c7465a8dce8dfb49d68292a296c6b408 (diff) | |
| download | android_packages_apps_Snap-76d39416cba8f8fe9f09f3387c324895d72b7afc.tar.gz android_packages_apps_Snap-76d39416cba8f8fe9f09f3387c324895d72b7afc.tar.bz2 android_packages_apps_Snap-76d39416cba8f8fe9f09f3387c324895d72b7afc.zip | |
Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 41d178411..9508bdc21 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -59,7 +59,6 @@ import com.android.gallery3d.R; import com.android.gallery3d.app.PhotoPage; import com.android.gallery3d.data.LocalAlbum; import com.android.gallery3d.filtershow.pipeline.CachingPipeline; -import com.android.gallery3d.filtershow.pipeline.FilteringPipeline; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.category.Action; import com.android.gallery3d.filtershow.category.CategoryAdapter; @@ -546,6 +545,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL master.getOrientation(), bounds); master.setOriginalBounds(bounds); master.setOriginalBitmapHighres(originalHires); + mBoundService.setOriginalBitmapHighres(originalHires); master.warnListeners(); } return true; @@ -555,10 +555,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL protected void onPostExecute(Boolean result) { Bitmap highresBitmap = MasterImage.getImage().getOriginalBitmapHighres(); if (highresBitmap != null) { - FilteringPipeline pipeline = FilteringPipeline.getPipeline(); float highResPreviewScale = (float) highresBitmap.getWidth() / (float) MasterImage.getImage().getOriginalBounds().width(); - pipeline.setHighResPreviewScaleFactor(highResPreviewScale); + mBoundService.setHighresPreviewScaleFactor(highResPreviewScale); } } } @@ -611,15 +610,14 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL imageShow.setVisibility(View.VISIBLE); Bitmap largeBitmap = MasterImage.getImage().getOriginalBitmapLarge(); - FilteringPipeline pipeline = FilteringPipeline.getPipeline(); - pipeline.setOriginal(largeBitmap); + mBoundService.setOriginalBitmap(largeBitmap); + float previewScale = (float) largeBitmap.getWidth() / (float) MasterImage.getImage().getOriginalBounds().width(); - pipeline.setPreviewScaleFactor(previewScale); + mBoundService.setPreviewScaleFactor(previewScale); if (!mShowingTinyPlanet) { mCategoryFiltersAdapter.removeTinyPlanet(); } - pipeline.turnOnPipeline(true); MasterImage.getImage().setOriginalGeometry(largeBitmap); mCategoryLooksAdapter.imageLoaded(); mCategoryBordersAdapter.imageLoaded(); |