ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.69 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.71 by root, Sat Feb 7 21:40:54 2009 UTC

… …
19use YAML (); 19use YAML ();
20use JSON::XS (); 20use JSON::XS ();
21use IO::AIO (); 21use IO::AIO ();
22use File::Temp; 22use File::Temp;
23use Deliantra; 23use Deliantra;
24use Coro; 24use Coro 5.12;
25use Coro::AIO; 25use Coro::AIO;
26use Coro::Util; 26use Coro::Util;
27use POSIX (); 27use POSIX ();
28use Carp; 28use Carp;
29use Coro::Channel; 29use Coro::Channel;
… …
273 fork_sub { 273 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 275 system $OPTIPNG, "-i0", "-q", "$other~";
276 276
277 # reduce smoothfaces >10000 bytes 277 # reduce smoothfaces >10000 bytes
278 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 279 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 280 my $ncolor = 256;
280 while () { 281 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 282 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 283 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 284 last if 10000 > -s "$other~~";
… …
630 my @a_res = map +(async \&process_res), 1..2; 631 my @a_res = map +(async \&process_res), 1..2;
631 my @a_trs = map +(async \&process_trs), 1..2; 632 my @a_trs = map +(async \&process_trs), 1..2;
632 633
633 IO::AIO::flush; 634 IO::AIO::flush;
634 635
635 $c_res->put (undef) for @a_res; 636 $c_res->shutdown;
636 $c_arc->put (undef) for @a_arc; 637 $c_arc->shutdown;
637 $c_trs->put (undef) for @a_trs; 638 $c_trs->shutdown;
638 639
639 print "start file scan, arc, res processing...\n" if $VERBOSE; 640 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 641
641 $_->join for @a_arc; # need to parse all archetypes before png processing 642 $_->join for @a_arc; # need to parse all archetypes before png processing
642 643
… …
706 print "processing facedata...\n" if $VERBOSE; 707 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 708 while (my ($k, $v) = each %FACEINFO) {
708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 709 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 710 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
710 711
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 712 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 713 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
713 714
714 if (my $magicmap = $v->{magicmap}) { 715 if (my $magicmap = $v->{magicmap}) {
715 $magicmap =~ y/A-Z_\-/a-z/d; 716 $magicmap =~ y/A-Z_\-/a-z/d;
716 $v->{magicmap} = $COLOR{$magicmap}; 717 $v->{magicmap} = $COLOR{$magicmap};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines