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

Commit 5d7e98f7 authored by nicolasroard's avatar nicolasroard
Browse files

Fix another potential crash in Curves 

bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
parent 361f6234

src/com/android/gallery3d/filtershow/ui/ImageCurves.java

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class ImageCurves extends ImageSlave { 
        if (mCurrentControlPoint == null) {

            if (pick == -1) {

                mCurrentControlPoint = new ControlPoint(posX, posY);

                spline.addPoint(mCurrentControlPoint);

                pick = spline.addPoint(mCurrentControlPoint);

                mDidAddPoint = true;

            } else {

                mCurrentControlPoint = spline.getPoint(pick);

src/com/android/gallery3d/filtershow/ui/Spline.java

+7 −3
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ public class Spline { 
    }



    public void movePoint(int pick, float x, float y) {

        if (pick < 0 || pick > mPoints.size() - 1) {

            return;

        }

        ControlPoint point = mPoints.elementAt(pick);

        point.x = x;

        point.y = y;
@@ -345,13 +348,14 @@ public class Spline { 
        return solution;

    }



    public void addPoint(float x, float y) {

        addPoint(new ControlPoint(x, y));

    public int addPoint(float x, float y) {

        return addPoint(new ControlPoint(x, y));

    }



    public void addPoint(ControlPoint v) {

    public int addPoint(ControlPoint v) {

        mPoints.add(v);

        Collections.sort(mPoints);

        return mPoints.indexOf(v);

    }



    public void deletePoint(int n) {