diff --git a/captcha/captcha.sh b/captcha/captcha.sh index 1c1db55..62477a5 100755 --- a/captcha/captcha.sh +++ b/captcha/captcha.sh @@ -124,15 +124,6 @@ RAND_ANGLE=$(($R % 3)) get_random RAND_INDEX=$(($R % ${#TRANSFORMATIONS[@]})) -convert -size 300x60 xc:none -pointsize 20 \ - \( -clone 0 -fill black \ - -stroke black -strokewidth 1 \ - -annotate "${RAND_ANGLE}x${RAND_ITALIC}+0+0" "\n $(${TRANSFORMATIONS[$RAND_INDEX]})" \ - -roll +$ROLL_X+0 \ - -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ - -roll -$ROLL_X+0 \) \ - -flatten -crop 300x60 +repage -quality 500 -depth 11 png:"/var/tmp/captcha/${INPUT}_$(date "+%Y-%m-%d-%H%M%S").png" - convert -size 300x60 xc:none -pointsize 20 \ \( -clone 0 -fill black \ -stroke black -strokewidth 1 \ diff --git a/captcha/experimental.sh b/captcha/experimental.sh index fb3e4d6..62477a5 100755 --- a/captcha/experimental.sh +++ b/captcha/experimental.sh @@ -124,15 +124,6 @@ RAND_ANGLE=$(($R % 3)) get_random RAND_INDEX=$(($R % ${#TRANSFORMATIONS[@]})) -convert -size 300x60 xc:none -pointsize 20 \ - \( -clone 0 -fill black \ - -stroke black -strokewidth 1 \ - -annotate "${RAND_ANGLE}x${RAND_ITALIC}+0+0" "\n $(${TRANSFORMATIONS[$RAND_INDEX]})" \ - -roll +$ROLL_X+0 \ - -wave "$WAVE1_AMPLITUDE"x"$WAVE1_LENGTH" \ - -roll -$ROLL_X+0 \) \ - -flatten -crop 300x60 +repage -quality 500 -depth 11 png:"/var/tmp/captcha/EXPERIMENTAL${INPUT}_$(date "+%Y-%m-%d-%H%M%S").png" - convert -size 300x60 xc:none -pointsize 20 \ \( -clone 0 -fill black \ -stroke black -strokewidth 1 \