From 618655bb946b83e1b95cb8841c077419d8ad69d3 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Fri, 22 May 2020 17:03:37 +0100
Subject: [PATCH] teletextdecodervbiebu & wtvmedia CWFs

---
 teletextdecodervbiebu.cc | 10 +++++-----
 wtvmedia.cc              | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/teletextdecodervbiebu.cc b/teletextdecodervbiebu.cc
index f50864b..5a91d51 100644
--- a/teletextdecodervbiebu.cc
+++ b/teletextdecodervbiebu.cc
@@ -71,7 +71,7 @@ TeletextDecoderVBIEBU::~TeletextDecoderVBIEBU()
 
 }
 
-long long TeletextDecoderVBIEBU::SetStartOffset(long long curreftime, bool *rsync)
+long long TeletextDecoderVBIEBU::SetStartOffset(long long /* curreftime */, bool* /* rsync */)
 {
   return 0;  
 }
@@ -146,7 +146,7 @@ void TeletextDecoderVBIEBU::setKeyinDigits(char digits[3],bool inKeying)
     }
 }
 
-void TeletextDecoderVBIEBU::PrepareMediaSample(const MediaPacketList& mplist, UINT samplepos)
+void TeletextDecoderVBIEBU::PrepareMediaSample(const MediaPacketList& mplist, UINT /* samplepos */)
 {
     mediapacket = mplist.front();
 }
@@ -259,10 +259,10 @@ UINT TeletextDecoderVBIEBU::DeliverMediaSample(UCHAR* buffer, UINT *samplepos)
 
 }
 // This part is inspired by the vdr-plugin-osdteletext of Udo Richter and Marcel Wiesweg
-void TeletextDecoderVBIEBU::DecodeTeletext(const UCHAR* buffer, unsigned int field) //needs to be exactly 42 byte long!!
+void TeletextDecoderVBIEBU::DecodeTeletext(const UCHAR* buffer, unsigned int /* field */) //needs to be exactly 42 byte long!!
 {
    UCHAR hdrbuf[5];
-   for (int i=0;i<5;i++) hdrbuf[i]=(unhamtab[buffer[2*i]]&0xF) | ((unhamtab[buffer[2*i+1]]&0xF)<< 4);
+   for (int i=0;i<5;i++) hdrbuf[i] = static_cast<UCHAR>( (unhamtab[buffer[2*i]]&0xF) | ((unhamtab[buffer[2*i+1]]&0xF)<< 4) );
    int header=hdrbuf[0];
    int magazin=header & 0x7;
    int line = (header>>3) & 0x1f;
@@ -737,7 +737,7 @@ void TeletextDecoderVBIEBU::RenderTeletextCode(bool renderfirstlineonly) {
             }
                 
             // Handle all 'Set-After' spacing codes
-             if (ttc>=0x00 &&  ttc<=0x07) { // Set FG color
+             if (ttc<=0x07) { // Set FG color
                 if (GraphicCharset) {
                     // Actual switch from graphics charset
                     HoldMosaicChar=' ';
diff --git a/wtvmedia.cc b/wtvmedia.cc
index 8e03805..a6815c2 100644
--- a/wtvmedia.cc
+++ b/wtvmedia.cc
@@ -52,12 +52,15 @@
 	 switch (scale)
 	 {
 	 case ZoomHorizontal:
-		 w = area.w; break;
+		 w = static_cast<float>(area.w);
+         break;
 	 case ZoomVertical:
-		 h = area.h; break;
+		 h = static_cast<float>(area.h);
+         break;
 	 case ZoomBoth:
-		 w = area.w;
-		 h = area.h; break;
+		 w = static_cast<float>(area.w);
+		 h = static_cast<float>(area.h);
+         break;
 
 	 case NoZoom:
 	   ; // ?
-- 
2.39.5