diff options
| author | louis <louis.braun@gmx.de> | 2014-11-21 19:19:59 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-11-21 19:19:59 +0100 |
| commit | a34a824527f9ab911f20f0b42d6fdd311a19829a (patch) | |
| tree | 9c029fc22d1a3f38a9b08504be6b9e0d7d6d32d6 /libtemplate/templatefunction.c | |
| parent | e7abb8557eb8397172a360845b7ac5f7607ca158 (diff) | |
| download | vdr-plugin-skindesigner-a34a824527f9ab911f20f0b42d6fdd311a19829a.tar.gz vdr-plugin-skindesigner-a34a824527f9ab911f20f0b42d6fdd311a19829a.tar.bz2 | |
changed handling of channel logos, width and height are now mandatory
Diffstat (limited to 'libtemplate/templatefunction.c')
| -rw-r--r-- | libtemplate/templatefunction.c | 18 |
1 files changed, 0 insertions, 18 deletions
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);
|