Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d33fe6fd authored by nicolasroard's avatar nicolasroard
Browse files

Fix geometry updates 

Change-Id: I985f9f564db09924c172e01dda7915ecc3bba1ba
parent 3cd6fc8e

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+1 −4
Original line number Diff line number Diff line
@@ -598,9 +598,6 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 
        if (representation == null) {

            filterRepresentation = filterRepresentation.copy();

            copy.addFilter(filterRepresentation);

        } else if (filterRepresentation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {

            representation.useParametersFrom(filterRepresentation);

            filterRepresentation = representation;

        } else {

            if (filterRepresentation.allowsSingleInstanceOnly()) {

                // Don't just update the filter representation. Centralize the
@@ -746,7 +743,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL 


            Bitmap largeBitmap = MasterImage.getImage().getOriginalBitmapLarge();

            mBoundService.setOriginalBitmap(largeBitmap);

            MasterImage.getImage().resetGeometryImages();

            MasterImage.getImage().resetGeometryImages(true);



            float previewScale = (float) largeBitmap.getWidth()

                    / (float) MasterImage.getImage().getOriginalBounds().width();

src/com/android/gallery3d/filtershow/editors/Editor.java

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis 
        mEditTitle = editTitle;

        mFilterTitle = stateButton;

        mButton = editTitle;

        MasterImage.getImage().resetGeometryImages();

        MasterImage.getImage().resetGeometryImages(false);

        setMenuIcon(true);

        setUtilityPanelUI(actionButton, editControl);

    }
@@ -242,7 +242,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis 
        }

        if (mChangesGeometry) {

            // Regenerate both the filtered and the geometry-only bitmaps

            MasterImage.getImage().resetGeometryImages();

            MasterImage.getImage().resetGeometryImages(true);

        }

        // Regenerate the filtered bitmap.

        MasterImage.getImage().invalidateFiltersOnly();

src/com/android/gallery3d/filtershow/imageshow/MasterImage.java

+4 −3
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ public class MasterImage implements RenderingRequestCaller { 
            mHistory.addHistoryItem(historyItem);

        }

        updatePresets(true);

        resetGeometryImages(false);

        mActivity.updateCategories();

    }
@@ -333,11 +334,11 @@ public class MasterImage implements RenderingRequestCaller { 
        }

    }



    public void resetGeometryImages() {

    public void resetGeometryImages(boolean force) {

        ImagePreset newPresetGeometryOnly = new ImagePreset(mPreset);

        newPresetGeometryOnly.setDoApplyFilters(false);

        newPresetGeometryOnly.setDoApplyGeometry(true);

        if (mGeometryOnlyPreset == null

        if (force || mGeometryOnlyPreset == null

                || !newPresetGeometryOnly.same(mGeometryOnlyPreset)) {

            mGeometryOnlyPreset = newPresetGeometryOnly;

            RenderingRequest.post(mActivity, getOriginalBitmapLarge(),
@@ -346,7 +347,7 @@ public class MasterImage implements RenderingRequestCaller { 
        ImagePreset newPresetFiltersOnly = new ImagePreset(mPreset);

        newPresetFiltersOnly.setDoApplyFilters(true);

        newPresetFiltersOnly.setDoApplyGeometry(false);

        if (mFiltersOnlyPreset == null

        if (force || mFiltersOnlyPreset == null

                || !newPresetFiltersOnly.same(mFiltersOnlyPreset)) {

            mFiltersOnlyPreset = newPresetFiltersOnly;

            RenderingRequest.post(mActivity, MasterImage.getImage().getOriginalBitmapLarge(),