Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9ed475cf
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ed475cf
编写于
8月 27, 2013
作者:
R
Roman Donchenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
War on Whitespace, master edition: file endings.
上级
9b92545c
变更
56
隐藏空白更改
内联
并排
Showing
56 changed file
with
33 addition
and
66 deletion
+33
-66
apps/CMakeLists.txt
apps/CMakeLists.txt
+0
-1
apps/sft/CMakeLists.txt
apps/sft/CMakeLists.txt
+1
-1
apps/sft/config.cpp
apps/sft/config.cpp
+1
-1
apps/sft/include/sft/common.hpp
apps/sft/include/sft/common.hpp
+1
-1
apps/sft/include/sft/config.hpp
apps/sft/include/sft/config.hpp
+1
-1
apps/sft/include/sft/dataset.hpp
apps/sft/include/sft/dataset.hpp
+1
-1
apps/sft/sft.cpp
apps/sft/sft.cpp
+1
-1
doc/tutorials/highgui/trackbar/trackbar.rst
doc/tutorials/highgui/trackbar/trackbar.rst
+0
-5
doc/tutorials/ios/hello/hello.rst
doc/tutorials/ios/hello/hello.rst
+0
-1
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
+0
-1
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+1
-1
modules/calib3d/src/compat_ptsetreg.cpp
modules/calib3d/src/compat_ptsetreg.cpp
+0
-1
modules/calib3d/src/ptsetreg.cpp
modules/calib3d/src/ptsetreg.cpp
+0
-1
modules/calib3d/src/stereosgbm.cpp
modules/calib3d/src/stereosgbm.cpp
+0
-1
modules/calib3d/test/test_modelest.cpp
modules/calib3d/test/test_modelest.cpp
+0
-1
modules/core/doc/command_line_parser.rst
modules/core/doc/command_line_parser.rst
+0
-1
modules/core/include/opencv2/core/affine.hpp
modules/core/include/opencv2/core/affine.hpp
+0
-2
modules/core/include/opencv2/core/cvstd.inl.hpp
modules/core/include/opencv2/core/cvstd.inl.hpp
+1
-1
modules/core/include/opencv2/core/types.hpp
modules/core/include/opencv2/core/types.hpp
+1
-1
modules/core/src/stl.cpp
modules/core/src/stl.cpp
+1
-1
modules/core/src/types.cpp
modules/core/src/types.cpp
+1
-1
modules/cudev/test/test_split_merge.cu
modules/cudev/test/test_split_merge.cu
+0
-1
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
+1
-1
modules/flann/include/opencv2/flann/flann.hpp
modules/flann/include/opencv2/flann/flann.hpp
+1
-1
modules/highgui/include/opencv2/highgui/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui.hpp
+1
-1
modules/imgproc/src/rotcalipers.cpp
modules/imgproc/src/rotcalipers.cpp
+0
-1
modules/imgproc/src/segmentation.cpp
modules/imgproc/src/segmentation.cpp
+0
-1
modules/imgproc/test/test_connectedcomponents.cpp
modules/imgproc/test/test_connectedcomponents.cpp
+0
-1
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/include/opencv2/ml/ml.hpp
+1
-1
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
+1
-1
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+1
-1
modules/objdetect/perf/perf_cascadeclassifier.cpp
modules/objdetect/perf/perf_cascadeclassifier.cpp
+1
-1
modules/objdetect/src/hog.cpp
modules/objdetect/src/hog.cpp
+0
-1
modules/ocl/doc/image_processing.rst
modules/ocl/doc/image_processing.rst
+0
-1
modules/photo/doc/denoising.rst
modules/photo/doc/denoising.rst
+0
-1
modules/photo/include/opencv2/photo/photo.hpp
modules/photo/include/opencv2/photo/photo.hpp
+1
-1
modules/softcascade/doc/softcascade.rst
modules/softcascade/doc/softcascade.rst
+1
-1
modules/softcascade/doc/softcascade_training.rst
modules/softcascade/doc/softcascade_training.rst
+1
-1
modules/softcascade/misc/roc_test.py
modules/softcascade/misc/roc_test.py
+1
-1
modules/softcascade/misc/scale_caltech.py
modules/softcascade/misc/scale_caltech.py
+1
-1
modules/softcascade/misc/scale_inria.py
modules/softcascade/misc/scale_inria.py
+1
-1
modules/softcascade/misc/sft.py
modules/softcascade/misc/sft.py
+1
-1
modules/softcascade/perf/perf_cuda_softcascade.cpp
modules/softcascade/perf/perf_cuda_softcascade.cpp
+1
-1
modules/softcascade/perf/perf_softcascade.cpp
modules/softcascade/perf/perf_softcascade.cpp
+1
-1
modules/softcascade/src/detector.cpp
modules/softcascade/src/detector.cpp
+1
-1
modules/softcascade/src/softcascade_init.cpp
modules/softcascade/src/softcascade_init.cpp
+1
-1
modules/softcascade/test/test_main.cpp
modules/softcascade/test/test_main.cpp
+1
-1
modules/softcascade/test/test_softcascade.cpp
modules/softcascade/test/test_softcascade.cpp
+1
-1
modules/softcascade/test/test_training.cpp
modules/softcascade/test/test_training.cpp
+1
-1
modules/stitching/CMakeLists.txt
modules/stitching/CMakeLists.txt
+0
-1
modules/video/include/opencv2/video/video.hpp
modules/video/include/opencv2/video/video.hpp
+1
-1
modules/videostab/CMakeLists.txt
modules/videostab/CMakeLists.txt
+0
-1
modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
...ideostab/include/opencv2/videostab/wobble_suppression.hpp
+0
-1
modules/videostab/src/global_motion.cpp
modules/videostab/src/global_motion.cpp
+0
-2
modules/videostab/src/wobble_suppression.cpp
modules/videostab/src/wobble_suppression.cpp
+0
-1
samples/c/example_cmake/README.txt
samples/c/example_cmake/README.txt
+0
-5
未找到文件。
apps/CMakeLists.txt
浏览文件 @
9ed475cf
...
@@ -3,4 +3,3 @@ add_definitions(-D__OPENCV_BUILD=1)
...
@@ -3,4 +3,3 @@ add_definitions(-D__OPENCV_BUILD=1)
add_subdirectory
(
haartraining
)
add_subdirectory
(
haartraining
)
add_subdirectory
(
traincascade
)
add_subdirectory
(
traincascade
)
add_subdirectory
(
sft
)
add_subdirectory
(
sft
)
apps/sft/CMakeLists.txt
浏览文件 @
9ed475cf
...
@@ -30,4 +30,4 @@ if(ENABLE_SOLUTION_FOLDERS)
...
@@ -30,4 +30,4 @@ if(ENABLE_SOLUTION_FOLDERS)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"applications"
)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"applications"
)
endif
()
endif
()
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
)
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
)
\ No newline at end of file
apps/sft/config.cpp
浏览文件 @
9ed475cf
...
@@ -159,4 +159,4 @@ std::ostream& sft::operator<<(std::ostream& out, const Config& m)
...
@@ -159,4 +159,4 @@ std::ostream& sft::operator<<(std::ostream& out, const Config& m)
<<
std
::
setw
(
14
)
<<
std
::
left
<<
"featureType"
<<
m
.
featureType
<<
std
::
endl
;
<<
std
::
setw
(
14
)
<<
std
::
left
<<
"featureType"
<<
m
.
featureType
<<
std
::
endl
;
return
out
;
return
out
;
}
}
\ No newline at end of file
apps/sft/include/sft/common.hpp
浏览文件 @
9ed475cf
...
@@ -71,4 +71,4 @@ namespace sft
...
@@ -71,4 +71,4 @@ namespace sft
# define dprintf(format, ...)
# define dprintf(format, ...)
#endif
#endif
#endif
#endif
\ No newline at end of file
apps/sft/include/sft/config.hpp
浏览文件 @
9ed475cf
...
@@ -135,4 +135,4 @@ std::ostream& operator<<(std::ostream& out, const Config& m);
...
@@ -135,4 +135,4 @@ std::ostream& operator<<(std::ostream& out, const Config& m);
}
}
#endif
#endif
\ No newline at end of file
apps/sft/include/sft/dataset.hpp
浏览文件 @
9ed475cf
...
@@ -64,4 +64,4 @@ private:
...
@@ -64,4 +64,4 @@ private:
};
};
}
}
#endif
#endif
\ No newline at end of file
apps/sft/sft.cpp
浏览文件 @
9ed475cf
...
@@ -165,4 +165,4 @@ int main(int argc, char** argv)
...
@@ -165,4 +165,4 @@ int main(int argc, char** argv)
fso
.
release
();
fso
.
release
();
std
::
cout
<<
"Training complete..."
<<
std
::
endl
;
std
::
cout
<<
"Training complete..."
<<
std
::
endl
;
return
0
;
return
0
;
}
}
\ No newline at end of file
doc/tutorials/highgui/trackbar/trackbar.rst
浏览文件 @
9ed475cf
...
@@ -152,8 +152,3 @@ Result
...
@@ -152,8 +152,3 @@ Result
.. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
.. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
:alt: Adding Trackbars - Lena
:alt: Adding Trackbars - Lena
:align: center
:align: center
doc/tutorials/ios/hello/hello.rst
浏览文件 @
9ed475cf
...
@@ -73,4 +73,3 @@ Now we will learn how to write a simple Hello World Application in Xcode using O
...
@@ -73,4 +73,3 @@ Now we will learn how to write a simple Hello World Application in Xcode using O
.. image:: images/output.png
.. image:: images/output.png
:alt: output
:alt: output
:align: center
:align: center
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
浏览文件 @
9ed475cf
...
@@ -185,4 +185,3 @@ Results
...
@@ -185,4 +185,3 @@ Results
.. image:: images/result.png
.. image:: images/result.png
:alt: The seperated planes
:alt: The seperated planes
:align: center
:align: center
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/calib3d.hpp"
#include "opencv2/calib3d.hpp"
\ No newline at end of file
modules/calib3d/src/compat_ptsetreg.cpp
浏览文件 @
9ed475cf
...
@@ -428,4 +428,3 @@ CV_IMPL void cvConvertPointsHomogeneous( const CvMat* _src, CvMat* _dst )
...
@@ -428,4 +428,3 @@ CV_IMPL void cvConvertPointsHomogeneous( const CvMat* _src, CvMat* _dst )
dst
.
convertTo
(
dst0
,
dst0
.
type
());
dst
.
convertTo
(
dst0
,
dst0
.
type
());
}
}
}
}
modules/calib3d/src/ptsetreg.cpp
浏览文件 @
9ed475cf
...
@@ -534,4 +534,3 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
...
@@ -534,4 +534,3 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
return
createRANSACPointSetRegistrator
(
new
Affine3DEstimatorCallback
,
4
,
param1
,
param2
)
->
run
(
dFrom
,
dTo
,
_out
,
_inliers
);
return
createRANSACPointSetRegistrator
(
new
Affine3DEstimatorCallback
,
4
,
param1
,
param2
)
->
run
(
dFrom
,
dTo
,
_out
,
_inliers
);
}
}
modules/calib3d/src/stereosgbm.cpp
浏览文件 @
9ed475cf
...
@@ -1169,4 +1169,3 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
...
@@ -1169,4 +1169,3 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
}
}
}
}
}
}
modules/calib3d/test/test_modelest.cpp
浏览文件 @
9ed475cf
...
@@ -229,4 +229,3 @@ void CV_ModelEstimator2_Test::run_func()
...
@@ -229,4 +229,3 @@ void CV_ModelEstimator2_Test::run_func()
TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); }
TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); }
#endif
#endif
modules/core/doc/command_line_parser.rst
浏览文件 @
9ed475cf
...
@@ -98,4 +98,3 @@ Use:
...
@@ -98,4 +98,3 @@ Use:
# ./app -fps=aaa
# ./app -fps=aaa
ERRORS:
ERRORS:
Exception: can not convert: [aaa] to [double]
Exception: can not convert: [aaa] to [double]
modules/core/include/opencv2/core/affine.hpp
浏览文件 @
9ed475cf
...
@@ -430,5 +430,3 @@ cv::Affine3<T>::operator Eigen::Transform<T, 3, Eigen::Affine>() const
...
@@ -430,5 +430,3 @@ cv::Affine3<T>::operator Eigen::Transform<T, 3, Eigen::Affine>() const
#endif
/* __cplusplus */
#endif
/* __cplusplus */
#endif
/* __OPENCV_CORE_AFFINE3_HPP__ */
#endif
/* __OPENCV_CORE_AFFINE3_HPP__ */
modules/core/include/opencv2/core/cvstd.inl.hpp
浏览文件 @
9ed475cf
...
@@ -247,4 +247,4 @@ std::ostream& operator << (std::ostream& out, const Rect_<_Tp>& rect)
...
@@ -247,4 +247,4 @@ std::ostream& operator << (std::ostream& out, const Rect_<_Tp>& rect)
#endif // OPENCV_NOSTL
#endif // OPENCV_NOSTL
}
// cv
}
// cv
#endif // __OPENCV_CORE_CVSTDINL_HPP__
#endif // __OPENCV_CORE_CVSTDINL_HPP__
\ No newline at end of file
modules/core/include/opencv2/core/types.hpp
浏览文件 @
9ed475cf
...
@@ -1922,4 +1922,4 @@ TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)
...
@@ -1922,4 +1922,4 @@ TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)
}
// cv
}
// cv
#endif //__OPENCV_CORE_TYPES_HPP__
#endif //__OPENCV_CORE_TYPES_HPP__
\ No newline at end of file
modules/core/src/stl.cpp
浏览文件 @
9ed475cf
...
@@ -66,4 +66,4 @@ void cv::String::deallocate()
...
@@ -66,4 +66,4 @@ void cv::String::deallocate()
{
{
cv
::
fastFree
(
data
-
1
);
cv
::
fastFree
(
data
-
1
);
}
}
}
}
\ No newline at end of file
modules/core/src/types.cpp
浏览文件 @
9ed475cf
...
@@ -136,4 +136,4 @@ float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
...
@@ -136,4 +136,4 @@ float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
return
ovrl
;
return
ovrl
;
}
}
}
// cv
}
// cv
\ No newline at end of file
modules/cudev/test/test_split_merge.cu
浏览文件 @
9ed475cf
...
@@ -178,4 +178,3 @@ TYPED_TEST(SplitTest, C4)
...
@@ -178,4 +178,3 @@ TYPED_TEST(SplitTest, C4)
{
{
SplitTest
<
TypeParam
>::
test_c4
();
SplitTest
<
TypeParam
>::
test_c4
();
}
}
modules/features2d/include/opencv2/features2d/features2d.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/features2d.hpp"
#include "opencv2/features2d.hpp"
\ No newline at end of file
modules/flann/include/opencv2/flann/flann.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/flann.hpp"
#include "opencv2/flann.hpp"
\ No newline at end of file
modules/highgui/include/opencv2/highgui/highgui.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/highgui.hpp"
#include "opencv2/highgui.hpp"
\ No newline at end of file
modules/imgproc/src/rotcalipers.cpp
浏览文件 @
9ed475cf
...
@@ -404,4 +404,3 @@ void cv::boxPoints(cv::RotatedRect box, OutputArray _pts)
...
@@ -404,4 +404,3 @@ void cv::boxPoints(cv::RotatedRect box, OutputArray _pts)
Mat
pts
=
_pts
.
getMat
();
Mat
pts
=
_pts
.
getMat
();
box
.
points
((
Point2f
*
)
pts
.
data
);
box
.
points
((
Point2f
*
)
pts
.
data
);
}
}
modules/imgproc/src/segmentation.cpp
浏览文件 @
9ed475cf
...
@@ -534,4 +534,3 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
...
@@ -534,4 +534,3 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
cv
::
pyrMeanShiftFiltering
(
src
,
dst
,
sp0
,
sr
,
max_level
,
termcrit
);
cv
::
pyrMeanShiftFiltering
(
src
,
dst
,
sp0
,
sr
,
max_level
,
termcrit
);
}
}
modules/imgproc/test/test_connectedcomponents.cpp
浏览文件 @
9ed475cf
...
@@ -105,4 +105,3 @@ void CV_ConnectedComponentsTest::run( int /* start_from */)
...
@@ -105,4 +105,3 @@ void CV_ConnectedComponentsTest::run( int /* start_from */)
}
}
TEST
(
Imgproc_ConnectedComponents
,
regression
)
{
CV_ConnectedComponentsTest
test
;
test
.
safe_run
();
}
TEST
(
Imgproc_ConnectedComponents
,
regression
)
{
CV_ConnectedComponentsTest
test
;
test
.
safe_run
();
}
modules/ml/include/opencv2/ml/ml.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/ml.hpp"
#include "opencv2/ml.hpp"
\ No newline at end of file
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/nonfree.hpp"
#include "opencv2/nonfree.hpp"
\ No newline at end of file
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/objdetect.hpp"
#include "opencv2/objdetect.hpp"
\ No newline at end of file
modules/objdetect/perf/perf_cascadeclassifier.cpp
浏览文件 @
9ed475cf
...
@@ -47,4 +47,4 @@ PERF_TEST_P(ImageName_MinSize, CascadeClassifierLBPFrontalFace,
...
@@ -47,4 +47,4 @@ PERF_TEST_P(ImageName_MinSize, CascadeClassifierLBPFrontalFace,
std
::
sort
(
faces
.
begin
(),
faces
.
end
(),
comparators
::
RectLess
());
std
::
sort
(
faces
.
begin
(),
faces
.
end
(),
comparators
::
RectLess
());
SANITY_CHECK
(
faces
,
3.001
*
faces
.
size
());
SANITY_CHECK
(
faces
,
3.001
*
faces
.
size
());
}
}
\ No newline at end of file
modules/objdetect/src/hog.cpp
浏览文件 @
9ed475cf
...
@@ -3023,4 +3023,3 @@ void HOGDescriptor::groupRectangles(std::vector<cv::Rect>& rectList, std::vector
...
@@ -3023,4 +3023,3 @@ void HOGDescriptor::groupRectangles(std::vector<cv::Rect>& rectList, std::vector
}
}
}
}
}
}
modules/ocl/doc/image_processing.rst
浏览文件 @
9ed475cf
...
@@ -366,4 +366,3 @@ Finds circles in a grayscale image using the Hough transform.
...
@@ -366,4 +366,3 @@ Finds circles in a grayscale image using the Hough transform.
.. note:: Currently only non-ROI oclMat is supported for src.
.. note:: Currently only non-ROI oclMat is supported for src.
.. seealso:: :ocv:func:`HoughCircles`
.. seealso:: :ocv:func:`HoughCircles`
modules/photo/doc/denoising.rst
浏览文件 @
9ed475cf
...
@@ -195,4 +195,3 @@ The function converts image to CIELAB colorspace and then separately denoise L a
...
@@ -195,4 +195,3 @@ The function converts image to CIELAB colorspace and then separately denoise L a
.. seealso::
.. seealso::
:ocv:func:`fastNlMeansDenoisingColored`
:ocv:func:`fastNlMeansDenoisingColored`
modules/photo/include/opencv2/photo/photo.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/photo.hpp"
#include "opencv2/photo.hpp"
\ No newline at end of file
modules/softcascade/doc/softcascade.rst
浏览文件 @
9ed475cf
...
@@ -9,4 +9,4 @@ softcascade. Soft Cascade object detection and training.
...
@@ -9,4 +9,4 @@ softcascade. Soft Cascade object detection and training.
softcascade_detector
softcascade_detector
softcascade_training
softcascade_training
softcascade_cuda
softcascade_cuda
\ No newline at end of file
modules/softcascade/doc/softcascade_training.rst
浏览文件 @
9ed475cf
...
@@ -140,4 +140,4 @@ Compute feature on integral channel image.
...
@@ -140,4 +140,4 @@ Compute feature on integral channel image.
:param si an index of sample.
:param si an index of sample.
:param fs a channel matrix.
:param fs a channel matrix.
\ No newline at end of file
modules/softcascade/misc/roc_test.py
浏览文件 @
9ed475cf
...
@@ -100,4 +100,4 @@ if __name__ == "__main__":
...
@@ -100,4 +100,4 @@ if __name__ == "__main__":
fppi
,
miss_rate
=
sft
.
computeROC
(
confidenses
,
tp
,
nannotated
,
nframes
,
ignored
)
fppi
,
miss_rate
=
sft
.
computeROC
(
confidenses
,
tp
,
nannotated
,
nframes
,
ignored
)
sft
.
plotLogLog
(
fppi
,
miss_rate
,
plot_colors
[
idx
])
sft
.
plotLogLog
(
fppi
,
miss_rate
,
plot_colors
[
idx
])
sft
.
showPlot
(
args
.
output
,
args
.
labels
)
sft
.
showPlot
(
args
.
output
,
args
.
labels
)
\ No newline at end of file
modules/softcascade/misc/scale_caltech.py
浏览文件 @
9ed475cf
...
@@ -139,4 +139,4 @@ if __name__ == "__main__":
...
@@ -139,4 +139,4 @@ if __name__ == "__main__":
path
,
ext
=
os
.
path
.
splitext
(
each
)
path
,
ext
=
os
.
path
.
splitext
(
each
)
path
=
path
+
".seq"
path
=
path
+
".seq"
print
path
print
path
extractPositive
(
open
(
each
),
path
,
opath
,
options
.
octave
,
options
.
min_possible
)
extractPositive
(
open
(
each
),
path
,
opath
,
options
.
octave
,
options
.
min_possible
)
\ No newline at end of file
modules/softcascade/misc/scale_inria.py
浏览文件 @
9ed475cf
...
@@ -136,4 +136,4 @@ if __name__ == "__main__":
...
@@ -136,4 +136,4 @@ if __name__ == "__main__":
cv2
.
imwrite
(
os
.
path
.
join
(
cneg_path
,
out_name
),
img
)
cv2
.
imwrite
(
os
.
path
.
join
(
cneg_path
,
out_name
),
img
)
idx
=
idx
+
1
idx
=
idx
+
1
print
"."
,
print
"."
,
sys
.
stdout
.
flush
()
sys
.
stdout
.
flush
()
\ No newline at end of file
modules/softcascade/misc/sft.py
浏览文件 @
9ed475cf
...
@@ -278,4 +278,4 @@ def parse_caltech(f):
...
@@ -278,4 +278,4 @@ def parse_caltech(f):
for
idx
,
(
p
,
pv
,
oc
)
in
enumerate
(
zip
(
*
[
pos
,
posv
,
occl
])):
for
idx
,
(
p
,
pv
,
oc
)
in
enumerate
(
zip
(
*
[
pos
,
posv
,
occl
])):
annotations
[
start
+
idx
].
append
((
type
,
p
,
oc
,
pv
))
annotations
[
start
+
idx
].
append
((
type
,
p
,
oc
,
pv
))
return
annotations
return
annotations
\ No newline at end of file
modules/softcascade/perf/perf_cuda_softcascade.cpp
浏览文件 @
9ed475cf
...
@@ -233,4 +233,4 @@ RUN_GPU(SCascadeTest, detectStream)
...
@@ -233,4 +233,4 @@ RUN_GPU(SCascadeTest, detectStream)
NO_CPU
(
SCascadeTest
,
detectStream
)
NO_CPU
(
SCascadeTest
,
detectStream
)
#undef SC_PERF_TEST_P
#undef SC_PERF_TEST_P
\ No newline at end of file
modules/softcascade/perf/perf_softcascade.cpp
浏览文件 @
9ed475cf
...
@@ -44,4 +44,4 @@ PERF_TEST_P(detect, SoftCascadeDetector,
...
@@ -44,4 +44,4 @@ PERF_TEST_P(detect, SoftCascadeDetector,
extractRacts
(
objectBoxes
,
rects
);
extractRacts
(
objectBoxes
,
rects
);
std
::
sort
(
rects
.
begin
(),
rects
.
end
(),
perf
::
comparators
::
RectLess
());
std
::
sort
(
rects
.
begin
(),
rects
.
end
(),
perf
::
comparators
::
RectLess
());
SANITY_CHECK
(
rects
);
SANITY_CHECK
(
rects
);
}
}
\ No newline at end of file
modules/softcascade/src/detector.cpp
浏览文件 @
9ed475cf
...
@@ -593,4 +593,4 @@ void cv::softcascade::Detector::detect(InputArray _image, InputArray _rois, Out
...
@@ -593,4 +593,4 @@ void cv::softcascade::Detector::detect(InputArray _image, InputArray _rois, Out
rectPtr
[
i
]
=
(
*
it
).
bb
();
rectPtr
[
i
]
=
(
*
it
).
bb
();
confPtr
[
i
]
=
(
*
it
).
confidence
;
confPtr
[
i
]
=
(
*
it
).
confidence
;
}
}
}
}
\ No newline at end of file
modules/softcascade/src/softcascade_init.cpp
浏览文件 @
9ed475cf
...
@@ -63,4 +63,4 @@ bool initModule_softcascade(void)
...
@@ -63,4 +63,4 @@ bool initModule_softcascade(void)
return
(
sc1
->
info
()
!=
0
)
&&
(
sc
->
info
()
!=
0
);
return
(
sc1
->
info
()
!=
0
)
&&
(
sc
->
info
()
!=
0
);
}
}
}
}
}
}
\ No newline at end of file
modules/softcascade/test/test_main.cpp
浏览文件 @
9ed475cf
...
@@ -42,4 +42,4 @@
...
@@ -42,4 +42,4 @@
#include "test_precomp.hpp"
#include "test_precomp.hpp"
CV_TEST_MAIN
(
"cv"
)
CV_TEST_MAIN
(
"cv"
)
\ No newline at end of file
modules/softcascade/test/test_softcascade.cpp
浏览文件 @
9ed475cf
...
@@ -138,4 +138,4 @@ TEST(SoftCascadeDetector, detectEmptyRoi)
...
@@ -138,4 +138,4 @@ TEST(SoftCascadeDetector, detectEmptyRoi)
cascade
.
detect
(
colored
,
cv
::
Mat
::
zeros
(
colored
.
size
(),
CV_8UC1
),
objects
);
cascade
.
detect
(
colored
,
cv
::
Mat
::
zeros
(
colored
.
size
(),
CV_8UC1
),
objects
);
ASSERT_EQ
(
0
,
(
int
)
objects
.
size
());
ASSERT_EQ
(
0
,
(
int
)
objects
.
size
());
}
}
\ No newline at end of file
modules/softcascade/test/test_training.cpp
浏览文件 @
9ed475cf
...
@@ -157,4 +157,4 @@ TEST(SoftCascade, training)
...
@@ -157,4 +157,4 @@ TEST(SoftCascade, training)
ASSERT_FALSE
(
fn
.
empty
());
ASSERT_FALSE
(
fn
.
empty
());
}
}
#endif
#endif
\ No newline at end of file
modules/stitching/CMakeLists.txt
浏览文件 @
9ed475cf
set
(
the_description
"Images stitching"
)
set
(
the_description
"Images stitching"
)
ocv_define_module
(
stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
ocv_define_module
(
stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_gpu opencv_gpuarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree
)
OPTIONAL opencv_gpu opencv_gpuarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree
)
modules/video/include/opencv2/video/video.hpp
浏览文件 @
9ed475cf
...
@@ -45,4 +45,4 @@
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#endif
#include "opencv2/video.hpp"
#include "opencv2/video.hpp"
\ No newline at end of file
modules/videostab/CMakeLists.txt
浏览文件 @
9ed475cf
set
(
the_description
"Video stabilization"
)
set
(
the_description
"Video stabilization"
)
ocv_define_module
(
videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
ocv_define_module
(
videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
OPTIONAL opencv_gpu opencv_gpuwarping opencv_gpuoptflow opencv_highgui
)
OPTIONAL opencv_gpu opencv_gpuwarping opencv_gpuoptflow opencv_highgui
)
modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
浏览文件 @
9ed475cf
...
@@ -133,4 +133,3 @@ private:
...
@@ -133,4 +133,3 @@ private:
}
// namespace cv
}
// namespace cv
#endif
#endif
modules/videostab/src/global_motion.cpp
浏览文件 @
9ed475cf
...
@@ -834,5 +834,3 @@ Mat getMotion(int from, int to, const std::vector<Mat> &motions)
...
@@ -834,5 +834,3 @@ Mat getMotion(int from, int to, const std::vector<Mat> &motions)
}
// namespace videostab
}
// namespace videostab
}
// namespace cv
}
// namespace cv
modules/videostab/src/wobble_suppression.cpp
浏览文件 @
9ed475cf
...
@@ -160,4 +160,3 @@ void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const Mat &frame,
...
@@ -160,4 +160,3 @@ void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const Mat &frame,
}
// namespace videostab
}
// namespace videostab
}
// namespace cv
}
// namespace cv
samples/c/example_cmake/README.txt
浏览文件 @
9ed475cf
...
@@ -25,8 +25,3 @@ the CMake gui with:
...
@@ -25,8 +25,3 @@ the CMake gui with:
$ cmake-gui <OPENCV_SRC_PATH>/samples/c/example_cmake/
$ cmake-gui <OPENCV_SRC_PATH>/samples/c/example_cmake/
And pick the correct value for OpenCV_DIR.
And pick the correct value for OpenCV_DIR.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录