From a34a824527f9ab911f20f0b42d6fdd311a19829a Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Fri, 21 Nov 2014 19:19:59 +0100
Subject: changed handling of channel logos, width and height are now mandatory

---
 libtemplate/templatefunction.c | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'libtemplate/templatefunction.c')

diff --git a/libtemplate/templatefunction.c b/libtemplate/templatefunction.c
index 2a6e5a3..8465961 100644
--- a/libtemplate/templatefunction.c
+++ b/libtemplate/templatefunction.c
@@ -305,24 +305,6 @@ bool cTemplateFunction::ReCalculateParameters(void) {
 void cTemplateFunction::CompleteParameters(void) {
     switch (type) {
         case ftDrawImage: {
-            //Calculate img size
-            if ((GetNumericParameter(ptImageType) == itChannelLogo)||(GetNumericParameter(ptImageType) == itSepLogo)) {
-                int logoWidthOrig = config.logoWidth;
-                int logoHeightOrig = config.logoHeight;
-                int logoWidth = GetNumericParameter(ptWidth);
-                int logoHeight = GetNumericParameter(ptHeight);
-                if (logoWidth <= 0 && logoHeight <= 0)
-                    break; 
-                if (logoWidth <= 0 && logoHeightOrig > 0) {
-                    logoWidth = logoHeight * logoWidthOrig / logoHeightOrig;
-                    numericParameters.erase(ptWidth);
-                    numericParameters.insert(pair<eParamType,int>(ptWidth, logoWidth));
-                } else if (logoHeight <= 0 && logoWidthOrig > 0) {
-                    logoHeight = logoWidth * logoHeightOrig / logoWidthOrig;
-                    numericParameters.erase(ptHeight);
-                    numericParameters.insert(pair<eParamType,int>(ptHeight, logoHeight));
-                }
-            }
             CalculateAlign(GetNumericParameter(ptWidth), GetNumericParameter(ptHeight));
             if (imgPath.size() == 0) {
                 imgPath = GetParameter(ptPath);
-- 
cgit v1.2.3