From 1fe7caeeaab314cd70d0b54f8f3dd3225c71c081 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Mon, 8 Apr 2013 20:07:47 -0700
Subject: Fix crash in curves

Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
---
 src/com/android/gallery3d/filtershow/ui/ImageCurves.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
index e5ffd8b68..7b881c7f5 100644
--- a/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
+++ b/src/com/android/gallery3d/filtershow/ui/ImageCurves.java
@@ -260,15 +260,22 @@ public class ImageCurves extends ImageShow {
             return true;
         }
 
-        float posX = e.getX() / getWidth();
-        float posY = e.getY();
         float margin = Spline.curveHandleSize() / 2;
+        float posX = e.getX();
+        if (posX < margin) {
+            posX = margin;
+        }
+        float posY = e.getY();
         if (posY < margin) {
             posY = margin;
         }
+        if (posX > getWidth() - margin) {
+            posX = getWidth() - margin;
+        }
         if (posY > getHeight() - margin) {
             posY = getHeight() - margin;
         }
+        posX = (posX - margin) / (getWidth() - 2 * margin);
         posY = (posY - margin) / (getHeight() - 2 * margin);
 
         if (e.getActionMasked() == MotionEvent.ACTION_UP) {
-- 
cgit v1.2.3