Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
a007c7b9
Commit
a007c7b9
authored
Aug 13, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Boring changes - gpuimgproc.
parent
b165016b
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
18 deletions
+19
-18
canny.cpp
modules/gpuimgproc/src/canny.cpp
+1
-1
corners.cpp
modules/gpuimgproc/src/corners.cpp
+2
-2
generalized_hough.cpp
modules/gpuimgproc/src/generalized_hough.cpp
+2
-2
gftt.cpp
modules/gpuimgproc/src/gftt.cpp
+2
-1
histogram.cpp
modules/gpuimgproc/src/histogram.cpp
+1
-1
hough_circles.cpp
modules/gpuimgproc/src/hough_circles.cpp
+1
-1
hough_lines.cpp
modules/gpuimgproc/src/hough_lines.cpp
+1
-1
hough_segments.cpp
modules/gpuimgproc/src/hough_segments.cpp
+1
-1
match_template.cpp
modules/gpuimgproc/src/match_template.cpp
+8
-8
No files found.
modules/gpuimgproc/src/canny.cpp
View file @
a007c7b9
...
...
@@ -228,7 +228,7 @@ namespace
Ptr
<
CannyEdgeDetector
>
cv
::
gpu
::
createCannyEdgeDetector
(
double
low_thresh
,
double
high_thresh
,
int
apperture_size
,
bool
L2gradient
)
{
return
new
CannyImpl
(
low_thresh
,
high_thresh
,
apperture_size
,
L2gradient
);
return
makePtr
<
CannyImpl
>
(
low_thresh
,
high_thresh
,
apperture_size
,
L2gradient
);
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/corners.cpp
View file @
a007c7b9
...
...
@@ -178,12 +178,12 @@ namespace
Ptr
<
gpu
::
CornernessCriteria
>
cv
::
gpu
::
createHarrisCorner
(
int
srcType
,
int
blockSize
,
int
ksize
,
double
k
,
int
borderType
)
{
return
new
Harris
(
srcType
,
blockSize
,
ksize
,
k
,
borderType
);
return
makePtr
<
Harris
>
(
srcType
,
blockSize
,
ksize
,
k
,
borderType
);
}
Ptr
<
gpu
::
CornernessCriteria
>
cv
::
gpu
::
createMinEigenValCorner
(
int
srcType
,
int
blockSize
,
int
ksize
,
int
borderType
)
{
return
new
MinEigenVal
(
srcType
,
blockSize
,
ksize
,
borderType
);
return
makePtr
<
MinEigenVal
>
(
srcType
,
blockSize
,
ksize
,
borderType
);
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/generalized_hough.cpp
View file @
a007c7b9
...
...
@@ -554,7 +554,7 @@ namespace
Ptr
<
GeneralizedHoughBallard
>
cv
::
gpu
::
createGeneralizedHoughBallard
()
{
return
new
GeneralizedHoughBallardImpl
;
return
makePtr
<
GeneralizedHoughBallardImpl
>
()
;
}
// GeneralizedHoughGuil
...
...
@@ -900,7 +900,7 @@ namespace
Ptr
<
GeneralizedHoughGuil
>
cv
::
gpu
::
createGeneralizedHoughGuil
()
{
return
new
GeneralizedHoughGuilImpl
;
return
makePtr
<
GeneralizedHoughGuilImpl
>
()
;
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/gftt.cpp
View file @
a007c7b9
...
...
@@ -209,7 +209,8 @@ namespace
Ptr
<
gpu
::
CornersDetector
>
cv
::
gpu
::
createGoodFeaturesToTrackDetector
(
int
srcType
,
int
maxCorners
,
double
qualityLevel
,
double
minDistance
,
int
blockSize
,
bool
useHarrisDetector
,
double
harrisK
)
{
return
new
GoodFeaturesToTrackDetector
(
srcType
,
maxCorners
,
qualityLevel
,
minDistance
,
blockSize
,
useHarrisDetector
,
harrisK
);
return
Ptr
<
gpu
::
CornersDetector
>
(
new
GoodFeaturesToTrackDetector
(
srcType
,
maxCorners
,
qualityLevel
,
minDistance
,
blockSize
,
useHarrisDetector
,
harrisK
));
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/histogram.cpp
View file @
a007c7b9
...
...
@@ -257,7 +257,7 @@ namespace
cv
::
Ptr
<
cv
::
gpu
::
CLAHE
>
cv
::
gpu
::
createCLAHE
(
double
clipLimit
,
cv
::
Size
tileGridSize
)
{
return
new
CLAHE_Impl
(
clipLimit
,
tileGridSize
.
width
,
tileGridSize
.
height
);
return
makePtr
<
CLAHE_Impl
>
(
clipLimit
,
tileGridSize
.
width
,
tileGridSize
.
height
);
}
////////////////////////////////////////////////////////////////////////
...
...
modules/gpuimgproc/src/hough_circles.cpp
View file @
a007c7b9
...
...
@@ -291,7 +291,7 @@ namespace
Ptr
<
HoughCirclesDetector
>
cv
::
gpu
::
createHoughCirclesDetector
(
float
dp
,
float
minDist
,
int
cannyThreshold
,
int
votesThreshold
,
int
minRadius
,
int
maxRadius
,
int
maxCircles
)
{
return
new
HoughCirclesDetectorImpl
(
dp
,
minDist
,
cannyThreshold
,
votesThreshold
,
minRadius
,
maxRadius
,
maxCircles
);
return
makePtr
<
HoughCirclesDetectorImpl
>
(
dp
,
minDist
,
cannyThreshold
,
votesThreshold
,
minRadius
,
maxRadius
,
maxCircles
);
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/hough_lines.cpp
View file @
a007c7b9
...
...
@@ -196,7 +196,7 @@ namespace
Ptr
<
HoughLinesDetector
>
cv
::
gpu
::
createHoughLinesDetector
(
float
rho
,
float
theta
,
int
threshold
,
bool
doSort
,
int
maxLines
)
{
return
new
HoughLinesDetectorImpl
(
rho
,
theta
,
threshold
,
doSort
,
maxLines
);
return
makePtr
<
HoughLinesDetectorImpl
>
(
rho
,
theta
,
threshold
,
doSort
,
maxLines
);
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/hough_segments.cpp
View file @
a007c7b9
...
...
@@ -177,7 +177,7 @@ namespace
Ptr
<
HoughSegmentDetector
>
cv
::
gpu
::
createHoughSegmentDetector
(
float
rho
,
float
theta
,
int
minLineLength
,
int
maxLineGap
,
int
maxLines
)
{
return
new
HoughSegmentDetectorImpl
(
rho
,
theta
,
minLineLength
,
maxLineGap
,
maxLines
);
return
makePtr
<
HoughSegmentDetectorImpl
>
(
rho
,
theta
,
minLineLength
,
maxLineGap
,
maxLines
);
}
#endif
/* !defined (HAVE_CUDA) */
modules/gpuimgproc/src/match_template.cpp
View file @
a007c7b9
...
...
@@ -607,10 +607,10 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
switch
(
method
)
{
case
TM_SQDIFF
:
return
new
Match_SQDIFF_32F
;
return
makePtr
<
Match_SQDIFF_32F
>
()
;
case
TM_CCORR
:
return
new
Match_CCORR_32F
(
user_block_size
);
return
makePtr
<
Match_CCORR_32F
>
(
user_block_size
);
default
:
CV_Error
(
Error
::
StsBadFlag
,
"Unsopported method"
);
...
...
@@ -622,22 +622,22 @@ Ptr<gpu::TemplateMatching> cv::gpu::createTemplateMatching(int srcType, int meth
switch
(
method
)
{
case
TM_SQDIFF
:
return
new
Match_SQDIFF_8U
(
user_block_size
);
return
makePtr
<
Match_SQDIFF_8U
>
(
user_block_size
);
case
TM_SQDIFF_NORMED
:
return
new
Match_SQDIFF_NORMED_8U
(
user_block_size
);
return
makePtr
<
Match_SQDIFF_NORMED_8U
>
(
user_block_size
);
case
TM_CCORR
:
return
new
Match_CCORR_8U
(
user_block_size
);
return
makePtr
<
Match_CCORR_8U
>
(
user_block_size
);
case
TM_CCORR_NORMED
:
return
new
Match_CCORR_NORMED_8U
(
user_block_size
);
return
makePtr
<
Match_CCORR_NORMED_8U
>
(
user_block_size
);
case
TM_CCOEFF
:
return
new
Match_CCOEFF_8U
(
user_block_size
);
return
makePtr
<
Match_CCOEFF_8U
>
(
user_block_size
);
case
TM_CCOEFF_NORMED
:
return
new
Match_CCOEFF_NORMED_8U
(
user_block_size
);
return
makePtr
<
Match_CCOEFF_NORMED_8U
>
(
user_block_size
);
default
:
CV_Error
(
Error
::
StsBadFlag
,
"Unsopported method"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment