Merge pull request opencv#9725 from dericcrago:fixed_boundary_spelling_in_comments

alalek · alalek · commit 7ff294dbe6a9 · 2017-09-27T12:04:23.000Z
diff --git a/modules/core/src/arithm.cpp b/modules/core/src/arithm.cpp
@@ -1823,7 +1823,7 @@ static bool ocl_inRange( InputArray _src, InputArray _lowerb,
     {
         if( !checkScalar(_lowerb, stype, lkind, skind) )
             CV_Error( CV_StsUnmatchedSizes,
-                     "The lower bounary is neither an array of the same size and same type as src, nor a scalar");
+                     "The lower boundary is neither an array of the same size and same type as src, nor a scalar");
         lbScalar = true;
     }
 
@@ -1832,7 +1832,7 @@ static bool ocl_inRange( InputArray _src, InputArray _lowerb,
     {
         if( !checkScalar(_upperb, stype, ukind, skind) )
             CV_Error( CV_StsUnmatchedSizes,
-                     "The upper bounary is neither an array of the same size and same type as src, nor a scalar");
+                     "The upper boundary is neither an array of the same size and same type as src, nor a scalar");
         ubScalar = true;
     }
 
@@ -1944,7 +1944,7 @@ void cv::inRange(InputArray _src, InputArray _lowerb,
     {
         if( !checkScalar(lb, src.type(), lkind, skind) )
             CV_Error( CV_StsUnmatchedSizes,
-                     "The lower bounary is neither an array of the same size and same type as src, nor a scalar");
+                     "The lower boundary is neither an array of the same size and same type as src, nor a scalar");
         lbScalar = true;
     }
 
@@ -1953,7 +1953,7 @@ void cv::inRange(InputArray _src, InputArray _lowerb,
     {
         if( !checkScalar(ub, src.type(), ukind, skind) )
             CV_Error( CV_StsUnmatchedSizes,
-                     "The upper bounary is neither an array of the same size and same type as src, nor a scalar");
+                     "The upper boundary is neither an array of the same size and same type as src, nor a scalar");
         ubScalar = true;
     }
 
diff --git a/modules/python/test/test_feature_homography.py b/modules/python/test/test_feature_homography.py
@@ -86,7 +86,7 @@ def test_feature_homography(self):
   p0     - matched points coords in target image
   p1     - matched points coords in input frame
   H      - homography matrix from p0 to p1
-  quad   - target bounary quad in input frame
+  quad   - target boundary quad in input frame
 '''
 TrackedTarget = namedtuple('TrackedTarget', 'target, p0, p1, H, quad')
 
diff --git a/samples/python/plane_tracker.py b/samples/python/plane_tracker.py
@@ -64,7 +64,7 @@
   p0     - matched points coords in target image
   p1     - matched points coords in input frame
   H      - homography matrix from p0 to p1
-  quad   - target bounary quad in input frame
+  quad   - target boundary quad in input frame
 '''
 TrackedTarget = namedtuple('TrackedTarget', 'target, p0, p1, H, quad')
 

Original file line number	Diff line number	Diff line change
`@@ -1823,7 +1823,7 @@ static bool ocl_inRange( InputArray _src, InputArray _lowerb,`
`1823`	`1823`	`{`
`1824`	`1824`	`if( !checkScalar(_lowerb, stype, lkind, skind) )`
`1825`	`1825`	`CV_Error( CV_StsUnmatchedSizes,`
`1826`		`- "The lower bounary is neither an array of the same size and same type as src, nor a scalar");`
	`1826`	`+ "The lower boundary is neither an array of the same size and same type as src, nor a scalar");`
`1827`	`1827`	`lbScalar = true;`
`1828`	`1828`	`}`
`1829`	`1829`
`@@ -1832,7 +1832,7 @@ static bool ocl_inRange( InputArray _src, InputArray _lowerb,`
`1832`	`1832`	`{`
`1833`	`1833`	`if( !checkScalar(_upperb, stype, ukind, skind) )`
`1834`	`1834`	`CV_Error( CV_StsUnmatchedSizes,`
`1835`		`- "The upper bounary is neither an array of the same size and same type as src, nor a scalar");`
	`1835`	`+ "The upper boundary is neither an array of the same size and same type as src, nor a scalar");`
`1836`	`1836`	`ubScalar = true;`
`1837`	`1837`	`}`
`1838`	`1838`
`@@ -1944,7 +1944,7 @@ void cv::inRange(InputArray _src, InputArray _lowerb,`
`1944`	`1944`	`{`
`1945`	`1945`	`if( !checkScalar(lb, src.type(), lkind, skind) )`
`1946`	`1946`	`CV_Error( CV_StsUnmatchedSizes,`
`1947`		`- "The lower bounary is neither an array of the same size and same type as src, nor a scalar");`
	`1947`	`+ "The lower boundary is neither an array of the same size and same type as src, nor a scalar");`
`1948`	`1948`	`lbScalar = true;`
`1949`	`1949`	`}`
`1950`	`1950`
`@@ -1953,7 +1953,7 @@ void cv::inRange(InputArray _src, InputArray _lowerb,`
`1953`	`1953`	`{`
`1954`	`1954`	`if( !checkScalar(ub, src.type(), ukind, skind) )`
`1955`	`1955`	`CV_Error( CV_StsUnmatchedSizes,`
`1956`		`- "The upper bounary is neither an array of the same size and same type as src, nor a scalar");`
	`1956`	`+ "The upper boundary is neither an array of the same size and same type as src, nor a scalar");`
`1957`	`1957`	`ubScalar = true;`
`1958`	`1958`	`}`
`1959`	`1959`