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
9ed475cf
Commit
9ed475cf
authored
Aug 27, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
War on Whitespace, master edition: file endings.
parent
9b92545c
Hide whitespace changes
Inline
Side-by-side
Showing
56 changed files
with
33 additions
and
99 deletions
+33
-99
CMakeLists.txt
apps/CMakeLists.txt
+0
-1
CMakeLists.txt
apps/sft/CMakeLists.txt
+1
-2
config.cpp
apps/sft/config.cpp
+1
-2
common.hpp
apps/sft/include/sft/common.hpp
+1
-2
config.hpp
apps/sft/include/sft/config.hpp
+1
-2
dataset.hpp
apps/sft/include/sft/dataset.hpp
+1
-2
sft.cpp
apps/sft/sft.cpp
+1
-2
trackbar.rst
doc/tutorials/highgui/trackbar/trackbar.rst
+0
-5
hello.rst
doc/tutorials/ios/hello/hello.rst
+0
-1
introduction_to_svm.rst
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
+0
-1
calib3d.hpp
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+1
-2
compat_ptsetreg.cpp
modules/calib3d/src/compat_ptsetreg.cpp
+0
-1
ptsetreg.cpp
modules/calib3d/src/ptsetreg.cpp
+0
-1
stereosgbm.cpp
modules/calib3d/src/stereosgbm.cpp
+0
-1
test_modelest.cpp
modules/calib3d/test/test_modelest.cpp
+0
-1
command_line_parser.rst
modules/core/doc/command_line_parser.rst
+0
-1
affine.hpp
modules/core/include/opencv2/core/affine.hpp
+0
-2
cvstd.inl.hpp
modules/core/include/opencv2/core/cvstd.inl.hpp
+1
-2
types.hpp
modules/core/include/opencv2/core/types.hpp
+1
-2
stl.cpp
modules/core/src/stl.cpp
+1
-2
types.cpp
modules/core/src/types.cpp
+1
-2
test_split_merge.cu
modules/cudev/test/test_split_merge.cu
+0
-1
features2d.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
+1
-2
flann.hpp
modules/flann/include/opencv2/flann/flann.hpp
+1
-2
highgui.hpp
modules/highgui/include/opencv2/highgui/highgui.hpp
+1
-2
rotcalipers.cpp
modules/imgproc/src/rotcalipers.cpp
+0
-1
segmentation.cpp
modules/imgproc/src/segmentation.cpp
+0
-1
test_connectedcomponents.cpp
modules/imgproc/test/test_connectedcomponents.cpp
+0
-1
ml.hpp
modules/ml/include/opencv2/ml/ml.hpp
+1
-2
nonfree.hpp
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
+1
-2
objdetect.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+1
-2
perf_cascadeclassifier.cpp
modules/objdetect/perf/perf_cascadeclassifier.cpp
+1
-2
hog.cpp
modules/objdetect/src/hog.cpp
+0
-1
image_processing.rst
modules/ocl/doc/image_processing.rst
+0
-1
denoising.rst
modules/photo/doc/denoising.rst
+0
-1
photo.hpp
modules/photo/include/opencv2/photo/photo.hpp
+1
-2
softcascade.rst
modules/softcascade/doc/softcascade.rst
+1
-2
softcascade_training.rst
modules/softcascade/doc/softcascade_training.rst
+1
-2
roc_test.py
modules/softcascade/misc/roc_test.py
+1
-2
scale_caltech.py
modules/softcascade/misc/scale_caltech.py
+1
-2
scale_inria.py
modules/softcascade/misc/scale_inria.py
+1
-2
sft.py
modules/softcascade/misc/sft.py
+1
-2
perf_cuda_softcascade.cpp
modules/softcascade/perf/perf_cuda_softcascade.cpp
+1
-2
perf_softcascade.cpp
modules/softcascade/perf/perf_softcascade.cpp
+1
-2
detector.cpp
modules/softcascade/src/detector.cpp
+1
-2
softcascade_init.cpp
modules/softcascade/src/softcascade_init.cpp
+1
-2
test_main.cpp
modules/softcascade/test/test_main.cpp
+1
-2
test_softcascade.cpp
modules/softcascade/test/test_softcascade.cpp
+1
-2
test_training.cpp
modules/softcascade/test/test_training.cpp
+1
-2
CMakeLists.txt
modules/stitching/CMakeLists.txt
+0
-1
video.hpp
modules/video/include/opencv2/video/video.hpp
+1
-2
CMakeLists.txt
modules/videostab/CMakeLists.txt
+0
-1
wobble_suppression.hpp
...ideostab/include/opencv2/videostab/wobble_suppression.hpp
+0
-1
global_motion.cpp
modules/videostab/src/global_motion.cpp
+0
-2
wobble_suppression.cpp
modules/videostab/src/wobble_suppression.cpp
+0
-1
README.txt
samples/c/example_cmake/README.txt
+0
-5
No files found.
apps/CMakeLists.txt
View file @
9ed475cf
...
...
@@ -3,4 +3,3 @@ add_definitions(-D__OPENCV_BUILD=1)
add_subdirectory
(
haartraining
)
add_subdirectory
(
traincascade
)
add_subdirectory
(
sft
)
apps/sft/CMakeLists.txt
View file @
9ed475cf
...
...
@@ -30,4 +30,4 @@ if(ENABLE_SOLUTION_FOLDERS)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"applications"
)
endif
()
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
)
\ No newline at end of file
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
)
apps/sft/config.cpp
View file @
9ed475cf
...
...
@@ -159,4 +159,4 @@ std::ostream& sft::operator<<(std::ostream& out, const Config& m)
<<
std
::
setw
(
14
)
<<
std
::
left
<<
"featureType"
<<
m
.
featureType
<<
std
::
endl
;
return
out
;
}
\ No newline at end of file
}
apps/sft/include/sft/common.hpp
View file @
9ed475cf
...
...
@@ -71,4 +71,4 @@ namespace sft
# define dprintf(format, ...)
#endif
#endif
\ No newline at end of file
#endif
apps/sft/include/sft/config.hpp
View file @
9ed475cf
...
...
@@ -135,4 +135,4 @@ std::ostream& operator<<(std::ostream& out, const Config& m);
}
#endif
\ No newline at end of file
#endif
apps/sft/include/sft/dataset.hpp
View file @
9ed475cf
...
...
@@ -64,4 +64,4 @@ private:
};
}
#endif
\ No newline at end of file
#endif
apps/sft/sft.cpp
View file @
9ed475cf
...
...
@@ -165,4 +165,4 @@ int main(int argc, char** argv)
fso
.
release
();
std
::
cout
<<
"Training complete..."
<<
std
::
endl
;
return
0
;
}
\ No newline at end of file
}
doc/tutorials/highgui/trackbar/trackbar.rst
View file @
9ed475cf
...
...
@@ -152,8 +152,3 @@ Result
.. image:: images/Adding_Trackbars_Tutorial_Result_1.jpg
:alt: Adding Trackbars - Lena
:align: center
doc/tutorials/ios/hello/hello.rst
View file @
9ed475cf
...
...
@@ -73,4 +73,3 @@ Now we will learn how to write a simple Hello World Application in Xcode using O
.. image:: images/output.png
:alt: output
:align: center
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.rst
View file @
9ed475cf
...
...
@@ -185,4 +185,3 @@ Results
.. image:: images/result.png
:alt: The seperated planes
:align: center
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/calib3d.hpp"
\ No newline at end of file
#include "opencv2/calib3d.hpp"
modules/calib3d/src/compat_ptsetreg.cpp
View file @
9ed475cf
...
...
@@ -428,4 +428,3 @@ CV_IMPL void cvConvertPointsHomogeneous( const CvMat* _src, CvMat* _dst )
dst
.
convertTo
(
dst0
,
dst0
.
type
());
}
}
modules/calib3d/src/ptsetreg.cpp
View file @
9ed475cf
...
...
@@ -534,4 +534,3 @@ int cv::estimateAffine3D(InputArray _from, InputArray _to,
return
createRANSACPointSetRegistrator
(
new
Affine3DEstimatorCallback
,
4
,
param1
,
param2
)
->
run
(
dFrom
,
dTo
,
_out
,
_inliers
);
}
modules/calib3d/src/stereosgbm.cpp
View file @
9ed475cf
...
...
@@ -1169,4 +1169,3 @@ void cv::validateDisparity( InputOutputArray _disp, InputArray _cost, int minDis
}
}
}
modules/calib3d/test/test_modelest.cpp
View file @
9ed475cf
...
...
@@ -229,4 +229,3 @@ void CV_ModelEstimator2_Test::run_func()
TEST(Calib3d_ModelEstimator2, accuracy) { CV_ModelEstimator2_Test test; test.safe_run(); }
#endif
modules/core/doc/command_line_parser.rst
View file @
9ed475cf
...
...
@@ -98,4 +98,3 @@ Use:
# ./app -fps=aaa
ERRORS:
Exception: can not convert: [aaa] to [double]
modules/core/include/opencv2/core/affine.hpp
View file @
9ed475cf
...
...
@@ -430,5 +430,3 @@ cv::Affine3<T>::operator Eigen::Transform<T, 3, Eigen::Affine>() const
#endif
/* __cplusplus */
#endif
/* __OPENCV_CORE_AFFINE3_HPP__ */
modules/core/include/opencv2/core/cvstd.inl.hpp
View file @
9ed475cf
...
...
@@ -247,4 +247,4 @@ std::ostream& operator << (std::ostream& out, const Rect_<_Tp>& rect)
#endif // OPENCV_NOSTL
}
// cv
#endif // __OPENCV_CORE_CVSTDINL_HPP__
\ No newline at end of file
#endif // __OPENCV_CORE_CVSTDINL_HPP__
modules/core/include/opencv2/core/types.hpp
View file @
9ed475cf
...
...
@@ -1922,4 +1922,4 @@ TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)
}
// cv
#endif //__OPENCV_CORE_TYPES_HPP__
\ No newline at end of file
#endif //__OPENCV_CORE_TYPES_HPP__
modules/core/src/stl.cpp
View file @
9ed475cf
...
...
@@ -66,4 +66,4 @@ void cv::String::deallocate()
{
cv
::
fastFree
(
data
-
1
);
}
}
\ No newline at end of file
}
modules/core/src/types.cpp
View file @
9ed475cf
...
...
@@ -136,4 +136,4 @@ float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
return
ovrl
;
}
}
// cv
\ No newline at end of file
}
// cv
modules/cudev/test/test_split_merge.cu
View file @
9ed475cf
...
...
@@ -178,4 +178,3 @@ TYPED_TEST(SplitTest, C4)
{
SplitTest<TypeParam>::test_c4();
}
modules/features2d/include/opencv2/features2d/features2d.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/features2d.hpp"
\ No newline at end of file
#include "opencv2/features2d.hpp"
modules/flann/include/opencv2/flann/flann.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/flann.hpp"
\ No newline at end of file
#include "opencv2/flann.hpp"
modules/highgui/include/opencv2/highgui/highgui.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/highgui.hpp"
\ No newline at end of file
#include "opencv2/highgui.hpp"
modules/imgproc/src/rotcalipers.cpp
View file @
9ed475cf
...
...
@@ -404,4 +404,3 @@ void cv::boxPoints(cv::RotatedRect box, OutputArray _pts)
Mat
pts
=
_pts
.
getMat
();
box
.
points
((
Point2f
*
)
pts
.
data
);
}
modules/imgproc/src/segmentation.cpp
View file @
9ed475cf
...
...
@@ -534,4 +534,3 @@ cvPyrMeanShiftFiltering( const CvArr* srcarr, CvArr* dstarr,
cv
::
pyrMeanShiftFiltering
(
src
,
dst
,
sp0
,
sr
,
max_level
,
termcrit
);
}
modules/imgproc/test/test_connectedcomponents.cpp
View file @
9ed475cf
...
...
@@ -105,4 +105,3 @@ void CV_ConnectedComponentsTest::run( int /* start_from */)
}
TEST
(
Imgproc_ConnectedComponents
,
regression
)
{
CV_ConnectedComponentsTest
test
;
test
.
safe_run
();
}
modules/ml/include/opencv2/ml/ml.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/ml.hpp"
\ No newline at end of file
#include "opencv2/ml.hpp"
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/nonfree.hpp"
\ No newline at end of file
#include "opencv2/nonfree.hpp"
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/objdetect.hpp"
\ No newline at end of file
#include "opencv2/objdetect.hpp"
modules/objdetect/perf/perf_cascadeclassifier.cpp
View file @
9ed475cf
...
...
@@ -47,4 +47,4 @@ PERF_TEST_P(ImageName_MinSize, CascadeClassifierLBPFrontalFace,
std
::
sort
(
faces
.
begin
(),
faces
.
end
(),
comparators
::
RectLess
());
SANITY_CHECK
(
faces
,
3.001
*
faces
.
size
());
}
\ No newline at end of file
}
modules/objdetect/src/hog.cpp
View file @
9ed475cf
...
...
@@ -3023,4 +3023,3 @@ void HOGDescriptor::groupRectangles(std::vector<cv::Rect>& rectList, std::vector
}
}
}
modules/ocl/doc/image_processing.rst
View file @
9ed475cf
...
...
@@ -366,4 +366,3 @@ Finds circles in a grayscale image using the Hough transform.
.. note:: Currently only non-ROI oclMat is supported for src.
.. seealso:: :ocv:func:`HoughCircles`
modules/photo/doc/denoising.rst
View file @
9ed475cf
...
...
@@ -195,4 +195,3 @@ The function converts image to CIELAB colorspace and then separately denoise L a
.. seealso::
:ocv:func:`fastNlMeansDenoisingColored`
modules/photo/include/opencv2/photo/photo.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/photo.hpp"
\ No newline at end of file
#include "opencv2/photo.hpp"
modules/softcascade/doc/softcascade.rst
View file @
9ed475cf
...
...
@@ -9,4 +9,4 @@ softcascade. Soft Cascade object detection and training.
softcascade_detector
softcascade_training
softcascade_cuda
\ No newline at end of file
softcascade_cuda
modules/softcascade/doc/softcascade_training.rst
View file @
9ed475cf
...
...
@@ -140,4 +140,4 @@ Compute feature on integral channel image.
:param si an index of sample.
:param fs a channel matrix.
\ No newline at end of file
:param fs a channel matrix.
modules/softcascade/misc/roc_test.py
View file @
9ed475cf
...
...
@@ -100,4 +100,4 @@ if __name__ == "__main__":
fppi
,
miss_rate
=
sft
.
computeROC
(
confidenses
,
tp
,
nannotated
,
nframes
,
ignored
)
sft
.
plotLogLog
(
fppi
,
miss_rate
,
plot_colors
[
idx
])
sft
.
showPlot
(
args
.
output
,
args
.
labels
)
\ No newline at end of file
sft
.
showPlot
(
args
.
output
,
args
.
labels
)
modules/softcascade/misc/scale_caltech.py
View file @
9ed475cf
...
...
@@ -139,4 +139,4 @@ if __name__ == "__main__":
path
,
ext
=
os
.
path
.
splitext
(
each
)
path
=
path
+
".seq"
print
path
extractPositive
(
open
(
each
),
path
,
opath
,
options
.
octave
,
options
.
min_possible
)
\ No newline at end of file
extractPositive
(
open
(
each
),
path
,
opath
,
options
.
octave
,
options
.
min_possible
)
modules/softcascade/misc/scale_inria.py
View file @
9ed475cf
...
...
@@ -136,4 +136,4 @@ if __name__ == "__main__":
cv2
.
imwrite
(
os
.
path
.
join
(
cneg_path
,
out_name
),
img
)
idx
=
idx
+
1
print
"."
,
sys
.
stdout
.
flush
()
\ No newline at end of file
sys
.
stdout
.
flush
()
modules/softcascade/misc/sft.py
View file @
9ed475cf
...
...
@@ -278,4 +278,4 @@ def parse_caltech(f):
for
idx
,
(
p
,
pv
,
oc
)
in
enumerate
(
zip
(
*
[
pos
,
posv
,
occl
])):
annotations
[
start
+
idx
]
.
append
((
type
,
p
,
oc
,
pv
))
return
annotations
\ No newline at end of file
return
annotations
modules/softcascade/perf/perf_cuda_softcascade.cpp
View file @
9ed475cf
...
...
@@ -233,4 +233,4 @@ RUN_GPU(SCascadeTest, detectStream)
NO_CPU
(
SCascadeTest
,
detectStream
)
#undef SC_PERF_TEST_P
\ No newline at end of file
#undef SC_PERF_TEST_P
modules/softcascade/perf/perf_softcascade.cpp
View file @
9ed475cf
...
...
@@ -44,4 +44,4 @@ PERF_TEST_P(detect, SoftCascadeDetector,
extractRacts
(
objectBoxes
,
rects
);
std
::
sort
(
rects
.
begin
(),
rects
.
end
(),
perf
::
comparators
::
RectLess
());
SANITY_CHECK
(
rects
);
}
\ No newline at end of file
}
modules/softcascade/src/detector.cpp
View file @
9ed475cf
...
...
@@ -593,4 +593,4 @@ void cv::softcascade::Detector::detect(InputArray _image, InputArray _rois, Out
rectPtr
[
i
]
=
(
*
it
).
bb
();
confPtr
[
i
]
=
(
*
it
).
confidence
;
}
}
\ No newline at end of file
}
modules/softcascade/src/softcascade_init.cpp
View file @
9ed475cf
...
...
@@ -63,4 +63,4 @@ bool initModule_softcascade(void)
return
(
sc1
->
info
()
!=
0
)
&&
(
sc
->
info
()
!=
0
);
}
}
}
\ No newline at end of file
}
}
modules/softcascade/test/test_main.cpp
View file @
9ed475cf
...
...
@@ -42,4 +42,4 @@
#include "test_precomp.hpp"
CV_TEST_MAIN
(
"cv"
)
\ No newline at end of file
CV_TEST_MAIN
(
"cv"
)
modules/softcascade/test/test_softcascade.cpp
View file @
9ed475cf
...
...
@@ -138,4 +138,4 @@ TEST(SoftCascadeDetector, detectEmptyRoi)
cascade
.
detect
(
colored
,
cv
::
Mat
::
zeros
(
colored
.
size
(),
CV_8UC1
),
objects
);
ASSERT_EQ
(
0
,
(
int
)
objects
.
size
());
}
\ No newline at end of file
}
modules/softcascade/test/test_training.cpp
View file @
9ed475cf
...
...
@@ -157,4 +157,4 @@ TEST(SoftCascade, training)
ASSERT_FALSE
(
fn
.
empty
());
}
#endif
\ No newline at end of file
#endif
modules/stitching/CMakeLists.txt
View file @
9ed475cf
set
(
the_description
"Images stitching"
)
ocv_define_module
(
stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_gpu opencv_gpuarithm opencv_gpufilters opencv_gpufeatures2d opencv_nonfree
)
modules/video/include/opencv2/video/video.hpp
View file @
9ed475cf
...
...
@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/video.hpp"
\ No newline at end of file
#include "opencv2/video.hpp"
modules/videostab/CMakeLists.txt
View file @
9ed475cf
set
(
the_description
"Video stabilization"
)
ocv_define_module
(
videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
OPTIONAL opencv_gpu opencv_gpuwarping opencv_gpuoptflow opencv_highgui
)
modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
View file @
9ed475cf
...
...
@@ -133,4 +133,3 @@ private:
}
// namespace cv
#endif
modules/videostab/src/global_motion.cpp
View file @
9ed475cf
...
...
@@ -834,5 +834,3 @@ Mat getMotion(int from, int to, const std::vector<Mat> &motions)
}
// namespace videostab
}
// namespace cv
modules/videostab/src/wobble_suppression.cpp
View file @
9ed475cf
...
...
@@ -160,4 +160,3 @@ void MoreAccurateMotionWobbleSuppressorGpu::suppress(int idx, const Mat &frame,
}
// namespace videostab
}
// namespace cv
samples/c/example_cmake/README.txt
View file @
9ed475cf
...
...
@@ -25,8 +25,3 @@ the CMake gui with:
$ cmake-gui <OPENCV_SRC_PATH>/samples/c/example_cmake/
And pick the correct value for OpenCV_DIR.
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