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
680dc71b
Commit
680dc71b
authored
Nov 20, 2010
by
Andrey Morozov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed compilation error and warnings under ubuntu
parent
3a8df603
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
12 deletions
+11
-12
gpu.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
+1
-1
color.cpp
modules/gpu/src/color.cpp
+2
-3
error.cpp
modules/gpu/src/error.cpp
+4
-2
hog.cpp
modules/gpu/src/hog.cpp
+4
-6
No files found.
modules/gpu/include/opencv2/gpu/gpu.hpp
View file @
680dc71b
...
...
@@ -829,9 +829,9 @@ namespace cv
// It queries current active device.
static
bool
checkIfGpuCallReasonable
();
int
preset
;
int
ndisp
;
int
winSize
;
int
preset
;
// If avergeTexThreshold == 0 => post procesing is disabled
// If avergeTexThreshold != 0 then disparity is set 0 in each point (x,y) where for left image
...
...
modules/gpu/src/color.cpp
View file @
680dc71b
...
...
@@ -351,8 +351,7 @@ namespace
case
CV_XYZ2BGR
:
case
CV_XYZ2RGB
:
{
typedef
void
(
*
func_t
)(
const
DevMem2D
&
src
,
int
srccn
,
const
DevMem2D
&
dst
,
int
dstcn
,
const
void
*
coeffs
,
cudaStream_t
stream
);
typedef
void
(
*
func_t
)(
const
DevMem2D
&
src
,
int
srccn
,
const
DevMem2D
&
dst
,
int
dstcn
,
const
void
*
coeffs
,
cudaStream_t
stream
);
static
const
func_t
funcs
[]
=
{
color
::
XYZ2RGB_gpu_8u
,
0
,
color
::
XYZ2RGB_gpu_16u
,
0
,
0
,
color
::
XYZ2RGB_gpu_32f
};
if
(
dcn
<=
0
)
dcn
=
3
;
...
...
@@ -392,7 +391,7 @@ namespace
dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
dcn
));
const
void
*
coeffs
=
depth
==
CV_32F
?
(
void
*
)
coeffs_f
:
(
void
*
)
coeffs_i
;
//
const void* coeffs = depth == CV_32F ? (void*)coeffs_f : (void*)coeffs_i;
funcs
[
depth
](
src
,
scn
,
dst
,
dcn
,
coeffs_i
,
stream
);
break
;
...
...
modules/gpu/src/error.cpp
View file @
680dc71b
...
...
@@ -67,7 +67,10 @@ namespace
error_entry
(
NPP_NOT_SUPPORTED_MODE_ERROR
),
error_entry
(
NPP_ROUND_MODE_NOT_SUPPORTED_ERROR
),
error_entry
(
NPP_RESIZE_NO_OPERATION_ERROR
),
#if defined (_MSC_VER)
error_entry
(
NPP_NOT_SUFFICIENT_COMPUTE_CAPABILITY
),
#endif
error_entry
(
NPP_BAD_ARG_ERROR
),
error_entry
(
NPP_LUT_NUMBER_OF_LEVELS_ERROR
),
error_entry
(
NPP_TEXTURE_BIND_ERROR
),
...
...
@@ -153,4 +156,4 @@ namespace cv
}
}
#endif
\ No newline at end of file
#endif
modules/gpu/src/hog.cpp
View file @
680dc71b
...
...
@@ -313,7 +313,7 @@ void cv::gpu::HOGDescriptor::detectMultiScale(const GpuMat& img, vector<Rect>& f
for
(
size_t
i
=
0
;
i
<
level_scale
.
size
();
i
++
)
{
double
scale
=
level_scale
[
i
];
Size
sz
=
Size_
<
double
>
(
img
.
size
())
*
(
1.0
/
scale
);
Size
sz
(
img
.
cols
/
scale
,
img
.
rows
/
scale
);
GpuMat
smaller_img
;
if
(
sz
==
img
.
size
())
...
...
@@ -328,10 +328,9 @@ void cv::gpu::HOGDescriptor::detectMultiScale(const GpuMat& img, vector<Rect>& f
}
detect
(
smaller_img
,
locations
,
hit_threshold
,
win_stride
,
padding
);
Size
scaled_win_size
=
Size_
<
double
>
(
win_size
)
*
scale
;
Size
scaled_win_size
(
win_size
.
width
*
scale
,
win_size
.
height
*
scale
)
;
for
(
size_t
j
=
0
;
j
<
locations
.
size
();
j
++
)
all_candidates
.
push_back
(
Rect
(
Point2d
(
locations
[
j
])
*
scale
,
scaled_win_size
));
all_candidates
.
push_back
(
Rect
(
Point2d
((
CvPoint
)
locations
[
j
])
*
scale
,
scaled_win_size
));
}
found_locations
.
assign
(
all_candidates
.
begin
(),
all_candidates
.
end
());
...
...
@@ -1509,4 +1508,4 @@ std::vector<float> cv::gpu::HOGDescriptor::getPeopleDetector_64x128()
return
vector
<
float
>
(
detector
,
detector
+
sizeof
(
detector
)
/
sizeof
(
detector
[
0
]));
}
#endif
\ No newline at end of file
#endif
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