diff --git a/doc/opencv.bib b/doc/opencv.bib index 8ada758c27..3c3c43936d 100644 --- a/doc/opencv.bib +++ b/doc/opencv.bib @@ -1431,14 +1431,6 @@ publisher = {Kluwer Academic Publishers}, url = {https://www.face-rec.org/algorithms/Boosting-Ensemble/16981346.pdf} } -@inproceedings{wang2016iros, - author = {John Wang and Edwin Olson}, - title = {{AprilTag} 2: Efficient and robust fiducial detection}, - booktitle = {Proceedings of the {IEEE/RSJ} International Conference on Intelligent Robots and Systems {(IROS)}}, - year = {2016}, - month = {October}, - url = {https://april.eecs.umich.edu/pdfs/wang2016iros.pdf} -} @misc{Welch95, author = {Welch, Greg and Bishop, Gary}, title = {An introduction to the Kalman filter}, diff --git a/modules/flann/include/opencv2/flann/general.h b/modules/flann/include/opencv2/flann/general.h index e65cba2f8a..11ea2af645 100644 --- a/modules/flann/include/opencv2/flann/general.h +++ b/modules/flann/include/opencv2/flann/general.h @@ -54,12 +54,12 @@ public: #define FLANN_THROW(TYPE, STR) throw FLANNException(STR) +//! @endcond + #else #define FLANN_THROW(TYPE, STR) CV_Error(TYPE, STR) #endif -//! @endcond - #endif /* OPENCV_FLANN_GENERAL_H_ */ diff --git a/modules/imgcodecs/include/opencv2/imgcodecs.hpp b/modules/imgcodecs/include/opencv2/imgcodecs.hpp index a2ce8963b0..cb020e4c4e 100644 --- a/modules/imgcodecs/include/opencv2/imgcodecs.hpp +++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp @@ -184,7 +184,7 @@ enum ImwriteTiffResolutionUnitFlags { }; enum ImwriteEXRTypeFlags { - /*IMWRITE_EXR_TYPE_UNIT = 0, //!< not supported */ + // IMWRITE_EXR_TYPE_UNIT = 0, // not supported IMWRITE_EXR_TYPE_HALF = 1, //!< store as HALF (FP16) IMWRITE_EXR_TYPE_FLOAT = 2 //!< store as FP32 (default) }; diff --git a/modules/objdetect/doc/objdetect.bib b/modules/objdetect/doc/objdetect.bib index f3623732d5..9f7f06e672 100644 --- a/modules/objdetect/doc/objdetect.bib +++ b/modules/objdetect/doc/objdetect.bib @@ -16,7 +16,8 @@ title = {{AprilTag} 2: Efficient and robust fiducial detection}, booktitle = {Proceedings of the {IEEE/RSJ} International Conference on Intelligent Robots and Systems {(IROS)}}, year = {2016}, - month = {October} + month = {October}, + url = {https://april.eecs.umich.edu/pdfs/wang2016iros.pdf} } @mastersthesis{Xiangmin2015research,