1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00

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

This commit is contained in:
Alexander Alekhin
2019-04-04 18:09:24 +00:00
8 changed files with 406 additions and 443 deletions
+2 -3
View File
@@ -42,8 +42,7 @@
#include "precomp.hpp"
#include "utils.hpp"
namespace cv
{
namespace cv {
int validateToInt(size_t sz)
{
@@ -601,4 +600,4 @@ uchar* FillGrayRow1( uchar* data, uchar* indices, int len, uchar* palette )
return data;
}
}
} // namespace