chacha21
aa1b031274
get rid of warning C4800 under VS2010
...
the "std::basic_ios::operator bool" differs between C++98 and C++11. The
"double not" syntax is portable and covers both cases with equivalent
meaning
2017-03-02 16:56:20 +01:00
Vladislav Sovrasov
896c34fab3
Add support of type headings from YAML1.2
2017-01-17 16:40:38 +03:00
Matt Bennett
c3a8db6d6c
Merge pull request #7952 from mattmyne:JSONWriteFixTrailingDecimalPoint
...
Append zero to trailing decimal place for FileStorage JSON write of a float or double value (#7952 )
* Fix for FileStorage JSON write of a float or double value that has no fractional part; appends a zero character after the trailing decimal place to meet JSON standard.
* strlen return to size_t type rather than unnecessary cast to int
2017-01-02 20:28:07 +00:00
mshabunin
e941259434
Persistence: fixed valgrind warning in base64 decoder
2016-12-08 14:58:18 +03:00
mshabunin
a0e771f545
Fixed valgrind issues in persistence functions
2016-12-02 18:41:25 +03:00
Vladislav Sovrasov
e955d17c51
Add new error messages
2016-11-02 14:53:56 +03:00
Vladislav Sovrasov
38483fe7a7
Skip UTF-8 BOM in FileStorage
2016-11-02 14:51:07 +03:00
fegorsch
ddf0554fff
Use colon in "%YAML:1.0" directive when persisting to YAML-files
...
In YAML 1.0 the colon is mandatory. See http://yaml.org/spec/1.0/#id2558635 .
This also allows prior releases to read YAML files created with the current version.
2016-10-25 18:18:35 +02:00
Vadim Pisarevsky
b03e3abd62
Merge pull request #7088 from wiryls:FileStorageJSON
2016-08-24 16:49:06 +00:00
MYLS
47f2e618ee
Add two tests.
...
- one test for type_id;
- another for comments in JSON;
2016-08-24 17:01:57 +08:00
Pavel Vlasov
30a6cee2fe
Instrumentation for OpenCV API regions and IPP functions;
2016-08-19 18:10:03 +03:00
MYLS
d99832163a
solve warnings and do some cleaning.
2016-08-11 03:31:35 +08:00
MYLS
8596e82d98
Add JSON support.
...
a JSON emitter, a parser, tests and some basic doc.
2016-08-11 00:53:15 +08:00
MYLS
1da8a19af3
fixed two bugs that I caused.
2016-08-05 16:15:03 +08:00
MYLS
86238d2748
make some changes according to the code review.
...
- use `std::string` instead of `new char`;
- reserve 1 MB for buffer;
2016-08-05 15:17:21 +08:00
MYLS
3935855365
Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests
...
# Conflicts:
# modules/core/test/test_io.cpp
2016-07-30 01:08:27 +08:00
MYLS
08911cbfae
change code
to snippet
and do some cleaning.
...
- use `@snippet` instead of `@code` in docs.
- remove some functions that were not used.
2016-07-30 00:35:41 +08:00
MYLS
cf2d6f6721
solve errors and warnings
...
Modified performance test and solve a problem caused by an enum type.
2016-07-19 21:18:41 +08:00
MYLS
78ca5ddd45
solve errors and warnings
2016-07-19 19:56:57 +08:00
Ilya Lavrenov
87ae4e0564
fixed clone of empty matrix
2016-07-19 11:31:53 +03:00
MYLS
617df09143
Modify Base64 functions and add test and documentation
...
Major changes:
- modify the Base64 functions to compatible with `cvWriteRawData` and so
on.
- add a Base64 flag for FileStorage and outputs raw data in Base64
automatically.
- complete all testing and documentation.
2016-07-19 15:54:38 +08:00
Philipp Hasper
00112bbe10
persistence: fixing crash with space-only values
2016-07-08 12:41:05 +02:00
MYLS
7c92ee2e6e
Split cvWriteRawData_Base64
into three functions
...
The three new functions:
```cpp
void cvStartWriteRawData_Base64(::CvFileStorage * fs, const char* name,
int len, const char* dt);
void cvWriteRawData_Base64(::CvFileStorage *
fs, const void* _data, int len);
void
cvEndWriteRawData_Base64(::CvFileStorage * fs);
```
Test is also updated. (And it's remarkable that there is a bug in
`cvWriteReadData`.)
2016-06-24 22:27:42 +08:00
MYLS
29921d055d
change the parameter to CvMat
and CvMatND
...
```cpp
cvWriteMat_Base64(::cv::FileStorage & fs, ::cv::String const & name,
::cv::Mat const & mat)
```
becomes:
```cpp
CV_EXPORTS void cvWriteMat_Base64(::CvFileStorage* fs, const char* name,
const ::CvMat* mat);
CV_EXPORTS void
cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const
::CvMatND* mat);
```
2016-06-20 16:59:58 +08:00
MYLS
9faa2a7fd0
solve warning for IOS
...
Two test are still needed:
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 02:44:39 +08:00
MYLS
958263d245
Solve warnings, and adjusted the test case.
2016-06-19 02:00:32 +08:00
MYLS
882e4221e7
fix errors from test.
...
Two other test are still needed.
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 00:45:51 +08:00
MYLS
d1b097f409
fix most coding style warnings and errors
2016-06-18 23:28:12 +08:00
MYLS
ecd827fc8e
Add Base64 support for FileStorage
...
[GSoC] FileStorage:
Add base64 support for reading and writting XML\YML file.
The two new functions:
```
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2016-06-18 21:40:29 +08:00
Pavel Rojtberg
bf688da50b
FileStorage: add simplified API for bindings
...
at least it is possible to read/ write calibration files. Fixes #4282 .
Also add CPP method for writing comments.
2016-05-25 16:01:55 +02:00
Philipp Hasper
47c4ee974a
operator<< handles keys starting with underscore
2016-04-11 09:55:33 +02:00
Vadim Pisarevsky
432cf1152a
added read/write functions for vector<DMatch> + the test ( http://code.opencv.org/issues/4308 )
2015-05-18 18:59:37 +03:00
Roman Donchenko
6274e1fc5f
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
)
2015-03-10 12:38:45 +03:00
Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
)
2015-03-10 12:38:45 +03:00
Vladislav Vinogradov
a932d8aba1
use full qualified name for all internal namespaces to prevent ambiguous symbol errors
2015-02-16 11:31:21 +03:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Ilya Lavrenov
493679dc56
cv::minMaxIdx for cn > 1
2014-04-22 23:47:04 +04:00
Roman Donchenko
d6b54ff9d1
Merge pull request #2476 from minkless:3.0-bugfix-core-filestorage
2014-03-28 12:17:16 +04:00
Koji Miyazato
1ab8060b62
corrected some style errors found by review.
2014-03-28 10:45:33 +09:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Koji Miyazato
a43ef9a6cd
WriteStructContext treats state of fs
2014-03-18 23:29:30 +09:00
kuroda sho
f9484bae8a
fix: use "cvAlloc" wrapper function for malloc.
2014-03-14 17:09:08 +09:00
kurodash
0eaeff0641
fix: use "cvAlloc" wrapper function for malloc.
2014-03-07 19:02:37 +09:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
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.
2013-09-05 19:03:00 +04:00
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.
2013-09-05 18:26:43 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
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.
2013-07-10 18:29:11 +04:00
Andrey Kamaev
7193a73ca0
Move FileStorage to separate header
2013-04-01 19:18:05 +04:00