--- cf.schmorp.de/server/utils/cfutil.in 2007/04/21 11:55:36 1.30 +++ cf.schmorp.de/server/utils/cfutil.in 2007/04/26 00:39:18 1.31 @@ -11,6 +11,7 @@ my $IDENTIFY = "@IDENTIFY@"; my $OPTIPNG = "@OPTIPNG@"; my $RSYNC = "@RSYNC@"; +my $PNGNQ = "@PNGNQ@"; use Getopt::Long; use Coro::Event; @@ -156,7 +157,7 @@ . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" and die "convert/hq2xa pipeline error: status $? ($!)"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + system $OPTIPNG, "-i0", "-q", "$other~"; die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; @@ -172,7 +173,25 @@ if (0 > aio_lstat $other or (-M _) > (-M $path)) { fork_sub { system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + system $OPTIPNG, "-i0", "-q", "$other~"; + + # reduce smoothfaces >10000 bytes + if ($stem =~ /_S\./ && (-s "$other~") > 10000) { + my $ncolor = 256; + while () { + system "<\Q$other~\E $PNGNQ -n$ncolor >\Q$other~~\E"; + system $OPTIPNG, "-i0", "-q", "$other~~"; + last if 10000 > -s "$other~~"; + $ncolor = int $ncolor * 0.9; + $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; + } + + printf "reduced %s from %d to %d bytes using %d colours.\n", + $other, -s "$other~", -s "$other~~", $ncolor + if $VERBOSE > 0; + rename "$other~~", "$other~"; + } + die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; };