1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Merge pull request #7135 from lupustr3:pvlasov/icv_restrictions_remove

This commit is contained in:
Alexander Alekhin
2016-08-19 13:23:47 +00:00
13 changed files with 16 additions and 53 deletions
+1 -1
View File
@@ -393,7 +393,7 @@ static ippiGeneralFunc ippiHLS2RGBTab[] =
0, (ippiGeneralFunc)ippiHLSToRGB_32f_C3R, 0, 0
};
#if !defined(HAVE_IPP_ICV_ONLY) && IPP_DISABLE_BLOCK
#if IPP_DISABLE_BLOCK
static ippiGeneralFunc ippiRGBToLUVTab[] =
{
(ippiGeneralFunc)ippiRGBToLUV_8u_C3R, 0, (ippiGeneralFunc)ippiRGBToLUV_16u_C3R, 0,