From 239d3dad97c82d9db7679868658658a920deaecd Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 7 Mar 2023 16:56:51 +0100 Subject: [PATCH] Update for opencv 4.7 --- tracking/Makefile | 10 ++++++++++ tracking/make_markers.py | 6 +++--- tracking/markers.pdf | Bin 8457 -> 28265 bytes 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 tracking/Makefile diff --git a/tracking/Makefile b/tracking/Makefile new file mode 100644 index 0000000..040e44d --- /dev/null +++ b/tracking/Makefile @@ -0,0 +1,10 @@ +all: markers.pdf + +clean: + rm -f markers.pdf markers.png + +markers.pdf: markers.png + convert $< -density 254 $@ + +markers.png: make_markers.py + ./make_markers.py diff --git a/tracking/make_markers.py b/tracking/make_markers.py index f2cb274..a4bae3e 100755 --- a/tracking/make_markers.py +++ b/tracking/make_markers.py @@ -27,13 +27,13 @@ def main(): stamp(page, cv2.aruco.drawCharucoDiamond(d, (4, 5, 6, 7), 160, 96), 220, 1220) cv2.putText(page, 'back', (220, 1170), 0, 2, 0, 2) - stamp(page, cv2.aruco.drawMarker(d, 8, 200), 1220, 220) + stamp(page, cv2.aruco.generateImageMarker(d, 8, 200), 1220, 220) cv2.putText(page, 'top', (1220, 170), 0, 2, 0, 2) - stamp(page, cv2.aruco.drawMarker(d, 9, 200), 1220, 620) + stamp(page, cv2.aruco.generateImageMarker(d, 9, 200), 1220, 620) cv2.putText(page, 'left', (1220, 570), 0, 2, 0, 2) - stamp(page, cv2.aruco.drawMarker(d, 10, 200), 1220, 1020) + stamp(page, cv2.aruco.generateImageMarker(d, 10, 200), 1220, 1020) cv2.putText(page, 'right', (1220, 970), 0, 2, 0, 2) cv2.imwrite('markers.png', page) diff --git a/tracking/markers.pdf b/tracking/markers.pdf index 6e18c6e376b558bb31e8dc38e4fac2f8903e70b6..ea9330bfb9b2842e1610ac00fb3fef7e5e4c38a1 100644 GIT binary patch literal 28265 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 literal 8457 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