summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--PLUGINS/src/pictures/HISTORY4
-rwxr-xr-xPLUGINS/src/pictures/pic2mpg7
-rw-r--r--PLUGINS/src/pictures/pictures.c4
4 files changed, 9 insertions, 8 deletions
diff --git a/HISTORY b/HISTORY
index 68616164..6e806ed3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5675,7 +5675,7 @@ Video Disk Recorder Revision History
- 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).
+ 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.
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY
index c8f93bfb..536c5deb 100644
--- a/PLUGINS/src/pictures/HISTORY
+++ b/PLUGINS/src/pictures/HISTORY
@@ -25,7 +25,7 @@ VDR Plugin 'pictures' Revision History
- Introduced 'operator const void * ()' in cString to catch cases where operator*()
should be used.
-2008-02-25:
+2008-02-29: Version 0.0.6
- Made the 'pic2mpg' script of the 'pictures' plugin work with uppercase filename
- extensions (reported by Stefan Wagner <stefanwag@gmx.at>).
+ extensions and relative paths (reported by Stefan Wagner <stefanwag@gmx.at>).
diff --git a/PLUGINS/src/pictures/pic2mpg b/PLUGINS/src/pictures/pic2mpg
index bcafcf52..af58f975 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.3 2008/02/24 22:00:18 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:
diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c
index 6e64c4e3..bb03c301 100644
--- a/PLUGINS/src/pictures/pictures.c
+++ b/PLUGINS/src/pictures/pictures.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: pictures.c 1.5 2008/02/09 12:15:52 kls Exp $
+ * $Id: pictures.c 1.6 2008/02/29 14:38:31 kls Exp $
*/
#include <getopt.h>
@@ -11,7 +11,7 @@
#include "menu.h"
#include "player.h"
-static const char *VERSION = "0.0.5";
+static const char *VERSION = "0.0.6";
static const char *DESCRIPTION = trNOOP("A simple picture viewer");
static const char *MAINMENUENTRY = trNOOP("Pictures");