From b1754c8a2eda52d76f3b37125b70e1004f6c5e77 Mon Sep 17 00:00:00 2001 From: VoidVolker Date: Wed, 5 Aug 2015 21:57:01 +0300 Subject: [PATCH] Revert "[=] fixed zoom start index: 1->0" This reverts commit f5096d2d00f61976acbb664958397f9535667a3d. --- magick-slicer.sh | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/magick-slicer.sh b/magick-slicer.sh index a51f95f..73f6f7f 100644 --- a/magick-slicer.sh +++ b/magick-slicer.sh @@ -1,6 +1,6 @@ #!/bin/bash -version="0.003" -date="31/07/2015" +version="0.002" +date="28/07/2015" # ####### Options ####### # # resultExt='png' @@ -301,18 +301,6 @@ vHelp(){ fi } -lHelp(){ - echo " [ -l, --overlap ] " - if [ "$1" = true ] - then - echo " Tiles overlap in pixels." - echo - echo " Default: 1" - echo " Type: int" - echo - fi -} - uHelp(){ echo " Usage:" echo " magick-slicer.sh -u|--usage" @@ -339,7 +327,6 @@ cliHelp(){ -w|--width) wHelp true ;; -h|--height) hHelp true ;; -s|--step) sHelp true ;; - # -l|--overlap) lHelp true ;; -p|--options) pHelp true ;; -g|--gravity) gHelp true ;; -x|--extent) xHelp true ;; @@ -366,7 +353,6 @@ cliHelp(){ wHelp $2 hHelp $2 sHelp $2 - # lHelp $2 pHelp $2 gHelp $2 xHelp $2 @@ -454,11 +440,6 @@ do shift # past argument ;; - -l|--overlap) - overlap="$2" - shift # past argument - ;; - -p|--options) imOptions="$2" shift # past argument @@ -577,7 +558,7 @@ fi # Set extension fullName=$(basename "$imageSource") fileBase="${fullName%.*}" -fileExt="${fullName##*.}" +fileExt="${fullName%.*}" if $ExtNotDefined then @@ -737,7 +718,7 @@ sliceImage(){ # zoom image } sliceA(){ - infoMsg " Slicer A is running..." + infoMsg " Slicer A is running..." local scalesW=( `getZoomLevels $imageW $tileW $step` ) local scalesH=( `getZoomLevels $imageH $tileH $step` ) local zw=${scalesW[0]} @@ -746,7 +727,7 @@ sliceA(){ local zoomMax=0 local zoom=0 local hMod='' - local s=0 + local s=1 local file='' if [ "$zw" -ge "$zh" ] @@ -762,19 +743,19 @@ sliceA(){ # local scale=$scaleStart # local scalep='' - while [ "$s" -lt "$zoomMax" ] + while [ "$s" -le "$zoomMax" ] do if $zoomReverse then let "zoom = s" else - let "zoom = zoomMax - s" + let "zoom = zoomMax - s + 1" fi - infoMsg " Resizing next file..." + infoMsg "     Resizing next file..." file=`zoomImage $s "${hMod}${scales[$zoom]}"` - infoMsg " File resized: ${file}" - infoMsg " Slicing file..." + infoMsg "     File resized: ${file}" + infoMsg "     Slicing file..." sliceImage $s $file rm -rf $file @@ -790,7 +771,7 @@ sliceA(){ let "s+=1" done - infoMsg " Slicer A complete" + infoMsg " Slicer A complete" # s=`nextScale $scaleStart` # s=`nextScale $s`