1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
From 9862a8bac536981c1c1a74710741fb40db4beac7 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@itseez.com>
Date: Wed, 23 Sep 2015 12:44:26 +0300
Subject: [PATCH] fix invalid String usage
---
modules/tracking/src/tldDetector.cpp | 6 +++---
modules/ximgproc/samples/live_demo.cpp | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git opencv_contrib-master/modules/tracking/src/tldDetector.cpp opencv_contrib-master/modules/tracking/src/tldDetector.cpp
index cbb783e..0916092 100644
--- opencv_contrib-master/modules/tracking/src/tldDetector.cpp
+++ opencv_contrib-master/modules/tracking/src/tldDetector.cpp
@@ -122,7 +122,7 @@ namespace cv
ocl::Kernel k;
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
String error;
- ocl::Program prog(src, NULL, error);
+ ocl::Program prog(src, String(), error);
k.create("NCC", prog);
if (k.empty())
printf("Kernel create failed!!!\n");
@@ -198,7 +198,7 @@ namespace cv
ocl::Kernel k;
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
String error;
- ocl::Program prog(src, NULL, error);
+ ocl::Program prog(src, String(), error);
k.create("batchNCC", prog);
if (k.empty())
printf("Kernel create failed!!!\n");
@@ -355,7 +355,7 @@ namespace cv
ocl::Kernel k;
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
String error;
- ocl::Program prog(src, NULL, error);
+ ocl::Program prog(src, String(), error);
k.create("NCC", prog);
if (k.empty())
printf("Kernel create failed!!!\n");
diff --git opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
index dd5dc1b..8e16de3 100644
--- opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
+++ opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
@@ -189,7 +189,7 @@ int main()
//Thread trackbar
cv::setNumThreads(g_numberOfCPUs); //speedup filtering
- createTrackbar("Threads", NULL, &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
+ createTrackbar("Threads", String(), &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
//Buttons to choose different modes
createButton("Mode Details Enhancement", changeModeCallback, (void*)filterDetailEnhancement, QT_RADIOBOX, true);
@@ -199,15 +199,15 @@ int main()
//sliders for Details Enhancement mode
g_filterOp = filterDetailEnhancement; //set Details Enhancement as default filter
- createTrackbar("Detail contrast", NULL, &g_contrastBase, 200);
- createTrackbar("Detail level" , NULL, &g_detailsLevel, 200);
+ createTrackbar("Detail contrast", String(), &g_contrastBase, 200);
+ createTrackbar("Detail level" , String(), &g_detailsLevel, 200);
//sliders for Stylizing mode
- createTrackbar("Style gamma", NULL, &g_edgesGamma, 300);
+ createTrackbar("Style gamma", String(), &g_edgesGamma, 300);
//sliders for every mode
- createTrackbar("Sigma Spatial", NULL, &g_sigmaSpatial, 200);
- createTrackbar("Sigma Color" , NULL, &g_sigmaColor, 200);
+ createTrackbar("Sigma Spatial", String(), &g_sigmaSpatial, 200);
+ createTrackbar("Sigma Color" , String(), &g_sigmaColor, 200);
Mat rawFrame, outputFrame;
Mat srcFrame, processedFrame;
|
GitWeb
