Fix another potential crash in Curves

bug:7379140
Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080

2 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index 5b053dfd5..c4ca900e1 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -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);
diff --git a/src/com/android/gallery3d/filtershow/ui/Spline.java b/src/com/android/gallery3d/filtershow/ui/Spline.java
index 95197280c..dd9aac1be 100644
--- a/src/com/android/gallery3d/filtershow/ui/Spline.java
+++ b/src/com/android/gallery3d/filtershow/ui/Spline.java
@@ -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) {