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
19270eea
Commit
19270eea
authored
Nov 15, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warnings
parent
497d0fd2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
createsamples.cpp
apps/haartraining/createsamples.cpp
+5
-0
gpumat.cpp
modules/core/src/gpumat.cpp
+1
-1
gpu.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
+10
-0
No files found.
apps/haartraining/createsamples.cpp
View file @
19270eea
...
...
@@ -52,6 +52,11 @@
#include <ctime>
#include <memory>
// std::auto_ptr
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
using
namespace
std
;
#include "cvhaartraining.h"
...
...
modules/core/src/gpumat.cpp
View file @
19270eea
...
...
@@ -700,7 +700,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type)
size_t
esz
=
elemSize
();
void
*
devPtr
;
void
*
devPtr
=
NULL
;
gpuFuncTable
()
->
mallocPitch
(
&
devPtr
,
&
step
,
esz
*
cols
,
rows
);
// Single row must be continuous
...
...
modules/gpu/include/opencv2/gpu/gpu.hpp
View file @
19270eea
...
...
@@ -54,6 +54,12 @@
#include "opencv2/objdetect/objdetect.hpp"
#include "opencv2/features2d/features2d.hpp"
// std::auto_ptr
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
namespace
cv
{
namespace
gpu
{
//////////////////////////////// CudaMem ////////////////////////////////
...
...
@@ -2527,4 +2533,8 @@ CV_EXPORTS void calcWobbleSuppressionMaps(
}
// namespace cv
#if defined(__GNUC__) && __GNUC__ >= 6
#pragma GCC diagnostic pop
#endif
#endif
/* __OPENCV_GPU_HPP__ */
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