summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-04-15 01:28:20 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-04-15 01:28:20 -0700
commit2cb1d1e958af8847ea5110391f0dfa5dc2cb4435 (patch)
treef2af0884778771cb3b6550ae490f0daed50dc961 /jni
parent7e95ae042a0ae839a1311ef7523bc49a5f449d30 (diff)
parent45e416fcc3feff470419aae4ed9360ddfacce94d (diff)
downloadandroid_packages_apps_Snap-2cb1d1e958af8847ea5110391f0dfa5dc2cb4435.tar.gz
android_packages_apps_Snap-2cb1d1e958af8847ea5110391f0dfa5dc2cb4435.tar.bz2
android_packages_apps_Snap-2cb1d1e958af8847ea5110391f0dfa5dc2cb4435.zip
Merge "SnapdragonCamera: fix messy photo in Panorama mode"
Diffstat (limited to 'jni')
-rw-r--r--jni/feature_mos/src/mosaic/Blend.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp
index 098047705..fce89c6e1 100644
--- a/jni/feature_mos/src/mosaic/Blend.cpp
+++ b/jni/feature_mos/src/mosaic/Blend.cpp
@@ -875,7 +875,7 @@ void Blend::ComputeMask(CSite *csite, BlendRect &vcrect, BlendRect &brect, Mosai
{
double d1 = hypotSq(m_AllSites[ce->second].getVCenter().x - si,
m_AllSites[ce->second].getVCenter().y - sj);
- if (d1 < dself)
+ if (d1 - dself < -1e-5)
{
break;
}