Merge pull request shimat#46 from codingTornado/master

shimat · shimat · commit cf0a59a8bd4e · 2014-08-27T13:21:15.000+09:00
Fixed a bug on video_background_segm.h
diff --git a/src/OpenCvSharpExtern/video_background_segm.h b/src/OpenCvSharpExtern/video_background_segm.h
@@ -2,8 +2,8 @@
 #pragma once
 #endif
 
-#ifndef _CPP_VIDEO_TRACKING_H_
-#define _CPP_VIDEO_TRACKING_H_
+#ifndef _CPP_VIDEO_BACKGROUND_SEGM_H_
+#define _CPP_VIDEO_BACKGROUND_SEGM_H_
 
 #include "include_opencv.h"
 
@@ -35,11 +35,11 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractor_info(cv::BackgroundSubtract
 // BackgroundSubtractorMOG
 CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG>*) video_BackgroundSubtractorMOG_new1()
 {
-	return wrap(new cv::BackgroundSubtractorMOG());
+	return new cv::Ptr<cv::BackgroundSubtractorMOG>(new cv::BackgroundSubtractorMOG());
 }
 CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG>*) video_BackgroundSubtractorMOG_new2(int history, int nmixtures, double backgroundRatio, double noiseSigma)
 {
-	return wrap(new cv::BackgroundSubtractorMOG(history, nmixtures, backgroundRatio, noiseSigma));
+	return new cv::Ptr<cv::BackgroundSubtractorMOG>(new cv::BackgroundSubtractorMOG(history, nmixtures, backgroundRatio, noiseSigma));
 }
 CVAPI(void) video_BackgroundSubtractorMOG_delete(cv::BackgroundSubtractorMOG *obj)
 {
@@ -72,12 +72,12 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractorMOG_info(cv::BackgroundSubtr
 // BackgroundSubtractorMOG2
 CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG2>*) video_BackgroundSubtractorMOG2_new1()
 {
-	return wrap(new cv::BackgroundSubtractorMOG2());
+	return new cv::Ptr<cv::BackgroundSubtractorMOG2>(new cv::BackgroundSubtractorMOG2());
 }
 CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG2>*) video_BackgroundSubtractorMOG2_new2(
 	int history, float varThreshold, int bShadowDetection)
 {
-	return wrap(new cv::BackgroundSubtractorMOG2(history, varThreshold, bShadowDetection != 0));
+	return new cv::Ptr<cv::BackgroundSubtractorMOG2>(new cv::BackgroundSubtractorMOG2(history, varThreshold, bShadowDetection != 0));
 }
 CVAPI(void) video_BackgroundSubtractorMOG2_delete(cv::BackgroundSubtractorMOG2 *obj)
 {
@@ -118,7 +118,7 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractorMOG2_info(cv::BackgroundSubt
 // BackgroundSubtractorGMG
 CVAPI(cv::Ptr<cv::BackgroundSubtractorGMG>*) video_BackgroundSubtractorGMG_new()
 {
-	return wrap(new cv::BackgroundSubtractorGMG());
+	return new cv::Ptr<cv::BackgroundSubtractorGMG>(new cv::BackgroundSubtractorGMG());
 }
 CVAPI(void) video_BackgroundSubtractorGMG_delete(cv::BackgroundSubtractorGMG *obj)
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`#pragma once`
`3`	`3`	`#endif`
`4`	`4`
`5`		`-#ifndef _CPP_VIDEO_TRACKING_H_`
`6`		`-#define _CPP_VIDEO_TRACKING_H_`
	`5`	`+#ifndef _CPP_VIDEO_BACKGROUND_SEGM_H_`
	`6`	`+#define _CPP_VIDEO_BACKGROUND_SEGM_H_`
`7`	`7`
`8`	`8`	`#include "include_opencv.h"`
`9`	`9`
`@@ -35,11 +35,11 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractor_info(cv::BackgroundSubtract`
`35`	`35`	`// BackgroundSubtractorMOG`
`36`	`36`	`CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG>*) video_BackgroundSubtractorMOG_new1()`
`37`	`37`	`{`
`38`		`- return wrap(new cv::BackgroundSubtractorMOG());`
	`38`	`+ return new cv::Ptr<cv::BackgroundSubtractorMOG>(new cv::BackgroundSubtractorMOG());`
`39`	`39`	`}`
`40`	`40`	`CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG>*) video_BackgroundSubtractorMOG_new2(int history, int nmixtures, double backgroundRatio, double noiseSigma)`
`41`	`41`	`{`
`42`		`- return wrap(new cv::BackgroundSubtractorMOG(history, nmixtures, backgroundRatio, noiseSigma));`
	`42`	`+ return new cv::Ptr<cv::BackgroundSubtractorMOG>(new cv::BackgroundSubtractorMOG(history, nmixtures, backgroundRatio, noiseSigma));`
`43`	`43`	`}`
`44`	`44`	`CVAPI(void) video_BackgroundSubtractorMOG_delete(cv::BackgroundSubtractorMOG *obj)`
`45`	`45`	`{`
`@@ -72,12 +72,12 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractorMOG_info(cv::BackgroundSubtr`
`72`	`72`	`// BackgroundSubtractorMOG2`
`73`	`73`	`CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG2>*) video_BackgroundSubtractorMOG2_new1()`
`74`	`74`	`{`
`75`		`- return wrap(new cv::BackgroundSubtractorMOG2());`
	`75`	`+ return new cv::Ptr<cv::BackgroundSubtractorMOG2>(new cv::BackgroundSubtractorMOG2());`
`76`	`76`	`}`
`77`	`77`	`CVAPI(cv::Ptr<cv::BackgroundSubtractorMOG2>*) video_BackgroundSubtractorMOG2_new2(`
`78`	`78`	`int history, float varThreshold, int bShadowDetection)`
`79`	`79`	`{`
`80`		`- return wrap(new cv::BackgroundSubtractorMOG2(history, varThreshold, bShadowDetection != 0));`
	`80`	`+ return new cv::Ptr<cv::BackgroundSubtractorMOG2>(new cv::BackgroundSubtractorMOG2(history, varThreshold, bShadowDetection != 0));`
`81`	`81`	`}`
`82`	`82`	`CVAPI(void) video_BackgroundSubtractorMOG2_delete(cv::BackgroundSubtractorMOG2 *obj)`
`83`	`83`	`{`
`@@ -118,7 +118,7 @@ CVAPI(cv::AlgorithmInfo*) video_BackgroundSubtractorMOG2_info(cv::BackgroundSubt`
`118`	`118`	`// BackgroundSubtractorGMG`
`119`	`119`	`CVAPI(cv::Ptr<cv::BackgroundSubtractorGMG>*) video_BackgroundSubtractorGMG_new()`
`120`	`120`	`{`
`121`		`- return wrap(new cv::BackgroundSubtractorGMG());`
	`121`	`+ return new cv::Ptr<cv::BackgroundSubtractorGMG>(new cv::BackgroundSubtractorGMG());`
`122`	`122`	`}`
`123`	`123`	`CVAPI(void) video_BackgroundSubtractorGMG_delete(cv::BackgroundSubtractorGMG *obj)`
`124`	`124`	`{`