potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

imgproc: revert #13843

Browse Source 
This reverts commit 00e8c7810f
This commit is contained in:
Alexander Alekhin
2019-03-13 15:07:37 +03:00
parent a534af68b8
commit f73b4f4a26
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/include/opencv2/imgproc.hpp
+2 -10
View File
@@ -4689,15 +4689,7 @@ public:
not to depend on the ordering of pt1 and pt2 parameters
*/
LineIterator( const Mat& img, Point pt1, Point pt2,
int connectivity = 8, bool leftToRight = false ) {
init(img.size(), img.type(), (uchar*)img.ptr(), img.step1()*img.elemSize1(), pt1, pt2, connectivity, leftToRight);
}
LineIterator( const Size& size, int type, Point pt1, Point pt2,
int connectivity = 8, bool leftToRight = false ) {
init(size, type, 0, CV_ELEM_SIZE(type)*size.width, pt1, pt2, connectivity, leftToRight);
}
void init(const Size& size, int type, uchar* data, size_t dataStep, Point pt1, Point pt2, int connectivity = 8, bool leftToRight = false);
int connectivity = 8, bool leftToRight = false );
/** @brief returns pointer to the current pixel
*/
uchar* operator *();
@@ -4726,7 +4718,7 @@ public:
inline
uchar* LineIterator::operator *()
{
return !ptr0 ? 0 : ptr;//when no Mat is attached, ptr is just a dummy address and should not be dereferenced
return ptr;
}
inline