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

Merge pull request #12458 from DEEPIR:3.4

Browse Source 
* may be an typo fix

* remove identical branch,may be paste error

* add parentheses around macro parameter

* simplify if condition

* check malloc fail

* change the condition of branch removed by commit 3041502861
This commit is contained in:
cyy
2018-09-07 23:43:47 +08:00
committed by Alexander Alekhin
parent 875de75327
commit 286c2c236b
8 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/precomp.hpp
+1 -1
View File
@@ -204,7 +204,7 @@ struct NoVec
size_t operator()(const void*, const void*, void*, size_t) const { return 0; }
};
#define CV_SPLIT_MERGE_MAX_BLOCK_SIZE(cn) ((INT_MAX/4)/cn) // HAL implementation accepts 'int' len, so INT_MAX doesn't work here
#define CV_SPLIT_MERGE_MAX_BLOCK_SIZE(cn) ((INT_MAX/4)/(cn)) // HAL implementation accepts 'int' len, so INT_MAX doesn't work here
enum { BLOCK_SIZE = 1024 };