Gallery2: Integrate API changes for DDM 2.5.2 update

Integrate new API changes associated with the DDM 2.5.2 library.

Change-Id: I11135ea67716630e7bba26ba783db40f12988ee0

4 files changed, 11 insertions, 8 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java
index 3390898c8..86ad45f94 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamFusion.java
@@ -89,6 +89,7 @@ public class ImageFilterDualCamFusion extends ImageFilter {
             Rect originalBounds = MasterImage.getImage().getOriginalBounds();
             int filteredW;
             int filteredH;
+            int[] roiRect = new int[4];
 
             if(quality == FilterEnvironment.QUALITY_FINAL) {
                 filteredW = originalBounds.width();
@@ -113,7 +114,7 @@ public class ImageFilterDualCamFusion extends ImageFilter {
             filteredBitmap.setHasAlpha(true);
 
             result = DualCameraNativeEngine.getInstance().getForegroundImg(point.x, point.y,
-                    quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
+                    roiRect, quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
 
             if(result == false) {
                 Log.e(TAG, "Imagelib API failed");
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
index d9ae16967..30ce83438 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamSketch.java
@@ -83,6 +83,7 @@ public class ImageFilterDualCamSketch extends ImageFilter {
             Rect originalBounds = MasterImage.getImage().getOriginalBounds();
             int filteredW;
             int filteredH;
+            int[] roiRect = new int[4];
 
             if(quality == FilterEnvironment.QUALITY_FINAL) {
                 filteredW = originalBounds.width();
@@ -105,7 +106,7 @@ public class ImageFilterDualCamSketch extends ImageFilter {
 
             filteredBitmap = MasterImage.getImage().getBitmapCache().getBitmap(filteredW, filteredH, BitmapCache.FILTERS);
             result = DualCameraNativeEngine.getInstance().applySketch(point.x, point.y,
-                    quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
+                    roiRect, quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
 
             if(result == false) {
                 Log.e(TAG, "Imagelib API failed");
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
index c8206d511..bf9e498b1 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDualCamera.java
@@ -87,6 +87,7 @@ public class ImageFilterDualCamera extends ImageFilter {
             Rect originalBounds = MasterImage.getImage().getOriginalBounds();
             int filteredW;
             int filteredH;
+            int[] roiRect = new int[4];
 
             if(quality == FilterEnvironment.QUALITY_FINAL) {
                 filteredW = originalBounds.width();
@@ -112,11 +113,11 @@ public class ImageFilterDualCamera extends ImageFilter {
             switch(mParameters.getTextId()) {
             case R.string.focus:
                 result = DualCameraNativeEngine.getInstance().applyFocus(point.x, point.y, intensity,
-                        quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
+                        roiRect, quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
                 break;
             case R.string.halo:
                 result = DualCameraNativeEngine.getInstance().applyHalo(point.x, point.y, intensity,
-                        quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
+                        roiRect, quality != FilterEnvironment.QUALITY_FINAL, filteredBitmap);
                 break;
             }
 
diff --git a/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java b/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
index 902f54070..f44f4d6d1 100644
--- a/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
+++ b/src/com/android/gallery3d/filtershow/tools/DualCameraNativeEngine.java
@@ -94,11 +94,11 @@ public class DualCameraNativeEngine {
 
     native public boolean getDepthMap(Bitmap dataBuffer);
 
-    native public boolean applyFocus(int focusPointX, int focusPointY, float intensity, boolean isPreview, Bitmap outBm);
+    native public boolean applyFocus(int focusPointX, int focusPointY, float intensity, int[] roiRect, boolean isPreview, Bitmap outBm);
 
-    native public boolean applyHalo(int focusPointX, int focusPointY, float intensity, boolean isPreview, Bitmap outBm);
+    native public boolean applyHalo(int focusPointX, int focusPointY, float intensity, int[] roiRect, boolean isPreview, Bitmap outBm);
 
-    native public boolean applySketch(int focusPointX, int focusPointY, boolean isPreview, Bitmap outBm);
+    native public boolean applySketch(int focusPointX, int focusPointY, int[] roiRect, boolean isPreview, Bitmap outBm);
 
-    native public boolean getForegroundImg(int focusPointX, int focusPointY, boolean isPreview, Bitmap outBm);
+    native public boolean getForegroundImg(int focusPointX, int focusPointY, int[] roiRect, boolean isPreview, Bitmap outBm);
 }