Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
11 years ago
Roman Donchenko
8200a95ced
Boring changes - core.
...
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
11 years ago
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
11 years ago
Bahram Dahi
6cf9070b9a
Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196
11 years ago
Roman Donchenko
f64d512774
Backported globbing from master.
12 years ago
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
12 years ago
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
12 years ago
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
12 years ago
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
12 years ago
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
12 years ago
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
12 years ago
marina.kolpakova
a486aafe7c
add dlobbing under *nix
12 years ago
Marina Kolpakova
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
13 years ago
Andrey Kamaev
d9c74f63e1
All tests writing temporary files are updated to use cv::tempfile() function
13 years ago
Andrey Kamaev
9ad470ba5c
backported API for storing OpenCV data structures to text string and reading them back (r8481, r8516, r8518, r8522)
13 years ago
Vadim Pisarevsky
17d9509e31
changed "void FileStorage::release(string&)" to "string FileStorage::releaseAndGetString()"
13 years ago
Vadim Pisarevsky
74882fe188
replaced "string FileStorage::release()" with 2 methods to preserve backward compatibility.
13 years ago
Vadim Pisarevsky
bc929a7d46
added API for storing OpenCV data structures to text string and reading them back
13 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Andrey Kamaev
ae00e9074b
Added test for reading empty Mat from FileStorage
13 years ago
Vadim Pisarevsky
c7d38a3aab
restored try-catch in the i/o test
13 years ago
Vadim Pisarevsky
5e15557155
fixed a few bugs in XML/YAML input/output.
13 years ago
Vadim Pisarevsky
24bc0db1b0
fixed writing huge matrices (ticket #1439 )
13 years ago
Andrey Kamaev
b906ad3108
Test system included into Android build
14 years ago
Vadim Pisarevsky
061b49e0b2
reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.
14 years ago