opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-25 04:26:17 +08:00
Code Issues Releases Wiki Activity

Merge pull request #822 from paroj:aruco_round

Browse Source
This commit is contained in:
Alexander Alekhin
2016-10-20 15:20:41 +00:00
parent 0014f1d0cb 2bf5b806bc
commit 604adc09ee
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aruco/src/aruco.cpp
View File

@@ -1505,7 +1505,7 @@ void _drawPlanarBoardImpl(Board *_board, Size outSize, OutputArray _img, int mar
pf -= Point2f(minX, minY); pf -= Point2f(minX, minY);
pf.x = pf.x / sizeX * float(out.cols); pf.x = pf.x / sizeX * float(out.cols);
pf.y = (1.0f - pf.y / sizeY) * float(out.rows); pf.y = (1.0f - pf.y / sizeY) * float(out.rows);
outCorners[j] = Point(pf); outCorners[j] = pf;
} }
// get marker // get marker

2
modules/aruco/src/dictionary.cpp
View File

@@ -163,7 +163,7 @@ int Dictionary::getDistanceToId(InputArray bits, int id, bool allRotations) cons
*/ */
void Dictionary::drawMarker(int id, int sidePixels, OutputArray _img, int borderBits) const { void Dictionary::drawMarker(int id, int sidePixels, OutputArray _img, int borderBits) const {
CV_Assert(sidePixels > markerSize); CV_Assert(sidePixels >= (markerSize + 2*borderBits));
CV_Assert(id < bytesList.rows); CV_Assert(id < bytesList.rows);
CV_Assert(borderBits > 0); CV_Assert(borderBits > 0);