Skip to content

Commit c78a8df

Browse files
alalekalalek
committed
fix 4.x links
1 parent be110d0 commit c78a8df

File tree

134 files changed

+334
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+334
-332
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
* Homepage: <https://opencv.org>
66
* Courses: <https://opencv.org/courses>
7-
* Docs: <https://docs.opencv.org/master/>
7+
* Docs: <https://docs.opencv.org/4.x/>
88
* Q&A forum: <https://forum.opencv.org>
99
* previous forum (read only): <http://answers.opencv.org>
1010
* Issue tracking: <https://github.com/opencv/opencv/issues>

‎apps/opencv_stitching_tool/opencv_stitching/blender.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ def prepare(self, corners, sizes):
3636
self.blender.prepare(dst_sz)
3737

3838
def feed(self, img, mask, corner):
39-
"""https://docs.opencv.org/master/d6/d4a/classcv_1_1detail_1_1Blender.html#a64837308bcf4e414a6219beff6cbe37a""" # noqa
39+
"""https://docs.opencv.org/4.x/d6/d4a/classcv_1_1detail_1_1Blender.html#a64837308bcf4e414a6219beff6cbe37a""" # noqa
4040
self.blender.feed(cv.UMat(img.astype(np.int16)), mask, corner)
4141

4242
def blend(self):
43-
"""https://docs.opencv.org/master/d6/d4a/classcv_1_1detail_1_1Blender.html#aa0a91ce0d6046d3a63e0123cbb1b5c00""" # noqa
43+
"""https://docs.opencv.org/4.x/d6/d4a/classcv_1_1detail_1_1Blender.html#aa0a91ce0d6046d3a63e0123cbb1b5c00""" # noqa
4444
result = None
4545
result_mask = None
4646
result, result_mask = self.blender.blend(result, result_mask)

‎apps/opencv_stitching_tool/opencv_stitching/camera_adjuster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
class CameraAdjuster:
9-
"""https://docs.opencv.org/master/d5/d56/classcv_1_1detail_1_1BundleAdjusterBase.html""" # noqa
9+
"""https://docs.opencv.org/4.x/d5/d56/classcv_1_1detail_1_1BundleAdjusterBase.html""" # noqa
1010

1111
CAMERA_ADJUSTER_CHOICES = OrderedDict()
1212
CAMERA_ADJUSTER_CHOICES['ray'] = cv.detail_BundleAdjusterRay

‎apps/opencv_stitching_tool/opencv_stitching/camera_wave_corrector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class WaveCorrector:
7-
"""https://docs.opencv.org/master/d7/d74/group__stitching__rotation.html#ga83b24d4c3e93584986a56d9e43b9cf7f""" # noqa
7+
"""https://docs.opencv.org/4.x/d7/d74/group__stitching__rotation.html#ga83b24d4c3e93584986a56d9e43b9cf7f""" # noqa
88
WAVE_CORRECT_CHOICES = OrderedDict()
99
WAVE_CORRECT_CHOICES['horiz'] = cv.detail.WAVE_CORRECT_HORIZ
1010
WAVE_CORRECT_CHOICES['vert'] = cv.detail.WAVE_CORRECT_VERT

‎apps/opencv_stitching_tool/opencv_stitching/exposure_error_compensator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def __init__(self,
3232
)
3333

3434
def feed(self, *args):
35-
"""https://docs.opencv.org/master/d2/d37/classcv_1_1detail_1_1ExposureCompensator.html#ae6b0cc69a7bc53818ddea53eddb6bdba""" # noqa
35+
"""https://docs.opencv.org/4.x/d2/d37/classcv_1_1detail_1_1ExposureCompensator.html#ae6b0cc69a7bc53818ddea53eddb6bdba""" # noqa
3636
self.compensator.feed(*args)
3737

3838
def apply(self, *args):
39-
"""https://docs.opencv.org/master/d2/d37/classcv_1_1detail_1_1ExposureCompensator.html#a473eaf1e585804c08d77c91e004f93aa""" # noqa
39+
"""https://docs.opencv.org/4.x/d2/d37/classcv_1_1detail_1_1ExposureCompensator.html#a473eaf1e585804c08d77c91e004f93aa""" # noqa
4040
return self.compensator.apply(*args)

‎apps/opencv_stitching_tool/opencv_stitching/feature_matcher.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ def __init__(self,
1515
**kwargs):
1616

1717
if matcher_type == "affine":
18-
"""https://docs.opencv.org/master/d3/dda/classcv_1_1detail_1_1AffineBestOf2NearestMatcher.html""" # noqa
18+
"""https://docs.opencv.org/4.x/d3/dda/classcv_1_1detail_1_1AffineBestOf2NearestMatcher.html""" # noqa
1919
self.matcher = cv.detail_AffineBestOf2NearestMatcher(**kwargs)
2020
elif range_width == -1:
21-
"""https://docs.opencv.org/master/d4/d26/classcv_1_1detail_1_1BestOf2NearestMatcher.html""" # noqa
21+
"""https://docs.opencv.org/4.x/d4/d26/classcv_1_1detail_1_1BestOf2NearestMatcher.html""" # noqa
2222
self.matcher = cv.detail.BestOf2NearestMatcher_create(**kwargs)
2323
else:
24-
"""https://docs.opencv.org/master/d8/d72/classcv_1_1detail_1_1BestOf2NearestRangeMatcher.html""" # noqa
24+
"""https://docs.opencv.org/4.x/d8/d72/classcv_1_1detail_1_1BestOf2NearestRangeMatcher.html""" # noqa
2525
self.matcher = cv.detail.BestOf2NearestRangeMatcher_create(
2626
range_width, **kwargs
2727
)

‎apps/opencv_stitching_tool/opencv_stitching/seam_finder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
class SeamFinder:
9-
"""https://docs.opencv.org/master/d7/d09/classcv_1_1detail_1_1SeamFinder.html""" # noqa
9+
"""https://docs.opencv.org/4.x/d7/d09/classcv_1_1detail_1_1SeamFinder.html""" # noqa
1010
SEAM_FINDER_CHOICES = OrderedDict()
1111
SEAM_FINDER_CHOICES['dp_color'] = cv.detail_DpSeamFinder('COLOR')
1212
SEAM_FINDER_CHOICES['dp_colorgrad'] = cv.detail_DpSeamFinder('COLOR_GRAD')
@@ -19,7 +19,7 @@ def __init__(self, finder=DEFAULT_SEAM_FINDER):
1919
self.finder = SeamFinder.SEAM_FINDER_CHOICES[finder]
2020

2121
def find(self, imgs, corners, masks):
22-
"""https://docs.opencv.org/master/d0/dd5/classcv_1_1detail_1_1DpSeamFinder.html#a7914624907986f7a94dd424209a8a609""" # noqa
22+
"""https://docs.opencv.org/4.x/d0/dd5/classcv_1_1detail_1_1DpSeamFinder.html#a7914624907986f7a94dd424209a8a609""" # noqa
2323
imgs_float = [img.astype(np.float32) for img in imgs]
2424
return self.finder.find(imgs_float, corners, masks)
2525

‎apps/opencv_stitching_tool/opencv_stitching/test/SAMPLE_IMAGES_TO_DOWNLOAD.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
https://github.com/opencv/opencv_extra/tree/master/testdata/stitching
1+
https://github.com/opencv/opencv_extra/tree/4.x/testdata/stitching
22

33
s1.jpg s2.jpg
44
boat1.jpg boat2.jpg boat3.jpg boat4.jpg boat5.jpg boat6.jpg

‎apps/opencv_stitching_tool/opencv_stitching/test/stitching_detailed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def main():
317317
sizes = []
318318
blender = None
319319
timelapser = None
320-
# https://github.com/opencv/opencv/blob/master/samples/cpp/stitching_detailed.cpp#L725 ?
320+
# https://github.com/opencv/opencv/blob/4.x/samples/cpp/stitching_detailed.cpp#L725 ?
321321
for idx, name in enumerate(img_names):
322322
full_img = cv.imread(name)
323323
if not is_compose_scale_set:

‎apps/opencv_stitching_tool/opencv_stitching/timelapser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, timelapse=DEFAULT_TIMELAPSE):
2626
)
2727

2828
def initialize(self, *args):
29-
"""https://docs.opencv.org/master/dd/dac/classcv_1_1detail_1_1Timelapser.html#aaf0f7c4128009f02473332a0c41f6345""" # noqa
29+
"""https://docs.opencv.org/4.x/dd/dac/classcv_1_1detail_1_1Timelapser.html#aaf0f7c4128009f02473332a0c41f6345""" # noqa
3030
self.timelapser.initialize(*args)
3131

3232
def process_and_save_frame(self, img_name, img, corner):

0 commit comments

Comments
 (0)