Skip to content

Remove references to deprecated NumPy type aliases. #3399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Remove references to deprecated NumPy type aliases. #3399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modules/aruco/misc/pattern_generator/MarkerPrinter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ def GenChessMarkerImage(filePath, chessboardSize, squareLength, subSize=None, pa
subChessboardBlockX = np.clip ( np.arange(0, subSize[0] * subDivide[0] + 1, subSize[0]), 0, chessboardSize[0])
subChessboardBlockY = np.clip ( np.arange(0, subSize[1] * subDivide[1] + 1, subSize[1]), 0, chessboardSize[1])

subChessboardSliceX = subChessboardBlockX.astype(np.float) * squareLength
subChessboardSliceY = subChessboardBlockY.astype(np.float) * squareLength
subChessboardSliceX = subChessboardBlockX.astype(float) * squareLength
subChessboardSliceY = subChessboardBlockY.astype(float) * squareLength

for subXID in range(subDivide[0]):
for subYID in range(subDivide[1]):
Expand Down Expand Up @@ -722,8 +722,8 @@ def GenCharucoMarkerImage(filePath, dictionary, chessboardSize, squareLength, ma
subChessboardBlockX = np.clip ( np.arange(0, subSize[0] * subDivide[0] + 1, subSize[0]), 0, chessboardSize[0])
subChessboardBlockY = np.clip ( np.arange(0, subSize[1] * subDivide[1] + 1, subSize[1]), 0, chessboardSize[1])

subChessboardSliceX = subChessboardBlockX.astype(np.float) * squareLength
subChessboardSliceY = subChessboardBlockY.astype(np.float) * squareLength
subChessboardSliceX = subChessboardBlockX.astype(float) * squareLength
subChessboardSliceY = subChessboardBlockY.astype(float) * squareLength

for subXID in range(subDivide[0]):
for subYID in range(subDivide[1]):
Expand Down Expand Up @@ -922,8 +922,8 @@ def GenArucoGridMarkerImage(filePath, dictionary, chessboardSize, markerLength,
subChessboardBlockX = np.clip ( np.arange(0, subSize[0] * subDivide[0] + 1, subSize[0]), 0, chessboardSize[0])
subChessboardBlockY = np.clip ( np.arange(0, subSize[1] * subDivide[1] + 1, subSize[1]), 0, chessboardSize[1])

subChessboardSliceX = subChessboardBlockX.astype(np.float) * (markerLength + markerSeparation)
subChessboardSliceY = subChessboardBlockY.astype(np.float) * (markerLength + markerSeparation)
subChessboardSliceX = subChessboardBlockX.astype(float) * (markerLength + markerSeparation)
subChessboardSliceY = subChessboardBlockY.astype(float) * (markerLength + markerSeparation)

subChessboardSliceX[-1] -= markerSeparation
subChessboardSliceY[-1] -= markerSeparation
Expand Down