Nguyen Nguyen
58dd70e8dc
Revert support for audio
2015-05-08 12:06:03 -04:00
Nguyen Nguyen
53ff537f1c
temporary fixes
2015-05-08 11:33:11 -04:00
Nguyen Nguyen
a5814871d9
Adding audio to opencv
2015-05-06 17:01:38 -04:00
Vadim Pisarevsky
1aa03cecf1
Merge pull request #3981 from patrikhuber:vs2015-support
2015-05-06 15:35:36 +00:00
Vladislav Vinogradov
f10537cdd6
fix tests compilation issue on Windows
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
9d294cbcf5
fix performance tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
f1bec940b1
fix accuracy tests in tiny mode
2015-05-06 17:15:25 +03:00
Vladislav Vinogradov
dd93d48be4
turn on stereob instantiates that required for tests
2015-05-06 17:15:25 +03:00
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
e49e75da06
OpenCV patch verison++.
2015-05-06 16:29:51 +03:00
Vladislav Vinogradov
1d40946959
Bug #4315 : fix CUDA bitwise operations with mask
...
(cherry picked from commit d87c30dc84
)
2015-05-06 16:27:12 +03:00
Alexander Smorkalov
2598392295
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
...
(cherry picked from commit 63d6cc5ca6
)
2015-05-06 16:26:50 +03:00
lujia
17cc5e2c40
bugfix_for_hog_detectMultiScale_with_weights
...
(cherry picked from commit 7ce116695d
)
2015-05-06 16:24:39 +03:00
Vladislav Vinogradov
4b14400976
disable several heavy performance tests
...
(cherry picked from commit cbdddb473c
)
2015-05-06 16:24:07 +03:00
Vladislav Vinogradov
4704a254f7
disable Video_PyrLKOpticalFlowDense performance test
...
sanity fails on Maxwell and CUDA 7.0 due to unknow reason
(cherry picked from commit b4c2891ef3
)
2015-05-06 16:23:41 +03:00
Vladislav Vinogradov
7708e9882e
use border extrapolation for central pixel in pyrDown
...
in case if image has odd dimension
(cherry picked from commit 1325213303
)
2015-05-06 16:23:28 +03:00
Vladislav Vinogradov
fe1bd0cc2f
fix racecheck warning in scanRows kernel
...
(cherry picked from commit fb15bdfb21
)
2015-05-06 16:23:09 +03:00
Vladislav Vinogradov
a752f25944
increase epsilon for solvePnPRansac function
...
(cherry picked from commit 9d2d173485
)
2015-05-06 16:22:57 +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
Nguyen Nguyen
9682430a69
Adding code to deal with audio output
2015-05-05 13:14:26 -04:00
Nguyen Nguyen
b69ffe6376
Fixed memory leak when recording video in iOS
2015-05-04 16:21:25 -04:00
Nguyen Nguyen
1f72815637
Exporting videoFileString to outside world
2015-05-04 12:38:55 -04:00
Maksim Shabunin
90c3d7d361
Merge pull request #3969 from Dikay900:master_to_2_4
2015-05-04 10:13:45 +00:00
StevenPuttemans
f4eebc46b2
Fixing all wrong uses of RGB channels instead of the OpenCV BGR standard
2015-05-04 09:23:15 +02:00
Patrik Huber
2b1103c1d3
Add support for VS2015
...
Without the fix, OpenCV will compile and silently copy the compiled libs/executables to a location not prefixed with arch/vc14, and OpenCV won't be picked up by find_package and OpenCVConfig.cmake.
2015-05-02 13:31:43 +01: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