diff --git a/doc/js_tutorials/js_assets/js_camshift.html b/doc/js_tutorials/js_assets/js_camshift.html index 046ab20efd981836b0a45b190c705c1d3dedbab1..b2d10751fac242fb78ef109ccdaa5f8377868270 100644 --- a/doc/js_tutorials/js_assets/js_camshift.html +++ b/doc/js_tutorials/js_assets/js_camshift.html @@ -77,7 +77,7 @@ cv.normalize(roiHist, roiHist, 0, 255, cv.NORM_MINMAX); // delete useless mats. roi.delete(); hsvRoi.delete(); mask.delete(); low.delete(); high.delete(); hsvRoiVec.delete(); -// Setup the termination criteria, either 10 iteration or move by atleast 1 pt +// Setup the termination criteria, either 10 iteration or move by at least 1 pt let termCrit = new cv.TermCriteria(cv.TERM_CRITERIA_EPS | cv.TERM_CRITERIA_COUNT, 10, 1); let hsv = new cv.Mat(video.height, video.width, cv.CV_8UC3); diff --git a/doc/js_tutorials/js_assets/js_meanshift.html b/doc/js_tutorials/js_assets/js_meanshift.html index 9e29002c8d9bb9fab87eadba87bff54915a27c7c..958539bedefbcedd201ff14367775a6f8e8f8330 100644 --- a/doc/js_tutorials/js_assets/js_meanshift.html +++ b/doc/js_tutorials/js_assets/js_meanshift.html @@ -77,7 +77,7 @@ cv.normalize(roiHist, roiHist, 0, 255, cv.NORM_MINMAX); // delete useless mats. roi.delete(); hsvRoi.delete(); mask.delete(); low.delete(); high.delete(); hsvRoiVec.delete(); -// Setup the termination criteria, either 10 iteration or move by atleast 1 pt +// Setup the termination criteria, either 10 iteration or move by at least 1 pt let termCrit = new cv.TermCriteria(cv.TERM_CRITERIA_EPS | cv.TERM_CRITERIA_COUNT, 10, 1); let hsv = new cv.Mat(video.height, video.width, cv.CV_8UC3); diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index e48e2470ceab136224ad3082cd881159701a00dc..8339a1d7d2dc0e9425bfc6a98c4476c90351385c 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -55,7 +55,7 @@ if(HAVE_QT) QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc) QT5_WRAP_CPP(_MOC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.h) else() - message(FATAL_ERROR "Unsuported QT version: ${QT_VERSION_MAJOR}") + message(FATAL_ERROR "Unsupported QT version: ${QT_VERSION_MAJOR}") endif() list(APPEND highgui_srcs diff --git a/modules/js/generator/embindgen.py b/modules/js/generator/embindgen.py index 7eb20c98615c1a3c15baddcf5065ba8a6992513a..784c463f3412f9415e4732b6db948191b82d1531 100644 --- a/modules/js/generator/embindgen.py +++ b/modules/js/generator/embindgen.py @@ -484,7 +484,7 @@ class JSWrapperGenerator(object): arg_types.append(arg_type) unwrapped_arg_types.append(arg_type) - # Function attribure + # Function attribute func_attribs = '' if '*' in ''.join(arg_types): func_attribs += ', allow_raw_pointers()' @@ -679,7 +679,7 @@ class JSWrapperGenerator(object): def_args.append(arg.defval) arg_types.append(orig_arg_types[-1]) - # Function attribure + # Function attribute func_attribs = '' if '*' in ''.join(orig_arg_types): func_attribs += ', allow_raw_pointers()' diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py index c2e4d6532b7f89f8f3ddc575f2ee01d35b9166f8..bb17aa884fe5e83d9f8ae66f4bbf300d28bfda93 100755 --- a/modules/ts/misc/run.py +++ b/modules/ts/misc/run.py @@ -105,7 +105,7 @@ if __name__ == "__main__": path = args.build_path try: if not os.path.isdir(path): - raise Err("Not a directory (should contain CMakeCache.txt ot test executables)") + raise Err("Not a directory (should contain CMakeCache.txt to test executables)") cache = CMakeCache(args.configuration) fname = os.path.join(path, "CMakeCache.txt") diff --git a/platforms/winpack_dldt/build_package.py b/platforms/winpack_dldt/build_package.py index 0194323930e6289d82fe20ab60fc63d2da49c115..0292b028b86871b7c50f0f975216c7f96f9d37f7 100644 --- a/platforms/winpack_dldt/build_package.py +++ b/platforms/winpack_dldt/build_package.py @@ -163,7 +163,7 @@ class BuilderDLDT: self.config = config cpath = self.config.dldt_config - log.info('DLDT build configration: %s', cpath) + log.info('DLDT build configuration: %s', cpath) if not os.path.exists(cpath): cpath = os.path.join(SCRIPT_DIR, cpath) if not os.path.exists(cpath): @@ -573,5 +573,5 @@ if __name__ == "__main__": try: main() except: - log.info('FATAL: Error occured. To investigate problem try to change logging level using LOGLEVEL=DEBUG environment variable.') + log.info('FATAL: Error occurred. To investigate problem try to change logging level using LOGLEVEL=DEBUG environment variable.') raise diff --git a/samples/dnn/dasiamrpn_tracker.py b/samples/dnn/dasiamrpn_tracker.py index 03e99d6dbffaf54882b4e23a389eea1e2b077c62..1f329423a32548ac45f5fb7b22d5a5c1d0bbcecb 100644 --- a/samples/dnn/dasiamrpn_tracker.py +++ b/samples/dnn/dasiamrpn_tracker.py @@ -226,7 +226,7 @@ def main(): mark = True drawing = False cx, cy, w, h = 0.0, 0.0, 0, 0 - # Fucntion for drawing during videostream + # Function for drawing during videostream def get_bb(event, x, y, flag, param): nonlocal point1, point2, cx, cy, w, h, drawing, mark diff --git a/samples/dnn/siamrpnpp.py b/samples/dnn/siamrpnpp.py index c7c49b1b85d9ae8941e4f4fedde23fc5c037eb66..d2eae9f7e2315ea780bd6bc07e2bf9a58ba1c201 100644 --- a/samples/dnn/siamrpnpp.py +++ b/samples/dnn/siamrpnpp.py @@ -300,7 +300,7 @@ class SiamRPNTracker: # clip boundary cx, cy, width, height = self._bbox_clip(cx, cy, width, height, img.shape[:2]) - # udpate state + # update state self.center_pos = np.array([cx, cy]) self.w = width self.h = height diff --git a/samples/python/tutorial_code/video/meanshift/camshift.py b/samples/python/tutorial_code/video/meanshift/camshift.py index d115bdb4d33e0eec3c367b5230afd0079cfde868..774e8b6c0e4ef7ca7e32b8881e652098ddbfc69f 100644 --- a/samples/python/tutorial_code/video/meanshift/camshift.py +++ b/samples/python/tutorial_code/video/meanshift/camshift.py @@ -24,7 +24,7 @@ mask = cv.inRange(hsv_roi, np.array((0., 60.,32.)), np.array((180.,255.,255.))) roi_hist = cv.calcHist([hsv_roi],[0],mask,[180],[0,180]) cv.normalize(roi_hist,roi_hist,0,255,cv.NORM_MINMAX) -# Setup the termination criteria, either 10 iteration or move by atleast 1 pt +# Setup the termination criteria, either 10 iteration or move by at least 1 pt term_crit = ( cv.TERM_CRITERIA_EPS | cv.TERM_CRITERIA_COUNT, 10, 1 ) while(1): diff --git a/samples/python/tutorial_code/video/meanshift/meanshift.py b/samples/python/tutorial_code/video/meanshift/meanshift.py index f765b023e920363b269389ab52d24e4deeb3663e..ecdd573cb164329d307543e870cf492f340fc82d 100644 --- a/samples/python/tutorial_code/video/meanshift/meanshift.py +++ b/samples/python/tutorial_code/video/meanshift/meanshift.py @@ -24,7 +24,7 @@ mask = cv.inRange(hsv_roi, np.array((0., 60.,32.)), np.array((180.,255.,255.))) roi_hist = cv.calcHist([hsv_roi],[0],mask,[180],[0,180]) cv.normalize(roi_hist,roi_hist,0,255,cv.NORM_MINMAX) -# Setup the termination criteria, either 10 iteration or move by atleast 1 pt +# Setup the termination criteria, either 10 iteration or move by at least 1 pt term_crit = ( cv.TERM_CRITERIA_EPS | cv.TERM_CRITERIA_COUNT, 10, 1 ) while(1):