summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ta Chen <weita@google.com>2011-09-21 10:09:07 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-21 10:09:07 -0700
commit9e9aff5145a9c3e1e4e99fbd779cd3b9b3c20848 (patch)
tree4d91dce9e3c37c228090ad6ae557f89f42480f8f
parent2df78e141f055b39a0a8a15b0710c564f39f1368 (diff)
parentad5d193e3a8c65f623abeda4f88449e8ff7d27f2 (diff)
downloadLegacyCamera-9e9aff5145a9c3e1e4e99fbd779cd3b9b3c20848.zip
LegacyCamera-9e9aff5145a9c3e1e4e99fbd779cd3b9b3c20848.tar.gz
LegacyCamera-9e9aff5145a9c3e1e4e99fbd779cd3b9b3c20848.tar.bz2
Merge "Correct the YUV444 to NV21 conversion." into ics-factoryrom
-rw-r--r--jni/feature_mos_jni.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/feature_mos_jni.cpp b/jni/feature_mos_jni.cpp
index 4ad3db3..5d02793 100644
--- a/jni/feature_mos_jni.cpp
+++ b/jni/feature_mos_jni.cpp
@@ -635,7 +635,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_android_camera_panorama_Mosaic_getFinalMos
for(int i=0; i<mosaicWidth; i+=2)
{
V[j*mosaicWidth+i] = V[(2*j)*mosaicWidth+i]; // V
- V[j*mosaicWidth+i+1] = U[(2*j)*mosaicWidth+i+1]; // U
+ V[j*mosaicWidth+i+1] = U[(2*j)*mosaicWidth+i]; // U
}
}