thmbgen() and thmb_add() changed to use 'generate thumbnail size' configuration file option

git-svn-id: file:///svnroot/renrot/trunk@530 fe2816f4-e837-0410-b10a-f608c9d244a1

2 files changed, 4 insertions, 5 deletions

diff --git a/etc/renrot.conf b/etc/renrot.conf
index 732220b..a6d45e4 100644
--- a/etc/renrot.conf
+++ b/etc/renrot.conf
@@ -159,6 +159,5 @@
 #contact sheet rank file	= 'rankfile'
 
 ## The generated thumbnail geometry
-#generate thumbnail size	=> '160x120'
-
+#generate thumbnail size	= '160x120'
 
diff --git a/renrot b/renrot
index a3db9eb..ae586f8 100755
--- a/renrot
+++ b/renrot
@@ -1526,7 +1526,7 @@ sub thmbgen {
   my $workdir  = shift;
   my $thmbname = shift;
   $thmbname = $workdir . $thmbname;
-  my $size = "160x120";
+  my $size = $cfgOpts{'generate thumbnail size'};
   my $thmb = Image::Magick->new;
 
   $thmb->Set(size => $size, filename => $thmbname, quality => 95, interlace => 'Partition');
@@ -1862,12 +1862,12 @@ sub rotateThumbnail {
 # Returns    : none
 # Parameters : $file str - original image name
 # Throws     : no exceptions
-# Comments   : sie of the generated thumbnail is fixed and is 160x120
+# Comments   : none
 # See Also   : n/a
 sub thmb_add {
   my $file = shift;
   my $thm_name = "thm_" . $file;
-  my $size = "160x120";
+  my $size = $cfgOpts{'generate thumbnail size'};
   my $thmb = Image::Magick->new;
 
   $thmb->Set(size => $size, filename => $thm_name, quality => 95, interlace => 'Partition');