提交 9fae8070 编写于 作者: A Alexander Alekhin

Merge pull request #12424 from alalek:fix_build_avoid_nullptr

......@@ -74,7 +74,7 @@ namespace
low_thresh_(low_thresh), high_thresh_(high_thresh), apperture_size_(apperture_size), L2gradient_(L2gradient)
{
old_apperture_size_ = -1;
d_counter = nullptr;
d_counter = NULL;
}
void detect(InputArray image, OutputArray edges, Stream& stream);
......
......@@ -223,7 +223,7 @@ openni::VideoMode CvCapture_OpenNI2::defaultStreamOutputMode(int stream)
CvCapture_OpenNI2::CvCapture_OpenNI2(int index) :
CvCapture_OpenNI2(index, nullptr)
CvCapture_OpenNI2(index, NULL)
{ }
CvCapture_OpenNI2::CvCapture_OpenNI2(const char * filename) :
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册