From c441ad36c881c61deab230f8be920a1289ae8009 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 5 Sep 2018 06:19:02 +0000 Subject: [PATCH] build: don't use nullptr without C++11 guard --- modules/cudaimgproc/src/canny.cpp | 2 +- modules/videoio/src/cap_openni2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cudaimgproc/src/canny.cpp b/modules/cudaimgproc/src/canny.cpp index 9a1125d1cd..b4b4cd3000 100644 --- a/modules/cudaimgproc/src/canny.cpp +++ b/modules/cudaimgproc/src/canny.cpp @@ -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); diff --git a/modules/videoio/src/cap_openni2.cpp b/modules/videoio/src/cap_openni2.cpp index 9a67a417f6..a63732a9d8 100644 --- a/modules/videoio/src/cap_openni2.cpp +++ b/modules/videoio/src/cap_openni2.cpp @@ -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) :