mirror of
https://github.com/opencv/opencv.git
synced 2026-09-12 13:23:03 -05:00
Merge pull request #29663 from Prasoon-Bodke:fix/houghlinesp-doc-shape-5.0
samples: fix HoughLines/HoughLinesP Python sample for 5.0 shape change (fixes #29637) - #29663 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake <!-- Note!!! If you are an automated agent, we have a special process for you: add 🤖🤖🤖 to the end of the PR title. --> Fixes #29637. OpenCV 5.0 changed vector-backed Mat/OutputArray to true 1D arrays (see migration guide: 1D and 0D array semantics). This changes HoughLines/ HoughLinesP Python return shape from (N,1,X) to (N,X), breaking the old indexing pattern used in the tutorial sample. Tested locally against opencv-python 5.0 — script runs without error, lines drawn correctly on samples/data/sudoku.png.
This commit is contained in:
@@ -29,17 +29,17 @@ def main():
|
||||
|
||||
if True: # HoughLinesP
|
||||
lines = cv.HoughLinesP(dst, 1, math.pi/180.0, 40, np.array([]), 50, 10)
|
||||
a, b, _c = lines.shape
|
||||
a, b = lines.shape
|
||||
for i in range(a):
|
||||
cv.line(cdst, (lines[i][0][0], lines[i][0][1]), (lines[i][0][2], lines[i][0][3]), (0, 0, 255), 3, cv.LINE_AA)
|
||||
cv.line(cdst, (lines[i][0], lines[i][1]), (lines[i][2], lines[i][3]), (0, 0, 255), 3, cv.LINE_AA)
|
||||
|
||||
else: # HoughLines
|
||||
lines = cv.HoughLines(dst, 1, math.pi/180.0, 50, np.array([]), 0, 0)
|
||||
if lines is not None:
|
||||
a, b, _c = lines.shape
|
||||
for i in range(a):
|
||||
rho = lines[i][0][0]
|
||||
theta = lines[i][0][1]
|
||||
num_lines, _ = lines.shape
|
||||
for i in range(num_lines):
|
||||
rho = lines[i][0]
|
||||
theta = lines[i][1]
|
||||
a = math.cos(theta)
|
||||
b = math.sin(theta)
|
||||
x0, y0 = a*rho, b*rho
|
||||
@@ -57,4 +57,4 @@ def main():
|
||||
if __name__ == '__main__':
|
||||
print(__doc__)
|
||||
main()
|
||||
cv.destroyAllWindows()
|
||||
cv.destroyAllWindows()
|
||||
@@ -39,9 +39,7 @@ def main(argv):
|
||||
## [draw_lines]
|
||||
# Draw the lines
|
||||
if lines is not None:
|
||||
for i in range(0, len(lines)):
|
||||
rho = lines[i][0][0]
|
||||
theta = lines[i][0][1]
|
||||
for rho, theta in lines.reshape(-1, 2):
|
||||
a = math.cos(theta)
|
||||
b = math.sin(theta)
|
||||
x0 = a * rho
|
||||
@@ -59,8 +57,9 @@ def main(argv):
|
||||
## [draw_lines_p]
|
||||
# Draw the lines
|
||||
if linesP is not None:
|
||||
for i in range(0, len(linesP)):
|
||||
l = linesP[i][0]
|
||||
num_lines, _ = linesP.shape
|
||||
for i in range(num_lines):
|
||||
l = linesP[i]
|
||||
cv.line(cdstP, (l[0], l[1]), (l[2], l[3]), (0,0,255), 3, cv.LINE_AA)
|
||||
## [draw_lines_p]
|
||||
## [imshow]
|
||||
@@ -76,4 +75,4 @@ def main(argv):
|
||||
## [exit]
|
||||
|
||||
if __name__ == "__main__":
|
||||
main(sys.argv[1:])
|
||||
main(sys.argv[1:])
|
||||
@@ -6,8 +6,7 @@ gray = cv.cvtColor(img,cv.COLOR_BGR2GRAY)
|
||||
edges = cv.Canny(gray,50,150,apertureSize = 3)
|
||||
|
||||
lines = cv.HoughLines(edges,1,np.pi/180,200)
|
||||
for line in lines:
|
||||
rho,theta = line[0]
|
||||
for rho, theta in lines.reshape(-1, 2):
|
||||
a = np.cos(theta)
|
||||
b = np.sin(theta)
|
||||
x0 = a*rho
|
||||
@@ -19,4 +18,4 @@ for line in lines:
|
||||
|
||||
cv.line(img,(x1,y1),(x2,y2),(0,0,255),2)
|
||||
|
||||
cv.imwrite('houghlines3.jpg',img)
|
||||
cv.imwrite('houghlines3.jpg',img)
|
||||
@@ -5,8 +5,9 @@ img = cv.imread(cv.samples.findFile('sudoku.png'))
|
||||
gray = cv.cvtColor(img,cv.COLOR_BGR2GRAY)
|
||||
edges = cv.Canny(gray,50,150,apertureSize = 3)
|
||||
lines = cv.HoughLinesP(edges,1,np.pi/180,100,minLineLength=100,maxLineGap=10)
|
||||
for line in lines:
|
||||
x1,y1,x2,y2 = line[0]
|
||||
num_lines, _ = lines.shape
|
||||
for i in range(num_lines):
|
||||
x1, y1, x2, y2 = lines[i]
|
||||
cv.line(img,(x1,y1),(x2,y2),(0,255,0),2)
|
||||
|
||||
cv.imwrite('houghlines5.jpg',img)
|
||||
cv.imwrite('houghlines5.jpg',img)
|
||||
Reference in New Issue
Block a user