summaryrefslogtreecommitdiff
path: root/PLUGINS/src/pictures/pic2mpg
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2008-03-02 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2008-03-02 18:00:00 +0100
commit0872cba0a10c1350e6f694ea2296947428a97326 (patch)
tree7e11b8528d8ad64b94331acdc1074eaf84e64382 /PLUGINS/src/pictures/pic2mpg
parent83d7a4b7838a8209c05c53b5e625bf965d3bf585 (diff)
downloadvdr-patch-lnbsharing-0872cba0a10c1350e6f694ea2296947428a97326.tar.gz
vdr-patch-lnbsharing-0872cba0a10c1350e6f694ea2296947428a97326.tar.bz2
Version 1.5.17vdr-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 and relative paths (thanks to Stefan Wagner for reporting this one). - Updated the Romanian OSD texts (thanks to Lucian Muresan). - Updated the Dutch OSD texts (thanks to Johan Schuring). - Stripping control codes 0x86 and 0x87 from SI strings. - Updated French language texts (thanks to Jean-Claude Repetto). - Fixed handling 3 and 4 byte UTF-8 symbols in Utf8CharGet() (thanks to Andreas Mair). - Fixed a crash in cFreetypeFont::DrawText() if an unknown symbol is encountered (thanks to Tobias Grimm). Unknown symbols are replaced with a '?'. - Updated the Slovenian OSD texts (thanks to Matjaz Thaler). - Updated the Czech OSD texts (thanks to Vladimír Bárta and Jiri Dobry). - Updated the Turkish OSD texts (thanks to Oktay Yolgeçen). - The 'plugins' target in the Makefile now returns an error exit code if one of the plugins failed to compile (suggested by Tobias Grimm). - Rendering the non-breaking space symbol as a blank (thanks to Tobias Grimm). - Changed the default character set for SI data from ISO6937 (as required by the DVB standard ETSI EN 300 468) to ISO-8859-9, in order to work around the stupidity of some providers, who actually use ISO-8859-9, but fail to correctly announce that.
Diffstat (limited to 'PLUGINS/src/pictures/pic2mpg')
-rwxr-xr-xPLUGINS/src/pictures/pic2mpg9
1 files changed, 5 insertions, 4 deletions
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index 6cd7435..af58f97 100755
--- a/PLUGINS/src/pictures/pic2mpg
+++ b/PLUGINS/src/pictures/pic2mpg
@@ -7,11 +7,12 @@
#
# 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.4 2008/02/29 14:34:22 kls Exp $
## TODO implement HDTV (1920 x 1080)
use File::Path;
+use File::Spec;
use Getopt::Std;
use Image::Size;
@@ -87,8 +88,8 @@ if (-f $ARGV[0]) {
die "$0: mixed directory and file ('$ARGV[0]' <-> '$ARGV[1]')\n" unless !-e $ARGV[1] || -d $ARGV[1];
-$PICDIR = $ARGV[0];
-$MPGDIR = $ARGV[1];
+$PICDIR = File::Spec->rel2abs($ARGV[0]);
+$MPGDIR = File::Spec->rel2abs($ARGV[1]);
# Convert pictures to mpegs:
@@ -143,7 +144,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";