Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
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_contrib
Commits
0bd061f0
Commit
0bd061f0
authored
Oct 18, 2017
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1413 from alalek:fix_build
parents
e9cd99d9
27ced2cb
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
22 additions
and
37 deletions
+22
-37
CMakeLists.txt
modules/cnn_3dobj/CMakeLists.txt
+5
-1
FindProtobuf.cmake
modules/cnn_3dobj/FindProtobuf.cmake
+0
-10
call_meta_data.hpp
modules/cvv/include/opencv2/cvv/call_meta_data.hpp
+1
-9
changed_pixels_widget.cpp
modules/cvv/src/qtutil/filter/changed_pixels_widget.cpp
+3
-3
test_location.cpp
modules/cvv/test/test_location.cpp
+1
-1
CMakeLists.txt
modules/dnn_modern/CMakeLists.txt
+3
-1
ppf_helpers.cpp
modules/surface_matching/src/ppf_helpers.cpp
+1
-1
t_hash_int.cpp
modules/surface_matching/src/t_hash_int.cpp
+0
-0
trackerMedianFlow.cpp
modules/tracking/src/trackerMedianFlow.cpp
+4
-0
brief.cpp
modules/xfeatures2d/src/brief.cpp
+4
-2
harris_lapace_detector.cpp
modules/xfeatures2d/src/harris_lapace_detector.cpp
+0
-9
No files found.
modules/cnn_3dobj/CMakeLists.txt
View file @
0bd061f0
set
(
BUILD_opencv_cnn_3dobj_INIT OFF
)
# Must be disabled by default - requires custom build of Caffe.
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
)
find_package
(
Caffe
)
...
...
@@ -8,7 +10,9 @@ else()
message
(
STATUS
"Caffe: NO"
)
endif
()
find_package
(
Protobuf
)
if
(
NOT BUILD_PROTOBUF
)
find_package
(
Protobuf
)
endif
()
if
(
Protobuf_FOUND
)
message
(
STATUS
"Protobuf: YES"
)
set
(
HAVE_PROTOBUF 1
)
...
...
modules/cnn_3dobj/FindProtobuf.cmake
deleted
100755 → 0
View file @
e9cd99d9
# Protobuf package for CNN Triplet training
unset
(
Protobuf_FOUND
)
find_library
(
Protobuf_LIBS NAMES protobuf
HINTS
/usr/local/lib
)
if
(
Protobuf_LIBS
)
set
(
Protobuf_FOUND 1
)
endif
()
modules/cvv/include/opencv2/cvv/call_meta_data.hpp
View file @
0bd061f0
...
...
@@ -58,18 +58,10 @@ struct CallMetaData
}
// namespaces
#ifdef __GNUC__
#define CVVISUAL_FUNCTION_NAME_MACRO __PRETTY_FUNCTION__
#else
#define CVVISUAL_FUNCTION_NAME_MACRO __func__
#endif
/**
* @brief Creates an instance of CallMetaData with the location of the macro as
* value.
*/
#define CVVISUAL_LOCATION \
::cvv::impl::CallMetaData(__FILE__, __LINE__, \
CVVISUAL_FUNCTION_NAME_MACRO)
#define CVVISUAL_LOCATION ::cvv::impl::CallMetaData(__FILE__, __LINE__, CV_Func)
#endif
modules/cvv/src/qtutil/filter/changed_pixels_widget.cpp
View file @
0bd061f0
...
...
@@ -67,14 +67,14 @@ void changedPixelImage(const cv::Mat& mat0, const cv::Mat& mat1, cv::Mat& out)
template
<
int
Depth
,
int
Channels
>
void
changedPixelImage
(
const
cv
::
Mat
&
mat0
,
const
cv
::
Mat
&
mat1
,
cv
::
Mat
&
out
)
{
using
PixelInType
=
c
onst
c
vv
::
qtutil
::
PixelType
<
Depth
,
Channels
>
;
using
PixelInType
=
cvv
::
qtutil
::
PixelType
<
Depth
,
Channels
>
;
using
PixelOutType
=
cvv
::
qtutil
::
DepthType
<
CV_8U
>
;
cv
::
Mat
result
=
cv
::
Mat
::
zeros
(
mat0
.
rows
,
mat0
.
cols
,
CV_8U
);
bool
same
;
PixelInType
*
in0
;
PixelInType
*
in1
;
const
PixelInType
*
in0
;
const
PixelInType
*
in1
;
for
(
int
i
=
0
;
i
<
result
.
rows
;
i
++
)
{
for
(
int
j
=
0
;
j
<
result
.
cols
;
j
++
)
...
...
modules/cvv/test/test_location.cpp
View file @
0bd061f0
...
...
@@ -12,7 +12,7 @@ TEST(LocationTest, FileLineFunction)
auto
locationMacroResult
=
CVVISUAL_LOCATION
;
size_t
line
=
__LINE__
-
1
;
auto
file
=
__FILE__
;
auto
fun
=
CV
VISUAL_FUNCTION_NAME_MACRO
;
auto
fun
=
CV
_Func
;
EXPECT_EQ
(
locationMacroResult
.
isKnown
,
true
);
EXPECT_EQ
(
locationMacroResult
.
file
,
file
);
EXPECT_EQ
(
locationMacroResult
.
line
,
line
);
...
...
modules/dnn_modern/CMakeLists.txt
View file @
0bd061f0
...
...
@@ -79,7 +79,9 @@ add_definitions(-DCNN_NO_SERIALIZATION -DCNN_USE_CAFFE_CONVERTER)
# NOTE: In case that proto files already exist,
# this is not needed anymore.
find_package
(
Protobuf QUIET
)
if
(
NOT BUILD_PROTOBUF
)
find_package
(
Protobuf QUIET
)
endif
()
if
(
NOT
${
Protobuf_FOUND
}
)
message
(
STATUS
"Module opencv_dnn_modern disabled because Protobuf is not found"
)
...
...
modules/surface_matching/src/ppf_helpers.cpp
View file @
0bd061f0
...
...
@@ -121,7 +121,7 @@ Mat loadPLYSimple(const char* fileName, int withNormals)
{
float
*
data
=
cloud
.
ptr
<
float
>
(
i
);
int
col
=
0
;
for
(;
col
<
withNormals
?
6
:
3
;
++
col
)
for
(;
col
<
(
withNormals
?
6
:
3
)
;
++
col
)
{
ifs
>>
data
[
col
];
}
...
...
modules/surface_matching/src/t_hash_int.cpp
View file @
0bd061f0
modules/tracking/src/trackerMedianFlow.cpp
View file @
0bd061f0
...
...
@@ -83,7 +83,9 @@ private:
Rect2d
vote
(
const
std
::
vector
<
Point2f
>&
oldPoints
,
const
std
::
vector
<
Point2f
>&
newPoints
,
const
Rect2d
&
oldRect
,
Point2f
&
mD
);
float
dist
(
Point2f
p1
,
Point2f
p2
);
std
::
string
type2str
(
int
type
);
#if 0
void computeStatistics(std::vector<float>& data,int size=-1);
#endif
void
check_FB
(
const
std
::
vector
<
Mat
>&
oldImagePyr
,
const
std
::
vector
<
Mat
>&
newImagePyr
,
const
std
::
vector
<
Point2f
>&
oldPoints
,
const
std
::
vector
<
Point2f
>&
newPoints
,
std
::
vector
<
bool
>&
status
);
void
check_NCC
(
const
Mat
&
oldImage
,
const
Mat
&
newImage
,
...
...
@@ -337,6 +339,7 @@ Rect2d TrackerMedianFlowImpl::vote(const std::vector<Point2f>& oldPoints,const s
return
newRect
;
}
#if 0
void TrackerMedianFlowImpl::computeStatistics(std::vector<float>& data,int size){
int binnum=10;
if(size==-1){
...
...
@@ -351,6 +354,7 @@ void TrackerMedianFlowImpl::computeStatistics(std::vector<float>& data,int size)
dprintf(("[%4f,%4f] -- %4d\n",mini+(maxi-mini)/binnum*i,mini+(maxi-mini)/binnum*(i+1),bins[i]));
}
}
#endif
void
TrackerMedianFlowImpl
::
check_FB
(
const
std
::
vector
<
Mat
>&
oldImagePyr
,
const
std
::
vector
<
Mat
>&
newImagePyr
,
const
std
::
vector
<
Point2f
>&
oldPoints
,
const
std
::
vector
<
Point2f
>&
newPoints
,
std
::
vector
<
bool
>&
status
){
...
...
modules/xfeatures2d/src/brief.cpp
View file @
0bd061f0
...
...
@@ -93,8 +93,10 @@ inline int smoothedSum(const Mat& sum, const KeyPoint& pt, int y, int x, bool us
{
int
rx
=
(
int
)(((
float
)
x
)
*
R
(
1
,
0
)
-
((
float
)
y
)
*
R
(
0
,
0
));
int
ry
=
(
int
)(((
float
)
x
)
*
R
(
0
,
0
)
+
((
float
)
y
)
*
R
(
1
,
0
));
if
(
rx
>
24
)
rx
=
24
;
if
(
rx
<
-
24
)
rx
=
-
24
;
if
(
ry
>
24
)
ry
=
24
;
if
(
ry
<
-
24
)
ry
=
-
24
;
if
(
rx
>
24
)
rx
=
24
;
if
(
rx
<
-
24
)
rx
=
-
24
;
if
(
ry
>
24
)
ry
=
24
;
if
(
ry
<
-
24
)
ry
=
-
24
;
x
=
rx
;
y
=
ry
;
}
const
int
img_y
=
(
int
)(
pt
.
pt
.
y
+
0.5
)
+
y
;
...
...
modules/xfeatures2d/src/harris_lapace_detector.cpp
View file @
0bd061f0
...
...
@@ -23,7 +23,6 @@ protected:
std
::
vector
<
Mat
>
layers
;
Octave
(
std
::
vector
<
Mat
>
layers
);
virtual
~
Octave
();
std
::
vector
<
Mat
>
getLayers
();
Mat
getLayerAt
(
int
i
);
};
...
...
@@ -278,14 +277,6 @@ void Pyramid::Params::clear()
*/
Pyramid
::
Octave
::
Octave
(
std
::
vector
<
Mat
>
_layers
)
:
layers
(
_layers
)
{}
/**
* Return layers of the Octave
*/
std
::
vector
<
Mat
>
Pyramid
::
Octave
::
getLayers
()
{
return
layers
;
}
/**
* Return the Octave's layer at index i
*/
...
...
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