From 3a2246a12b54589b1bdf07d475f83c8cde281218 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 25 Feb 2008 18:11:33 +0100 Subject: [PATCH] Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename extensions --- HISTORY | 5 +++-- PLUGINS/src/pictures/HISTORY | 5 +++++ PLUGINS/src/pictures/pic2mpg | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 02a7deca..e5e7253c 100644 --- a/HISTORY +++ b/HISTORY @@ -5671,7 +5671,8 @@ Video Disk Recorder Revision History - Added the backslash ('\') to the list of characters that need to be escaped when executing external commands (thanks to Peter Bieringer for reporting this one). -2008-02-24: Version 1.5.17 - +2008-02-25: Version 1.5.17 - Updated the Swedish OSD texts (thanks to Tomas Berglund). +- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename + extensions (thanks to Stefan Wagner for reporting this one). diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index b0952abf..c8f93bfb 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -24,3 +24,8 @@ VDR Plugin 'pictures' Revision History - Fixed setting the OSD area. - Introduced 'operator const void * ()' in cString to catch cases where operator*() should be used. + +2008-02-25: + +- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename + extensions (reported by Stefan Wagner ). diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg index 6cd74359..bcafcf52 100755 --- a/PLUGINS/src/pictures/pic2mpg +++ b/PLUGINS/src/pictures/pic2mpg @@ -7,7 +7,7 @@ # # See the README file for copyright information and how to reach the author. # -# $Id: pic2mpg 1.2 2008/02/02 11:34:43 kls Exp $ +# $Id: pic2mpg 1.3 2008/02/24 22:00:18 kls Exp $ ## TODO implement HDTV (1920 x 1080) @@ -143,7 +143,7 @@ for ($i = 0; $i < 10; $i++) { # dirs might become empty when removing empty subd sub ConvertFile { my ($Pict, $Mpeg) = @_; - (my $Type) = $Pict =~ /\.([^\.]*)$/; + (my $Type) = lc($Pict) =~ /\.([^\.]*)$/; if (!defined $PNMCONV{$Type}) { return if ($Ignore); die "unknown file type '$Type': '$Pict'\n";