diff options
Diffstat (limited to 'src')
3 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 1b0318bc4..37d850fe7 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -983,7 +983,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL } } - public void completeSaveImage(Uri saveUri) { + public void completeSaveImage(Uri saveUri, boolean releaseDualCam) { if (mSharingImage && mSharedOutputFile != null) { // Image saved, we unblock the content provider Uri uri = Uri.withAppendedPath(SharedImageProvider.CONTENT_URI, @@ -993,6 +993,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL getContentResolver().insert(uri, values); } setResult(RESULT_OK, new Intent().setData(saveUri)); + if (releaseDualCam && DualCameraNativeEngine.getInstance().isLibLoaded()) + DualCameraNativeEngine.getInstance().releaseDepthMap(); hideSavingProgress(); finish(); } diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java b/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java index 801aee46b..2202e736b 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java @@ -125,7 +125,7 @@ public class ImageSavingTask extends ProcessingTask { @Override public void onResult(Result message) { URIResult result = (URIResult) message; - mProcessingService.completeSaveImage(result.uri, result.exit); + mProcessingService.completeSaveImage(result.uri, result.exit, true); } @Override diff --git a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java index dbf6a8d88..2dbf9295b 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java +++ b/src/com/android/gallery3d/filtershow/pipeline/ProcessingService.java @@ -267,11 +267,11 @@ public class ProcessingService extends Service { public void completePreviewSaveImage(Uri result, boolean exit) { if (exit && !mNeedsAlive && !mFiltershowActivity.isSimpleEditAction()) { - mFiltershowActivity.completeSaveImage(result); + mFiltershowActivity.completeSaveImage(result, false); } } - public void completeSaveImage(Uri result, boolean exit) { + public void completeSaveImage(Uri result, boolean exit, boolean releaseDualCam) { if (SHOW_IMAGE) { // TODO: we should update the existing image in Gallery instead Intent viewImage = new Intent(Intent.ACTION_VIEW, result); @@ -291,7 +291,7 @@ public class ProcessingService extends Service { mFiltershowActivity.updateUIAfterServiceStarted(); } else if (exit || mFiltershowActivity.isSimpleEditAction()) { // terminate now - mFiltershowActivity.completeSaveImage(result); + mFiltershowActivity.completeSaveImage(result, releaseDualCam); } } |