From e4651fa697efbe0d6633725cba54b8560a4a6628 Mon Sep 17 00:00:00 2001
From: Alexey Spizhevoy <no@email>
Date: Tue, 20 Mar 2012 07:30:07 +0000
Subject: [PATCH] Fixed ensureInclusionConstraint

---
 modules/videostab/src/global_motion.cpp | 2 +-
 samples/cpp/videostab.cpp               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/videostab/src/global_motion.cpp b/modules/videostab/src/global_motion.cpp
index 4409d7884a..c8fd6b52ff 100644
--- a/modules/videostab/src/global_motion.cpp
+++ b/modules/videostab/src/global_motion.cpp
@@ -351,7 +351,7 @@ static inline bool isGoodMotion(const float M[], float w, float h, float dx, flo
     for (int i = 0; i < 4; ++i)
     {
         Mpt[i].x = M[0]*pt[i].x + M[1]*pt[i].y + M[2];
-        Mpt[i].x = M[3]*pt[i].x + M[4]*pt[i].y + M[5];
+        Mpt[i].y = M[3]*pt[i].x + M[4]*pt[i].y + M[5];
     }
 
     pt[0] = Point2f(dx, dy);
diff --git a/samples/cpp/videostab.cpp b/samples/cpp/videostab.cpp
index 23d9de8b62..08fd65be00 100644
--- a/samples/cpp/videostab.cpp
+++ b/samples/cpp/videostab.cpp
@@ -181,7 +181,8 @@ int main(int argc, const char **argv)
         if (!cmd.get<string>("trim-ratio").empty())
             stabilizer->setTrimRatio(cmd.get<float>("trim-ratio"));
 
-        stabilizer->setInclusionConstraint(cmd.get<string>("incl-constr") == "yes");
+        if (!cmd.get<string>("incl-constr").empty())
+            stabilizer->setInclusionConstraint(cmd.get<string>("incl-constr") == "yes");
 
         if (cmd.get<string>("border-mode") == "replicate")
             stabilizer->setBorderMode(BORDER_REPLICATE);