VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-20 20:06:57 -04:00
Code Issues Projects Releases Wiki Activity

ATV modulator: make OpenCV code objects compatible with OpenCV version in Ubuntu 20.04. Fixes issue #511

Browse Source
This commit is contained in:
f4exb 2020-04-27 14:41:02 +02:00
parent b04b81816b
commit 9029a7f24f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channeltx/modatv/atvmodsource.cpp
View File

@ -316,7 +316,7 @@ void ATVModSource::pullVideo(Real& sample)
mixImageAndText(colorFrame); mixImageAndText(colorFrame);
} }
cv::cvtColor(colorFrame, m_videoframeOriginal, cv::COLOR_BGR2GRAY); cv::cvtColor(colorFrame, m_videoframeOriginal, cv::COLOR_RGB2GRAY);
resizeVideo(); resizeVideo();
} }
} }
@ -443,7 +443,7 @@ void ATVModSource::pullVideo(Real& sample)
mixImageAndText(colorFrame); mixImageAndText(colorFrame);
} }
cv::cvtColor(colorFrame, camera.m_videoframeOriginal, cv::COLOR_BGR2GRAY); cv::cvtColor(colorFrame, camera.m_videoframeOriginal, cv::COLOR_RGB2GRAY);
resizeCamera(); resizeCamera();
} }
@ -648,7 +648,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
void ATVModSource::openImage(const QString& fileName) void ATVModSource::openImage(const QString& fileName)
{ {
m_imageFromFile = cv::imread(qPrintable(fileName), cv::IMREAD_GRAYSCALE); m_imageFromFile = cv::imread(qPrintable(fileName), cv::ImreadModes::IMREAD_GRAYSCALE);
m_imageOK = m_imageFromFile.data != 0; m_imageOK = m_imageFromFile.data != 0;
if (m_imageOK) if (m_imageOK)