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
a50d75d362
Made Filestorage able to not own its CvFileStorage instance.
...
This allows to get rid of the last remaining Ptr<T>::addref calls.
12 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.
12 years ago
Roman Donchenko
4f9554eead
Removed a few more unused configuration macros.
...
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.
Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
12 years ago
Andrey Kamaev
7193a73ca0
Move FileStorage to separate header
12 years ago
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
12 years ago
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
12 years ago
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
12 years ago
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
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
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
12 years ago
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
12 years ago
Anatoly Baksheev
a09b973c2e
Smart operators for smart Ptr (feature #2637 )
12 years ago
Alexander Smorkalov
dfa4b2fefa
Workaround for gcc overoptimization compiler bug.
12 years ago
Andrey Kamaev
18e77d606c
Drop functions working with multibyte characters
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
12 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
12 years ago
Vadim Pisarevsky
0bd68a70f1
fixed #2297 , #2300 ; fixed several warnings
13 years ago
Andrey Kamaev
27c23b557c
Merged few small fixes from 2.4 branch
13 years ago
Marina Kolpakova
680a44189c
merged the trunk r8704:8716
13 years ago
Marina Kolpakova
6cca6a4548
merged the trunk r8669:8702
13 years ago
Marina Kolpakova
150aeee58f
merged iOS framework from the trunk
13 years ago
Andrey Kamaev
0f8e271509
Fixing iOS detection in core persistence
13 years ago
Andrey Kamaev
25f70e691a
Fixed warnigs from zlib defines
13 years ago
Andrey Kamaev
f6ef504ef0
Fixed few more warnings/bugs.
13 years ago
Andrey Kamaev
7dcbf32532
Fixed WString related build problem in Android build
13 years ago
Vadim Pisarevsky
76f49f3078
added script to build the universal opencv2.framework for iOS device and simulator. fixed opencv_world cmake script to create static libopencv_world.a for iOS. temporarily disable compressed file storages in the case of iOS (to avoid dependency of zlib)
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
Andrey Kamaev
1a572c8e89
Added test for #1997 ; fixed build warnings
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
7fb694756b
Fixed bug in reading zero-size Mat from FileStorage
13 years ago
Vadim Pisarevsky
5e15557155
fixed a few bugs in XML/YAML input/output.
13 years ago
Vadim Pisarevsky
ff071d2cf6
added Algorithm::get/set/addParam(vector<Mat>) (to be used by EM)
13 years ago
Vadim Pisarevsky
24bc0db1b0
fixed writing huge matrices (ticket #1439 )
13 years ago
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
13 years ago
Andrey Kamaev
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
13 years ago
Andrey Kamaev
5cce038958
Performance testing branch is merged back into trunk
14 years ago
Vadim Pisarevsky
6f26c55fe3
fixed ticket #983
14 years ago
Vadim Pisarevsky
f6b3754f34
handle empty YAML's correctly (ticket #1127 )
14 years ago
Vadim Pisarevsky
fcd2a0c3d3
fixed VS2010 compile warnings and errors
14 years ago
Alexander Shishkov
b19434513b
reverted the floating-point number formatting (exception in ml tests)
14 years ago
Alexander Shishkov
80dfdf8ff7
removed ddepth from matrix (after Vadim's commit, it generates problem with core and ml tests)
...
returned the new floating-point number formatting
14 years ago
Vadim Pisarevsky
b14ca4299a
reverted the floating-point number formatting
14 years ago
Vadim Pisarevsky
6de72ea8ee
resolved tickets #904 (nicer floating-point formatting) and #816 (reduce with CV_REDUCE_AVG on 8-bit arrays)
14 years ago
Vadim Pisarevsky
60a0ebbd6c
added optional encoding parameter to cvOpenFileStorage() and FileStorage::open() (ticket #976 ). moved some implementation parts of CommandLineParser to cmdparser.cpp.
14 years ago
Vadim Pisarevsky
309bb171b2
do not use system is<alpha|alnum|space|...>, because of the different implementations (and in OpenCV we assume english names of the identifiers etc)
14 years ago