Fix bugs caused by recent changes

diff --git a/gal/Gallery/Generator.pm b/gal/Gallery/Generator.pm
index b3542a1e3f658a4b40fb9698411c5cbb07ee99ac..c435543a7d7530ccb14ef5a2ab428e79c88b5e1e 100644 (file)
--- a/gal/Gallery/Generator.pm
+++ b/gal/Gallery/Generator.pm
@@ -32,7 +32,7 @@ sub img($$$) {
        print "$base: ";
        my $p = new Image::Magick;
        my $e;
-       my $img = $CF{"PhotoDir"} . $orig;
+       my $img = $CF{"PhotoDir"} . "/$orig";
        $e = $p->Read($img) and die "Error reading $img: $e";
        my ($wo, $ho) = $p->Get('width', 'height');
        my ($w, $h) = ($wo, $ho);
@@ -52,7 +52,7 @@ sub img($$$) {
        $h = int($h);
        print " -> ${w}x${h} ";
        $p->Resize(width=>$w, height=>$h);
-       my $thumb = $CF{"ThumbDir"} . "$base-thumb.jpg";
+       my $thumb = $CF{"ThumbDir"} . "/$base-thumb.jpg";
        $e = $p->Write($thumb) and die "Unable to write $thumb: $e";
        print NOTES "$base $w $h $wo $ho\n";
        print "OK\n";