Vladislav Vinogradov
ad3123adfd
turn on some instantiates that required for other primitives
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
f939d80f4c
fixed seg faults
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
ee316758ca
reduce color instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
6d7a61cbdc
reduce copy_make_border instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
b44b1ab47b
reduce matrix_reductions instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
2e47a1a61b
reduce pyramids instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
72685cf01c
reduce resize instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
612888c066
reduce remap instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
e7b55f4982
reduce warp instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
3004f5fa30
reduce stereobm instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
9682d2afff
reduce element_operations instantiates for tiny build
2015-05-06 17:15:24 +03:00
Vladislav Vinogradov
87d655325c
reduce add_weighted instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
db25e44a17
reduce brute_force_matcher instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
b7a9e672c5
reduce bilateral filter instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
8e49ab1d3b
reduce filter2d instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
00c36e88ef
reduce separable filter instantiates for tiny build
2015-05-06 17:13:59 +03:00
Vladislav Vinogradov
cde697dd14
introduce BUILD_TINY_GPU_MODULE CMake option
...
it adds OPENCV_TINY_GPU_MODULE definition, that will allow
to build tiny version of gpu module (with limited image format support)
2015-05-06 17:13:59 +03:00
Alexander Smorkalov
bb44316028
Merge pull request #3990 from jet47:cuda-bitwise-mask
2015-05-06 12:50:08 +00:00
Alexander Smorkalov
0b2cfcfda2
Merge pull request #3976 from SpecLad:rm-insertIframe
2015-05-06 12:47:59 +00:00
Alexander Smorkalov
9c02caf392
Merge pull request #3989 from asmorkalov:as/tbb_dep
2015-05-06 12:47:41 +00:00
Vladislav Vinogradov
d87c30dc84
Bug #4315 : fix CUDA bitwise operations with mask
2015-05-06 13:28:08 +03:00
Alexander Smorkalov
63d6cc5ca6
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
2015-05-06 13:10:39 +03:00
Maksim Shabunin
90c3d7d361
Merge pull request #3969 from Dikay900:master_to_2_4
2015-05-04 10:13:45 +00:00
Roman Donchenko
007a3ef8b6
Remove insertIframe.js
...
It hasn't been used since f82c04f
. Also, the line adding the script had
an unneeded pathto call, so the script was being loaded from the wrong path
anyway.
2015-04-30 15:42:15 +03:00
Belev
83eb1d3608
Fix typo
...
Fixed difference in the given arguments to the ellipse function and the description after that
Fixed two more typos
Replaced unnecessary the with to
Conflicts:
doc/tutorials/core/adding_images/adding_images.markdown
doc/tutorials/core/basic_geometric_drawing/basic_geometric_drawing.markdown
doc/tutorials/core/random_generator_and_text/random_generator_and_text.markdown
modules/imgproc/include/opencv2/imgproc.hpp
2015-04-30 09:14:36 +02:00
Andrey Pavlenko
5c12c92243
Merge pull request #3961 from apavlenko:2.4_fix_polylines_empty
2015-04-28 16:22:31 +00:00
Martin Ueding
9e29762838
Add example data types for calibrateCamera call
...
It took me a while to figure out what was meant with
OpenCV Error: Assertion failed (i < 0) in getMat
While searching for this error message I found [a list of error
messages](https://adventuresandwhathaveyou.wordpress.com/2014/03/14/opencv-error-messages-suck/ )
which also explained what the problem was: The data type for `rvecs` was
not a simple `cv::Mat` but a `std::vector<cv::Mat>`.
After I fixed that, I got the next error message:
OpenCV Error: Assertion failed (ni > 0 && ni == ni1) in
collectCalibrationData, file
/build/buildd/opencv-2.4.9+dfsg/modules/calib3d/src/calibration.cpp,
line 3193
The problem here was that my data type for the `objectPoints` was just
`vector<Vec3f>` and not `vector<vector<Vec3f>>`.
In order to save other people the time looking for this, I added
explicit examples of the needed data types into the documentation of the
function. I had to re-read the current version a couple of times until I
can read the needed levels of `vector<>`. Having this example would have
really helped me there.
Conflicts:
modules/calib3d/include/opencv2/calib3d.hpp
2015-04-28 17:24:37 +02:00
Vadim Pisarevsky
da229cce9a
Merge pull request #3946 from zjulujia:bugfix_for_hog_detectMultiScale_with_weights
2015-04-28 10:54:45 +00:00
Vadim Pisarevsky
36af97d00c
Merge pull request #3959 from jet47:gpu-fixes
2015-04-28 10:49:06 +00:00
Vadim Pisarevsky
d705c651f2
Merge pull request #3960 from ilya-lavrenov:aarch64_test_fixes
2015-04-28 10:48:33 +00:00
Vadim Pisarevsky
08848c56b7
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2
2015-04-28 10:47:05 +00:00
Vadim Pisarevsky
ebe979090e
Merge pull request #3963 from Dikay900:2_4_diff_to_master
2015-04-28 10:41:42 +00:00
Pierre Moulon
901d4995e3
Fix a typo error
...
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
2015-04-25 15:07:17 +02:00
Adi Shavit
aad95c7d8c
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2015-04-25 14:54:35 +02:00
Dikay900
d9b7b300b4
fix qt example on 2.4 with vs2010 and higher
2015-04-25 14:46:17 +02:00
Brian Park
044de4105e
add input paramter checking that verifies the existance of the input files to stero_match example
...
remove the unnecessary header file
check input paramter by checking the image size
2015-04-25 14:46:17 +02:00
Chris Mayo
7a5aa06b9e
Act on INSTALL_PYTHON_EXAMPLES
...
Conflicts:
samples/CMakeLists.txt
2015-04-25 14:46:16 +02:00
Ben Hagen
a21fb63c28
store user-provided data in PlaneTracker class
2015-04-25 11:22:18 +02:00
Yang Fan
eaa9b78121
ENH: explicitly declared outputFilename to surpress error C2668
...
Conflicts:
samples/gpu/video_writer.cpp
2015-04-25 10:58:01 +02:00
Abhijit Kundu
fd4df0f67d
Added suuport for finding Intel TBB for Visual Studio 2013
2015-04-25 10:23:34 +02:00
Simon Heinen
6decc2596d
squashed #3729
...
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
2015-04-24 23:02:10 +02:00
Eric Sommerlade
41b920344d
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
...
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
2015-04-24 22:59:08 +02:00
Ying Xiong
82668e06d4
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-24 22:39:49 +02:00
ttagu99
a81374c1d7
findcontour_example check image empty
2015-04-24 21:58:31 +02:00
侯骥
66fc6126d2
Update MatchTemplate_Demo.cpp
2015-04-24 21:58:31 +02:00
Jay Bosamiya
8b58b59df4
Fix typo
2015-04-24 21:58:30 +02:00
RafaRuiz
f0595b8254
Update lkdemo.cpp because of memory leak
...
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
2015-04-24 21:58:29 +02:00
Pastafarianist
1e01441767
Fixed typo
2015-04-24 21:58:29 +02:00
Dikay900
c797746b6e
use constant instead of value backported from #785
2015-04-24 21:58:28 +02:00
Dikay900
1bf4427a5c
filename correction from #3217
2015-04-24 21:58:28 +02:00