potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-10-09 21:18:37 +00:00
parent 1522722fab 421fdc0e94
commit dada5a422d
32 changed files with 616 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/system.cpp
+2
View File
@@ -70,6 +70,8 @@ static bool param_dumpErrors = utils::getConfigurationParameterBool("OPENCV_DUMP
#endif
);
void* allocSingletonBuffer(size_t size) { return fastMalloc(size); }
} // namespace cv
#ifndef CV_ERROR_SET_TERMINATE_HANDLER // build config option