You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.6 KiB
36 lines
1.6 KiB
6 years ago
|
From c26c43c69c654344d2e2fb7b2d21121ca89224e6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maksim Shabunin <maksim.shabunin@gmail.com>
|
||
|
|
Date: Mon, 3 Dec 2018 17:16:09 +0300
|
||
|
|
Subject: [PATCH] Fixed compilation with VA-interop on 32-bit platforms
|
||
|
|
|
||
|
|
---
|
||
|
|
modules/core/src/va_intel.cpp | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/core/src/va_intel.cpp b/modules/core/src/va_intel.cpp
|
||
|
|
index ac74f0c5337..c571b90b5fe 100644
|
||
|
|
--- a/modules/core/src/va_intel.cpp
|
||
|
|
+++ b/modules/core/src/va_intel.cpp
|
||
|
|
@@ -340,8 +340,8 @@ static void copy_convert_yv12_to_bgr(const VAImage& image, const unsigned char*
|
||
|
|
1.5959997177f
|
||
|
|
};
|
||
|
|
|
||
|
|
- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
|
||
|
|
- CV_CheckEQ(image.num_planes, 3, "");
|
||
|
|
+ CV_CheckEQ((size_t)image.format.fourcc, (size_t)VA_FOURCC_YV12, "Unexpected image format");
|
||
|
|
+ CV_CheckEQ((size_t)image.num_planes, (size_t)3, "");
|
||
|
|
|
||
|
|
const size_t srcOffsetY = image.offsets[0];
|
||
|
|
const size_t srcOffsetV = image.offsets[1];
|
||
|
|
@@ -417,8 +417,8 @@ static void copy_convert_bgr_to_yv12(const VAImage& image, const Mat& bgr, unsig
|
||
|
|
-0.2909994125f, 0.438999176f, -0.3679990768f, -0.0709991455f
|
||
|
|
};
|
||
|
|
|
||
|
|
- CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image format");
|
||
|
|
- CV_CheckEQ(image.num_planes, 3, "");
|
||
|
|
+ CV_CheckEQ((size_t)image.format.fourcc, (size_t)VA_FOURCC_YV12, "Unexpected image format");
|
||
|
|
+ CV_CheckEQ((size_t)image.num_planes, (size_t)3, "");
|
||
|
|
|
||
|
|
const size_t dstOffsetY = image.offsets[0];
|
||
|
|
const size_t dstOffsetV = image.offsets[1];
|