commit 1a6e17e80ae4e27b2135259aeca29e889f12872d
author Zhijun He <zhijunhe@google.com> Mon Sep 16 10:38:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 16 10:38:13 2013 -0700
tree 4cded81a5625b1f10ec26e964d0a86fda65b275d
parent 1f8d7f61c07faa7ad566fe2329dcf7923f6221d0
parent 869f44cc320ecd3301c032dcdc21f243f7c3e8ec

am 869f44cc: Merge "ImageReader: get correct crop size" into klp-dev

* commit '869f44cc320ecd3301c032dcdc21f243f7c3e8ec':
  ImageReader: get correct crop size

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index 94f20bc..16b45be 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -739,11 +739,9 @@
     int outputHeight = buffer->height;
 
     // Correct width/height when crop is set.
-    if (buffer->crop.getWidth() > 0) {
-        outputWidth = buffer->crop.getWidth() + 1;
-    }
-    if (buffer->crop.getHeight() > 0) {
-        outputHeight = buffer->crop.getHeight() + 1;
+    if (buffer->crop.isValid()) {
+        outputWidth = buffer->crop.getWidth();
+        outputHeight = buffer->crop.getHeight();
     }
 
     int imageReaderWidth = ctx->getBufferWidth();