nullptr -> 0

nynyg · nynyg · commit 7c55a71c2688 · 2017-07-04T09:20:31.000+02:00
diff --git a/modules/photometric_calib/include/opencv2/photometric_calib/GammaRemover.hpp b/modules/photometric_calib/include/opencv2/photometric_calib/GammaRemover.hpp
@@ -19,12 +19,12 @@ class CV_EXPORTS GammaRemover
 
     inline float* getG()
     {
-        if(!validGamma) return nullptr;
+        if(!validGamma) return 0;
         else return G;
     };
     inline float* getGInv()
     {
-        if(!validGamma) return nullptr;
+        if(!validGamma) return 0;
         else return GInv;
     };
 

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ class CV_EXPORTS GammaRemover`
`19`	`19`
`20`	`20`	`inline float* getG()`
`21`	`21`	`{`
`22`		`- if(!validGamma) return nullptr;`
	`22`	`+ if(!validGamma) return 0;`
`23`	`23`	`else return G;`
`24`	`24`	`};`
`25`	`25`	`inline float* getGInv()`
`26`	`26`	`{`
`27`		`- if(!validGamma) return nullptr;`
	`27`	`+ if(!validGamma) return 0;`
`28`	`28`	`else return GInv;`
`29`	`29`	`};`
`30`	`30`