am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce

* commit 'cc7bcd0721735723c683b2f27267a52a76ff4244':
  Fix Curves

1 files changed, 30 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
index 56d75178e..a32068aeb 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
@@ -1,5 +1,7 @@
 package com.android.gallery3d.filtershow.filters;
 
+import android.util.Log;
+
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.ui.Spline;
 
@@ -7,6 +9,8 @@ import com.android.gallery3d.filtershow.ui.Spline;
  * TODO: Insert description here. (generated by hoford)
  */
 public class FilterCurvesRepresentation extends FilterRepresentation {
+    private static final String LOGTAG = "FilterCurvesRepresentation";
+
     private Spline[] mSplines = new Spline[4];
 
     public FilterCurvesRepresentation() {
@@ -21,10 +25,33 @@ public class FilterCurvesRepresentation extends FilterRepresentation {
         setShowParameterValue(false);
         setShowUtilityPanel(true);
         setSupportsPartialRendering(true);
-        for (int i = 0; i < mSplines.length; i++) {
-            mSplines[i] = new Spline();
-            mSplines[i].reset();
+        reset();
+    }
+
+    @Override
+    public FilterRepresentation clone() throws CloneNotSupportedException {
+        FilterCurvesRepresentation rep = new FilterCurvesRepresentation();
+        rep.useParametersFrom(this);
+        return rep;
+    }
+
+    @Override
+    public void useParametersFrom(FilterRepresentation a) {
+        if (!(a instanceof FilterCurvesRepresentation)) {
+            Log.v(LOGTAG, "cannot use parameters from " + a);
+            return;
+        }
+        FilterCurvesRepresentation representation = (FilterCurvesRepresentation) a;
+        Spline[] spline = new Spline[4];
+        for (int i = 0; i < spline.length; i++) {
+            Spline sp = representation.mSplines[i];
+            if (sp != null) {
+                spline[i] = new Spline(sp);
+            } else {
+                spline[i] = new Spline();
+            }
         }
+        mSplines = spline;
     }
 
     public boolean isNil() {