third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12424 from alalek:fix_build_avoid_nullptr

Browse Source
This commit is contained in:
Alexander Alekhin 2018-09-05 09:46:26 +00:00
commit 9fae8070dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cudaimgproc/src/canny.cpp
View File

@ -74,7 +74,7 @@ namespace
low_thresh_(low_thresh), high_thresh_(high_thresh), apperture_size_(apperture_size), L2gradient_(L2gradient) low_thresh_(low_thresh), high_thresh_(high_thresh), apperture_size_(apperture_size), L2gradient_(L2gradient)
{ {
old_apperture_size_ = -1; old_apperture_size_ = -1;
d_counter = nullptr; d_counter = NULL;
} }
void detect(InputArray image, OutputArray edges, Stream& stream); void detect(InputArray image, OutputArray edges, Stream& stream);

2
modules/videoio/src/cap_openni2.cpp
View File

@ -223,7 +223,7 @@ openni::VideoMode CvCapture_OpenNI2::defaultStreamOutputMode(int stream)
CvCapture_OpenNI2::CvCapture_OpenNI2(int index) : CvCapture_OpenNI2::CvCapture_OpenNI2(int index) :
CvCapture_OpenNI2(index, nullptr) CvCapture_OpenNI2(index, NULL)
{ } { }
CvCapture_OpenNI2::CvCapture_OpenNI2(const char * filename) : CvCapture_OpenNI2::CvCapture_OpenNI2(const char * filename) :