Merge pull request #12570 from alalek:drop_usrtype1
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 19 Sep 2018 10:55:26 +0000 (13:55 +0300)
committerGitHub <noreply@github.com>
Wed, 19 Sep 2018 10:55:26 +0000 (13:55 +0300)
commit5fb0f34e8ab9002b1e222fb5ab87f91db8ad7bcf
tree0f7fdfe46e522916192f369083a2282c789c10f5
parent861415133e555df2158423726eed9290bbdfe1b9
Merge pull request #12570 from alalek:drop_usrtype1

* core: drop usage of CV_USRTYPE1 in OpenCV

avoid OpenCV crashes due size change CV_ELEM_SIZE(CV_USRTYPE1): 8 -> 2

* ! fix persistence internal types
13 files changed:
modules/core/include/opencv2/core/hal/interface.h
modules/core/include/opencv2/core/types_c.h
modules/core/src/datastructs.cpp
modules/core/src/persistence.cpp
modules/core/src/persistence.hpp
modules/core/src/persistence_c.cpp
modules/core/src/persistence_types.cpp
modules/cudalegacy/src/graphcuts.cpp
modules/features2d/misc/java/test/FlannBasedDescriptorMatcherTest.java
modules/features2d/src/matchers.cpp
modules/flann/include/opencv2/flann/miniflann.hpp
modules/flann/src/miniflann.cpp
modules/ts/src/ts_perf.cpp