[Orca-checkins] rev 116 - in trunk/orca: . orcallator config lib src docs packages packages/Storable-0.6.5 packages/Storable-0.6.5/t packages/Data-Dumper-2.101 packages/Data-Dumper-2.101/t packages/rrdtool-1.0.7.2 packages/rrdtool-1.0.7.2/src packages/rrdtool-1.0.7.2/cgilib-0.4 packages/rrdtool-1.0.7.2/zlib-1.1.3 packages/rrdtool-1.0.7.2/contrib packages/rrdtool-1.0.7.2/contrib/rrd-file-icon packages/rrdtool-1.0.7.2/contrib/log2rrd packages/rrdtool-1.0.7.2/contrib/trytime packages/rrdtool-1.0.7.2/perl-piped packages/rrdtool-1.0.7.2/config packages/rrdtool-1.0.7.2/config/libtool packages/rrdtool-1.0.7.2/doc packages/rrdtool-1.0.7.2/perl-shared packages/rrdtool-1.0.7.2/perl-shared/t packages/rrdtool-1.0.7.2/libpng-1.0.3 packages/rrdtool-1.0.7.2/gd1.3 packages/rrdtool-1.0.7.2/examples packages/Digest-MD5-2.09 packages/Digest-MD5-2.09/MD2 packages/Digest-MD5-2.09/MD2/t packages/Digest-MD5-2.09/t packages/Digest-MD5-2.09/lib packages/Digest-MD5-2.09/SHA1 packages/Digest-MD5-2.09/SHA1/t packages/Math-Interpolate-1.05 packages/Math-Interpolate-1.05/t packages/Math-Interpolate-1.05/lib/Math
blair at orcaware.com
blair at orcaware.com
Sat Jul 13 19:25:05 PDT 2002
Author: blair
Date: Fri, 28 Jun 2002 22:04:28 -0700
New Revision: 116
Added:
trunk/orca/config/aclocal.m4
trunk/orca/docs/FAQ
trunk/orca/docs/manual.html
trunk/orca/orcallator/Makefile.in
trunk/orca/packages/Data-Dumper-2.101/
trunk/orca/packages/Data-Dumper-2.101/Changes
trunk/orca/packages/Data-Dumper-2.101/Dumper.html
trunk/orca/packages/Data-Dumper-2.101/Dumper.pm
trunk/orca/packages/Data-Dumper-2.101/Dumper.pm.NOXSUB
trunk/orca/packages/Data-Dumper-2.101/Dumper.xs
trunk/orca/packages/Data-Dumper-2.101/MANIFEST
trunk/orca/packages/Data-Dumper-2.101/MANIFEST.NOXSUB
trunk/orca/packages/Data-Dumper-2.101/Makefile.PL
trunk/orca/packages/Data-Dumper-2.101/README
trunk/orca/packages/Data-Dumper-2.101/Todo
trunk/orca/packages/Data-Dumper-2.101/t/
trunk/orca/packages/Data-Dumper-2.101/t/dumper.t
trunk/orca/packages/Data-Dumper-2.101/t/overload.t
trunk/orca/packages/Digest-MD5-2.09/MD2/t/badfile.t
trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.gif
trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.html
trunk/orca/packages/Digest-MD5-2.09/SHA1/t/badfile.t
trunk/orca/packages/Digest-MD5-2.09/t/badfile.t
trunk/orca/packages/rrdtool-1.0.7.2/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/NT-BUILD-TIPS.txt
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.5
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.c
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.h
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiDebug.3
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiGetValue.3
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiHeader.3
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiInit.3
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiRedirect.3
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsp
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsw
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgitest.c
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/jumpto.c
trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/readme
trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/config/acconfig.h
trunk/orca/packages/rrdtool-1.0.7.2/config/acinclude.m4
trunk/orca/packages/rrdtool-1.0.7.2/config/aclocal.m4
trunk/orca/packages/rrdtool-1.0.7.2/config/config.guess
trunk/orca/packages/rrdtool-1.0.7.2/config/config.sub
trunk/orca/packages/rrdtool-1.0.7.2/config/libtool/
trunk/orca/packages/rrdtool-1.0.7.2/config/libtool/libtool.m4
trunk/orca/packages/rrdtool-1.0.7.2/config/ltconfig
trunk/orca/packages/rrdtool-1.0.7.2/config/ltmain.sh
trunk/orca/packages/rrdtool-1.0.7.2/config/missing
trunk/orca/packages/rrdtool-1.0.7.2/config/mkinstalldirs
trunk/orca/packages/rrdtool-1.0.7.2/config/stamp-h.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/
trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/README
trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/rrd.png
trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.txt
trunk/orca/packages/rrdtool-1.0.7.2/examples/
trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/bigtops.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/cgi-demo.cgi.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/minmax.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/piped-demo.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/shared-demo.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/examples/stripes.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README.rrdtool
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/readme.txt
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ANNOUNCE
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/CHANGES
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/INSTALL
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/KNOWNBUG
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README.rrdtool
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/TODO
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Y2KINFO
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.1
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/example.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.3
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.txt
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpngpf.3
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.5
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsp
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsw
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.h
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngconf.h
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngerror.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngget.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngmem.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngpread.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngread.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrio.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrtran.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrutil.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngset.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngtrans.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwio.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwrite.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwtran.c
trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwutil.c
trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsp
trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsw
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/ntmake.pl
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsp
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsw
trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/src/gdpng.c
trunk/orca/packages/rrdtool-1.0.7.2/src/gifsize.c
trunk/orca/packages/rrdtool-1.0.7.2/src/pngsize.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_cgi.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_restore.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/ChangeLog
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/FAQ
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/INDEX
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.am
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README.rrdtool
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/adler32.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/algorithm.txt
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/compress.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/configure
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/crc32.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/gzio.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffixed.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inflate.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/uncompr.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zconf.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.3
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsp
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsw
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.h
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.c
trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.h
Removed:
trunk/orca/packages/rrdtool-1.0.7.2/MANIFEST
trunk/orca/packages/rrdtool-1.0.7.2/Makefile.dist
trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile
trunk/orca/packages/rrdtool-1.0.7.2/doc/GNUmakefile.in
trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.3
trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.3
trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.1
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.1
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gddemo.c
trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/examples/
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/examples/
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd.dsp
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd.dsw
Modified:
trunk/orca/CHANGES
trunk/orca/INSTALL
trunk/orca/Makefile.in
trunk/orca/NEWS
trunk/orca/README
trunk/orca/TODO
trunk/orca/config/PerlHead1.in
trunk/orca/config/PerlHead2.in
trunk/orca/configure
trunk/orca/configure.in
trunk/orca/lib/Makefile.in
trunk/orca/orcallator/orcallator.cfg.in
trunk/orca/orcallator/orcallator.se
trunk/orca/orcallator/start_orcallator.sh.in
trunk/orca/packages/Digest-MD5-2.09/Changes
trunk/orca/packages/Digest-MD5-2.09/MANIFEST
trunk/orca/packages/Digest-MD5-2.09/MD2/MD2.xs
trunk/orca/packages/Digest-MD5-2.09/MD5.pm
trunk/orca/packages/Digest-MD5-2.09/MD5.xs
trunk/orca/packages/Digest-MD5-2.09/README
trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.pm
trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.xs
trunk/orca/packages/Digest-MD5-2.09/lib/Digest.pm
trunk/orca/packages/Digest-MD5-2.09/lib/MD5.pm
trunk/orca/packages/Digest-MD5-2.09/t/files.t
trunk/orca/packages/Makefile.in
trunk/orca/packages/Math-Interpolate-1.05/CHANGES
trunk/orca/packages/Math-Interpolate-1.05/README
trunk/orca/packages/Math-Interpolate-1.05/lib/Math/Interpolate.pm
trunk/orca/packages/Math-Interpolate-1.05/lib/Math/IntervalSearch.pm
trunk/orca/packages/Math-Interpolate-1.05/t/01interval.t
trunk/orca/packages/Storable-0.6.5/ChangeLog
trunk/orca/packages/Storable-0.6.5/Makefile.PL
trunk/orca/packages/Storable-0.6.5/README
trunk/orca/packages/Storable-0.6.5/Storable.pm
trunk/orca/packages/Storable-0.6.5/Storable.xs
trunk/orca/packages/Storable-0.6.5/patchlevel.h
trunk/orca/packages/Storable-0.6.5/t/canonical.t
trunk/orca/packages/Storable-0.6.5/t/dclone.t
trunk/orca/packages/Storable-0.6.5/t/dump.pl
trunk/orca/packages/Storable-0.6.5/t/forgive.t
trunk/orca/packages/Storable-0.6.5/t/freeze.t
trunk/orca/packages/Storable-0.6.5/t/retrieve.t
trunk/orca/packages/Storable-0.6.5/t/store.t
trunk/orca/packages/Storable-0.6.5/t/tied.t
trunk/orca/packages/rrdtool-1.0.7.2/CHANGES
trunk/orca/packages/rrdtool-1.0.7.2/CONTRIBUTORS
trunk/orca/packages/rrdtool-1.0.7.2/COPYING
trunk/orca/packages/rrdtool-1.0.7.2/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/README
trunk/orca/packages/rrdtool-1.0.7.2/TODO
trunk/orca/packages/rrdtool-1.0.7.2/config/config.h.in
trunk/orca/packages/rrdtool-1.0.7.2/config/install-sh
trunk/orca/packages/rrdtool-1.0.7.2/configure
trunk/orca/packages/rrdtool-1.0.7.2/configure.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/README
trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/log2rrd.pl.in
trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/trytime.c
trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.txt
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.html
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.pod
trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.txt
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.dsp
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.c
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.h
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/index.html
trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/webgif.c
trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/MANIFEST
trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/RRDp.pm
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/Makefile.PL
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.pm
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.xs
trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/t/base.t
trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.in
trunk/orca/packages/rrdtool-1.0.7.2/src/getopt.c
trunk/orca/packages/rrdtool-1.0.7.2/src/parsetime.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_create.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_diff.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_dump.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_error.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_fetch.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.h
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_graph.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_last.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_open.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_resize.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.h
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tune.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_update.c
trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsp
trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsw
trunk/orca/src/Makefile.in
trunk/orca/src/orca.pl.in
trunk/orca/src/upgrade_installation.pl
Log:
Load orca-0.24 into trunk/orca.
Modified: trunk/orca/configure
==============================================================================
--- trunk/orca/configure (original)
+++ trunk/orca/configure Sat Jul 13 19:22:22 2002
@@ -463,7 +463,7 @@
# A filename unique to this package, relative to the directory that
# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=src/orca.pl
+ac_unique_file=src/orca.pl.in
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
@@ -648,11 +648,16 @@
# Define the directories containing packages that Orca makes use of here.
-# The path packages gets added where necessary.
-DIGEST_MD5_DIR=Digest-MD5-2.07
-MATH_INTERPOLATE_DIR=Math-Interpolate-1.02
-RRDTOOL_DIR=rrdtool-0.99.31
-STORABLE_DIR=Storable-0.6 at 3
+# The directory name packages where these packages are distributed with
+# Orca gets added where necessary.
+COMPRESS_ZLIB_DIR=Compress-Zlib-1.05
+DATA_DUMPER_DIR=Data-Dumper-2.101
+DIGEST_MD5_DIR=Digest-MD5-2.09
+MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
+RRDTOOL_DIR=rrdtool-1.0.7.2
+STORABLE_DIR=Storable-0.6.5
+
+
@@ -730,7 +735,7 @@
)`
-WATCH_HTTPD=
+WATCH_WEB=
NCSA_LOG=
# Check whether --with-ncsa-log or --without-ncsa-log was given.
if test "${with_ncsa_log+set}" = set; then
@@ -742,7 +747,7 @@
;;
*) WEB_LOG="$withval"
NCSA_LOG=yes
- WATCH_HTTPD="-DWATCH_HTTPD"
+ WATCH_WEB="-DWATCH_WEB"
;;
esac
@@ -764,7 +769,7 @@
;;
*) WEB_LOG="$withval"
PROXY_LOG=yes
- WATCH_HTTPD="-DWATCH_HTTPD -DWATCH_PROXY"
+ WATCH_WEB="-DWATCH_WEB -DWATCH_PROXY"
;;
esac
@@ -787,7 +792,7 @@
{ echo "configure: error: *** You must supply an argument to the --with-squid-log option." 1>&2; exit 1; }
;;
*) WEB_LOG="$withval"
- WATCH_HTTPD="-DWATCH_HTTPD -DWATCH_SQUID"
+ WATCH_WEB="-DWATCH_WEB -DWATCH_SQUID"
;;
esac
@@ -797,13 +802,12 @@
-
# To get a default CFLAGS for this build, check for a C compiler. This
# is also needed to be ready to compile any Perl modules.
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:807: checking for $ac_word" >&5
+echo "configure:811: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -833,7 +837,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:837: checking for $ac_word" >&5
+echo "configure:841: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -884,7 +888,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:888: checking for $ac_word" >&5
+echo "configure:892: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -916,7 +920,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:920: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:924: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -927,12 +931,12 @@
cat > conftest.$ac_ext << EOF
-#line 931 "configure"
+#line 935 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -958,12 +962,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:962: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:967: checking whether we are using GNU C" >&5
+echo "configure:971: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -972,7 +976,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -991,7 +995,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:995: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:999: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1024,7 +1028,7 @@
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1028: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1032: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1069,21 +1073,19 @@
# sed with no file args requires a program.
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-for ac_prog in mawk gawk nawk awk
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
+# Extract the first word of "bzip2", so it can be a program name with args.
+set dummy bzip2; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1078: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
+echo "configure:1080: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_BZIP2'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$AWK" in
+ case "$BZIP2" in
/*)
- ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
+ ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
;;
?:/*)
- ac_cv_path_AWK="$AWK" # Let the user override the test with a dos path.
+ ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
@@ -1091,7 +1093,7 @@
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_AWK="$ac_dir/$ac_word"
+ ac_cv_path_BZIP2="$ac_dir/$ac_word"
break
fi
done
@@ -1099,20 +1101,87 @@
;;
esac
fi
-AWK="$ac_cv_path_AWK"
-if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&6
+BZIP2="$ac_cv_path_BZIP2"
+if test -n "$BZIP2"; then
+ echo "$ac_t""$BZIP2" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-test -n "$AWK" && break
-done
+# Extract the first word of "bunzip2", so it can be a program name with args.
+set dummy bunzip2; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1115: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_BUNZIP2'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$BUNZIP2" in
+ /*)
+ ac_cv_path_BUNZIP2="$BUNZIP2" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_BUNZIP2="$BUNZIP2" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_BUNZIP2="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+BUNZIP2="$ac_cv_path_BUNZIP2"
+if test -n "$BUNZIP2"; then
+ echo "$ac_t""$BUNZIP2" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "compress", so it can be a program name with args.
+set dummy compress; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1150: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$COMPRESS" in
+ /*)
+ ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_COMPRESS="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+COMPRESS="$ac_cv_path_COMPRESS"
+if test -n "$COMPRESS"; then
+ echo "$ac_t""$COMPRESS" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
# Extract the first word of "cut", so it can be a program name with args.
set dummy cut; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1116: checking for $ac_word" >&5
+echo "configure:1185: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CUT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1148,7 +1217,7 @@
# Extract the first word of "expr", so it can be a program name with args.
set dummy expr; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1152: checking for $ac_word" >&5
+echo "configure:1221: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_EXPR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1181,27 +1250,27 @@
echo "$ac_t""no" 1>&6
fi
-# Extract the first word of "se", so it can be a program name with args.
-set dummy se; ac_word=$2
+# Extract the first word of "gzip", so it can be a program name with args.
+set dummy gzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1188: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_SE'+set}'`\" = set"; then
+echo "configure:1257: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$SE" in
+ case "$GZIP" in
/*)
- ac_cv_path_SE="$SE" # Let the user override the test with a path.
+ ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
;;
?:/*)
- ac_cv_path_SE="$SE" # Let the user override the test with a dos path.
+ ac_cv_path_GZIP="$GZIP" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="/opt/RICHPse/bin:$PATH"
+ ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_SE="$ac_dir/$ac_word"
+ ac_cv_path_GZIP="$ac_dir/$ac_word"
break
fi
done
@@ -1209,26 +1278,26 @@
;;
esac
fi
-SE="$ac_cv_path_SE"
-if test -n "$SE"; then
- echo "$ac_t""$SE" 1>&6
+GZIP="$ac_cv_path_GZIP"
+if test -n "$GZIP"; then
+ echo "$ac_t""$GZIP" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-# Extract the first word of "uname", so it can be a program name with args.
-set dummy uname; ac_word=$2
+# Extract the first word of "gunzip", so it can be a program name with args.
+set dummy gunzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1223: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_UNAME'+set}'`\" = set"; then
+echo "configure:1292: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GUNZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$UNAME" in
+ case "$GUNZIP" in
/*)
- ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
+ ac_cv_path_GUNZIP="$GUNZIP" # Let the user override the test with a path.
;;
?:/*)
- ac_cv_path_UNAME="$UNAME" # Let the user override the test with a dos path.
+ ac_cv_path_GUNZIP="$GUNZIP" # Let the user override the test with a dos path.
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
@@ -1236,32 +1305,67 @@
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
- ac_cv_path_UNAME="$ac_dir/$ac_word"
+ ac_cv_path_GUNZIP="$ac_dir/$ac_word"
break
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_path_UNAME" && ac_cv_path_UNAME="uname"
;;
esac
fi
-UNAME="$ac_cv_path_UNAME"
-if test -n "$UNAME"; then
- echo "$ac_t""$UNAME" 1>&6
+GUNZIP="$ac_cv_path_GUNZIP"
+if test -n "$GUNZIP"; then
+ echo "$ac_t""$GUNZIP" 1>&6
else
echo "$ac_t""no" 1>&6
fi
+for ac_prog in mawk gawk nawk awk
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1329: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$AWK" in
+ /*)
+ ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_AWK="$AWK" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_AWK="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+AWK="$ac_cv_path_AWK"
+if test -n "$AWK"; then
+ echo "$ac_t""$AWK" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
-# Include the file that defines BORP_PERL_RUN.
-
-
+test -n "$AWK" && break
+done
+# Include the file that defines BORP_PERL_RUN.
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_word" >&5
+echo "configure:1369: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1299,7 +1403,7 @@
else
echo $ac_n "checking if '$PERL' will run Perl scripts""... $ac_c" 1>&6
-echo "configure:1303: checking if '$PERL' will run Perl scripts" >&5
+echo "configure:1407: checking if '$PERL' will run Perl scripts" >&5
rm -f conftest.BZ
cat > conftest.BZ <<EOF
#!$PERL
@@ -1320,10 +1424,206 @@
PERL_HEAD="../config/$PERL_HEAD"
-# Check for necessary Perl modules.
+# Extract the first word of "uname", so it can be a program name with args.
+set dummy uname; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1431: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_UNAME'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$UNAME" in
+ /*)
+ ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_UNAME="$UNAME" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_UNAME="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_UNAME" && ac_cv_path_UNAME="uname"
+ ;;
+esac
+fi
+UNAME="$ac_cv_path_UNAME"
+if test -n "$UNAME"; then
+ echo "$ac_t""$UNAME" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "uncompress", so it can be a program name with args.
+set dummy uncompress; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1467: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$UNCOMPRESS" in
+ /*)
+ ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_UNCOMPRESS="$UNCOMPRESS" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+UNCOMPRESS="$ac_cv_path_UNCOMPRESS"
+if test -n "$UNCOMPRESS"; then
+ echo "$ac_t""$UNCOMPRESS" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+# Determine the correct flags to compress files depending upon the compress
+# programs available.
+COMPRESSOR=
+UNCOMPRESSOR_PIPE=
+if test -n "$BZIP2" -a -n "$BUNZIP2"; then
+ COMPRESSOR="$BZIP2 -9"
+ UNCOMPRESSOR_PIPE="$BUNZIP2 -c"
+elif test -n "$GZIP" -a -n "$GUNZIP"; then
+ COMPRESSOR="$GZIP -9"
+ UNCOMPRESSOR_PIPE="$GUNZIP -c"
+elif test -n "$COMPRESS" -a -n "$UNCOMPRESS"; then
+ COMPRESSOR="$COMPRESS"
+ UNCOMPRESSOR_PIPE="$UNCOMPRESS -c"
+fi
+
+
+
+# Now we check for those portions of Orca that should be built and set
+# up for installation. The first step is to check for operating system
+# specific modules. For Solaris hosts, orcallator.se is built and
+# installed. This requires the additional building of a librrd.so
+# installed in libdir. Then we check for the proper Perl modules.
+echo $ac_n "checking for solaris host for orcallator install""... $ac_c" 1>&6
+echo "configure:1523: checking for solaris host for orcallator install" >&5
+case "$target" in
+ *-solaris*)
+ BUILD_ORCALLATOR=yes
+ ORCALLATOR_SUBDIR=orcallator
+ # Add --enable-shared to the configure options for RRDtool if it is
+ # not already declared.
+ expr "$CONFIGURE_COMMAND_LINE" : "--enable-shared" >/dev/null 2>&1 || CONFIGURE_COMMAND_LINE="$CONFIGURE_COMMAND_LINE --enable-shared"
+
+ INSTALL_LIB_RRDTOOL=install_lib_rrdtool
+ MAKE_RRDTOOL=make_rrdtool
+ TEST_RRDTOOL=test_rrdtool
+ INSTALL_PERL_RRDTOOL=
+ CLEAN_RRDTOOL=clean_rrdtool
+ DISTCLEAN_RRDTOOL=distclean_rrdtool
+ ;;
+ *)
+ INSTALL_LIB_RRDTOOL=
+ BUILD_ORCALLATOR=no
+ ORCALLATOR_SUBDIR=
+ ;;
+esac
+
+
+
+echo "$ac_t""$BUILD_ORCALLATOR" 1>&6
+if test "$BUILD_ORCALLATOR" = "yes"; then
+ # Extract the first word of "se", so it can be a program name with args.
+set dummy se; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1553: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_SE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$SE" in
+ /*)
+ ac_cv_path_SE="$SE" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_SE="$SE" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH:/opt/RICHPse/bin"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_SE="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+fi
+SE="$ac_cv_path_SE"
+if test -n "$SE"; then
+ echo "$ac_t""$SE" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+if test "$borp_cv_perl_compress_zlib" = no; then
+ MAKE_COMPRESS_ZLIB=make_compress_zlib
+ TEST_COMPRESS_ZLIB=test_compress_zlib
+ INSTALL_PERL_COMPRESS_ZLIB=install_perl_compress_zlib
+ CLEAN_COMPRESS_ZLIB=clean_compress_zlib
+ DISTCLEAN_COMPRESS_ZLIB=distclean_compress_zlib
+fi
+
+
+
+
+
+
+
+ echo $ac_n "checking if Perl module Data::Dumper version 2.101 is installed""... $ac_c" 1>&6
+echo "configure:1602: checking if Perl module Data::Dumper version 2.101 is installed" >&5
+ if $PERL ./config/check_for_perl_mod Data::Dumper 2.101; then
+ borp_cv_perl_data_dumper=yes
+
+ else
+ borp_cv_perl_data_dumper=no
+
+ fi
+ echo "$ac_t""$borp_cv_perl_data_dumper" 1>&6
+
+if test "$borp_cv_perl_data_dumper" = no; then
+ MAKE_DATA_DUMPER=make_data_dumper
+ TEST_DATA_DUMPER=test_data_dumper
+ INSTALL_PERL_DATA_DUMPER=install_perl_data_dumper
+ CLEAN_DATA_DUMPER=clean_data_dumper
+ DISTCLEAN_DATA_DUMPER=distclean_data_dumper
+fi
+
+
+
+
+
+
echo $ac_n "checking if Perl module Digest::MD5 version 2.00 is installed""... $ac_c" 1>&6
-echo "configure:1327: checking if Perl module Digest::MD5 version 2.00 is installed" >&5
+echo "configure:1627: checking if Perl module Digest::MD5 version 2.00 is installed" >&5
if $PERL ./config/check_for_perl_mod Digest::MD5 2.00; then
borp_cv_perl_digest_md5=yes
@@ -1336,7 +1636,7 @@
if test "$borp_cv_perl_digest_md5" = no; then
MAKE_DIGEST_MD5=make_digest_md5
TEST_DIGEST_MD5=test_digest_md5
- INSTALL_DIGEST_MD5=install_digest_md5
+ INSTALL_PERL_DIGEST_MD5=install_perl_digest_md5
CLEAN_DIGEST_MD5=clean_digest_md5
DISTCLEAN_DIGEST_MD5=distclean_digest_md5
fi
@@ -1347,9 +1647,9 @@
- echo $ac_n "checking if Perl module Math::Interpolate version 1.00 is installed""... $ac_c" 1>&6
-echo "configure:1352: checking if Perl module Math::Interpolate version 1.00 is installed" >&5
- if $PERL ./config/check_for_perl_mod Math::Interpolate 1.00; then
+ echo $ac_n "checking if Perl module Math::Interpolate version 1.04 is installed""... $ac_c" 1>&6
+echo "configure:1652: checking if Perl module Math::Interpolate version 1.04 is installed" >&5
+ if $PERL ./config/check_for_perl_mod Math::Interpolate 1.04; then
borp_cv_perl_math_interpolate=yes
else
@@ -1361,7 +1661,7 @@
if test "$borp_cv_perl_math_interpolate" = no; then
MAKE_MATH_INTERPOLATE=make_math_interpolate
TEST_MATH_INTERPOLATE=test_math_interpolate
- INSTALL_MATH_INTERPOLATE=install_math_interpolate
+ INSTALL_PERL_MATH_INTERPOLATE=install_perl_math_interpolate
CLEAN_MATH_INTERPOLATE=clean_math_interpolate
DISTCLEAN_MATH_INTERPOLATE=distclean_math_interpolate
fi
@@ -1372,9 +1672,9 @@
- echo $ac_n "checking if Perl module RRDs version 0.99029 is installed""... $ac_c" 1>&6
-echo "configure:1377: checking if Perl module RRDs version 0.99029 is installed" >&5
- if $PERL ./config/check_for_perl_mod RRDs 0.99029; then
+ echo $ac_n "checking if Perl module RRDs version 1.000072 is installed""... $ac_c" 1>&6
+echo "configure:1677: checking if Perl module RRDs version 1.000072 is installed" >&5
+ if $PERL ./config/check_for_perl_mod RRDs 1.000072; then
borp_cv_perl_rdds=yes
else
@@ -1386,7 +1686,7 @@
if test "$borp_cv_perl_rdds" = no; then
MAKE_RRDTOOL=make_rrdtool
TEST_RRDTOOL=test_rrdtool
- INSTALL_RRDTOOL=install_rrdtool
+ INSTALL_PERL_RRDTOOL=install_perl_rrdtool
CLEAN_RRDTOOL=clean_rrdtool
DISTCLEAN_RRDTOOL=distclean_rrdtool
fi
@@ -1398,7 +1698,7 @@
echo $ac_n "checking if Perl module Storable version 0.603 is installed""... $ac_c" 1>&6
-echo "configure:1402: checking if Perl module Storable version 0.603 is installed" >&5
+echo "configure:1702: checking if Perl module Storable version 0.603 is installed" >&5
if $PERL ./config/check_for_perl_mod Storable 0.603; then
borp_cv_perl_storable=yes
@@ -1411,7 +1711,7 @@
if test "$borp_cv_perl_storable" = no; then
MAKE_STORABLE=make_storable
TEST_STORABLE=test_storable
- INSTALL_STORABLE=install_storable
+ INSTALL_PERL_STORABLE=install_perl_storable
CLEAN_STORABLE=clean_storable
DISTCLEAN_STORABLE=distclean_storable
fi
@@ -1421,7 +1721,6 @@
-
# Define the INSTALL and MKDIR variables to point to the scripts in
# the config directory.
INSTALL="../config/install-sh -c"
@@ -1431,8 +1730,17 @@
#--------------------------------------------------------------------
# Generate the Makefiles and shell scripts with the
-# variable substitution.
+# variable substitutions.
#--------------------------------------------------------------------
+if test "$BUILD_ORCALLATOR" = "yes"; then
+ ORCALLATOR_OUTPUT="orcallator/orcallator.cfg
+ orcallator/orcallator_running.pl
+ orcallator/restart_orcallator.sh
+ orcallator/start_orcallator.sh
+ orcallator/stop_orcallator.sh
+ orcallator/Makefile"
+fi
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -1547,14 +1855,11 @@
trap 'rm -fr `echo "config/PerlHead1
config/PerlHead2
+ lib/Makefile
packages/Makefile
- src/orcallator_running.pl
- src/restart_orcallator.sh
- src/start_orcallator.sh
- src/stop_orcallator.sh
+ src/orca.pl
src/Makefile
- lib/orcallator.cfg
- lib/Makefile
+ $ORCALLATOR_OUTPUT
docs/Makefile
Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
@@ -1604,6 +1909,8 @@
s%@build_vendor@%$build_vendor%g
s%@build_os@%$build_os%g
s%@CONFIGURE_COMMAND_LINE@%$CONFIGURE_COMMAND_LINE%g
+s%@COMPRESS_ZLIB_DIR@%$COMPRESS_ZLIB_DIR%g
+s%@DATA_DUMPER_DIR@%$DATA_DUMPER_DIR%g
s%@DIGEST_MD5_DIR@%$DIGEST_MD5_DIR%g
s%@MATH_INTERPOLATE_DIR@%$MATH_INTERPOLATE_DIR%g
s%@RRDTOOL_DIR@%$RRDTOOL_DIR%g
@@ -1611,35 +1918,55 @@
s%@RRD_DIR@%$RRD_DIR%g
s%@HTML_DIR@%$HTML_DIR%g
s%@ORCALLATOR_DIR@%$ORCALLATOR_DIR%g
-s%@WATCH_HTTPD@%$WATCH_HTTPD%g
+s%@WATCH_WEB@%$WATCH_WEB%g
s%@WEB_LOG@%$WEB_LOG%g
s%@CC@%$CC%g
s%@SET_MAKE@%$SET_MAKE%g
-s%@AWK@%$AWK%g
+s%@BZIP2@%$BZIP2%g
+s%@BUNZIP2@%$BUNZIP2%g
+s%@COMPRESS@%$COMPRESS%g
s%@CUT@%$CUT%g
s%@EXPR@%$EXPR%g
-s%@SE@%$SE%g
-s%@UNAME@%$UNAME%g
+s%@GZIP@%$GZIP%g
+s%@GUNZIP@%$GUNZIP%g
+s%@AWK@%$AWK%g
s%@PERL@%$PERL%g
s%@PERL_HEAD@%$PERL_HEAD%g
+s%@UNAME@%$UNAME%g
+s%@UNCOMPRESS@%$UNCOMPRESS%g
+s%@COMPRESSOR@%$COMPRESSOR%g
+s%@UNCOMPRESSOR_PIPE@%$UNCOMPRESSOR_PIPE%g
+s%@ORCALLATOR_SUBDIR@%$ORCALLATOR_SUBDIR%g
+s%@INSTALL_LIB_RRDTOOL@%$INSTALL_LIB_RRDTOOL%g
+s%@SE@%$SE%g
+s%@MAKE_COMPRESS_ZLIB@%$MAKE_COMPRESS_ZLIB%g
+s%@TEST_COMPRESS_ZLIB@%$TEST_COMPRESS_ZLIB%g
+s%@INSTALL_PERL_COMPRESS_ZLIB@%$INSTALL_PERL_COMPRESS_ZLIB%g
+s%@CLEAN_COMPRESS_ZLIB@%$CLEAN_COMPRESS_ZLIB%g
+s%@DISTCLEAN_COMPRESS_ZLIB@%$DISTCLEAN_COMPRESS_ZLIB%g
+s%@MAKE_DATA_DUMPER@%$MAKE_DATA_DUMPER%g
+s%@TEST_DATA_DUMPER@%$TEST_DATA_DUMPER%g
+s%@INSTALL_PERL_DATA_DUMPER@%$INSTALL_PERL_DATA_DUMPER%g
+s%@CLEAN_DATA_DUMPER@%$CLEAN_DATA_DUMPER%g
+s%@DISTCLEAN_DATA_DUMPER@%$DISTCLEAN_DATA_DUMPER%g
s%@MAKE_DIGEST_MD5@%$MAKE_DIGEST_MD5%g
s%@TEST_DIGEST_MD5@%$TEST_DIGEST_MD5%g
-s%@INSTALL_DIGEST_MD5@%$INSTALL_DIGEST_MD5%g
+s%@INSTALL_PERL_DIGEST_MD5@%$INSTALL_PERL_DIGEST_MD5%g
s%@CLEAN_DIGEST_MD5@%$CLEAN_DIGEST_MD5%g
s%@DISTCLEAN_DIGEST_MD5@%$DISTCLEAN_DIGEST_MD5%g
s%@MAKE_MATH_INTERPOLATE@%$MAKE_MATH_INTERPOLATE%g
s%@TEST_MATH_INTERPOLATE@%$TEST_MATH_INTERPOLATE%g
-s%@INSTALL_MATH_INTERPOLATE@%$INSTALL_MATH_INTERPOLATE%g
+s%@INSTALL_PERL_MATH_INTERPOLATE@%$INSTALL_PERL_MATH_INTERPOLATE%g
s%@CLEAN_MATH_INTERPOLATE@%$CLEAN_MATH_INTERPOLATE%g
s%@DISTCLEAN_MATH_INTERPOLATE@%$DISTCLEAN_MATH_INTERPOLATE%g
s%@MAKE_RRDTOOL@%$MAKE_RRDTOOL%g
s%@TEST_RRDTOOL@%$TEST_RRDTOOL%g
-s%@INSTALL_RRDTOOL@%$INSTALL_RRDTOOL%g
+s%@INSTALL_PERL_RRDTOOL@%$INSTALL_PERL_RRDTOOL%g
s%@CLEAN_RRDTOOL@%$CLEAN_RRDTOOL%g
s%@DISTCLEAN_RRDTOOL@%$DISTCLEAN_RRDTOOL%g
s%@MAKE_STORABLE@%$MAKE_STORABLE%g
s%@TEST_STORABLE@%$TEST_STORABLE%g
-s%@INSTALL_STORABLE@%$INSTALL_STORABLE%g
+s%@INSTALL_PERL_STORABLE@%$INSTALL_PERL_STORABLE%g
s%@CLEAN_STORABLE@%$CLEAN_STORABLE%g
s%@DISTCLEAN_STORABLE@%$DISTCLEAN_STORABLE%g
s%@INSTALL@%$INSTALL%g
@@ -1687,14 +2014,11 @@
CONFIG_FILES=\${CONFIG_FILES-"config/PerlHead1
config/PerlHead2
+ lib/Makefile
packages/Makefile
- src/orcallator_running.pl
- src/restart_orcallator.sh
- src/start_orcallator.sh
- src/stop_orcallator.sh
+ src/orca.pl
src/Makefile
- lib/orcallator.cfg
- lib/Makefile
+ $ORCALLATOR_OUTPUT
docs/Makefile
Makefile"}
EOF
@@ -1763,14 +2087,13 @@
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-if test "$borp_cv_perl_rdds" != "yes"; then
- echo ""
- echo "Running configure in packages/$RRDTOOL_DIR to create RRDtool and RRDs.pm."
- echo ""
- echo "(cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)"
- echo ""
- (cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)
-fi
+command="(cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)"
+echo ""
+echo "Running configure in packages/$RRDTOOL_DIR to create RRDtool and RRDs.pm."
+echo ""
+echo $command
+echo ""
+eval $command
if test -z "$WEB_LOG"; then
echo "configure: warning: *** Unless you use a --with-*-log option you will not gather WWW log data." 1>&2
Modified: trunk/orca/Makefile.in
==============================================================================
--- trunk/orca/Makefile.in (original)
+++ trunk/orca/Makefile.in Sat Jul 13 19:22:23 2002
@@ -1,47 +1,44 @@
@SET_MAKE@
-SUBDIRS = packages lib src docs
+SUBDIRS = packages lib src @ORCALLATOR_SUBDIR@ docs
PREFIX = @prefix@
+MAKE_RRDTOOL = @MAKE_RRDTOOL@
ORCALLATOR_DIR = @ORCALLATOR_DIR@
RRD_DIR = @RRD_DIR@
CFLAGS = @CFLAGS@
-all: configure Makefile
- @for dir in $(SUBDIRS); do \
- echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
- (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
+all: configure config/PerlHead1 config/PerlHead2 Makefile
+ @for dir in $(SUBDIRS); do \
+ echo "cd $$dir && $(MAKE) CFLAGS=$(CFLAGS)"; \
+ (cd $$dir && $(MAKE) CFLAGS="$(CFLAGS)"); \
done
-test:
- (cd packages; $(MAKE) CFLAGS="$(CFLAGS)" test)
+test: configure Makefile
-migrate:
- (cd src; $(MAKE) migrate)
+upgrade:
+ cd src && $(MAKE) upgrade_installation
-install:
+install: $(INSTALL_RRDTOOL)
./config/mkinstalldirs $(ORCALLATOR_DIR)
- ./config/mkinstalldirs $(RRD_DIR)
+ ./config/mkinstalldirs $(RRD_DIR)/orcallator
@for dir in $(SUBDIRS); do \
echo "cd $$dir && $(MAKE) install"; \
(cd $$dir && $(MAKE) install); \
done
-modules:
- (cd packages && $(MAKE) CFLAGS="$(CFLAGS)" modules)
-
test_modules:
- (cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules)
+ cd packages && $(MAKE) CFLAGS="$(CFLAGS)" test_modules
install_modules:
- (cd packages && $(MAKE) CFLAGS="$(CFLAGS)" install_modules)
+ cd packages && $(MAKE) CFLAGS="$(CFLAGS)" install_modules
-clean:
+clean: $(CLEAN_RRDTOOL)
@for dir in $(SUBDIRS); do \
echo "cd $$dir && $(MAKE) clean"; \
(cd $$dir && $(MAKE) clean); \
done
-distclean:
+distclean: $(DISTCLEAN_RRDTOOL)
@for dir in $(SUBDIRS); do \
echo "cd $$dir && $(MAKE) distclean"; \
(cd $$dir && $(MAKE) distclean); \
@@ -49,9 +46,19 @@
$(RM) config/PerlHead1 config/PerlHead2
$(RM) config.cache config.log config.status Makefile
+to-autoconf:
+ aclocal -I config --output=config/aclocal.m4
+ autoconf --localdir=config
+
configure: configure.in
- autoconf
+ $(MAKE) to-autoconf
./config.status
Makefile: Makefile.in
- ./config.status
+ CONFIG_FILES=Makefile ./config.status
+
+config/PerlHead1: config/PerlHead1.in
+ CONFIG_FILES=config/PerlHead1 ./config.status
+
+config/PerlHead2: config/PerlHead2.in
+ CONFIG_FILES=config/PerlHead2 ./config.status
Added: trunk/orca/orcallator/Makefile.in
==============================================================================
--- trunk/orca/orcallator/Makefile.in (original)
+++ trunk/orca/orcallator/Makefile.in Sat Jul 13 19:22:23 2002
@@ -0,0 +1,65 @@
+ at SET_MAKE@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+MKDIR = @MKDIR@
+INSTALL = @INSTALL@
+PERL_HEAD = @PERL_HEAD@
+ORCALLATOR_DIR = @ORCALLATOR_DIR@
+RRD_DIR = @RRD_DIR@
+RRDTOOL_DIR = @RRDTOOL_DIR@
+PERL_SCRIPTS = orcallator_column orcallator_running
+SHELL_SCRIPTS = restart_orcallator stop_orcallator start_orcallator
+TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
+
+all: $(TARGETS) orcallator.cfg
+
+install: all
+ $(MKDIR) $(bindir)
+ $(MKDIR) $(libdir)
+ @for file in $(TARGETS); do \
+ echo $(INSTALL) $$file $(bindir); \
+ $(INSTALL) $$file $(bindir); \
+ done
+ if test -r $(libdir)/orcallator.cfg; then \
+ cp -p $(libdir)/orcallator.cfg $(libdir)/orcallator.cfg.`date +%Y-%m-%d-%H:%M:%S`; \
+ fi
+ $(INSTALL) -m 0644 orcallator.cfg $(libdir)
+ $(INSTALL) -m 0644 orcallator.se $(libdir)
+
+clean:
+ $(RM) $(TARGETS)
+
+distclean: clean
+ $(RM) *.sh orcallator.cfg orcallator_running.pl Makefile
+
+.SUFFIXES: .pl .sh
+
+.pl: $(PERL_HEAD)
+ cat $(PERL_HEAD) $< > $@
+ chmod 0755 $@
+
+.sh:
+ cp $< $@
+ chmod 0755 $@
+
+Makefile: Makefile.in
+ cd .. && CONFIG_FILES=orcallator/Makefile ./config.status
+ $(MAKE)
+
+orcallator.cfg: orcallator.cfg.in
+ cd .. && CONFIG_FILES=orcallator/orcallator.cfg ./config.status
+
+orcallator_running.pl: orcallator_running.pl.in
+ cd .. && CONFIG_FILES=orcallator/orcallator_running.pl ./config.status
+
+restart_orcallator.sh: restart_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/restart_orcallator.sh ./config.status
+
+start_orcallator.sh: start_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/start_orcallator.sh ./config.status
+
+stop_orcallator.sh: stop_orcallator.sh.in
+ cd .. && CONFIG_FILES=orcallator/stop_orcallator.sh ./config.status
Modified: trunk/orca/orcallator/orcallator.cfg.in
==============================================================================
--- trunk/orca/orcallator/orcallator.cfg.in (original)
+++ trunk/orca/orcallator/orcallator.cfg.in Sat Jul 13 19:22:23 2002
@@ -1,12 +1,12 @@
# Orca configuration file for orcallator files.
-# base_dir is prepended to the paths data_dir, find_files, html_dir,
+# base_dir is prepended to the paths find_files, html_dir, rrd_dir,
# and state_file only if the path does not match the regular
# expression ^\\?\.{0,2}/, which matches /, ./, ../, and \./.
base_dir @RRD_DIR@/orcallator
-# data_dir specifies the location of the generated RRD data files.
-data_dir .
+# rrd_dir specifies the location of the generated RRD data files.
+rrd_dir .
# state_file specifies the location of the state file that remembers
# the modification time of each source data file.
@@ -17,7 +17,7 @@
# By default create .meta tag files for all GIFs so that the web
# browser will automatically reload them.
-expire_gifs 1
+expire_images 1
# Find files at the following times:
# 0:10 to pick up new orcallator files for the new day.
@@ -36,7 +36,7 @@
# This defines where the find the source data files and the format of those
# files.
-files orcallator {
+group orcallator {
find_files @ORCALLATOR_DIR@/(.*)/(?:(?:orcallator)|(?:percol))-\d{4}-\d{2}-\d{2}
column_description first_line
date_source column_name timestamp
@@ -45,25 +45,13 @@
reopen 1
}
-html_top_title GeoCities Host Status
+html_top_title Yahoo!/GeoCities Host Status
html_page_header
- <table border=0 cellspacing=0 cellpadding=0 width="100%">
- <tr>
- <td><a href="http://www.geocities.com">
- <img border=0 alt="GeoCities"
- src="http://pic.geocities.com/images/main/hp/logo_top.gif"
- width=126 height=58></a>
- </td>
- </tr>
- <tr>
- <td><a href="http://www.geocities.com">
- <img border=0 alt="GeoCities"
- src="http://pic.geocities.com/images/main/hp/tagline.gif"
- width=124 height=36></a>
- </td>
- </tr>
- </table>
+ <a href="http://geocities.yahoo.com/home/">
+ <img border=0 alt="Yahoo!/GeoCities"
+ src="http://a372.g.akamaitech.net/7/372/27/5fd49246b3dc72/us.yimg.com/i/geo/ygeo.gif"
+ width=305 height=36></a>
<spacer type=vertical size=4>
html_page_footer
@@ -73,7 +61,7 @@
</font>
plot {
-title %g Average # Processes in Run Queue
+title %g Average # Processes in Run Queue (Load Average)
source orcallator
data 1runq
data 5runq
@@ -84,54 +72,75 @@
y_legend # Processes
data_min 0
data_max 100
+href http://www.geocities.com/~bzking/docs/orcallator.html#processes_in_run_queue
}
plot {
-title %g System Load
+title %g CPU Usage
source orcallator
-data 1load
-data 5load
-data 15load
-legend 1 Minute Average
-legend 5 Minute Average
-legend 15 Minute Average
-y_legend Load
+data usr%
+data sys%
+data 100 - usr% - sys%
+line_type area
+line_type stack
+line_type stack
+legend User
+legend System
+legend Idle
+y_legend Percent
data_min 0
-data_max 200
+data_max 100
+plot_min 0
+plot_max 100
+rigid_min_max 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#cpu_usage
+}
+
+plot {
+title %g New Process Spawn Rate
+source orcallator
+data #proc/s
+data #proc/p5s
+line_type area
+line_type line1
+legend 5 min average procs/s
+legend Peak 5 second procs/s
+y_legend New processes/second
+data_min 0
+data_max 100000
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#new_process_spawn_rate
}
plot {
-title %g Number of System & Httpd Processes
+title %g Number of System & Web Server Processes
source orcallator
data #proc
data #httpds
line_type line1
line_type area
legend System total
-legend Number httpds
+legend Number web servers
y_legend # Processes
data_min 0
data_max 10000
+color 0000ff
+color 00ff00
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#number_system_processes
}
plot {
-title %g CPU Usage
+title %g Number of Web Server Processes
source orcallator
-data usr%
-data sys%
-data 100 - usr% - sys%
-legend User
-legend System
-legend Idle
+data #httpds
line_type area
-line_type stack
-line_type stack
-y_legend Percent
+legend Number Web Server Processes
+y_legend # Processes
data_min 0
-data_max 100
-plot_min 0
-plot_max 100
-rigid_min_max 1
+data_max 10000
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#number_web_server_processes
}
plot {
@@ -139,11 +148,16 @@
source orcallator
data httpop/s
data http/p5s
+line_type area
+line_type line1
legend 5 min average hits/s
legend Peak 5 second hits/s
y_legend Hits/second
data_min 0
+color 00ff00
+color 0000ff
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#web_server_hit_rate
}
plot {
@@ -170,180 +184,212 @@
plot_min 0
plot_max 100
rigid_min_max 1
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#web_server_file_size
}
plot {
title %g Web Server Data Transfer Rate
source orcallator
data httpb/s
+line_type area
legend Bytes/s
y_legend Bytes/s
data_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#web_server_data_transfer_rate
}
plot {
title %g Web Server HTTP Error Rate
source orcallator
data htErr/s
+line_type area
legend HTTP Errors/s
y_legend Errors/s
data_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#web_server_error_rate
}
plot {
-title %g Bits Per Second: be0
+title %g Interface Bits Per Second: be0
source orcallator
data 1024 * 8 * be0InKB/s
data 1024 * 8 * be0OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 100000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: elxl0
+title %g Interface Bits Per Second: elxl0
source orcallator
data 1024 * 8 * elxl0InKB/s
data 1024 * 8 * elxl0OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 100000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: hme0
+title %g Interface Bits Per Second: hme0
source orcallator
data 1024 * 8 * hme0InKB/s
data 1024 * 8 * hme0OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 100000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: hme1
+title %g Interface Bits Per Second: hme1
source orcallator
data 1024 * 8 * hme1InKB/s
data 1024 * 8 * hme1OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 100000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: hme2
+title %g Interface Bits Per Second: hme2
source orcallator
data 1024 * 8 * hme2InKB/s
data 1024 * 8 * hme2OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 100000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: le0
+title %g Interface Bits Per Second: le0
source orcallator
data 1024 * 8 * le0InKB/s
data 1024 * 8 * le0OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 10000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Bits Per Second: le1
+title %g Interface Bits Per Second: le1
source orcallator
data 1024 * 8 * le1InKB/s
data 1024 * 8 * le1OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 10000000
optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_bits_per_second
}
plot {
-title %g Packets Per Second: $1
+title %g Interface Packets Per Second: $1
source orcallator
data (.*\d)Ipkt/s
data $1Opkt/s
line_type area
+line_type line1
legend Input
legend Output
y_legend Packets/s
data_min 0
data_max 100000
flush_regexps 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_packets_per_second
}
plot {
-title %g Errors Per Second: $1
+title %g Interface Errors Per Second: $1
source orcallator
data (.*\d)IErr/s
data $1OErr/s
line_type area
+line_type line1
legend Input
legend Output
y_legend Errors/s
data_min 0
flush_regexps 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_errors_per_second
}
plot {
-title %g Ethernet Nocanput Rate
+title %g Interface Nocanput Rate
source orcallator
data (.*\d)NoCP/s
+line_type area
legend $1
y_legend Nocanput/s
data_min 0
flush_regexps 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_nocanput_rate
}
plot {
-title %g Ethernet Deferred Packet Rate
+title %g Interface Deferred Packet Rate
source orcallator
data (.*\d)Defr/s
+line_type area
legend $1
y_legend Defers/s
data_min 0
flush_regexps 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_deferred_packet_rate
}
plot {
-title %g Ethernet Collisions
+title %g Interface Collisions
source orcallator
data (.*\d)Coll%
+line_type area
legend $1
y_legend Percent
data_min 0
data_max 200
flush_regexps 1
+href http://www.geocities.com/~bzking/docs/orcallator.html#interface_collisions
}
plot {
@@ -352,11 +398,13 @@
data 1024 * 8 * tcp_InKB/s
data 1024 * 8 * tcp_OuKB/s
line_type area
+line_type line1
legend Input
legend Output
-y_legend bits/s
+y_legend Bits/s
data_min 0
data_max 1000000000
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_bits_per_second
}
plot {
@@ -365,11 +413,13 @@
data tcp_Iseg/s
data tcp_Oseg/s
line_type area
+line_type line1
legend Input
legend Output
y_legend Segments/s
data_min 0
data_max 20000
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_segments_per_second
}
plot {
@@ -377,11 +427,14 @@
source orcallator
data tcp_Ret%
data tcp_Dup%
+line_type area
+line_type line1
legend Retransmission
legend Duplicate Received
y_legend Percent
data_min 0
data_max 200
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_retransmission_duplicate_received_percentage
}
plot {
@@ -389,39 +442,48 @@
source orcallator
data tcp_Icn/s
data tcp_Ocn/s
+line_type area
+line_type line1
legend Input - Passive
legend Output - Active
y_legend Connections/s
data_min 0
data_max 10000
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_new_connection_rate
}
plot {
title %g TCP Number Open Connections
source orcallator
data tcp_estb
+line_type area
legend # Open Connections
y_legend Number Open TCP Connections
data_min 0
data_max 50000
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_number_open_connections
}
plot {
title %g TCP Reset Rate
source orcallator
data tcp_Rst/s
+line_type area
legend Number TCP Resets/s
y_legend Resets/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_reset_rate
}
plot {
title %g TCP Attempt Fail Rate
source orcallator
data tcp_Atf/s
+line_type area
legend TCP Attempt Fails/s
y_legend Atf/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_attempt_fail_rate
}
plot {
@@ -434,6 +496,7 @@
legend TCP Listen Drop Q0
legend TCP Half Open Drops
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#TCP_listen_drop_rate
}
plot {
@@ -441,19 +504,24 @@
source orcallator
data smtx
data smtx/cpu
+line_type area
+line_type line1
legend Sleeps on mutex
legend Sleeps on mutex/cpu
y_legend Smtx/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#sleeps_mutex_rate
}
plot {
title %g NFS Call Rate
source orcallator
data nfs_call/s
+line_type area
legend NFS Calls/s
y_legend Calls/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#NFS_call_rate
}
plot {
@@ -461,23 +529,87 @@
source orcallator
data nfs_timo/s
data nfs_badx/s
+line_type area
+line_type line1
legend NFS Timeouts
legend Bad Transmits
y_legend Count/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#NFS_timeouts_bad_transmits_rate
}
plot {
-title %g Peak & Mean Disk Busy
+title %g Disk System Wide Reads/Writes Per Second
source orcallator
-data disk_peak
-data disk_mean
+data disk_rd/s
+data disk_wr/s
+line_type area
line_type line1
+legend Reads/s
+legend Writes/s
+y_legend Ops/s
+data_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#disk_system_wide_reads_writes_per_second
+}
+
+plot {
+title %g Disk System Wide Transfer Rate
+source orcallator
+data 1024 * disk_rK/s
+data 1024 * disk_wK/s
line_type area
-legend Peak Disk Busy
-legend Mean Disk Busy
-y_legend Disk Busy Measure
+line_type line1
+legend Read transfer rate
+legend Write transfer rate
+y_legend Bytes/s
+data_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#disk_system_wide_transfer_rate
+}
+
+plot {
+title %g Disk Run Percent
+source orcallator
+data disk_runp_(c\d+t\d+d\d+)
+line_type line2
+legend $1
+y_legend Run Percent
+data_min 0
+data_max 100
+plot_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#disk_run_percent
+}
+
+plot {
+title %g Disk Space Percent Usage
+source orcallator
+data mntP_(.*)
+line_type line2
+legend $1
+y_legend Percent
+data_min 0
+data_max 100
+plot_min 0
+plot_max 100
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#disk_space_percent_usage
+}
+
+plot {
+title %g Disk Inode Percent Usage
+source orcallator
+data mntp_(.*)
+line_type line2
+legend $1
+y_legend Percent
data_min 0
+data_max 100
+plot_min 0
+plot_max 100
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#disk_inode_percent_usage
}
plot {
@@ -485,11 +617,14 @@
source orcallator
data dnlc_hit%
data inod_hit%
+line_type area
+line_type line1
legend DNLC
legend Inode Cache
y_legend Percent
data_min 0
data_max 100
+href http://www.geocities.com/~bzking/docs/orcallator.html#cache_hit_percentages
}
plot {
@@ -497,39 +632,59 @@
source orcallator
data dnlc_ref/s
data inod_ref/s
-line_type line1
line_type area
+line_type line1
legend DNLC
legend Inode Cache
y_legend References/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#cache_reference_rate
}
plot {
title %g Inode Steal Rate
source orcallator
data inod_stl/s
+line_type area
legend Inode w/page steals/s
y_legend Steals/s
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#inode_steal_rate
}
plot {
title %g Available Swap Space
source orcallator
data 1024 * swap_avail
+line_type area
legend Available Swap Space
y_legend Bytes
+base 1024
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#available_swap_space
}
plot {
title %g Page Residence Time
source orcallator
data page_rstim
+line_type area
legend Page Residence Time
y_legend Seconds
data_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#page_residence_time
+}
+
+plot {
+title %g Page Scan Rate
+source orcallator
+data scanrate
+line_type area
+legend Page Scan Rate
+y_legend Pages/s
+data_min 0
+optional
+href http://www.geocities.com/~bzking/docs/orcallator.html#page_scan_rate
}
plot {
@@ -553,6 +708,7 @@
color 00ff00
color ff0000
color 0000ff
+href http://www.geocities.com/~bzking/docs/orcallator.html#page_usage
}
plot {
@@ -560,9 +716,12 @@
source orcallator
data pageslock
data pagesio
+line_type area
+line_type line1
legend Locked
legend IO
y_legend Number of Pages
data_min 0
plot_min 0
+href http://www.geocities.com/~bzking/docs/orcallator.html#pages_locked_IO
}
Modified: trunk/orca/orcallator/orcallator.se
==============================================================================
--- trunk/orca/orcallator/orcallator.se (original)
+++ trunk/orca/orcallator/orcallator.se Sat Jul 13 19:22:24 2002
@@ -4,18 +4,78 @@
// This program logs many different system quantities to a log file
// for later processing.
//
-// Author: Blair Zajac <bzajac at geostaff.com>
+// Author: Blair Zajac <bzajac at geostaff.com>.
//
// Portions copied from percollator.se written by Adrian Cockroft.
//
-// Version 1.7: Mar 25, 1999 Speed up by 20% and simplify count_proc.
-// Version 1.6: Feb 23, 1999 Print pvm.user_time and system_time correctly.
-// Version 1.5: Feb 23, 1999 Always write header to a new file.
-// Version 1.4: Feb 19, 1999 Handle missing HTTP/1.x in access log.
-// Version 1.3: Feb 18, 1999 On busy machines httpops5 will be enlarged.
-// Version 1.2: Feb 18, 1999 Output data on integral multiples of interval.
-// Version 1.1: Feb 18, 1999 Integrate Squid log processing from SE 3.1.
-// Version 1.0: Sep 9, 1998 Initial version.
+// Version 1.19: Oct 13, 1999 Prevent a division by zero in calculating the
+// mean_disk_busy if the number of disks on the
+// system is 0.
+// Version 1.18: Oct 12, 1999 Rename disk_runp.c?t?d? to disk_runp_c?t?d?
+// to remove the .'s.
+// Version 1.17: Oct 8, 1999 Do not record mount point statistics for
+// locally mounted /cdrom partitions.
+// Version 1.16: Oct 7, 1999 To keep backwards compatibility, define
+// WATCH_WEB if WATCH_HTTPD is defined.
+// If the COMPRESSOR environmental variable
+// is defined, then when a new log file is opened
+// for a new day, the just closed log file is
+// compressed using the COMPRESSOR command in the
+// following manner:
+// system(sprintf("%s %s &", COMPRESSOR, log_file)
+// COMPRESSOR should be set to something like
+// "gzip -9", or "compress", or "bzip2 -9".
+// Version 1.15: Oct 5, 1999 kvm$mpid is a int not a long. This caused
+// problems on Solaris 7 hosts running a 64
+// bit kernel.
+// Version 1.14: Oct 1, 1999 Rename disk.c?t?d? column names to
+// disk_runp.c?t?d? to better reflect the data
+// being recorded and to allow for more per disk
+// information later.
+// Version 1.13: Sep 24, 1999 Fix a bug in the disk_mean calculation where
+// it was being divided by the wrong disk_count.
+// Now it should be much larger and in scale with
+// disk_peak. When WATCH_DISK is defined, now
+// print each disk's run percent. Add a new
+// define WATCH_MOUNTS, which reports each local
+// mount point's disk space and inode capacity,
+// usage, available for non-root users and
+// percent used. This comes from Duncan Lawie
+// tyger at hoopoes.com. Add some smarts so that if
+// the number of interfaces, physical disks, or
+// mounted partitions changes, then a new header
+// is printed. This will prevent column name and
+// data mixups when the system configuration
+// changes.
+// Version 1.12: Sep 14, 1999 Add the page scan rate as scanrate in
+// measure_cpu.
+// Version 1.11: Aug 13, 1999 Add the number of CPUs as ncpus. Move
+// measure_disk and measure_ram sooner in the
+// list of subsystems to handle. Increase the
+// number of characters for each network
+// interface from four to five. Add new disk
+// reads, writes, Kbytes read, and Kbytes
+// written per second. Add number of bytes
+// of free memory in bytes as freememK.
+// Version 1.10: Jul 28, 1999 Measure the process spawn rate if WATCH_CPU
+// is defined and the user is root.
+// Version 1.9: Jun 2, 1999 If WATCH_YAHOO is defined, then process the
+// access log as a Yahoo! style access log.
+// Restructure the code to handle different
+// web server access log formats.
+// Version 1.8: Jun 1, 1999 If the environmental variable WEB_SERVER is
+// defined, use its value of the as the name
+// of the process to count for the number of
+// web servers on the system. If WEB_SERVER
+// is not defined, then count number of httpd's.
+// Version 1.7: Mar 25, 1999 Simplify and speed up count_proc by 20%.
+// Version 1.6: Feb 23, 1999 Print pvm.user_time and system_time correctly.
+// Version 1.5: Feb 23, 1999 Always write header to a new file.
+// Version 1.4: Feb 19, 1999 Handle missing HTTP/1.x in access log.
+// Version 1.3: Feb 18, 1999 On busy machines httpops5 will be enlarged.
+// Version 1.2: Feb 18, 1999 Output data on integral multiples of interval.
+// Version 1.1: Feb 18, 1999 Integrate Squid log processing from SE 3.1.
+// Version 1.0: Sep 9, 1998 Initial version.
//
// The default sampling interval in seconds.
@@ -25,16 +85,22 @@
// Define the different parts of the system you want to examine.
#ifdef WATCH_OS
-#define WATCH_CPU
-#define WATCH_MUTEX
-#define WATCH_NET
-#define WATCH_TCP
-#define WATCH_NFS
-#define WATCH_DISK
-#define WATCH_DNLC
-#define WATCH_INODE
-#define WATCH_RAM
-#define WATCH_PAGES
+#define WATCH_CPU 1
+#define WATCH_MUTEX 1
+#define WATCH_NET 1
+#define WATCH_TCP 1
+#define WATCH_NFS 1
+#define WATCH_MOUNTS 1
+#define WATCH_DISK 1
+#define WATCH_DNLC 1
+#define WATCH_INODE 1
+#define WATCH_RAM 1
+#define WATCH_PAGES 1
+#endif
+
+// Keep backwards compatibility with WATCH_HTTPD.
+#ifdef WATCH_HTTPD
+#define WATCH_WEB 1
#endif
#include <stdio.se>
@@ -54,9 +120,95 @@
#include <tcp_class.se>
#include <tcp_rules.se>
-#ifdef WATCH_HTTPD
+#ifdef WATCH_MOUNTS
+#include <mnt_class.se>
+#include <statvfs.se>
+#endif
+
+#if WATCH_CPU || WATCH_WEB
#include <proc.se>
+
+#ifdef WATCH_CPU
+// This is the maximum pid on Solaris hosts.
+#define DEFAULT_MAXPID 30000
+#include <fcntl.se>
+#endif
+
+#ifdef WATCH_WEB
#include <stat.se>
+
+// Define this macro which returns the size index for a file of a
+// particular size. This saves the overhead of a function call.
+#define WWW_SIZE_INDEX(size, size_index) \
+ if (size < 1024) { \
+ size_index=0; /* under 1KB */ \
+ } else { \
+ if (size < 10240) { \
+ size_index=1; /* under 10K */ \
+ } else { \
+ if (size < 102400) { \
+ size_index=2; /* under 100KB */ \
+ } else { \
+ if (size < 1048576) { \
+ size_index=3; /* under 1MB */ \
+ } else { \
+ size_index=4; /* over 1MB */ \
+ } \
+ } \
+ } \
+ } \
+ dwnld_size[size_index]++;
+
+// Handle the reply code from the server.
+#define WWW_REPLY_CODE(word) \
+ if (word != nil) { \
+ if (word == "304") { \
+ httpop_condgets++; \
+ } \
+ else { \
+ first_byte = word; \
+ if (first_byte[0] == '4' || first_byte[0] == '5') { \
+ httpop_errors++; \
+ } \
+ } \
+ }
+
+// Handle the method of the object served. This define only works with
+// non-proxy servers.
+#define WWW_METHOD1(word) \
+ if (word != nil) { \
+ switch (word) { \
+ case "get": \
+ case "GET": \
+ httpop_gets++; \
+ break; \
+ case "post": \
+ case "POST": \
+ httpop_posts++; \
+ break; \
+ case "head": \
+ case "HEAD": \
+ ishead = 1; \
+ httpop_condgets++; \
+ break;
+
+#ifdef WATCH_SQUID
+#define WWW_METHOD2 \
+ case "icp_query": \
+ case "ICP_QUERY": \
+ squid_icp_queries++; \
+ break;
+#else
+#define WWW_METHOD2
+#endif
+
+#define WWW_METHOD_END \
+ default: \
+ break; \
+ } \
+ }
+#define WWW_METHOD(word) WWW_METHOD1(word) WWW_METHOD2 WWW_METHOD_END
+#endif
#endif
// Put all rules here so they can be accessed by the handle functions.
@@ -94,77 +246,116 @@
ks_system_misc tmp_kstat_misc;
// Put application globals here.
-string nodename; // Name of machine running the script.
-string program_name; // Name of this program.
-int hz; // Clock tick rate.
-int page_size; // Page size in bytes.
-long boot_time; // Boot time of the system.
-long interval = SAMPLE_INTERVAL; // Sampling interval.
+string nodename; // Name of this machine.
+string program_name; // Name of this program.
+int hz; // Clock tick rate.
+int page_size; // Page size in bytes.
+long boot_time; // Boot time of the system.
+long interval = SAMPLE_INTERVAL; // Sampling interval.
-// Variables for handling the httpd access log.
-#ifdef WATCH_HTTPD
-ulong log_file;
-string log_name = getenv("WEB_LOG");
-string log_gateway = getenv("GATEWAY");
-uint log_gatelen;
-stat_t log_stat[1];
-ulong log_ino;
-long log_size;
-
-double log_interval; // Hi-res interval time.
-ulonglong log_then;
-ulonglong log_now;
-
-double log5_interval; // Actual hi-res 5 second interval.
-ulonglong log5_then;
-ulonglong log5_now;
-
-double httpops;
-double httpops5;
-double gateops;
-double dtmp;
-
-long httpop_gets;
-long httpop_condgets; // HEAD or code = 304 conditional get no data.
-long httpop_posts;
-long httpop_cgi_bins;
-long httpop_searches;
-long httpop_errors;
-string search_url;
-long dwnld_size[5]; // [0] < 1K, [1] < 10K, [2] < 100K, [3] < 1M, [4] >= 1M
-long dwnld_totalz; // total size counted from log
+#ifdef WATCH_CPU
+int can_read_kernel = 0; // If the kernel can be read.
+int kvm$mpid; // The last created PID.
+// These variables store the mpid before and after the standard interval.
+int mpid_previous;
+int mpid_current;
+ulonglong mpid_then;
+ulonglong mpid_now;
+
+// These variables store the mpid before and after 5 second intervals.
+int mpid5_previous;
+int mpid5_current;
+ulonglong mpid5_then;
+ulonglong mpid5_now;
+double mpid5_rate;
+#endif
+
+#ifdef WATCH_MOUNTS
+mnttab_t mnt$mnt;
+mnttab_t tmp_mnt;
+#endif
+
+// Variables for handling the httpd access log.
+#ifdef WATCH_WEB
+string www_search_url = getenv("SEARCHURL");
+string www_server_proc_name = getenv("WEB_SERVER");
+string www_log_filename = getenv("WEB_LOG");
+string www_gateway = getenv("GATEWAY");
+ulong www_fd;
+uint www_gatelen;
+stat_t www_stat[1];
+ulong www_ino;
+long www_size;
+
+double www_interval; // Hi-res interval time.
+ulonglong www_then;
+ulonglong www_now;
+
+double www5_interval; // Actual hi-res 5 second interval.
+ulonglong www5_then;
+ulonglong www5_now;
+
+double httpops;
+double httpops5;
+double gateops;
+double dtmp;
+
+long httpop_gets;
+long httpop_condgets; // HEAD or code = 304 conditional get no data.
+long httpop_posts;
+long httpop_cgi_bins;
+long httpop_searches;
+long httpop_errors;
+long dwnld_size[5]; // [0] < 1K, [1] < 10K, [2] < 100K, [3] < 1M, [4] >= 1M
+long dwnld_totalz; // total size counted from log
+
+#if WATCH_PROXY || WATCH_SQUID || WATCH_YAHOO
+// If we're watching a Yahoo log, then take the transfer time to be the
+// processing time.
+double www_dwnld_time_sum; // transfer time
+double www_dwnld_time_by_size[5]; // mean transfer time by size bin
+#endif
#if WATCH_PROXY || WATCH_SQUID
-double prxy_squid_xfer_sum; // transfer time
-double prxy_squid_xfer_by_size[5]; // mean transfer time by size bin
-long prxy_squid_indirect; // number of hits that go via PROXY,SOCKS,parent
-long prxy_squid_cache_hits; // number of hits returned from cache
+long prxy_squid_indirect; // number of hits that go via PROXY,SOCKS,parent
+long prxy_squid_cache_hits; // number of hits returned from cache
#endif
#ifdef WATCH_PROXY
-long prxy_cache_writes; // number of writes and updates to cache
-long prxy_uncacheable; // number of explicitly uncacheable httpops
- // any extra is errors or incomplete ops
+long prxy_cache_writes; // number of writes and updates to cache
+long prxy_uncacheable; // number of explicitly uncacheable httpops
+ // any extra is errors or incomplete ops
#endif
#ifdef WATCH_SQUID
-long squid_cache_misses;
-long squid_icp_requests;
-long squid_icp_queries;
-long squid_client_http;
+long squid_cache_misses;
+long squid_icp_requests;
+long squid_icp_queries;
+long squid_client_http;
#endif
#endif
// Variables for handling output.
-string col_comment[MAX_COLUMNS]; // Comments for each column.
-string col_data[MAX_COLUMNS]; // Data for each column.
-int current_column; // The current column.
+string compress = getenv("COMPRESSOR"); // How to compress logs.
+ulong ofile; // File pointer to the logging file.
+string col_comment[MAX_COLUMNS]; // Comments for each column.
+string col_data[MAX_COLUMNS]; // Data for each column.
+int current_column = 0; // The current column.
+int print_header = 1; // Flag to flush header.
-// Reset the output data.
-reset_output()
+// Send the stored columns of information to the output.
+print_columns(string data[])
{
- current_column = 0;
+ int i;
+ for (i=0; i<current_column; i++) {
+ fprintf(ofile, "%s", data[i]);
+ if (i != current_column-1) {
+ fputc(' ', ofile);
+ }
+ }
+ fputc('\n', ofile);
+ fflush(ofile);
}
// Add one column of comments and data to the buffers.
@@ -181,64 +372,61 @@
++current_column;
}
-print_columns(ulong fd, string data[])
-{
- int i;
- for (i=0; i<current_column; ++i) {
- fprintf(fd, "%s", data[i]);
- if (i != current_column-1) {
- fputc(' ', fd);
- }
+flush_output() {
+ if (print_header != 0) {
+ print_columns(col_comment);
+ print_header = 0;
}
- fputc('\n', fd);
- fflush(fd);
+ print_columns(col_data);
+ current_column = 0;
}
-/* returns output file - creates or appends to logfile if OUTDIR is set
- returns stdout and writes header if no OUTDIR
- starts new logfile each day
-*/
-ulong checkoutput(tm_t now) {
+// Sets ofile to the output file pointer. Creates or appends to the
+// log file if OUTDIR is set, otherwise sets the file pointer to STDOUT.
+// It start a new log file each day. It compresses the previous days
+// log file if the environmental variable COMPRESSOR is set.
+checkoutput(tm_t now) {
string outdir = getenv("OUTDIR");
string outname;
- ulong ofile;
tm_t then;
char tm_buf[32];
if (outdir == nil) {
- /* no output dir so use stdout */
+ // No output dir so use stdout.
if (ofile == 0) {
- /* first time, so print header and set ofile */
+ // First time, so print header and set ofile.
ofile = stdout;
- print_columns(ofile, col_comment);
+ print_header = 1;
}
- return ofile;
+ return;
}
- /* maintain daily output logfiles in OUTDIR */
+ // Maintain daily output logfiles in OUTDIR.
if (now.tm_yday != then.tm_yday) {
- /* first time or day has changed, start new logfile */
+ // First time or day has changed, start new logfile.
if (ofile != 0) {
- /* close existing output file */
+ // Close and optionally compress the existing output file.
fclose(ofile);
+ if (compress != nil) {
+ system(sprintf(compress, outname));
+ }
}
strftime(tm_buf, sizeof(tm_buf), "%Y-%m-%d", now);
outname = sprintf("%s/percol-%s", outdir, tm_buf);
- ofile = fopen(outname, "a"); /* open for append either way */
+ // Open for append either way.
+ ofile = fopen(outname, "a");
if (ofile == 0) {
perror("can't open output logfile");
exit(1);
}
// Always write header.
- print_columns(ofile, col_comment);
+ print_header = 1;
then = now;
}
- return ofile;
}
int main(int argc, string argv[])
{
utsname_t u[1];
- ulong ofile; // File pointer to the logging file.
long now;
long sleep_till; // Time to sleep to.
tm_t tm_now;
@@ -259,24 +447,28 @@
default:
fprintf(stderr, "usage: se [Defines] %s [interval]\n", program_name);
fprintf(stderr, "%s can use the following environmental variables:\n", program_name);
+ fprintf(stderr, " setenv OUTDIR /var/orcallator/logs - log file directory, default stdout\n");
+ fprintf(stderr, " setenv WEB_SERVER apache - string to search for number of web servers\n");
fprintf(stderr, " setenv WEB_LOG /ns-home/httpd-80/logs/access - location of web server log\n");
fprintf(stderr, " setenv GATEWAY some.where.com - special address to monitor\n");
- fprintf(stderr, " setenv OUTDIR /ns-home/docs/orcallator/logs - default stdout\n");
fprintf(stderr, " setenv SEARCHURL srch.cgi - match for search scripts, default is search.cgi\n");
+ fprintf(stderr, " setenv COMPRESSOR \"gzip -9\" - compress previous day logs using this command\n");
fprintf(stderr, "Defines:\n");
- fprintf(stderr, " -DWATCH_HTTPD watch httpd access log\n");
- fprintf(stderr, " -DWATCH_PROXY use WEB_LOG as a NCSA style proxy log\n");
- fprintf(stderr, " -DWATCH_SQUID use WEB_LOG as a Squid log\n");
- fprintf(stderr, " -DWATCH_OS includes all of the below:\n");
- fprintf(stderr, " -DWATCH_CPU watch the cpu load, run queue, etc\n");
- fprintf(stderr, " -DWATCH_MUTEX watch the number of mutex spins\n");
- fprintf(stderr, " -DWATCH_NET watch all Ethernet interfaces\n");
- fprintf(stderr, " -DWATCH_TCP watch all the TCP/IP stack\n");
- fprintf(stderr, " -DWATCH_NFS watch NFS requests\n");
- fprintf(stderr, " -DWATCH_DNLC watch the directory name lookup cache\n");
- fprintf(stderr, " -DWATCH_INODE watch the inode cache\n");
- fprintf(stderr, " -DWATCH_RAM watch memory usage\n");
- fprintf(stderr, " -DWATCH_PAGES watch where pages are allocated\n");
+ fprintf(stderr, " -DWATCH_WEB watch web server access logs\n");
+ fprintf(stderr, " -DWATCH_PROXY use WEB_LOG as a NCSA style proxy log\n");
+ fprintf(stderr, " -DWATCH_SQUID use WEB_LOG as a Squid log\n");
+ fprintf(stderr, " -DWATCH_OS includes all of the below:\n");
+ fprintf(stderr, " -DWATCH_CPU watch the cpu load, run queue, etc\n");
+ fprintf(stderr, " -DWATCH_MUTEX watch the number of mutex spins\n");
+ fprintf(stderr, " -DWATCH_NET watch all Ethernet interfaces\n");
+ fprintf(stderr, " -DWATCH_TCP watch all the TCP/IP stack\n");
+ fprintf(stderr, " -DWATCH_NFS watch NFS requests\n");
+ fprintf(stderr, " -DWATCH_MOUNTS watch usage of mount points\n");
+ fprintf(stderr, " -DWATCH_DISK watch disk read/write usage\n");
+ fprintf(stderr, " -DWATCH_DNLC watch the directory name lookup cache\n");
+ fprintf(stderr, " -DWATCH_INODE watch the inode cache\n");
+ fprintf(stderr, " -DWATCH_RAM watch memory usage\n");
+ fprintf(stderr, " -DWATCH_PAGES watch where pages are allocated\n");
exit(1);
break;
}
@@ -284,7 +476,7 @@
// Initialize the various structures.
initialize();
- // Run forever. If WATCH_HTTPD is defined, then have measure_httpd()
+ // Run forever. If WATCH_WEB is defined, then have measure_web()
// do the sleeping while it is watching the access log file until the
// next update time for the whole operating system. Also, collect the
// data from the access log file before printing any output.
@@ -292,90 +484,123 @@
// Calculate the next time to sleep to that is an integer multiple of
// the interval time. Make sure that at least half of the interval
// passes before waking up.
- now = time(0);
+ now = time(0);
sleep_till = (now/interval)*interval;
- while (now + interval*0.5 > sleep_till) {
+ while (sleep_till < now + interval*0.5) {
sleep_till += interval;
}
-#ifdef WATCH_HTTPD
- measure_httpd(sleep_till);
+#ifdef WATCH_WEB
+ measure_web(sleep_till);
#else
- while (now < sleep_till) {
- sleep(sleep_till - now);
- now = time(0);
- }
+ sleep_till_and_count_new_proceses(sleep_till);
#endif
- // Reset the output.
- reset_output();
-
// Get the current time.
now = time(0);
tm_now = localtime(&now);
- handle_os(now, tm_now);
+ measure_os(now, tm_now);
-#ifdef WATCH_HTTPD
+#ifdef WATCH_WEB
put_httpd();
#endif
- // Get a filedescriptor to write to. Maintains daily output files.
- ofile = checkoutput(tm_now);
+ // Get a file descriptor to write to. Maintains daily output files.
+ checkoutput(tm_now);
// Print the output.
- print_columns(ofile, col_data);
+ flush_output();
}
return 0;
}
initialize()
{
- // Sleep to give the disks a chance to update.
- sleep(DISK_UPDATE_RATE);
+#ifdef WATCH_CPU
+ int i;
+#endif
- // Get the clock tick rate.
- hz = sysconf(_SC_CLK_TCK);
+ // Get the command to compress the log files.
+ if (compress == nil || compress == "") {
+ compress = nil;
+ }
+ else {
+ compress = sprintf("%s %%s &", compress);
+ }
- // Get the page size.
- page_size = sysconf(_SC_PAGESIZE);
+#ifdef WATCH_CPU
+ // Initialize the process spawning rate measurement variables.
+ // Determine if the kernel can be read to measure the last pid.
+ i = open("/dev/kmem", O_RDONLY);
+ if (i != -1) {
+ close(i);
+ can_read_kernel = 1;
+ mpid_previous = kvm$mpid;
+ mpid_then = gethrtime();
+ mpid_current = mpid_previous;
+
+ mpid5_then = mpid_then;
+ mpid5_previous = mpid_previous;
+ mpid5_current = mpid_previous;
+ mpid5_rate = 0;
+ }
+#endif
- // Calculate the system boot time.
- boot_time = time(0) - (kstat$misc.clk_intr / hz);
+#ifdef WATCH_WEB
+ // Initialize those variables that were not set with environmental
+ // variables.
+ if (www_search_url == nil || www_search_url == "") {
+ www_search_url = "search.cgi";
+ }
-#ifdef WATCH_HTTPD
- search_url = getenv("SEARCHURL");
- if (search_url == nil) {
- search_url = "search.cgi";
+ if (www_server_proc_name == nil || www_server_proc_name == "") {
+ www_server_proc_name = "httpd";
}
- if (log_gateway == nil) {
- log_gateway = "NoGatway";
- log_gatelen = 0;
+ if (www_gateway == nil || www_gateway == "" ) {
+ www_gateway = "NoGatway";
+ www_gatelen = 0;
}
else {
- log_gatelen = strlen(log_gateway);
+ www_gatelen = strlen(www_gateway);
}
- log_file = fopen(log_name, "r");
- if (log_file != 0) {
- stat(log_name, log_stat);
- log_ino = log_stat[0].st_ino;
- log_size = log_stat[0].st_size;
- // Move to the end of the file.
- fseek(log_file, 0, 2);
+ // Initialize the web server watching variables. Move the file pointer
+ // to the end of the web access log and note the current time.
+ if (www_log_filename != nil) {
+ www_fd = fopen(www_log_filename, "r");
+ if (www_fd != 0) {
+ stat(www_log_filename, www_stat);
+ www_ino = www_stat[0].st_ino;
+ www_size = www_stat[0].st_size;
+ // Move to the end of the file.
+ fseek(www_fd, 0, 2);
+ }
}
- log_then = gethrtime();
- log5_then = log_then;
+ www_then = gethrtime();
+ www5_then = www_then;
#endif
+ // Sleep to give the disks a chance to update.
+ sleep(DISK_UPDATE_RATE);
+
+ // Get the clock tick rate.
+ hz = sysconf(_SC_CLK_TCK);
+
+ // Get the page size.
+ page_size = sysconf(_SC_PAGESIZE);
+
+ // Calculate the system boot time.
+ boot_time = time(0) - (kstat$misc.clk_intr / hz);
+
// Perform the first measurement of the system.
- measure_os();
+ _measure_os();
}
// Measure the system statistics all at once.
-measure_os()
+_measure_os()
{
tmp_lrcpu = lr_cpu$cpu;
tmp_mutex = lr_mutex$m;
@@ -397,62 +622,67 @@
tmp_kstat_misc = kstat$misc;
}
-handle_os(long now, tm_t tm_now)
+measure_os(long now, tm_t tm_now)
{
// Measure the system now.
- measure_os();
+ _measure_os();
// Take care of miscellaneous measurements.
- handle_misc(now, tm_now);
+ measure_misc(now, tm_now);
// Take care of cpu.
#ifdef WATCH_CPU
- handle_cpu();
+ measure_cpu();
#endif
// Take care of mutexes.
#ifdef WATCH_MUTEX
- handle_mutex();
+ measure_mutex();
+#endif
+
+ // Take care of mount pointes.
+#ifdef WATCH_MOUNTS
+ measure_mounts();
+#endif
+
+ // Take care of the disks.
+#ifdef WATCH_DISK
+ measure_disk();
+#endif
+
+ // Take care of ram.
+#ifdef WATCH_RAM
+ measure_ram();
#endif
// Take care of the network.
#ifdef WATCH_NET
- handle_net();
+ measure_net();
#endif
// Take care of TCP/IP.
#ifdef WATCH_TCP
- handle_tcp();
+ measure_tcp();
#endif
// Take care of NFS.
#ifdef WATCH_NFS
- handle_nfs();
-#endif
-
- // Take care of the disks.
-#ifdef WATCH_DISK
- handle_disk();
+ measure_nfs();
#endif
// Take care of DNLC.
#ifdef WATCH_DNLC
- handle_dnlc();
+ measure_dnlc();
#endif
// Take care of the inode cache.
#ifdef WATCH_INODE
- handle_inode();
-#endif
-
- // Take care of ram.
-#ifdef WATCH_RAM
- handle_ram();
+ measure_inode();
#endif
// Take care of page allocations.
#ifdef WATCH_PAGES
- handle_pages();
+ measure_pages();
#endif
}
@@ -469,7 +699,7 @@
}
}
-handle_misc(long now, tm_t tm_now)
+measure_misc(long now, tm_t tm_now)
{
long uptime;
char states[12];
@@ -493,69 +723,153 @@
put_output(" timestamp", sprintf("%10d", now));
put_output("locltime", tm_buf);
- put_output(" uptime", sprintf("%8d", uptime));
put_output("DNnsrkcmdit", states);
+ put_output(" uptime", sprintf("%8d", uptime));
+}
+
+sleep_till_and_count_new_proceses(long sleep_till)
+{
+ long now;
+#ifdef WATCH_CPU
+ long sleep_till1;
+ int mpid5_diff;
+ double mpid5_interval;
+ double rate;
+#endif
+
+ now = time(0);
+ while (now < sleep_till) {
+#ifdef WATCH_CPU
+ if (can_read_kernel != 0) {
+ // Sleep at least 5 seconds to make a measurement.
+ sleep_till1 = now + 5;
+ while (now < sleep_till1) {
+ sleep(sleep_till1 - now);
+ now = time(0);
+ }
+
+ // Measure the 5 second process creation rate.
+ mpid5_current = kvm$mpid;
+ mpid5_now = gethrtime();
+ mpid5_interval = (mpid5_now - mpid5_then) * 0.000000001;
+ mpid5_then = mpid5_now;
+ if (mpid5_current >= mpid5_previous) {
+ mpid5_diff = mpid5_current - mpid5_previous;
+ }
+ else {
+ mpid5_diff = mpid5_current + DEFAULT_MAXPID - mpid5_previous;
+ }
+ rate = mpid5_diff/mpid5_interval;
+ if (rate > mpid5_rate) {
+ mpid5_rate = rate;
+ }
+ mpid5_previous = mpid5_current;
+
+ // Now take these results to measure the long interval rate.
+ // Because the mpid may flip over DEFAULT_MAXPID more than once
+ // in the long interval time span, use the difference between
+ // the previous and current mpid over a 5 second interval to
+ // calculate the long interval difference.
+ mpid_current += mpid5_diff;
+ mpid_now = mpid5_now;
+ }
+ else {
+ sleep(sleep_till - now);
+ }
+#else
+ sleep(sleep_till - now);
+#endif
+ now = time(0);
+ }
}
#ifdef WATCH_CPU
-handle_cpu()
+measure_cpu()
{
p_vmstat pvm;
+ double mpid_interval;
+ double mpid_rate;
pvm = vmglobal_total();
// In SE 3.0 user_time and system_time are int and in SE 3.1 they are
// double, so cast everything to double using + 0.0.
- put_output(" usr%", sprintf("%5.1f", pvm.user_time + 0.0));
- put_output(" sys%", sprintf("%5.1f", pvm.system_time + 0.0));
- put_output(" 1load", sprintf("%6.2f", tmp_kstat_misc.avenrun_1min/256.0));
- put_output(" 5load", sprintf("%6.2f", tmp_kstat_misc.avenrun_5min/256.0));
- put_output("15load", sprintf("%6.2f", tmp_kstat_misc.avenrun_15min/256.0));
- put_output(" 1runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_1min/256.0));
- put_output(" 5runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_5min/256.0));
- put_output("15runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_15min/256.0));
- put_output("#proc", sprintf("%5lu", tmp_kstat_misc.nproc));
+ put_output(" usr%", sprintf("%5.1f", pvm.user_time + 0.0));
+ put_output(" sys%", sprintf("%5.1f", pvm.system_time + 0.0));
+ put_output(" 1runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_1min/256.0));
+ put_output(" 5runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_5min/256.0));
+ put_output("15runq", sprintf("%6.2f", tmp_kstat_misc.avenrun_15min/256.0));
+ put_output("#proc", sprintf("%5lu", tmp_kstat_misc.nproc));
+ put_output("scanrate", sprintf("%8.3f", pvm.scan));
+
+ // Calculate the rate of new process spawning.
+ if (can_read_kernel != 0) {
+ mpid_interval = (mpid_now - mpid_then) * 0.000000001;
+ mpid_rate = (mpid_current - mpid_previous) / mpid_interval;
+ put_output("#proc/s", sprintf("%7.3f", mpid_rate));
+ put_output("#proc/p5s", sprintf("%9.4f", mpid5_rate));
+
+ // Reset counters.
+ mpid_then = mpid_now;
+ mpid_previous = mpid_current;
+ mpid5_rate = 0;
+ }
}
#endif
#ifdef WATCH_MUTEX
-handle_mutex()
+measure_mutex()
{
put_output(" smtx", sprintf("%5d", tmp_mutex.smtx));
put_output("smtx/cpu", sprintf("%8d", tmp_mutex.smtx/tmp_mutex.ncpus));
+ put_output("ncpus", sprintf("%5d", tmp_mutex.ncpus));
}
#endif
#ifdef WATCH_NET
-handle_net()
+measure_net()
{
- int i;
+ int previous_count = -1;
+ int current_count;
+ int i;
- for (i=0; i<tmp_nr.net_count; ++i) {
- put_output(sprintf("%4sIpkt/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].ipackets));
- put_output(sprintf("%4sOpkt/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].opackets));
- put_output(sprintf("%4sInKB/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].ioctets/1024.0));
- put_output(sprintf("%4sOuKB/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].ooctets/1024.0));
- put_output(sprintf("%4sIErr/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].ierrors));
- put_output(sprintf("%4sOErr/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].oerrors));
- put_output(sprintf("%4sColl%%", tmp_nr.names[i]),
- sprintf("%9.3f", GLOBAL_net[i].collpercent));
- put_output(sprintf("%4sNoCP/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].nocanput));
- put_output(sprintf("%4sDefr/s", tmp_nr.names[i]),
- sprintf("%10.3f", GLOBAL_net[i].defer));
+ current_count = 0;
+ for (i=0; i<tmp_nr.net_count; i++) {
+ // Skip unused interfaces.
+// if (GLOBAL_net[i].up == 0) {
+// continue;
+// }
+ ++current_count;
+ put_output(sprintf("%5sIpkt/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].ipackets));
+ put_output(sprintf("%5sOpkt/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].opackets));
+ put_output(sprintf("%5sInKB/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].ioctets/1024.0));
+ put_output(sprintf("%5sOuKB/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].ooctets/1024.0));
+ put_output(sprintf("%5sIErr/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].ierrors));
+ put_output(sprintf("%5sOErr/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].oerrors));
+ put_output(sprintf("%5sColl%%", tmp_nr.names[i]),
+ sprintf("%10.3f", GLOBAL_net[i].collpercent));
+ put_output(sprintf("%5sNoCP/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].nocanput));
+ put_output(sprintf("%5sDefr/s", tmp_nr.names[i]),
+ sprintf("%11.3f", GLOBAL_net[i].defer));
+ }
+
+ // If the number of up interfaces changes, then print new headers.
+ if (current_count != previous_count) {
+ print_header = 1;
+ previous_count = current_count;
}
}
#endif
#ifdef WATCH_TCP
-handle_tcp()
+measure_tcp()
{
put_output("tcp_Iseg/s", sprintf("%10.3f", tmp_tcp.InDataSegs));
put_output("tcp_Oseg/s", sprintf("%10.3f", tmp_tcp.OutDataSegs));
@@ -575,7 +889,7 @@
#endif
#ifdef WATCH_NFS
-handle_nfs()
+measure_nfs()
{
put_output("nfs_call/s", sprintf("%10.3f", tmp_lrpcc.calls));
put_output("nfs_timo/s", sprintf("%10.3f", tmp_lrpcc.timeouts));
@@ -583,30 +897,142 @@
}
#endif
+#ifdef WATCH_MOUNTS
+measure_mounts()
+{
+ statvfs_t vfs_array[1];
+ statvfs_t vfs;
+ string comment_fmt;
+ string kbytes_fmt;
+ string inode_fmt;
+ string percent_fmt;
+ ulong kbytes_used;
+ ulong inodes_used;
+ double block_factor;
+ int comment_length;
+ int previous_count = -1;
+ int current_count;
+
+ current_count = 0;
+ // Traverse the mount table to find mounted ufs/vxfs file systems.
+ for (mnt$mnt.number$=0; mnt$mnt.number$ != -1; mnt$mnt.number$++) {
+ tmp_mnt = mnt$mnt;
+ if (tmp_mnt.mnt_fstype == "ufs" || tmp_mnt.mnt_fstype == "vxfs") {
+ // Skip locally mounted /cdrom partitions.
+ if (tmp_mnt.mnt_mountp =~ "^/cdrom/") {
+ continue;
+ }
+ if (statvfs(tmp_mnt.mnt_mountp, vfs_array) == -1) {
+ continue;
+ }
+ vfs = vfs_array[0];
+ ++current_count;
+
+ // Generate the format strings for the comment and for the data.
+ comment_fmt = sprintf("mnt%%c_%s", tmp_mnt.mnt_mountp);
+ comment_length = strlen(comment_fmt) - 1;
+ kbytes_fmt = sprintf("%%%d.0f", comment_length);
+ inode_fmt = sprintf("%%%dld", comment_length);
+ percent_fmt = sprintf("%%%d.3f", comment_length);
+
+ // Calculate the number of 1 kilobyte blocks on the disk.
+ block_factor = vfs.f_frsize/1024;
+
+ // Capital letters refer to the disk usage in kilobytes. Lower case
+ // letters refer to inode usage.
+ // C - Capacity of the disk.
+ // U - Used capacity.
+ // A - Available capacity for non-root users.
+ // P - Percent used.
+ kbytes_used = vfs.f_blocks - vfs.f_bfree;
+ inodes_used = vfs.f_files - vfs.f_ffree;
+
+ put_output(sprintf(comment_fmt, 'C'),
+ sprintf(kbytes_fmt, block_factor*vfs.f_blocks));
+ put_output(sprintf(comment_fmt, 'U'),
+ sprintf(kbytes_fmt, block_factor*kbytes_used));
+ put_output(sprintf(comment_fmt, 'A'),
+ sprintf(kbytes_fmt, block_factor*vfs.f_bavail));
+ put_output(sprintf(comment_fmt, 'P'),
+ sprintf(percent_fmt,
+ 100.0*kbytes_used/(vfs.f_blocks + vfs.f_bavail - vfs.f_bfree)));
+
+ put_output(sprintf(comment_fmt, 'c'),
+ sprintf(inode_fmt, vfs.f_files));
+ put_output(sprintf(comment_fmt, 'u'),
+ sprintf(inode_fmt, inodes_used));
+ put_output(sprintf(comment_fmt, 'a'),
+ sprintf(inode_fmt, vfs.f_favail));
+ put_output(sprintf(comment_fmt, 'p'),
+ sprintf(percent_fmt,
+ 100.0*inodes_used/(vfs.f_files + vfs.f_favail - vfs.f_ffree)));
+
+ }
+ }
+
+ // If the number of mounted filesystems changes, then print new headers.
+ if (current_count != previous_count) {
+ print_header = 1;
+ previous_count = current_count;
+ }
+}
+#endif
+
#ifdef WATCH_DISK
-handle_disk()
+measure_disk()
{
double mean_disk_busy;
double peak_disk_busy;
+ double total_reads;
+ double total_writes;
+ double total_readk;
+ double total_writek;
+ int previous_count = -1;
int i;
mean_disk_busy = 0.0;
peak_disk_busy = 0.0;
- for (i=0; i < GLOBAL_disk[0].disk_count; i++) {
+ total_reads = 0.0;
+ total_writes = 0.0;
+ total_readk = 0.0;
+ total_writek = 0.0;
+ for (i=0; i<GLOBAL_disk_count; i++) {
+ put_output(sprintf("disk_runp_c%dt%dd%d",
+ GLOBAL_disk[i].info.controller,
+ GLOBAL_disk[i].info.target,
+ GLOBAL_disk[i].info.device),
+ sprintf("%16.5f", GLOBAL_disk[i].run_percent));
+ total_reads += GLOBAL_disk[i].reads;
+ total_writes += GLOBAL_disk[i].writes;
+ total_readk += GLOBAL_disk[i].kreads;
+ total_writek += GLOBAL_disk[i].kwrites;
mean_disk_busy += GLOBAL_disk[i].run_percent;
if (GLOBAL_disk[i].run_percent > peak_disk_busy) {
peak_disk_busy = GLOBAL_disk[i].run_percent;
}
}
- mean_disk_busy = mean_disk_busy/GLOBAL_disk[0].disk_count;
+ if (GLOBAL_disk_count != 0) {
+ mean_disk_busy = mean_disk_busy/GLOBAL_disk_count;
+ }
put_output("disk_peak", sprintf("%9.3f", peak_disk_busy));
put_output("disk_mean", sprintf("%9.3f", mean_disk_busy));
+ put_output("disk_rd/s", sprintf("%9.1f", total_reads));
+ put_output("disk_wr/s", sprintf("%9.1f", total_writes));
+ put_output("disk_rK/s", sprintf("%9.1f", total_readk));
+ put_output("disk_wK/s", sprintf("%9.1f", total_writek));
+
+ // If the number of disks has changed, say due to a add_drv, then print
+ // new headers.
+ if (previous_count != GLOBAL_disk_count) {
+ print_header = 1;
+ previous_count = GLOBAL_disk_count;
+ }
}
#endif
#ifdef WATCH_DNLC
-handle_dnlc()
+measure_dnlc()
{
put_output("dnlc_ref/s", sprintf("%10.3f", tmp_lrdnlc.refrate));
put_output("dnlc_hit%", sprintf("%9.3f", tmp_lrdnlc.hitrate));
@@ -614,7 +1040,7 @@
#endif
#ifdef WATCH_INODE
-handle_inode()
+measure_inode()
{
put_output("inod_ref/s", sprintf("%10.3f", tmp_lrinode.refrate));
put_output("inod_hit%", sprintf("%9.3f", tmp_lrinode.hitrate));
@@ -623,16 +1049,17 @@
#endif
#ifdef WATCH_RAM
-handle_ram()
+measure_ram()
{
put_output("swap_avail", sprintf("%10ld", GLOBAL_pvm[0].swap_avail));
put_output("page_rstim", sprintf("%10d", tmp_lrram.restime));
+ put_output(" freememK", sprintf("%10d", GLOBAL_pvm[0].freemem));
put_output("free_pages", sprintf("%10d", (GLOBAL_pvm[0].freemem*1024)/page_size));
}
#endif
#ifdef WATCH_PAGES
-handle_pages()
+measure_pages()
{
put_output("pp_kernel", sprintf("%9lu", tmp_kstat_pages.pp_kernel));
put_output("pagesfree", sprintf("%9lu", tmp_kstat_pages.pagesfree));
@@ -642,241 +1069,257 @@
}
#endif
-#ifdef WATCH_HTTPD
-/* breakdown access log format */
+#ifdef WATCH_WEB
+// Breakdown access log format.
accesslog(string buf) {
- int size_index;
- string word;
- int z;
- int ishead;
-#if WATCH_PROXY || WATCH_SQUID
- double xf;
+ int z;
+ int size_index;
+ int ishead;
+ string word;
+ char first_byte[1];
+
+#if WATCH_PROXY || WATCH_SQUID || WATCH_YAHOO
+ double xf;
#ifdef WATCH_SQUID
- string logtag;
- string request;
+ string logtag;
+ string request;
#endif
+#ifdef WATCH_YAHOO
+ string arg;
+ ulong ptr;
+ ulong tmp;
+ ulong ulong_xf;
+#endif
+#endif
+
+ ishead = 0;
+#ifdef WATCH_YAHOO
+ // Make sure that the input line has at least 32 bytes of data plus a new
+ // line, for a total length of 33.
+ if (strlen(buf) < 33) {
+ return;
+ }
+ word = strtok(buf,"\05");
+#else
+ word = strtok(buf," ");
#endif
- ishead = 0;
- word = strtok(buf," ");
- if (word == nil) {
- return;
- }
+ if (word == nil) {
+ return;
+ }
+
#ifdef WATCH_SQUID
- /* word contains unix time in seconds.milliseconds */
- word = strtok(nil, " "); /* elapsed request time in ms */
- xf = atof(word)/1000.0;
- prxy_squid_xfer_sum += xf;
+ // Word contains unix time in seconds.milliseconds.
+ word = strtok(nil, " "); // Elapsed request time in ms
+ xf = atof(word)/1000.0;
+ www_dwnld_time_sum += xf;
#ifdef DINKY
- printf("time: %s %f total %f\n", word, xf, xfer_sum);
+ printf("time: %s %f total %f\n", word, xf, xfer_sum);
#endif
- word = strtok(nil, " "); /* client IP address */
- logtag = strtok(nil, "/"); /* Log tag */
- word = strtok(nil, " "); /* reply code */
- if (word != nil) {
- if (strstr(word,"304") != nil) {
- httpop_condgets++;
- }
- if (strncmp(word, "4", 1) == 0 || strncmp(word, "5", 1) == 0) {
- httpop_errors++;
- }
- }
- word = strtok(nil, " "); /* size sent to client */
- z = atoi(word);
- request = strtok(nil, " "); /* Request method */
- word = strtok(nil, " "); /* URL */
- if (word != nil) {
- if (strstr(word,"cgi-bin") != nil) {
- httpop_cgi_bins++;
- }
- if (strstr(word, search_url) != nil) {
- httpop_searches++;
- }
- }
- word = strtok(nil, " "); /* optional user ident */
- word = strtok(nil, "/"); /* Hierarchy */
- if (word != nil) {
- if (strstr(word, "DIRECT") == nil) {
- prxy_squid_indirect++;
- }
- }
- word = strtok(nil, " "); /* Hostname */
- word = strtok(nil, " "); /* content-type */
-
- /* process the collected data */
- if (strstr(logtag, "TCP") != nil) {
- squid_client_http++;
- }
- if (strstr(logtag, "UDP") != nil) {
- squid_icp_requests++;
- }
- if (strstr(logtag, "HIT") != nil) {
- prxy_squid_cache_hits++;
- }
- if (strstr(logtag, "MISS") != nil) {
- squid_cache_misses++;
- }
- switch(request) {
- case "GET":
- httpop_gets++;
- break;
- case "POST":
- httpop_posts++;
- break;
- case "HEAD":
- ishead = 1;
- httpop_condgets++;
- break;
- case "ICP_QUERY":
- squid_icp_queries++;
- default: break;
- }
- if (ishead == 0) { /* don't add size if its a HEAD */
- dwnld_totalz += z;
- }
- if (z < 1024) {
- size_index=0; /* under 1K */
- } else {
- if (z < 10240) {
- size_index=1; /* under 10K */
- } else {
- if (z < 102400) {
- size_index=2; /* under 100K */
- } else {
- if (z < 1048576) {
- size_index=3; /* < 1MB */
- } else {
- size_index=4; /* >= 1MB */
- }
- }
- }
- }
- dwnld_size[size_index]++;
- prxy_squid_xfer_by_size[size_index] += xf;
+ word = strtok(nil, " "); // Client IP address
+ logtag = strtok(nil, "/"); // Log tag
+ word = strtok(nil, " "); // Reply code
+ WWW_REPLY_CODE(word)
+ word = strtok(nil, " "); // Size sent to client
+ z = atoi(word);
+ request = strtok(nil, " "); // Request method
+ word = strtok(nil, " "); // URL
+ if (word != nil) {
+ if (word =~ "cgi-bin") {
+ httpop_cgi_bins++;
+ }
+ if (word =~ www_search_url) {
+ httpop_searches++;
+ }
+ }
+ word = strtok(nil, " "); // Optional user ident
+ word = strtok(nil, "/"); // Hierarchy
+ if (word != nil) {
+ if (word =~ "DIRECT") {
+ prxy_squid_indirect++;
+ }
+ }
+ word = strtok(nil, " "); // Hostname
+ word = strtok(nil, " "); // Content-type
+
+ // Process the collected data.
+ if (logtag =~ "TCP") {
+ squid_client_http++;
+ }
+ if (logtag =~ "UDP") {
+ squid_icp_requests++;
+ }
+ if (logtag =~ "HIT") {
+ prxy_squid_cache_hits++;
+ }
+ if (logtag =~ "MISS") {
+ squid_cache_misses++;
+ }
+ WWW_METHOD(request)
+
+ // Do not add size if its a HEAD.
+ if (ishead == 0) {
+ dwnld_totalz += z;
+ }
+
+ WWW_SIZE_INDEX(z, size_index)
+ www_dwnld_time_by_size[size_index] += xf;
+
+#elif WATCH_YAHOO
+ // Yahoo log format. Fields in square brackets will only appear in the
+ // log file if the data actually exists (ie. you will never see a null
+ // Referrer field). Further, fields labelled here with "(CONFIG)" will
+ // only appear if they are enabled via the YahooLogOptions configuration
+ // directive.
+ //
+ // IP Address (8 hex digits)
+ // Timestamp (time_t as 8 hex digits)
+ // Processing Time (in microseconds, as 8 hex digits)
+ // Bytes Sent (8 hex digits)
+ // URL
+ // [^Er referrer] (CONFIG)
+ // [^Em method] (CONFIG)
+ // [^Es status_code]
+ // ^Ed signature
+ // \n
+
+ // Ignore the IP address and timestamp. Get the processing time, the
+ // number of bytes sent and the URL. For each portion of the line, split
+ // it up into separate pieces.
+ if (sscanf(word, "%8lx%8lx%8x%8x", &tmp, &tmp, &ulong_xf, &z) != 4) {
+ return;
+ }
+
+ xf = ulong_xf/1000000.0;
+ WWW_SIZE_INDEX(z, size_index)
+ www_dwnld_time_sum += xf;
+ www_dwnld_time_by_size[size_index] += xf;
+
+ if (word =~ "cgi-bin") {
+ httpop_cgi_bins++;
+ }
+ if (word =~ www_search_url) {
+ httpop_searches++;
+ }
+
+ for (;;) {
+ word = strtok(nil, "\05");
+ if (word == nil) {
+ break;
+ }
+ first_byte = word;
+ ptr = &word + 1;
+ arg = ((string) ptr);
+ ptr = 0;
+ switch (first_byte[0]) {
+ case 'm':
+ WWW_METHOD(arg)
+ ptr = 1;
+ break;
+ case 's':
+ WWW_REPLY_CODE(arg)
+ break;
+ default:
+ break;
+ }
+ }
+
+ // If no method was seen, then assume it was a GET.
+ if (ptr == 0) {
+ httpop_gets++;
+ }
+
+ // Do not add size if its a HEAD.
+ if (ishead == 0) {
+ dwnld_totalz += z;
+ }
+
#else /* common or netscape proxy formats */
- strtok(nil, " "); /* - */
- strtok(nil, " "); /* - */
- strtok(nil, " ["); /* date */
- strtok(nil, " "); /* zone] */
- word = strtok(nil, " \""); /* GET or POST */
- switch (word) {
- case "get":
- case "GET":
- httpop_gets++;
- break;
- case "post":
- case "POST":
- httpop_posts++;
- break;
- case "head":
- case "HEAD":
- ishead = 1;
- httpop_condgets++;
- break;
- default:
- break;
- }
- word = strtok(nil, " "); /* URL */
- if (word != nil) {
- if (strstr(word,"cgi-bin") != nil) {
- httpop_cgi_bins++;
- }
- if (strstr(word, search_url) != nil) {
- httpop_searches++;
- }
- }
- // Sometimes HTTP/1.x is not listed in the access log. Skip it
- // if it does exist. Load the error/success code.
- word = strtok(nil, " ");
- if (word != nil) {
- if (strstr(word, "HTTP") != nil || strstr(word, "http") != nil) {
- word = strtok(nil, " ");
- }
- }
- if (word != nil) {
- if (strstr(word,"304") != nil) {
- httpop_condgets++;
- }
- else {
- if (strncmp(word, "4", 1) == 0 || strncmp(word, "5", 1) == 0) {
- httpop_errors++;
- }
- }
- }
- word = strtok(nil, " "); // bytes transferred
- if (word != nil) {
- z = atoi(word);
- if (ishead == 0) { // don't add size if its a HEAD
- dwnld_totalz += z;
- }
- if ((z % 1024) == z) {
- size_index=0; /* under 1K */
- } else {
- if ((z % 10240) == z) {
- size_index=1; /* under 10K */
- } else {
- if ((z % 102400) == z) {
- size_index=2; /* under 100K */
- } else {
- if ((z % 1048576) == z) {
- size_index=3; /* < 1MB */
- } else {
- size_index=4; /* >= 1MB */
- }
- }
- }
- }
- dwnld_size[size_index]++;
- }
+ strtok(nil, " "); // -
+ strtok(nil, " "); // -
+ strtok(nil, " ["); // date
+ strtok(nil, " "); // zone]
+ word = strtok(nil, " \""); // GET or POST
+ WWW_METHOD(word)
+ word = strtok(nil, " "); // URL
+ if (word != nil) {
+ if (word =~ "cgi-bin") {
+ httpop_cgi_bins++;
+ }
+ if (word =~ www_search_url) {
+ httpop_searches++;
+ }
+ }
+ // Sometimes HTTP/1.x is not listed in the access log. Skip it
+ // if it does exist. Load the error/success code.
+ word = strtok(nil, " ");
+ if (word != nil && (word =~ "HTTP" || word =~ "http")) {
+ word = strtok(nil, " ");
+ }
+ WWW_REPLY_CODE(word)
+ word = strtok(nil, " "); // Bytes transferred.
+ if (word != nil) {
+ z = atoi(word);
+ if (ishead == 0) { // Do not add size if its a HEAD.
+ dwnld_totalz += z;
+ }
+ WWW_SIZE_INDEX(z, size_index)
+ }
#ifdef WATCH_PROXY
- word = strtok(nil, " "); /* status from server */
- word = strtok(nil, " "); /* length from server */
- word = strtok(nil, " "); /* length from client POST */
- word = strtok(nil, " "); /* length POSTed to remote */
- word = strtok(nil, " "); /* client header req */
- word = strtok(nil, " "); /* proxy header resp */
- word = strtok(nil, " "); /* proxy header req */
- word = strtok(nil, " "); /* server header resp */
- word = strtok(nil, " "); /* transfer total secs */
- word = strtok(nil, " "); /* route */
- if (word != nil) { /* - DIRECT PROXY(host.domain:port) SOCKS */
- if (strncmp(word, "PROXY", 5) == 0 ||
- strncmp(word, "SOCKS", 5) == 0) {
- prxy_squid_indirect++;
- }
- }
- word = strtok(nil, " "); /* client finish status */
- word = strtok(nil, " "); /* server finish status */
- word = strtok(nil, " "); /* cache finish status */
- /* - ERROR HOST-NOT-AVAILABLE = error or incomplete op
- WRITTEN REFRESHED CL-MISMATCH(content length mismatch) = cache_writes
- NO-CHECK UP-TO-DATE = cache_hits
- DO-NOT-CACHE NON-CACHEABLE = uncacheable */
- if (word != nil) {
- switch(word) {
- case "WRITTEN":
- case "REFRESHED":
- case "CL-MISMATCH": prxy_cache_writes++;
- break;
- case "NO-CHECK":
- case "UP-TO-DATE": prxy_squid_cache_hits++;
- break;
- case "DO-NOT-CACHE":
- case "NON-CACHEABLE": prxy_uncacheable++;
- break;
- default: break;
- }
- }
- word = strtok(nil, " ["); /* [transfer total time x.xxx */
- if (word != nil) {
- xf = atof(word);
- prxy_squid_xfer_by_size[size_index] += xf;
- prxy_squid_xfer_sum += xf;
- }
+ word = strtok(nil, " "); // status from server
+ word = strtok(nil, " "); // length from server
+ word = strtok(nil, " "); // length from client POST
+ word = strtok(nil, " "); // length POSTed to remote
+ word = strtok(nil, " "); // client header req
+ word = strtok(nil, " "); // proxy header resp
+ word = strtok(nil, " "); // proxy header req
+ word = strtok(nil, " "); // server header resp
+ word = strtok(nil, " "); // transfer total secs
+ word = strtok(nil, " "); // route
+
+ // - DIRECT PROXY(host.domain:port) SOCKS
+ if (word != nil) {
+ if (strncmp(word, "PROXY", 5) == 0 ||
+ strncmp(word, "SOCKS", 5) == 0) {
+ prxy_squid_indirect++;
+ }
+ }
+ word = strtok(nil, " "); // client finish status
+ word = strtok(nil, " "); // server finish status
+ word = strtok(nil, " "); // cache finish status
+ // ERROR HOST-NOT-AVAILABLE = error or incomplete op
+ // WRITTEN REFRESHED CL-MISMATCH(content length mismatch) = cache_writes
+ // NO-CHECK UP-TO-DATE = cache_hits
+ // DO-NOT-CACHE NON-CACHEABLE = uncacheable
+ if (word != nil) {
+ switch(word) {
+ case "WRITTEN":
+ case "REFRESHED":
+ case "CL-MISMATCH":
+ prxy_cache_writes++;
+ break;
+ case "NO-CHECK":
+ case "UP-TO-DATE":
+ prxy_squid_cache_hits++;
+ break;
+ case "DO-NOT-CACHE":
+ case "NON-CACHEABLE":
+ prxy_uncacheable++;
+ break;
+ default:
+ break;
+ }
+ }
+ word = strtok(nil, " ["); // [transfer total time x.xxx
+ if (word != nil) {
+ xf = atof(word);
+ www_dwnld_time_sum += xf;
+ www_dwnld_time_by_size[size_index] += xf;
+ }
#endif
#endif
}
-measure_httpd(long sleep_till)
+measure_web(long sleep_till)
{
double lastops = 0.0;
char buf[BUFSIZ];
@@ -895,19 +1338,21 @@
for (i=0; i<5; i++) {
dwnld_size[i] = 0;
-#if WATCH_PROXY || WATCH_SQUID
- prxy_squid_xfer_by_size[i] = 0.0;
+#if WATCH_PROXY || WATCH_SQUID || WATCH_YAHOO
+ www_dwnld_time_by_size[i] = 0.0;
#endif
}
dwnld_totalz = 0;
+#if WATCH_PROXY || WATCH_SQUID || WATCH_YAHOO
+ www_dwnld_time_sum = 0.0;
+#endif
#if WATCH_PROXY || WATCH_SQUID
- prxy_squid_xfer_sum = 0.0;
- prxy_squid_indirect = 0;
- prxy_squid_cache_hits = 0;
+ prxy_squid_indirect = 0;
+ prxy_squid_cache_hits = 0;
#ifdef WATCH_PROXY
- prxy_cache_writes = 0;
- prxy_uncacheable = 0;
+ prxy_cache_writes = 0;
+ prxy_uncacheable = 0;
#else
squid_cache_misses = 0;
squid_icp_requests = 0;
@@ -916,14 +1361,20 @@
#endif
#endif
- if (log_name != nil) {
- while (time(0) < sleep_till) {
+ if (www_log_filename != nil) {
+ now = time(0);
+ while (now < sleep_till) {
+#ifdef WATCH_CPU
+ sleep_till_and_count_new_proceses(now + 5);
+#else
sleep(5);
- if (log_file != 0) {
- while (fgets(buf, BUFSIZ, log_file) != nil) {
+#endif
+ now = time(0);
+ if (www_fd != 0) {
+ while (fgets(buf, BUFSIZ, www_fd) != nil) {
httpops += 1.0;
- if (log_gatelen > 0) {
- if (strncmp(buf, log_gateway, log_gatelen) == 0) {
+ if (www_gatelen > 0) {
+ if (strncmp(buf, www_gateway, www_gatelen) == 0) {
gateops += 1.0;
}
}
@@ -932,19 +1383,19 @@
}
/* see if the file has been switched or truncated */
- stat(log_name, log_stat);
- if (log_ino != log_stat[0].st_ino || log_size > log_stat[0].st_size) {
- if (log_file != 0) {
- fclose(log_file); /* close the old log */
+ stat(www_log_filename, www_stat);
+ if (www_ino != www_stat[0].st_ino || www_size > www_stat[0].st_size) {
+ if (www_fd != 0) {
+ fclose(www_fd); /* close the old log */
}
/* log file has changed, open the new one */
- log_file = fopen(log_name, "r");
- if (log_file != 0) {
- log_ino = log_stat[0].st_ino;
- while(fgets(buf, BUFSIZ, log_file) != nil) {
+ www_fd = fopen(www_log_filename, "r");
+ if (www_fd != 0) {
+ www_ino = www_stat[0].st_ino;
+ while(fgets(buf, BUFSIZ, www_fd) != nil) {
httpops += 1.0;
- if (log_gatelen > 0) {
- if (strncmp(buf, log_gateway, log_gatelen) == 0) {
+ if (www_gatelen > 0) {
+ if (strncmp(buf, www_gateway, www_gatelen) == 0) {
gateops += 1.0;
}
}
@@ -953,30 +1404,27 @@
}
}
- log5_now = gethrtime();
- log5_interval = (log5_now - log5_then) * 0.000000001;
- log5_then = log5_now;
- dtmp = (httpops - lastops)/log5_interval;
+ www5_now = gethrtime();
+ www5_interval = (www5_now - www5_then) * 0.000000001;
+ www5_then = www5_now;
+ dtmp = (httpops - lastops)/www5_interval;
if (dtmp > httpops5) {
httpops5 = dtmp;
}
lastops = httpops;
// Remember size for next time.
- log_size = log_stat[0].st_size;
+ www_size = www_stat[0].st_size;
}
}
else {
- now = time(0);
- while (now < sleep_till) {
- sleep(sleep_till - now);
- now = time(0);
- }
+ sleep_till_and_count_new_proceses(sleep_till);
+ www5_now = gethrtime();
}
- log_now = gethrtime();
- log_interval = (log_now - log_then) * 0.000000001;
- log_then = log_now;
+ www_now = www5_now;
+ www_interval = (www_now - www_then) * 0.000000001;
+ www_then = www_now;
// Use dtmp to get percentages.
if (httpops == 0.0) {
@@ -986,13 +1434,13 @@
dtmp = 100.0 / httpops;
}
-#if WATCH_PROXY || WATCH_SQUID
- for (i=0; i<5; ++i) {
+#if WATCH_PROXY || WATCH_SQUID || WATCH_YAHOO
+ for (i=0; i<5; i++) {
if (dwnld_size[i] == 0) {
- prxy_squid_xfer_by_size[i] = 0.0;
+ www_dwnld_time_by_size[i] = 0.0;
}
else {
- prxy_squid_xfer_by_size[i] = prxy_squid_xfer_by_size[i]/dwnld_size[i];
+ www_dwnld_time_by_size[i] = www_dwnld_time_by_size[i]/dwnld_size[i];
}
}
#endif
@@ -1000,7 +1448,7 @@
int count_proc(string name)
{
- int count;
+ int count;
prpsinfo_t p;
count = 0;
@@ -1014,37 +1462,44 @@
put_httpd()
{
- put_output("#httpds", sprintf("%7d", count_proc("httpd")));
- put_output("httpop/s", sprintf("%8.2f", httpops/log_interval));
- put_output("http/p5s", sprintf("%8.2f", httpops5));
- put_output("cndget/s", sprintf("%8.2f", httpop_condgets/log_interval));
- put_output("search/s", sprintf("%8.3f", httpop_searches/log_interval));
- put_output(" cgi/s", sprintf("%8.3f", httpop_cgi_bins/log_interval));
- put_output(" htErr/s", sprintf("%8.3f", httpop_errors/log_interval));
- put_output(" httpb/s", sprintf("%8.0f", dwnld_totalz/log_interval));
- put_output(" %to1KB", sprintf("%8.2f", dtmp*dwnld_size[0]));
- put_output(" %to10KB", sprintf("%8.2f", dtmp*dwnld_size[1]));
- put_output("%to100KB", sprintf("%8.2f", dtmp*dwnld_size[2]));
- put_output(" %to1MB", sprintf("%8.2f", dtmp*dwnld_size[3]));
- put_output("%over1MB", sprintf("%8.2f", dtmp*dwnld_size[4]));
- put_output(log_gateway, sprintf("%8.2f", gateops/log_interval));
+ put_output("#httpds", sprintf("%7d", count_proc(www_server_proc_name)));
+ put_output("httpop/s", sprintf("%8.2f", httpops/www_interval));
+ put_output("http/p5s", sprintf("%8.2f", httpops5));
+ put_output("cndget/s", sprintf("%8.2f", httpop_condgets/www_interval));
+ put_output("search/s", sprintf("%8.3f", httpop_searches/www_interval));
+ put_output(" cgi/s", sprintf("%8.3f", httpop_cgi_bins/www_interval));
+ put_output(" htErr/s", sprintf("%8.3f", httpop_errors/www_interval));
+ put_output(" httpb/s", sprintf("%8.0f", dwnld_totalz/www_interval));
+ put_output(" %to1KB", sprintf("%8.2f", dtmp*dwnld_size[0]));
+ put_output(" %to10KB", sprintf("%8.2f", dtmp*dwnld_size[1]));
+ put_output("%to100KB", sprintf("%8.2f", dtmp*dwnld_size[2]));
+ put_output(" %to1MB", sprintf("%8.2f", dtmp*dwnld_size[3]));
+ put_output("%over1MB", sprintf("%8.2f", dtmp*dwnld_size[4]));
+ put_output(www_gateway, sprintf("%8.2f", gateops/www_interval));
#if WATCH_PROXY || WATCH_SQUID
- put_output(" %indir", sprintf("%8.2f", dtmp * prxy_squid_indirect));
- put_output("%cch_hit", sprintf("%8.2f", dtmp * prxy_squid_cache_hits));
+ put_output(" %indir", sprintf("%8.2f", dtmp * prxy_squid_indirect));
+ put_output("%cch_hit", sprintf("%8.2f", dtmp * prxy_squid_cache_hits));
#ifdef WATCH_PROXY
- put_output("%cch_wrt", sprintf("%8.2f", dtmp * prxy_cache_writes));
- put_output("%cch_unc", sprintf("%8.2f", dtmp * prxy_uncacheable));
+ put_output("%cch_wrt", sprintf("%8.2f", dtmp * prxy_cache_writes));
+ put_output("%cch_unc", sprintf("%8.2f", dtmp * prxy_uncacheable));
#else
- put_output("%cch_mis", sprintf("%8.2f", dtmp * squid_cache_misses));
- put_output("%cch_req", sprintf("%8.2f", dtmp * squid_icp_requests));
- put_output("%cch_qry", sprintf("%8.2f", dtmp * squid_icp_queries));
-#endif
- put_output(" xfr_t", sprintf("%8.2f", 0.01 * dtmp * prxy_squid_xfer_sum));
- put_output(" xfr1_t", sprintf("%8.2f", prxy_squid_xfer_by_size[0]));
- put_output(" xfr10_t", sprintf("%8.2f", prxy_squid_xfer_by_size[1]));
- put_output("xfr100_t", sprintf("%8.2f", prxy_squid_xfer_by_size[2]));
- put_output(" xfr1M_t", sprintf("%8.2f", prxy_squid_xfer_by_size[3]));
- put_output("xfro1M_t", sprintf("%8.2f", prxy_squid_xfer_by_size[4]));
+ put_output("%cch_mis", sprintf("%8.2f", dtmp * squid_cache_misses));
+ put_output("%cch_req", sprintf("%8.2f", dtmp * squid_icp_requests));
+ put_output("%cch_qry", sprintf("%8.2f", dtmp * squid_icp_queries));
+#endif
+ put_output(" xfr_t", sprintf("%8.2f", 0.01 * dtmp * www_dwnld_time_sum));
+ put_output(" xfr1_t", sprintf("%8.2f", www_dwnld_time_by_size[0]));
+ put_output(" xfr10_t", sprintf("%8.2f", www_dwnld_time_by_size[1]));
+ put_output("xfr100_t", sprintf("%8.2f", www_dwnld_time_by_size[2]));
+ put_output(" xfr1M_t", sprintf("%8.2f", www_dwnld_time_by_size[3]));
+ put_output("xfro1M_t", sprintf("%8.2f", www_dwnld_time_by_size[4]));
+#elif WATCH_YAHOO
+ put_output(" wprc_t", sprintf("%9.5f", 0.01 * dtmp * www_dwnld_time_sum));
+ put_output(" wprc1_t", sprintf("%9.5f", www_dwnld_time_by_size[0]));
+ put_output(" wprc10_t", sprintf("%9.5f", www_dwnld_time_by_size[1]));
+ put_output("wprc100_t", sprintf("%9.5f", www_dwnld_time_by_size[2]));
+ put_output(" wprc1M_t", sprintf("%9.5f", www_dwnld_time_by_size[3]));
+ put_output("wprco1M_t", sprintf("%9.5f", www_dwnld_time_by_size[4]));
#endif
}
#endif
Modified: trunk/orca/orcallator/start_orcallator.sh.in
==============================================================================
--- trunk/orca/orcallator/start_orcallator.sh.in (original)
+++ trunk/orca/orcallator/start_orcallator.sh.in Sat Jul 13 19:22:25 2002
@@ -7,14 +7,34 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
AWK=@AWK@
+COMPRESSOR="@COMPRESSOR@"
CUT=@CUT@
EXPR=@EXPR@
UNAME=@UNAME@
ORCALLATOR_DIR=@ORCALLATOR_DIR@
SE=@SE@
-WATCH_HTTPD="@WATCH_HTTPD@"
+WATCH_WEB="@WATCH_WEB@"
WEB_LOG=@WEB_LOG@
+# Check if the SE executable was found upon configure.
+if test -z "$SE"; then
+ echo "When you configured Orca the se executable was not found. If you"
+ echo "do not have the SE toolkit installed on your system, then follow"
+ echo "the steps in section 8 of INSTALL."
+ echo ""
+ echo "Once you have the SE toolkit installed on your system, then either"
+ echo "rerun configure so that it finds se, or edit start_orcallator.sh"
+ echo "and define SE to the location of se."
+ exit 1
+fi
+
+if test ! -x "$SE"; then
+ echo "The SE executable at"
+ echo " $SE"
+ echo "does not exist or is not executable. Please correct this problem."
+ exit 1
+fi
+
# Get the hostname without the fully qualified part; that is, trim off
# anything past the first `.'.
uname=`$UNAME -n | $CUT -d. -f1`
@@ -23,7 +43,7 @@
OUTDIR=$ORCALLATOR_DIR/$uname
# Export the environmental variables.
-export OUTDIR WEB_LOG
+export COMPRESSOR OUTDIR WEB_LOG
# Check if orcallator is already running.
pids=`/usr/ucb/ps auxww | $AWK '/orcallator.se/ && !/awk/ {print $2}'`
@@ -53,7 +73,7 @@
# Now start the logging.
echo "Starting logging"
-$SE $LE_PATCH -DWATCH_OS $WATCH_HTTPD $libdir/orcallator.se &
+$SE $LE_PATCH -DWATCH_OS $WATCH_WEB $libdir/orcallator.se &
# Write the PID of orcallator to a file to make killing easier.
pid=$!
Modified: trunk/orca/config/PerlHead1.in
==============================================================================
--- trunk/orca/config/PerlHead1.in (original)
+++ trunk/orca/config/PerlHead1.in Sat Jul 13 19:22:25 2002
@@ -1,4 +1,4 @@
#!@PERL@ -w # -*- perl -*-
-require 5.005;
+require 5.004_01;
Modified: trunk/orca/config/PerlHead2.in
==============================================================================
--- trunk/orca/config/PerlHead2.in (original)
+++ trunk/orca/config/PerlHead2.in Sat Jul 13 19:22:25 2002
@@ -5,5 +5,5 @@
& eval 'exec perl -w -S $0 $argv:q'
if 0;
-require 5.005;
+require 5.004_01;
Added: trunk/orca/config/aclocal.m4
==============================================================================
--- trunk/orca/config/aclocal.m4 (original)
+++ trunk/orca/config/aclocal.m4 Sat Jul 13 19:22:25 2002
@@ -0,0 +1,53 @@
+dnl config/aclocal.m4 generated automatically by aclocal 1.4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl Check if the requested modules are install in this perl module.
+dnl Do not cache this result, since the user may easy install the
+dnl modules and rerun configure. We do not want to remember if
+dnl the module is not installed.
+dnl BORP_PERL_MODULE(DEFINE, PATH_TO_PERL, MODULE_NAME, MODULE_VERSION,
+dnl [ACTION_IF_FOUND, [ACTION_IF_NOT_FOUND]]
+AC_DEFUN(BORP_PERL_MODULE, [
+ AC_MSG_CHECKING([if Perl module $3 version $4 is installed])
+ if $2 ./config/check_for_perl_mod $3 $4; then
+ $1=yes
+ ifelse([$5], , , [$5])
+ else
+ $1=no
+ ifelse([$6], , , [$6])
+ fi
+ AC_MSG_RESULT([$]$1)
+])
+
+dnl Check if the whole path to Perl can be placed on the #! line
+dnl of a shell script. Some systems have length restrictions
+dnl so some paths to programs may be too long.
+dnl BORP_PERL_RUN(PATH_TO_SHELL [, ACTION-IF-WORKS [, ACTION-IF_NOT]])
+AC_DEFUN(BORP_PERL_RUN, [
+ AC_MSG_CHECKING([if '$1' will run Perl scripts])
+ rm -f conftest.BZ
+ cat > conftest.BZ <<EOF
+#!$1
+
+exit 0
+EOF
+ chmod +x conftest.BZ
+ if ./conftest.BZ 2>/dev/null; then
+ ifelse([$2], , , [$2])
+ AC_MSG_RESULT(yes)
+ else
+ ifelse([$3], , , [$3])
+ AC_MSG_RESULT(no)
+ fi
+ rm -f conftest.BZ
+])
+
Modified: trunk/orca/TODO
==============================================================================
--- trunk/orca/TODO (original)
+++ trunk/orca/TODO Sat Jul 13 19:22:25 2002
@@ -1,22 +1,399 @@
-Other:
+This is a pretty comprehensive to-do list for Orca and the related data
+gathering tools. Any comments and additions to this list are welcome.
+
+To motivate the discussion of this to do list, let me give some background
+on our setup. GeoCities site has over 100 hosts. I've been running
+orcallator.se on some hosts since September 1998 that have stored over
+300 source text files. Currently I have 34472 files using 7.3 gigabytes
+of storage. I have 9 different orcallator.cfg for different classes
+of machines.
+
+* Orca: Load arbitrarily formatted source text files.
+
+ (If this is implemented, then the problems of source text files
+ not containing fields that orcallator.cfg is looking for and
+ Orca complaining will disappear).
+
+ Orca can only handle source text files that have data from one
+ source, such as a host, in a single file. It cannot currently
+ handle source data like this:
+
+ # Web_server time hits/s bytes/s
+ www1 933189273 1304 10324
+ www2 933189273 2545 40322
+
+ I plan on having Orca allow something like this in the configuration
+ file for each group. To read the data above, something like this
+ would be defined. Here the ChangeSubGroup and StoreMeasurement
+ would be macros or subroutines defined elsewhere for Orca users
+ to use.
+
+ group web_servers {
+ upon_open
+ # Do nothing special.
+
+ upon_new_data
+ while (<$fh>) {
+ next if /^#/;
+ my @line = split;
+ next unless (@line == 4);
+ my ($www, $time, $hits_s, $bytes_s) = @line;
+ ChangeSubGroup($www);
+ StoreMeasurement('Hits Per Second', $time, $hits_s);
+ StoreMeasurement('Bytes Per Second', $time, $bytes_s);
+ }
+
+ upon_close
+ # Do nothing special.
+ }
+
+ For the standard orcallator.se output, something like this would
+ be used:
+
+ group orcallator {
+ find_files /usr/local/var/orca/orcallator/(.*)/orcallator-\d+-\d+\d+
+
+ upon_open
+ # Look for the first # line describing the data.
+ while (<$fh>)) {
+ last if /^#/;
+ }
+ @ColumnsNames = split;
+ # Do some searching for the column with the Unix time in it.
+ my $time_column = ....;
+ splice(@ColumnNames, $time_column, 1);
+
+ upon_new_data
+ # Load the new data.
+ while (my $line = <$fh>) {
+ my @line = split;
+ next unless @line == @ColumnNames + 1;
+ my ($time) = splice(@line, $time_column, 1);
+ #
+ StoreMeasurements($time, \@ColumnNames, \@line);
+ }
+
+ }
+
+ The code for each upon_* would be Perl code designed explicitly
+ for the type of source text. This would allow the arbitrary
+ reading of text files, leaving the specifics to the user of
+ Orca.
+
+ This work would also include caching away the type of measurements
+ that each source data file provides. Currently Orca reads the
+ header of each source text file for the names of the columns.
+ With the number of source text files I have, this takes a long
+ time.
+
+* OS independent data gathering tools:
+
+ Many people have been asking for Orca for operating systems other
+ than Solaris, since orcallator.se only runs on Solaris hosts.
+
+ I've given this a little thought and one good solution to this is
+ use other publically available tools that gather host information.
+ The one that came to mind is top (ftp://ftp.groupsys.com/pub/top).
+ Looking at the configure script for top, it runs on the following
+ OSes:
+
+ 386bsd For a 386BSD system
+ aix32 POWER and POWER2 running AIX 3.2.5.0
+ aix41 PowerPC running AIX 4.1.2.0
+ aux3 a Mac running A/UX version 3.x
+ bsd386 For a BSD/386 system
+ bsd43 any generic 4.3BSD system
+ bsd44 For a 4.4BSD system
+ bsd44a For a pre-release 4.4BSD system
+ bsdos2 For a BSD/OS 2.X system (based on the 4.4BSD Lite system)
+ convex any C2XX running Convex OS 11.X.
+ dcosx For Pyramid DC/OSX
+ decosf1 DEC Alpha AXP running OSF/1 or Digital Unix 4.0.
+ dgux for DG AViiON with DG/UX 5.4+
+ dynix any Sequent Running Dynix 3.0.x
+ dynix32 any Sequent Running Dynix 3.2.x
+ freebsd20 For a FreeBSD-2.0 (4.4BSD) system
+ ftx For FTX based System V Release 4
+ hpux10 any hp9000 running hpux version 10.x
+ hpux7 any hp9000 running hpux version 7 or earlier
+ hpux8 any hp9000 running hpux version 8 (may work with 9)
+ hpux9 any hp9000 running hpux version 9
+ irix5 any uniprocessor, 32 bit SGI machine running IRIX 5.3
+ irix62 any uniprocessor, SGI machine running IRIX 6.2
+ linux Linux 1.2.x, 1.3.x, using the /proc filesystem
+ mtxinu any VAX Running Mt. Xinu MORE/bsd
+ ncr3000 For NCR 3000 series systems Release 2.00.02 and above -
+ netbsd08 For a NetBSD system
+ netbsd10 For a NetBSD-1.0 (4.4BSD) system
+ netbsd132 For a NetBSD-1.3.2 (4.4BSD) system
+ next32 any m68k or intel NEXTSTEP v3.x system
+ next40 any hppa or sparc NEXTSTEP v3.3 system
+ osmp41a any Solbourne running OS/MP 4.1A
+ sco SCO UNIX
+ sco5 SCO UNIX OpenServer5
+ sunos4 any Sun running SunOS version 4.x
+ sunos4mp any multi-processor Sun running SunOS versions 4.1.2 or later
+ sunos5 Any Sun running SunOS 5.x (Solaris 2.x)
+ svr4 Intel based System V Release 4
+ svr42 For Intel based System V Release 4.2 (DESTINY)
+ ultrix4 any DEC running ULTRIX V4.2 or later
+ umax Encore Multimax running any release of UMAX 4.3
+ utek Tektronix 43xx running UTek 4.1
+
+ If somebody were to write a tie into top's source code that would
+ generate output every X minutes to a text file or even RRD files,
+ then Orca could put it together into a nice package.
+
+ In line with this di
+ (ftp://ftp.pz.pirmasens.de/pub/unix/utilities/), a freely
+ available disk usage program that could be used to generate disk
+ usage plots loaded by Orca.
+
+* orcallator.se: Dump directly to RRD files.
+
+ A separate RRD file would be created for each measurement.
+ I do not want all the data stored in a single RRD, since people
+ commonly add or remove hardware from the system, which will cause
+ more or less data to be stored. Also, this currently would not
+ work with RRDtool, since you cannot dynamically add more RRAs
+ to a RRD file. Saving each measurement in a separate RRD file
+ removes this issue.
+
+ Pros:
+ 1) Disk space savings. For an old host using over 70
+ megabytes of storage for text output, the RRD files
+ consume 3.5 megabytes of storage.
+ 2) Orca processing time. Orca spends a large amount of
+ kernel and CPU time in finding files and getting
+ the column headers from these files. By storing
+ the data in RRD files, this is no longer a problem.
+ Also, Orca itself would not need to move the data
+ from text to RRD form, speeding up the process of
+ generating the final plots.
+
+ Cons:
+ 1) Potential slowdown in updating the data files.
+ It is easier to write a single text line using fprintf
+ than using rrd_update. What is the impact on a single
+ orcallator.se process?
+ 2) RRDtool format changes and upgrading the data files.
+ Text files do not change, but if RRDtool does change,
+ then the data files will need to be upgraded somehow.
+ 3) Loss of data over time. Due to the consolidation
+ function of RRD, older data will not be as precise
+ in case it needs to be examined.
+ 4) You cannot grep or simply parse the text files for
+ particular data for ad-hoc studies.
+ 5) The RRD creation parameters would be set by
+ orcallator.se and not by Orca, making modifications
+ harder.
+
+ Question: Do the pros outweigh the cons?
+
+ Work to do: Get RRDtool to build a librrd.so that orcallator.se
+ would attach to. The RRDs.so that gets built in the perl-shared
+ directory has RRDs.o included in it with references to Perl
+ variables, so this shared library cannot be loaded by anybody
+ else. Two things can be done. One is to modify the perl-shared
+ Makefile.PL to build a librrd.so without RRDs.so. The other is
+ to somehow make librrd.so with libtool. Either libtool can be
+ integrated into RRDtool as a whole, or probably simpler would
+ be to add another directory to RRDtool and use libtool in there
+ to make the shared library. The first libtool solution would
+ allow RRDtool to make shared libraries on almost any host without
+ requiring that gcc be installed, since currently the Makefile's
+ look for gcc to use the -fPIC flags.
+
+* Orca: Potentially use Cricket's configuration ConfigTree Module.
+
+ Given more complex Orca installations where many different Orca
+ configuration files are used, maintaining them will start to be
+ complicated. For example, in Yahoo!/GeoCities I have 9 different
+ configurations to split up the hosts for our site I found that
+ for the number of hosts and the number of data files require this
+ for reasonable generating of the resulting HTML and PNG files.
+
+ It looks like using ConfigTree would allow Orca to use the same
+ inheritance that Cricket uses. I don't know enough about the
+ Cricket config tree setup to know if it would work well with Orca.
+
+ Work to do: Review the ConfigTree code.
+
+* Orca: Allow different group sources in the same plot.
+
+ Currently Orca only allows data sources from one group. Expand
+ the code to list the group in each data line. Initially, however
+ only data from one group would be allowed in one data statement.
+
+* Orca: Put the last update time for each host in an HTML file somewhere.
+
+ This could be done simply up updating a file that gets included
+ by the real HTML file. This way the main HTML files do not
+ have to get rewritten all the time. On large installations,
+ writing the HTML files is lengthy.
+
+* Orca: Turn off HTML creation via command line option.
+
+ Add a command line option to turn off HTML file creation.
+
+* Orca: Update the HTML files is new data is found.
+
+ Currently Orca will only update the HTML files if new source
+ files are found, but not if new data in existing files is found.
+ Change this.
+
+* orcallator.se: Put HTTP proxy and caching statistics into orcallator.cfg.
+
+ Since orcallator.se measures HTTP proxy and caching statistics,
+ update orcallator.cfg.in to display these data sets.
+
+* Orca:
+
+ Do what it takes to remove the same Ethernet port listings in
+ orcallator.cfg.in. They seem redundant, but are not totally,
+ since different interfaces have different maximum data transfer
+ rates.
+
+* Orca:
+
+ Add some error checking code for the maximum number of available
+ colors so undefined errors do not arise.
+
+* Other:
Mention the AIX tool nmon.
-Orca:
- Come up with a better error scheme than using warn() for some
- errors and the email warn for others.
- Do something better if the number of columns changes in a single
- orcallator file.
- Have a scheme were at any point of time a data file may add or
- change the number of columns of data and column names.
- Lock file.
- Arbitrary date reading.
- Use Cricket's configuration ConfigTree?????
- More configuration file defaults.
- Better date loading support.
- Make plots from multiple files sets: delete source files_key and put
- it into data.
- Update HTML files if a new file is found with a new group.
- Update orcallator.cfg.in for caching and proxy stuff.
-orcallator.se:
- Better documentation.
+
+
+
+Some notes from Paul Company <paul.company at plpt.com>:
+
+I'd create one graph for each and autoscale. That way you have system
+processes, httpd processes and a combination. All your bases are covered.
+
+Presenting data in a useful, meaningful way is an artform & is very
+difficult. What makes it an artform is the definitions of useful and
+meaningful are subjective. General rules of thumb:
+ + Know your audience.
+ + Know what you're measuring and why (definitions/goals).
+ + Know what the measurements mean.
+ aka., know what is good/bad/acceptable (limits/thresholds).
+ + Know how you're measuring.
+ aka., how reliable is your measurement?
+
+Graphs are just one way of presenting data.
+
+I definitely don't claim to be an expert of any kind in this area,
+but here are my preferences.
+
+Most resources have a max and min limit (this defines your range). I like
+to see the max value at the top of the y-axis and the min at the bottom.
+
+Most resources have a usage pattern (this defines your scale). I like
+to see autoscaling graphs which dynamically modify the top & bottom to
+show the points of activity. This is useful when the range is huge and
+the activity is localized to a small band within the huge range.
+
+For example,
+
+We have a Fractional T1 (384Kbps with 50% CIR) at my company and I use
+mrtg to monitor it. Because the range is small I use a fixed min & max,
+and a fixed linear scale of 1.
+ (1) x-axis is time
+ y-axis is Kbps w/ min=0
+ max=384kb
+ scale=1Kbps (linear)
+
+Assume a web site gets anywhere from 0 hits/second to 10Million hits
+per second. I would want multiple graphs depending on usage pattern:
+ (1) x-axis is time
+ y-axis is Kbps w/ min=0
+ max=10Million
+ scale=1Hit/s (linear)
+
+ (2) x-axis is time
+ y-axis is Kbps w/ min=0
+ max=10Million
+ scale=1-1000Hit/s (logarithmic)
+
+ (3) x-axis is time
+ y-axis is Kbps w/ min={min value of lowest usage, usually zero}
+ max={max value of highest usage}
+ scale=auto (multiple graphs with
+ appropriate range/scale)
+
+Bottom line is it would be nice if one could modify the various attributes
+of the graphs (range, scale, labels, title, ...) interactively. I realize
+the orca graphs are generated fixed PNG files. Just dreaming.
+
+Here are the things I'd like modified in orca, for my (audience)
+specific use.
+ + Definitions for all Data Sets which includes what is good and bad.
+ For example, is a 15-20% collision rate bad?
+ What is a Disk Busy Measure and is 95 a bad number?
+ Also, suggestions for what to do if things are bad.
+ + Finer resolution (more graphs) on each Data Set.
+ For example, a graph for each disk, when you click on that graph
+ you get a graph for each:
+ Bytes read
+ Bytes written
+ KBytes read
+ KBytes written
+ Average # of transactions waiting
+ Average # of transactions serviced
+ Reads issued
+ Writes issued
+ Average service time (milliseconds)
+ % of time spent waiting for service
+ % of time spent busy
+ + The ability to set thresholds (like virtual_adiran.se, zoom.se
+ or pure_test.se) and have those thresholds graphed as color
+ changes (red, amber, green etc.)
+ + System & Httpd Processes
+ Have 3 separate graphs as mentioned above.
+ + CPU Usage
+ Have multiprocessor support - separate graphs for each processor,
+ in addition to the combined graph.
+ + Packets Per Second
+ I'd like to know the definition of packet and maybe the
+ ave,min,max size. And maybe the packet types (IP, TCP,
+ UDP, ICMP).
+ + Errors Per Second
+ Possibly a graph per error type.
+ + Nocanput Rate
+ I'd like to know the definition of nocanput.
+ What is the unit on the y-axis. What does 3m mean?
+ + Collisions
+ Deferred Packet Rate
+ TCP Bits Per Second
+ TCP Segments Per Second
+ TCP Retransmission & Duplicate Received Percentage
+ TCP New Connection Rate
+ TCP Number Open Connections
+ TCP Reset Rate
+ TCP Attempt Fail Rate
+ TCP Listen Drop Rate
+ Should all be per interface AND cumulative.
+ + Page Residence Time
+ What's a good/bad/acceptable number?
+ How do you read this graph and relate it to pageouts
+ or swap thrashing.
+ Maybe we should plot the sr field of vmstat. p.329
+ + Page Usage
+ Unless you know how memory subsystems work,
+ this graph is hard to read. The only obvious
+ thing this graph tells you is if the Free List
+ is too small. The Free List can be fine, but you
+ can still have performance problems!
+ The Other & System Total labels are useless.
+ Detecting a swap problem (thrashing) would be more useful!
+ + Pages Locked & IO
+ This maps directly to the kernel page usage above.
+ It is redundant and therefore useless.
+ + Bits Per Second: <interface>
+ Doesn't work for all OS versions and/or NICs.
+ + Web Server Hit Rate, Web Server File Size, Web Server Data
+ Transfer Rate,
+ Web Server HTTP Error Rate
+ All don't seem to work!
+ Probably my fault, I'll take a closer look.
Modified: trunk/orca/INSTALL
==============================================================================
--- trunk/orca/INSTALL (original)
+++ trunk/orca/INSTALL Sat Jul 13 19:22:25 2002
@@ -1,191 +1,158 @@
Outline:
-1) Install Perl 5.005_0[23].
+ 1) Install Perl 5.004_01 or later.
-2) Decide where Orca's binaries, RRD, HTML, and orcallator directories
- will reside. Make sure performance concerns are handled.
+ 2) Decide where Orca's binaries, RRD, HTML, and orcallator directories
+ will reside. Make sure performance concerns are handled.
-3) Configure Orca.
+ 3) Determine which Perl modules need compiling and installing.
+ Optionally download newer versions of these modules.
-4) Make, test and install necessary Perl modules.
- b) Install Digest::MD5 version 2.00 or greater.
- a) Install Math::IntervalSearch version 1.00 or greater.
- c) Install RRDs version 0.99.29 or greater.
- d) Install Storable 0.603 or greater.
+ 4) Configure Orca.
-5) Make Orca.
+ 5) Make Orca and any necessary Perl modules.
-6) Install Orca.
+ 6) Test if the Perl modules properly compiled.
-7) [Optional] Install orcallator.
- a) If required, rename all percollator, percol and perc filenames to
- orcallator.
- b) Install the SE toolkit.
- c) Apply a patch to the SE 3.0 toolkit.
- d) Examine Orca/orcallator programs.
- e) Run start_orcallator on all systems.
- f) Edit orcallator.cfg.
- g) Run Orca.
+ 7) Doing an upgrade from Orca 0.23 or older? Follow these steps.
+ 8) Install any necessary Perl modules.
+ 9) Install Orca.
+10) Set the Unix process file descriptor limit to at least 256.
-1) Install Perl 5.005_0[23].
+11) [Solaris Only and Optional] Install orcallator.
+ a) Install the SE toolkit.
+ b) Apply a patch to the SE 3.0 toolkit if necessary.
+ c) Examine Orca/orcallator programs.
+ d) Run start_orcallator on all systems.
+ e) Edit orcallator.cfg.
- I have used only version 5.005_0[23] of Perl with Orca. Because Orca
- makes very heavy use of references, it may or may not work with older
- versions of Perl. I welcome feedback if Orca works with older Perls.
+12) Run Orca.
- This step is too large to go into here. The bottom line is to follow
- the instructions at
- http://language.perl.com/info/software.html
-2) Decide where Orca's binaries, RRD, HTML, and orcallator directories
- will reside. Make sure performance concerns are handled.
- First choose the location where Orca will be installed. By default,
- Orca will install into the following structure:
+ 1) Install Perl 5.004_01 or later.
- $prefix Prefix, set with --prefix=
- $prefix/bin Binaries, set with --bindir=
- $prefix/lib Libraries, set with --libdir=
- $prefix/man Manual pages, set with --mandir=
- $prefix/var/orca/rrd RRD directory, set with --with-rrd-dir
- $prefix/var/orca/orcallator Orcallator directory, set with --with-orcallator-dir
+ This step is too large to go into here. The bottom line is to follow
+ the instructions at
- By default $prefix is set to /usr/local. The -- arguments shown
- above should be given to the configure script described below which
- configures Orca. If you want to change the installation location of
- Orca, say into /opt/orca, you would do so by passing --prefix=/opt/orca
- to the configure script.
+ http://language.perl.com/info/software.html
- Because Orca is extremely IO intensive, I recommend that the host
- that locally mounts the web server content be the same machine that
- runs Orca. In addition, the RRD data files that Orca uses also
- require a good amount of IO. The machine running Orca should always
- have the $prefix/var/rrd directory locally mounted. For performance
- concerns it is more important this directory be locally stored than
- HTML directory where the resulting HTML and GIF files are written.
+ 2) Decide where Orca's binaries, RRD, HTML, and orcallator directories
+ will reside. Make sure performance concerns are handled.
- If you are going to use the orcallator Orca addon to monitor your
- Sun Solaris systems, then you will in addition need to decide where
- to have orcallator store its data files. By default, these data
- files are written to once every 5 minutes, so IO is not an issue.
- The issue here is that orcallator needs to run as root and all of
- the orcallator output files from all your hosts need to be written
- into the same NFS shared directory that Orca can read. It is not too
- important that the directory that orcallator writes into be mounted
- locally on the machine that Orca will run on, since Orca will only
- read each file every five minutes.
+ First choose the location where Orca will be installed. By default,
+ Orca will install into the following structure:
- If you are running orcallator on a system running a web, proxy, or
- Squid server, you can have orcallator watch the logs generated by
- these programs. In this case, note the location of the log file for
- the configure script.
+ $prefix Prefix, set with --prefix=
+ $prefix/bin Binaries, set with --bindir=
+ $prefix/lib Libraries, set with --libdir=
+ $prefix/man Manual pages, set with --mandir=
+ $prefix/var/orca/rrd RRD directory, set with --with-rrd-dir
+ $prefix/var/orca/orcallator Orcallator directory, set with --with-orcallator-dir
-3) Configure Orca.
+ The HTML output directory is not set by default and must be specified
+ by the Orca administrator.
- Now that you have decided where the RRD, HTML, and optionally the
- orcallator data files and the web server access logs, are located,
- run the configure script with the following arguments:
+ By default $prefix is set to /usr/local. The -- arguments shown
+ above should be given to the configure script described below
+ which configures Orca. If you want to change the installation
+ location of Orca, say into /opt/orca, you would do so by passing
+ --prefix=/opt/orca to the configure script.
- % ./configure --prefix=ORCA_PREFIX_DIRECTORY \
- --with-rrd-dir=RRD_DIR_LOCATION \
- --with-html-dir=HTML_DIR_LOCATION \
- --with-orcallator-dir=ORCALLATOR_DIR_LOCATION \
- --with-TYPE-log=LOG_LOCATION
+ Because Orca is extremely IO intensive, I recommend the following
+ architecture. Choose one host that can locally mount all the RRD data
+ files and the directory containing the HTML and image files that are
+ viewed by Orca users. If these two locations must be on separate
+ hosts and one directory must be NFS mounted to the Orca host, then
+ I recommend that the RRD data file be local instead of the HTML and
+ image files, since the RRD files are much more read/write intensive.
- If you choose nothing else, the --with-html-dir must always be used.
+ If you are going to use the orcallator Orca addon to monitor your
+ Sun Solaris systems, then you will in addition need to decide where
+ to have orcallator store its data files. By default, these data
+ files are written to once every 5 minutes, so IO is not an issue.
+ The issue here is that orcallator needs to run as root and all of
+ the orcallator output files from all your hosts need to be written
+ into the same NFS shared directory that Orca can read. It is not too
+ important that the directory that orcallator writes into be mounted
+ locally on the machine that Orca will run on, since Orca will only
+ read each file every five minutes.
- If you use a web, proxy, or Squid server, you can have orcallator
- gather statistics from the log file. Use this table to decide which
- configure option to use:
+ If you are running orcallator on a system running a web, proxy,
+ or Squid server, you can have orcallator watch the logs generated
+ by these programs. In this case, note the location of the log file
+ for the configure script.
- Log Type Configure Option
- -----------------------------------------------------------------
- NCSA/Common Log Format --with-ncsa-log=FILE
- Common Log Format with Proxy Information --with-proxy-log=FILE
- Squid Log Format --with-squid-log=FILE
+ 3) Determine which Perl modules need compiling and installing.
+ Optionally download newer versions of these modules.
- Configure will let you use only one of these --with-TYPE-log options.
+ Orca requires the following Perl modules at the specified versions:
- The configure script will find where your version of Perl and some
- other assorted programs are located. It will also determine if you
- have the necessary Perl modules to run Orca. If it does not find
- the required modules, the modules that are included with the Orca
- distribution will be built.
+ Name Required Version Included With Orca
+ -----------------------------------------------------------------------
+ Data::Dumper 2.101 or greater 2.101
+ Digest::MD5 2.00 or greater 2.09
+ Math::IntervalSearch 1.05 or greater 1.05
+ RRDs 1.0.7.2 or greater 1.0.7.2
+ Storable 0.6.3 or greater 0.6.5
-4) Make, test and install necessary Perl modules.
+ All five of these modules are included with the Orca distribution
+ in the packages directory. When you configure Orca in step 4),
+ configure will determine if you need any of these modules compiled
+ and installed. configure will then modify the packages/Makefile
+ file to only build those modules that need to be installed.
- Orca requires the following modules at the specified version number:
+ All of the modules except for Math::IntervalSearch require a compiler
+ and generate shared libraries by default.
- Name Required Version Included With Orca
- -----------------------------------------------------------------------
- Digest::MD5 version 2.00 or greater 2.07
- Math::IntervalSearch 1.00 or greater 1.02
- RRDs version 0.99.29 or greater 0.99.31
- Storable 0.603 or greater 0.603
+ If you wish to download and install modules that have been updated
+ since this Orca package has been assembled, please use the following
+ information.
- All four of these modules are included with the Orca distribution
- in the packages directory. When you configured Orca in step 3),
- configure should have determined if you need any of these modules
- installed in the version of Perl that configure found. configure will
- then modify the packages/Makefile file to only build those modules
- that need to be installed.
+ Data::Dumper
- All of the modules except for Math::IntervalSearch require a compiler
- and generate shared libraries by default.
+ http://www.perl.com/CPAN/authors/id/GSAR/Data-Dumper-2.101.tar.gz
- To make these modules run the following command:
-
- % make modules [ To optimize: make modules CFLAGS=-O ]
-
- To test if the modules are working properly, run the following command:
-
- % make test_modules
-
- To automatically install these modules into Perl run the following
- command:
-
- % make install_modules
-
- If you want newer version of these modules, get them from the following
- locations:
+ % gunzip -c Data-Dumper-2.101.tar.gz | tar xvf -
+ % cd Data-Dumper-2.101
+ % perl Makefile.PL
+ % make
+ % make test
+ % make install
- Math::IntervalSearch
+ Digest::MD5
- ftp://ftp.gps.caltech.edu/pub/blair/Perl/Math-Interpolate-1.02.tar.gz
- http://www.perl.com/CPAN/authors/id/B/BZ/BZAJAC/Math-Interpolate-1.02.tar.gz
+ http://www.perl.com/CPAN/authors/id/GAAS/Digest-MD5-2.09.tar.gz
- % gunzip -c Math-Interpolate-1.02.tar.gz | tar xvf -
- % cd Math-Interpolate-1.02
+ % gunzip -c Digest-MD5-2.09.tar.gz | tar xvf -
+ % cd Digest-MD5-2.09
% perl Makefile.PL
% make
% make test
% make install
- Digest::MD5
+ Math::IntervalSearch
- http://www.perl.com/CPAN/authors/id/GAAS/Digest-MD5-2.07.tar.gz
+ ftp://ftp.gps.caltech.edu/pub/blair/Perl/Math-Interpolate-1.05.tar.gz
+ http://www.perl.com/CPAN/authors/id/B/BZ/BZAJAC/Math-Interpolate-1.05.tar.gz
- % gunzip -c Digest-MD5-2.07.tar.gz | tar xvf -
- % cd Digest-MD5-2.07
+ % gunzip -c Math-Interpolate-1.05.tar.gz | tar xvf -
+ % cd Math-Interpolate-1.05
% perl Makefile.PL
% make
% make test
% make install
- RRDs
+ RRDs
http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
RRDs is the Perl module that comes with RRDtool, a package written
- by Tobias Oetiker. RRDtool contains a copy of the gd1.2 library
- and is installed automatically into the RRDtool shared library that
- is used by the RRDs Perl module. While gd1.3 exists, according
- to its README file it generates larger GIFs. I see no reason to
- link RRDtool with gd1.3.
+ by Tobias Oetiker.
% gunzip -c rrdtool-?.??.??.tar.gz | tar xvf -
% cd rrdtool-?.??.??
@@ -198,92 +165,232 @@
For large installations, I recommend that RRDs be compiled with
optimization turned on.
-5) Make Orca.
+ Storable
- Build Orca by running the following command:
+ http://www.perl.com/CPAN/authors/id/RAM/Storable-0.6.5.tar.gz
- % make
+ % gunzip -c Storable-0.6.5.tar.gz | tar xvf -
+ % cd Storable-0.6.5
+ % perl Makefile.PL
+ % make
+ % make test
+ % make install
-6) Install Orca.
+ 4) Configure Orca.
- Between version 0.20 and 0.21 of Orca, a major name change occurred in
- all of the installed and generated files. Any filenames containing
- percollator, percol, and perc had the name orcallator substituted in
- place. Percollator.se has been renamed to orcallator.se and its output
- files are now named orcallator. The default percollator.cfg has been
- renamed to orcallator.cfg and the version of orcallator.cfg included
- here now looks for data filenames of the form orcallator-1999-05-08
- and percol-1999-05-8. If you are running an Orca installation 0.20 or
- older and want to rename all of the files and directories in your Orca
- installation to the new scheme, then kill any running percollator.se's
- and Orca processes. Then run
+ Now that you have decided where the RRD, HTML, and optionally the
+ orcallator data files and the web server access logs, are located,
+ run the configure script with the following arguments:
+
+ % ./configure --prefix=ORCA_PREFIX_DIRECTORY \
+ --with-rrd-dir=RRD_DIR_LOCATION \
+ --with-html-dir=HTML_DIR_LOCATION \
+ --with-orcallator-dir=ORCALLATOR_DIR_LOCATION \
+ --with-TYPE-log=LOG_LOCATION
+
+ If you choose nothing else, the --with-html-dir must always be used,
+ otherwise configure will fail.
+
+ If you use a web, proxy, or Squid server, you can have orcallator
+ gather statistics from the log file. Use this table to decide which
+ configure option to use:
+
+ Log Type Configure Option
+ -----------------------------------------------------------------
+ NCSA/Common Log Format --with-ncsa-log=FILE
+ Common Log Format with Proxy Information --with-proxy-log=FILE
+ Squid Log Format --with-squid-log=FILE
+
+ Configure will let you use only one of these --with-TYPE-log options.
+
+ The configure script will find where your version of Perl and some
+ other assorted programs are located. It will also determine if you
+ have the necessary Perl modules to run Orca. If it does not find
+ the required modules, the modules that are included with the Orca
+ distribution will be built.
+
+ Configure will also determine if you run one of the operating
+ systems where a shared librrd.so library will be built and installed
+ in $libdir.
+
+ 5) Make Orca and any necessary Perl modules.
+
+ To make Orca and these Perl modules run the following command:
+
+ % make [ To optimize: make CFLAGS=-O or CFLAGS=-O3 ]
+
+ 6) Test if the Perl modules properly compiled.
+
+ To check if the Perl modules were properly compiled run the following
+ command:
+
+ % make test_modules
+
+ 7) Doing an upgrade from Orca 0.23 or older? Follow these steps.
+
+ Due to various changes to Orca between releases, many of the RRD,
+ HTML and image filenames that Orca creates have changed names.
+ Two separate issues exist.
+
+ The first is that the naming scheme for all generated HTML and image
+ (either PNG or GIF) files have changed. Unless you want to leave
+ files with old names around wasting disk space, I recommend you cd
+ into your HTML directories and delete all files there.
+
+ The second issue is that the RRD data files have also changed names
+ and unless you want to reload all of your source data files and
+ waste more disk space on unused RRD files, I suggest that you run
+ following command:
+
+ % make upgrade
+
+ This will look through the all of the directories that Orca will
+ install into and use (namely the $prefix, $exec_prefix, $bindir,
+ $libdir, $ORCALLATOR_DIR, and $RRD_DIR directories) and perform any
+ necessary file renaming.
+
+ If you have some new directories that are not included in the above
+ list directories that make upgrade will cover, you can run the
+ src/upgrage_installation program with a list of directories to parse
+ and rename. If you want to see what upgrage_installation will rename
+ without actually doing the rename, give it the -n option before any
+ directory names.
+
+ Here is a description of the various differences between versions.
+
+ 0.23 -> 0.24
+
+ The following substitutions are now done to create any RRD, HTML and
+ image files.
+
+ orcallator -> o
+ orca -> o
+ _percent -> _pct
+ _number -> _num
+ _times -> _X
+ # -> _num_
+ * -> _X_
+
+ 0.20 -> 0.21
+
+ Between version 0.20 and 0.21 of Orca, a major name change occurred
+ in all of the installed and generated files. Any filenames
+ containing percollator, percol, and perc had the name orcallator
+ substituted in place. Filenames containing the word percent are
+ properly protected and will not be renamed to contain the word
+ orcallatorent. Percollator.se has been renamed to
+ orcallator.se and its output files are now named orcallator.
+ The default percollator.cfg has been renamed to orcallator.cfg
+ and the version of orcallator.cfg included here now looks for data
+ filenames of the form orcallator-1999-05-08 and percol-1999-05-8.
+ If you are running an Orca installation 0.20 or older and want to
+ rename all of the files and directories in your Orca installation
+ to the new scheme, then kill any running percollator.se's before
+ installing and running the following commands
- % make migrate
+ 8) Install any necessary Perl modules.
- This will look through the all of the directories that Orca will
- install into and use (namely the $prefix, $exec_prefix, $bindir,
- $libdir, $ORCALLATOR_DIR, and $RRD_DIR directories) and perform any
- necessary file renaming. Filenamess containing the word percent will
- not have be modified to contain the word orcallatorent.
+ To automatically install these modules into Perl run the following
+ command:
+
+ % make install_modules
+
+ 9) Install Orca.
+
+ Run the following command to install Orca:
+
+ % make install
+
+ This may also install librrd.so in your $libdir.
+
+10) Set the Unix process file descriptor limit to at least 256.
+
+ Orca is designed to run with a minimum of 256 available file
+ descriptors. If under Unix your processes have a file descriptor
+ limit less than 256, then Orca may possibly fail.
- Now run the following command to install Orca:
+ To check your default file descriptor limit, on many Unix systems
+ you can run
- % make install
+ % ulimit -n
-7) [Optional] Install orcallator.
- a) Install the SE toolkit.
+ If this number is less than 256, then you'll need to increase your
+ limit. This can be accomplished using the limit or ulimit command
+ in your shell, depending upon which shell you use. See man (1)
+ ulimit or man (1) limit.
- Perform the installation instructions as listed on the web page
+ If you are running a C shell equivalent, such as csh or tcsh, then
+ you can run
+
+ % limit descriptors 256
+
+ If you have a Bourne shell equivalent, such as sh, ksh, bash, you
+ can run
+
+ % ulimit -n 256
+
+ This command should either be placed in a .login, .profile, .cshrc
+ file or run just before Orca is run.
+
+11) [Solaris Only and Optional] Install orcallator.
+ a) Install the SE toolkit.
+
+ Perform the installation instructions as listed on the web page
http://www.sun.com/sun-on-net/performance/se3/
- If you are running 2.6 or greater, then download SE 3.1 or greater.
- Otherwise you will need SE 3.0.
+ If you are running 2.6 or greater, then download SE 3.1 or greater.
+ Otherwise you will need SE 3.0.
- b) Apply a patch to the SE 3.0 toolkit. If you are running any other
- release of SE, then do not install the patch.
+ b) Apply a patch to the SE 3.0 toolkit. If you are running any other
+ release of SE, then do not install the patch.
- By default the SE toolkit will install into /opt/RICHPse.
- Run this command:
+ By default the SE toolkit will install into /opt/RICHPse.
+ Run this command:
- % cd /opt/RICHPse
- % patch -s < THIS_DIR/patches/p_netstat_class.se.diff
+ % cd /opt/RICHPse % patch -s <
+ THIS_DIR/patches/p_netstat_class.se.diff
- c) Examine Orca/orcallator programs.
+ c) Examine Orca/orcallator programs.
- Orca's installation scripts also installs several programs and
- configuration files necessary to have Orca monitor many different
- statistics of your Sun Solaris systems.
+ Orca's installation scripts also installs several programs and
+ configuration files necessary to have Orca monitor many different
+ statistics of your Sun Solaris systems.
- The following tools are installed in the $prefix/bin directory:
+ The following tools are installed in the $prefix/bin directory:
start_orcallator - start orcallator on a system
- stop_precol - stop orcallator on a system
+ stop_orcallator - stop orcallator on a system
restart_orcallator - restart orcallator on a system
orcallator_column - print selected columns from orcallator output
orcallator_running - run to see if any orcallators are not running
- d) Run start_orcallator on all systems.
+ d) Run start_orcallator on all systems.
+
+ Log in as root on all the systems you want to watch and run:
+
+ % $prefix/bin/start_orcallator
- Log in as root on all the systems you want to watch and run:
+ Orcallator will not generate an output data file until the first
+ update interval, which will be between 2.5 to 7.5 minutes after
+ orcallator is started.
- % $prefix/bin/start_orcallator
+ e) Edit orcallator.cfg.
- Orcallator will not generate an output data file until the first
- update interval, which will be between 2.5 to 7.5 minutes after
- orcallator is started.
+ You need to edit the installed orcallator.cfg file and remove
+ all unneeded references. In particular, you'll want to change
+ warn_email, which is the email address that receives emails when
+ orcallator generated files are out of date, which may signify a
+ orcallator program that has died and is no longer gathering data.
- e) Edit orcallator.cfg.
+12) Run Orca.
- You need to edit the installed orcallator.cfg file and remove
- all unneeded references. In particular, you'll want to change
- warn_email, which is the email address that receives emails when
- orcallator generated files are out of date, which may signify a
- orcallator program that has died and is no longer gathering data.
+ Log into the system that will run Orca and run the command:
- f) Run Orca.
+ % cd $prefix
+ % ./bin/orca -v CONFIG_FILE
- Log into the system that will run Orca and run the command:
+ If you are using orcallator.se, then this command will be
- % cd $prefix
- % ./bin/orca -v lib/orcallator.cfg
+ % cd $prefix
+ % ./bin/orca -v lib/orcallator.cfg
Modified: trunk/orca/lib/Makefile.in
==============================================================================
--- trunk/orca/lib/Makefile.in (original)
+++ trunk/orca/lib/Makefile.in Sat Jul 13 19:22:25 2002
@@ -6,11 +6,7 @@
MKDIR = @MKDIR@
INSTALL = @INSTALL@
-all: orcallator.cfg orca.gif.hex rrdtool.gif.hex
-
-orcallator.cfg: orcallator.cfg.in
- (cd ..; ./config.status)
- $(MAKE)
+all: orca.gif.hex rrdtool.gif.hex
# Create a hex file representation of orca.gif that can be stored inside
# orca.pl.
@@ -23,13 +19,12 @@
perl -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
install: all
- $(MKDIR) $(libdir)
- -cp -p $(libdir)/orcallator.cfg $(libdir)/orcallator.cfg.`date +%Y-%m-%d-%H:%M:%S`
- $(INSTALL) -m 0644 orcallator.cfg $(libdir)
- $(INSTALL) -m 0644 orcallator.se $(libdir)
clean:
- $(RM) orcallator.cfg
distclean: clean
$(RM) Makefile
+
+Makefile: Makefile.in
+ cd .. && CONFIG_FILES=lib/Makefile ./config.status
+ $(MAKE)
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Sat Jul 13 19:22:25 2002
@@ -1,7 +1,7 @@
# This file is an input file used by the GNU "autoconf" program to
# generate the file "configure", which is run during Borp installation
# to configure the system for the local environment.
-AC_INIT(src/orca.pl)
+AC_INIT(src/orca.pl.in)
AC_CONFIG_AUX_DIR(config)
AC_CANONICAL_SYSTEM
@@ -11,11 +11,16 @@
AC_SUBST(CONFIGURE_COMMAND_LINE)
# Define the directories containing packages that Orca makes use of here.
-# The path packages gets added where necessary.
-DIGEST_MD5_DIR=Digest-MD5-2.07
-MATH_INTERPOLATE_DIR=Math-Interpolate-1.02
-RRDTOOL_DIR=rrdtool-0.99.31
-STORABLE_DIR=Storable-0.6 at 3
+# The directory name packages where these packages are distributed with
+# Orca gets added where necessary.
+COMPRESS_ZLIB_DIR=Compress-Zlib-1.05
+DATA_DUMPER_DIR=Data-Dumper-2.101
+DIGEST_MD5_DIR=Digest-MD5-2.09
+MATH_INTERPOLATE_DIR=Math-Interpolate-1.05
+RRDTOOL_DIR=rrdtool-1.0.7.2
+STORABLE_DIR=Storable-0.6.5
+AC_SUBST(COMPRESS_ZLIB_DIR)
+AC_SUBST(DATA_DUMPER_DIR)
AC_SUBST(DIGEST_MD5_DIR)
AC_SUBST(MATH_INTERPOLATE_DIR)
AC_SUBST(RRDTOOL_DIR)
@@ -81,7 +86,7 @@
)`
AC_SUBST(ORCALLATOR_DIR)
-WATCH_HTTPD=
+WATCH_WEB=
NCSA_LOG=
AC_ARG_WITH(ncsa-log,
[ --with-ncsa-log=FILE location of the NCSA style web server access log],
@@ -92,7 +97,7 @@
;;
*) WEB_LOG="$withval"
NCSA_LOG=yes
- WATCH_HTTPD="-DWATCH_HTTPD"
+ WATCH_WEB="-DWATCH_WEB"
;;
esac
]
@@ -111,7 +116,7 @@
;;
*) WEB_LOG="$withval"
PROXY_LOG=yes
- WATCH_HTTPD="-DWATCH_HTTPD -DWATCH_PROXY"
+ WATCH_WEB="-DWATCH_WEB -DWATCH_PROXY"
;;
esac
]
@@ -131,13 +136,12 @@
AC_MSG_ERROR([*** You must supply an argument to the --with-squid-log option.])
;;
*) WEB_LOG="$withval"
- WATCH_HTTPD="-DWATCH_HTTPD -DWATCH_SQUID"
+ WATCH_WEB="-DWATCH_WEB -DWATCH_SQUID"
;;
esac
]
)
-
-AC_SUBST(WATCH_HTTPD)
+AC_SUBST(WATCH_WEB)
AC_SUBST(WEB_LOG)
# To get a default CFLAGS for this build, check for a C compiler. This
@@ -146,14 +150,16 @@
AC_PROG_MAKE_SET
AC_ARG_PROGRAM
-AC_PATH_PROGS(AWK,mawk gawk nawk awk)
+AC_PATH_PROG(BZIP2, bzip2)
+AC_PATH_PROG(BUNZIP2, bunzip2)
+AC_PATH_PROG(COMPRESS, compress)
AC_PATH_PROG(CUT, cut, cut)
AC_PATH_PROG(EXPR, expr, expr)
-AC_PATH_PROG(SE, se,,/opt/RICHPse/bin:$PATH)
-AC_PATH_PROG(UNAME, uname, uname)
+AC_PATH_PROG(GZIP, gzip)
+AC_PATH_PROG(GUNZIP, gunzip)
+AC_PATH_PROGS(AWK, mawk gawk nawk awk)
# Include the file that defines BORP_PERL_RUN.
-sinclude(config/acinclude.m4)
AC_PATH_PROG(PERL, perl, NOT_FOUND)
if test "x$PERL" = "xNOT_FOUND"; then
AC_MSG_ERROR([*** Perl not found. Please install Perl. See INSTALL how to do this.])
@@ -163,46 +169,128 @@
PERL_HEAD="../config/$PERL_HEAD"
AC_SUBST(PERL_HEAD)
-# Check for necessary Perl modules.
+AC_PATH_PROG(UNAME, uname, uname)
+AC_PATH_PROG(UNCOMPRESS, uncompress)
+
+# Determine the correct flags to compress files depending upon the compress
+# programs available.
+COMPRESSOR=
+UNCOMPRESSOR_PIPE=
+if test -n "$BZIP2" -a -n "$BUNZIP2"; then
+ COMPRESSOR="$BZIP2 -9"
+ UNCOMPRESSOR_PIPE="$BUNZIP2 -c"
+elif test -n "$GZIP" -a -n "$GUNZIP"; then
+ COMPRESSOR="$GZIP -9"
+ UNCOMPRESSOR_PIPE="$GUNZIP -c"
+elif test -n "$COMPRESS" -a -n "$UNCOMPRESS"; then
+ COMPRESSOR="$COMPRESS"
+ UNCOMPRESSOR_PIPE="$UNCOMPRESS -c"
+fi
+AC_SUBST(COMPRESSOR)
+AC_SUBST(UNCOMPRESSOR_PIPE)
+
+# Now we check for those portions of Orca that should be built and set
+# up for installation. The first step is to check for operating system
+# specific modules. For Solaris hosts, orcallator.se is built and
+# installed. This requires the additional building of a librrd.so
+# installed in libdir. Then we check for the proper Perl modules.
+AC_MSG_CHECKING([for solaris host for orcallator install])
+case "$target" in
+ *-solaris*)
+ BUILD_ORCALLATOR=yes
+ ORCALLATOR_SUBDIR=orcallator
+ # Add --enable-shared to the configure options for RRDtool if it is
+ # not already declared.
+ expr "$CONFIGURE_COMMAND_LINE" : "--enable-shared" >/dev/null 2>&1 || CONFIGURE_COMMAND_LINE="$CONFIGURE_COMMAND_LINE --enable-shared"
+
+ INSTALL_LIB_RRDTOOL=install_lib_rrdtool
+ MAKE_RRDTOOL=make_rrdtool
+ TEST_RRDTOOL=test_rrdtool
+ INSTALL_PERL_RRDTOOL=
+ CLEAN_RRDTOOL=clean_rrdtool
+ DISTCLEAN_RRDTOOL=distclean_rrdtool
+ ;;
+ *)
+ INSTALL_LIB_RRDTOOL=
+ BUILD_ORCALLATOR=no
+ ORCALLATOR_SUBDIR=
+ ;;
+esac
+AC_SUBST(ORCALLATOR_SUBDIR)
+AC_SUBST(INSTALL_LIB_RRDTOOL)
+
+AC_MSG_RESULT($BUILD_ORCALLATOR)
+if test "$BUILD_ORCALLATOR" = "yes"; then
+ AC_PATH_PROG(SE, se,,$PATH:/opt/RICHPse/bin)
+fi
+
+dnl BORP_PERL_MODULE(borp_cv_perl_compress_zlib, $PERL, Compress::Zlib, 1.05)
+if test "$borp_cv_perl_compress_zlib" = no; then
+ MAKE_COMPRESS_ZLIB=make_compress_zlib
+ TEST_COMPRESS_ZLIB=test_compress_zlib
+ INSTALL_PERL_COMPRESS_ZLIB=install_perl_compress_zlib
+ CLEAN_COMPRESS_ZLIB=clean_compress_zlib
+ DISTCLEAN_COMPRESS_ZLIB=distclean_compress_zlib
+fi
+AC_SUBST(MAKE_COMPRESS_ZLIB)
+AC_SUBST(TEST_COMPRESS_ZLIB)
+AC_SUBST(INSTALL_PERL_COMPRESS_ZLIB)
+AC_SUBST(CLEAN_COMPRESS_ZLIB)
+AC_SUBST(DISTCLEAN_COMPRESS_ZLIB)
+
+BORP_PERL_MODULE(borp_cv_perl_data_dumper, $PERL, Data::Dumper, 2.101)
+if test "$borp_cv_perl_data_dumper" = no; then
+ MAKE_DATA_DUMPER=make_data_dumper
+ TEST_DATA_DUMPER=test_data_dumper
+ INSTALL_PERL_DATA_DUMPER=install_perl_data_dumper
+ CLEAN_DATA_DUMPER=clean_data_dumper
+ DISTCLEAN_DATA_DUMPER=distclean_data_dumper
+fi
+AC_SUBST(MAKE_DATA_DUMPER)
+AC_SUBST(TEST_DATA_DUMPER)
+AC_SUBST(INSTALL_PERL_DATA_DUMPER)
+AC_SUBST(CLEAN_DATA_DUMPER)
+AC_SUBST(DISTCLEAN_DATA_DUMPER)
+
BORP_PERL_MODULE(borp_cv_perl_digest_md5, $PERL, Digest::MD5, 2.00)
if test "$borp_cv_perl_digest_md5" = no; then
MAKE_DIGEST_MD5=make_digest_md5
TEST_DIGEST_MD5=test_digest_md5
- INSTALL_DIGEST_MD5=install_digest_md5
+ INSTALL_PERL_DIGEST_MD5=install_perl_digest_md5
CLEAN_DIGEST_MD5=clean_digest_md5
DISTCLEAN_DIGEST_MD5=distclean_digest_md5
fi
AC_SUBST(MAKE_DIGEST_MD5)
AC_SUBST(TEST_DIGEST_MD5)
-AC_SUBST(INSTALL_DIGEST_MD5)
+AC_SUBST(INSTALL_PERL_DIGEST_MD5)
AC_SUBST(CLEAN_DIGEST_MD5)
AC_SUBST(DISTCLEAN_DIGEST_MD5)
-BORP_PERL_MODULE(borp_cv_perl_math_interpolate, $PERL, Math::Interpolate, 1.00)
+BORP_PERL_MODULE(borp_cv_perl_math_interpolate, $PERL, Math::Interpolate, 1.04)
if test "$borp_cv_perl_math_interpolate" = no; then
MAKE_MATH_INTERPOLATE=make_math_interpolate
TEST_MATH_INTERPOLATE=test_math_interpolate
- INSTALL_MATH_INTERPOLATE=install_math_interpolate
+ INSTALL_PERL_MATH_INTERPOLATE=install_perl_math_interpolate
CLEAN_MATH_INTERPOLATE=clean_math_interpolate
DISTCLEAN_MATH_INTERPOLATE=distclean_math_interpolate
fi
AC_SUBST(MAKE_MATH_INTERPOLATE)
AC_SUBST(TEST_MATH_INTERPOLATE)
-AC_SUBST(INSTALL_MATH_INTERPOLATE)
+AC_SUBST(INSTALL_PERL_MATH_INTERPOLATE)
AC_SUBST(CLEAN_MATH_INTERPOLATE)
AC_SUBST(DISTCLEAN_MATH_INTERPOLATE)
-BORP_PERL_MODULE(borp_cv_perl_rdds, $PERL, RRDs, 0.99029)
+BORP_PERL_MODULE(borp_cv_perl_rdds, $PERL, RRDs, 1.000072)
if test "$borp_cv_perl_rdds" = no; then
MAKE_RRDTOOL=make_rrdtool
TEST_RRDTOOL=test_rrdtool
- INSTALL_RRDTOOL=install_rrdtool
+ INSTALL_PERL_RRDTOOL=install_perl_rrdtool
CLEAN_RRDTOOL=clean_rrdtool
DISTCLEAN_RRDTOOL=distclean_rrdtool
fi
AC_SUBST(MAKE_RRDTOOL)
AC_SUBST(TEST_RRDTOOL)
-AC_SUBST(INSTALL_RRDTOOL)
+AC_SUBST(INSTALL_PERL_RRDTOOL)
AC_SUBST(CLEAN_RRDTOOL)
AC_SUBST(DISTCLEAN_RRDTOOL)
@@ -210,17 +298,16 @@
if test "$borp_cv_perl_storable" = no; then
MAKE_STORABLE=make_storable
TEST_STORABLE=test_storable
- INSTALL_STORABLE=install_storable
+ INSTALL_PERL_STORABLE=install_perl_storable
CLEAN_STORABLE=clean_storable
DISTCLEAN_STORABLE=distclean_storable
fi
AC_SUBST(MAKE_STORABLE)
AC_SUBST(TEST_STORABLE)
-AC_SUBST(INSTALL_STORABLE)
+AC_SUBST(INSTALL_PERL_STORABLE)
AC_SUBST(CLEAN_STORABLE)
AC_SUBST(DISTCLEAN_STORABLE)
-
# Define the INSTALL and MKDIR variables to point to the scripts in
# the config directory.
INSTALL="../config/install-sh -c"
@@ -230,29 +317,34 @@
#--------------------------------------------------------------------
# Generate the Makefiles and shell scripts with the
-# variable substitution.
+# variable substitutions.
#--------------------------------------------------------------------
+if test "$BUILD_ORCALLATOR" = "yes"; then
+ ORCALLATOR_OUTPUT="orcallator/orcallator.cfg
+ orcallator/orcallator_running.pl
+ orcallator/restart_orcallator.sh
+ orcallator/start_orcallator.sh
+ orcallator/stop_orcallator.sh
+ orcallator/Makefile"
+fi
+
AC_OUTPUT(config/PerlHead1
config/PerlHead2
+ lib/Makefile
packages/Makefile
- src/orcallator_running.pl
- src/restart_orcallator.sh
- src/start_orcallator.sh
- src/stop_orcallator.sh
+ src/orca.pl
src/Makefile
- lib/orcallator.cfg
- lib/Makefile
+ $ORCALLATOR_OUTPUT
docs/Makefile
Makefile)
-if test "$borp_cv_perl_rdds" != "yes"; then
- echo ""
- echo "Running configure in packages/$RRDTOOL_DIR to create RRDtool and RRDs.pm."
- echo ""
- echo "(cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)"
- echo ""
- (cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)
-fi
+command="(cd packages/$RRDTOOL_DIR; ./configure $CONFIGURE_COMMAND_LINE --cache-file=../../config.cache)"
+echo ""
+echo "Running configure in packages/$RRDTOOL_DIR to create RRDtool and RRDs.pm."
+echo ""
+echo $command
+echo ""
+eval $command
if test -z "$WEB_LOG"; then
AC_MSG_WARN([*** Unless you use a --with-*-log option you will not gather WWW log data.])
Modified: trunk/orca/src/Makefile.in
==============================================================================
--- trunk/orca/src/Makefile.in (original)
+++ trunk/orca/src/Makefile.in Sat Jul 13 19:22:25 2002
@@ -8,11 +8,11 @@
PERL_HEAD = @PERL_HEAD@
ORCALLATOR_DIR = @ORCALLATOR_DIR@
RRD_DIR = @RRD_DIR@
-PERL_SCRIPTS = orcallator_running orca orcallator_column
-SHELL_SCRIPTS = restart_orcallator stop_orcallator start_orcallator
+PERL_SCRIPTS = orca upgrade_installation
+SHELL_SCRIPTS =
TARGETS = $(PERL_SCRIPTS) $(SHELL_SCRIPTS)
-all: $(TARGETS) migrate_to_orcallator
+all: $(TARGETS)
install: all
$(MKDIR) $(bindir)
@@ -21,14 +21,14 @@
$(INSTALL) $$file $(bindir); \
done
-migrate: migrate_to_orcallator
- ./migrate_to_orcallator $(prefix) $(exec_prefix) $(bindir) $(libdir) $(ORCALLATOR_DIR) $(RRD_DIR)
+upgrade: upgrade_installation
+ ./upgrade_installation $(prefix) $(exec_prefix) $(bindir) $(libdir) $(ORCALLATOR_DIR) $(RRD_DIR)
clean:
$(RM) $(TARGETS)
distclean: clean
- $(RM) *.sh orcallator_running.pl Makefile
+ $(RM) *.sh orca.pl Makefile
.SUFFIXES: .pl .sh
@@ -41,21 +41,8 @@
chmod 0755 $@
Makefile: Makefile.in
- (cd ..; ./config.status)
+ cd .. && CONFIG_FILES=src/Makefile ./config.status
$(MAKE)
-orcallator_running.pl: orcallator_running.pl.in
- (cd ..; ./config.status)
- $(MAKE)
-
-restart_orcallator.sh: restart_orcallator.sh.in
- (cd ..; ./config.status)
- $(MAKE)
-
-start_orcallator.sh: start_orcallator.sh.in
- (cd ..; ./config.status)
- $(MAKE)
-
-stop_orcallator.sh: stop_orcallator.sh.in
- (cd ..; ./config.status)
- $(MAKE)
+orca.pl: orca.pl.in
+ cd .. && CONFIG_FILES=src/orca.pl ./config.status
Modified: trunk/orca/src/upgrade_installation.pl
==============================================================================
--- trunk/orca/src/upgrade_installation.pl (original)
+++ trunk/orca/src/upgrade_installation.pl Sat Jul 13 19:22:25 2002
@@ -1,5 +1,8 @@
-# migrate_to_orcallator: migrate from a percollator named installation to
-# an orcallator named install.
+# upgrade_installation: Upgrade and rename any files to the latest
+# installation of Orca:
+#
+# 1) Migrate from a percollator named installation to orcallator.
+# 2) Rename all files with * in them to _times_.
#
# Copyright (C) 1999 Blair Zajac and GeoCities, Inc.
@@ -8,6 +11,14 @@
$| = 1;
+# Check if there is an argument -n, in which case the rename will be
+# shown but not done.
+my $rename = 1;
+if (@ARGV and $ARGV[0] eq '-n') {
+ $rename = 0;
+ shift;
+}
+
# Take a list of directories and rename every file in the directory using
# the following translation in the following order:
# percollator -> orcallator
@@ -21,14 +32,30 @@
sub rename {
my $old_name = $_;
my $new_name = $_;
- $new_name =~ s/percent/\200/g;
- $new_name =~ s/percollator/orcallator/g;
- $new_name =~ s/percol/orcallator/g;
- $new_name =~ s/perc/orcallator/g;
- $new_name =~ s/\200/percent/g;
+ $new_name =~ s:percent:\200:g;
+ $new_name =~ s:percollator:orcallator:g;
+ $new_name =~ s:percol:orcallator:g;
+ $new_name =~ s:perc:orcallator:g;
+ $new_name =~ s:_{2,}:_:g;
+ $new_name =~ s:\200:percent:g;
+
+ # This name change was released between 0.23 and 0.24.
+ $new_name =~ s:\*:_times_:g;
+
+ # These are the final 0.24 names.
+ $new_name =~ s:_percent([\W_]):_pct$1:g;
+ $new_name =~ s:_number([\W_]):_num$1:g;
+ $new_name =~ s:_times([\W_]):_X$1:g;
+
+ # Be careful not to rename filenames exactly named orcallator or orca.
+ $new_name =~ s:orcallator_:o_:g;
+ $new_name =~ s:orca_:o_:g;
+
if ($old_name ne $new_name) {
- print "Renaming $File::Find::dir/$old_name\n";
- rename("$File::Find::dir/$old_name", "$File::Find::dir/$new_name") or
- warn "$0: cannot rename `$File::Find::dir/$old_name': $!\n";
+ print "$File::Find::name -> $new_name\n";
+ if ($rename) {
+ rename($old_name, $new_name) or
+ warn "$0: cannot rename $old_name: $!\n";
+ }
}
}
Modified: trunk/orca/src/orca.pl.in
==============================================================================
--- trunk/orca/src/orca.pl.in (original)
+++ trunk/orca/src/orca.pl.in Sat Jul 13 19:22:25 2002
@@ -1,23 +1,41 @@
-# Orca: display arbitrary data from files onto web pages using RRD.
+# Orca: display arbitrary data from files onto web pages using RRDtool.
#
-# Copyright (C) 1998, 1999 Blair Zajac and GeoCities, Inc.
+# Copyright (C) 1998, 1999 Blair Zajac and Yahoo!, Inc.
use strict;
-require 5.005;
+require 5.004_01;
$| = 1;
+# Set the location of the Orca modules.
+BEGIN {
+# my $prefix = "@prefix@";
+# my $exec_prefix = "@exec_prefix@";
+# my $libdir = "@libdir@";
+# unshift(@INC, $libdir);
+}
+
use Carp;
-use Digest::MD5 2.00 qw(md5);
-use Math::IntervalSearch 1.00 qw(interval_search);
-use Data::Dumper;
+
+# Load any modules that have required version numbers here in
+# addition to the loading of the modules in the other Orca
+# modules to keep all the requiste numbers here.
+use Data::Dumper 2.101;
+use Digest::MD5 2.00 qw(md5_base64);
+use Math::IntervalSearch 1.05 qw(interval_search);
+use Storable 0.603;
+use RRDs 1.000072;
+
+# Set behavior of the Data::Dumper module.
$Data::Dumper::Indent = 1;
$Data::Dumper::Purity = 1;
$Data::Dumper::Deepcopy = 1;
# This is the version of Orca.
use vars qw($VERSION);
-$VERSION = '0.23';
+$VERSION = '0.24';
+
+my $IMAGE_SUFFIX = 'png';
# This is the version number used in creating the DS names in RRDs.
# This should be updated any time a new version of Orca needs some new
@@ -48,13 +66,13 @@
# be exactly the same as the RRA definitions, but they can be. Here
# create a quarterly plot (100 days) between the monthly and yearly
# plots. Only update the quarterly plot daily. The last array here
-# holds the number of days back in time to plot in the GIF. Be
+# holds the number of days back in time to plot in the image. Be
# careful to not increase this so much that the number of data points
-# to plot are greater than the number of pixels available for the GIF,
+# to plot are greater than the number of pixels available for the image,
# otherwise there will be a 30% slowdown due to a reduction
# calculation to resample the data to the lower resolution for the
# plot. For example, with 40 days of 2 hour data, there are 480 data
-# points. For no slowdown to occur, the GIF should be atleast 481
+# points. For no slowdown to occur, the image should be atleast 481
# pixels wide.
my @gif_plot_type = (@rra_plot_type[0..2], 'quarterly', $rra_plot_type[3]);
my @gif_pdp_count = (@rra_pdp_count[0..2], @rra_pdp_count[3, 3]);
@@ -65,6 +83,7 @@
my $opt_verbose = 0;
my $opt_once_only = 0;
my $opt_rrd_update_only = 0;
+my $opt_generate_gifs = 0;
# Set up a signal handler to force looking for new files.
my $force_find_files = 0;
@@ -85,7 +104,10 @@
$bottom = '' unless defined $bottom;
local *FD;
- open(FD, "> $filename") or return;
+ unless (open(FD, "> $filename.htm")) {
+ warn "$0: cannot open `$filename.htm' for writing: $!\n";
+ return;
+ }
print FD <<END;
<html>
@@ -138,8 +160,11 @@
</html>
END
+ my $filename = "$self->{_filename}";
close($self->{_handle}) or
- warn "$0: warning: cannot close `$self->{_filename}': $!\n";
+ warn "$0: warning: cannot close `$filename.htm': $!\n";
+ rename("$filename.htm", $filename) or
+ warn "$0: cannot rename `$filename.htm' to `$filename': $!\n";
}
package Orca::OpenFileHash;
@@ -171,6 +196,17 @@
local *FD;
+ # Uncompress compressed files on the fly and read them in.
+ if ($filename =~ /\.gz$/) {
+ $filename = "gunzip -c $filename |";
+ }
+ elsif ($filename =~ /\.Z$/) {
+ $filename = "uncompress -c $filename |";
+ }
+ elsif ($filename =~ /\.bz2$/) {
+ $filename = "bunzip2 -c $filename |";
+ }
+
unless (open(FD, $filename)) {
warn "$0: warning: cannot open `$filename' for reading: $!\n";
return;
@@ -211,7 +247,16 @@
return $self unless defined $self->{_hash}{$filename};
my $close_value = close($self->{_hash}{$filename}{fd});
- $close_value or warn "$0: warning: cannot close `$filename': $!\n";
+ # Only print a warning on the close if the close failed and the file
+ # descriptor is not a pipe.
+ unless ($close_value) {
+ if ($filename =~ /\|$/) {
+ warn "$0: warning: cannot close pipe `$filename': [$close_value \$?=$?] $!\n" if $opt_verbose > 1;
+ }
+ else {
+ warn "$0: warning: cannot close `$filename': [$close_value] $!\n";
+ }
+ }
my $weight = $self->{_hash}{$filename}{weight};
delete $self->{_hash}{$filename};
@@ -401,14 +446,14 @@
$result;
}
-package Orca::GIFFile;
+package Orca::ImageFile;
-use RRDs 0.99029;
+use RRDs;
use Carp;
sub new {
unless (@_ == 11) {
- confess "$0: Orca::GIFFile::new passed incorrect number of arguments.\n";
+ confess "$0: Orca::ImageFile::new passed incorrect number of arguments.\n";
}
my ($class,
@@ -424,15 +469,15 @@
$my_rrds_ref) = @_;
unless (@$my_rrds_ref) {
- confess "$0: Orca::GIFFile::new passed empty \@rrds_ref reference.\n";
+ confess "$0: Orca::ImageFile::new passed empty \@rrds_ref reference.\n";
}
unless ($name) {
- confess "$0: Orca::GIFFile::new passed empty \$name.\n";
+ confess "$0: Orca::ImageFile::new passed empty \$name.\n";
}
# Remove any special characters from the unique name and do some
# replacements.
- $name = &::strip_key_name($name);
+ $name = &::escape_name($name);
# Create the paths to the html directory and subdirectories.
my $html_dir = $config_options->{html_dir};
@@ -456,7 +501,7 @@
_all_rrd_ref => $rrd_data_files_ref,
_my_rrd_list => [ &::unique(@$my_rrds_ref) ],
_plot_ref => $plot_ref,
- _expire => $config_options->{expire_gifs},
+ _expire => $config_options->{expire_images},
_gif_height => 0,
_gif_width => 0,
_graph_options => []
@@ -466,14 +511,14 @@
my $interval = int($config_files->{$files_key}{interval}+0.5);
for (my $i=0; $i<@gif_plot_type; ++$i) {
# Load the data that helps this class determine if a particular
- # GIF file, such as the daily GIF, is current or needs to be
+ # image file, such as the daily image, is current or needs to be
# created or recreated. The data saved is the Unix epoch file
# modification time. If the file does not exist or the file
# modification time is newer than the time of te last data point
# entered, then save a file modification time of -1 which will
- # definitely cause the GIF to be recreated.
+ # definitely cause the image to be recreated.
my $plot_type = $gif_plot_type[$i];
- my @stat = stat("$gif_basename-$plot_type.gif");
+ my @stat = stat("$gif_basename-$plot_type.$IMAGE_SUFFIX");
if (@stat and $stat[9] <= $plot_end_time) {
$self->{"_${plot_type}_update_time"} = $stat[9];
}
@@ -485,6 +530,13 @@
my $gif_pdp_count = int($gif_pdp_count[$i]*300.0/$interval + 0.5);
$gif_pdp_count = 1 if $gif_pdp_count < 1;
$self->{"_${plot_type}_plot_age"} = $gif_pdp_count*$interval;
+
+ # Generate the unique plot title cotaining the period title
+ # for this plot.
+ $self->{"_${plot_type}_legend"} =
+ &::Capatialize($plot_type) .
+ ' ' .
+ ::replace_group_name($plot_ref->{title}, $group);
}
$self->_update_graph_options;
@@ -499,8 +551,9 @@
# Create the options for RRDs::graph that do not change across any
# invocations of RRDs::graph.
my @options = (
- '-t', ::replace_group_name($plot_ref->{title}, $group),
- '-v', ::replace_group_name($plot_ref->{y_legend}, $group)
+ '-a', 'PNG',
+ '-v', ::replace_group_name($plot_ref->{y_legend}, $group),
+ '-b', $plot_ref->{base}
);
# Add the lower-limit and upper-limit flags if defined.
if (defined $plot_ref->{plot_min}) {
@@ -512,6 +565,15 @@
if (defined $plot_ref->{rigid_min_max}) {
push(@options, '-r');
}
+ if (defined $plot_ref->{logarithmic}) {
+ push(@options, '-o');
+ }
+
+ # By default create PNG files.
+ unless ($opt_generate_gifs) {
+ push(@options, '-a', 'PNG');
+ }
+
my $data_sources = @{$self->{_my_rrd_list}};
for (my $i=0; $i<$data_sources; ++$i) {
my $rrd_key = $self->{_my_rrd_list}[$i];
@@ -535,17 +597,17 @@
}
# Force a break between the plot legend and comments.
- push(@options, 'COMMENT:\s',);
+ push(@options, 'COMMENT:\s', 'COMMENT:\s', 'COMMENT:\s');
# Generate the legends containing the current, average, minimum, and
# maximum values on the plot.
for (my $i=0; $i<$data_sources; ++$i) {
my $legend = $legends[$i];
$legend .= ' ' x ($max_legend_length - length($legend));
- push(@options, "GPRINT:average$i:LAST:$legend Current\\: %f",
- "GPRINT:average$i:AVERAGE:Average\\: %f",
- "GPRINT:average$i:MIN:Min\\: %f",
- "GPRINT:average$i:MAX:Max\\: %f\\l"
+ push(@options, "GPRINT:average$i:LAST:$legend Current\\: %8.3f %S",
+ "GPRINT:average$i:AVERAGE:Average\\: %8.3f %S",
+ "GPRINT:average$i:MIN:Min\\: %8.3f %S",
+ "GPRINT:average$i:MAX:Max\\: %8.3f %S\\l"
);
}
@@ -574,10 +636,10 @@
$_[0]->{_gif_height};
}
-# For this GIF return a string that can be used to size the image
+# For this image return a string that can be used to size the image
# properly in HTML. The output from this subroutine is either an
# empty string or the size of the image.
-sub gif_img_src_size {
+sub image_src_size {
if ($_[0]->{_gif_height} and $_[0]->{_gif_width}) {
return "width=$_[0]->{_gif_width} height=$_[0]->{_gif_height}";
}
@@ -650,15 +712,16 @@
return;
}
- my $gif_filename = "$self->{_gif_basename}-$plot_type.gif";
+ my $gif_filename = "$self->{_gif_basename}-$plot_type.$IMAGE_SUFFIX";
print " Creating `$gif_filename'.\n" if $opt_verbose > 1;
- my $plot_ref = $self->{_plot_ref};
+ my $plot_ref = $self->{_plot_ref};
my ($graph_return, $gif_width, $gif_height) =
RRDs::graph
$gif_filename,
@{$self->{_graph_options}},
+ '-t', $self->{"_${plot_type}_legend"},
'-s', ($plot_end_time-$gif_days_back*$day_seconds),
'-e', $plot_end_time,
'-w', $plot_ref->{plot_width},
@@ -732,18 +795,18 @@
# Remove any special characters from the unique name and do some
# replacements.
- $name = &::strip_key_name($name);
+ $name = &::escape_name($name);
# Create the paths to the data directory.
- my $data_dir = $config_options->{data_dir};
+ my $rrd_dir = $config_options->{rrd_dir};
if ($config_files->{$files_key}{sub_dir}) {
- $data_dir .= "/$group";
- unless (-d $data_dir) {
- warn "$0: making directory `$data_dir'.\n";
- ::recursive_mkdir($data_dir);
+ $rrd_dir .= "/$group";
+ unless (-d $rrd_dir) {
+ warn "$0: making directory `$rrd_dir'.\n";
+ ::recursive_mkdir($rrd_dir);
}
}
- my $rrd_filename = "$data_dir/$name.rrd";
+ my $rrd_filename = "$rrd_dir/$name.rrd";
# Create the new object.
my $self = $class->SUPER::new($rrd_filename);
@@ -951,7 +1014,7 @@
use Carp;
use Digest::MD5 qw(md5);
-use Storable 0.603 qw(dclone);
+use Storable qw(dclone);
use vars qw(@ISA);
@ISA = qw(Orca::DataFile);
@@ -1227,19 +1290,29 @@
next;
}
- # There are three cases to handle. The first is a single data
- # source with a single element that has a regular expression. In
+ # There are three cases to handle:
+ # 1) Regular expression match in the first data with additional datas.
+ # 2) Regular expression match in the first data with no additional datas.
+ # 3) All others.
+ # The first is a single data source that has a regular expression. In
# this case, all of the columns are searched to match the regular
- # expression. The second case is two or more data sources and
- # with one element in the first data source that has a regular
- # expression match. This may generate more than one plot, while
- # the first one will only generate one plot. The final case to
- # handle is when the previous two cases are not true. The last
- # column matched on is stored in @regexp_pos.
- my $number_datas = @{$plot->{data}};
- my $number_elements = @{$plot->{data}[0]};
- my $has_regexp = $plot->{data}[0][0] =~ m:\(.+\):;
- if ($number_datas == 1 and $number_elements == 1 and $has_regexp) {
+ # expression. This generates a single plot with all of the different
+ # data sources plotted on it. The second case is two or more data
+ # sources and where the first data source has a regular expression
+ # match. This may generate more than one plot, for each set of columns
+ # that match the regular expression. The final case to handle is when
+ # the previous two cases are not true. The last column matched on is
+ # stored in @regexp_pos.
+ my $number_datas = @{$plot->{data}};
+ my $number_elements = @{$plot->{data}[0]};
+ my $regexp_element_index = -1;
+ for (my $j=0; $j<@{$plot->{data}[0]}; ++$j) {
+ if ($plot->{data}[0][$j] =~ m:\(.+\):) {
+ $regexp_element_index = $j;
+ last;
+ }
+ }
+ if ($number_datas == 1 and $regexp_element_index != -1) {
# If we've gone up to the last column to match, then go on.
if ($regexp_pos[$i] >= @column_description) {
@@ -1252,36 +1325,37 @@
}
$regexp_pos[$i] = @column_description;
- # In this case we're creating a whole new plot that will have as
- # many data sources as their are columns that match the regular
- # expression. Start by making a deep copy of the plot. Be
- # careful not to make a deep copy of the creates reference,
- # since it can cause recursion.
- my $creates = delete $plot->{creates};
- {
- my $new_plot = dclone($plot);
- $plot->{creates} = $creates;
- $new_plot->{creates} = $creates;
- $plot = $new_plot;
- }
+ # Start by making a deep copy of the plot. Be careful not to make
+ # a deep copy of the `creates' reference, since it can cause
+ # recursion. Replace the regular expression in the first data
+ # with the name of the column that caused the match.
+ my $creates = delete $plot->{creates};
+ my $new_plot = dclone($plot);
+ $plot->{creates} = $creates;
+ $new_plot->{creates} = $creates;
+ $plot = $new_plot;
# At this point we have a copy of plot. Now go through looking
# for all the columns that match and create an additional data
# source for each match.
- my $regexp = $plot->{data}[0][0];
- my $new_data_index = 0;
- my $original_legend = $plot->{legend}[0];
+ my @data_with_regexp = @{$plot->{data}[0]};
+ my $regexp = $data_with_regexp[$regexp_element_index];
+ my $new_data_index = 0;
+ my $original_legend = $plot->{legend}[0];
foreach my $column_name (@column_description) {
my @matches = $column_name =~ /$regexp/;
next unless @matches;
- $plot->{data}[$new_data_index] = [ $column_name ];
+ # Replace the regular expression match with the matched column
+ # name.
+ $data_with_regexp[$regexp_element_index] = $column_name;
+ $plot->{data}[$new_data_index] = [ @data_with_regexp ];
# Copy any items over that haven't been created for this new
# data source. Make sure that any new elements added to
# pcl_plot_append_elements show up here.
unless (defined $plot->{color}[$new_data_index]) {
- $plot->{color}[$new_data_index] = $::cc_default_colors[$new_data_index];
+ $plot->{color}[$new_data_index] = &::get_color($new_data_index);
}
unless (defined $plot->{legend}[$new_data_index]) {
$plot->{legend}[$new_data_index] = $original_legend;
@@ -1292,7 +1366,7 @@
# Replace the regular expression in any legend elements.
my $legend = $plot->{legend}[$new_data_index];
- my $count = 1;
+ my $count = 1;
foreach my $match (@matches) {
$legend =~ s/\$$count/$match/ge;
$legend =~ s/\(.+\)/$match/ge;
@@ -1311,7 +1385,7 @@
$i = $plot->{flush_regexps} ? $oldest_regexp_index : $i + 1;
next unless $new_data_index;
}
- elsif ($number_datas > 1 and $number_elements == 1 and $has_regexp) {
+ elsif ($number_datas > 1 and $regexp_element_index != -1) {
$handle_regexps = 1;
# If we've gone up to the last column to match, then go on. If
@@ -1326,11 +1400,16 @@
}
# Go through all of the columns and stop at the first match.
- my $regexp = $plot->{data}[0][0];
+ my @data_with_regexp = @{$plot->{data}[0]};
+ my $regexp = $data_with_regexp[$regexp_element_index];
+ my $column_description;
my @matches;
for (;$regexp_pos[$i]<@column_description; ++$regexp_pos[$i]) {
@matches = $column_description[$regexp_pos[$i]] =~ /$regexp/;
- last if @matches;
+ if (@matches) {
+ $column_description = $column_description[$regexp_pos[$i]];
+ last;
+ }
}
unless (@matches) {
if ($oldest_regexp_index == $i) {
@@ -1342,16 +1421,20 @@
}
++$regexp_pos[$i];
- # Make a deep copy of the plot. In the string form of the plot
+ # Start by making a deep copy of the plot. Be careful not to make
+ # a deep copy of the `creates' reference, since it can cause
+ # recursion. Replace the regular expression in the first data
+ # with the name of the column that caused the match. Then create
+ # string form of the plot object using Data::Dumper::Dumper and
# replace all of the $1, $2, ... with what was matched in the
- # first data source. The tricky one is to replace the regular
- # expression that did the match in the first place. Also, save
- # a copy of the creates array for this plot so it doesn't also
- # get dumped.
- my $creates = delete $plot->{creates};
- my $d = Data::Dumper->Dump([$plot], [qw(plot)]);
- $plot->{creates} = $creates;
- $d =~ s/$regexp/$matches[0]/mge;
+ # first data source.
+ my $creates = delete $plot->{creates};
+ my $new_plot = dclone($plot);
+ $plot->{creates} = $creates;
+ $plot = $new_plot;
+ $plot->{data}[0][$regexp_element_index] = $column_description;
+ my $d = Data::Dumper->Dump([$plot], [qw(plot)]);
+ $plot->{creates} = $creates;
my $count = 1;
foreach my $match (@matches) {
$d =~ s/\$$count/$match/mge;
@@ -1359,10 +1442,11 @@
++$count;
}
{
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
eval $d;
}
- die "$0: internal error: eval on\n $d\nOutput: $@\n" if $@;
+ die "$0: internal error: eval on\n\n$d\nOutput: $@\n" if $@;
# Either increment the index or reset it to the oldest regexp
# index.
@@ -1370,6 +1454,7 @@
$i = $plot->{flush_regexps} ? $oldest_regexp_index : $i + 1;
}
else {
+
$old_i = $i++;
++$oldest_regexp_index unless $handle_regexps;
}
@@ -1427,20 +1512,25 @@
# data. Also create an unique Orca data file name for this plot
# and a name for this plot that does not include the group.
my @my_rrds;
+ my @my_short_rrds;
my @no_group_name;
my @group_name;
+ my $previous_group = '';
+ my $previous_subgroup = '';
for (my $j=0; $j<@datas; ++$j) {
- my $expr = "@{$datas[$j]}";
+ my $expr = undef;
my $sub_expr_sub = undef;
my $data_name = join('_', @{$plot->{data}[$j]});
if (defined $datas[$j]) {
+ $expr = "@{$datas[$j]}";
my $sub_expr = "sub {\n return $expr;\n}\n";
my $sub_expr_md5 = md5($sub_expr);
unless (defined ($sub_expr_sub = $choose_data_sub_cache{$sub_expr_md5})) {
{
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
$sub_expr_sub = eval $sub_expr;
}
@@ -1459,9 +1549,27 @@
push(@no_group_name, "${files_key}_${data_name}");
push(@group_name, $name);
- # Create a new RRD only if it doesn't already exist and if a
- # valid get data subroutine is created. Keep the
- # choose_data_sub for this file.
+ # Create a short name that may exclude the group and subgroup if the
+ # previous data had the same group and subgroup.
+ my $short_name_with_subgroup;
+ if ($files_key eq $previous_group) {
+ if ($group eq $previous_subgroup) {
+ $short_name_with_subgroup = "__$data_name";
+ }
+ else {
+ $short_name_with_subgroup = "_${group}_${data_name}";
+ $previous_subgroup = $group;
+ }
+ }
+ else {
+ $previous_group = $files_key;
+ $previous_subgroup = $group;
+ $short_name_with_subgroup = $name;
+ }
+
+ # Create a new RRD only if it doesn't already exist and if a valid
+ # get data subroutine is created. Keep the choose_data_sub for this
+ # file.
if (defined $sub_expr_sub) {
$choose_data_expr .= " '$name', $expr,\n";
unless (defined $rrd_data_files_ref->{$name}) {
@@ -1476,6 +1584,7 @@
$self->{_all_rrd_ref} = $rrd_data_files_ref;
$my_rrd_list{$name} = 1;
push(@my_rrds, $name);
+ push(@my_short_rrds, $short_name_with_subgroup);
}
}
@@ -1486,16 +1595,16 @@
$gif->add_rrds(@my_rrds);
}
else {
- $gif = Orca::GIFFile->new($config_options,
- $config_files,
- $config_plots,
- $files_key,
- $group,
- join(',', @my_rrds),
- join(',', @no_group_name),
- $plot,
- $rrd_data_files_ref,
- \@my_rrds);
+ $gif = Orca::ImageFile->new($config_options,
+ $config_files,
+ $config_plots,
+ $files_key,
+ $group,
+ join(',', @my_short_rrds),
+ join(',', @no_group_name),
+ $plot,
+ $rrd_data_files_ref,
+ \@my_rrds);
$gif_files_ref->{hash}{$group_name} = $gif;
push(@{$gif_files_ref->{list}}, $gif);
push(@{$config_plots->[$old_i]{creates}}, $gif);
@@ -1509,6 +1618,7 @@
$choose_data_expr .= " );\n}\n";
{
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
$self->{_choose_data_sub} = eval $choose_data_expr;
}
@@ -1604,7 +1714,7 @@
my $number_added = 0;
my $close_once_done = 0;
my $number_columns = @{$self->{_column_description}};
- while (my $line = <$fd>) {
+ while (defined(my $line = <$fd>)) {
# Skip the line if the word timestamp appears in it. This is a
# temporary fix for orcallator.se to place a new information line
# in the output file when it starts up.
@@ -1686,12 +1796,16 @@
package main;
sub Usage {
- die "usage: $0 [-o] [-r] [-v] config_file\n";
+ die "usage: $0 [-gifs] [-o] [-r] [-v] config_file\n";
}
while (@ARGV and $ARGV[0] =~ /^-\w/) {
my $arg = shift;
- if ($arg eq '-o') {
+ if ($arg eq '-gifs') {
+ ++$opt_generate_gifs;
+ $IMAGE_SUFFIX = 'gif';
+ }
+ elsif ($arg eq '-o') {
++$opt_once_only;
}
elsif ($arg eq '-v') {
@@ -1707,6 +1821,11 @@
Usage unless @ARGV;
+# Install signal handlers to clean up.
+$SIG{INT} = \&catch_signal;
+$SIG{TERM} = \&catch_signal;
+$SIG{__DIE__} = \&catch_signal;
+
if ($opt_verbose) {
print "Orca version $VERSION using RRDs version $RRDs::VERSION.\n";
}
@@ -1715,9 +1834,45 @@
exit 0;
+# This is the name of the locking directory.
+my $locking_directory;
+
+# This is set to 1 if the locking directory should be removed.
+my $rmdir_locking_directory;
+
+sub clean_up_and_quit {
+ if ($rmdir_locking_directory and
+ $locking_directory and
+ -d $locking_directory) {
+ rmdir($locking_directory) or
+ warn "$0: cannot rmdir `$locking_directory': $!\n";
+ }
+ exit 0;
+}
+
+sub catch_signal {
+ my $signal = shift;
+ chomp($signal);
+ $signal =~ s/\.+$//;
+ if ($signal =~ /$0/o) {
+ print STDERR "$signal.\n";
+ }
+ else {
+ print STDERR "$0: caught signal $signal.\n";
+ }
+ clean_up_and_quit;
+}
+
sub main {
my $config_filename = shift;
+ # Create a locking directory using the configuration filename.
+ $locking_directory = "$config_filename.lock";
+ unless (mkdir($locking_directory, 0755)) {
+ die "$0: cannot create locking directory `$locking_directory': $!\n";
+ }
+ $rmdir_locking_directory = 1;
+
my $start_time = time;
# Load the configuration file.
@@ -1744,6 +1899,8 @@
if ($opt_verbose) {
printf "Running time is %d:%02d minutes.\n", $minutes, $seconds;
}
+
+ &clean_up_and_quit;
}
# Given a directory name, attempt to make all necessary directories.
@@ -1930,6 +2087,8 @@
}
}
+# system("/bin/ps -p $$ -o\"rss vsz pmem time user pid comm\"");
+
# Save the current state of the source data files.
if ($found_new_files or $updated_source_files) {
&save_state($config_options->{state_file}, $new_found_files_ref);
@@ -1938,10 +2097,12 @@
# Create the HTML and GIF files now.
unless ($opt_rrd_update_only) {
# Plot the data in each gif.
- print "Updating GIFs.\n" if $opt_verbose;;
+ print "Updating " . uc($IMAGE_SUFFIX). "s.\n" if $opt_verbose;;
+# system("/bin/ps -p $$ -o\"rss vsz pmem time user pid comm\"");
foreach my $gif (@{$gif_files_ref->{list}}) {
$gif->plot;
}
+# system("/bin/ps -p $$ -o\"rss vsz pmem time user pid comm\"");
# Make the HTML files.
if ($found_new_files) {
@@ -2050,12 +2211,12 @@
$index_html->print("<hr>\n<font size=\"-2\">");
# The first step is to create the HTML files for each different
- # group. This is only done if there is more than one group gathered
- # from the configuration and input data files. If there is more
- # than one group first list the different available groups and
- # create for each group an HTML file that contains HREFs to the GIFs
- # for that group. Also create an HTML file for the daily, weekly,
- # monthly, and yearly GIFs.
+ # subgroup. This is only done if there is more than one subgroup
+ # gathered from the configuration and input data files. If there
+ # is more than one subgroup first list the different available subgroups
+ # and create for each subgroup an HTML file that contains HREFs to the
+ # images for that subgroup. Also create an HTML file for different time
+ # span images (i.e., daily, monthly, etc).
# This variable sets the number of groups to place into a single
# row.
@@ -2072,7 +2233,7 @@
my $html_group = ($number_groups == 1 and !$group) ? 'Everything' : $group;
# Create the HTML code for the main index.html file.
- my $group_basename = strip_key_name($html_group);
+ my $group_basename = escape_name($html_group);
my $element = "<table border=2><tr><td><b>$html_group</b></td></tr>\n<tr><td>\n";
foreach my $plot_type (@gif_plot_type) {
$element .= "<a href=\"$group_basename-$plot_type.html\">";
@@ -2088,8 +2249,7 @@
@table_columns = ();
}
- # Create the daily, weekly, monthly, yearly, and all HTML files
- # for this group.
+ # Create the various time span HTML files for this subgroup.
my @html_files;
foreach my $plot_type (@gif_plot_type, 'all') {
my $href = "$group_basename-$plot_type.html";
@@ -2109,9 +2269,8 @@
Plot_Type => $Plot_Type});
}
- # At the top of the daily, weekly, monthly, yearly, and all HTML
- # files add HREFs to the other date span HTML files in the same
- # group.
+ # At the top of the various time span HTML files add HREFs to the
+ # other date span HTML files in the same subgroup.
my $href_html;
foreach my $plot_type (@html_files) {
$href_html .= "<a href=\"$plot_type->{href}\">" .
@@ -2121,9 +2280,11 @@
$html_file->{fd}->print($href_html);
}
- # Use only those GIFs now that have the same group name as the
- # HTML files that are being created.
- my @gifs = grep {$group eq $_->group} @{$gif_files_ref->{list}};
+ # Use only those images now that have the same subgroup name as the
+ # HTML files that are being created. Make sure the images appear
+ # in the files in the order listed in the configuration file.
+ my @gifs = sort {$a->{_plot_ref}{_index} <=> $b->{_plot_ref}{_index}}
+ grep {$group eq $_->group} @{$gif_files_ref->{list}};
if (@gifs > 1) {
my $href_html = "<hr>";
for (my $i=0; $i<@gifs; ++$i) {
@@ -2141,9 +2302,9 @@
my $gif = $gifs[$i];
my $name = $gif->name;
my $title = replace_group_name($gif->plot_ref->{title}, $gif->group);
- my $href = "href=\"" . strip_key_name($name) . ".html\"";
+ my $href = "href=\"" . escape_name($name) . ".html\"";
my $sub_dir = $config_files->{$gif->files_key}{sub_dir};
- my $gif_size = $gif->gif_img_src_size;
+ my $gif_size = $gif->image_src_size;
foreach my $html_file (@html_files) {
$html_file->{fd}->print("<hr>\n<h2><a ${href} name=\"$i\">$html_file->{Plot_Type} " .
@@ -2153,7 +2314,7 @@
# Put the proper GIFs into each HTML file. The all HTML file is
# listed last and requires special handling.
for (my $j=0; $j<@html_files-1; ++$j) {
- my $gif_filename = "$name-$html_files[$j]{plot_type}.gif";
+ my $gif_filename = "$name-$html_files[$j]{plot_type}.$IMAGE_SUFFIX";
$gif_filename = "$group/$gif_filename" if $sub_dir;
my $html = "<a $href><img src=\"$gif_filename\" $gif_size " .
"alt=\"$html_files[$j]{Plot_Type} $title\"></a>\n";
@@ -2189,101 +2350,98 @@
# This sets the number of plot types to place into a single row in
# the main index.html.
$table_number_columns = 1;
- @table_columns = ();
+ @table_columns = ();
# Go through all of the configured plots.
for (my $i=0; $i<@$config_plots; ++$i) {
next unless @{$config_plots->[$i]{creates}};
- # Create an ordered list of GIFs sorted on the legend name for
- # each GIF. Remember, each GIF represented here actually
- # represents the set of daily, weekly, monthly, and yearly GIF
- # files. %gif_legend_no_group is a hash keyed by the GIF that
- # contains the legend with no group substitution for the GIF. The
- # %legends hash is keyed by the legend name with no group
- # substitution and contains a reference to an array of GIFs that
+ # Create an ordered list of images sorted on the legend name for
+ # each image. Remember, each image represented here actually
+ # represents the set of time span image files.
+ # %image_legend_no_subgroup is a hash keyed by the image that
+ # contains the legend with no subgroup substitution for the image.
+ # The %legends hash is keyed by the legend name with no subgroup
+ # substitution and contains a reference to an array of image that
# have the same legend name.
- my %gif_legend_no_group;
+ my %gif_legend_no_subgroup;
my %same_legends_gif_list;
foreach my $gif (@{$config_plots->[$i]{creates}}) {
- my $legend_no_group = replace_group_name($gif->plot_ref->{title}, '');
- $gif_legend_no_group{$gif} = $legend_no_group;
+ my $legend_no_subgroup = replace_group_name($gif->plot_ref->{title}, '');
+ $gif_legend_no_subgroup{$gif} = $legend_no_subgroup;
- unless (defined $same_legends_gif_list{$legend_no_group}) {
- $same_legends_gif_list{$legend_no_group} = [];
+ unless (defined $same_legends_gif_list{$legend_no_subgroup}) {
+ $same_legends_gif_list{$legend_no_subgroup} = [];
}
- push(@{$same_legends_gif_list{$legend_no_group}}, $gif);
+ push(@{$same_legends_gif_list{$legend_no_subgroup}}, $gif);
}
# Put together the correctly ordered list of GIFs using the array
# references in the legends hash. Sort the GIFs using the special
# sorting routine for group names.
my @gifs;
- foreach my $legend_no_group (sort keys %same_legends_gif_list) {
- @{$same_legends_gif_list{$legend_no_group}} =
- sort sort_group_names @{$same_legends_gif_list{$legend_no_group}};
- push(@gifs, @{$same_legends_gif_list{$legend_no_group}});
+ foreach my $legend_no_subgroup (sort keys %same_legends_gif_list) {
+ @{$same_legends_gif_list{$legend_no_subgroup}} =
+ sort sort_group_names @{$same_legends_gif_list{$legend_no_subgroup}};
+ push(@gifs, @{$same_legends_gif_list{$legend_no_subgroup}});
}
# This hash keyed by legend name holds an array of references to a
# hash of file descriptor, HREF and plot type.
my %legend_html_files;
- # Now for each set of daily, weekly, monthly and yearly GIFs, go
+ # Now for each set of time span (i.e., daily, weekly, etc) images, go
# through and create the correct HTML files.
foreach my $gif (@gifs) {
- my $no_group_name = strip_key_name($gif->no_group_name);
- my $legend_no_group = $gif_legend_no_group{$gif};
+ my $no_group_name = escape_name($gif->no_group_name);
+ my $legend_no_subgroup = $gif_legend_no_subgroup{$gif};
# If this is the first time that this legend has been seen in
# for creating the proper HTML files, then create the new HTML
# files and set up the top of them properly and place into the
# main index.html the proper HREFs to these files.
- unless (defined $legend_html_files{$legend_no_group}) {
-
- # Now create the HTML files for the daily, weekly, monthly,
- # yearly, and all plots. Use the legend name to create this
- # list.
- $legend_html_files{$legend_no_group} = [];
+ unless (defined $legend_html_files{$legend_no_subgroup}) {
+ # Now create the HTML files for the time span plots. Use the
+ # legend name to create this list.
+ $legend_html_files{$legend_no_subgroup} = [];
foreach my $plot_type (@gif_plot_type, 'all') {
my $href = "$no_group_name-$plot_type.html";
my $filename = "$html_dir/$href";
my $Plot_Type = Capatialize($plot_type);
my $fd = Orca::HTMLFile->new($filename,
- "$Plot_Type $legend_no_group",
+ "$Plot_Type $legend_no_subgroup",
$config_options->{html_page_header},
"<hr>\n$config_options->{html_page_footer}");
unless ($fd) {
warn "$0: warning: cannot open `$filename' for writing: $!\n";
next;
}
- push(@{$legend_html_files{$legend_no_group}},
+ push(@{$legend_html_files{$legend_no_subgroup}},
{fd => $fd,
href => $href,
plot_type => $plot_type,
Plot_Type => $Plot_Type});
}
- # For each of the daily, weekly, monthy, yearly and all HTML
- # files add at the top of the file HREFs to all of the daily,
- # weekly, monthly, yearly and all HTML files. Also add HREFs
- # to the different groups later on in the same HTML file.
- my @legend_html_files = @{$legend_html_files{$legend_no_group}};
+ # For each of the time span HTML files add at the top of the
+ # file HREFs to all of time span HTML files. Also add HREFs
+ # to the different subgroups later on in the same HTML file.
+ my @legend_html_files = @{$legend_html_files{$legend_no_subgroup}};
my $href_html;
foreach my $plot_type (@legend_html_files) {
$href_html .= "<a href=\"$plot_type->{href}\">" .
- "$plot_type->{Plot_Type} $legend_no_group</a><br>\n";
+ "$plot_type->{Plot_Type} $legend_no_subgroup</a><br>\n";
}
# Add to the top of the file HREFs to all of the different
# groups in the HTML file. This makes traversing the HTML
# page easier. Do this if there are two or more groups in
# this HTML page.
- if (@{$same_legends_gif_list{$legend_no_group}} > 1) {
+ if (@{$same_legends_gif_list{$legend_no_subgroup}} > 1) {
$href_html .= "<hr>\n";
- foreach my $legend_gif (@{$same_legends_gif_list{$legend_no_group}}) {
+ foreach my $legend_gif (@{$same_legends_gif_list{$legend_no_subgroup}}) {
my $group = $legend_gif->group;
$href_html .= "<a href=\"#$group\">[$group]</a><spacer size=10>\n";
}
@@ -2292,9 +2450,14 @@
$html_file->{fd}->print($href_html);
}
- # Create the HTML code that goes into the main index.html that
- # links to these other HTML files.
- my $element = "<td><b>$legend_no_group</b></td>\n";
+ # Create the HTML code that goes into the main index.html that links
+ # to these other HTML files. If the configuration file contains
+ # an href for information on this plot, then include the href here.
+ my $element = "<td><b>$legend_no_subgroup";
+ if (my $legend_href = $config_plots->[$i]{href}) {
+ $element .= " [<a href=\"$legend_href\">Info</a>]";
+ }
+ $element .= "</b></td>\n";
foreach my $plot_type (@gif_plot_type, 'all') {
$element .= "<td><a href=\"$no_group_name-$plot_type.html\">";
$element .= Capatialize($plot_type) . "</a></td>\n";
@@ -2306,12 +2469,10 @@
}
}
- # At this point the HTML files for this set of daily, weekly,
- # monthly, and yearly GIFs have been opened. Now create the
- # summary HTML file that contains only four GIF images, the
- # daily, weekly, monthly, and yearly GIFs for a particular plot
- # for a particular group.
- my $with_group_name = strip_key_name($gif->name);
+ # At this point the HTML files for this set of of images have been
+ # opened. Now create the summary HTML file that contains only the
+ # images for a particular plot for a particular subgroup.
+ my $with_group_name = escape_name($gif->name);
my $legend_with_group = replace_group_name($gif->plot_ref->{title},
$gif->group);
my $summarize_name = "$html_dir/$with_group_name.html";
@@ -2326,11 +2487,11 @@
my $sub_dir = $config_files->{$gif->files_key}{sub_dir};
my $gif_filename = $with_group_name;
$gif_filename = $gif->group . "/$gif_filename" if $sub_dir;
- my $gif_size = $gif->gif_img_src_size;
+ my $gif_size = $gif->image_src_size;
foreach my $plot_type (@gif_plot_type) {
my $Plot_Type = Capatialize($plot_type);
$summarize_html->print("<hr>\n<h2>$Plot_Type $legend_with_group</h2>\n",
- "<img src=\"$gif_filename-$plot_type.gif\"",
+ "<img src=\"$gif_filename-$plot_type.$IMAGE_SUFFIX\"",
$gif_size,
"alt=\"$Plot_Type $legend_with_group\">\n");
}
@@ -2341,15 +2502,15 @@
my $href = "href=\"$with_group_name.html\"";
- my @legend_html_files = @{$legend_html_files{$legend_no_group}};
- $legend_html_files[-1]{fd}->print("<hr>\n<h2><a ${href} name=\"$group\">$group $legend_no_group</a></h2>\n");
+ my @legend_html_files = @{$legend_html_files{$legend_no_subgroup}};
+ $legend_html_files[-1]{fd}->print("<hr>\n<h2><a ${href} name=\"$group\">$group $legend_no_subgroup</a></h2>\n");
for (my $i=0; $i<@legend_html_files-1; ++$i) {
my $Plot_Type = $legend_html_files[$i]{Plot_Type};
- my $gif_filename = "$name-$legend_html_files[$i]{plot_type}.gif";
+ my $gif_filename = "$name-$legend_html_files[$i]{plot_type}.$IMAGE_SUFFIX";
$gif_filename = "$group/$gif_filename" if $sub_dir;
my $html = "<a $href><img src=\"$gif_filename\" $gif_size " .
- "alt=\"$Plot_Type $group $legend_no_group\"></a>\n";
- $legend_html_files[$i]{fd}->print("<hr>\n<h2><a ${href} name=\"$group\">$Plot_Type $group $legend_no_group</a></h2>\n");
+ "alt=\"$Plot_Type $group $legend_no_subgroup\"></a>\n";
+ $legend_html_files[$i]{fd}->print("<hr>\n<h2><a ${href} name=\"$group\">$Plot_Type $group $legend_no_subgroup</a></h2>\n");
$legend_html_files[$i]{fd}->print($html);
$legend_html_files[-1]{fd}->print($html);
}
@@ -2451,19 +2612,48 @@
$title;
}
-# Strip special characters from key names.
-sub strip_key_name {
+# Replace special characters from key names, remove redundant characters,
+# and shorten the names so the maximum path name is not exceeded. If
+# the name is still too long such that the maximum filename path length
+# may be exceeded by appending -daily.html or other names to the name,
+# which is choosen to be 235 characters, then compute a MD5 hash of the
+# name, trim the name the name to 210 characters, which leaves enough space
+# for a 22 byte base64 MD5 digest, plus a separating '-' and plus the prefix,
+# and append the MD5 name.
+sub escape_name {
my $name = shift;
+
$name =~ s/:/_/g;
$name =~ s:/:_per_:g;
$name =~ s:\s+:_:g;
- $name =~ s:%:_percent_:g;
- $name =~ s:#:_number_:g;
- $name =~ s:_{2,}:_:g;
+ $name =~ s:%:_pct_:g;
+ $name =~ s:#:_num_:g;
+ $name =~ s:\*:_X_:g;
+
+ # Trim anything containing orcallator, orca.
+ $name =~ s:orcallator:o:g;
+ $name =~ s:orca:o:g;
# Remove trailing _'s.
$name =~ s:_+$::;
$name =~ s:_+,:,:g;
+
+ # Replace multiple _'s with one _, except when they follow a , which
+ # happens when the same group and subgroup appear for a new data
+ # source.
+ $name =~ s:,_{2,}:\200:g;
+ $name =~ s:_{2,}:_:g;
+ $name =~ s:\200:,__:g;
+
+ if (length($name) > 235) {
+ my $md5 = md5_base64($name);
+ $name = substr($name, 0, 210) . "-$md5";
+
+ # Be careful to convert any / characters _, since / is a valid base64
+ # character and should not be used.
+ $name =~ s:/:_:g;
+ }
+
$name;
}
@@ -2559,7 +2749,7 @@
$new_found_files_ref->{$filename} = $old_found_files_ref->{$filename};
}
else {
- print " $filename\n" if $opt_verbose;
+# print " $filename\n" if $opt_verbose;
my $data_file =
Orca::SourceDataFile->new($filename,
$config_files->{$files_key}{interval},
@@ -2695,51 +2885,59 @@
my @cc_optional_options;
my @cc_optional_files;
my @cc_optional_plots;
+my @cc_default_colors;
+
+sub get_color {
+ $cc_default_colors[$_[0] % @cc_default_colors];
+}
sub check_config {
my ($config_filename, $config_options, $config_files, $config_plots) = @_;
unless (@cc_required_options) {
- @cc_required_options = qw(state_file
- data_dir
- html_dir);
+ @cc_required_options = qw(html_dir
+ rrd_dir
+ state_file);
@cc_required_files = qw(column_description
date_source
find_files
interval);
@cc_required_plots = qw(data
source);
- @cc_optional_options = qw(expire_gifs
+ @cc_optional_options = qw(expire_images
html_page_footer
html_page_header
html_top_title
late_interval
sub_dir
warn_email);
- @cc_optional_files = qw(date_format
- reopen);
+ @cc_optional_files = qw(reopen);
@cc_optional_plots = qw(flush_regexps
+ href
plot_width
- plot_height
- rigid_min_max);
+ plot_height);
# This is a special variable that gets used in add_plots.
- @::cc_default_colors = ('00ff00', # Green
+ @cc_default_colors = ('00ff00', # Green
'0000ff', # Blue
'ff0000', # Red
'a020f0', # Magenta
'ffa500', # Orange
'a52a2a', # Brown
- '00ffff'); # Cyan
+ '00ffff', # Cyan
+ '00aa00', # Dark Green
+ 'eeee00', # Yellow
+ '5e5e5e', # Dark Gray
+ '0000aa'); # Dark Blue
}
- # If data_dir is not set, then use base_dir. Only die if both are
+ # If rrd_dir is not set, then use base_dir. Only die if both are
# not set.
- unless (defined $config_options->{data_dir}) {
+ unless (defined $config_options->{rrd_dir}) {
if (defined $config_options->{base_dir}) {
- $config_options->{data_dir} = $config_options->{base_dir};
+ $config_options->{rrd_dir} = $config_options->{base_dir};
}
else {
- die "$0: error: must define `data_dir' in `$config_filename'.\n";
+ die "$0: error: must define `rrd_dir' in `$config_filename'.\n";
}
}
@@ -2750,8 +2948,8 @@
}
}
- # Check if the data_dir and html_dir directories exist.
- foreach my $dir_key ('html_dir', 'data_dir') {
+ # Check if the html_dir and rrd_dir directories exist.
+ foreach my $dir_key ('html_dir', 'rrd_dir') {
my $dir = $config_options->{$dir_key};
die "$0: error: please create $dir_key `$dir'.\n" unless -d $dir;
}
@@ -2772,11 +2970,13 @@
$expr =~ s/interval/\$_[0]/g;
my $sub;
{
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
$sub = eval $expr;
}
die "$0: cannot evaluate command for `late_interval' on\n $expr\nOutput: $@\n" if $@;
{
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
eval '&$sub(3.1415926) + 0;';
}
@@ -2809,12 +3009,12 @@
}
$config_options->{find_times} = [ sort { $a <=> $b } @find_times ];
- # There must be at least one list of files.
+ # There must be at least one group.
unless (keys %$config_files) {
- die "$0: error: must define at least one `files' in `$config_filename'.\n";
+ die "$0: error: must define at least one `group' in `$config_filename'.\n";
}
- # For each files parameter there are required options. Convert the
+ # For each group there are required options. Convert the
# unblessed reference to a hash to a Orca::Config::FilesGroup
# object.
foreach my $files_key (keys %$config_files) {
@@ -2823,11 +3023,11 @@
foreach my $option (@cc_required_files) {
unless (defined $files_group->{$option}) {
- die "$0: error: must define `$option' for `files $files_key' in `$config_filename'.\n";
+ die "$0: error: must define `$option' for `group $files_key' in `$config_filename'.\n";
}
}
- # Optional files options will be set to '' here if they haven't
+ # Optional group options will be set to '' here if they haven't
# been set by the user.
foreach my $option (@cc_optional_files) {
unless (defined $files_group->{$option}) {
@@ -2841,15 +3041,15 @@
my $date_source = $files_group->{date_source}[0];
if ($date_source eq 'column_name') {
unless (@{$files_group->{date_source}} == 2) {
- die "$0: error: incorrect number of arguments for `date_source' for `files $files_key'.\n";
+ die "$0: error: incorrect number of arguments for `date_source' for `group $files_key'.\n";
}
unless (defined $files_group->{date_format}) {
- die "$0: error: must define `date_format' with `date_source columns ...' for `files $files_key'.\n";
+ die "$0: error: must define `date_format' with `date_source columns ...' for `group $files_key'.\n";
}
}
else {
unless ($date_source eq 'file_mtime') {
- die "$0: error: illegal argument for `date_source' for `files $files_key'.\n";
+ die "$0: error: illegal argument for `date_source' for `group $files_key'.\n";
}
}
$files_group->{date_source}[0] = $date_source;
@@ -2865,23 +3065,24 @@
# since this will match single character files and directories.
my $sub_dir = 0;
my %find_files;
- my $number_finds = @{$files_group->{find_files}};
+ my $number_finds = @{$files_group->{'find_files'}};
for (my $i=0; $i<$number_finds; ++$i) {
- my $orig_find = $files_group->{find_files}[$i];
+ my $orig_find = $files_group->{'find_files'}[$i];
my $find = $orig_find;
$find =~ s:^\\./::;
$find =~ s:/\\./:/:g;
$find = $orig_find unless $find;
- $files_group->{find_files}[$i] = $find;
+ $files_group->{'find_files'}[$i] = $find;
my $test_string = 'abcdefg';
+ local $SIG{__DIE__} = 'DEFAULT';
local $SIG{__WARN__} = sub { die $_[0] };
eval { $test_string =~ /$find/ };
- die "$0: error: illegal regular expression in `find_files $orig_find' for `files $files_key' in `$config_filename':\n$@\n" if $@;
+ die "$0: error: illegal regular expression in `find_files $orig_find' for `group $files_key' in `$config_filename':\n$@\n" if $@;
$find_files{$find} = 1;
$sub_dir = 1 if $find =~ m:\(.+\):;
}
- $files_group->{find_files} = [sort keys %find_files];
- $files_group->{sub_dir} = $sub_dir || $config_options->{sub_dir};
+ $files_group->{'find_files'} = [sort keys %find_files];
+ $files_group->{sub_dir} = $sub_dir || $config_options->{sub_dir};
}
# There must be at least one plot.
@@ -2918,6 +3119,16 @@
$plot->{plot_width} = 500 unless $plot->{plot_width};
$plot->{plot_height} = 125 unless $plot->{plot_height};
+ # Make sure the base is either 1000 or 1024.
+ if (defined $plot->{base} && length($plot->{base})) {
+ if ($plot->{base} != 1000 and $plot->{base} != 1024) {
+ die "$0: error: plot #$j must define base to be either 1000 or 1024.\n";
+ }
+ }
+ else {
+ $plot->{base} = 1000;
+ }
+
# Set the plot minimum and maximum values to U unless they are
# set.
unless (defined $plot->{data_min}) {
@@ -2950,13 +3161,13 @@
$plot->{data_type} = 'GAUGE';
}
- # The data source needs to be a valid files key.
+ # The data source needs to be a valid group key.
my $source = $plot->{source};
unless (defined $config_files->{$source}) {
- die "$0: error: plot #$j `source $source' references non-existant `files' in `$config_filename'.\n";
+ die "$0: error: plot #$j `source $source' references non-existant `group' in `$config_filename'.\n";
}
unless ($plot->{source}) {
- die "$0: error: plot #$j `source $source' requires one files_key argument in `$config_filename'.\n";
+ die "$0: error: plot #$j `source $source' requires one group argument in `$config_filename'.\n";
}
# Set the legends of any columns not defined.
@@ -2973,7 +3184,7 @@
$plot->{color} = [];
}
for (my $k=@{$plot->{color}}; $k<$number_datas; ++$k) {
- $plot->{color}[$k] = $::cc_default_colors[$k];
+ $plot->{color}[$k] = get_color($k);
}
# Check each line type setting.
@@ -3084,14 +3295,14 @@
$pcl_files_key = '';
$pcl_plot_index = '-0';
@pcl_option_elements = qw(base_dir
- data_dir
- expire_gifs
+ expire_images
find_times
html_dir
html_page_footer
html_page_header
html_top_title
late_interval
+ rrd_dir
state_file
sub_dir
warn_email);
@@ -3101,14 +3312,17 @@
find_files
interval
reopen);
- @pcl_plot_elements = qw(color
+ @pcl_plot_elements = qw(base
+ color
data
data_min
data_max
data_type
flush_regexps
+ href
legend
line_type
+ logarithmic
optional
plot_height
plot_min
@@ -3122,11 +3336,12 @@
data
legend
line_type);
- @pcl_filepath_elements = qw(data_dir
- find_files
+ @pcl_filepath_elements = qw(find_files
html_dir
+ rrd_dir
state_file);
@pcl_no_arg_elements = qw(flush_regexps
+ logarithmic
optional
rigid_min_max);
@pcl_keep_as_array_options = qw();
@@ -3179,7 +3394,7 @@
return;
}
unless (grep {$key eq $_} @pcl_file_elements) {
- warn "$0: warning: directive `$key' unknown for files at line $line_number in `$config_filename'.\n";
+ warn "$0: warning: directive `$key' unknown for group at line $line_number in `$config_filename'.\n";
return;
}
@@ -3246,25 +3461,26 @@
}
# Take care of files to watch.
- if ($key eq 'files') {
+ if ($key eq 'group') {
unless (@line) {
- die "$0: error: files needs a files name followed by { at line $line_number in `$config_filename'.\n"
+ die "$0: error: group needs a group name followed by { at line $line_number in `$config_filename'.\n"
}
$pcl_files_key = shift(@line);
unless (@line == 1 and $line[0] eq '{' ) {
- warn "$0: warning: '{' required after 'files $pcl_files_key' at line $line_number in `$config_filename'.\n";
+ warn "$0: warning: '{' required after `group $pcl_files_key' at line $line_number in `$config_filename'.\n";
}
if (defined $config_files->{$pcl_files_key}) {
- warn "$0: warning: files `$key' at line $line_number in `$config_filename' previously defined.\n";
+ warn "$0: warning: `group $key' at line $line_number in `$config_filename' previously defined.\n";
}
return;
}
- # Take care of plots to make.
+ # Take care of plots to make. Include in each plot its index.
if ($key eq 'plot') {
$pcl_plot_index =~ s:^-::;
+ $config_plots->[$pcl_plot_index]{_index} = $pcl_plot_index;
unless (@line == 1 and $line[0] eq '{') {
- warn "$0: warning: '{' required after 'plot' at line $line_number in `$config_filename'.\n";
+ warn "$0: warning: '{' required after `plot' at line $line_number in `$config_filename'.\n";
}
return;
}
@@ -3325,11 +3541,11 @@
=head1 NAME
-orca - Make HTML & GIF plots of daily, weekly, monthly & yearly data
+orca - Make HTML & PNG plots of daily, weekly, monthly & yearly data
=head1 SYNOPSIS
- orca [-o] [-r] [-v [-v [-v]]] configuration_file
+ orca [-gifs] [-o] [-r] [-v [-v [-v]]] configuration_file
=head1 DESCRIPTION
@@ -3343,7 +3559,7 @@
* Remembers the last modification times for files so they do not have to
be reread continuously.
* Can plot the same type of data from different files into different
- or the same GIFs.
+ or the same PNGs.
* Different plots can be created based on the filename.
* Parses the date from the text files.
* Create arbitrary plots of data from different columns.
@@ -3353,16 +3569,16 @@
ones, using one or more columns.
* Group multiple columns into a single plot using regular expressions on
the column titles.
- * Creates an HTML tree of HTML files and GIF plots.
+ * Creates an HTML tree of HTML files and PNG plots.
* Creates an index of URL links listing all available targets.
* Creates an index of URL links listing all different plot types.
* No separate CGI set up required.
* Can be run under cron or it can sleep itself waiting for file updates
based on when the file was last updated.
-Orca is based the RRD tool by Tobias Oetiker. While it is similar to the
-other tools based on RRD, such as Cricket and MRTG, it is significantly
-different. To see these other tools, examine
+Orca is similar to but substantially different from other tools that
+record and display hourly, daily, monthly, and yearly data, such as
+MRTG and Cricket. To see these other tools, examine
http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
@@ -3372,7 +3588,7 @@
=head1 EXAMPLES
-A small static example of Orca is at
+A static example of Orca is at
http://www.geocities.com/~bzking/orca-example/
@@ -3381,16 +3597,20 @@
=head1 COMMAND LINE OPTIONS
-Orca has only three command line options. They are:
+Orca has only four command line options. They are:
+
+B<-gifs>: Generate GIFs instead of PNGs. Tell Orca to generate GIFs
+instead of PNGs. You may not want to generate GIFs since PNGs are 1/3
+the size of GIFs and take less time to generate.
B<-o>: Once. This tells Orca to go through the steps of finding files,
-updating the RRDs, updating the GIFs, and creating the HTML files once.
+updating the RRDs, updating the PNGs, and creating the HTML files once.
Normally, Orca loops continuously looking for new and updated files.
B<-r>: RRD only. Have Orca only update its RRD files. Do not generate
-any HTML or GIF files. This is useful if you are loading in a large
+any HTML or PNG files. This is useful if you are loading in a large
amount of data in several invocations of Orca and do not want to create
-the HTML and GIF files in each run since it is time consuming.
+the HTML and PNG files in each run since it is time consuming.
B<-v>: Verbose. Have Orca spit out more verbose messages. As you add
more B<-v>'s to the command line, more messages are sent out. Any more
@@ -3404,12 +3624,13 @@
=head1 ARCHITECTURE ISSUES
Because Orca is extremely IO intensive, I recommend that the host that
-locally mounts the web server content be the same machine that runs Orca.
-In addition, the RRD data files that Orca uses also require a good amount
-of IO. The machine running Orca should always have the B<data_dir>
-directory locally mounted. It is more important this B<data_dir>
-be locally stored than B<html_dir> for performance concerns. The two
-options B<data_dir> and B<html_dir> are described in more detail below.
+locally mounts the RRD data files be the same machine that runs Orca.
+In addition, the HTML and image files that Orca creates also require a
+good amount of IO. The machine running Orca should always have the
+B<rrd_dir> directory locally mounted. It is more important this
+B<rrd_dir> be locally stored than B<html_dir> for performance concerns.
+The two options B<html_dir> and B<rrd_dir> are described in more detail
+below.
=head1 INSTALLATION AND CONFIGURATION
@@ -3417,7 +3638,7 @@
instructs Orca on what to do. The configuration file is based on a
key/value pair structure. The key name must start at the beginning of
a line. Lines that begin with whitespace are concatenated onto the last
-key's value. This is the same format as used by MRTG and Cricket.
+key's value.
There are three main groups of options in a Orca confg: general options,
file specific options, and plot specific options. General options may
@@ -3444,7 +3665,7 @@
=item B<html_dir> I<directory>
B<html_dir> specifies the root directory for the main index.html and
-all underlying HTML and GIF files that Orca generates. This should
+all underlying HTML and PNG files that Orca generates. This should
not be a directory that normal users will edit. Ideally this directory
should be on a disk locally attached to the host running Orca, but is
not necessary.
@@ -3452,27 +3673,27 @@
If I<directory> does not begin with a / and the B<base_dir> option was
set, then the B<base_dir> directory will be prepended to I<directory>.
-=item B<data_dir> I<directory>
+=item B<rrd_dir> I<directory>
-B<data_dir> specifies the root directory for the location of the RRD data
+B<rrd_dir> specifies the root directory for the location of the RRD data
files that Orca generates. For best performance, this directory should
be on a disk locally attached to the host running Orca. Otherwise,
the many IO operations that Orca performs will be greatly slowed down.
-It is more important this B<data_dir> be locally stored than B<html_dir>
+It is more important this B<rrd_dir> be locally stored than B<html_dir>
for performance concerns.
If I<directory> does not begin with a / and the B<base_dir> option was
set, then the B<base_dir> directory will be prepended to I<directory>.
-If B<data_dir> is not defined, then B<base_dir> will be used as B<data_dir>.
-Orca will quit with an error if both B<data_dir> and B<base_dir> are
+If B<rrd_dir> is not defined, then B<base_dir> will be used as B<rrd_dir>.
+Orca will quit with an error if both B<rrd_dir> and B<base_dir> are
not set.
=item B<base_dir> I<directory>
If B<base_dir> is set, then it is used to prepend to any file or directory
based names that do not begin with /. These are currently B<state_file>,
-B<html_dir>, B<data_dir>, and the B<find_files> option in the B<files>
+B<html_dir>, B<rrd_dir>, and the B<find_files> option in the B<group>
options.
=head2 Optional General Options
@@ -3480,7 +3701,7 @@
=item B<late_interval> I<Perl expression>
B<late_interval> is used to calculate the time interval between a
-files last modification time and the time when that file is considered
+file's last modification time and the time when that file is considered
to be late for an update. In this case, an email message may be sent
out using the B<warn_email> addresses. Because different input files
may be updated at different rates, B<late_interval> takes an arbitrary
@@ -3509,10 +3730,10 @@
By default, nobody is emailed.
-=item B<expire_gifs> 1
+=item B<expire_images> 1
-If B<expire_gifs> is set then .meta files will be created for all
-generated GIF files. If the Apache web server 1.3.2 or greater is being
+If B<expire_images> is set then .meta files will be created for all
+generated PNG files. If the Apache web server 1.3.2 or greater is being
used, then the following modifications must added to srm.conf or
httpd.conf.
@@ -3527,7 +3748,7 @@
---
> MetaSuffix .meta
-By default, expiring the GIF files is not enabled.
+By default, expiration of images is not enabled.
=item B<find_times> I<hours:minutes> [I<hours:minutes> ...]
@@ -3565,16 +3786,16 @@
sub_dir 1
-=head2 Files Options
+=head2 Group Options
The next step in configuring Orca is telling where to find the files to
use as input, a description of the columns of data comprising the file,
the interval at which the file is updated, and where the measurement
-time is stored in the file. This is stored into a files set.
+time is stored in the file. This is stored into a group.
-A generic example of the files set and its options are:
+A generic example of a group and its options are:
- files FILES_KEY1 {
+ group GROUP_NAME1 {
find_files filename1 filename2 ...
column_description column1_name column2_name ...
date_source file_mtime
@@ -3584,19 +3805,19 @@
.
}
- files FILES_KEY2 {
+ group GROUP_NAME2 {
.
.
}
-The key for a files set, in this example FILES_KEY1 and FILE_KEY2, is a
+The key for a group, in this example GROUP_NAME1 and GROUP_NAME2, is a
descriptive name that is unique for all files and is used later when the
plots to create are defined. Files that share the same general format
-of column data may be grouped under the same files key. The options
-for a particular files set must be enclosed in the curly brackets {}'s.
-An unlimited number of file sets may be listed.
+of column data may be grouped together. The options
+for a particular group must be enclosed in the curly brackets {}'s.
+An unlimited number of groups may be listed.
-=head2 Required Files Options
+=head2 Required Group Options
=item B<find_files> I<path|regexp> [I<path|regexp> ...]
@@ -3621,14 +3842,14 @@
source1 is data from one place and source2 is data from another place,
then Orca needs to be told to treat the data from each file as distinct
data sources. This be accomplished in two ways. The first is by creating
-another files { ... } option set. However, this requires copying all
+another group { ... } set. However, this requires copying all
of the text and makes maintenance of the configuration file complex.
The second and recommend approach is to place ()'s around parts of the
regular expression to tell Orca how to distinguish the two data files:
find_files /data/(source\d)
-This creates two "groups", one named source1 and the other named source2
+This creates two groups, one named source1 and the other named source2
which will be plotted separately. One more example:
find_files /data/solaris.*/(.*)/percol-\d{4}-\d{2}-\d{2}
@@ -3643,14 +3864,14 @@
and treat the files in the olympia and sunridge directories as distinct,
but the files within each directory as from the same data source.
-If any of the paths or regular expressions given to B<find_Files> do not
+If any of the paths or regular expressions given to B<find_files> do not
begin with a / and the B<base_dir> option was set, then the B<base_dir>
directory will be prepended to the path or regular expression.
=item B<interval> I<seconds>
The B<interval> options takes the number of seconds between updates for
-the input data files listed in this files set.
+the input data files listed in this group.
=item B<column_description> I<column_name> [I<column_name> ...]
@@ -3659,7 +3880,7 @@
For Orca to plot the data, it needs to be told what each column of
data holds. This is accomplished by creating a text description for
each column. There are two ways this may be loaded into Orca. If the
-input data files for a files set do not change, then the column names
+input data files for a group do not change, then the column names
can be listed after B<column_description>:
column_description date in_packets/s out_packets/s
@@ -3671,7 +3892,7 @@
This informs Orca that it should read the first line of all the input
data files for the column description. Orca can handle different files
-in the same files set that have different number of columns and column
+in the same group that have different number of columns and column
descriptions. The only limitation here is that column descriptions
are white space separated and therefore, no spaces are allowed in the
column descriptions.
@@ -3696,7 +3917,7 @@
=item B<reopen> 1
-Using the B<reopen> option for a files set instructs Orca to close
+Using the B<reopen> option for a group instructs Orca to close
and reopen any input data files when there is new data to be read.
This is of most use when an input data file is erased and rewritten by
some other process.
@@ -3708,7 +3929,7 @@
plot {
title Plot title
- source FILES_KEY1
+ source GROUP_NAME1
data column_name1
data 1024 * column_name2 + column_name3
legend First column
@@ -3720,7 +3941,7 @@
.
}
-Unlike the files set, there is no key for generating a plot. An unlimited
+Unlike the group, there is no key for generating a plot. An unlimited
number of plots can be created.
Some of the plot options if they have the two characters %g or %G
@@ -3737,24 +3958,24 @@
=head2 Required Plot Options
-=item B<source> I<files_key>
+=item B<source> I<group_name>
-The B<source> argument should be a single key name for a files set from
-which data will be plotted. Currently, only data from a single files
-set may be put into a single plot.
+The B<source> argument should be a single group name from which data will
+be plotted. Currently, only data from a single group may be put into a
+single plot.
=item B<data> I<Perl expression>
=item B<data> I<regular expression>
The B<data> plot option tells Orca the data sources to use to place
-in a single GIF plot. At least one B<data> option is required for a
+in a single PNG plot. At least one B<data> option is required for a
particular plot and as many as needed may be placed into a single plot.
Two forms of arguments to B<data> are allowed. The first form
allows arbitrary Perl expressions, including mathematical expressions,
that result in a number as a data source to plot. The expression may
-contain the names of the columns as found in the files set given to the
+contain the names of the columns as found in the group given to the
B<source> option. The column names must be separated with white space
from any other characters in the expression. For example, if you have
number of bytes per second input and output and you want to plot the
@@ -3774,7 +3995,7 @@
the portion of the match in the ()'s is placed into the normal Perl $1,
$2, etc variables. Take the following configuration for example:
- files throughput {
+ group throughput {
find_files /data/solaris.*/(.*)/percol-\d{4}-\d{2}-\d{2}
column_description hme0Ipkt/s hme0Opkt/s
hme1Ipkt/s hme1Opkt/s
@@ -3934,17 +4155,23 @@
in the options for a particular plot.
-=head2 GIF Plot Plotting Options
+=head2 PNG Plot Plotting Options
+
+=item B<base> I<number>
+
+If memory is being plotted (and not network traffic) this value should
+be set to 1024 so that one Kb is 1024 bytes. For traffic measurements,
+1 Kb/s is 1000 b/s. By default, a base of 1000 is used.
=item B<plot_width> I<number>
Using the B<plot_width> option specifies how many pixels wide the drawing
-area inside the GIF is.
+area inside the PNG is.
=item B<plot_height> I<number>
Using the B<plot_height> option specifies how many pixels high the
-drawing area inside the GIF is.
+drawing area inside the PNG is.
=item B<plot_min> I<number>
@@ -3958,26 +4185,31 @@
By default this will be auto-configured from the data you select with
the graphing functions.
-=item B<rigid_min_max> 1
+=item B<rigid_min_max>
Normally Orca will automatically expand the lower and upper limit if
the graph contains a value outside the valid range. By setting the
B<rigid_min_max> option, this is disabled.
+=item B<logarithmic>
+
+Normally Orca will use a linear scale for the Y axis. If a plot contains
+this option, then a logarithmic scale will be used.
+
=item B<title> <text>
Setting the B<title> option sets the title of the plot. If you place
%g or %G in the title, it is replaced with the text matched by any
-()'s in the files set B<find_files> option. %g gets replaced with the
+()'s in the group B<find_files> option. %g gets replaced with the
exact text matched by the ()'s and %G is replaced with the same text,
except the first character is capitalized.
=item B<y_legend> <text>
Setting B<y_legend> sets the text to be displayed along the Y axis of
-the GIF plot.
+the PNG plot.
-=head2 Multiple GIF Plot Ploting Options
+=head2 Multiple PNG Plot Ploting Options
The following options should be specified multiple times for each data
source in the plot.
@@ -3995,7 +4227,7 @@
=item B<legend> I<text>
The B<legend> option specifies for a single data source the comment that
-is placed below the GIF plot.
+is placed below the PNG plot.
=head1 MAILING LISTS
Modified: trunk/orca/CHANGES
==============================================================================
--- trunk/orca/CHANGES (original)
+++ trunk/orca/CHANGES Sat Jul 13 19:22:26 2002
@@ -1,3 +1,381 @@
+Thu Oct 14 14:44:00 PDT 1999
+
+ Release Orca 0.24.
+
+Thu Oct 14 12:17:29 PDT 1999
+
+ Back down to RRDtool 1.0.7 with only my filename length patch
+ applied per Tobi.
+
+ Revamp the INSTALL, NEWS, and other files to get a release out.
+
+ Up the version number of the included RRDs package to 1.000072
+ since it contains some patches specifically for Orca.
+
+Wed Oct 13 12:40:29 PDT 1999
+
+ Orcallator.se 1.19 prevents a division by zero in calculating
+ the mean_disk_busy if the number of disks on the system is 0.
+
+ Move the URL http://www.geocities.com/~bzking/orcallator-docs/
+ to http://www.geocities.com/~bzking/docs/orcallator.html.
+
+ In cases where there are a large number of data sources in a
+ single image, then the list of available colors is expired.
+ Now reuse the colors.
+
+ Make sure plots are displayed in each subgroup's HTML files in
+ the order they appear in the configuration file.
+
+Tue Oct 12 10:27:44 PDT 1999
+
+ Update orcallator.cfg to remove the maximum and average disk busy
+ plot and add a plot that displays the run percent for each disk.
+
+ Orcallator 1.18 now renames disk_runp.c?t?d? to disk_runp_c?t?d?.
+
+Mon Oct 11 14:31:38 PDT 1999
+
+ Update orcallator.cfg to plot the disk space and inode usage
+ for all locally mounted filesystems.
+
+ Apply a patch to RRDtool that increases the maximum filename
+ length for generated image files from 255 to 1024.
+
+ Rename &strip_key_name to &escape_name.
+
+Fri Oct 8 14:23:37 PDT 1999
+
+ Save even more space in Orca generated HTML and image filenames.
+ On large directories, up to 10% disk space can be saved alone
+ in filenames according to du. Also, if generated filenames are
+ longer than 235 characters, then compute a MD5 hash of the name,
+ trim the name down to 210 characters, and append the MD5 hash.
+
+ Orcallator.se 1.17 now skips locally mounted /cdrom filesystems.
+
+ Increase the number of default known colors to 11.
+
+Wed Oct 6 17:59:05 PDT 1999
+
+ Orcallator.se 1.16 now compresses its log files after it has
+ completed a day's log using the command in the COMPRESSOR
+ environmental variable. start_orcallator now passed this
+ environmental variable to orcallator.se.
+
+Wed Oct 6 15:19:09 PDT 1999
+
+ Have configure.in look for bzip2, bunzip2, gzip, gunzip, compress,
+ and uncompress. Define the COMPRESSOR and UNCOMPRESSOR_PIPE as
+ the best compression tool to use and add these names to the list
+ of names being substituted. This only gets defined if both a
+ compress and uncompression tool is used.
+
+ To keep backwards compatibility in orcallator.se, define WATCH_WEB
+ if WATCH_HTTPD is defined.
+
+Tue Oct 5 14:54:59 PDT 1999
+
+ Update orcallator.se to 1.15. kvm$mpid is a int not a long.
+ This caused problems on Solaris 7 hosts running a 64 bit kernel.
+
+Fri Oct 1 12:15:47 PDT 1999
+
+ Update orcallator.se to 1.14. Rename disk.c?t?d? column names
+ to disk_runp.c?t?d? to better reflect the data being recorded
+ and to allow for more per disk information later.
+
+ Install the latest RRDtool patch.
+
+Thu Sep 29 19:19:23 PDT 1999
+
+ Add some more space between a plot's legend and the minimum,
+ maximum, etc information for a particular piece of data.
+
+ Allow mathematical expressions in plots where the first data
+ contains a regular expression.
+
+Fri Sep 24 11:50:33 PDT 1999
+
+ Many fixes and improvements to orcallator.se. Fix a bug in the
+ disk_mean calculation where it was being divided by the wrong
+ disk_count. Now it should be much larger and in scale with
+ disk_peak. When WATCH_DISK is defined, now print each disk's
+ run percent. Add a new define WATCH_MOUNTS, which reports each
+ mount point's disk space and inode capacity, usage, available
+ for non-root users and percent used. This comes from Duncan
+ Lawie tyger at hoopoes.com. Add some smarts so that if the number
+ of interfaces, physical disk, or mounted partitions changes,
+ then a new header is printed. This will prevent column name
+ and data mixups when the system configuration changes.
+
+Mon Sep 20 11:18:21 PDT 1999
+
+ Include Storable 0.6.5.
+
+Tue Sep 14 15:54:38 PDT 1999
+
+ Add the page scan rate to orcallator.se as column scanrate.
+
+Tue Sep 7 12:21:52 PDT 1999
+
+ Update the archive URLs for the orca-* mailing lists.
+
+Thu Sep 2 11:03:19 PDT 1999
+
+ Include and require RRDtool 1.0.7.
+
+ Make some more minor changes to have Orca run with Perl 5.004_01.
+
+Tue Aug 24 11:32:34 PDT 1999
+
+ Include and require Math::Interpolate 1.05.
+
+Thu Aug 19 14:13:16 PDT 1999
+
+ No longer include Compress::Zlib, which was to be used to read in
+ compressed source data files without spawning a separate process.
+ Now it seems easier to just call gunzip -c.
+
+Wed Aug 18 11:10:21 PDT 1999
+
+ Read in .gz files using gunzip, .Z files using uncompress,
+ and .bz2 files with bunzip2.
+
+ Clean up some bugs where the RRDs::graph -r option would always
+ be used.
+
+ Plots can now take a logarithmic option which specified that
+ the Y axis will have a logarithmic scale.
+
+Tue Aug 17 11:50:34 PDT 1999
+
+ Include and require Math::Interpolate 1.04.
+
+Mon Aug 16 12:11:48 PDT 1999
+
+ Add locking on a particular configuration file. Make a directory
+ using the configuration filename.
+
+ Include and require RRDtool 1.0.6.
+
+Fri Aug 13 17:10:23 PDT 1999
+
+ Install librrd.so on Solaris hosts in $libdir so that
+ orcallator.se can attach to it.
+
+Fri Aug 13 15:35:21 PDT 1999
+
+ Include and require RRDtool 1.0.5.
+
+Mon Aug 9 10:32:42 PDT 1999
+
+ Include and require RRDtool 1.0.4.
+
+Fri Aug 6 09:29:14 PDT 1999
+
+ Include Digest::MD5 2.09 but continue to only require 2.00.
+
+Thu Aug 5 20:58:32 PDT 1999
+
+ Make sure start_orcallator looks to see if SE is defined. If it
+ is not, then print a message stating where to find the SE toolkit.
+
+Fri Jul 30 09:12:20 PDT 1999
+
+ Update orcallator.cfg to plot the new process spawn rate.
+
+ Include and require RRDtool 1.0.3.
+
+Thu Jul 29 10:36:20 PDT 1999
+
+ To fix the problem of too long HTML and image file names,
+ shorten the names as they get passed through strip_key_name.
+ Now orcallator -> o, orca -> o, _times_ -> _X_, _percent_ ->
+ _pct_, _number_ -> _num_. The upgrade_installation will perform
+ these renames on a list of directories.
+
+ Since orcallator is only one of many different data gatherers,
+ move it into its own directory.
+
+Wed Jul 28 10:10:53 PDT 1999
+
+ If WATCH_CPU is defined and if the user can read /dev/kmem then
+ orcallator.se will now measure the process spawn rate over a 5
+ minute interval and also record the maximum rate measured over
+ a 5 second interval.
+
+ Add a href field for a plot in the configuration file. This,
+ if defined, lets you make a particular target type be a HREF to
+ read something about that target type.
+
+ Include Digest::MD5 2.08 but continue to only require 2.00.
+
+Fri Jul 23 13:41:36 PDT 1999
+
+ Include and require RRDtool 1.0.1.
+
+Thu Jul 22 17:06:45 PDT 1999
+
+ Use a blessed reference to an array for the Orca::DataFile,
+ Orca::HTMLFile, Orca::ImageFile, Orca::OpenFileHash,
+ Orca::RRDFile, and Orca::OpenFileHash classes.
+
+Mon Jul 19 12:57:56 PDT 1999
+
+ On a fresh install make sure to mkdir RRD_DIR/orcallator.
+
+ Change the tag name data_dir to rrd_dir to make it clearer what
+ kind of data is being loaded.
+
+ Integrate building of Compress::Zlib into the Makefile structure.
+ Make use of the Zlib 1.1.3 library included with RRDtool for
+ Compress::Zlib.
+
+Fri Jul 16 11:12:02 PDT 1999
+
+ Include and require RRDtool 1.0.0 and Compress::Zlib 1.05.
+
+ Update the colors in orcallator.cfg. In all plots, make one
+ plot use area.
+
+Thu Jul 15 11:35:52 PDT 1999
+
+ As noted by Bob Hoekstra <Bob_Hoekstra at merck.com>, orcallator.se
+ was outputting the same information for ??load as for ??runq.
+ Orcallator.se no longer generates that data and orcallator.cfg
+ no longer generates plots for it.
+
+Wed Jul 14 11:04:09 PDT 1999
+
+ Switch to use PNGs instead of GIFs. They take up 1/3 less space
+ than GIFs and at least 10% less time to generate.
+
+ Revamp the INSTALL document to reflect the new * -> _times_
+ change and add some documentation of the file descriptor limit.
+
+ Uncompress and read .Z and .gz compressed input files on the fly.
+
+Wed Jul 14 10:22:13 PDT 1999
+
+ Include and require RRDtool 0.99.52.
+
+Tue Jul 13 12:34:29 PDT 1999
+
+ Include Storable 0.604 but continue to only require 0.603.
+
+Thu Jul 8 16:22:45 PDT 1999
+
+ Include and require RRDtool 0.99.50.
+
+Wed Jul 7 13:26:55 PDT 1999
+
+ Rename the migrate_to_orcallator script to upgrade_installation.
+
+ Per Vadim Shulkin <vadim.shulkin at csfb.com> request, replace the
+ * in all generated filenames with _times_. Put this rename in
+ the new upgrade_installation script.
+
+Tue Jul 6 18:14:20 PDT 1999
+
+ Include and require RRDtool 0.99.49.
+
+Sun Jul 4 16:57:28 PDT 1999
+
+ Include and require RRDtool 0.99.47.
+
+Fri Jul 2 18:16:21 PDT 1999
+
+ Include and require RRDtool 0.99.46.
+
+Tue Jun 29 13:18:57 PDT 1999
+
+ Add a new option for each plot named base that allows the base
+ for each plot to be either 1000 or 1024. This allows for plotting
+ of memory or network type of datas.
+
+ Use the new base option in the number of bytes of available swap
+ space plots.
+
+ Include and require RRDtool 0.99.45.
+
+ Make use of RRDtool's 0.99.45 capability to place the SI number
+ suffix to numbers appearing in the legend using the GPRINT
+ command.
+
+Mon Jun 28 11:16:46 PDT 1999
+
+ Now only print found filenames if the verbose level is above one.
+ Orca was generating too much output.
+
+ When creating all the HTML files, do not write directly to the
+ new filename, instead write to a temporary filename and when
+ the file is closed, then rename it to the final name. This lets
+ the user view existing HTML files even when the new HTML files
+ are being updated.
+
+ Include RRDtool 0.99.41 but continue to only require 0.99.29.
+
+Tue Jun 22 10:54:39 PDT 1999
+
+ Include RRDtool 0.99.40 but continue to only require 0.99.29.
+
+Thu Jun 10 09:39:36 PDT 1999
+
+ When 80% of a host's processes are web serving processes, plotting
+ the total system and number of httpd's together on the same plot
+ makes sense. However, for people running a tiny web server with
+ only a few processes, this does not make sense, so a separate
+ plot is created. Noted by Paul Company <paul.company at plpt.com>.
+
+Tue Jun 8 10:57:39 PDT 1999
+
+ Make the table of contents in INSTALL consistent with the contents
+ of the file.
+
+Mon Jun 7 13:01:05 PDT 1999
+
+ Include RRDtool 0.99.32 but continue to only require 0.99.29.
+
+Thu Jun 3 13:27:09 PDT 1999
+
+ Fix a bug in Orca::SourceDataFile::add_plots where it was
+ dereferencing an undef.
+
+ Since orcallator.se may watch many different types of web
+ server logs, move some of the common code into CPP defines.
+ Defines are preferred over functions since the function call
+ overhead in SE is larger than having the code inlined.
+
+ Have orcallator.se watch Yahoo! style web access logs if
+ -DWATCH_YAHOO is passed on the command line.
+
+ If any of the environmental variables used by orcallator.se were
+ defined then the value was used, even if the length was zero.
+ Now the length of the variable must be non-zero for the value
+ to be used, otherwise the default value is used.
+
+Wed Jun 2 12:11:44 PDT 1999
+
+ Optimize orcallator.se slightly when it determines the size bin
+ for a particular file served.
+
+ Change the define WATCH_HTTPD in orcallator.se to WATCH_WEB to
+ be consistent with the other WEB_* defines and environmental
+ variables.
+
+Tue Jun 1 21:53:15 PDT 1999
+
+ For orcallator.se, if the WEB_SERVER environmental variable
+ is set, then the value of of WEB_SERVER is used to count the
+ number of web server processes. If WEB_SERVER is not defined
+ it defaults to httpd.
+
+Fri May 28 17:39:36 PDT 1999
+
+ Add to the plot title the type of the plot, i.e. 'Yearly',
+ in every GIF. Requested by Tom Murray <murray at reston.wcom.net>.
+
Thu May 27 10:53:02 PDT 1999
Release version 0.23.
@@ -25,11 +403,11 @@
Include RRDtool 0.99.31 but continue to only require 0.99.29.
- Add a new quarterly plot that shows the last 100 days. This is
+ Add a new quarterly plot that shows the last 100 days. This is
a nice transition between the monthly and yearly plots.
Change the number of days shown in the yearly plot from 500 to
- 428, which is one year and two months. Reducing the number
+ 428, which is one year and two months. Reducing the number
of days from 500 by at least one day will speed up the GIF
generation time because by default the plot portion of the GIFs
are 500 pixels wide.
@@ -44,24 +422,29 @@
Put a closing ) in a error message in RRDtool 0.99.29.1.
- Fix a bug in queue_data where it was sending data to
- rrd_update that was already in the RRD file.
+ Fix a bug in queue_data where it was sending data to rrd_update
+ that was already in the RRD file.
Wed May 19 10:43:48 PDT 1999
- Restructured the code so each Orca::SourceDataFile has only
- one anonymous subroutine to read in all the valued from a single
+ Remove the load_state and save_state subroutines and replace
+ them with an object-oriented Orca::State class for saving
+ information between Orca invocations. Use the Storable class
+ to save information instead of a text based method.
+
+ Restructured the code so each Orca::SourceDataFile has only one
+ anonymous subroutine to read in all the valued from a single
line of the source data file. This sped Orca up slightly.
- Add a -r option to Orca to have it not create any HTML or
- GIF files and only update the RRD files.
+ Add a -r option to Orca to have it not create any HTML or GIF
+ files and only update the RRD files.
- Fix a bug where if the number of columns changed in from one
- source file to the next source file in a files group, the
- column index used to get a particular value is the old index
- for the old file and not the new index for the new file. This
- fix involved having the Orca::SourceDataFile object run the
- anonymous subroutines to pick the correct data from a line
+ Fix a bug where if the number of columns changed in from
+ one source file to the next source file in a files group,
+ the column index used to get a particular value is the old
+ index for the old file and not the new index for the new file.
+ This fix involved having the Orca::SourceDataFile object run
+ the anonymous subroutines to pick the correct data from a line
instead of Orca::RRDFile.
Remove some unused methods: Orca::OpenFileHash::list,
@@ -107,7 +490,7 @@
The paths used to find input files are now passed through
the following regular expressions: s:^\\./:: and s:/\\./:/:g.
- These remove unneccessary searches through the current directory.
+ These remove unnecessary searches through the current directory.
Perl_glob will only return found files and no other type.
It will also not follow any directories named `..'.
Added: trunk/orca/docs/manual.html
==============================================================================
--- trunk/orca/docs/manual.html (original)
+++ trunk/orca/docs/manual.html Sat Jul 13 19:22:26 2002
@@ -0,0 +1,98 @@
+CPU Utilization doesn't break out on a multiprocessor system.
+In fact, no explaination on how it works on such a platform.
+I guess I'll look at the source.
+I'm assuming it aggregates all processors.
+
+--pjc
+
+And none of the give a small paragraph description
+of the 33 Data Sets.
+
+As I mentioned before, most of these are self explainitory,
+but some need more explaination. For example,
+ how large is a packet &/or segment (I know they're variable length),
+ what is a Nocanput Rate,
+ what is the unit, the y-axis (Disk Busy Measure) on Peak & Mean Disk
+Busy
+ ...
+ I'm looking them up in Adrian's book, but it would be nice if they
+were
+ included in the documentation for orcallator.
+
+ Average # Processes in Run Queue
+ System Load
+ CPU Usage
+ Number of System & Httpd Processes
+ Web Server Hit Rate
+ Web Server File Size
+ Web Server Data Transfer Rate
+ Web Server HTTP Error Rate
+ Bits Per Second: <interface>
+ Packets Per Second: <interface>
+ Errors Per Second: <interface>
+ Ethernet Nocanput Rate
+ Ethernet Deferred Packet Rate
+ Ethernet Collisions
+ TCP Bits Per Second
+ TCP Segments Per Second
+ TCP Retransmission & Duplicate Received Percentage
+ TCP New Connection Rate
+ TCP Number Open Connections
+ TCP Reset Rate
+ TCP Attempt Fail Rate
+ TCP Listen Drop Rate
+ Sleeps on Mutex Rate
+ NFS Call Rate
+ NFS Timeouts & Bad Transmits Rate
+ Peak & Mean Disk Busy
+ Cache Hit Percentages
+ Cache Reference Rate
+ Inode Steal Rate
+ Available Swap Space
+ Page Residence Time
+ Page Usage
+ Pages Locked & IO
+
+-----Original Message-----
+From: Blair Zajac [mailto:bzajac at geostaff.com]
+Sent: Wednesday, June 09, 1999 10:45 AM
+To: Company, Paul
+Subject: Re: Orca observations
+
+
+Hello Paul,
+
+True on the first observation, not always true on the bits per second
+depending on the OS version and the support for the different
+Ethernet port types. On 2.6 or greater, I believe all hme, le, etc
+measure bits per second, but on older OSes, you cannot get these
+on all Ethernet types.
+
+What do you mean by "No definitions for Data Sets"? Is this missing
+from the Orca manual?
+
+Thanks for the notes, I'll put them in the next release of Orca.
+
+Blair
+
+
+"Company, Paul" wrote:
+>
+> Observations on Solaris 2.x:
+>
+> + Average # Processes in Run Queue
+> and
+> System Load
+> are identical (y axis the same - should they be, no!)
+> + Bits Per Second does not work, although the Packets Per Second
+> does.
+> + No definitions for Data Sets
+>
+> File this stuff away or not.
+> Just though you might want this data.
+> I'll send you the fixes if I find them.
+>
+> --pjc
+>
+>
+
Added: trunk/orca/docs/FAQ
==============================================================================
--- trunk/orca/docs/FAQ (original)
+++ trunk/orca/docs/FAQ Sat Jul 13 19:22:26 2002
@@ -0,0 +1,7 @@
+Orcallator:
+ 1) Why are my Ethernet bits/second measurements all 0?
+
+ On 2.5.1 or older Solaris operating system releases, the kernel does
+ not measure the bits/second going through a particular device. I
+ believe some later kernel and device driver patches may fix this,
+ but Solaris 2.6 and greater definitely does measure this.
Modified: trunk/orca/NEWS
==============================================================================
--- trunk/orca/NEWS (original)
+++ trunk/orca/NEWS Sat Jul 13 19:22:26 2002
@@ -1,9 +1,122 @@
-New in version 0.23.
+New in Orca version 0.24.
+ 1) Installation notes. Due to the way Orca generated image and HTML
+ files are named, read the INSTALL file. Otherwise, you will have
+ some left over cruft that will waste disk space and you will have
+ to reload all of your source data files.
+ 2) Orca now runs under older Perls: Perl 5.004_01 or later.
+ 3) Switch to generate PNGs instead of GIFs. They take up 1/3 less disk
+ space and are created at least 10% faster. If you want Orca to
+ generate GIFs instead of PNGs, give it the -gifs flag.
+ 4) Read in .gz files using gunzip, .Z files using uncompress, and .bz2
+ files with bunzip2.
+ 5) Add to the plot title the type of the plot (i.e. 'Yearly') in
+ every image.
+ 6) Add a href field for a plot. This, if defined, appends a HREF to a
+ target name letting you point the user to a page to get more
+ information. The default orcallator.cfg has these added to point
+ to the new documentation web page
+ http://www.geocities.com/~bzking/docs/orcallator.html for all
+ orcallator.se recorded data.
+ 7) Add a new option named base that lets the user specify either a base
+ of 1000 or 1024 for autoscaling plots. This is useful for memory
+ (base 1024) vs network (base 1000) measurements and is used in
+ generating correctly calculating the base to use in calculating
+ the Y axis.
+ 8) The word logarithmic can now be used for a plot to create a
+ logarithmic Y axis scale.
+ 9) Orca no longer lists all the source files it finds to shorten verbose
+ output. This output is now generated if the verbose level is greater
+ than one.
+10) Do not overwrite existing HTML files when creating new versions until
+ the new version is finished. This allows people to better view
+ existing pages until the new page is completely finished.
+11) All generated HTML and image filenames are now created using
+ a different set of mappings. Now
+ orcallator -> o
+ orca -> o
+ _times_ -> _X_
+ _percent_ -> _pct_
+ _number_ -> _num_.
+ All older installations of Orca will need to be renamed unless you
+ want to load in all your data again. You can perform this renaming
+ on your files by running make upgrade, or if you have directories
+ that are not normally covered by the Orca install, run
+ src/upgrade_installation followed by the list of directories to search
+ in. Pass the -n flag to upgrade_installation if you want to see
+ the renames that will be performed without actually performing them.
+12) New HTML and image filenames are shorter, which can save 10% in
+ disk space on a large installation according to du -k. Also, now
+ plots containing arbitrary many data sources can be plotted without
+ exceeding the maximum file lengths.
+13) Add locking so that only one Orca can run on a single configuration
+ file at one time.
+14) Include and require RRDtool 1.0.7.2 and Math::Interpolate 1.05.
+ Include Data::Dumper 2.101, Digest::MD5 2.09, Storable 0.6.5, with
+ Orca.
+
+ These following changes are what's new in orcallator.se 1.19 since
+ version 1.7 which was included with Orca 0.23. All of the changes
+ below are taken advantage of in the included orcallator.cfg and
+ start_orcallator files.
+
+15) Orcallator.se now has a web page describing the various measurements
+ it makes. See http://www.geocities.com/~bzking/docs/orcallator.html.
+16) If the environmental variable WEB_SERVER is defined, use its value of
+ the as the name of the process to count for the number of web
+ servers on the system. If WEB_SERVER is not defined, then count
+ number of httpd's.
+17) If the COMPRESSOR environmental variable is defined, then when a new
+ log file is opened for a new day, the just closed log file is
+ compressed using the COMPRESSOR command in the following manner:
+ system(sprintf("%s %s &", COMPRESSOR, log_file)
+ COMPRESSOR should be set to something like "gzip -9", or "compress",
+ or "bzip2 -9". If the configure script finds both a compressor and
+ uncompressor tool, such as both gzip and gunzip, then start_orcallator
+ will inform orcallator.se to compress the log files at the end of a
+ day.
+18) New measurements. The first column lists the define that must
+ be passed to the SE interpreter to obtain the measurement. If you
+ use the WATCH_OS define, then all of these are now measured.
+ WATCH_MUTEX - ncpus - number of CPUs on the system
+ WATCH_CPU - #proc/s - 5 minute average process spawn rate if root
+ WATCH_CPU - #proc/p5s - maximum 5 second process spawn rate if root
+ WATCH_CPU - scanrate - page scan rate in pages per second
+ WATCH_DISK - disk_runp_c\d+t\d+d\d+ - run percent for each disk
+ WATCH_DISK - disk_rd/s - system wide read operations per second
+ WATCH_DISK - disk_wr/s - system wide write operations per second
+ WATCH_DISK - disk_rK/s - system wide kilobytes read per second
+ WATCH_DISK - disk_wK/s - system wide kilobytes written per second
+ WATCH_RAM - freememK - number of free kilobytes of memory on the system
+ WATCH_MOUNTS - mntC_* - capacity of disk in kilobytes
+ WATCH_MOUNTS - mntc_* - inode capacity of disk
+ WATCH_MOUNTS - mntU_* - used capacity of disk in kilobytes
+ WATCH_MOUNTS - mntu_* - used inode capacity of disk
+ WATCH_MOUNTS - mntA_* - available kilobytes for non-root users
+ WATCH_MOUNTS - mnta_* - available inodes for non-root users
+ WATCH_MOUNTS - mntP_* - percentage of kilobytes used for non-root users
+ WATCH_MOUNTS - mntp_* - percentage of inodes used for non-root users
+19) Add some smarts so that if the number of interfaces, physical
+ disks, or mounted partitions changes, then a new header is printed.
+ This will prevent column name and data mixups when the system
+ configuration changes.
+20) Prevent a division by zero in calculating the mean_disk_busy if the
+ number of disks on the system is 0.
+21) Fix a bug in the disk_mean calculation where it was being divided
+ by the wrong disk_count. Now it should be much larger and in scale
+ with disk_peak.
+22) Increase the number of characters for each network interface from four
+ to five.
+23) If WATCH_YAHOO is defined, then process the access log as a Yahoo!
+ style access log.
+24) Restructure the code to handle different web server access log formats
+ easier.
+
+New in Orca version 0.23.
1) Fix two important bugs in orcallator_running and start_orcallator
which where using old PERCOLLATOR_DIR variables instead of the new
ORCALLATOR_DIR.
-New in version 0.22.
+New in Orca version 0.22.
1) Add a new command line option (-r) that tells Orca to only update
the RRD data files and not to generate any HTML or GIF files.
This is useful if you are loading in a large amount of data in several
@@ -20,10 +133,10 @@
4) A temporary fix: Skip and do not complain about input source data
file lines containing the word timestamp in it.
5) Removed some unused methods to make Orca smaller.
- 6) Added some more documentation to orcallater.cfg.
+ 6) Added some more documentation to orcallator.cfg.
7) Make Orca slightly faster.
-New in version 0.21.
+New in Orca version 0.21.
1) Every file containing the words percollator, percol and perc has
been renamed to contain the word orcallator. A new make target named
migrate will change all filenames in an installed Orca directory to
Modified: trunk/orca/README
==============================================================================
--- trunk/orca/README (original)
+++ trunk/orca/README Sat Jul 13 19:22:26 2002
@@ -1,70 +1,78 @@
-This package contains two main tools: Orca and orcallator.se.
-
-Orca
+ORCA
=====
Orca is a tool useful for plotting arbitrary data from text files onto
a directory on a Web server. It has the following features:
- * Configuration file based.
- * Reads white space separated data files.
- * Watches data files for updates and sleeps between reads.
- * Finds new files at specified times.
- * Remembers the last modification times for files so they do not have to
- be reread continuously.
- * Can plot the same type of data from different files into different
- or the same GIFs.
- * Different plots can be created based on the filename.
- * Parses the date from the text files.
- * Create arbitrary plots of data from different columns.
- * Ignore columns or use the same column in many plots.
- * Add or remove columns from plots without having to deleting RRDs.
- * Plot the results of arbitrary Perl expressions, including mathematical
- ones, using one or more columns.
- * Group multiple columns into a single plot using regular expressions on
- the column titles.
- * Creates an HTML tree of HTML files and GIF plots.
- * Creates an index of URL links listing all available targets.
- * Creates an index of URL links listing all different plot types.
- * No separate CGI set up required.
- * Can be run under cron or it can sleep itself waiting for file updates
- based on when the file was last updated.
+ * Creates an HTML tree of HTML and image (PNG or GIF) files.
+ * Creates an index of URL links listing all available targets.
+ * Creates an index of URL links listing all different plot types.
+ * No separate CGI set up required.
+ * Can be run under cron or it can sleep itself waiting for file updates
+ based on when the file was last updated.
+ * Configuration file based.
+ * Reads arbitrarily formatted text or binary data files.
+ * Watches data files for updates and sleeps between reads.
+ * Finds new files at specified times.
+ * Remembers the last modification times for files so they do not have to
+ be reread continuously.
+ * Allows arbitrary grouping of data from different files into the same
+ or different plots.
+ * Allows arbitrary math performed on data read from one file.
An example of the output generated by Orca is located at:
-http://www.geocities.com/~bzking/orca-example/
+ http://www.geocities.com/~bzking/orca-example/
Orca is written completely in Perl. To install, configure and use
-Orca read the INSTALL file. Some sample configuration files for
-Orca can be found in the sample_configs directory.
+Orca, read the INSTALL file. Some sample configuration files for
+Orca can be found in the lib directory.
-Orca is based on the RRD tool written by Tobias Oetiker. To really
-understand Orca you should understand RRD. Get RRD from
+For an overview of the design decisions that made Orca what it is today,
+read the article
-http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
+ http://www.sunworld.com/sunworldonline/swol-07-1999/swol-07-realtime.html
-I recommend reading the documentation that comes with RRD. It will
+Orca is based on the RRDtool written by Tobias Oetiker. To really
+understand Orca and how it saves and manages your data, you should
+understand RRDtool, which serves as the backend binary data filestore.
+I recommend reading the
+documentation that comes with RRDtool. It will
explain how the data files Orca uses are created, maintained, and
-used to create the GIFs that Orca creates.
+used to create the images that Orca creates. Read about RRDtool
+at
-orcallator.se
-==============
+ http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
+
+DATA COLLECTION TOOLS
+=====================
+
+Orca does not generate the data itself that it plots. This is left for
+other programs. Currently only one such data gathering and measuring
+program is included here with Orca.
+
+ orcallator.se
+ ==============
+
+ The other tool in this package is an updated version of orcallator.se
+ written by Adrian Cockcroft. Percollator.se is a tool written for Solaris
+ SPARC and Solaris x86 that collects a large amount of system and web
+ server statistics and prints them into a file for later processing
+ and plotting. For documentation on the original orcallator.se tool,
+ see the URL http://www.sunworld.com/swol-03-1996/swol-03-perf.html
-The other tool in this package is an updated version of orcallator.se
-written by Adrian Cockcroft. Percollator.se is a tool written for Solaris
-SPARC and Solaris x86 that collects a large amount of system and web
-server statistics and prints them into a file for later processing
-and plotting. For documentation on the original orcallator.se tool,
-see the URL http://www.sunworld.com/swol-03-1996/swol-03-perf.html
-
-This version of orcallator.se collects much more data than the original
-on Solaris systems. I have designed an Orca configuration file designed
-to read the output of this orcallator. Sample output from this set up
-is displayed at
+ This version of orcallator.se collects much more data than the original
+ on Solaris systems. I have designed an Orca configuration file designed
+ to read the output of this orcallator. Sample output from this set up
+ is displayed at
-http://www.geocities.com/~bzking/orca-example/
+ http://www.geocities.com/~bzking/orca-example/
-AVAILABLE AT
+ Documentation on the data that orcallator.se collects can be viewed at
+
+ http://www.geocities.com/~bzking/docs/orcallator.html
+
+DOWNLOAD AT
============
These tools are available for download from
@@ -74,10 +82,48 @@
MAILING LISTS
=============
-Discussions regarding Orca take place on the mrtg-developers mailing
-list located at mrtg-developers at list.ee.ethz.ch. To place yourself
-on the mailing list, send a message with the word subscribe to it
-to mrtg-developers-request at list.ee.ethz.ch.
+Four mailing lists exist for Orca. To subscribe to any of the mailing
+lists, please visit the URL listed below. You have the option of choosing a
+digest form of the mailing list if you wish it when you subscribe to
+the mailing list or anytime thereafter. To send email to any of these
+lists you must subscribe to the list.
+
+orca-announce at onelist.com
+ Subscribe http://www.onelist.com/subscribe/orca-announce
+ Archive http://www.onelist.com/archive/orca-announce
+
+ This is a LOW volume moderated mailing list for announcing stable
+ releases of Orca.
+
+orca-help at onelist.com
+ Subscribe http://www.onelist.com/subscribe/orca-help
+ Archive http://www.onelist.com/archive/orca-help
+
+ This mailing list is a first stop mailing list for getting help in
+ setting up and getting Orca running. Problems relating to downloading,
+ configuring, compiling the necessary Perl modules, and installing Orca
+ belong here. People interested anything more than this, such as
+ developing data gathering modules or active Perl development, should be
+ on one or both of the following mailing lists. Once you get Orca
+ running to your satisfaction, you may want to remove yourself from this
+ list.
+
+orca-discuss at onelist.com
+ Subscribe http://www.onelist.com/subscribe/orca-discuss
+ Archive http://www.onelist.com/archive/orca-discuss
+
+ This mailing list is for active users of Orca who are doing new
+ interesting things with Orca and want to discuss Orca but are not
+ interested in actively developing Orca source code. These people are
+ also not interested in helping people get Orca running on their systems.
+
+orca-developers at onelist.com
+ Subscribe http://www.onelist.com/subscribe/orca-developers
+ Archive http://www.onelist.com/archive/orca-developers
+
+ This mailing list is for people who are interested in actively developing,
+ fixing and improving Orca's source code and related data gathering
+ modules, and porting Orca to new platforms.
INSTALLATION
============
@@ -87,5 +133,18 @@
AUTHOR
======
-These two tools were written by Blair Zajac <bzajac at geostaff.com>. I
-welcome any patches for bugs or improvements, comments and suggestions.
+These two tools were written by Blair Zajac. I welcome any patches for
+bugs or improvements, comments and suggestions. Please send any Orca
+correspondence to orca-users at onelist.com or orca-developers at onelist.com,
+which I read and participate on.
+
+If you wish to contact me directly, my email address is
+bzajac at geostaff.com.
+
+NAMING OF ORCA
+==============
+
+I originally named Orca FMRTG, but after asking my wife
+http://www.rothschildimage.com for some suggestions, she came up with
+Orca. It turns out that there are only one or two small programs on
+the Internet named Orca, so we both were happy to hear this.
Modified: trunk/orca/packages/Storable-0.6.5/t/dump.pl
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/dump.pl (original)
+++ trunk/orca/packages/Storable-0.6.5/t/dump.pl Sat Jul 13 19:22:26 2002
@@ -1,4 +1,4 @@
-;# $Id: dump.pl,v 0.6 1998/06/04 16:08:27 ram Exp $
+;# $Id: dump.pl,v 0.6 1998/06/04 16:08:27 ram Exp ram $
;#
;# Copyright (c) 1995-1998, Raphael Manfredi
;#
Modified: trunk/orca/packages/Storable-0.6.5/t/freeze.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/freeze.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/freeze.t Sat Jul 13 19:22:26 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: freeze.t,v 0.6.1.1 1998/06/12 09:47:08 ram Exp $
+# $Id: freeze.t,v 0.6.1.1 1998/06/12 09:47:08 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/forgive.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/forgive.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/forgive.t Sat Jul 13 19:22:26 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: forgive.t,v 0.6 1998/06/04 16:08:38 ram Exp $
+# $Id: forgive.t,v 0.6 1998/06/04 16:08:38 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/dclone.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/dclone.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/dclone.t Sat Jul 13 19:22:27 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: dclone.t,v 0.6 1998/06/04 16:08:25 ram Exp $
+# $Id: dclone.t,v 0.6 1998/06/04 16:08:25 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/retrieve.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/retrieve.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/retrieve.t Sat Jul 13 19:22:27 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: retrieve.t,v 0.6 1998/06/04 16:08:33 ram Exp $
+# $Id: retrieve.t,v 0.6 1998/06/04 16:08:33 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/tied.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/tied.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/tied.t Sat Jul 13 19:22:27 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: tied.t,v 0.6 1998/06/04 16:08:40 ram Exp $
+# $Id: tied.t,v 0.6 1998/06/04 16:08:40 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/canonical.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/canonical.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/canonical.t Sat Jul 13 19:22:27 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: canonical.t,v 0.6 1998/06/04 16:08:24 ram Exp $
+# $Id: canonical.t,v 0.6 1998/06/04 16:08:24 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/t/store.t
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/t/store.t (original)
+++ trunk/orca/packages/Storable-0.6.5/t/store.t Sat Jul 13 19:22:27 2002
@@ -1,6 +1,6 @@
#!./perl
-# $Id: store.t,v 0.6 1998/06/04 16:08:35 ram Exp $
+# $Id: store.t,v 0.6 1998/06/04 16:08:35 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/Storable.xs
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/Storable.xs (original)
+++ trunk/orca/packages/Storable-0.6.5/Storable.xs Sat Jul 13 19:22:28 2002
@@ -3,7 +3,7 @@
*/
/*
- * $Id: Storable.xs,v 0.6.1.3 1998/07/03 11:36:09 ram Exp $
+ * $Id: Storable.xs,v 0.6.1.5 1999/09/14 20:12:29 ram Exp ram $
*
* Copyright (c) 1995-1998, Raphael Manfredi
*
@@ -11,6 +11,13 @@
* as specified in the README file that comes with the distribution.
*
* $Log: Storable.xs,v $
+ * Revision 0.6.1.5 1999/09/14 20:12:29 ram
+ * patch5: integrated "thread-safe" patch from Murray Nesbitt
+ * patch5: try to avoid compilation warning on 64-bit CPUs
+ *
+ * Revision 0.6.1.4 1999/07/12 12:37:01 ram
+ * patch4: uses new internal PL_* naming convention.
+ *
* Revision 0.6.1.3 1998/07/03 11:36:09 ram
* patch3: fixed compatibility (wrt 0.5 at 9) for retrieval of blessed refs
* patch3: increased store() throughput significantly
@@ -56,6 +63,11 @@
#ifndef newRV_noinc
#define newRV_noinc(sv) ((Sv = newRV(sv)), --SvREFCNT(SvRV(Sv)), Sv)
#endif
+#ifndef ERRSV /* Detects older perls (<= 5.004) */
+#define PL_sv_yes sv_yes
+#define PL_sv_no sv_no
+#define PL_sv_undef sv_undef
+#endif
#ifndef HvSHAREKEYS_off
#define HvSHAREKEYS_off(hv) /* Ignore */
#endif
@@ -96,9 +108,9 @@
#define SX_TIED_ARRAY C(11) /* Tied array forthcoming */
#define SX_TIED_HASH C(12) /* Tied hash forthcoming */
#define SX_TIED_SCALAR C(13) /* Tied scalar forthcoming */
-#define SX_SV_UNDEF C(14) /* Perl's immortal sv_undef */
-#define SX_SV_YES C(15) /* Perl's immortal sv_yes */
-#define SX_SV_NO C(16) /* Perl's immortal sv_no */
+#define SX_SV_UNDEF C(14) /* Perl's immortal PL_sv_undef */
+#define SX_SV_YES C(15) /* Perl's immortal PL_sv_yes */
+#define SX_SV_NO C(16) /* Perl's immortal PL_sv_no */
#define SX_ERROR C(17) /* Error */
/*
@@ -155,16 +167,80 @@
typedef unsigned long stag_t; /* Used by pre-0.6 binary format */
/*
- * XXX multi-threading needs context for the following variables...
+ * The following "thread-safe" related defines were contributed by
+ * Murray Nesbitt <murray at activestate.com> and integrated by RAM, who
+ * only renamed things a little bit to ensure consistency with surrounding
+ * code.
+ *
+ * The patch itself is fairly inefficient since it performs a lookup in
+ * some hash table at the start of every routine. It has to do that in order
+ * to determine the proper context.
+ *
+ * The right solution, naturally, is to change all the signatures to propagate
+ * the context down the call chain and only fetch the per-thread context only
+ * once at the entry point before recursion begins. That's planned for some
+ * day, when Perl's threading model will be stabilized.
+ *
+ * -- RAM, 14/09/1999
+ */
+
+#define MY_VERSION "Storable(" XS_VERSION ")"
+
+typedef struct {
+ HV *hseen; /* which objects have been seen, store time */
+ AV *aseen; /* which objects have been seen, retrieve time */
+ I32 tagnum; /* incremented at store time for each seen object */
+ int netorder; /* true if network order used */
+ int forgive_me; /* whether to be forgiving... */
+ int canonical; /* whether to store hashes sorted by key */
+ struct extendable keybuf; /* for hash key retrieval */
+ struct extendable membuf; /* for memory store/retrieve operations */
+} storable_cxt_t;
+
+#if defined(MULTIPLICITY) || defined(PERL_OBJECT) || defined(PERL_CAPI)
+
+#if (PATCHLEVEL == 4) && (SUBVERSION < 68)
+#define dPERINTERP_SV \
+ SV *perinterp_sv = perl_get_sv(MY_VERSION, FALSE) \
+#else /* >= perl5.004_68 */
+#define dPERINTERP_SV \
+ SV *perinterp_sv = *hv_fetch(PL_modglobal, \
+ MY_VERSION, sizeof(MY_VERSION)-1, TRUE)
+#endif /* < perl5.004_68 */
+
+#define dPERINTERP_PTR(T,name) \
+ T name = (T)(perinterp_sv && SvIOK(perinterp_sv) \
+ ? SvIVX(perinterp_sv) : NULL)
+#define dPERINTERP \
+ dPERINTERP_SV; \
+ dPERINTERP_PTR(storable_cxt_t *, PERINTERP)
+
+#define INIT_PERINTERP \
+ dPERINTERP; \
+ Newz(0,PERINTERP,1, storable_cxt_t); \
+ sv_setiv(perinterp_sv, (IV)PERINTERP)
+
+#else /* !MULTIPLICITY && !PERL_OBJECT && !PERL_CAPI */
+
+static storable_cxt_t Context;
+#define dPERINTERP typedef int _interp_DBI_dummy
+#define PERINTERP (&Context)
+#define INIT_PERINTERP
+
+#endif /* MULTIPLICITY || PERL_OBJECT || PERL_CAPI */
+
+#define hseen (PERINTERP->hseen)
+#define aseen (PERINTERP->aseen)
+#define tagnum (PERINTERP->tagnum)
+#define netorder (PERINTERP->netorder)
+#define forgive_me (PERINTERP->forgive_me)
+#define canonical (PERINTERP->canonical)
+#define keybuf (PERINTERP->keybuf)
+#define membuf (PERINTERP->membuf)
+
+/*
+ * End of "thread-safe" related definitions.
*/
-static HV *hseen; /* which objects have been seen, store time */
-static AV *aseen; /* which objects have been seen, retrieve time */
-static I32 tagnum; /* incremented at store time for each seen object */
-static int netorder = 0; /* true if network order used */
-static int forgive_me = -1; /* whether to be forgiving... */
-static int canonical; /* whether to store hashes sorted by key */
-struct extendable keybuf; /* for hash key retrieval */
-struct extendable membuf; /* for memory store/retrieve operations */
/*
* key buffer handling
@@ -370,7 +446,7 @@
} while (0)
#define STORE_SCALAR(pv, len) do { \
- if (len < LG_SCALAR) { \
+ if (len <= LG_SCALAR) { \
unsigned char clen = (unsigned char) len; \
PUTMARK(SX_SCALAR); \
PUTMARK(clen); \
@@ -468,6 +544,7 @@
PerlIO *f;
SV *sv;
{
+ dPERINTERP;
TRACEME(("store_ref (0x%lx)", (unsigned long) sv));
PUTMARK(SX_REF);
@@ -490,6 +567,7 @@
PerlIO *f;
SV *sv;
{
+ dPERINTERP;
IV iv;
char *pv;
STRLEN len;
@@ -504,7 +582,7 @@
*/
if (!(flags & SVf_OK)) { /* !SvOK(sv) */
- if (sv == &sv_undef) {
+ if (sv == &PL_sv_undef) {
TRACEME(("immortal undef"));
PUTMARK(SX_SV_UNDEF);
} else {
@@ -539,17 +617,17 @@
* value is false.
*
* The test for a read-only scalar with both POK and NOK set is meant
- * to quickly detect &sv_yes and &sv_no without having to pay the address
- * comparison for each scalar we store.
+ * to quickly detect &PL_sv_yes and &PL_sv_no without having to pay the
+ * address comparison for each scalar we store.
*/
#define SV_MAYBE_IMMORTAL (SVf_READONLY|SVf_POK|SVf_NOK)
if ((flags & SV_MAYBE_IMMORTAL) == SV_MAYBE_IMMORTAL) {
- if (sv == &sv_yes) {
+ if (sv == &PL_sv_yes) {
TRACEME(("immortal yes"));
PUTMARK(SX_SV_YES);
- } else if (sv == &sv_no) {
+ } else if (sv == &PL_sv_no) {
TRACEME(("immortal no"));
PUTMARK(SX_SV_NO);
} else {
@@ -561,8 +639,8 @@
/*
* Will come here from below with pv and len set if double & netorder,
- * or from above if it was readonly, POK and NOK but neither &sv_yes
- * nor &sv_no.
+ * or from above if it was readonly, POK and NOK but neither &PL_sv_yes
+ * nor &PL_sv_no.
*/
string:
@@ -647,6 +725,7 @@
PerlIO *f;
AV *av;
{
+ dPERINTERP;
SV **sav;
I32 len = av_len(av) + 1;
I32 i;
@@ -712,6 +791,7 @@
PerlIO *f;
HV *hv;
{
+ dPERINTERP;
I32 len = HvKEYS(hv);
I32 i;
int ret = 0;
@@ -878,6 +958,7 @@
PerlIO *f;
SV *sv;
{
+ dPERINTERP;
MAGIC *mg;
int ret = 0;
int svt = SvTYPE(sv);
@@ -946,6 +1027,7 @@
PerlIO *f;
SV *sv;
{
+ dPERINTERP;
STRLEN len;
static char buf[80];
@@ -1061,6 +1143,7 @@
PerlIO *f;
SV *sv;
{
+ dPERINTERP;
SV **svh;
int ret;
int type;
@@ -1072,11 +1155,21 @@
* If object has already been stored, do not duplicate data.
* Simply emit the SX_OBJECT marker followed by its tag data.
* The tag is always written in network order.
+ *
+ * NOTA BENE, for 64-bit machines: the "*svh" below does not yield a
+ * real pointer, rather a tag number (watch the insertion code below).
+ * That means it pobably safe to assume it is well under the 32-bit limit,
+ * and makes the truncation safe.
+ * -- RAM, 14/09/1999
*/
svh = hv_fetch(hseen, (char *) &sv, sizeof(sv), FALSE);
if (svh) {
+#if PTRSIZE <= 4
I32 tagval = htonl((I32) (*svh));
+#else
+ I32 tagval = htonl((I32) ((unsigned long) (*svh) & 0xffffffff));
+#endif
TRACEME(("object 0x%lx seen as #%d.", (unsigned long) sv, tagval));
PUTMARK(SX_OBJECT);
WRITE(&tagval, sizeof(I32));
@@ -1091,9 +1184,13 @@
* cast the tagnum to a SV pointer and store that in the hash. This
* means that we must clean up the hash manually afterwards, but gives
* us a 15% throughput increase.
+ *
+ * The (IV) cast below is for 64-bit machines, to avoid warnings from
+ * the compiler. Please, let me know if it does not work.
+ * -- RAM, 14/09/1999
*/
- if (!hv_store(hseen, (char *) &sv, sizeof(sv), (SV*) (tagnum++), 0))
+ if (!hv_store(hseen, (char *) &sv, sizeof(sv), (SV*) (IV) (tagnum++), 0))
return -1;
TRACEME(("recorded 0x%lx as object #%d", (unsigned long) sv, tagnum));
@@ -1154,6 +1251,7 @@
PerlIO *f;
int use_network_order;
{
+ dPERINTERP;
char buf[256]; /* Enough room for 256 hexa digits */
unsigned char c;
@@ -1200,6 +1298,7 @@
SV *sv;
int use_network_order;
{
+ dPERINTERP;
int status;
netorder = use_network_order; /* Global, not suited for multi-thread */
@@ -1271,7 +1370,7 @@
hv_iterinit(hseen);
while (he = hv_iternext(hseen))
- HeVAL(he) = &sv_undef;
+ HeVAL(he) = &PL_sv_undef;
}
hv_undef(hseen); /* Free seen object table */
sv_free((SV *) hseen); /* Free HV */
@@ -1288,6 +1387,7 @@
*/
static SV *mbuf2sv()
{
+ dPERINTERP;
return newSVpv(mbase, MBUF_SIZE());
}
@@ -1300,10 +1400,11 @@
SV *mstore(sv)
SV *sv;
{
+ dPERINTERP;
TRACEME(("mstore"));
MBUF_INIT(0);
if (!do_store(0, sv, FALSE)) /* Not in network order */
- return &sv_undef;
+ return &PL_sv_undef;
return mbuf2sv();
}
@@ -1317,10 +1418,11 @@
SV *net_mstore(sv)
SV *sv;
{
+ dPERINTERP;
TRACEME(("net_mstore"));
MBUF_INIT(0);
if (!do_store(0, sv, TRUE)) /* Use network order */
- return &sv_undef;
+ return &PL_sv_undef;
return mbuf2sv();
}
@@ -1363,6 +1465,7 @@
static SV *retrieve_ref(f)
PerlIO *f;
{
+ dPERINTERP;
SV *rv;
SV *sv;
@@ -1418,6 +1521,7 @@
static SV *retrieve_tied_array(f)
PerlIO *f;
{
+ dPERINTERP;
SV *tv;
SV *sv;
@@ -1448,6 +1552,7 @@
static SV *retrieve_tied_hash(f)
PerlIO *f;
{
+ dPERINTERP;
SV *tv;
SV *sv;
@@ -1477,6 +1582,7 @@
static SV *retrieve_tied_scalar(f)
PerlIO *f;
{
+ dPERINTERP;
SV *tv;
SV *sv;
@@ -1509,6 +1615,7 @@
static SV *retrieve_lscalar(f)
PerlIO *f;
{
+ dPERINTERP;
STRLEN len;
SV *sv;
@@ -1555,6 +1662,7 @@
static SV *retrieve_scalar(f)
PerlIO *f;
{
+ dPERINTERP;
int len;
SV *sv;
@@ -1610,6 +1718,7 @@
static SV *retrieve_integer(f)
PerlIO *f;
{
+ dPERINTERP;
SV *sv;
IV iv;
@@ -1634,6 +1743,7 @@
static SV *retrieve_netint(f)
PerlIO *f;
{
+ dPERINTERP;
SV *sv;
int iv;
@@ -1663,6 +1773,7 @@
static SV *retrieve_double(f)
PerlIO *f;
{
+ dPERINTERP;
SV *sv;
double nv;
@@ -1687,6 +1798,7 @@
static SV *retrieve_byte(f)
PerlIO *f;
{
+ dPERINTERP;
SV *sv;
int siv;
@@ -1710,6 +1822,7 @@
*/
static SV *retrieve_undef()
{
+ dPERINTERP;
SV* sv;
TRACEME(("retrieve_undef"));
@@ -1727,7 +1840,8 @@
*/
static SV *retrieve_sv_undef()
{
- SV *sv = &sv_undef;
+ dPERINTERP;
+ SV *sv = &PL_sv_undef;
TRACEME(("retrieve_sv_undef"));
@@ -1742,7 +1856,8 @@
*/
static SV *retrieve_sv_yes()
{
- SV *sv = &sv_yes;
+ dPERINTERP;
+ SV *sv = &PL_sv_yes;
TRACEME(("retrieve_sv_yes"));
@@ -1757,7 +1872,8 @@
*/
static SV *retrieve_sv_no()
{
- SV *sv = &sv_no;
+ dPERINTERP;
+ SV *sv = &PL_sv_no;
TRACEME(("retrieve_sv_no"));
@@ -1789,6 +1905,7 @@
static SV *retrieve_array(f)
PerlIO *f;
{
+ dPERINTERP;
I32 len;
I32 i;
AV *av;
@@ -1841,6 +1958,7 @@
static SV *retrieve_hash(f)
PerlIO *f;
{
+ dPERINTERP;
I32 len;
I32 size;
I32 i;
@@ -1915,6 +2033,7 @@
static SV *old_retrieve_array(f)
PerlIO *f;
{
+ dPERINTERP;
I32 len;
I32 i;
AV *av;
@@ -1976,6 +2095,7 @@
static SV *old_retrieve_hash(f)
PerlIO *f;
{
+ dPERINTERP;
I32 len;
I32 size;
I32 i;
@@ -2010,12 +2130,12 @@
if (c == SX_VL_UNDEF) {
TRACEME(("(#%d) undef value", i));
/*
- * Due to a bug in hv_store(), it's not possible to pass &sv_undef
- * to hv_store() as a value, otherwise the associated key will
- * not be creatable any more. -- RAM, 14/01/97
+ * Due to a bug in hv_store(), it's not possible to pass
+ * &PL_sv_undef to hv_store() as a value, otherwise the
+ * associated key will not be creatable any more. -- RAM, 14/01/97
*/
if (!sv_h_undef)
- sv_h_undef = newSVsv(&sv_undef);
+ sv_h_undef = newSVsv(&PL_sv_undef);
sv = SvREFCNT_inc(sv_h_undef);
} else if (c == SX_VALUE) {
TRACEME(("(#%d) value", i));
@@ -2101,7 +2221,7 @@
retrieve_other, /* SX_ERROR */
};
-static SV *(**sv_retrieve_vtbl)(); /* One of the above -- XXX for threads*/
+static SV *(**sv_retrieve_vtbl)(); /* One of the above -- XXX for threads */
#define RETRIEVE(x) (*sv_retrieve_vtbl[(x) >= SX_ERROR ? SX_ERROR : (x)])
@@ -2111,7 +2231,7 @@
* Make sure the stored data we're trying to retrieve has been produced
* on an ILP compatible system with the same byteorder. It croaks out in
* case an error is detected. [ILP = integer-long-pointer sizes]
- * Returns null if error is detected, &sv_undef otherwise.
+ * Returns null if error is detected, &PL_sv_undef otherwise.
*
* Note that there's no byte ordering info emitted when network order was
* used at store time.
@@ -2119,6 +2239,7 @@
static SV *magic_check(f)
PerlIO *f;
{
+ dPERINTERP;
char buf[256];
char byteorder[256];
int c;
@@ -2165,7 +2286,7 @@
TRACEME(("binary image version is %d", version));
if (netorder = (use_network_order & 0x1))
- return &sv_undef; /* No byte ordering info */
+ return &PL_sv_undef; /* No byte ordering info */
sprintf(byteorder, "%lx", (unsigned long) BYTEORDER);
GETMARK(c);
@@ -2187,7 +2308,7 @@
if ((int) c != sizeof(char *))
croak("Pointer integer size is not compatible");
- return &sv_undef; /* OK */
+ return &PL_sv_undef; /* OK */
}
/*
@@ -2200,6 +2321,7 @@
static SV *retrieve(f)
PerlIO *f;
{
+ dPERINTERP;
int type;
SV **svh;
SV *sv;
@@ -2348,6 +2470,7 @@
static SV *do_retrieve(f)
PerlIO *f;
{
+ dPERINTERP;
SV *sv;
TRACEME(("do_retrieve"));
@@ -2360,6 +2483,8 @@
if (!magic_check(f))
croak("Magic number checking on perl storable failed");
+ TRACEME(("data stored in %s format", netorder ? "net order" : "native"));
+
/*
* If retrieving an old binary version, the sv_retrieve_vtbl variable is
* set to sv_old_retrieve. We'll need a hash table to keep track of
@@ -2380,7 +2505,7 @@
if (!sv) {
TRACEME(("retrieve ERROR"));
- return &sv_undef; /* Something went wrong, return undef */
+ return &PL_sv_undef; /* Something went wrong, return undef */
}
TRACEME(("retrieve got %s(0x%lx)",
@@ -2424,6 +2549,7 @@
SV *mretrieve(sv)
SV *sv;
{
+ dPERINTERP;
struct extendable mcommon; /* Temporary save area for global */
SV *rsv; /* Retrieved SV pointer */
@@ -2449,13 +2575,14 @@
SV *dclone(sv)
SV *sv;
{
+ dPERINTERP;
int size;
TRACEME(("dclone"));
MBUF_INIT(0);
if (!do_store(0, sv, FALSE)) /* Not in network order! */
- return &sv_undef; /* Error during store */
+ return &PL_sv_undef; /* Error during store */
size = MBUF_SIZE();
TRACEME(("dclone stored %d bytes", size));
@@ -2465,6 +2592,17 @@
}
/*
+ * init_perinterp
+ *
+ * Called once per "thread" (interpreter) to initialize some global context.
+ */
+static void init_perinterp() {
+ INIT_PERINTERP;
+ netorder = 0; /* true if network order used */
+ forgive_me = -1; /* whether to be forgiving... */
+}
+
+/*
* The Perl IO GV object distinguishes between input and output for sockets
* but not for plain files. To allow Storable to transparently work on
* plain files and sockets transparently, we have to ask xsubpp to fetch the
@@ -2483,6 +2621,9 @@
PROTOTYPES: ENABLE
+BOOT:
+ init_perinterp();
+
int
pstore(f,obj)
OutputStream f
Modified: trunk/orca/packages/Storable-0.6.5/Storable.pm
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/Storable.pm (original)
+++ trunk/orca/packages/Storable-0.6.5/Storable.pm Sat Jul 13 19:22:28 2002
@@ -1,4 +1,4 @@
-;# $Id: Storable.pm,v 0.6.1.3 1998/07/03 11:32:52 ram Exp $
+;# $Id: Storable.pm,v 0.6.1.5 1999/09/14 20:11:22 ram Exp ram $
;#
;# Copyright (c) 1995-1998, Raphael Manfredi
;#
@@ -6,6 +6,12 @@
;# as specified in the README file that comes with the distribution.
;#
;# $Log: Storable.pm,v $
+;# Revision 0.6.1.5 1999/09/14 20:11:22 ram
+;# patch5: updated version number
+;#
+;# Revision 0.6.1.4 1999/07/12 12:36:04 ram
+;# patch4: changed my e-mail to pobox, updated version number.
+;#
;# Revision 0.6.1.3 1998/07/03 11:32:52 ram
;# patch3: recent optimizations increased store() throughput
;# patch3: increased revision number
@@ -36,7 +42,7 @@
use Carp;
use vars qw($forgive_me $VERSION);
-$VERSION = '0.603';
+$VERSION = '0.605';
*AUTOLOAD = \&AutoLoader::AUTOLOAD; # Grrr...
bootstrap Storable;
@@ -424,6 +430,6 @@
=head1 AUTHOR
-Raphael Manfredi F<E<lt>Raphael_Manfredi at grenoble.hp.comE<gt>>
+Raphael Manfredi F<E<lt>Raphael_Manfredi at pobox.comE<gt>>
=cut
Modified: trunk/orca/packages/Storable-0.6.5/ChangeLog
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/ChangeLog (original)
+++ trunk/orca/packages/Storable-0.6.5/ChangeLog Sat Jul 13 19:22:29 2002
@@ -1,3 +1,26 @@
+Tue Sep 14 22:13:28 MEST 1999 Raphael Manfredi <Raphael_Manfredi at pobox.com>
+
+. Description:
+
+ Integrated "thread-safe" patch from Murray Nesbitt.
+ Note that this may not be very efficient for threaded code,
+ see comment in the code.
+
+ Try to avoid compilation warning on 64-bit CPUs. Can't test it,
+ since I don't have access to such machines.
+
+Mon Jul 12 14:37:19 METDST 1999 Raphael Manfredi <Raphael_Manfredi at pobox.com>
+
+. Description:
+
+ changed my e-mail to pobox.
+
+ mentionned it is not thread-safe.
+
+ updated version number.
+
+ uses new internal PL_* naming convention.
+
Fri Jul 3 13:38:16 METDST 1998 Raphael Manfredi <Raphael_Manfredi at grenoble.hp.com>
. Description:
Modified: trunk/orca/packages/Storable-0.6.5/Makefile.PL
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/Makefile.PL (original)
+++ trunk/orca/packages/Storable-0.6.5/Makefile.PL Sat Jul 13 19:22:29 2002
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL,v 0.6 1998/06/04 16:08:18 ram Exp $
+# $Id: Makefile.PL,v 0.6 1998/06/04 16:08:18 ram Exp ram $
#
# Copyright (c) 1995-1998, Raphael Manfredi
#
Modified: trunk/orca/packages/Storable-0.6.5/README
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/README (original)
+++ trunk/orca/packages/Storable-0.6.5/README Sat Jul 13 19:22:29 2002
@@ -15,6 +15,7 @@
*** This is beta software -- use at your own risks ***
The Storable extension brings persistency to your data.
+This extension is NOT thread-safe and should not be used by threaded perls.
You may recursively store to disk any data structure, no matter
how complex and circular it is, provided it contains only SCALAR,
@@ -136,7 +137,7 @@
There is an embeded POD manual page in Storable.pm.
-Raphael Manfredi <Raphael_Manfredi at grenoble.hp.com>
+Raphael Manfredi <Raphael_Manfredi at pobox.com>
Thanks to:
Modified: trunk/orca/packages/Storable-0.6.5/patchlevel.h
==============================================================================
--- trunk/orca/packages/Storable-0.6.5/patchlevel.h (original)
+++ trunk/orca/packages/Storable-0.6.5/patchlevel.h Sat Jul 13 19:22:29 2002
@@ -1 +1 @@
-#define PATCHLEVEL 3
+#define PATCHLEVEL 5
Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in (original)
+++ trunk/orca/packages/Makefile.in Sat Jul 13 19:22:29 2002
@@ -1,114 +1,164 @@
@SET_MAKE@
-PERL = @PERL@
-CFLAGS = @CFLAGS@
-digest_md5_dir = @DIGEST_MD5_DIR@
-math_interpolate_dir = @MATH_INTERPOLATE_DIR@
-rrdtool_dir = @RRDTOOL_DIR@
-storable_dir = @STORABLE_DIR@
-
-MAKE_DIGEST_MD5 = @MAKE_DIGEST_MD5@
-MAKE_MATH_INTERPOLATE = @MAKE_MATH_INTERPOLATE@
-MAKE_RRDTOOL = @MAKE_RRDTOOL@
-MAKE_STORABLE = @MAKE_STORABLE@
-MAKE_TARGETS = $(MAKE_DIGEST_MD5) $(MAKE_MATH_INTERPOLATE) $(MAKE_RRDTOOL) $(MAKE_STORABLE)
-
-TEST_DIGEST_MD5 = @TEST_DIGEST_MD5@
-TEST_MATH_INTERPOLATE = @TEST_MATH_INTERPOLATE@
-TEST_RRDTOOL = @TEST_RRDTOOL@
-TEST_STORABLE = @TEST_STORABLE@
-TEST_TARGETS = $(TEST_DIGEST_MD5) $(TEST_MATH_INTERPOLATE) $(TEST_RRDTOOL) $(TEST_STORABLE)
-
-INSTALL_DIGEST_MD5 = @INSTALL_DIGEST_MD5@
-INSTALL_MATH_INTERPOLATE= @INSTALL_MATH_INTERPOLATE@
-INSTALL_RRDTOOL = @INSTALL_RRDTOOL@
-INSTALL_STORABLE = @INSTALL_STORABLE@
-INSTALL_TARGETS = $(INSTALL_DIGEST_MD5) $(INSTALL_MATH_INTERPOLATE) $(INSTALL_RRDTOOL) $(INSTALL_STORABLE)
-
-CLEAN_DIGEST_MD5 = @CLEAN_DIGEST_MD5@
-CLEAN_MATH_INTERPOLATE = @CLEAN_MATH_INTERPOLATE@
-CLEAN_RRDTOOL = @CLEAN_RRDTOOL@
-CLEAN_STORABLE = @CLEAN_STORABLE@
-CLEAN_TARGETS = $(CLEAN_DIGEST_MD5) $(CLEAN_MATH_INTERPOLATE) $(CLEAN_RRDTOOL) $(CLEAN_STORABLE)
-
-DISTCLEAN_DIGEST_MD5 = @DISTCLEAN_DIGEST_MD5@
-DISTCLEAN_MATH_INTERPOLATE = @DISTCLEAN_MATH_INTERPOLATE@
-DISTCLEAN_RRDTOOL = @DISTCLEAN_RRDTOOL@
-DISTCLEAN_STORABLE = @DISTCLEAN_STORABLE@
-DISTCLEAN_TARGETS = $(DISTCLEAN_DIGEST_MD5) $(DISTCLEAN_MATH_INTERPOLATE) $(DISTCLEAN_RRDTOOL) $(DISTCLEAN_STORABLE)
+PERL = @PERL@
+CFLAGS = @CFLAGS@
-all: Makefile
+compress_zlib_dir = @COMPRESS_ZLIB_DIR@
+data_dumper_dir = @DATA_DUMPER_DIR@
+digest_md5_dir = @DIGEST_MD5_DIR@
+math_interpolate_dir = @MATH_INTERPOLATE_DIR@
+rrdtool_dir = @RRDTOOL_DIR@
+storable_dir = @STORABLE_DIR@
+
+MAKE_COMPRESS_ZLIB = @MAKE_COMPRESS_ZLIB@
+MAKE_DATA_DUMPER = @MAKE_DATA_DUMPER@
+MAKE_DIGEST_MD5 = @MAKE_DIGEST_MD5@
+MAKE_MATH_INTERPOLATE = @MAKE_MATH_INTERPOLATE@
+MAKE_RRDTOOL = @MAKE_RRDTOOL@
+MAKE_STORABLE = @MAKE_STORABLE@
+MAKE_TARGETS = $(MAKE_COMPRESS_ZLIB) $(MAKE_DATA_DUMPER) $(MAKE_DIGEST_MD5) $(MAKE_MATH_INTERPOLATE) $(MAKE_RRDTOOL) $(MAKE_STORABLE)
+
+TEST_COMPRESS_ZLIB = @TEST_COMPRESS_ZLIB@
+TEST_DATA_DUMPER = @TEST_DATA_DUMPER@
+TEST_DIGEST_MD5 = @TEST_DIGEST_MD5@
+TEST_MATH_INTERPOLATE = @TEST_MATH_INTERPOLATE@
+TEST_RRDTOOL = @TEST_RRDTOOL@
+TEST_STORABLE = @TEST_STORABLE@
+TEST_TARGETS = $(TEST_COMPRESS_ZLIB) $(TEST_DATA_DUMPER) $(TEST_DIGEST_MD5) $(TEST_MATH_INTERPOLATE) $(TEST_RRDTOOL) $(TEST_STORABLE)
+
+INSTALL_PERL_COMPRESS_ZLIB = @INSTALL_PERL_COMPRESS_ZLIB@
+INSTALL_PERL_DATA_DUMPER = @INSTALL_PERL_DATA_DUMPER@
+INSTALL_PERL_DIGEST_MD5 = @INSTALL_PERL_DIGEST_MD5@
+INSTALL_PERL_MATH_INTERPOLATE = @INSTALL_PERL_MATH_INTERPOLATE@
+INSTALL_PERL_RRDTOOL = @INSTALL_PERL_RRDTOOL@
+INSTALL_PERL_STORABLE = @INSTALL_PERL_STORABLE@
+INSTALL_PERL_TARGETS = $(INSTALL_PERL_COMPRESS_ZLIB) $(INSTALL_PERL_DATA_DUMPER) $(INSTALL_PERL_DIGEST_MD5) $(INSTALL_PERL_MATH_INTERPOLATE) $(INSTALL_PERL_RRDTOOL) $(INSTALL_PERL_STORABLE)
+
+INSTALL_LIB_RRDTOOL = @INSTALL_LIB_RRDTOOL@
+INSTALL_LIB_TARGETS = $(INSTALL_LIB_RRDTOOL)
+
+CLEAN_COMPRESS_ZLIB = @CLEAN_COMPRESS_ZLIB@
+CLEAN_DATA_DUMPER = @CLEAN_DATA_DUMPER@
+CLEAN_DIGEST_MD5 = @CLEAN_DIGEST_MD5@
+CLEAN_MATH_INTERPOLATE = @CLEAN_MATH_INTERPOLATE@
+CLEAN_RRDTOOL = @CLEAN_RRDTOOL@
+CLEAN_STORABLE = @CLEAN_STORABLE@
+CLEAN_TARGETS = $(CLEAN_COMPRESS_ZLIB) $(CLEAN_DIGEST_MD5) $(CLEAN_MATH_INTERPOLATE) $(CLEAN_RRDTOOL) $(CLEAN_STORABLE)
+
+DISTCLEAN_COMPRESS_ZLIB = @DISTCLEAN_COMPRESS_ZLIB@
+DISTCLEAN_DATA_DUMPER = @DISTCLEAN_DATA_DUMPER@
+DISTCLEAN_DIGEST_MD5 = @DISTCLEAN_DIGEST_MD5@
+DISTCLEAN_MATH_INTERPOLATE = @DISTCLEAN_MATH_INTERPOLATE@
+DISTCLEAN_RRDTOOL = @DISTCLEAN_RRDTOOL@
+DISTCLEAN_STORABLE = @DISTCLEAN_STORABLE@
+DISTCLEAN_TARGETS = $(DISTCLEAN_COMPRESS_ZLIB) $(DISTCLEAN_DATA_DUMPER) $(DISTCLEAN_DIGEST_MD5) $(DISTCLEAN_MATH_INTERPOLATE) $(DISTCLEAN_RRDTOOL) $(DISTCLEAN_STORABLE)
+
+all: Makefile $(MAKE_TARGETS)
+
+make_compress_zlib: make_rrdtool_zlib $(compress_zlib_dir)/Makefile
+ cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
-modules: Makefile $(MAKE_TARGETS)
+$(compress_zlib_dir)/Makefile: $(compress_zlib_dir)/Makefile.PL $(PERL)
+ cd $(compress_zlib_dir) && $(PERL) Makefile.PL
+
+make_data_dumper: $(data_dumper_dir)/Makefile
+ cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
+
+$(data_dumper_dir)/Makefile: $(data_dumper_dir)/Makefile.PL $(PERL)
+ cd $(data_dumper_dir) && $(PERL) Makefile.PL
make_digest_md5: $(digest_md5_dir)/Makefile
- (cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)")
+ cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
$(digest_md5_dir)/Makefile: $(digest_md5_dir)/Makefile.PL $(PERL)
- (cd $(digest_md5_dir) && $(PERL) Makefile.PL)
+ cd $(digest_md5_dir) && $(PERL) Makefile.PL
make_math_interpolate: $(math_interpolate_dir)/Makefile
- (cd $(math_interpolate_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)")
+ cd $(math_interpolate_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
$(math_interpolate_dir)/Makefile: $(math_interpolate_dir)/Makefile.PL $(PERL)
- (cd $(math_interpolate_dir) && $(PERL) Makefile.PL)
+ cd $(math_interpolate_dir) && $(PERL) Makefile.PL
make_rrdtool: $(rrdtool_dir)/Makefile $(PERL)
- (cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)")
+ cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)"
+
+make_rrdtool_zlib: $(rrdtool_dir)/Makefile $(PERL)
+ cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)" zlib-1.1.3/librrd_z.a
$(rrdtool_dir)/Makefile: $(rrdtool_dir)/Makefile.in
- (cd .. && ./configure @CONFIGURE_COMMAND_LINE@)
+ cd .. && ./configure @CONFIGURE_COMMAND_LINE@
make_storable: $(storable_dir)/Makefile
- (cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)")
+ cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
$(storable_dir)/Makefile: $(storable_dir)/Makefile.PL $(PERL)
- (cd $(storable_dir) && $(PERL) Makefile.PL)
+ cd $(storable_dir) && $(PERL) Makefile.PL
test:
test_modules: $(TEST_TARGETS)
+test_compress_zlib: make_rrdtool_zlib $(compress_zlib_dir)/Makefile
+ cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
+
+test_data_dumper: $(data_dumper_dir)/Makefile
+ cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
+
test_digest_md5: $(digest_md5_dir)/Makefile
- (cd $(digest_md5_dir) && $(MAKE) CFLAGS="$(CFLAGS)" test)
+ cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
test_math_interpolate: $(math_interpolate_dir)/Makefile
- (cd $(math_interpolate_dir) && $(MAKE) test)
+ cd $(math_interpolate_dir) && $(MAKE) test
test_rrdtool: make_rrdtool
- (cd $(rrdtool_dir)/perl-shared && $(MAKE) CFLAGS="$(CFLAGS)" test)
+ cd $(rrdtool_dir)/perl-shared && $(MAKE) CFLAGS="$(CFLAGS)" test
-test_storable: make_storable
- (cd $(storable_dir) && $(MAKE) CFLAGS="$(CFLAGS)" test)
+test_storable: $(storable_dir)/Makefile
+ cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
-install:
+install: $(INSTALL_LIB_TARGETS)
-install_modules: $(INSTALL_TARGETS)
+install_lib_rrdtool: make_rrdtool
+ cd $(rrdtool_dir)/src && $(MAKE) CFLAGS="$(CFLAGS)" install-libLTLIBRARIES
-install_digest_md5: make_digest_md5
- (cd $(digest_md5_dir) && $(MAKE) install)
+install_modules: $(INSTALL_PERL_TARGETS)
-install_math_interpolate: make_math_interpolate
- (cd $(math_interpolate_dir) && $(MAKE) install)
+install_perl_compress_zlib: make_compress_zlib
+ cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
-install_rrdtool: make_rrdtool
- (cd $(rrdtool_dir)/perl-shared && $(MAKE) install)
+install_perl_data_dumper: $(data_dumper_dir)/Makefile
+ cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
-install_storable: make_storable
- (cd $(storable_dir) && $(MAKE) install)
+install_perl_digest_md5: $(digest_md5_dir)/Makefile
+ cd $(digest_md5_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+
+install_perl_math_interpolate: $(math_interpolate_dir)/Makefile
+ cd $(math_interpolate_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+
+install_perl_rrdtool: make_rrdtool
+ cd $(rrdtool_dir)/perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)" install
+
+install_perl_storable: $(storable_dir)/Makefile
+ cd $(storable_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" install
clean: $(CLEAN_TARGETS)
+clean_compress_zlib: clean_rrdtool
+ @if test -r $(compress_zlib_dir)/Makefile; then \
+ echo 'cd $(compress_zlib_dir) && $(MAKE) clean'; \
+ (cd $(compress_zlib_dir) && $(MAKE) clean); \
+ fi
+
clean_digest_md5:
@if test -r $(digest_md5_dir)/Makefile; then \
- echo '(cd $(digest_md5_dir); $(MAKE) clean'; \
- (cd $(digest_md5_dir); $(MAKE) clean); \
+ echo 'cd $(digest_md5_dir) && $(MAKE) clean'; \
+ (cd $(digest_md5_dir) && $(MAKE) clean); \
fi
clean_math_interpolate:
@if test -r $(math_interpolate_dir)/Makefile; then \
- echo '(cd $(math_interpolate_dir); $(MAKE) clean)'; \
- (cd $(math_interpolate_dir); $(MAKE) clean); \
+ echo 'cd $(math_interpolate_dir) && $(MAKE) clean'; \
+ (cd $(math_interpolate_dir) && $(MAKE) clean); \
fi
clean_rrdtool:
@@ -116,21 +166,23 @@
clean_storable:
@if test -r $(storable_dir)/Makefile; then \
- echo '(cd $(storable_dir); $(MAKE) clean)'; \
- (cd $(storable_dir); $(MAKE) clean); \
+ echo 'cd $(storable_dir) && $(MAKE) clean'; \
+ (cd $(storable_dir) && $(MAKE) clean); \
fi
distclean: $(DISTCLEAN_TARGETS)
+distclean_compress_zlib: clean_compress_zlib
+
distclean_digest_md5: clean_digest_md5
distclean_math_interpolate: clean_math_interpolate
distclean_rrdtool: clean_rrdtool
- (cd $(rrdtool_dir) && $(MAKE) distclean)
+ cd $(rrdtool_dir) && $(MAKE) distclean
distclean_storable: clean_storable
Makefile: Makefile.in
- (cd ..; ./config.status)
+ cd .. && CONFIG_FILES=packages/Makefile ./config.status
$(MAKE)
Added: trunk/orca/packages/Data-Dumper-2.101/Dumper.html
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Dumper.html (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Dumper.html Sat Jul 13 19:22:29 2002
@@ -0,0 +1,495 @@
+<HTML>
+<HEAD>
+<TITLE>Data::Dumper - stringified perl data structures, suitable for both printing and C<eval></TITLE>
+<LINK REV="made" HREF="mailto:gsar at umich.edu">
+</HEAD>
+
+<BODY>
+
+<!-- INDEX BEGIN -->
+
+<UL>
+
+ <LI><A HREF="#NAME">NAME</A>
+ <LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+ <LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+ <UL>
+
+ <LI><A HREF="#Methods">Methods</A>
+ <LI><A HREF="#Functions">Functions</A>
+ <LI><A HREF="#Configuration_Variables_or_Metho">Configuration Variables or Methods</A>
+ <LI><A HREF="#Exports">Exports</A>
+ </UL>
+
+ <LI><A HREF="#EXAMPLES">EXAMPLES</A>
+ <LI><A HREF="#BUGS">BUGS</A>
+ <LI><A HREF="#AUTHOR">AUTHOR</A>
+ <LI><A HREF="#VERSION">VERSION</A>
+ <LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+<!-- INDEX END -->
+
+<HR>
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+Data::Dumper - stringified perl data structures, suitable for both printing
+and <CODE>eval</CODE>
+
+
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS</A></H1>
+<P>
+<PRE> use Data::Dumper;
+</PRE>
+<P>
+<PRE> # simple procedural interface
+ print Dumper($foo, $bar);
+</PRE>
+<P>
+<PRE> # extended usage with names
+ print Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+</PRE>
+<P>
+<PRE> # configuration variables
+ {
+ local $Data::Dump::Purity = 1;
+ eval Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+ }
+</PRE>
+<P>
+<PRE> # OO usage
+ $d = Data::Dumper->new([$foo, $bar], [qw(foo *ary)]);
+ ...
+ print $d->Dump;
+ ...
+ $d->Purity(1)->Terse(1)->Deepcopy(1);
+ eval $d->Dump;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+Given a list of scalars or reference variables, writes out their contents
+in perl syntax. The references can also be objects. The contents of each
+variable is output in a single Perl statement. Handles self-referential
+structures correctly.
+
+<P>
+The return value can be <CODE>eval</CODE>ed to get back an identical copy of the original reference structure.
+
+<P>
+Any references that are the same as one of those passed in will be named
+<CODE>$VAR</CODE><EM>n</EM> (where <EM>n</EM> is a numeric suffix), and other duplicate references to substructures
+within <CODE>$VAR</CODE><EM>n</EM> will be appropriately labeled using arrow notation. You can specify names
+for individual values to be dumped if you use the <CODE>Dump()</CODE> method, or you can change the default <CODE>$VAR</CODE> prefix to something else. See <CODE>$Data::Dumper::Varname</CODE> and <CODE>$Data::Dumper::Terse</CODE>
+below.
+
+<P>
+The default output of self-referential structures can be <CODE>eval</CODE>ed, but the nested references to <CODE>$VAR</CODE><EM>n</EM> will be undefined, since a recursive structure cannot be constructed using
+one Perl statement. You should set the
+<CODE>Purity</CODE> flag to 1 to get additional statements that will correctly fill in these
+references.
+
+<P>
+In the extended usage form, the references to be dumped can be given
+user-specified names. If a name begins with a <CODE>*</CODE>, the output will describe the dereferenced type of the supplied reference
+for hashes and arrays, and coderefs. Output of names will be avoided where
+possible if the <CODE>Terse</CODE> flag is set.
+
+<P>
+In many cases, methods that are used to set the internal state of the
+object will return the object itself, so method calls can be conveniently
+chained together.
+
+<P>
+Several styles of output are possible, all controlled by setting the <CODE>Indent</CODE> flag. See <A HREF="#Configuration_Variables_or_Metho">Configuration Variables or Methods</A> below for details.
+
+<P>
+<HR>
+<H2><A NAME="Methods">Methods</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_PACKAGE">PACKAGE->new(ARRAYREF [, ARRAYREF])</A></STRONG><DD>
+<P>
+Returns a newly created <CODE>Data::Dumper</CODE> object. The first argument is an anonymous array of values to be dumped.
+The optional second argument is an anonymous array of names for the values.
+The names need not have a leading
+<CODE>$</CODE> sign, and must be comprised of alphanumeric characters. You can begin a
+name with a <CODE>*</CODE> to specify that the dereferenced type must be dumped instead of the
+reference itself, for ARRAY and HASH references.
+
+<P>
+The prefix specified by <CODE>$Data::Dumper::Varname</CODE> will be used with a numeric suffix if the name for a value is undefined.
+
+<P>
+Data::Dumper will catalog all references encountered while dumping the
+values. Cross-references (in the form of names of substructures in perl
+syntax) will be inserted at all possible points, preserving any structural
+interdependencies in the original set of values. Structure traversal is
+depth-first, and proceeds in order from the first supplied value to the
+last.
+
+<DT><STRONG><A NAME="item__OBJ_Dump">$OBJ->Dump or PACKAGE->Dump(ARRAYREF [, ARRAYREF])</A></STRONG><DD>
+<P>
+Returns the stringified form of the values stored in the object (preserving
+the order in which they were supplied to <CODE>new</CODE>), subject to the configuration options below. In an array context, it
+returns a list of strings corresponding to the supplied values.
+
+<P>
+The second form, for convenience, simply calls the <CODE>new</CODE> method on its arguments before dumping the object immediately.
+
+<DT><STRONG><A NAME="item__OBJ_Dumpxs">$OBJ->Dumpxs or PACKAGE->Dumpxs(ARRAYREF [, ARRAYREF])</A></STRONG><DD>
+<P>
+This method is available if you were able to compile and install the XSUB
+extension to <CODE>Data::Dumper</CODE>. It is exactly identical to the <CODE>Dump</CODE> method above, only about 4 to 5 times faster, since it is written entirely
+in C.
+
+<DT><STRONG><A NAME="item__OBJ_Seen_HASHREF_">$OBJ->Seen([HASHREF])</A></STRONG><DD>
+<P>
+Queries or adds to the internal table of already encountered references.
+You must use <CODE>Reset</CODE> to explicitly clear the table if needed. Such references are not dumped;
+instead, their names are inserted wherever they are encountered
+subsequently. This is useful especially for properly dumping subroutine
+references.
+
+<P>
+Expects a anonymous hash of name => value pairs. Same rules apply for
+names as in <CODE>new</CODE>. If no argument is supplied, will return the ``seen'' list of name =>
+value pairs, in an array context. Otherwise, returns the object itself.
+
+<DT><STRONG><A NAME="item__OBJ_Values_ARRAYREF_">$OBJ->Values([ARRAYREF])</A></STRONG><DD>
+<P>
+Queries or replaces the internal array of values that will be dumped. When
+called without arguments, returns the values. Otherwise, returns the object
+itself.
+
+<DT><STRONG><A NAME="item__OBJ_Names_ARRAYREF_">$OBJ->Names([ARRAYREF])</A></STRONG><DD>
+<P>
+Queries or replaces the internal array of user supplied names for the
+values that will be dumped. When called without arguments, returns the
+names. Otherwise, returns the object itself.
+
+<DT><STRONG><A NAME="item__OBJ_Reset">$OBJ->Reset</A></STRONG><DD>
+<P>
+Clears the internal table of ``seen'' references and returns the object
+itself.
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Functions">Functions</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_Dumper">Dumper(LIST)</A></STRONG><DD>
+<P>
+Returns the stringified form of the values in the list, subject to the
+configuration options below. The values will be named <CODE>$VAR</CODE><EM>n</EM> in the output, where <EM>n</EM> is a numeric suffix. Will return a list of strings in an array context.
+
+<DT><STRONG><A NAME="item_DumperX">DumperX(LIST)</A></STRONG><DD>
+<P>
+Identical to the <A HREF="#item_Dumper">Dumper()</A> function above, but this calls the XSUB implementation. Only available if
+you were able to compile and install the XSUB extensions in <CODE>Data::Dumper</CODE>.
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Configuration_Variables_or_Metho">Configuration Variables or Methods</A></H2>
+<P>
+Several configuration variables can be used to control the kind of output
+generated when using the procedural interface. These variables are usually
+<CODE>local</CODE>ized in a block so that other parts of the code are not affected by the
+change.
+
+<P>
+These variables determine the default state of the object created by
+calling the <CODE>new</CODE> method, but cannot be used to alter the state of the object thereafter. The
+equivalent method names should be used instead to query or set the internal
+state of the object.
+
+<P>
+The method forms return the object itself when called with arguments, so
+that they can be chained together nicely.
+
+<DL>
+<DT><STRONG><A NAME="item__Data_Dumper_Indent">$Data::Dumper::Indent or $OBJ->Indent([NEWVAL])</A></STRONG><DD>
+<P>
+Controls the style of indentation. It can be set to 0, 1, 2 or 3. Style 0
+spews output without any newlines, indentation, or spaces between list
+items. It is the most compact format possible that can still be called
+valid perl. Style 1 outputs a readable form with newlines but no fancy
+indentation (each level in the structure is simply indented by a fixed
+amount of whitespace). Style 2 (the default) outputs a very readable form
+which takes into account the length of hash keys (so the hash value lines
+up). Style 3 is like style 2, but also annotates the elements of arrays
+with their index (but the comment is on its own line, so array output
+consumes twice the number of lines). Style 2 is the default.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Purity">$Data::Dumper::Purity or $OBJ->Purity([NEWVAL])</A></STRONG><DD>
+<P>
+Controls the degree to which the output can be <CODE>eval</CODE>ed to recreate the supplied reference structures. Setting it to 1 will
+output additional perl statements that will correctly recreate nested
+references. The default is 0.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Pad">$Data::Dumper::Pad or $OBJ->Pad([NEWVAL])</A></STRONG><DD>
+<P>
+Specifies the string that will be prefixed to every line of the output.
+Empty string by default.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Varname">$Data::Dumper::Varname or $OBJ->Varname([NEWVAL])</A></STRONG><DD>
+<P>
+Contains the prefix to use for tagging variable names in the output. The
+default is ``VAR''.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Useqq">$Data::Dumper::Useqq or $OBJ->Useqq([NEWVAL])</A></STRONG><DD>
+<P>
+When set, enables the use of double quotes for representing string values.
+Whitespace other than space will be represented as <CODE>[\n\t\r]</CODE>, ``unsafe'' characters will be backslashed, and unprintable characters
+will be output as quoted octal integers. Since setting this variable
+imposes a performance penalty, the default is 0. The <CODE>Dumpxs()</CODE> method does not honor this flag yet.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Terse">$Data::Dumper::Terse or $OBJ->Terse([NEWVAL])</A></STRONG><DD>
+<P>
+When set, Data::Dumper will emit single, non-self-referential values as
+atoms/terms rather than statements. This means that the <CODE>$VAR</CODE><EM>n</EM> names will be avoided where possible, but be advised that such output may
+not always be parseable by <CODE>eval</CODE>.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Freezer">$Data::Dumper::Freezer or $OBJ->Freezer([NEWVAL])</A></STRONG><DD>
+<P>
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will invoke that method via the object before attempting to
+stringify it. This method can alter the contents of the object (if, for
+instance, it contains data allocated from C), and even rebless it in a
+different package. The client is responsible for making sure the specified
+method can be called via the object, and that the object ends up containing
+only perl data types after the method has been called. Defaults to an empty
+string.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Toaster">$Data::Dumper::Toaster or $OBJ->Toaster([NEWVAL])</A></STRONG><DD>
+<P>
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will emit a method call for any objects that are to be dumped
+using the syntax <CODE>bless(DATA, CLASS)-</CODE><CODE>METHOD()>.</CODE> Note that this means that the method specified
+will have to perform any modifications required on the object (like
+creating new state within it, and/or reblessing it in a different package)
+and then return it. The client is responsible for making sure the method
+can be called via the object, and that it returns a valid object. Defaults
+to an empty string.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Deepcopy">$Data::Dumper::Deepcopy or $OBJ->Deepcopy([NEWVAL])</A></STRONG><DD>
+<P>
+Can be set to a boolean value to enable deep copies of structures.
+Cross-referencing will then only be done when absolutely essential (i.e.,
+to break reference cycles). Default is 0.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Quotekeys">$Data::Dumper::Quotekeys or $OBJ->Quotekeys([NEWVAL])</A></STRONG><DD>
+<P>
+Can be set to a boolean value to control whether hash keys are quoted. A
+false value will avoid quoting hash keys when it looks like a simple
+string. Default is 1, which will always enclose hash keys in quotes.
+
+<DT><STRONG><A NAME="item__Data_Dumper_Bless">$Data::Dumper::Bless or $OBJ->Bless([NEWVAL])</A></STRONG><DD>
+<P>
+Can be set to a string that specifies an alternative to the <CODE>bless</CODE>
+builtin operator used to create objects. A function with the specified name
+should exist, and should accept the same arguments as the builtin. Default
+is <CODE>bless</CODE>.
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Exports">Exports</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_Dumper">Dumper</A></STRONG><DD>
+</DL>
+<P>
+<HR>
+<H1><A NAME="EXAMPLES">EXAMPLES</A></H1>
+<P>
+Run these code snippets to get a quick feel for the behavior of this
+module. When you are through with these examples, you may want to add or
+change the various configuration variables described above, to see their
+behavior. (See the testsuite in the Data::Dumper distribution for more
+examples.)
+
+<P>
+<PRE> use Data::Dumper;
+</PRE>
+<P>
+<PRE> package Foo;
+ sub new {bless {'a' => 1, 'b' => sub { return "foo" }}, $_[0]};
+</PRE>
+<P>
+<PRE> package Fuz; # a weird REF-REF-SCALAR object
+ sub new {bless \($_ = \ 'fu\'z'), $_[0]};
+</PRE>
+<P>
+<PRE> package main;
+ $foo = Foo->new;
+ $fuz = Fuz->new;
+ $boo = [ 1, [], "abcd", \*foo,
+ {1 => 'a', 023 => 'b', 0x45 => 'c'},
+ \\"p\q\'r", $foo, $fuz];
+
+ ########
+ # simple usage
+ ########
+</PRE>
+<P>
+<PRE> $bar = eval(Dumper($boo));
+ print($@) if $@;
+ print Dumper($boo), Dumper($bar); # pretty print (no array indices)
+</PRE>
+<P>
+<PRE> $Data::Dumper::Terse = 1; # don't output names where feasible
+ $Data::Dumper::Indent = 0; # turn off all pretty print
+ print Dumper($boo), "\n";
+</PRE>
+<P>
+<PRE> $Data::Dumper::Indent = 1; # mild pretty print
+ print Dumper($boo);
+</PRE>
+<P>
+<PRE> $Data::Dumper::Indent = 3; # pretty print with array indices
+ print Dumper($boo);
+</PRE>
+<P>
+<PRE> $Data::Dumper::Useqq = 1; # print strings in double quotes
+ print Dumper($boo);
+
+
+ ########
+ # recursive structures
+ ########
+
+ @c = ('c');
+ $c = \@c;
+ $b = {};
+ $a = [1, $b, $c];
+ $b->{a} = $a;
+ $b->{b} = $a->[1];
+ $b->{c} = $a->[2];
+ print Data::Dumper->Dump([$a,$b,$c], [qw(a b c)]);
+
+
+ $Data::Dumper::Purity = 1; # fill in the holes for eval
+ print Data::Dumper->Dump([$a, $b], [qw(*a b)]); # print as @a
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]); # print as %b
+
+
+ $Data::Dumper::Deepcopy = 1; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ $Data::Dumper::Purity = 0; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ ########
+ # object-oriented usage
+ ########
+
+ $d = Data::Dumper->new([$a,$b], [qw(a b)]);
+ $d->Seen({'*c' => $c}); # stash a ref without printing it
+ $d->Indent(3);
+ print $d->Dump;
+ $d->Reset->Purity(0); # empty the seen cache
+ print join "----\n", $d->Dump;
+
+
+ ########
+ # persistence
+ ########
+
+ package Foo;
+ sub new { bless { state => 'awake' }, shift }
+ sub Freeze {
+ my $s = shift;
+ print STDERR "preparing to sleep\n";
+ $s->{state} = 'asleep';
+ return bless $s, 'Foo::ZZZ';
+ }
+
+ package Foo::ZZZ;
+ sub Thaw {
+ my $s = shift;
+ print STDERR "waking up\n";
+ $s->{state} = 'awake';
+ return bless $s, 'Foo';
+ }
+
+ package Foo;
+ use Data::Dumper;
+ $a = Foo->new;
+ $b = Data::Dumper->new([$a], ['c']);
+ $b->Freezer('Freeze');
+ $b->Toaster('Thaw');
+ $c = $b->Dump;
+ print $c;
+ $d = eval $c;
+ print Data::Dumper->Dump([$d], ['d']);
+
+
+ ########
+ # symbol substitution (useful for recreating CODE refs)
+ ########
+
+ sub foo { print "foo speaking\n" }
+ *other = \&foo;
+ $bar = [ \&other ];
+ $d = Data::Dumper->new([\&other,$bar],['*other','bar']);
+ $d->Seen({ '*foo' => \&foo });
+ print $d->Dump;
+</PRE>
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+Due to limitations of Perl subroutine call semantics, you cannot pass an
+array or hash. Prepend it with a <CODE>\</CODE> to pass its reference instead. This will be remedied in time, with the
+arrival of prototypes in later versions of Perl. For now, you need to use
+the extended usage form, and prepend the name with a <CODE>*</CODE> to output it as a hash or array.
+
+<P>
+<CODE>Data::Dumper</CODE> cheats with CODE references. If a code reference is encountered in the
+structure being processed, an anonymous subroutine that contains the string
+'``DUMMY''' will be inserted in its place, and a warning will be printed if <CODE>Purity</CODE> is set. You can <CODE>eval</CODE> the result, but bear in mind that the anonymous sub that gets created is
+just a placeholder. Someday, perl will have a switch to cache-on-demand the
+string representation of a compiled piece of code, I hope. If you have
+prior knowledge of all the code refs that your data structures are likely
+to have, you can use the <CODE>Seen</CODE> method to pre-seed the internal reference table and make the dumped output
+point to them, instead. See <A HREF="#EXAMPLES">EXAMPLES</A>
+above.
+
+<P>
+The <CODE>Useqq</CODE> flag is not honored by <CODE>Dumpxs()</CODE> (it always outputs strings in single quotes).
+
+<P>
+SCALAR objects have the weirdest looking <CODE>bless</CODE> workaround.
+
+<P>
+<HR>
+<H1><A NAME="AUTHOR">AUTHOR</A></H1>
+<P>
+Gurusamy Sarathy <A HREF="mailto:gsar at umich.edu">gsar at umich.edu</A>
+
+<P>
+Copyright (c) 1996-98 Gurusamy Sarathy. All rights reserved. This program
+is free software; you can redistribute it and/or modify it under the same
+terms as Perl itself.
+
+<P>
+<HR>
+<H1><A NAME="VERSION">VERSION</A></H1>
+<P>
+Version 2.101 (30 Apr 1999)
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<CODE>perl(1)</CODE>
+
+</BODY>
+
+</HTML>
Added: trunk/orca/packages/Data-Dumper-2.101/MANIFEST.NOXSUB
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/MANIFEST.NOXSUB (original)
+++ trunk/orca/packages/Data-Dumper-2.101/MANIFEST.NOXSUB Sat Jul 13 19:22:29 2002
@@ -0,0 +1,12 @@
+README
+MANIFEST
+MANIFEST.XSUB
+Changes
+Todo
+Makefile.PL
+Dumper.pm
+Dumper.pm.XSUB
+Dumper.xs.XSUB
+Dumper.html
+t/dumper.t
+t/overload.t
Added: trunk/orca/packages/Data-Dumper-2.101/t/overload.t
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/t/overload.t (original)
+++ trunk/orca/packages/Data-Dumper-2.101/t/overload.t Sat Jul 13 19:22:29 2002
@@ -0,0 +1,24 @@
+#!./perl -w
+
+use Data::Dumper;
+
+print "1..1\n";
+
+package Foo;
+use overload '""' => 'as_string';
+
+sub new { bless { foo => "bar" }, shift }
+sub as_string { "%%%%" }
+
+package main;
+
+my $f = Foo->new;
+
+print "#\$f=$f\n";
+
+$_ = Dumper($f);
+s/^/#/mg;
+print $_;
+
+print "not " unless /bar/ && /Foo/;
+print "ok 1\n";
Added: trunk/orca/packages/Data-Dumper-2.101/t/dumper.t
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/t/dumper.t (original)
+++ trunk/orca/packages/Data-Dumper-2.101/t/dumper.t Sat Jul 13 19:22:29 2002
@@ -0,0 +1,699 @@
+#!./perl -w
+#
+# testsuite for Data::Dumper
+#
+
+use Data::Dumper;
+
+$Data::Dumper::Pad = "#";
+my $TMAX;
+my $XS;
+my $TNUM = 0;
+my $WANT = '';
+
+sub TEST {
+ my $string = shift;
+ my $t = eval $string;
+ ++$TNUM;
+ print( ($t eq $WANT and not $@) ? "ok $TNUM\n"
+ : "not ok $TNUM\n--Expected--\n$WANT\n--Got--\n$@$t\n");
+
+ ++$TNUM;
+ eval "$t";
+ print $@ ? "not ok $TNUM\n# \$@ says: $@\n" : "ok $TNUM\n";
+
+ $t = eval $string;
+ ++$TNUM;
+ print( ($t eq $WANT and not $@) ? "ok $TNUM\n"
+ : "not ok $TNUM\n--Expected--\n$WANT\n--Got--\n$@$t\n");
+}
+
+if (defined &Data::Dumper::Dumpxs) {
+ print "### XS extension loaded, will run XS tests\n";
+ $TMAX = 162; $XS = 1;
+}
+else {
+ print "### XS extensions not loaded, will NOT run XS tests\n";
+ $TMAX = 81; $XS = 0;
+}
+
+print "1..$TMAX\n";
+
+#############
+#############
+
+ at c = ('c');
+$c = \@c;
+$b = {};
+$a = [1, $b, $c];
+$b->{a} = $a;
+$b->{b} = $a->[1];
+$b->{c} = $a->[2];
+
+############# 1
+##
+$WANT = <<'EOT';
+#$a = [
+# 1,
+# {
+# 'a' => $a,
+# 'b' => $a->[1],
+# 'c' => [
+# 'c'
+# ]
+# },
+# $a->[1]{'c'}
+# ];
+#$b = $a->[1];
+#$c = $a->[1]{'c'};
+EOT
+
+TEST q(Data::Dumper->Dump([$a,$b,$c], [qw(a b c)]));
+TEST q(Data::Dumper->Dumpxs([$a,$b,$c], [qw(a b c)])) if $XS;
+
+
+############# 7
+##
+$WANT = <<'EOT';
+#@a = (
+# 1,
+# {
+# 'a' => [],
+# 'b' => {},
+# 'c' => [
+# 'c'
+# ]
+# },
+# []
+# );
+#$a[1]{'a'} = \@a;
+#$a[1]{'b'} = $a[1];
+#$a[2] = $a[1]{'c'};
+#$b = $a[1];
+EOT
+
+$Data::Dumper::Purity = 1; # fill in the holes for eval
+TEST q(Data::Dumper->Dump([$a, $b], [qw(*a b)])); # print as @a
+TEST q(Data::Dumper->Dumpxs([$a, $b], [qw(*a b)])) if $XS;
+
+############# 13
+##
+$WANT = <<'EOT';
+#%b = (
+# 'a' => [
+# 1,
+# {},
+# [
+# 'c'
+# ]
+# ],
+# 'b' => {},
+# 'c' => []
+# );
+#$b{'a'}[1] = \%b;
+#$b{'b'} = \%b;
+#$b{'c'} = $b{'a'}[2];
+#$a = $b{'a'};
+EOT
+
+TEST q(Data::Dumper->Dump([$b, $a], [qw(*b a)])); # print as %b
+TEST q(Data::Dumper->Dumpxs([$b, $a], [qw(*b a)])) if $XS;
+
+############# 19
+##
+$WANT = <<'EOT';
+#$a = [
+# 1,
+# {
+# 'a' => [],
+# 'b' => {},
+# 'c' => []
+# },
+# []
+#];
+#$a->[1]{'a'} = $a;
+#$a->[1]{'b'} = $a->[1];
+#$a->[1]{'c'} = \@c;
+#$a->[2] = \@c;
+#$b = $a->[1];
+EOT
+
+$Data::Dumper::Indent = 1;
+TEST q(
+ $d = Data::Dumper->new([$a,$b], [qw(a b)]);
+ $d->Seen({'*c' => $c});
+ $d->Dump;
+ );
+if ($XS) {
+ TEST q(
+ $d = Data::Dumper->new([$a,$b], [qw(a b)]);
+ $d->Seen({'*c' => $c});
+ $d->Dumpxs;
+ );
+}
+
+
+############# 25
+##
+$WANT = <<'EOT';
+#$a = [
+# #0
+# 1,
+# #1
+# {
+# a => $a,
+# b => $a->[1],
+# c => [
+# #0
+# 'c'
+# ]
+# },
+# #2
+# $a->[1]{c}
+# ];
+#$b = $a->[1];
+EOT
+
+$d->Indent(3);
+$d->Purity(0)->Quotekeys(0);
+TEST q( $d->Reset; $d->Dump );
+
+TEST q( $d->Reset; $d->Dumpxs ) if $XS;
+
+############# 31
+##
+$WANT = <<'EOT';
+#$VAR1 = [
+# 1,
+# {
+# 'a' => [],
+# 'b' => {},
+# 'c' => [
+# 'c'
+# ]
+# },
+# []
+#];
+#$VAR1->[1]{'a'} = $VAR1;
+#$VAR1->[1]{'b'} = $VAR1->[1];
+#$VAR1->[2] = $VAR1->[1]{'c'};
+EOT
+
+TEST q(Dumper($a));
+TEST q(Data::Dumper::DumperX($a)) if $XS;
+
+############# 37
+##
+$WANT = <<'EOT';
+#[
+# 1,
+# {
+# a => $VAR1,
+# b => $VAR1->[1],
+# c => [
+# 'c'
+# ]
+# },
+# $VAR1->[1]{c}
+#]
+EOT
+
+{
+ local $Data::Dumper::Purity = 0;
+ local $Data::Dumper::Quotekeys = 0;
+ local $Data::Dumper::Terse = 1;
+ TEST q(Dumper($a));
+ TEST q(Data::Dumper::DumperX($a)) if $XS;
+}
+
+
+############# 43
+##
+$WANT = <<'EOT';
+#$VAR1 = {
+# "abc\0'\efg" => "mno\0"
+#};
+EOT
+
+$foo = { "abc\000\'\efg" => "mno\000" };
+{
+ local $Data::Dumper::Useqq = 1;
+ TEST q(Dumper($foo));
+}
+
+ $WANT = <<"EOT";
+#\$VAR1 = {
+# 'abc\0\\'\efg' => 'mno\0'
+#};
+EOT
+
+ {
+ local $Data::Dumper::Useqq = 1;
+ TEST q(Data::Dumper::DumperX($foo)) if $XS; # cheat
+ }
+
+
+
+#############
+#############
+
+{
+ package main;
+ use Data::Dumper;
+ $foo = 5;
+ @foo = (10,\*foo);
+ %foo = (a=>1,b=>\$foo,c=>\@foo);
+ $foo{d} = \%foo;
+ $foo[2] = \%foo;
+
+############# 49
+##
+ $WANT = <<'EOT';
+#$foo = \*::foo;
+#*::foo = \5;
+#*::foo = [
+# #0
+# 10,
+# #1
+# '',
+# #2
+# {
+# 'a' => 1,
+# 'b' => '',
+# 'c' => [],
+# 'd' => {}
+# }
+# ];
+#*::foo{ARRAY}->[1] = $foo;
+#*::foo{ARRAY}->[2]{'b'} = *::foo{SCALAR};
+#*::foo{ARRAY}->[2]{'c'} = *::foo{ARRAY};
+#*::foo{ARRAY}->[2]{'d'} = *::foo{ARRAY}->[2];
+#*::foo = *::foo{ARRAY}->[2];
+#@bar = @{*::foo{ARRAY}};
+#%baz = %{*::foo{ARRAY}->[2]};
+EOT
+
+ $Data::Dumper::Purity = 1;
+ $Data::Dumper::Indent = 3;
+ TEST q(Data::Dumper->Dump([\\*foo, \\@foo, \\%foo], ['*foo', '*bar', '*baz']));
+ TEST q(Data::Dumper->Dumpxs([\\*foo, \\@foo, \\%foo], ['*foo', '*bar', '*baz'])) if $XS;
+
+############# 55
+##
+ $WANT = <<'EOT';
+#$foo = \*::foo;
+#*::foo = \5;
+#*::foo = [
+# 10,
+# '',
+# {
+# 'a' => 1,
+# 'b' => '',
+# 'c' => [],
+# 'd' => {}
+# }
+#];
+#*::foo{ARRAY}->[1] = $foo;
+#*::foo{ARRAY}->[2]{'b'} = *::foo{SCALAR};
+#*::foo{ARRAY}->[2]{'c'} = *::foo{ARRAY};
+#*::foo{ARRAY}->[2]{'d'} = *::foo{ARRAY}->[2];
+#*::foo = *::foo{ARRAY}->[2];
+#$bar = *::foo{ARRAY};
+#$baz = *::foo{ARRAY}->[2];
+EOT
+
+ $Data::Dumper::Indent = 1;
+ TEST q(Data::Dumper->Dump([\\*foo, \\@foo, \\%foo], ['foo', 'bar', 'baz']));
+ TEST q(Data::Dumper->Dumpxs([\\*foo, \\@foo, \\%foo], ['foo', 'bar', 'baz'])) if $XS;
+
+############# 61
+##
+ $WANT = <<'EOT';
+#@bar = (
+# 10,
+# \*::foo,
+# {}
+#);
+#*::foo = \5;
+#*::foo = \@bar;
+#*::foo = {
+# 'a' => 1,
+# 'b' => '',
+# 'c' => [],
+# 'd' => {}
+#};
+#*::foo{HASH}->{'b'} = *::foo{SCALAR};
+#*::foo{HASH}->{'c'} = \@bar;
+#*::foo{HASH}->{'d'} = *::foo{HASH};
+#$bar[2] = *::foo{HASH};
+#%baz = %{*::foo{HASH}};
+#$foo = $bar[1];
+EOT
+
+ TEST q(Data::Dumper->Dump([\\@foo, \\%foo, \\*foo], ['*bar', '*baz', '*foo']));
+ TEST q(Data::Dumper->Dumpxs([\\@foo, \\%foo, \\*foo], ['*bar', '*baz', '*foo'])) if $XS;
+
+############# 67
+##
+ $WANT = <<'EOT';
+#$bar = [
+# 10,
+# \*::foo,
+# {}
+#];
+#*::foo = \5;
+#*::foo = $bar;
+#*::foo = {
+# 'a' => 1,
+# 'b' => '',
+# 'c' => [],
+# 'd' => {}
+#};
+#*::foo{HASH}->{'b'} = *::foo{SCALAR};
+#*::foo{HASH}->{'c'} = $bar;
+#*::foo{HASH}->{'d'} = *::foo{HASH};
+#$bar->[2] = *::foo{HASH};
+#$baz = *::foo{HASH};
+#$foo = $bar->[1];
+EOT
+
+ TEST q(Data::Dumper->Dump([\\@foo, \\%foo, \\*foo], ['bar', 'baz', 'foo']));
+ TEST q(Data::Dumper->Dumpxs([\\@foo, \\%foo, \\*foo], ['bar', 'baz', 'foo'])) if $XS;
+
+############# 73
+##
+ $WANT = <<'EOT';
+#$foo = \*::foo;
+#@bar = (
+# 10,
+# $foo,
+# {
+# a => 1,
+# b => \5,
+# c => \@bar,
+# d => $bar[2]
+# }
+#);
+#%baz = %{$bar[2]};
+EOT
+
+ $Data::Dumper::Purity = 0;
+ $Data::Dumper::Quotekeys = 0;
+ TEST q(Data::Dumper->Dump([\\*foo, \\@foo, \\%foo], ['*foo', '*bar', '*baz']));
+ TEST q(Data::Dumper->Dumpxs([\\*foo, \\@foo, \\%foo], ['*foo', '*bar', '*baz'])) if $XS;
+
+############# 79
+##
+ $WANT = <<'EOT';
+#$foo = \*::foo;
+#$bar = [
+# 10,
+# $foo,
+# {
+# a => 1,
+# b => \5,
+# c => $bar,
+# d => $bar->[2]
+# }
+#];
+#$baz = $bar->[2];
+EOT
+
+ TEST q(Data::Dumper->Dump([\\*foo, \\@foo, \\%foo], ['foo', 'bar', 'baz']));
+ TEST q(Data::Dumper->Dumpxs([\\*foo, \\@foo, \\%foo], ['foo', 'bar', 'baz'])) if $XS;
+
+}
+
+#############
+#############
+{
+ package main;
+ @dogs = ( 'Fido', 'Wags' );
+ %kennel = (
+ First => \$dogs[0],
+ Second => \$dogs[1],
+ );
+ $dogs[2] = \%kennel;
+ $mutts = \%kennel;
+ $mutts = $mutts; # avoid warning
+
+############# 85
+##
+ $WANT = <<'EOT';
+#%kennels = (
+# First => \'Fido',
+# Second => \'Wags'
+#);
+#@dogs = (
+# ${$kennels{First}},
+# ${$kennels{Second}},
+# \%kennels
+#);
+#%mutts = %kennels;
+EOT
+
+ TEST q(
+ $d = Data::Dumper->new([\\%kennel, \\@dogs, $mutts],
+ [qw(*kennels *dogs *mutts)] );
+ $d->Dump;
+ );
+ if ($XS) {
+ TEST q(
+ $d = Data::Dumper->new([\\%kennel, \\@dogs, $mutts],
+ [qw(*kennels *dogs *mutts)] );
+ $d->Dumpxs;
+ );
+ }
+
+############# 91
+##
+ $WANT = <<'EOT';
+#%kennels = %kennels;
+#@dogs = @dogs;
+#%mutts = %kennels;
+EOT
+
+ TEST q($d->Dump);
+ TEST q($d->Dumpxs) if $XS;
+
+############# 97
+##
+ $WANT = <<'EOT';
+#%kennels = (
+# First => \'Fido',
+# Second => \'Wags'
+#);
+#@dogs = (
+# ${$kennels{First}},
+# ${$kennels{Second}},
+# \%kennels
+#);
+#%mutts = %kennels;
+EOT
+
+
+ TEST q($d->Reset; $d->Dump);
+ if ($XS) {
+ TEST q($d->Reset; $d->Dumpxs);
+ }
+
+############# 103
+##
+ $WANT = <<'EOT';
+#@dogs = (
+# 'Fido',
+# 'Wags',
+# {
+# First => \$dogs[0],
+# Second => \$dogs[1]
+# }
+#);
+#%kennels = %{$dogs[2]};
+#%mutts = %{$dogs[2]};
+EOT
+
+ TEST q(
+ $d = Data::Dumper->new([\\@dogs, \\%kennel, $mutts],
+ [qw(*dogs *kennels *mutts)] );
+ $d->Dump;
+ );
+ if ($XS) {
+ TEST q(
+ $d = Data::Dumper->new([\\@dogs, \\%kennel, $mutts],
+ [qw(*dogs *kennels *mutts)] );
+ $d->Dumpxs;
+ );
+ }
+
+############# 109
+##
+ TEST q($d->Reset->Dump);
+ if ($XS) {
+ TEST q($d->Reset->Dumpxs);
+ }
+
+############# 115
+##
+ $WANT = <<'EOT';
+#@dogs = (
+# 'Fido',
+# 'Wags',
+# {
+# First => \'Fido',
+# Second => \'Wags'
+# }
+#);
+#%kennels = (
+# First => \'Fido',
+# Second => \'Wags'
+#);
+EOT
+
+ TEST q(
+ $d = Data::Dumper->new( [\@dogs, \%kennel], [qw(*dogs *kennels)] );
+ $d->Deepcopy(1)->Dump;
+ );
+ if ($XS) {
+ TEST q($d->Reset->Dumpxs);
+ }
+
+}
+
+{
+
+sub z { print "foo\n" }
+$c = [ \&z ];
+
+############# 121
+##
+ $WANT = <<'EOT';
+#$a = $b;
+#$c = [
+# $b
+#];
+EOT
+
+TEST q(Data::Dumper->new([\&z,$c],['a','c'])->Seen({'b' => \&z})->Dump;);
+TEST q(Data::Dumper->new([\&z,$c],['a','c'])->Seen({'b' => \&z})->Dumpxs;)
+ if $XS;
+
+############# 127
+##
+ $WANT = <<'EOT';
+#$a = \&b;
+#$c = [
+# \&b
+#];
+EOT
+
+TEST q(Data::Dumper->new([\&z,$c],['a','c'])->Seen({'*b' => \&z})->Dump;);
+TEST q(Data::Dumper->new([\&z,$c],['a','c'])->Seen({'*b' => \&z})->Dumpxs;)
+ if $XS;
+
+############# 133
+##
+ $WANT = <<'EOT';
+#*a = \&b;
+#@c = (
+# \&b
+#);
+EOT
+
+TEST q(Data::Dumper->new([\&z,$c],['*a','*c'])->Seen({'*b' => \&z})->Dump;);
+TEST q(Data::Dumper->new([\&z,$c],['*a','*c'])->Seen({'*b' => \&z})->Dumpxs;)
+ if $XS;
+
+}
+
+{
+ $a = [];
+ $a->[1] = \$a->[0];
+
+############# 139
+##
+ $WANT = <<'EOT';
+#@a = (
+# undef,
+# ''
+#);
+#$a[1] = \$a[0];
+EOT
+
+TEST q(Data::Dumper->new([$a],['*a'])->Purity(1)->Dump;);
+TEST q(Data::Dumper->new([$a],['*a'])->Purity(1)->Dumpxs;)
+ if $XS;
+}
+
+{
+ $a = \\\\\'foo';
+ $b = $$$a;
+
+############# 145
+##
+ $WANT = <<'EOT';
+#$a = \\\\\'foo';
+#$b = ${${$a}};
+EOT
+
+TEST q(Data::Dumper->new([$a,$b],['a','b'])->Purity(1)->Dump;);
+TEST q(Data::Dumper->new([$a,$b],['a','b'])->Purity(1)->Dumpxs;)
+ if $XS;
+}
+
+{
+ $a = [{ a => \$b }, { b => undef }];
+ $b = [{ c => \$b }, { d => \$a }];
+
+############# 151
+##
+ $WANT = <<'EOT';
+#$a = [
+# {
+# a => \[
+# {
+# c => ''
+# },
+# {
+# d => \[]
+# }
+# ]
+# },
+# {
+# b => undef
+# }
+#];
+#${$a->[0]{a}}->[0]->{c} = $a->[0]{a};
+#${${$a->[0]{a}}->[1]->{d}} = $a;
+#$b = ${$a->[0]{a}};
+EOT
+
+TEST q(Data::Dumper->new([$a,$b],['a','b'])->Purity(1)->Dump;);
+TEST q(Data::Dumper->new([$a,$b],['a','b'])->Purity(1)->Dumpxs;)
+ if $XS;
+}
+
+{
+ $a = [[[[\\\\\'foo']]]];
+ $b = $a->[0][0];
+ $c = $${$b->[0][0]};
+
+############# 157
+##
+ $WANT = <<'EOT';
+#$a = [
+# [
+# [
+# [
+# \\\\\'foo'
+# ]
+# ]
+# ]
+#];
+#$b = $a->[0][0];
+#$c = ${${$a->[0][0][0][0]}};
+EOT
+
+TEST q(Data::Dumper->new([$a,$b,$c],['a','b','c'])->Purity(1)->Dump;);
+TEST q(Data::Dumper->new([$a,$b,$c],['a','b','c'])->Purity(1)->Dumpxs;)
+ if $XS;
+}
Added: trunk/orca/packages/Data-Dumper-2.101/Dumper.pm.NOXSUB
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Dumper.pm.NOXSUB (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Dumper.pm.NOXSUB Sat Jul 13 19:22:29 2002
@@ -0,0 +1,1001 @@
+#
+# Data/Dumper.pm
+#
+# convert perl data structures into perl syntax suitable for both printing
+# and eval
+#
+# Documentation at the __END__
+#
+
+package Data::Dumper;
+
+$VERSION = $VERSION = '2.101';
+
+#$| = 1;
+
+require 5.004;
+require Exporter;
+##require DynaLoader;
+require overload;
+
+use Carp;
+
+ at ISA = qw(Exporter);
+##@ISA = qw(Exporter Dynaloader);
+ at EXPORT = qw(Dumper);
+##@EXPORT_OK = qw(DumperX);
+
+##bootstrap Data::Dumper;
+
+# module vars and their defaults
+$Indent = 2 unless defined $Indent;
+$Purity = 0 unless defined $Purity;
+$Pad = "" unless defined $Pad;
+$Varname = "VAR" unless defined $Varname;
+$Useqq = 0 unless defined $Useqq;
+$Terse = 0 unless defined $Terse;
+$Freezer = "" unless defined $Freezer;
+$Toaster = "" unless defined $Toaster;
+$Deepcopy = 0 unless defined $Deepcopy;
+$Quotekeys = 1 unless defined $Quotekeys;
+$Bless = "bless" unless defined $Bless;
+#$Expdepth = 0 unless defined $Expdepth;
+#$Maxdepth = 0 unless defined $Maxdepth;
+
+#
+# expects an arrayref of values to be dumped.
+# can optionally pass an arrayref of names for the values.
+# names must have leading $ sign stripped. begin the name with *
+# to cause output of arrays and hashes rather than refs.
+#
+sub new {
+ my($c, $v, $n) = @_;
+
+ croak "Usage: PACKAGE->new(ARRAYREF, [ARRAYREF])"
+ unless (defined($v) && (ref($v) eq 'ARRAY'));
+ $n = [] unless (defined($n) && (ref($v) eq 'ARRAY'));
+
+ my($s) = {
+ level => 0, # current recursive depth
+ indent => $Indent, # various styles of indenting
+ pad => $Pad, # all lines prefixed by this string
+ xpad => "", # padding-per-level
+ apad => "", # added padding for hash keys n such
+ sep => "", # list separator
+ seen => {}, # local (nested) refs (id => [name, val])
+ todump => $v, # values to dump []
+ names => $n, # optional names for values []
+ varname => $Varname, # prefix to use for tagging nameless ones
+ purity => $Purity, # degree to which output is evalable
+ useqq => $Useqq, # use "" for strings (backslashitis ensues)
+ terse => $Terse, # avoid name output (where feasible)
+ freezer => $Freezer, # name of Freezer method for objects
+ toaster => $Toaster, # name of method to revive objects
+ deepcopy => $Deepcopy, # dont cross-ref, except to stop recursion
+ quotekeys => $Quotekeys, # quote hash keys
+ 'bless' => $Bless, # keyword to use for "bless"
+# expdepth => $Expdepth, # cutoff depth for explicit dumping
+# maxdepth => $Maxdepth, # depth beyond which we give up
+ };
+
+ if ($Indent > 0) {
+ $s->{xpad} = " ";
+ $s->{sep} = "\n";
+ }
+ return bless($s, $c);
+}
+
+#
+# add-to or query the table of already seen references
+#
+sub Seen {
+ my($s, $g) = @_;
+ if (defined($g) && (ref($g) eq 'HASH')) {
+ my($k, $v, $id);
+ while (($k, $v) = each %$g) {
+ if (defined $v and ref $v) {
+ ($id) = (overload::StrVal($v) =~ /\((.*)\)$/);
+ if ($k =~ /^[*](.*)$/) {
+ $k = (ref $v eq 'ARRAY') ? ( "\\\@" . $1 ) :
+ (ref $v eq 'HASH') ? ( "\\\%" . $1 ) :
+ (ref $v eq 'CODE') ? ( "\\\&" . $1 ) :
+ ( "\$" . $1 ) ;
+ }
+ elsif ($k !~ /^\$/) {
+ $k = "\$" . $k;
+ }
+ $s->{seen}{$id} = [$k, $v];
+ }
+ else {
+ carp "Only refs supported, ignoring non-ref item \$$k";
+ }
+ }
+ return $s;
+ }
+ else {
+ return map { @$_ } values %{$s->{seen}};
+ }
+}
+
+#
+# set or query the values to be dumped
+#
+sub Values {
+ my($s, $v) = @_;
+ if (defined($v) && (ref($v) eq 'ARRAY')) {
+ $s->{todump} = [@$v]; # make a copy
+ return $s;
+ }
+ else {
+ return @{$s->{todump}};
+ }
+}
+
+#
+# set or query the names of the values to be dumped
+#
+sub Names {
+ my($s, $n) = @_;
+ if (defined($n) && (ref($n) eq 'ARRAY')) {
+ $s->{names} = [@$n]; # make a copy
+ return $s;
+ }
+ else {
+ return @{$s->{names}};
+ }
+}
+
+sub DESTROY {}
+
+#
+# dump the refs in the current dumper object.
+# expects same args as new() if called via package name.
+#
+sub Dump {
+ my($s) = shift;
+ my(@out, $val, $name);
+ my($i) = 0;
+ local(@post);
+
+ $s = $s->new(@_) unless ref $s;
+
+ for $val (@{$s->{todump}}) {
+ my $out = "";
+ @post = ();
+ $name = $s->{names}[$i++];
+ if (defined $name) {
+ if ($name =~ /^[*](.*)$/) {
+ if (defined $val) {
+ $name = (ref $val eq 'ARRAY') ? ( "\@" . $1 ) :
+ (ref $val eq 'HASH') ? ( "\%" . $1 ) :
+ (ref $val eq 'CODE') ? ( "\*" . $1 ) :
+ ( "\$" . $1 ) ;
+ }
+ else {
+ $name = "\$" . $1;
+ }
+ }
+ elsif ($name !~ /^\$/) {
+ $name = "\$" . $name;
+ }
+ }
+ else {
+ $name = "\$" . $s->{varname} . $i;
+ }
+
+ my $valstr;
+ {
+ local($s->{apad}) = $s->{apad};
+ $s->{apad} .= ' ' x (length($name) + 3) if $s->{indent} >= 2;
+ $valstr = $s->_dump($val, $name);
+ }
+
+ $valstr = "$name = " . $valstr . ';' if @post or !$s->{terse};
+ $out .= $s->{pad} . $valstr . $s->{sep};
+ $out .= $s->{pad} . join(';' . $s->{sep} . $s->{pad}, @post)
+ . ';' . $s->{sep} if @post;
+
+ push @out, $out;
+ }
+ return wantarray ? @out : join('', @out);
+}
+
+#
+# twist, toil and turn;
+# and recurse, of course.
+#
+sub _dump {
+ my($s, $val, $name) = @_;
+ my($sname);
+ my($out, $realpack, $realtype, $type, $ipad, $id, $blesspad);
+
+ $type = ref $val;
+ $out = "";
+
+ if ($type) {
+
+ # prep it, if it looks like an object
+ if ($type =~ /[a-z_:]/) {
+ my $freezer = $s->{freezer};
+ $val->$freezer() if $freezer && UNIVERSAL::can($val, $freezer);
+ }
+
+ ($realpack, $realtype, $id) =
+ (overload::StrVal($val) =~ /^(?:(.*)\=)?([^=]*)\(([^\(]*)\)$/);
+
+ # if it has a name, we need to either look it up, or keep a tab
+ # on it so we know when we hit it later
+ if (defined($name) and length($name)) {
+ # keep a tab on it so that we dont fall into recursive pit
+ if (exists $s->{seen}{$id}) {
+# if ($s->{expdepth} < $s->{level}) {
+ if ($s->{purity} and $s->{level} > 0) {
+ $out = ($realtype eq 'HASH') ? '{}' :
+ ($realtype eq 'ARRAY') ? '[]' :
+ "''" ;
+ push @post, $name . " = " . $s->{seen}{$id}[0];
+ }
+ else {
+ $out = $s->{seen}{$id}[0];
+ if ($name =~ /^([\@\%])/) {
+ my $start = $1;
+ if ($out =~ /^\\$start/) {
+ $out = substr($out, 1);
+ }
+ else {
+ $out = $start . '{' . $out . '}';
+ }
+ }
+ }
+ return $out;
+# }
+ }
+ else {
+ # store our name
+ $s->{seen}{$id} = [ (($name =~ /^[@%]/) ? ('\\' . $name ) :
+ ($realtype eq 'CODE' and
+ $name =~ /^[*](.*)$/) ? ('\\&' . $1 ) :
+ $name ),
+ $val ];
+ }
+ }
+
+ $s->{level}++;
+ $ipad = $s->{xpad} x $s->{level};
+
+ if ($realpack) { # we have a blessed ref
+ $out = $s->{'bless'} . '( ';
+ $blesspad = $s->{apad};
+ $s->{apad} .= ' ' if ($s->{indent} >= 2);
+ }
+
+ if ($realtype eq 'SCALAR') {
+ if ($realpack) {
+ $out .= 'do{\\(my $o = ' . $s->_dump($$val, "\${$name}") . ')}';
+ }
+ else {
+ $out .= '\\' . $s->_dump($$val, "\${$name}");
+ }
+ }
+ elsif ($realtype eq 'GLOB') {
+ $out .= '\\' . $s->_dump($$val, "*{$name}");
+ }
+ elsif ($realtype eq 'ARRAY') {
+ my($v, $pad, $mname);
+ my($i) = 0;
+ $out .= ($name =~ /^\@/) ? '(' : '[';
+ $pad = $s->{sep} . $s->{pad} . $s->{apad};
+ ($name =~ /^\@(.*)$/) ? ($mname = "\$" . $1) :
+ # omit -> if $foo->[0]->{bar}, but not ${$foo->[0]}->{bar}
+ ($name =~ /^\\?[\%\@\*\$][^{].*[]}]$/) ? ($mname = $name) :
+ ($mname = $name . '->');
+ $mname .= '->' if $mname =~ /^\*.+\{[A-Z]+\}$/;
+ for $v (@$val) {
+ $sname = $mname . '[' . $i . ']';
+ $out .= $pad . $ipad . '#' . $i if $s->{indent} >= 3;
+ $out .= $pad . $ipad . $s->_dump($v, $sname);
+ $out .= "," if $i++ < $#$val;
+ }
+ $out .= $pad . ($s->{xpad} x ($s->{level} - 1)) if $i;
+ $out .= ($name =~ /^\@/) ? ')' : ']';
+ }
+ elsif ($realtype eq 'HASH') {
+ my($k, $v, $pad, $lpad, $mname);
+ $out .= ($name =~ /^\%/) ? '(' : '{';
+ $pad = $s->{sep} . $s->{pad} . $s->{apad};
+ $lpad = $s->{apad};
+ ($name =~ /^\%(.*)$/) ? ($mname = "\$" . $1) :
+ # omit -> if $foo->[0]->{bar}, but not ${$foo->[0]}->{bar}
+ ($name =~ /^\\?[\%\@\*\$][^{].*[]}]$/) ? ($mname = $name) :
+ ($mname = $name . '->');
+ $mname .= '->' if $mname =~ /^\*.+\{[A-Z]+\}$/;
+ while (($k, $v) = each %$val) {
+ my $nk = $s->_dump($k, "");
+ $nk = $1 if !$s->{quotekeys} and $nk =~ /^[\"\']([A-Za-z_]\w*)[\"\']$/;
+ $sname = $mname . '{' . $nk . '}';
+ $out .= $pad . $ipad . $nk . " => ";
+
+ # temporarily alter apad
+ $s->{apad} .= (" " x (length($nk) + 4)) if $s->{indent} >= 2;
+ $out .= $s->_dump($val->{$k}, $sname) . ",";
+ $s->{apad} = $lpad if $s->{indent} >= 2;
+ }
+ if (substr($out, -1) eq ',') {
+ chop $out;
+ $out .= $pad . ($s->{xpad} x ($s->{level} - 1));
+ }
+ $out .= ($name =~ /^\%/) ? ')' : '}';
+ }
+ elsif ($realtype eq 'CODE') {
+ $out .= 'sub { "DUMMY" }';
+ carp "Encountered CODE ref, using dummy placeholder" if $s->{purity};
+ }
+ else {
+ croak "Can\'t handle $realtype type.";
+ }
+
+ if ($realpack) { # we have a blessed ref
+ $out .= ', \'' . $realpack . '\'' . ' )';
+ $out .= '->' . $s->{toaster} . '()' if $s->{toaster} ne '';
+ $s->{apad} = $blesspad;
+ }
+ $s->{level}--;
+
+ }
+ else { # simple scalar
+
+ my $ref = \$_[1];
+ # first, catalog the scalar
+ if ($name ne '') {
+ ($id) = ("$ref" =~ /\(([^\(]*)\)$/);
+ if (exists $s->{seen}{$id}) {
+ if ($s->{seen}{$id}[2]) {
+ $out = $s->{seen}{$id}[0];
+ #warn "[<$out]\n";
+ return "\${$out}";
+ }
+ }
+ else {
+ #warn "[>\\$name]\n";
+ $s->{seen}{$id} = ["\\$name", $ref];
+ }
+ }
+ if (ref($ref) eq 'GLOB' or "$ref" =~ /=GLOB\([^()]+\)$/) { # glob
+ my $name = substr($val, 1);
+ if ($name =~ /^[A-Za-z_][\w:]*$/) {
+ $name =~ s/^main::/::/;
+ $sname = $name;
+ }
+ else {
+ $sname = $s->_dump($name, "");
+ $sname = '{' . $sname . '}';
+ }
+ if ($s->{purity}) {
+ my $k;
+ local ($s->{level}) = 0;
+ for $k (qw(SCALAR ARRAY HASH)) {
+ my $gval = *$val{$k};
+ next unless defined $gval;
+ next if $k eq "SCALAR" && ! defined $$gval; # always there
+
+ # _dump can push into @post, so we hold our place using $postlen
+ my $postlen = scalar @post;
+ $post[$postlen] = "\*$sname = ";
+ local ($s->{apad}) = " " x length($post[$postlen]) if $s->{indent} >= 2;
+ $post[$postlen] .= $s->_dump($gval, "\*$sname\{$k\}");
+ }
+ }
+ $out .= '*' . $sname;
+ }
+ elsif (!defined($val)) {
+ $out .= "undef";
+ }
+ elsif ($val =~ /^-?[1-9]\d{0,8}$/) { # safe decimal number
+ $out .= $val;
+ }
+ else { # string
+ if ($s->{useqq}) {
+ $out .= qquote($val, $s->{useqq});
+ }
+ else {
+ $val =~ s/([\\\'])/\\$1/g;
+ $out .= '\'' . $val . '\'';
+ }
+ }
+ }
+ if ($id) {
+ # if we made it this far, $id was added to seen list at current
+ # level, so remove it to get deep copies
+ if ($s->{deepcopy}) {
+ delete($s->{seen}{$id});
+ }
+ elsif ($name) {
+ $s->{seen}{$id}[2] = 1;
+ }
+ }
+ return $out;
+}
+
+#
+# non-OO style of earlier version
+#
+sub Dumper {
+ return Data::Dumper->Dump([@_]);
+}
+
+#
+# same, only calls the XS version
+#
+sub DumperX {
+ croak "XSUB extensions of Data::Dumper not installed";
+}
+
+sub Dumpf { return Data::Dumper->Dump(@_) }
+
+sub Dumpp { print Data::Dumper->Dump(@_) }
+
+#
+# reset the "seen" cache
+#
+sub Reset {
+ my($s) = shift;
+ $s->{seen} = {};
+ return $s;
+}
+
+sub Indent {
+ my($s, $v) = @_;
+ if (defined($v)) {
+ if ($v == 0) {
+ $s->{xpad} = "";
+ $s->{sep} = "";
+ }
+ else {
+ $s->{xpad} = " ";
+ $s->{sep} = "\n";
+ }
+ $s->{indent} = $v;
+ return $s;
+ }
+ else {
+ return $s->{indent};
+ }
+}
+
+sub Pad {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{pad} = $v), return $s) : $s->{pad};
+}
+
+sub Varname {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{varname} = $v), return $s) : $s->{varname};
+}
+
+sub Purity {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{purity} = $v), return $s) : $s->{purity};
+}
+
+sub Useqq {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{useqq} = $v), return $s) : $s->{useqq};
+}
+
+sub Terse {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{terse} = $v), return $s) : $s->{terse};
+}
+
+sub Freezer {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{freezer} = $v), return $s) : $s->{freezer};
+}
+
+sub Toaster {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{toaster} = $v), return $s) : $s->{toaster};
+}
+
+sub Deepcopy {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{deepcopy} = $v), return $s) : $s->{deepcopy};
+}
+
+sub Quotekeys {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{quotekeys} = $v), return $s) : $s->{quotekeys};
+}
+
+sub Bless {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{'bless'} = $v), return $s) : $s->{'bless'};
+}
+
+# used by qquote below
+my %esc = (
+ "\a" => "\\a",
+ "\b" => "\\b",
+ "\t" => "\\t",
+ "\n" => "\\n",
+ "\f" => "\\f",
+ "\r" => "\\r",
+ "\e" => "\\e",
+);
+
+# put a string value in double quotes
+sub qquote {
+ local($_) = shift;
+ s/([\\\"\@\$])/\\$1/g;
+ return qq("$_") unless /[^\040-\176]/; # fast exit
+
+ my $high = shift || "";
+ s/([\a\b\t\n\f\r\e])/$esc{$1}/g;
+
+ # no need for 3 digits in escape for these
+ s/([\0-\037])(?!\d)/'\\'.sprintf('%o',ord($1))/eg;
+
+ s/([\0-\037\177])/'\\'.sprintf('%03o',ord($1))/eg;
+ if ($high eq "iso8859") {
+ s/([\200-\240])/'\\'.sprintf('%o',ord($1))/eg;
+ } elsif ($high eq "utf8") {
+# use utf8;
+# $str =~ s/([^\040-\176])/sprintf "\\x{%04x}", ord($1)/ge;
+ } elsif ($high eq "8bit") {
+ # leave it as it is
+ } else {
+ s/([\0-\037\177-\377])/'\\'.sprintf('%03o',ord($1))/eg;
+ }
+ return qq("$_");
+}
+
+1;
+__END__
+
+=head1 NAME
+
+Data::Dumper - stringified perl data structures, suitable for both printing and C<eval>
+
+
+=head1 SYNOPSIS
+
+ use Data::Dumper;
+
+ # simple procedural interface
+ print Dumper($foo, $bar);
+
+ # extended usage with names
+ print Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+
+ # configuration variables
+ {
+ local $Data::Dump::Purity = 1;
+ eval Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+ }
+
+ # OO usage
+ $d = Data::Dumper->new([$foo, $bar], [qw(foo *ary)]);
+ ...
+ print $d->Dump;
+ ...
+ $d->Purity(1)->Terse(1)->Deepcopy(1);
+ eval $d->Dump;
+
+
+=head1 DESCRIPTION
+
+Given a list of scalars or reference variables, writes out their contents in
+perl syntax. The references can also be objects. The contents of each
+variable is output in a single Perl statement. Handles self-referential
+structures correctly.
+
+The return value can be C<eval>ed to get back an identical copy of the
+original reference structure.
+
+Any references that are the same as one of those passed in will be named
+C<$VAR>I<n> (where I<n> is a numeric suffix), and other duplicate references
+to substructures within C<$VAR>I<n> will be appropriately labeled using arrow
+notation. You can specify names for individual values to be dumped if you
+use the C<Dump()> method, or you can change the default C<$VAR> prefix to
+something else. See C<$Data::Dumper::Varname> and C<$Data::Dumper::Terse>
+below.
+
+The default output of self-referential structures can be C<eval>ed, but the
+nested references to C<$VAR>I<n> will be undefined, since a recursive
+structure cannot be constructed using one Perl statement. You should set the
+C<Purity> flag to 1 to get additional statements that will correctly fill in
+these references.
+
+In the extended usage form, the references to be dumped can be given
+user-specified names. If a name begins with a C<*>, the output will
+describe the dereferenced type of the supplied reference for hashes and
+arrays, and coderefs. Output of names will be avoided where possible if
+the C<Terse> flag is set.
+
+In many cases, methods that are used to set the internal state of the
+object will return the object itself, so method calls can be conveniently
+chained together.
+
+Several styles of output are possible, all controlled by setting
+the C<Indent> flag. See L<Configuration Variables or Methods> below
+for details.
+
+
+=head2 Methods
+
+=over 4
+
+=item I<PACKAGE>->new(I<ARRAYREF [>, I<ARRAYREF]>)
+
+Returns a newly created C<Data::Dumper> object. The first argument is an
+anonymous array of values to be dumped. The optional second argument is an
+anonymous array of names for the values. The names need not have a leading
+C<$> sign, and must be comprised of alphanumeric characters. You can begin
+a name with a C<*> to specify that the dereferenced type must be dumped
+instead of the reference itself, for ARRAY and HASH references.
+
+The prefix specified by C<$Data::Dumper::Varname> will be used with a
+numeric suffix if the name for a value is undefined.
+
+Data::Dumper will catalog all references encountered while dumping the
+values. Cross-references (in the form of names of substructures in perl
+syntax) will be inserted at all possible points, preserving any structural
+interdependencies in the original set of values. Structure traversal is
+depth-first, and proceeds in order from the first supplied value to
+the last.
+
+=item I<$OBJ>->Dump I<or> I<PACKAGE>->Dump(I<ARRAYREF [>, I<ARRAYREF]>)
+
+Returns the stringified form of the values stored in the object (preserving
+the order in which they were supplied to C<new>), subject to the
+configuration options below. In an array context, it returns a list
+of strings corresponding to the supplied values.
+
+The second form, for convenience, simply calls the C<new> method on its
+arguments before dumping the object immediately.
+
+=item I<$OBJ>->Dumpxs I<or> I<PACKAGE>->Dumpxs(I<ARRAYREF [>, I<ARRAYREF]>)
+
+This method is available if you were able to compile and install the XSUB
+extension to C<Data::Dumper>. It is exactly identical to the C<Dump> method
+above, only about 4 to 5 times faster, since it is written entirely in C.
+
+=item I<$OBJ>->Seen(I<[HASHREF]>)
+
+Queries or adds to the internal table of already encountered references.
+You must use C<Reset> to explicitly clear the table if needed. Such
+references are not dumped; instead, their names are inserted wherever they
+are encountered subsequently. This is useful especially for properly
+dumping subroutine references.
+
+Expects a anonymous hash of name => value pairs. Same rules apply for names
+as in C<new>. If no argument is supplied, will return the "seen" list of
+name => value pairs, in an array context. Otherwise, returns the object
+itself.
+
+=item I<$OBJ>->Values(I<[ARRAYREF]>)
+
+Queries or replaces the internal array of values that will be dumped.
+When called without arguments, returns the values. Otherwise, returns the
+object itself.
+
+=item I<$OBJ>->Names(I<[ARRAYREF]>)
+
+Queries or replaces the internal array of user supplied names for the values
+that will be dumped. When called without arguments, returns the names.
+Otherwise, returns the object itself.
+
+=item I<$OBJ>->Reset
+
+Clears the internal table of "seen" references and returns the object
+itself.
+
+=back
+
+=head2 Functions
+
+=over 4
+
+=item Dumper(I<LIST>)
+
+Returns the stringified form of the values in the list, subject to the
+configuration options below. The values will be named C<$VAR>I<n> in the
+output, where I<n> is a numeric suffix. Will return a list of strings
+in an array context.
+
+=item DumperX(I<LIST>)
+
+Identical to the C<Dumper()> function above, but this calls the XSUB
+implementation. Only available if you were able to compile and install
+the XSUB extensions in C<Data::Dumper>.
+
+=back
+
+=head2 Configuration Variables or Methods
+
+Several configuration variables can be used to control the kind of output
+generated when using the procedural interface. These variables are usually
+C<local>ized in a block so that other parts of the code are not affected by
+the change.
+
+These variables determine the default state of the object created by calling
+the C<new> method, but cannot be used to alter the state of the object
+thereafter. The equivalent method names should be used instead to query
+or set the internal state of the object.
+
+The method forms return the object itself when called with arguments,
+so that they can be chained together nicely.
+
+=over 4
+
+=item $Data::Dumper::Indent I<or> I<$OBJ>->Indent(I<[NEWVAL]>)
+
+Controls the style of indentation. It can be set to 0, 1, 2 or 3. Style 0
+spews output without any newlines, indentation, or spaces between list
+items. It is the most compact format possible that can still be called
+valid perl. Style 1 outputs a readable form with newlines but no fancy
+indentation (each level in the structure is simply indented by a fixed
+amount of whitespace). Style 2 (the default) outputs a very readable form
+which takes into account the length of hash keys (so the hash value lines
+up). Style 3 is like style 2, but also annotates the elements of arrays
+with their index (but the comment is on its own line, so array output
+consumes twice the number of lines). Style 2 is the default.
+
+=item $Data::Dumper::Purity I<or> I<$OBJ>->Purity(I<[NEWVAL]>)
+
+Controls the degree to which the output can be C<eval>ed to recreate the
+supplied reference structures. Setting it to 1 will output additional perl
+statements that will correctly recreate nested references. The default is
+0.
+
+=item $Data::Dumper::Pad I<or> I<$OBJ>->Pad(I<[NEWVAL]>)
+
+Specifies the string that will be prefixed to every line of the output.
+Empty string by default.
+
+=item $Data::Dumper::Varname I<or> I<$OBJ>->Varname(I<[NEWVAL]>)
+
+Contains the prefix to use for tagging variable names in the output. The
+default is "VAR".
+
+=item $Data::Dumper::Useqq I<or> I<$OBJ>->Useqq(I<[NEWVAL]>)
+
+When set, enables the use of double quotes for representing string values.
+Whitespace other than space will be represented as C<[\n\t\r]>, "unsafe"
+characters will be backslashed, and unprintable characters will be output as
+quoted octal integers. Since setting this variable imposes a performance
+penalty, the default is 0. The C<Dumpxs()> method does not honor this
+flag yet.
+
+=item $Data::Dumper::Terse I<or> I<$OBJ>->Terse(I<[NEWVAL]>)
+
+When set, Data::Dumper will emit single, non-self-referential values as
+atoms/terms rather than statements. This means that the C<$VAR>I<n> names
+will be avoided where possible, but be advised that such output may not
+always be parseable by C<eval>.
+
+=item $Data::Dumper::Freezer I<or> $I<OBJ>->Freezer(I<[NEWVAL]>)
+
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will invoke that method via the object before attempting to
+stringify it. This method can alter the contents of the object (if, for
+instance, it contains data allocated from C), and even rebless it in a
+different package. The client is responsible for making sure the specified
+method can be called via the object, and that the object ends up containing
+only perl data types after the method has been called. Defaults to an empty
+string.
+
+=item $Data::Dumper::Toaster I<or> $I<OBJ>->Toaster(I<[NEWVAL]>)
+
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will emit a method call for any objects that are to be dumped
+using the syntax C<bless(DATA, CLASS)->METHOD()>. Note that this means that
+the method specified will have to perform any modifications required on the
+object (like creating new state within it, and/or reblessing it in a
+different package) and then return it. The client is responsible for making
+sure the method can be called via the object, and that it returns a valid
+object. Defaults to an empty string.
+
+=item $Data::Dumper::Deepcopy I<or> $I<OBJ>->Deepcopy(I<[NEWVAL]>)
+
+Can be set to a boolean value to enable deep copies of structures.
+Cross-referencing will then only be done when absolutely essential
+(i.e., to break reference cycles). Default is 0.
+
+=item $Data::Dumper::Quotekeys I<or> $I<OBJ>->Quotekeys(I<[NEWVAL]>)
+
+Can be set to a boolean value to control whether hash keys are quoted.
+A false value will avoid quoting hash keys when it looks like a simple
+string. Default is 1, which will always enclose hash keys in quotes.
+
+=item $Data::Dumper::Bless I<or> $I<OBJ>->Bless(I<[NEWVAL]>)
+
+Can be set to a string that specifies an alternative to the C<bless>
+builtin operator used to create objects. A function with the specified
+name should exist, and should accept the same arguments as the builtin.
+Default is C<bless>.
+
+=back
+
+=head2 Exports
+
+=over 4
+
+=item Dumper
+
+=back
+
+=head1 EXAMPLES
+
+Run these code snippets to get a quick feel for the behavior of this
+module. When you are through with these examples, you may want to
+add or change the various configuration variables described above,
+to see their behavior. (See the testsuite in the Data::Dumper
+distribution for more examples.)
+
+
+ use Data::Dumper;
+
+ package Foo;
+ sub new {bless {'a' => 1, 'b' => sub { return "foo" }}, $_[0]};
+
+ package Fuz; # a weird REF-REF-SCALAR object
+ sub new {bless \($_ = \ 'fu\'z'), $_[0]};
+
+ package main;
+ $foo = Foo->new;
+ $fuz = Fuz->new;
+ $boo = [ 1, [], "abcd", \*foo,
+ {1 => 'a', 023 => 'b', 0x45 => 'c'},
+ \\"p\q\'r", $foo, $fuz];
+
+ ########
+ # simple usage
+ ########
+
+ $bar = eval(Dumper($boo));
+ print($@) if $@;
+ print Dumper($boo), Dumper($bar); # pretty print (no array indices)
+
+ $Data::Dumper::Terse = 1; # don't output names where feasible
+ $Data::Dumper::Indent = 0; # turn off all pretty print
+ print Dumper($boo), "\n";
+
+ $Data::Dumper::Indent = 1; # mild pretty print
+ print Dumper($boo);
+
+ $Data::Dumper::Indent = 3; # pretty print with array indices
+ print Dumper($boo);
+
+ $Data::Dumper::Useqq = 1; # print strings in double quotes
+ print Dumper($boo);
+
+
+ ########
+ # recursive structures
+ ########
+
+ @c = ('c');
+ $c = \@c;
+ $b = {};
+ $a = [1, $b, $c];
+ $b->{a} = $a;
+ $b->{b} = $a->[1];
+ $b->{c} = $a->[2];
+ print Data::Dumper->Dump([$a,$b,$c], [qw(a b c)]);
+
+
+ $Data::Dumper::Purity = 1; # fill in the holes for eval
+ print Data::Dumper->Dump([$a, $b], [qw(*a b)]); # print as @a
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]); # print as %b
+
+
+ $Data::Dumper::Deepcopy = 1; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ $Data::Dumper::Purity = 0; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ ########
+ # object-oriented usage
+ ########
+
+ $d = Data::Dumper->new([$a,$b], [qw(a b)]);
+ $d->Seen({'*c' => $c}); # stash a ref without printing it
+ $d->Indent(3);
+ print $d->Dump;
+ $d->Reset->Purity(0); # empty the seen cache
+ print join "----\n", $d->Dump;
+
+
+ ########
+ # persistence
+ ########
+
+ package Foo;
+ sub new { bless { state => 'awake' }, shift }
+ sub Freeze {
+ my $s = shift;
+ print STDERR "preparing to sleep\n";
+ $s->{state} = 'asleep';
+ return bless $s, 'Foo::ZZZ';
+ }
+
+ package Foo::ZZZ;
+ sub Thaw {
+ my $s = shift;
+ print STDERR "waking up\n";
+ $s->{state} = 'awake';
+ return bless $s, 'Foo';
+ }
+
+ package Foo;
+ use Data::Dumper;
+ $a = Foo->new;
+ $b = Data::Dumper->new([$a], ['c']);
+ $b->Freezer('Freeze');
+ $b->Toaster('Thaw');
+ $c = $b->Dump;
+ print $c;
+ $d = eval $c;
+ print Data::Dumper->Dump([$d], ['d']);
+
+
+ ########
+ # symbol substitution (useful for recreating CODE refs)
+ ########
+
+ sub foo { print "foo speaking\n" }
+ *other = \&foo;
+ $bar = [ \&other ];
+ $d = Data::Dumper->new([\&other,$bar],['*other','bar']);
+ $d->Seen({ '*foo' => \&foo });
+ print $d->Dump;
+
+
+=head1 BUGS
+
+Due to limitations of Perl subroutine call semantics, you cannot pass an
+array or hash. Prepend it with a C<\> to pass its reference instead. This
+will be remedied in time, with the arrival of prototypes in later versions
+of Perl. For now, you need to use the extended usage form, and prepend the
+name with a C<*> to output it as a hash or array.
+
+C<Data::Dumper> cheats with CODE references. If a code reference is
+encountered in the structure being processed, an anonymous subroutine that
+contains the string '"DUMMY"' will be inserted in its place, and a warning
+will be printed if C<Purity> is set. You can C<eval> the result, but bear
+in mind that the anonymous sub that gets created is just a placeholder.
+Someday, perl will have a switch to cache-on-demand the string
+representation of a compiled piece of code, I hope. If you have prior
+knowledge of all the code refs that your data structures are likely
+to have, you can use the C<Seen> method to pre-seed the internal reference
+table and make the dumped output point to them, instead. See L<EXAMPLES>
+above.
+
+The C<Useqq> flag is not honored by C<Dumpxs()> (it always outputs
+strings in single quotes).
+
+SCALAR objects have the weirdest looking C<bless> workaround.
+
+
+=head1 AUTHOR
+
+Gurusamy Sarathy gsar at umich.edu
+
+Copyright (c) 1996-98 Gurusamy Sarathy. All rights reserved.
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+
+=head1 VERSION
+
+Version 2.101 (30 Apr 1999)
+
+=head1 SEE ALSO
+
+perl(1)
+
+=cut
Added: trunk/orca/packages/Data-Dumper-2.101/Dumper.xs
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Dumper.xs (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Dumper.xs Sat Jul 13 19:22:30 2002
@@ -0,0 +1,864 @@
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+#ifndef PERL_VERSION
+#include "patchlevel.h"
+#define PERL_VERSION PATCHLEVEL
+#endif
+
+#if PERL_VERSION < 5
+# ifndef PL_sv_undef
+# define PL_sv_undef sv_undef
+# endif
+# ifndef ERRSV
+# define ERRSV GvSV(errgv)
+# endif
+# ifndef newSVpvn
+# define newSVpvn newSVpv
+# endif
+#endif
+
+static I32 num_q _((char *s, STRLEN slen));
+static I32 esc_q _((char *dest, char *src, STRLEN slen));
+static SV *sv_x _((SV *sv, char *str, STRLEN len, I32 n));
+static I32 DD_dump _((SV *val, char *name, STRLEN namelen, SV *retval,
+ HV *seenhv, AV *postav, I32 *levelp, I32 indent,
+ SV *pad, SV *xpad, SV *apad, SV *sep,
+ SV *freezer, SV *toaster,
+ I32 purity, I32 deepcopy, I32 quotekeys, SV *bless));
+
+/* does a string need to be protected? */
+static I32
+needs_quote(register char *s)
+{
+TOP:
+ if (s[0] == ':') {
+ if (*++s) {
+ if (*s++ != ':')
+ return 1;
+ }
+ else
+ return 1;
+ }
+ if (isIDFIRST(*s)) {
+ while (*++s)
+ if (!isALNUM(*s))
+ if (*s == ':')
+ goto TOP;
+ else
+ return 1;
+ }
+ else
+ return 1;
+ return 0;
+}
+
+/* count the number of "'"s and "\"s in string */
+static I32
+num_q(register char *s, register STRLEN slen)
+{
+ register I32 ret = 0;
+
+ while (slen > 0) {
+ if (*s == '\'' || *s == '\\')
+ ++ret;
+ ++s;
+ --slen;
+ }
+ return ret;
+}
+
+
+/* returns number of chars added to escape "'"s and "\"s in s */
+/* slen number of characters in s will be escaped */
+/* destination must be long enough for additional chars */
+static I32
+esc_q(register char *d, register char *s, register STRLEN slen)
+{
+ register I32 ret = 0;
+
+ while (slen > 0) {
+ switch (*s) {
+ case '\'':
+ case '\\':
+ *d = '\\';
+ ++d; ++ret;
+ default:
+ *d = *s;
+ ++d; ++s; --slen;
+ break;
+ }
+ }
+ return ret;
+}
+
+/* append a repeated string to an SV */
+static SV *
+sv_x(SV *sv, register char *str, STRLEN len, I32 n)
+{
+ if (sv == Nullsv)
+ sv = newSVpvn("", 0);
+ else
+ assert(SvTYPE(sv) >= SVt_PV);
+
+ if (n > 0) {
+ SvGROW(sv, len*n + SvCUR(sv) + 1);
+ if (len == 1) {
+ char *start = SvPVX(sv) + SvCUR(sv);
+ SvCUR(sv) += n;
+ start[n] = '\0';
+ while (n > 0)
+ start[--n] = str[0];
+ }
+ else
+ while (n > 0) {
+ sv_catpvn(sv, str, len);
+ --n;
+ }
+ }
+ return sv;
+}
+
+/*
+ * This ought to be split into smaller functions. (it is one long function since
+ * it exactly parallels the perl version, which was one long thing for
+ * efficiency raisins.) Ugggh!
+ */
+static I32
+DD_dump(SV *val, char *name, STRLEN namelen, SV *retval, HV *seenhv,
+ AV *postav, I32 *levelp, I32 indent, SV *pad, SV *xpad,
+ SV *apad, SV *sep, SV *freezer, SV *toaster, I32 purity,
+ I32 deepcopy, I32 quotekeys, SV *bless)
+{
+ char tmpbuf[128];
+ U32 i;
+ char *c, *r, *realpack, id[128];
+ SV **svp;
+ SV *sv, *ipad, *ival;
+ SV *blesspad = Nullsv;
+ AV *seenentry = Nullav;
+ char *iname;
+ STRLEN inamelen, idlen = 0;
+ U32 flags;
+ U32 realtype;
+
+ if (!val)
+ return 0;
+
+ flags = SvFLAGS(val);
+ realtype = SvTYPE(val);
+
+ if (SvGMAGICAL(val))
+ mg_get(val);
+ if (SvROK(val)) {
+
+ if (SvOBJECT(SvRV(val)) && freezer &&
+ SvPOK(freezer) && SvCUR(freezer))
+ {
+ dSP; ENTER; SAVETMPS; PUSHMARK(sp);
+ XPUSHs(val); PUTBACK;
+ i = perl_call_method(SvPVX(freezer), G_EVAL|G_SCALAR);
+ SPAGAIN;
+ if (SvTRUE(ERRSV))
+ warn("WARNING(Freezer method call failed): %s",
+ SvPVX(ERRSV));
+ else if (i)
+ val = newSVsv(POPs);
+ PUTBACK; FREETMPS; LEAVE;
+ if (i)
+ (void)sv_2mortal(val);
+ }
+
+ ival = SvRV(val);
+ flags = SvFLAGS(ival);
+ realtype = SvTYPE(ival);
+ (void) sprintf(id, "0x%lx", (unsigned long)ival);
+ idlen = strlen(id);
+ if (SvOBJECT(ival))
+ realpack = HvNAME(SvSTASH(ival));
+ else
+ realpack = Nullch;
+
+ /* if it has a name, we need to either look it up, or keep a tab
+ * on it so we know when we hit it later
+ */
+ if (namelen) {
+ if ((svp = hv_fetch(seenhv, id, idlen, FALSE))
+ && (sv = *svp) && SvROK(sv) && (seenentry = (AV*)SvRV(sv)))
+ {
+ SV *othername;
+ if ((svp = av_fetch(seenentry, 0, FALSE))
+ && (othername = *svp))
+ {
+ if (purity && *levelp > 0) {
+ SV *postentry;
+
+ if (realtype == SVt_PVHV)
+ sv_catpvn(retval, "{}", 2);
+ else if (realtype == SVt_PVAV)
+ sv_catpvn(retval, "[]", 2);
+ else
+ sv_catpvn(retval, "''", 2);
+ postentry = newSVpvn(name, namelen);
+ sv_catpvn(postentry, " = ", 3);
+ sv_catsv(postentry, othername);
+ av_push(postav, postentry);
+ }
+ else {
+ if (name[0] == '@' || name[0] == '%') {
+ if ((SvPVX(othername))[0] == '\\' &&
+ (SvPVX(othername))[1] == name[0]) {
+ sv_catpvn(retval, SvPVX(othername)+1,
+ SvCUR(othername)-1);
+ }
+ else {
+ sv_catpvn(retval, name, 1);
+ sv_catpvn(retval, "{", 1);
+ sv_catsv(retval, othername);
+ sv_catpvn(retval, "}", 1);
+ }
+ }
+ else
+ sv_catsv(retval, othername);
+ }
+ return 1;
+ }
+ else {
+ warn("ref name not found for %s", id);
+ return 0;
+ }
+ }
+ else { /* store our name and continue */
+ SV *namesv;
+ if (name[0] == '@' || name[0] == '%') {
+ namesv = newSVpvn("\\", 1);
+ sv_catpvn(namesv, name, namelen);
+ }
+ else if (realtype == SVt_PVCV && name[0] == '*') {
+ namesv = newSVpvn("\\", 2);
+ sv_catpvn(namesv, name, namelen);
+ (SvPVX(namesv))[1] = '&';
+ }
+ else
+ namesv = newSVpvn(name, namelen);
+ seenentry = newAV();
+ av_push(seenentry, namesv);
+ (void)SvREFCNT_inc(val);
+ av_push(seenentry, val);
+ (void)hv_store(seenhv, id, strlen(id),
+ newRV((SV*)seenentry), 0);
+ SvREFCNT_dec(seenentry);
+ }
+ }
+
+ (*levelp)++;
+ ipad = sv_x(Nullsv, SvPVX(xpad), SvCUR(xpad), *levelp);
+
+ if (realpack) { /* we have a blessed ref */
+ STRLEN blesslen;
+ char *blessstr = SvPV(bless, blesslen);
+ sv_catpvn(retval, blessstr, blesslen);
+ sv_catpvn(retval, "( ", 2);
+ if (indent >= 2) {
+ blesspad = apad;
+ apad = newSVsv(apad);
+ sv_x(apad, " ", 1, blesslen+2);
+ }
+ }
+
+ if (realtype <= SVt_PVBM) { /* scalar ref */
+ SV *namesv = newSVpvn("${", 2);
+ sv_catpvn(namesv, name, namelen);
+ sv_catpvn(namesv, "}", 1);
+ if (realpack) { /* blessed */
+ sv_catpvn(retval, "do{\\(my $o = ", 13);
+ DD_dump(ival, SvPVX(namesv), SvCUR(namesv), retval, seenhv,
+ postav, levelp, indent, pad, xpad, apad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys, bless);
+ sv_catpvn(retval, ")}", 2);
+ } /* plain */
+ else {
+ sv_catpvn(retval, "\\", 1);
+ DD_dump(ival, SvPVX(namesv), SvCUR(namesv), retval, seenhv,
+ postav, levelp, indent, pad, xpad, apad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys, bless);
+ }
+ SvREFCNT_dec(namesv);
+ }
+ else if (realtype == SVt_PVGV) { /* glob ref */
+ SV *namesv = newSVpvn("*{", 2);
+ sv_catpvn(namesv, name, namelen);
+ sv_catpvn(namesv, "}", 1);
+ sv_catpvn(retval, "\\", 1);
+ DD_dump(ival, SvPVX(namesv), SvCUR(namesv), retval, seenhv,
+ postav, levelp, indent, pad, xpad, apad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys, bless);
+ SvREFCNT_dec(namesv);
+ }
+ else if (realtype == SVt_PVAV) {
+ SV *totpad;
+ I32 ix = 0;
+ I32 ixmax = av_len((AV *)ival);
+
+ SV *ixsv = newSViv(0);
+ /* allowing for a 24 char wide array index */
+ New(0, iname, namelen+28, char);
+ (void)strcpy(iname, name);
+ inamelen = namelen;
+ if (name[0] == '@') {
+ sv_catpvn(retval, "(", 1);
+ iname[0] = '$';
+ }
+ else {
+ sv_catpvn(retval, "[", 1);
+ /* omit "->" in $foo{bar}->[0], but not in ${$foo}->[0] */
+ /*if (namelen > 0
+ && name[namelen-1] != ']' && name[namelen-1] != '}'
+ && (namelen < 4 || (name[1] != '{' && name[2] != '{')))*/
+ if ((namelen > 0
+ && name[namelen-1] != ']' && name[namelen-1] != '}')
+ || (namelen > 4
+ && (name[1] == '{'
+ || (name[0] == '\\' && name[2] == '{'))))
+ {
+ iname[inamelen++] = '-'; iname[inamelen++] = '>';
+ iname[inamelen] = '\0';
+ }
+ }
+ if (iname[0] == '*' && iname[inamelen-1] == '}' && inamelen >= 8 &&
+ (instr(iname+inamelen-8, "{SCALAR}") ||
+ instr(iname+inamelen-7, "{ARRAY}") ||
+ instr(iname+inamelen-6, "{HASH}"))) {
+ iname[inamelen++] = '-'; iname[inamelen++] = '>';
+ }
+ iname[inamelen++] = '['; iname[inamelen] = '\0';
+ totpad = newSVsv(sep);
+ sv_catsv(totpad, pad);
+ sv_catsv(totpad, apad);
+
+ for (ix = 0; ix <= ixmax; ++ix) {
+ STRLEN ilen;
+ SV *elem;
+ svp = av_fetch((AV*)ival, ix, FALSE);
+ if (svp)
+ elem = *svp;
+ else
+ elem = &PL_sv_undef;
+
+ ilen = inamelen;
+ sv_setiv(ixsv, ix);
+ (void) sprintf(iname+ilen, "%ld", ix);
+ ilen = strlen(iname);
+ iname[ilen++] = ']'; iname[ilen] = '\0';
+ if (indent >= 3) {
+ sv_catsv(retval, totpad);
+ sv_catsv(retval, ipad);
+ sv_catpvn(retval, "#", 1);
+ sv_catsv(retval, ixsv);
+ }
+ sv_catsv(retval, totpad);
+ sv_catsv(retval, ipad);
+ DD_dump(elem, iname, ilen, retval, seenhv, postav,
+ levelp, indent, pad, xpad, apad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys, bless);
+ if (ix < ixmax)
+ sv_catpvn(retval, ",", 1);
+ }
+ if (ixmax >= 0) {
+ SV *opad = sv_x(Nullsv, SvPVX(xpad), SvCUR(xpad), (*levelp)-1);
+ sv_catsv(retval, totpad);
+ sv_catsv(retval, opad);
+ SvREFCNT_dec(opad);
+ }
+ if (name[0] == '@')
+ sv_catpvn(retval, ")", 1);
+ else
+ sv_catpvn(retval, "]", 1);
+ SvREFCNT_dec(ixsv);
+ SvREFCNT_dec(totpad);
+ Safefree(iname);
+ }
+ else if (realtype == SVt_PVHV) {
+ SV *totpad, *newapad;
+ SV *iname, *sname;
+ HE *entry;
+ char *key;
+ I32 klen;
+ SV *hval;
+
+ iname = newSVpvn(name, namelen);
+ if (name[0] == '%') {
+ sv_catpvn(retval, "(", 1);
+ (SvPVX(iname))[0] = '$';
+ }
+ else {
+ sv_catpvn(retval, "{", 1);
+ /* omit "->" in $foo[0]->{bar}, but not in ${$foo}->{bar} */
+ if ((namelen > 0
+ && name[namelen-1] != ']' && name[namelen-1] != '}')
+ || (namelen > 4
+ && (name[1] == '{'
+ || (name[0] == '\\' && name[2] == '{'))))
+ {
+ sv_catpvn(iname, "->", 2);
+ }
+ }
+ if (name[0] == '*' && name[namelen-1] == '}' && namelen >= 8 &&
+ (instr(name+namelen-8, "{SCALAR}") ||
+ instr(name+namelen-7, "{ARRAY}") ||
+ instr(name+namelen-6, "{HASH}"))) {
+ sv_catpvn(iname, "->", 2);
+ }
+ sv_catpvn(iname, "{", 1);
+ totpad = newSVsv(sep);
+ sv_catsv(totpad, pad);
+ sv_catsv(totpad, apad);
+
+ (void)hv_iterinit((HV*)ival);
+ i = 0;
+ while ((entry = hv_iternext((HV*)ival))) {
+ char *nkey;
+ I32 nticks = 0;
+
+ if (i)
+ sv_catpvn(retval, ",", 1);
+ i++;
+ key = hv_iterkey(entry, &klen);
+ hval = hv_iterval((HV*)ival, entry);
+
+ if (quotekeys || needs_quote(key)) {
+ nticks = num_q(key, klen);
+ New(0, nkey, klen+nticks+3, char);
+ nkey[0] = '\'';
+ if (nticks)
+ klen += esc_q(nkey+1, key, klen);
+ else
+ (void)Copy(key, nkey+1, klen, char);
+ nkey[++klen] = '\'';
+ nkey[++klen] = '\0';
+ }
+ else {
+ New(0, nkey, klen, char);
+ (void)Copy(key, nkey, klen, char);
+ }
+
+ sname = newSVsv(iname);
+ sv_catpvn(sname, nkey, klen);
+ sv_catpvn(sname, "}", 1);
+
+ sv_catsv(retval, totpad);
+ sv_catsv(retval, ipad);
+ sv_catpvn(retval, nkey, klen);
+ sv_catpvn(retval, " => ", 4);
+ if (indent >= 2) {
+ char *extra;
+ I32 elen = 0;
+ newapad = newSVsv(apad);
+ New(0, extra, klen+4+1, char);
+ while (elen < (klen+4))
+ extra[elen++] = ' ';
+ extra[elen] = '\0';
+ sv_catpvn(newapad, extra, elen);
+ Safefree(extra);
+ }
+ else
+ newapad = apad;
+
+ DD_dump(hval, SvPVX(sname), SvCUR(sname), retval, seenhv,
+ postav, levelp, indent, pad, xpad, newapad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys, bless);
+ SvREFCNT_dec(sname);
+ Safefree(nkey);
+ if (indent >= 2)
+ SvREFCNT_dec(newapad);
+ }
+ if (i) {
+ SV *opad = sv_x(Nullsv, SvPVX(xpad), SvCUR(xpad), *levelp-1);
+ sv_catsv(retval, totpad);
+ sv_catsv(retval, opad);
+ SvREFCNT_dec(opad);
+ }
+ if (name[0] == '%')
+ sv_catpvn(retval, ")", 1);
+ else
+ sv_catpvn(retval, "}", 1);
+ SvREFCNT_dec(iname);
+ SvREFCNT_dec(totpad);
+ }
+ else if (realtype == SVt_PVCV) {
+ sv_catpvn(retval, "sub { \"DUMMY\" }", 15);
+ if (purity)
+ warn("Encountered CODE ref, using dummy placeholder");
+ }
+ else {
+ warn("cannot handle ref type %ld", realtype);
+ }
+
+ if (realpack) { /* free blessed allocs */
+ if (indent >= 2) {
+ SvREFCNT_dec(apad);
+ apad = blesspad;
+ }
+ sv_catpvn(retval, ", '", 3);
+ sv_catpvn(retval, realpack, strlen(realpack));
+ sv_catpvn(retval, "' )", 3);
+ if (toaster && SvPOK(toaster) && SvCUR(toaster)) {
+ sv_catpvn(retval, "->", 2);
+ sv_catsv(retval, toaster);
+ sv_catpvn(retval, "()", 2);
+ }
+ }
+ SvREFCNT_dec(ipad);
+ (*levelp)--;
+ }
+ else {
+ STRLEN i;
+
+ if (namelen) {
+ (void) sprintf(id, "0x%lx", (unsigned long)val);
+ if ((svp = hv_fetch(seenhv, id, (idlen = strlen(id)), FALSE)) &&
+ (sv = *svp) && SvROK(sv) &&
+ (seenentry = (AV*)SvRV(sv)))
+ {
+ SV *othername;
+ if ((svp = av_fetch(seenentry, 0, FALSE)) && (othername = *svp)
+ && (svp = av_fetch(seenentry, 2, FALSE)) && *svp && SvIV(*svp) > 0)
+ {
+ sv_catpvn(retval, "${", 2);
+ sv_catsv(retval, othername);
+ sv_catpvn(retval, "}", 1);
+ return 1;
+ }
+ }
+ else {
+ SV *namesv;
+ namesv = newSVpvn("\\", 1);
+ sv_catpvn(namesv, name, namelen);
+ seenentry = newAV();
+ av_push(seenentry, namesv);
+ av_push(seenentry, newRV(val));
+ (void)hv_store(seenhv, id, strlen(id), newRV((SV*)seenentry), 0);
+ SvREFCNT_dec(seenentry);
+ }
+ }
+
+ if (SvIOK(val)) {
+ STRLEN len;
+ i = SvIV(val);
+ (void) sprintf(tmpbuf, "%d", i);
+ len = strlen(tmpbuf);
+ sv_catpvn(retval, tmpbuf, len);
+ }
+ else if (realtype == SVt_PVGV) {/* GLOBs can end up with scribbly names */
+ c = SvPV(val, i);
+ ++c; --i; /* just get the name */
+ if (i >= 6 && strncmp(c, "main::", 6) == 0) {
+ c += 4;
+ i -= 4;
+ }
+ if (needs_quote(c)) {
+ sv_grow(retval, SvCUR(retval)+6+2*i);
+ r = SvPVX(retval)+SvCUR(retval);
+ r[0] = '*'; r[1] = '{'; r[2] = '\'';
+ i += esc_q(r+3, c, i);
+ i += 3;
+ r[i++] = '\''; r[i++] = '}';
+ r[i] = '\0';
+ }
+ else {
+ sv_grow(retval, SvCUR(retval)+i+2);
+ r = SvPVX(retval)+SvCUR(retval);
+ r[0] = '*'; strcpy(r+1, c);
+ i++;
+ }
+ SvCUR_set(retval, SvCUR(retval)+i);
+
+ if (purity) {
+ static char *entries[] = { "{SCALAR}", "{ARRAY}", "{HASH}" };
+ static STRLEN sizes[] = { 8, 7, 6 };
+ SV *e;
+ SV *nname = newSVpvn("", 0);
+ SV *newapad = newSVpvn("", 0);
+ GV *gv = (GV*)val;
+ I32 j;
+
+ for (j=0; j<3; j++) {
+ e = ((j == 0) ? GvSV(gv) : (j == 1) ? (SV*)GvAV(gv) : (SV*)GvHV(gv));
+ if (!e)
+ continue;
+ if (j == 0 && !SvOK(e))
+ continue;
+
+ {
+ I32 nlevel = 0;
+ SV *postentry = newSVpvn(r,i);
+
+ sv_setsv(nname, postentry);
+ sv_catpvn(nname, entries[j], sizes[j]);
+ sv_catpvn(postentry, " = ", 3);
+ av_push(postav, postentry);
+ e = newRV(e);
+
+ SvCUR(newapad) = 0;
+ if (indent >= 2)
+ (void)sv_x(newapad, " ", 1, SvCUR(postentry));
+
+ DD_dump(e, SvPVX(nname), SvCUR(nname), postentry,
+ seenhv, postav, &nlevel, indent, pad, xpad,
+ newapad, sep, freezer, toaster, purity,
+ deepcopy, quotekeys, bless);
+ SvREFCNT_dec(e);
+ }
+ }
+
+ SvREFCNT_dec(newapad);
+ SvREFCNT_dec(nname);
+ }
+ }
+ else if (val == &PL_sv_undef || !SvOK(val)) {
+ sv_catpvn(retval, "undef", 5);
+ }
+ else {
+ c = SvPV(val, i);
+ sv_grow(retval, SvCUR(retval)+3+2*i);
+ r = SvPVX(retval)+SvCUR(retval);
+ r[0] = '\'';
+ i += esc_q(r+1, c, i);
+ ++i;
+ r[i++] = '\'';
+ r[i] = '\0';
+ SvCUR_set(retval, SvCUR(retval)+i);
+ }
+ }
+
+ if (idlen) {
+ if (deepcopy)
+ (void)hv_delete(seenhv, id, idlen, G_DISCARD);
+ else if (namelen && seenentry) {
+ SV *mark = *av_fetch(seenentry, 2, TRUE);
+ sv_setiv(mark,1);
+ }
+ }
+ return 1;
+}
+
+
+MODULE = Data::Dumper PACKAGE = Data::Dumper PREFIX = Data_Dumper_
+
+#
+# This is the exact equivalent of Dump. Well, almost. The things that are
+# different as of now (due to Laziness):
+# * doesnt do double-quotes yet.
+#
+
+void
+Data_Dumper_Dumpxs(href, ...)
+ SV *href;
+ PROTOTYPE: $;$$
+ PPCODE:
+ {
+ HV *hv;
+ SV *retval, *valstr;
+ HV *seenhv = Nullhv;
+ AV *postav, *todumpav, *namesav;
+ I32 level = 0;
+ I32 indent, terse, useqq, i, imax, postlen;
+ SV **svp;
+ SV *val, *name, *pad, *xpad, *apad, *sep, *tmp, *varname;
+ SV *freezer, *toaster, *bless;
+ I32 purity, deepcopy, quotekeys;
+ char tmpbuf[1024];
+ I32 gimme = GIMME;
+
+ if (!SvROK(href)) { /* call new to get an object first */
+ SV *valarray;
+ SV *namearray;
+
+ if (items == 3) {
+ valarray = ST(1);
+ namearray = ST(2);
+ }
+ else
+ croak("Usage: Data::Dumper::Dumpxs(PACKAGE, VAL_ARY_REF, NAME_ARY_REF)");
+
+ ENTER;
+ SAVETMPS;
+
+ PUSHMARK(sp);
+ XPUSHs(href);
+ XPUSHs(sv_2mortal(newSVsv(valarray)));
+ XPUSHs(sv_2mortal(newSVsv(namearray)));
+ PUTBACK;
+ i = perl_call_method("new", G_SCALAR);
+ SPAGAIN;
+ if (i)
+ href = newSVsv(POPs);
+
+ PUTBACK;
+ FREETMPS;
+ LEAVE;
+ if (i)
+ (void)sv_2mortal(href);
+ }
+
+ todumpav = namesav = Nullav;
+ seenhv = Nullhv;
+ val = pad = xpad = apad = sep = tmp = varname
+ = freezer = toaster = bless = &PL_sv_undef;
+ name = sv_newmortal();
+ indent = 2;
+ terse = useqq = purity = deepcopy = 0;
+ quotekeys = 1;
+
+ retval = newSVpvn("", 0);
+ if (SvROK(href)
+ && (hv = (HV*)SvRV((SV*)href))
+ && SvTYPE(hv) == SVt_PVHV) {
+
+ if ((svp = hv_fetch(hv, "seen", 4, FALSE)) && SvROK(*svp))
+ seenhv = (HV*)SvRV(*svp);
+ if ((svp = hv_fetch(hv, "todump", 6, FALSE)) && SvROK(*svp))
+ todumpav = (AV*)SvRV(*svp);
+ if ((svp = hv_fetch(hv, "names", 5, FALSE)) && SvROK(*svp))
+ namesav = (AV*)SvRV(*svp);
+ if ((svp = hv_fetch(hv, "indent", 6, FALSE)))
+ indent = SvIV(*svp);
+ if ((svp = hv_fetch(hv, "purity", 6, FALSE)))
+ purity = SvIV(*svp);
+ if ((svp = hv_fetch(hv, "terse", 5, FALSE)))
+ terse = SvTRUE(*svp);
+ if ((svp = hv_fetch(hv, "useqq", 5, FALSE)))
+ useqq = SvTRUE(*svp);
+ if ((svp = hv_fetch(hv, "pad", 3, FALSE)))
+ pad = *svp;
+ if ((svp = hv_fetch(hv, "xpad", 4, FALSE)))
+ xpad = *svp;
+ if ((svp = hv_fetch(hv, "apad", 4, FALSE)))
+ apad = *svp;
+ if ((svp = hv_fetch(hv, "sep", 3, FALSE)))
+ sep = *svp;
+ if ((svp = hv_fetch(hv, "varname", 7, FALSE)))
+ varname = *svp;
+ if ((svp = hv_fetch(hv, "freezer", 7, FALSE)))
+ freezer = *svp;
+ if ((svp = hv_fetch(hv, "toaster", 7, FALSE)))
+ toaster = *svp;
+ if ((svp = hv_fetch(hv, "deepcopy", 8, FALSE)))
+ deepcopy = SvTRUE(*svp);
+ if ((svp = hv_fetch(hv, "quotekeys", 9, FALSE)))
+ quotekeys = SvTRUE(*svp);
+ if ((svp = hv_fetch(hv, "bless", 5, FALSE)))
+ bless = *svp;
+ postav = newAV();
+
+ if (todumpav)
+ imax = av_len(todumpav);
+ else
+ imax = -1;
+ valstr = newSVpvn("",0);
+ for (i = 0; i <= imax; ++i) {
+ SV *newapad;
+
+ av_clear(postav);
+ if ((svp = av_fetch(todumpav, i, FALSE)))
+ val = *svp;
+ else
+ val = &PL_sv_undef;
+ if ((svp = av_fetch(namesav, i, TRUE)))
+ sv_setsv(name, *svp);
+ else
+ SvOK_off(name);
+
+ if (SvOK(name)) {
+ if ((SvPVX(name))[0] == '*') {
+ if (SvROK(val)) {
+ switch (SvTYPE(SvRV(val))) {
+ case SVt_PVAV:
+ (SvPVX(name))[0] = '@';
+ break;
+ case SVt_PVHV:
+ (SvPVX(name))[0] = '%';
+ break;
+ case SVt_PVCV:
+ (SvPVX(name))[0] = '*';
+ break;
+ default:
+ (SvPVX(name))[0] = '$';
+ break;
+ }
+ }
+ else
+ (SvPVX(name))[0] = '$';
+ }
+ else if ((SvPVX(name))[0] != '$')
+ sv_insert(name, 0, 0, "$", 1);
+ }
+ else {
+ STRLEN nchars = 0;
+ sv_setpvn(name, "$", 1);
+ sv_catsv(name, varname);
+ (void) sprintf(tmpbuf, "%ld", i+1);
+ nchars = strlen(tmpbuf);
+ sv_catpvn(name, tmpbuf, nchars);
+ }
+
+ if (indent >= 2) {
+ SV *tmpsv = sv_x(Nullsv, " ", 1, SvCUR(name)+3);
+ newapad = newSVsv(apad);
+ sv_catsv(newapad, tmpsv);
+ SvREFCNT_dec(tmpsv);
+ }
+ else
+ newapad = apad;
+
+ DD_dump(val, SvPVX(name), SvCUR(name), valstr, seenhv,
+ postav, &level, indent, pad, xpad, newapad, sep,
+ freezer, toaster, purity, deepcopy, quotekeys,
+ bless);
+
+ if (indent >= 2)
+ SvREFCNT_dec(newapad);
+
+ postlen = av_len(postav);
+ if (postlen >= 0 || !terse) {
+ sv_insert(valstr, 0, 0, " = ", 3);
+ sv_insert(valstr, 0, 0, SvPVX(name), SvCUR(name));
+ sv_catpvn(valstr, ";", 1);
+ }
+ sv_catsv(retval, pad);
+ sv_catsv(retval, valstr);
+ sv_catsv(retval, sep);
+ if (postlen >= 0) {
+ I32 i;
+ sv_catsv(retval, pad);
+ for (i = 0; i <= postlen; ++i) {
+ SV *elem;
+ svp = av_fetch(postav, i, FALSE);
+ if (svp && (elem = *svp)) {
+ sv_catsv(retval, elem);
+ if (i < postlen) {
+ sv_catpvn(retval, ";", 1);
+ sv_catsv(retval, sep);
+ sv_catsv(retval, pad);
+ }
+ }
+ }
+ sv_catpvn(retval, ";", 1);
+ sv_catsv(retval, sep);
+ }
+ sv_setpvn(valstr, "", 0);
+ if (gimme == G_ARRAY) {
+ XPUSHs(sv_2mortal(retval));
+ if (i < imax) /* not the last time thro ? */
+ retval = newSVpvn("",0);
+ }
+ }
+ SvREFCNT_dec(postav);
+ SvREFCNT_dec(valstr);
+ }
+ else
+ croak("Call to new() method failed to return HASH ref");
+ if (gimme == G_SCALAR)
+ XPUSHs(sv_2mortal(retval));
+ }
Added: trunk/orca/packages/Data-Dumper-2.101/Todo
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Todo (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Todo Sat Jul 13 19:22:30 2002
@@ -0,0 +1,34 @@
+=head1 NAME
+
+TODO - seeds germane, yet not germinated
+
+=head1 DESCRIPTION
+
+The following functionality will be supported in the next few releases.
+
+=over 4
+
+=item $Data::Dumper::Maxdepth I<or> $I<OBJ>->Maxdepth(I<NEWVAL>)
+
+Depth beyond which we don't venture into a structure. Has no effect when
+C<Data::Dumper::Purity> is set. (useful in debugger when we often don't
+want to see more than enough).
+
+=item $Data::Dumper::Expdepth I<or> $I<OBJ>->Expdepth(I<NEWVAL>)
+
+Dump contents explicitly up to a certain depth and then use names for
+cross-referencing identical references. (useful in debugger, in situations
+where we don't care so much for cross-references).
+
+=item Make C<Dumpxs()> honor C<$Useqq>
+
+=item Fix formatting when Terse is set and Indent >= 2
+
+=item Output space after '\' (ref constructor) for high enough Indent
+
+=item Implement redesign that allows various backends (Perl, Lisp,
+some-binary-data-format, graph-description-languages, etc.)
+
+=item Dump traversal in breadth-first order
+
+=back
Added: trunk/orca/packages/Data-Dumper-2.101/MANIFEST
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/MANIFEST (original)
+++ trunk/orca/packages/Data-Dumper-2.101/MANIFEST Sat Jul 13 19:22:30 2002
@@ -0,0 +1,12 @@
+README
+MANIFEST
+MANIFEST.NOXSUB
+Changes
+Todo
+Makefile.PL
+Dumper.pm
+Dumper.pm.NOXSUB
+Dumper.xs
+Dumper.html
+t/dumper.t
+t/overload.t
Added: trunk/orca/packages/Data-Dumper-2.101/Makefile.PL
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Makefile.PL (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Makefile.PL Sat Jul 13 19:22:30 2002
@@ -0,0 +1,45 @@
+use ExtUtils::MakeMaker;
+use File::Copy qw();
+my $arg = $ARGV[0] || "";
+my($DOXS, $DONOXS);
+$DONOXS = shift if $arg =~ /^noxs/i and
+ -f "MANIFEST.NOXSUB" and
+ -f "Dumper.pm.NOXSUB";
+$DOXS = shift if $arg =~ /^xs/i and
+ -f "MANIFEST.XSUB" and
+ -f "Dumper.xs.XSUB" and
+ -f "Dumper.pm.XSUB";
+
+if ($DONOXS) {
+ print STDERR "Disabling XS in sources...\n";
+ die "***** Failed, sources could be inconsistent! *****\n" unless
+ File::Copy::move('MANIFEST', 'MANIFEST.XSUB') and
+ File::Copy::move('MANIFEST.NOXSUB', 'MANIFEST') and
+ File::Copy::move('Dumper.pm', 'Dumper.pm.XSUB') and
+ File::Copy::move('Dumper.xs', 'Dumper.xs.XSUB') and
+ File::Copy::move('Dumper.pm.NOXSUB','Dumper.pm');
+}
+elsif ($DOXS) {
+ print STDERR "Enabling XS in sources...\n";
+ die "***** Failed, sources could be inconsistent! *****\n" unless
+ File::Copy::move('MANIFEST', 'MANIFEST.NOXSUB') and
+ File::Copy::move('MANIFEST.XSUB', 'MANIFEST') and
+ File::Copy::move('Dumper.pm', 'Dumper.pm.NOXSUB') and
+ File::Copy::move('Dumper.xs.XSUB', 'Dumper.xs') and
+ File::Copy::move('Dumper.pm.XSUB', 'Dumper.pm');
+}
+
+WriteMakefile(
+ NAME => "Data::Dumper",
+ VERSION_FROM => 'Dumper.pm',
+ DISTNAME => 'Data-Dumper',
+ (
+ $] > 5.00470 ?
+ (INSTALLDIRS => 'perl') :
+ ()
+ ),
+ 'dist' => {
+ COMPRESS => 'gzip -9f',
+ SUFFIX => 'gz',
+ },
+);
Added: trunk/orca/packages/Data-Dumper-2.101/Dumper.pm
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Dumper.pm (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Dumper.pm Sat Jul 13 19:22:30 2002
@@ -0,0 +1,1000 @@
+#
+# Data/Dumper.pm
+#
+# convert perl data structures into perl syntax suitable for both printing
+# and eval
+#
+# Documentation at the __END__
+#
+
+package Data::Dumper;
+
+$VERSION = $VERSION = '2.101';
+
+#$| = 1;
+
+require 5.004;
+require Exporter;
+require DynaLoader;
+require overload;
+
+use Carp;
+
+ at ISA = qw(Exporter DynaLoader);
+ at EXPORT = qw(Dumper);
+ at EXPORT_OK = qw(DumperX);
+
+bootstrap Data::Dumper;
+
+# module vars and their defaults
+$Indent = 2 unless defined $Indent;
+$Purity = 0 unless defined $Purity;
+$Pad = "" unless defined $Pad;
+$Varname = "VAR" unless defined $Varname;
+$Useqq = 0 unless defined $Useqq;
+$Terse = 0 unless defined $Terse;
+$Freezer = "" unless defined $Freezer;
+$Toaster = "" unless defined $Toaster;
+$Deepcopy = 0 unless defined $Deepcopy;
+$Quotekeys = 1 unless defined $Quotekeys;
+$Bless = "bless" unless defined $Bless;
+#$Expdepth = 0 unless defined $Expdepth;
+#$Maxdepth = 0 unless defined $Maxdepth;
+
+#
+# expects an arrayref of values to be dumped.
+# can optionally pass an arrayref of names for the values.
+# names must have leading $ sign stripped. begin the name with *
+# to cause output of arrays and hashes rather than refs.
+#
+sub new {
+ my($c, $v, $n) = @_;
+
+ croak "Usage: PACKAGE->new(ARRAYREF, [ARRAYREF])"
+ unless (defined($v) && (ref($v) eq 'ARRAY'));
+ $n = [] unless (defined($n) && (ref($v) eq 'ARRAY'));
+
+ my($s) = {
+ level => 0, # current recursive depth
+ indent => $Indent, # various styles of indenting
+ pad => $Pad, # all lines prefixed by this string
+ xpad => "", # padding-per-level
+ apad => "", # added padding for hash keys n such
+ sep => "", # list separator
+ seen => {}, # local (nested) refs (id => [name, val])
+ todump => $v, # values to dump []
+ names => $n, # optional names for values []
+ varname => $Varname, # prefix to use for tagging nameless ones
+ purity => $Purity, # degree to which output is evalable
+ useqq => $Useqq, # use "" for strings (backslashitis ensues)
+ terse => $Terse, # avoid name output (where feasible)
+ freezer => $Freezer, # name of Freezer method for objects
+ toaster => $Toaster, # name of method to revive objects
+ deepcopy => $Deepcopy, # dont cross-ref, except to stop recursion
+ quotekeys => $Quotekeys, # quote hash keys
+ 'bless' => $Bless, # keyword to use for "bless"
+# expdepth => $Expdepth, # cutoff depth for explicit dumping
+# maxdepth => $Maxdepth, # depth beyond which we give up
+ };
+
+ if ($Indent > 0) {
+ $s->{xpad} = " ";
+ $s->{sep} = "\n";
+ }
+ return bless($s, $c);
+}
+
+#
+# add-to or query the table of already seen references
+#
+sub Seen {
+ my($s, $g) = @_;
+ if (defined($g) && (ref($g) eq 'HASH')) {
+ my($k, $v, $id);
+ while (($k, $v) = each %$g) {
+ if (defined $v and ref $v) {
+ ($id) = (overload::StrVal($v) =~ /\((.*)\)$/);
+ if ($k =~ /^[*](.*)$/) {
+ $k = (ref $v eq 'ARRAY') ? ( "\\\@" . $1 ) :
+ (ref $v eq 'HASH') ? ( "\\\%" . $1 ) :
+ (ref $v eq 'CODE') ? ( "\\\&" . $1 ) :
+ ( "\$" . $1 ) ;
+ }
+ elsif ($k !~ /^\$/) {
+ $k = "\$" . $k;
+ }
+ $s->{seen}{$id} = [$k, $v];
+ }
+ else {
+ carp "Only refs supported, ignoring non-ref item \$$k";
+ }
+ }
+ return $s;
+ }
+ else {
+ return map { @$_ } values %{$s->{seen}};
+ }
+}
+
+#
+# set or query the values to be dumped
+#
+sub Values {
+ my($s, $v) = @_;
+ if (defined($v) && (ref($v) eq 'ARRAY')) {
+ $s->{todump} = [@$v]; # make a copy
+ return $s;
+ }
+ else {
+ return @{$s->{todump}};
+ }
+}
+
+#
+# set or query the names of the values to be dumped
+#
+sub Names {
+ my($s, $n) = @_;
+ if (defined($n) && (ref($n) eq 'ARRAY')) {
+ $s->{names} = [@$n]; # make a copy
+ return $s;
+ }
+ else {
+ return @{$s->{names}};
+ }
+}
+
+sub DESTROY {}
+
+#
+# dump the refs in the current dumper object.
+# expects same args as new() if called via package name.
+#
+sub Dump {
+ my($s) = shift;
+ my(@out, $val, $name);
+ my($i) = 0;
+ local(@post);
+
+ $s = $s->new(@_) unless ref $s;
+
+ for $val (@{$s->{todump}}) {
+ my $out = "";
+ @post = ();
+ $name = $s->{names}[$i++];
+ if (defined $name) {
+ if ($name =~ /^[*](.*)$/) {
+ if (defined $val) {
+ $name = (ref $val eq 'ARRAY') ? ( "\@" . $1 ) :
+ (ref $val eq 'HASH') ? ( "\%" . $1 ) :
+ (ref $val eq 'CODE') ? ( "\*" . $1 ) :
+ ( "\$" . $1 ) ;
+ }
+ else {
+ $name = "\$" . $1;
+ }
+ }
+ elsif ($name !~ /^\$/) {
+ $name = "\$" . $name;
+ }
+ }
+ else {
+ $name = "\$" . $s->{varname} . $i;
+ }
+
+ my $valstr;
+ {
+ local($s->{apad}) = $s->{apad};
+ $s->{apad} .= ' ' x (length($name) + 3) if $s->{indent} >= 2;
+ $valstr = $s->_dump($val, $name);
+ }
+
+ $valstr = "$name = " . $valstr . ';' if @post or !$s->{terse};
+ $out .= $s->{pad} . $valstr . $s->{sep};
+ $out .= $s->{pad} . join(';' . $s->{sep} . $s->{pad}, @post)
+ . ';' . $s->{sep} if @post;
+
+ push @out, $out;
+ }
+ return wantarray ? @out : join('', @out);
+}
+
+#
+# twist, toil and turn;
+# and recurse, of course.
+#
+sub _dump {
+ my($s, $val, $name) = @_;
+ my($sname);
+ my($out, $realpack, $realtype, $type, $ipad, $id, $blesspad);
+
+ $type = ref $val;
+ $out = "";
+
+ if ($type) {
+
+ # prep it, if it looks like an object
+ if ($type =~ /[a-z_:]/) {
+ my $freezer = $s->{freezer};
+ $val->$freezer() if $freezer && UNIVERSAL::can($val, $freezer);
+ }
+
+ ($realpack, $realtype, $id) =
+ (overload::StrVal($val) =~ /^(?:(.*)\=)?([^=]*)\(([^\(]*)\)$/);
+
+ # if it has a name, we need to either look it up, or keep a tab
+ # on it so we know when we hit it later
+ if (defined($name) and length($name)) {
+ # keep a tab on it so that we dont fall into recursive pit
+ if (exists $s->{seen}{$id}) {
+# if ($s->{expdepth} < $s->{level}) {
+ if ($s->{purity} and $s->{level} > 0) {
+ $out = ($realtype eq 'HASH') ? '{}' :
+ ($realtype eq 'ARRAY') ? '[]' :
+ "''" ;
+ push @post, $name . " = " . $s->{seen}{$id}[0];
+ }
+ else {
+ $out = $s->{seen}{$id}[0];
+ if ($name =~ /^([\@\%])/) {
+ my $start = $1;
+ if ($out =~ /^\\$start/) {
+ $out = substr($out, 1);
+ }
+ else {
+ $out = $start . '{' . $out . '}';
+ }
+ }
+ }
+ return $out;
+# }
+ }
+ else {
+ # store our name
+ $s->{seen}{$id} = [ (($name =~ /^[@%]/) ? ('\\' . $name ) :
+ ($realtype eq 'CODE' and
+ $name =~ /^[*](.*)$/) ? ('\\&' . $1 ) :
+ $name ),
+ $val ];
+ }
+ }
+
+ $s->{level}++;
+ $ipad = $s->{xpad} x $s->{level};
+
+ if ($realpack) { # we have a blessed ref
+ $out = $s->{'bless'} . '( ';
+ $blesspad = $s->{apad};
+ $s->{apad} .= ' ' if ($s->{indent} >= 2);
+ }
+
+ if ($realtype eq 'SCALAR') {
+ if ($realpack) {
+ $out .= 'do{\\(my $o = ' . $s->_dump($$val, "\${$name}") . ')}';
+ }
+ else {
+ $out .= '\\' . $s->_dump($$val, "\${$name}");
+ }
+ }
+ elsif ($realtype eq 'GLOB') {
+ $out .= '\\' . $s->_dump($$val, "*{$name}");
+ }
+ elsif ($realtype eq 'ARRAY') {
+ my($v, $pad, $mname);
+ my($i) = 0;
+ $out .= ($name =~ /^\@/) ? '(' : '[';
+ $pad = $s->{sep} . $s->{pad} . $s->{apad};
+ ($name =~ /^\@(.*)$/) ? ($mname = "\$" . $1) :
+ # omit -> if $foo->[0]->{bar}, but not ${$foo->[0]}->{bar}
+ ($name =~ /^\\?[\%\@\*\$][^{].*[]}]$/) ? ($mname = $name) :
+ ($mname = $name . '->');
+ $mname .= '->' if $mname =~ /^\*.+\{[A-Z]+\}$/;
+ for $v (@$val) {
+ $sname = $mname . '[' . $i . ']';
+ $out .= $pad . $ipad . '#' . $i if $s->{indent} >= 3;
+ $out .= $pad . $ipad . $s->_dump($v, $sname);
+ $out .= "," if $i++ < $#$val;
+ }
+ $out .= $pad . ($s->{xpad} x ($s->{level} - 1)) if $i;
+ $out .= ($name =~ /^\@/) ? ')' : ']';
+ }
+ elsif ($realtype eq 'HASH') {
+ my($k, $v, $pad, $lpad, $mname);
+ $out .= ($name =~ /^\%/) ? '(' : '{';
+ $pad = $s->{sep} . $s->{pad} . $s->{apad};
+ $lpad = $s->{apad};
+ ($name =~ /^\%(.*)$/) ? ($mname = "\$" . $1) :
+ # omit -> if $foo->[0]->{bar}, but not ${$foo->[0]}->{bar}
+ ($name =~ /^\\?[\%\@\*\$][^{].*[]}]$/) ? ($mname = $name) :
+ ($mname = $name . '->');
+ $mname .= '->' if $mname =~ /^\*.+\{[A-Z]+\}$/;
+ while (($k, $v) = each %$val) {
+ my $nk = $s->_dump($k, "");
+ $nk = $1 if !$s->{quotekeys} and $nk =~ /^[\"\']([A-Za-z_]\w*)[\"\']$/;
+ $sname = $mname . '{' . $nk . '}';
+ $out .= $pad . $ipad . $nk . " => ";
+
+ # temporarily alter apad
+ $s->{apad} .= (" " x (length($nk) + 4)) if $s->{indent} >= 2;
+ $out .= $s->_dump($val->{$k}, $sname) . ",";
+ $s->{apad} = $lpad if $s->{indent} >= 2;
+ }
+ if (substr($out, -1) eq ',') {
+ chop $out;
+ $out .= $pad . ($s->{xpad} x ($s->{level} - 1));
+ }
+ $out .= ($name =~ /^\%/) ? ')' : '}';
+ }
+ elsif ($realtype eq 'CODE') {
+ $out .= 'sub { "DUMMY" }';
+ carp "Encountered CODE ref, using dummy placeholder" if $s->{purity};
+ }
+ else {
+ croak "Can\'t handle $realtype type.";
+ }
+
+ if ($realpack) { # we have a blessed ref
+ $out .= ', \'' . $realpack . '\'' . ' )';
+ $out .= '->' . $s->{toaster} . '()' if $s->{toaster} ne '';
+ $s->{apad} = $blesspad;
+ }
+ $s->{level}--;
+
+ }
+ else { # simple scalar
+
+ my $ref = \$_[1];
+ # first, catalog the scalar
+ if ($name ne '') {
+ ($id) = ("$ref" =~ /\(([^\(]*)\)$/);
+ if (exists $s->{seen}{$id}) {
+ if ($s->{seen}{$id}[2]) {
+ $out = $s->{seen}{$id}[0];
+ #warn "[<$out]\n";
+ return "\${$out}";
+ }
+ }
+ else {
+ #warn "[>\\$name]\n";
+ $s->{seen}{$id} = ["\\$name", $ref];
+ }
+ }
+ if (ref($ref) eq 'GLOB' or "$ref" =~ /=GLOB\([^()]+\)$/) { # glob
+ my $name = substr($val, 1);
+ if ($name =~ /^[A-Za-z_][\w:]*$/) {
+ $name =~ s/^main::/::/;
+ $sname = $name;
+ }
+ else {
+ $sname = $s->_dump($name, "");
+ $sname = '{' . $sname . '}';
+ }
+ if ($s->{purity}) {
+ my $k;
+ local ($s->{level}) = 0;
+ for $k (qw(SCALAR ARRAY HASH)) {
+ my $gval = *$val{$k};
+ next unless defined $gval;
+ next if $k eq "SCALAR" && ! defined $$gval; # always there
+
+ # _dump can push into @post, so we hold our place using $postlen
+ my $postlen = scalar @post;
+ $post[$postlen] = "\*$sname = ";
+ local ($s->{apad}) = " " x length($post[$postlen]) if $s->{indent} >= 2;
+ $post[$postlen] .= $s->_dump($gval, "\*$sname\{$k\}");
+ }
+ }
+ $out .= '*' . $sname;
+ }
+ elsif (!defined($val)) {
+ $out .= "undef";
+ }
+ elsif ($val =~ /^-?[1-9]\d{0,8}$/) { # safe decimal number
+ $out .= $val;
+ }
+ else { # string
+ if ($s->{useqq}) {
+ $out .= qquote($val, $s->{useqq});
+ }
+ else {
+ $val =~ s/([\\\'])/\\$1/g;
+ $out .= '\'' . $val . '\'';
+ }
+ }
+ }
+ if ($id) {
+ # if we made it this far, $id was added to seen list at current
+ # level, so remove it to get deep copies
+ if ($s->{deepcopy}) {
+ delete($s->{seen}{$id});
+ }
+ elsif ($name) {
+ $s->{seen}{$id}[2] = 1;
+ }
+ }
+ return $out;
+}
+
+#
+# non-OO style of earlier version
+#
+sub Dumper {
+ return Data::Dumper->Dump([@_]);
+}
+
+#
+# same, only calls the XS version
+#
+sub DumperX {
+ return Data::Dumper->Dumpxs([@_], []);
+}
+
+sub Dumpf { return Data::Dumper->Dump(@_) }
+
+sub Dumpp { print Data::Dumper->Dump(@_) }
+
+#
+# reset the "seen" cache
+#
+sub Reset {
+ my($s) = shift;
+ $s->{seen} = {};
+ return $s;
+}
+
+sub Indent {
+ my($s, $v) = @_;
+ if (defined($v)) {
+ if ($v == 0) {
+ $s->{xpad} = "";
+ $s->{sep} = "";
+ }
+ else {
+ $s->{xpad} = " ";
+ $s->{sep} = "\n";
+ }
+ $s->{indent} = $v;
+ return $s;
+ }
+ else {
+ return $s->{indent};
+ }
+}
+
+sub Pad {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{pad} = $v), return $s) : $s->{pad};
+}
+
+sub Varname {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{varname} = $v), return $s) : $s->{varname};
+}
+
+sub Purity {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{purity} = $v), return $s) : $s->{purity};
+}
+
+sub Useqq {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{useqq} = $v), return $s) : $s->{useqq};
+}
+
+sub Terse {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{terse} = $v), return $s) : $s->{terse};
+}
+
+sub Freezer {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{freezer} = $v), return $s) : $s->{freezer};
+}
+
+sub Toaster {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{toaster} = $v), return $s) : $s->{toaster};
+}
+
+sub Deepcopy {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{deepcopy} = $v), return $s) : $s->{deepcopy};
+}
+
+sub Quotekeys {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{quotekeys} = $v), return $s) : $s->{quotekeys};
+}
+
+sub Bless {
+ my($s, $v) = @_;
+ defined($v) ? (($s->{'bless'} = $v), return $s) : $s->{'bless'};
+}
+
+# used by qquote below
+my %esc = (
+ "\a" => "\\a",
+ "\b" => "\\b",
+ "\t" => "\\t",
+ "\n" => "\\n",
+ "\f" => "\\f",
+ "\r" => "\\r",
+ "\e" => "\\e",
+);
+
+# put a string value in double quotes
+sub qquote {
+ local($_) = shift;
+ s/([\\\"\@\$])/\\$1/g;
+ return qq("$_") unless /[^\040-\176]/; # fast exit
+
+ my $high = shift || "";
+ s/([\a\b\t\n\f\r\e])/$esc{$1}/g;
+
+ # no need for 3 digits in escape for these
+ s/([\0-\037])(?!\d)/'\\'.sprintf('%o',ord($1))/eg;
+
+ s/([\0-\037\177])/'\\'.sprintf('%03o',ord($1))/eg;
+ if ($high eq "iso8859") {
+ s/([\200-\240])/'\\'.sprintf('%o',ord($1))/eg;
+ } elsif ($high eq "utf8") {
+# use utf8;
+# $str =~ s/([^\040-\176])/sprintf "\\x{%04x}", ord($1)/ge;
+ } elsif ($high eq "8bit") {
+ # leave it as it is
+ } else {
+ s/([\0-\037\177-\377])/'\\'.sprintf('%03o',ord($1))/eg;
+ }
+ return qq("$_");
+}
+
+1;
+__END__
+
+=head1 NAME
+
+Data::Dumper - stringified perl data structures, suitable for both printing and C<eval>
+
+
+=head1 SYNOPSIS
+
+ use Data::Dumper;
+
+ # simple procedural interface
+ print Dumper($foo, $bar);
+
+ # extended usage with names
+ print Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+
+ # configuration variables
+ {
+ local $Data::Dump::Purity = 1;
+ eval Data::Dumper->Dump([$foo, $bar], [qw(foo *ary)]);
+ }
+
+ # OO usage
+ $d = Data::Dumper->new([$foo, $bar], [qw(foo *ary)]);
+ ...
+ print $d->Dump;
+ ...
+ $d->Purity(1)->Terse(1)->Deepcopy(1);
+ eval $d->Dump;
+
+
+=head1 DESCRIPTION
+
+Given a list of scalars or reference variables, writes out their contents in
+perl syntax. The references can also be objects. The contents of each
+variable is output in a single Perl statement. Handles self-referential
+structures correctly.
+
+The return value can be C<eval>ed to get back an identical copy of the
+original reference structure.
+
+Any references that are the same as one of those passed in will be named
+C<$VAR>I<n> (where I<n> is a numeric suffix), and other duplicate references
+to substructures within C<$VAR>I<n> will be appropriately labeled using arrow
+notation. You can specify names for individual values to be dumped if you
+use the C<Dump()> method, or you can change the default C<$VAR> prefix to
+something else. See C<$Data::Dumper::Varname> and C<$Data::Dumper::Terse>
+below.
+
+The default output of self-referential structures can be C<eval>ed, but the
+nested references to C<$VAR>I<n> will be undefined, since a recursive
+structure cannot be constructed using one Perl statement. You should set the
+C<Purity> flag to 1 to get additional statements that will correctly fill in
+these references.
+
+In the extended usage form, the references to be dumped can be given
+user-specified names. If a name begins with a C<*>, the output will
+describe the dereferenced type of the supplied reference for hashes and
+arrays, and coderefs. Output of names will be avoided where possible if
+the C<Terse> flag is set.
+
+In many cases, methods that are used to set the internal state of the
+object will return the object itself, so method calls can be conveniently
+chained together.
+
+Several styles of output are possible, all controlled by setting
+the C<Indent> flag. See L<Configuration Variables or Methods> below
+for details.
+
+
+=head2 Methods
+
+=over 4
+
+=item I<PACKAGE>->new(I<ARRAYREF [>, I<ARRAYREF]>)
+
+Returns a newly created C<Data::Dumper> object. The first argument is an
+anonymous array of values to be dumped. The optional second argument is an
+anonymous array of names for the values. The names need not have a leading
+C<$> sign, and must be comprised of alphanumeric characters. You can begin
+a name with a C<*> to specify that the dereferenced type must be dumped
+instead of the reference itself, for ARRAY and HASH references.
+
+The prefix specified by C<$Data::Dumper::Varname> will be used with a
+numeric suffix if the name for a value is undefined.
+
+Data::Dumper will catalog all references encountered while dumping the
+values. Cross-references (in the form of names of substructures in perl
+syntax) will be inserted at all possible points, preserving any structural
+interdependencies in the original set of values. Structure traversal is
+depth-first, and proceeds in order from the first supplied value to
+the last.
+
+=item I<$OBJ>->Dump I<or> I<PACKAGE>->Dump(I<ARRAYREF [>, I<ARRAYREF]>)
+
+Returns the stringified form of the values stored in the object (preserving
+the order in which they were supplied to C<new>), subject to the
+configuration options below. In an array context, it returns a list
+of strings corresponding to the supplied values.
+
+The second form, for convenience, simply calls the C<new> method on its
+arguments before dumping the object immediately.
+
+=item I<$OBJ>->Dumpxs I<or> I<PACKAGE>->Dumpxs(I<ARRAYREF [>, I<ARRAYREF]>)
+
+This method is available if you were able to compile and install the XSUB
+extension to C<Data::Dumper>. It is exactly identical to the C<Dump> method
+above, only about 4 to 5 times faster, since it is written entirely in C.
+
+=item I<$OBJ>->Seen(I<[HASHREF]>)
+
+Queries or adds to the internal table of already encountered references.
+You must use C<Reset> to explicitly clear the table if needed. Such
+references are not dumped; instead, their names are inserted wherever they
+are encountered subsequently. This is useful especially for properly
+dumping subroutine references.
+
+Expects a anonymous hash of name => value pairs. Same rules apply for names
+as in C<new>. If no argument is supplied, will return the "seen" list of
+name => value pairs, in an array context. Otherwise, returns the object
+itself.
+
+=item I<$OBJ>->Values(I<[ARRAYREF]>)
+
+Queries or replaces the internal array of values that will be dumped.
+When called without arguments, returns the values. Otherwise, returns the
+object itself.
+
+=item I<$OBJ>->Names(I<[ARRAYREF]>)
+
+Queries or replaces the internal array of user supplied names for the values
+that will be dumped. When called without arguments, returns the names.
+Otherwise, returns the object itself.
+
+=item I<$OBJ>->Reset
+
+Clears the internal table of "seen" references and returns the object
+itself.
+
+=back
+
+=head2 Functions
+
+=over 4
+
+=item Dumper(I<LIST>)
+
+Returns the stringified form of the values in the list, subject to the
+configuration options below. The values will be named C<$VAR>I<n> in the
+output, where I<n> is a numeric suffix. Will return a list of strings
+in an array context.
+
+=item DumperX(I<LIST>)
+
+Identical to the C<Dumper()> function above, but this calls the XSUB
+implementation. Only available if you were able to compile and install
+the XSUB extensions in C<Data::Dumper>.
+
+=back
+
+=head2 Configuration Variables or Methods
+
+Several configuration variables can be used to control the kind of output
+generated when using the procedural interface. These variables are usually
+C<local>ized in a block so that other parts of the code are not affected by
+the change.
+
+These variables determine the default state of the object created by calling
+the C<new> method, but cannot be used to alter the state of the object
+thereafter. The equivalent method names should be used instead to query
+or set the internal state of the object.
+
+The method forms return the object itself when called with arguments,
+so that they can be chained together nicely.
+
+=over 4
+
+=item $Data::Dumper::Indent I<or> I<$OBJ>->Indent(I<[NEWVAL]>)
+
+Controls the style of indentation. It can be set to 0, 1, 2 or 3. Style 0
+spews output without any newlines, indentation, or spaces between list
+items. It is the most compact format possible that can still be called
+valid perl. Style 1 outputs a readable form with newlines but no fancy
+indentation (each level in the structure is simply indented by a fixed
+amount of whitespace). Style 2 (the default) outputs a very readable form
+which takes into account the length of hash keys (so the hash value lines
+up). Style 3 is like style 2, but also annotates the elements of arrays
+with their index (but the comment is on its own line, so array output
+consumes twice the number of lines). Style 2 is the default.
+
+=item $Data::Dumper::Purity I<or> I<$OBJ>->Purity(I<[NEWVAL]>)
+
+Controls the degree to which the output can be C<eval>ed to recreate the
+supplied reference structures. Setting it to 1 will output additional perl
+statements that will correctly recreate nested references. The default is
+0.
+
+=item $Data::Dumper::Pad I<or> I<$OBJ>->Pad(I<[NEWVAL]>)
+
+Specifies the string that will be prefixed to every line of the output.
+Empty string by default.
+
+=item $Data::Dumper::Varname I<or> I<$OBJ>->Varname(I<[NEWVAL]>)
+
+Contains the prefix to use for tagging variable names in the output. The
+default is "VAR".
+
+=item $Data::Dumper::Useqq I<or> I<$OBJ>->Useqq(I<[NEWVAL]>)
+
+When set, enables the use of double quotes for representing string values.
+Whitespace other than space will be represented as C<[\n\t\r]>, "unsafe"
+characters will be backslashed, and unprintable characters will be output as
+quoted octal integers. Since setting this variable imposes a performance
+penalty, the default is 0. The C<Dumpxs()> method does not honor this
+flag yet.
+
+=item $Data::Dumper::Terse I<or> I<$OBJ>->Terse(I<[NEWVAL]>)
+
+When set, Data::Dumper will emit single, non-self-referential values as
+atoms/terms rather than statements. This means that the C<$VAR>I<n> names
+will be avoided where possible, but be advised that such output may not
+always be parseable by C<eval>.
+
+=item $Data::Dumper::Freezer I<or> $I<OBJ>->Freezer(I<[NEWVAL]>)
+
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will invoke that method via the object before attempting to
+stringify it. This method can alter the contents of the object (if, for
+instance, it contains data allocated from C), and even rebless it in a
+different package. The client is responsible for making sure the specified
+method can be called via the object, and that the object ends up containing
+only perl data types after the method has been called. Defaults to an empty
+string.
+
+=item $Data::Dumper::Toaster I<or> $I<OBJ>->Toaster(I<[NEWVAL]>)
+
+Can be set to a method name, or to an empty string to disable the feature.
+Data::Dumper will emit a method call for any objects that are to be dumped
+using the syntax C<bless(DATA, CLASS)->METHOD()>. Note that this means that
+the method specified will have to perform any modifications required on the
+object (like creating new state within it, and/or reblessing it in a
+different package) and then return it. The client is responsible for making
+sure the method can be called via the object, and that it returns a valid
+object. Defaults to an empty string.
+
+=item $Data::Dumper::Deepcopy I<or> $I<OBJ>->Deepcopy(I<[NEWVAL]>)
+
+Can be set to a boolean value to enable deep copies of structures.
+Cross-referencing will then only be done when absolutely essential
+(i.e., to break reference cycles). Default is 0.
+
+=item $Data::Dumper::Quotekeys I<or> $I<OBJ>->Quotekeys(I<[NEWVAL]>)
+
+Can be set to a boolean value to control whether hash keys are quoted.
+A false value will avoid quoting hash keys when it looks like a simple
+string. Default is 1, which will always enclose hash keys in quotes.
+
+=item $Data::Dumper::Bless I<or> $I<OBJ>->Bless(I<[NEWVAL]>)
+
+Can be set to a string that specifies an alternative to the C<bless>
+builtin operator used to create objects. A function with the specified
+name should exist, and should accept the same arguments as the builtin.
+Default is C<bless>.
+
+=back
+
+=head2 Exports
+
+=over 4
+
+=item Dumper
+
+=back
+
+=head1 EXAMPLES
+
+Run these code snippets to get a quick feel for the behavior of this
+module. When you are through with these examples, you may want to
+add or change the various configuration variables described above,
+to see their behavior. (See the testsuite in the Data::Dumper
+distribution for more examples.)
+
+
+ use Data::Dumper;
+
+ package Foo;
+ sub new {bless {'a' => 1, 'b' => sub { return "foo" }}, $_[0]};
+
+ package Fuz; # a weird REF-REF-SCALAR object
+ sub new {bless \($_ = \ 'fu\'z'), $_[0]};
+
+ package main;
+ $foo = Foo->new;
+ $fuz = Fuz->new;
+ $boo = [ 1, [], "abcd", \*foo,
+ {1 => 'a', 023 => 'b', 0x45 => 'c'},
+ \\"p\q\'r", $foo, $fuz];
+
+ ########
+ # simple usage
+ ########
+
+ $bar = eval(Dumper($boo));
+ print($@) if $@;
+ print Dumper($boo), Dumper($bar); # pretty print (no array indices)
+
+ $Data::Dumper::Terse = 1; # don't output names where feasible
+ $Data::Dumper::Indent = 0; # turn off all pretty print
+ print Dumper($boo), "\n";
+
+ $Data::Dumper::Indent = 1; # mild pretty print
+ print Dumper($boo);
+
+ $Data::Dumper::Indent = 3; # pretty print with array indices
+ print Dumper($boo);
+
+ $Data::Dumper::Useqq = 1; # print strings in double quotes
+ print Dumper($boo);
+
+
+ ########
+ # recursive structures
+ ########
+
+ @c = ('c');
+ $c = \@c;
+ $b = {};
+ $a = [1, $b, $c];
+ $b->{a} = $a;
+ $b->{b} = $a->[1];
+ $b->{c} = $a->[2];
+ print Data::Dumper->Dump([$a,$b,$c], [qw(a b c)]);
+
+
+ $Data::Dumper::Purity = 1; # fill in the holes for eval
+ print Data::Dumper->Dump([$a, $b], [qw(*a b)]); # print as @a
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]); # print as %b
+
+
+ $Data::Dumper::Deepcopy = 1; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ $Data::Dumper::Purity = 0; # avoid cross-refs
+ print Data::Dumper->Dump([$b, $a], [qw(*b a)]);
+
+
+ ########
+ # object-oriented usage
+ ########
+
+ $d = Data::Dumper->new([$a,$b], [qw(a b)]);
+ $d->Seen({'*c' => $c}); # stash a ref without printing it
+ $d->Indent(3);
+ print $d->Dump;
+ $d->Reset->Purity(0); # empty the seen cache
+ print join "----\n", $d->Dump;
+
+
+ ########
+ # persistence
+ ########
+
+ package Foo;
+ sub new { bless { state => 'awake' }, shift }
+ sub Freeze {
+ my $s = shift;
+ print STDERR "preparing to sleep\n";
+ $s->{state} = 'asleep';
+ return bless $s, 'Foo::ZZZ';
+ }
+
+ package Foo::ZZZ;
+ sub Thaw {
+ my $s = shift;
+ print STDERR "waking up\n";
+ $s->{state} = 'awake';
+ return bless $s, 'Foo';
+ }
+
+ package Foo;
+ use Data::Dumper;
+ $a = Foo->new;
+ $b = Data::Dumper->new([$a], ['c']);
+ $b->Freezer('Freeze');
+ $b->Toaster('Thaw');
+ $c = $b->Dump;
+ print $c;
+ $d = eval $c;
+ print Data::Dumper->Dump([$d], ['d']);
+
+
+ ########
+ # symbol substitution (useful for recreating CODE refs)
+ ########
+
+ sub foo { print "foo speaking\n" }
+ *other = \&foo;
+ $bar = [ \&other ];
+ $d = Data::Dumper->new([\&other,$bar],['*other','bar']);
+ $d->Seen({ '*foo' => \&foo });
+ print $d->Dump;
+
+
+=head1 BUGS
+
+Due to limitations of Perl subroutine call semantics, you cannot pass an
+array or hash. Prepend it with a C<\> to pass its reference instead. This
+will be remedied in time, with the arrival of prototypes in later versions
+of Perl. For now, you need to use the extended usage form, and prepend the
+name with a C<*> to output it as a hash or array.
+
+C<Data::Dumper> cheats with CODE references. If a code reference is
+encountered in the structure being processed, an anonymous subroutine that
+contains the string '"DUMMY"' will be inserted in its place, and a warning
+will be printed if C<Purity> is set. You can C<eval> the result, but bear
+in mind that the anonymous sub that gets created is just a placeholder.
+Someday, perl will have a switch to cache-on-demand the string
+representation of a compiled piece of code, I hope. If you have prior
+knowledge of all the code refs that your data structures are likely
+to have, you can use the C<Seen> method to pre-seed the internal reference
+table and make the dumped output point to them, instead. See L<EXAMPLES>
+above.
+
+The C<Useqq> flag is not honored by C<Dumpxs()> (it always outputs
+strings in single quotes).
+
+SCALAR objects have the weirdest looking C<bless> workaround.
+
+
+=head1 AUTHOR
+
+Gurusamy Sarathy gsar at umich.edu
+
+Copyright (c) 1996-98 Gurusamy Sarathy. All rights reserved.
+This program is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+
+=head1 VERSION
+
+Version 2.101 (30 Apr 1999)
+
+=head1 SEE ALSO
+
+perl(1)
+
+=cut
Added: trunk/orca/packages/Data-Dumper-2.101/Changes
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/Changes (original)
+++ trunk/orca/packages/Data-Dumper-2.101/Changes Sat Jul 13 19:22:30 2002
@@ -0,0 +1,183 @@
+=head1 NAME
+
+HISTORY - public release history for Data::Dumper
+
+=head1 DESCRIPTION
+
+=over 8
+
+=item 2.101 (30 Apr 1999)
+
+Minor release to sync with version in 5.005_03. Fixes dump of
+dummy coderefs.
+
+=item 2.10 (31 Oct 1998)
+
+Bugfixes for dumping related undef values, globs, and better double
+quoting: three patches suggested by Gisle Aas <gisle at aas.no>.
+
+Escaping of single quotes in the XS version could get tripped up
+by the presence of nulls in the string. Fix suggested by
+Slaven Rezic <eserte at cs.tu-berlin.de>.
+
+Rather large scale reworking of the logic in how seen values
+are stashed. Anonymous scalars that may be encountered while
+traversing the structure are properly tracked, in case they become
+used in data dumped in a later pass. There used to be a problem
+with the previous logic that prevented such structures from being
+dumped correctly.
+
+Various additions to the testsuite.
+
+=item 2.09 (9 July 1998)
+
+Implement $Data::Dumper::Bless, suggested by Mark Daku <daku at nortel.ca>.
+
+=item 2.081 (15 January 1998)
+
+Minor release to fix Makefile.PL not accepting MakeMaker args.
+
+=item 2.08 (7 December 1997)
+
+Glob dumps don't output superflous 'undef' anymore.
+
+Fixes from Gisle Aas <gisle at aas.no> to make Dumper() work with
+overloaded strings in recent perls, and his new testsuite.
+
+require 5.004.
+
+A separate flag to always quote hash keys (on by default).
+
+Recreating known CODE refs is now better supported.
+
+Changed flawed constant SCALAR bless workaround.
+
+=item 2.07 (7 December 1996)
+
+Dumpxs output is now exactly the same as Dump. It still doesn't
+honor C<Useqq> though.
+
+Regression tests test for identical output and C<eval>-ability.
+
+Bug in *GLOB{THING} output fixed.
+
+Other small enhancements.
+
+=item 2.06 (2 December 1996)
+
+Bugfix that was serious enough for new release--the bug cripples
+MLDBM. Problem was "Attempt to modify readonly value..." failures
+that stemmed for a misguided SvPV_force() instead of a SvPV().)
+
+=item 2.05 (2 December 1996)
+
+Fixed the type mismatch that was causing Dumpxs test to fail
+on 64-bit platforms.
+
+GLOB elements are dumped now when C<Purity> is set (using the
+*GLOB{THING} syntax).
+
+The C<Freezer> option can be set to a method name to call
+before probing objects for dumping. Some applications: objects with
+external data, can re-bless themselves into a transitional package;
+Objects the maintain ephemeral state (like open files) can put
+additional information in the object to facilitate persistence.
+
+The corresponding C<Toaster> option, if set, specifies
+the method call that will revive the frozen object.
+
+The C<Deepcopy> flag has been added to do just that.
+
+Dumper does more aggressive cataloging of SCALARs encountered
+within ARRAY/HASH structures. Thanks to Norman Gaywood
+<norm at godel.une.edu.au> for reporting the problem.
+
+Objects that C<overload> the '""' operator are now handled
+properly by the C<Dump> method.
+
+Significant additions to the testsuite.
+
+More documentation.
+
+=item 2.04beta (28 August 1996)
+
+Made dump of glob names respect C<Useqq> setting.
+
+[@$%] are now escaped now when in double quotes.
+
+=item 2.03beta (26 August 1996)
+
+Fixed Dumpxs. It was appending trailing nulls to globnames.
+(reported by Randal Schwartz <merlyn at teleport.com>).
+
+Calling the C<Indent()> method on a dumper object now correctly
+resets the internal separator (reported by Curt Tilmes
+<curt at ltpmail.gsfc.nasa.gov>).
+
+New C<Terse> option to suppress the 'C<VARI<n> = >' prefix
+introduced. If the option is set, they are output only when
+absolutely essential.
+
+The C<Useqq> flag is supported (but not by the XSUB version
+yet).
+
+Embedded nulls in keys are now handled properly by Dumpxs.
+
+Dumper.xs now use various integer types in perl.h (should
+make it compile without noises on 64 bit platforms, although
+I haven't been able to test this).
+
+All the dump methods now return a list of strings in a list
+context.
+
+
+=item 2.02beta (13 April 1996)
+
+Non portable sprintf usage in XS code fixed (thanks to
+Ulrich Pfeifer <pfeifer at charly.informatik.uni-dortmund.de>).
+
+
+=item 2.01beta (10 April 1996)
+
+Minor bugfix (single digit numbers were always getting quoted).
+
+
+=item 2.00beta (9 April 1996)
+
+C<Dumpxs> is now the exact XSUB equivalent of C<Dump>. The XS version
+is 4-5 times faster.
+
+C<require 5.002>.
+
+MLDBM example removed (as its own module, it has a separate CPAN
+reality now).
+
+Fixed bugs in handling keys with wierd characters. Perl can be
+tripped up in its implicit quoting of the word before '=>'. The
+fix: C<Data::Dumper::Purity>, when set, always triggers quotes
+around hash keys.
+
+Andreas Koenig <k at anna.in-berlin.de> pointed out that handling octals
+is busted. His patch added.
+
+Dead code removed, other minor documentation fixes.
+
+
+=item 1.23 (3 Dec 1995)
+
+MLDBM example added.
+
+Several folks pointed out that quoting of ticks and backslashes
+in strings is missing. Added.
+
+Ian Phillips <ian at pipex.net> pointed out that numerics may lose
+precision without quotes. Fixed.
+
+
+=item 1.21 (20 Nov 1995)
+
+Last stable version I can remember.
+
+=back
+
+=cut
Added: trunk/orca/packages/Data-Dumper-2.101/README
==============================================================================
--- trunk/orca/packages/Data-Dumper-2.101/README (original)
+++ trunk/orca/packages/Data-Dumper-2.101/README Sat Jul 13 19:22:30 2002
@@ -0,0 +1,115 @@
+This is the README file for Data::Dumper, the Perl
+data-structure printing/stringification module.
+
+This is version 2.101. See the CHANGES section below for details on
+the new features and fixes in this release.
+
+Perl version 5.004 or later is required to build and use this module.
+
+
+---NOTE----NOTE----NOTE----NOTE----NOTE----NOTE----NOTE----NOTE---NOTE---
+| |
+| Data-Dumper comes standard with perl from version 5.004_71. |
+| |
+| Building the XSUB version *requires* a C compiler that groks ANSI |
+| prototypes. You may install the non-XSUB version if you're not so |
+| lucky. See the INSTALLATION section below. |
+| |
+---NOTE----NOTE----NOTE----NOTE----NOTE----NOTE----NOTE----NOTE---NOTE---
+
+
+You may find this module useful if you:
+
+ * are writing an application that must display perl data
+ structures.
+
+ * want to store some data structures to disk, in either a
+ compact or perl readable format (Dumper outputs pure perl,
+ so you don't have to invent your own portable data format, or
+ parse it; simply "do FILE" or read the data back in with
+ perl and eval() it). See the MLDBM module for an example of
+ one such use.
+
+ * want a simple, yet powerful, persistence engine that can be
+ quickly integrated into your application, and is a breeze to
+ debug.
+
+ * want a facility to make copies of data, or quickly find
+ differences between data structures.
+
+Dumper can be efficient if you are on a system supported by MakeMaker
+and xsubpp, the perl extension building tools. In this case, Dumper
+will build a XSUB extension that will be much faster than its perl
+counterpart (in my tests, about 4 to 5 times). In either case,
+you should be able to use this module without loss of functionality.
+
+See the embedded documentation in the module for more details.
+
+Comments and suggestions are always welcome.
+
+ - Sarathy.
+ gsar at umich.edu
+
+---------------------------------------------------------------------
+INSTALLATION
+
+Installation requires a functional Makemaker and perl 5.004 or later. Do
+either of these:
+
+ a. If your platform has a C compiler AND is supported by xsubpp:
+
+ gzip -c -d Data-Dumper-2.101.tar.gz | tar xvf -
+ cd Data-Dumper-2.101
+ perl Makefile.PL
+ make test
+ make install
+
+ b. If you have no C compiler OR if you don't want the XSUB extension
+ (no loss of functionality, only speed):
+
+ gzip -c -d Data-Dumper-2.101.tar.gz | tar xvf -
+ cd Data-Dumper-2.101
+ perl Makefile.PL noxs # flips to non-xsub version
+ make test
+ make install
+
+ If you decide to go back to compiling the XSUB extension after this,
+ just do:
+
+ make distclean
+ perl Makefile.PL xs # flips to non-xsub version
+ make test
+ make install
+
+---------------------------------------------------------------------
+CHANGES
+
+ 2.101 (30 Apr 1999)
+ Minor release to sync with version in 5.005_03. Fixes
+ dump of dummy coderefs.
+
+ 2.10 (31 Oct 1998)
+ Bugfixes for dumping related undef values, globs, and better
+ double quoting: three patches suggested by Gisle Aas
+ <gisle at aas.no>.
+
+ Escaping of single quotes in the XS version could get tripped
+ up by the presence of nulls in the string. Fix suggested by
+ Slaven Rezic <eserte at cs.tu-berlin.de>.
+
+ Rather large scale reworking of the logic in how seen values
+ are stashed. Anonymous scalars that may be encountered while
+ traversing the structure are properly tracked, in case they
+ become used in data dumped in a later pass. There used to be a
+ problem with the previous logic that prevented such structures
+ from being dumped correctly.
+
+ Various additions to the testsuite.
+
+ 2.09 (9 July 1998)
+ Implement $Data::Dumper::Bless, suggested by Mark Daku
+ <daku at nortel.ca>.
+
+ 2.081 (15 January 1998)
+ Minor release to fix Makefile.PL not accepting
+ MakeMaker args.
Modified: trunk/orca/packages/rrdtool-1.0.7.2/configure
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/configure (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/configure Sat Jul 13 19:22:31 2002
@@ -11,6 +11,17 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
+ac_default_prefix=/usr/local/rrdtool-1.0.7
+ac_help="$ac_help
+ --enable-shared[=PKGS] build shared libraries [default=no]"
+ac_help="$ac_help
+ --enable-static[=PKGS] build static libraries [default=yes]"
+ac_help="$ac_help
+ --enable-fast-install[=PKGS] optimize for fast installation [default=yes]"
+ac_help="$ac_help
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
+ac_help="$ac_help
+ --disable-libtool-lock avoid locking (might break parallel builds)"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -522,11 +533,417 @@
+ac_aux_dir=
+for ac_dir in config $srcdir/config; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+# configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+# same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+# as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:585: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+ case $nonopt in
+ NONE)
+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+ fi ;;
+ *) host_alias=$nonopt ;;
+ esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:606: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+ case $nonopt in
+ NONE) target_alias=$host_alias ;;
+ *) target_alias=$nonopt ;;
+ esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:624: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+ case $nonopt in
+ NONE) build_alias=$host_alias ;;
+ *) build_alias=$nonopt ;;
+ esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+ test "$program_prefix$program_suffix$program_transform_name" = \
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:659: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ for ac_dir in $PATH; do
+ # Account for people who put trailing slashes in PATH elements.
+ case "$ac_dir/" in
+ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ if test -f $ac_dir/$ac_prog; then
+ if test $ac_prog = install &&
+ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ else
+ ac_cv_path_install="$ac_dir/$ac_prog -c"
+ break 2
+ fi
+ fi
+ done
+ ;;
+ esac
+ done
+ IFS="$ac_save_IFS"
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL="$ac_cv_path_install"
+ else
+ # As a last resort, use the slow shell script. We don't cache a
+ # path for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the path is relative.
+ INSTALL="$ac_install_sh"
+ fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:712: checking whether build environment is sane" >&5
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftestfile`
+ fi
+ if test "$*" != "X $srcdir/configure conftestfile" \
+ && test "$*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" 1>&2; exit 1; }
+ fi
+
+ test "$2" = conftestfile
+ )
+then
+ # Ok.
+ :
+else
+ { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+ program_transform_name=
+else
+ # Double any \ or $. echo might interpret backslashes.
+ cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+ program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+ rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+ program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:769: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftestmake <<\EOF
+all:
+ @echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ SET_MAKE=
+else
+ echo "$ac_t""no" 1>&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+PACKAGE=rrdtool
+
+VERSION=1.0.7
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
+missing_dir=`cd $ac_aux_dir && pwd`
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:815: checking for working aclocal" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+ ACLOCAL=aclocal
+ echo "$ac_t""found" 1>&6
+else
+ ACLOCAL="$missing_dir/missing aclocal"
+ echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+echo "configure:828: checking for working autoconf" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+ AUTOCONF=autoconf
+ echo "$ac_t""found" 1>&6
+else
+ AUTOCONF="$missing_dir/missing autoconf"
+ echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:841: checking for working automake" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+ AUTOMAKE=automake
+ echo "$ac_t""found" 1>&6
+else
+ AUTOMAKE="$missing_dir/missing automake"
+ echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+echo "configure:854: checking for working autoheader" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+ AUTOHEADER=autoheader
+ echo "$ac_t""found" 1>&6
+else
+ AUTOHEADER="$missing_dir/missing autoheader"
+ echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+echo "configure:867: checking for working makeinfo" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+ MAKEINFO=makeinfo
+ echo "$ac_t""found" 1>&6
+else
+ MAKEINFO="$missing_dir/missing makeinfo"
+ echo "$ac_t""missing" 1>&6
+fi
+
+
+
+
+
+
+
+
+
+
+
+CGI_LIB_DIR=cgilib-0.4
+GD_LIB_DIR=gd1.3
+PNG_LIB_DIR=libpng-1.0.3
+ZLIB_LIB_DIR=zlib-1.1.3
+
+
+
+
+
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:903: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$PERL" in
+ /*)
+ ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_PERL="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
+ ;;
+esac
+fi
+PERL="$ac_cv_path_PERL"
+if test -n "$PERL"; then
+ echo "$ac_t""$PERL" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+if test "x$PERL" = "nox"; then
+ COMP_PERL=
+else
+ COMP_PERL="perl_piped perl_shared"
+fi
+
+
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:530: checking for $ac_word" >&5
+echo "configure:947: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -556,7 +973,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:560: checking for $ac_word" >&5
+echo "configure:977: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -607,7 +1024,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:611: checking for $ac_word" >&5
+echo "configure:1028: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -639,7 +1056,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:643: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1060: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -650,12 +1067,12 @@
cat > conftest.$ac_ext << EOF
-#line 654 "configure"
+#line 1071 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -681,12 +1098,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1102: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:690: checking whether we are using GNU C" >&5
+echo "configure:1107: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -695,7 +1112,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -714,7 +1131,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:718: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1135: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -746,7 +1163,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:750: checking how to run the C preprocessor" >&5
+echo "configure:1167: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -761,13 +1178,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 765 "configure"
+#line 1182 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -778,13 +1195,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 782 "configure"
+#line 1199 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -795,13 +1212,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 799 "configure"
+#line 1216 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -819,147 +1236,87 @@
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
- CPP="$ac_cv_prog_CPP"
-else
- ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:860: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
- fi
- fi
- done
- ;;
- esac
- done
- IFS="$ac_save_IFS"
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL="$ac_install_sh"
- fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:913: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
- rm -f conftestdata
- ac_cv_prog_LN_S="ln -s"
-else
- ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
- echo "$ac_t""yes" 1>&6
+ CPP="$ac_cv_prog_CPP"
else
- echo "$ac_t""no" 1>&6
+ ac_cv_prog_CPP="$CPP"
fi
+echo "$ac_t""$CPP" 1>&6
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:934: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftestmake <<\EOF
-all:
- @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval="$enable_shared"
+ p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
else
- eval ac_cv_prog_make_${ac_make}_set=no
+ enable_shared=no
fi
-rm -f conftestmake
+
+
+# Check whether --enable-static or --disable-static was given.
+if test "${enable_static+set}" = set; then
+ enableval="$enable_static"
+ p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
+else
+ enable_static=yes
fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- SET_MAKE=
+
+# Check whether --enable-fast-install or --disable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+ enableval="$enable_fast_install"
+ p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac
else
- echo "$ac_t""no" 1>&6
- SET_MAKE="MAKE=${MAKE-make}"
+ enable_fast_install=yes
fi
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:963: checking for $ac_word" >&5
+echo "configure:1320: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -986,99 +1343,321 @@
echo "$ac_t""no" 1>&6
fi
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:993: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+echo "configure:1359: checking for ld used by GCC" >&5
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+echo "configure:1383: checking for GNU ld" >&5
+else
+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:1386: checking for non-GNU ld" >&5
+fi
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- case "$PERL" in
- /*)
- ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_PERL="$ac_dir/$ac_word"
- break
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ ac_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no"
- ;;
-esac
+else
+ ac_cv_path_LD="$LD" # Let the user override the test with a path.
fi
-PERL="$ac_cv_path_PERL"
-if test -n "$PERL"; then
- echo "$ac_t""$PERL" 1>&6
+fi
+
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+ echo "$ac_t""$LD" 1>&6
else
echo "$ac_t""no" 1>&6
fi
+test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
+echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
+echo "configure:1422: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ ac_cv_prog_gnu_ld=yes
+else
+ ac_cv_prog_gnu_ld=no
+fi
+fi
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
-echo "configure:1029: checking for acos in -lm" >&5
-ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
+echo "configure:1438: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1037 "configure"
+ if test -n "$NM"; then
+ # Let the user override the test.
+ ac_cv_path_NM="$NM"
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -B"
+ break
+ elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -p"
+ break
+ else
+ ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi
+fi
+
+NM="$ac_cv_path_NM"
+echo "$ac_t""$NM" 1>&6
+
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:1475: checking whether ln -s works" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+ rm -f conftestdata
+ ac_cv_prog_LN_S="ln -s"
+else
+ ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags="--cache-file=$cache_file"
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+ enableval="$enable_libtool_lock"
+ :
+fi
+
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$host" in
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '#line 1519 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+echo "configure:1541: checking whether the C compiler needs -belf" >&5
+if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1546 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char acos();
int main() {
-acos()
+
; return 0; }
EOF
-if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+ lt_cv_cc_needs_belf=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+ lt_cv_cc_needs_belf=no
fi
rm -f conftest*
-LIBS="$ac_save_LIBS"
-
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
+
+echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+
+
+esac
+
+
+# Save cache, so that ltconfig can load it
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already. You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote substitution
+ # turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ -e "s/'/'\\\\''/g" \
+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+ ;;
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+ ;;
+ esac >> confcache
+if cmp -s $cache_file confcache; then
+ :
+else
+ if test -w $cache_file; then
+ echo "updating cache $cache_file"
+ cat confcache > $cache_file
+ else
+ echo "not updating unwritable cache $cache_file"
+ fi
+fi
+rm -f confcache
- LIBS="-lm $LIBS"
+# Actually configure libtool. ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+
+# Reload cache, that may have been modified by ltconfig
+if test -r "$cache_file"; then
+ echo "loading cache $cache_file"
+ . $cache_file
else
- echo "$ac_t""no" 1>&6
+ echo "creating cache $cache_file"
+ > $cache_file
fi
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+
+
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1077: checking for ANSI C header files" >&5
+echo "configure:1656: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1082 "configure"
+#line 1661 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1086,7 +1665,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1103,7 +1682,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1107 "configure"
+#line 1686 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1121,7 +1700,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1125 "configure"
+#line 1704 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1142,7 +1721,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1146 "configure"
+#line 1725 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1153,7 +1732,7 @@
exit (0); }
EOF
-if { (eval echo configure:1157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1180,17 +1759,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1184: checking for $ac_hdr" >&5
+echo "configure:1763: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1189 "configure"
+#line 1768 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1218,12 +1797,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1222: checking for working const" >&5
+echo "configure:1801: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1227 "configure"
+#line 1806 "configure"
#include "confdefs.h"
int main() {
@@ -1272,7 +1851,7 @@
; return 0; }
EOF
-if { (eval echo configure:1276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1293,12 +1872,12 @@
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1297: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1876: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1881 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1307,7 +1886,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1328,59 +1907,106 @@
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1332: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1911: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1337 "configure"
+#line 1916 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <time.h>
+int main() {
+struct tm *tp; tp->tm_sec;
+; return 0; }
+EOF
+if { (eval echo configure:1924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_struct_tm=time.h
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ ac_cv_struct_tm=sys/time.h
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_struct_tm" 1>&6
+if test $ac_cv_struct_tm = sys/time.h; then
+ cat >> confdefs.h <<\EOF
+#define TM_IN_SYS_TIME 1
+EOF
+
+fi
+
+
+echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6
+echo "configure:1946: checking for acos in -lm" >&5
+ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1954 "configure"
#include "confdefs.h"
-#include <sys/types.h>
-#include <time.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char acos();
+
int main() {
-struct tm *tp; tp->tm_sec;
+acos()
; return 0; }
EOF
-if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- ac_cv_struct_tm=time.h
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- ac_cv_struct_tm=sys/time.h
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
-echo "$ac_t""$ac_cv_struct_tm" 1>&6
-if test $ac_cv_struct_tm = sys/time.h; then
- cat >> confdefs.h <<\EOF
-#define TM_IN_SYS_TIME 1
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
EOF
+ LIBS="-lm $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
fi
if test ${CC-gcc} = gcc; then
- rd_cv_prog_hpcc=no
-oCFLAGS_EXTRA=$CFLAGS_EXTRA
-CFLAGS_EXTRA="$CFLAGS_EXTRA -Wall -pedantic -fPIC"
-echo $ac_n "checking if we can use GCC-specific compiler options""... $ac_c" 1>&6
-echo "configure:1371: checking if we can use GCC-specific compiler options" >&5
+ oCFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Wall -pedantic"
+ echo $ac_n "checking if we can use GCC-specific compiler options""... $ac_c" 1>&6
+echo "configure:1997: checking if we can use GCC-specific compiler options" >&5
if eval "test \"`echo '$''{'rd_cv_gcc_opt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-cat > conftest.$ac_ext <<EOF
-#line 1377 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 2003 "configure"
#include "confdefs.h"
int main() {
return 0
; return 0; }
EOF
-if { (eval echo configure:1384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rd_cv_gcc_opt=yes
else
@@ -1390,47 +2016,22 @@
rd_cv_gcc_opt=no
fi
rm -f conftest*
-
+
fi
echo "$ac_t""$rd_cv_gcc_opt" 1>&6
-if test $rd_cv_gcc_opt = no; then
- CFLAGS_EXTRA=$oCFLAGS_EXTRA
-fi
-
-else
-echo $ac_n "checking if we should use HP compiler options""... $ac_c" 1>&6
-echo "configure:1404: checking if we should use HP compiler options" >&5
-if eval "test \"`echo '$''{'rd_cv_prog_hpcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-cat > conftest.c <<EOF
-#ifdef _HPUX_SOURCE
- yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -Ae -z -E conftest.c'; { (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1
-then
- rd_cv_prog_hpcc=yes
-else
- rd_cv_prog_hpcc=no
-fi
-fi
-
-echo "$ac_t""$rd_cv_prog_hpcc" 1>&6
-fi
-if test $rd_cv_prog_hpcc = yes; then
- CFLAGS_EXTRA="$CFLAGS_EXTRA -Ae -z"
+ if test $rd_cv_gcc_opt = no; then
+ CFLAGS=$oCFLAGS
+ fi
fi
echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:1429: checking for strftime" >&5
+echo "configure:2030: checking for strftime" >&5
if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1434 "configure"
+#line 2035 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strftime(); below. */
@@ -1453,7 +2054,7 @@
; return 0; }
EOF
-if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_strftime=yes"
else
@@ -1475,7 +2076,7 @@
echo "$ac_t""no" 1>&6
# strftime is in -lintl on SCO UNIX.
echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:1479: checking for strftime in -lintl" >&5
+echo "configure:2080: checking for strftime in -lintl" >&5
ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1483,7 +2084,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1487 "configure"
+#line 2088 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1494,7 +2095,7 @@
strftime()
; return 0; }
EOF
-if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1521,12 +2122,12 @@
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1525: checking for vprintf" >&5
+echo "configure:2126: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1530 "configure"
+#line 2131 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -1549,7 +2150,7 @@
; return 0; }
EOF
-if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1573,12 +2174,12 @@
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1577: checking for _doprnt" >&5
+echo "configure:2178: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1582 "configure"
+#line 2183 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -1601,7 +2202,7 @@
; return 0; }
EOF
-if { (eval echo configure:1605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1626,15 +2227,15 @@
fi
-for ac_func in mktime getrusage gettimeofday
+for ac_func in snprintf fpclass isnan finite isinf memmove strchr mktime getrusage gettimeofday
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1633: checking for $ac_func" >&5
+echo "configure:2234: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1638 "configure"
+#line 2239 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1657,7 +2258,7 @@
; return 0; }
EOF
-if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1682,9 +2283,57 @@
done
-oCFLAGS_EXTRA=$CFLAGS_EXTRA
-echo $ac_n "checking if the compiler does proper IEEE math""... $ac_c" 1>&6
-echo "configure:1688: checking if the compiler does proper IEEE math" >&5
+
+echo $ac_n "checking if realloc can deal with NULL""... $ac_c" 1>&6
+echo "configure:2289: checking if realloc can deal with NULL" >&5
+if eval "test \"`echo '$''{'rd_cv_null_realloc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2297 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+ int main(void){
+ char *x = NULL;
+ x = realloc (x,10);
+ if (x==NULL) return 1;
+ return 0;
+ }
+EOF
+if { (eval echo configure:2307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ rd_cv_null_realloc=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ rd_cv_null_realloc=nope
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rd_cv_null_realloc" 1>&6
+
+if test x"$rd_cv_null_realloc" = xnope; then
+cat >> confdefs.h <<\EOF
+#define NO_NULL_REALLOC 1
+EOF
+
+fi
+
+
+
+
+oCFLAGS=$CFLAGS
+unset CFLAGS
+
+echo $ac_n "checking if IEEE math works out of the box""... $ac_c" 1>&6
+echo "configure:2337: checking if IEEE math works out of the box" >&5
if eval "test \"`echo '$''{'rd_cv_ieee_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1692,25 +2341,62 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1696 "configure"
+#line 2345 "configure"
#include "confdefs.h"
+
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
int main(void){
- double a=0.0/0.0,b=0.0,c;
- c=a/b;if (c==a) c=a;return isnan(a/c)?0:1;
- }
+ double nan,inf,c,d;
+ ;
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
EOF
-if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rd_cv_ieee_works=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
-
-echo "$ac_t""no it does not" 1>&6
-CFLAGS_EXTRA="$CFLAGS_EXTRA -ieee"
-echo $ac_n "checking if the compiler does proper IEEE math with -ieee""... $ac_c" 1>&6
-echo "configure:1714: checking if the compiler does proper IEEE math with -ieee" >&5
+ rd_cv_ieee_works=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rd_cv_ieee_works" 1>&6
+
+if test "$rd_cv_ieee_works" != yes ; then
+
+CFLAGS=-ieee
+echo $ac_n "checking if IEEE math works with the -ieee switch""... $ac_c" 1>&6
+echo "configure:2400: checking if IEEE math works with the -ieee switch" >&5
if eval "test \"`echo '$''{'rd_cv_ieee_switch'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1718,29 +2404,49 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1722 "configure"
+#line 2408 "configure"
#include "confdefs.h"
+
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
int main(void){
- double a=0.0/0.0,b=0.0,c;
- c=a/b;if (c==a) c=a;return isnan(a/c)?0:1;
- }
+ double nan,inf,c,d;
+ ;
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
EOF
-if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
rd_cv_ieee_switch=yes
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
- rd_cv_ieee_switch=no;
-echo "$ac_t""nope" 1>&6
-echo "--------------------------------------------------------------"
-echo "Your Compiler does not do propper IEEE math ... "
-echo "Please find out how to make IEEE math work with your Compiler"
-echo "And let me know (oetiker at ee.ethz.ch)"
-echo ""
-exit 1
-
+ rd_cv_ieee_switch=no
fi
rm -fr conftest*
fi
@@ -1749,20 +2455,302 @@
echo "$ac_t""$rd_cv_ieee_switch" 1>&6
+ if test "$rd_cv_ieee_switch" != yes ; then
+
+CFLAGS=-mieee
+echo $ac_n "checking if IEEE math works with the -mieee switch""... $ac_c" 1>&6
+echo "configure:2463: checking if IEEE math works with the -mieee switch" >&5
+if eval "test \"`echo '$''{'rd_cv_ieee_mswitch'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2471 "configure"
+#include "confdefs.h"
+
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
+int main(void){
+ double nan,inf,c,d;
+ ;
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
+EOF
+if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ rd_cv_ieee_mswitch=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ rd_cv_ieee_mswitch=no
fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$rd_cv_ieee_works" 1>&6
+echo "$ac_t""$rd_cv_ieee_mswitch" 1>&6
+
+ if test "$rd_cv_ieee_mswitch" != yes ; then
+
+CFLAGS="-q float=rndsngl"
+echo $ac_n "checking if IEEE math works with the -q float=rndsngl switch""... $ac_c" 1>&6
+echo "configure:2526: checking if IEEE math works with the -q float=rndsngl switch" >&5
+if eval "test \"`echo '$''{'rd_cv_ieee_qswitch'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2534 "configure"
+#include "confdefs.h"
+
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
+int main(void){
+ double nan,inf,c,d;
+ ;
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
+EOF
+if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ rd_cv_ieee_qswitch=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ rd_cv_ieee_qswitch=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rd_cv_ieee_qswitch" 1>&6
+
+ if test "$rd_cv_ieee_qswitch" != yes ; then
+
+unset CFLAGS
+
+echo $ac_n "checking if IEEE math works with fpsetmask(0)""... $ac_c" 1>&6
+echo "configure:2590: checking if IEEE math works with fpsetmask(0)" >&5
+if eval "test \"`echo '$''{'rd_cv_ieee_mask'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2598 "configure"
+#include "confdefs.h"
+#include <floatingpoint.h>
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
+int main(void){
+ double nan,inf,c,d;
+ fpsetmask(0);
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
+EOF
+if { (eval echo configure:2633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ rd_cv_ieee_mask=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ rd_cv_ieee_mask=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rd_cv_ieee_mask" 1>&6
+
+ if test "$rd_cv_ieee_mask" != yes ; then
+
+echo $ac_n "checking if IEEE math works with signal(SIGFPE,SIG_IGN)""... $ac_c" 1>&6
+echo "configure:2652: checking if IEEE math works with signal(SIGFPE,SIG_IGN)" >&5
+if eval "test \"`echo '$''{'rd_cv_ieee_sigfpe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ :
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2660 "configure"
+#include "confdefs.h"
+#include <signal.h>
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
+int main(void){
+ double nan,inf,c,d;
+ signal(SIGFPE,SIG_IGN);
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}
+EOF
+if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+ rd_cv_ieee_sigfpe=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ rd_cv_ieee_sigfpe=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$rd_cv_ieee_sigfpe" 1>&6
-CFLAGS_EXTRA=$oCFLAGS_EXTRA
+ if test "$rd_cv_ieee_sigfpe" != yes ; then
+
+
+echo "--------------------------------------------------------------"
+echo "Your Compiler does not do propper IEEE math ... "
+echo "Please find out how to make IEEE math work with your Compiler"
+echo "and let me know (oetiker at ee.ethz.ch)"
+echo "Check config.log to see what went wrong ..."
+echo ""
+exit 1
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+CFLAGS=$oCFLAGS
+
+if test x$rd_cv_ieee_sigfpe = xyes; then
+ cat >> confdefs.h <<\EOF
+#define MUST_DISABLE_SIGFPE 1
+EOF
+
+fi
+
+if test x$rd_cv_ieee_mask = xyes; then
+ cat >> confdefs.h <<\EOF
+#define MUST_DISABLE_FPMASK 1
+EOF
+
+fi
if test x$rd_cv_ieee_switch = xyes; then
- CFLAGS_EXTRA="$CFLAGS_EXTRA -ieee"
+ CFLAGS="$CFLAGS -ieee"
+fi
+
+if test x$rd_cv_ieee_mswitch = xyes; then
+ CFLAGS="$CFLAGS -mieee"
fi
+if test x$rd_cv_ieee_qswitch = xyes; then
+ CFLAGS="$CFLAGS -q float=rndsngl"
+fi
@@ -1867,7 +2855,26 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile src/Makefile gd1.2/Makefile doc/GNUmakefile perl-shared/examples/shared-demo.pl perl-piped/examples/piped-demo.pl config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "cgilib-0.4/Makefile \
+ config/Makefile \
+ examples/shared-demo.pl \
+ examples/piped-demo.pl \
+ examples/stripes.pl \
+ examples/bigtops.pl \
+ examples/minmax.pl \
+ examples/cgi-demo.cgi \
+ examples/Makefile \
+ contrib/Makefile \
+ contrib/trytime/Makefile \
+ contrib/log2rrd/Makefile \
+ contrib/log2rrd/log2rrd.pl \
+ contrib/rrd-file-icon/Makefile \
+ doc/Makefile \
+ gd1.3/Makefile \
+ libpng-1.0.3/Makefile \
+ zlib-1.1.3/Makefile \
+ src/Makefile \
+ Makefile config/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -1899,16 +2906,45 @@
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@LN_S@%$LN_S%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@ACLOCAL@%$ACLOCAL%g
+s%@AUTOCONF@%$AUTOCONF%g
+s%@AUTOMAKE@%$AUTOMAKE%g
+s%@AUTOHEADER@%$AUTOHEADER%g
+s%@MAKEINFO@%$MAKEINFO%g
s%@SET_MAKE@%$SET_MAKE%g
-s%@RANLIB@%$RANLIB%g
+s%@CGI_LIB_DIR@%$CGI_LIB_DIR%g
+s%@GD_LIB_DIR@%$GD_LIB_DIR%g
+s%@PNG_LIB_DIR@%$PNG_LIB_DIR%g
+s%@ZLIB_LIB_DIR@%$ZLIB_LIB_DIR%g
s%@PERL@%$PERL%g
-s%@CFLAGS_EXTRA@%$CFLAGS_EXTRA%g
+s%@COMP_PERL@%$COMP_PERL%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
+s%@RANLIB@%$RANLIB%g
+s%@LD@%$LD%g
+s%@NM@%$NM%g
+s%@LN_S@%$LN_S%g
+s%@LIBTOOL@%$LIBTOOL%g
CEOF
EOF
@@ -1950,7 +2986,26 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile gd1.2/Makefile doc/GNUmakefile perl-shared/examples/shared-demo.pl perl-piped/examples/piped-demo.pl"}
+CONFIG_FILES=\${CONFIG_FILES-"cgilib-0.4/Makefile \
+ config/Makefile \
+ examples/shared-demo.pl \
+ examples/piped-demo.pl \
+ examples/stripes.pl \
+ examples/bigtops.pl \
+ examples/minmax.pl \
+ examples/cgi-demo.cgi \
+ examples/Makefile \
+ contrib/Makefile \
+ contrib/trytime/Makefile \
+ contrib/log2rrd/Makefile \
+ contrib/log2rrd/log2rrd.pl \
+ contrib/rrd-file-icon/Makefile \
+ doc/Makefile \
+ gd1.3/Makefile \
+ libpng-1.0.3/Makefile \
+ zlib-1.1.3/Makefile \
+ src/Makefile \
+ Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2031,7 +3086,7 @@
if test "${CONFIG_HEADERS+set}" != set; then
EOF
cat >> $CONFIG_STATUS <<EOF
- CONFIG_HEADERS="config.h"
+ CONFIG_HEADERS="config/config.h"
EOF
cat >> $CONFIG_STATUS <<\EOF
fi
@@ -2119,9 +3174,12 @@
EOF
cat >> $CONFIG_STATUS <<EOF
+
EOF
cat >> $CONFIG_STATUS <<\EOF
-chmod +x perl-*/examples/*.pl
+test -z "$CONFIG_HEADERS" || echo timestamp > config/stamp-h
+\
+ chmod +x examples/*.cgi examples/*.pl contrib/*/*.pl
exit 0
EOF
chmod +x $CONFIG_STATUS
@@ -2130,9 +3188,32 @@
echo $ac_n "checking in""... $ac_c" 1>&6
-echo "configure:2134: checking in" >&5
+echo "configure:3192: checking in" >&5
echo "$ac_t""and out again" 1>&6
-echo $ac_n "ordering CD from http://cdnow.com/gift/oetiker@ee.ethz.ch""... $ac_c" 1>&6
-sleep 3
-echo "$ac_t""just kidding ;-)" 1>&6
+echo $ac_n "ordering CD from http://cdnow.com/gift/oetiker@ee.ethz.ch $ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo "$ac_t"" just kidding ;-)" 1>&6
+echo
+echo "----------------------------------------------------------------"
+echo "Config is DONE!"
+echo
+echo "Type 'make' to compile the software and use 'make install' to "
+echo "install everything to $prefix. If you want to install the perl"
+echo "modules in site-perl, try 'make site-perl-install'."
+echo
+echo " ... that wishlist mentioned above does realy exist. So if"
+echo "you feel like showing your appreciation for rrdtool this is the"
+echo "place to go. :-)"
+echo
+echo " -- Tobi Oetiker <oetiker at ee.ethz.ch>"
+echo "----------------------------------------------------------------"
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/Makefile.in Sat Jul 13 19:22:31 2002
@@ -1,53 +1,434 @@
-# things that the GNU standards document suggests all makefiles
-# should have.
-SHELL = /bin/sh
- at SET_MAKE@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# build the following subdirectories
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOMAKE = @AUTOMAKE@
+
INSTALL = @INSTALL@
-PREFIX = @prefix@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.3 src doc examples contrib
+
+# the following files are not mentioned in any other Makefile
+EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS perl-piped/MANIFEST perl-piped/README perl-piped/rrdpl.ds? perl-piped/RRDp.pm perl-piped/Makefile.PL perl-piped/t/base.t perl-shared/MANIFEST perl-shared/README perl-shared/RRDs.xs perl-shared/ntmake.pl perl-shared/Makefile.PL perl-shared/t/base.t perl-shared/rrdpl.ds? perl-shared/RRDs.pm
+
+
+#
+CLEANFILES = config.cache
+
+# use relaxed rules when building dists
+AUTOMAKE_OPTIONS = foreign
+
+# where we keep local rules for automake
+ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ./config/config.h
+CONFIG_CLEAN_FILES =
+DIST_COMMON = README COPYING Makefile.am Makefile.in TODO \
+config/config.h.in config/stamp-h.in configure configure.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
.SUFFIXES:
-.SUFFIXES: .c .o .pl .pm .pod .html .man
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+
+config/config.h: config/stamp-h
+ @if test ! -f $@; then \
+ rm -f config/stamp-h; \
+ $(MAKE) config/stamp-h; \
+ else :; fi
+config/stamp-h: $(srcdir)/config/config.h.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES= CONFIG_HEADERS=config/config.h \
+ $(SHELL) ./config.status
+ @echo timestamp > config/stamp-h 2> /dev/null
+$(srcdir)/config/config.h.in: $(srcdir)/config/stamp-h.in
+ @if test ! -f $@; then \
+ rm -f $(srcdir)/config/stamp-h.in; \
+ $(MAKE) $(srcdir)/config/stamp-h.in; \
+ else :; fi
+$(srcdir)/config/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @echo timestamp > $(srcdir)/config/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+ -rm -f config/config.h
+
+maintainer-clean-hdr:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+ at SET_MAKE@
-all:
- (cd gd1.2 && $(MAKE) CFLAGS="$(CFLAGS)" libgd.a)
- (cd src && $(MAKE) CFLAGS="$(CFLAGS)")
- $(MAKE) perl-piped perl-shared
- (cd doc && $(MAKE))
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
-perl-piped: perl-piped/Makefile
- (cd perl-piped && $(MAKE) OPTIMIZE="$(CFLAGS)")
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" = "." && dot_seen=yes; \
+ done; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
-perl-shared: perl-shared/Makefile
- (cd perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)")
+tags: TAGS
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ -rm -rf $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) dist
+ -rm -rf $(distdir)
+ @banner="$(distdir).tar.gz is ready for distribution"; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"
+dist: distdir
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
+dist-all: distdir
+ -chmod -R a+r $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+ -rm -rf $(distdir)
+distdir: $(DISTFILES)
+ -rm -rf $(distdir)
+ mkdir $(distdir)
+ -chmod 777 $(distdir)
+ $(mkinstalldirs) $(distdir)/perl-piped $(distdir)/perl-piped/t \
+ $(distdir)/perl-shared $(distdir)/perl-shared/t
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+ for subdir in $(SUBDIRS); do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+ chmod 777 $(distdir)/$$subdir; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ || exit 1; \
+ fi; \
+ done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am: install-data-local
+install-data: install-data-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am:
+uninstall: uninstall-recursive
+all-am: Makefile all-local
+all-redirect: all-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+
+
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean-local
+
+clean: clean-recursive
+
+distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-recursive
+ -rm -f config.status
+
+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
+ maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-am uninstall all-local all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
+
+
+# lets schedule the perl stuff for installation
+install-data-local:
+ $(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs
+ $(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs
+ $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs
+
+# rules for building the perl module
+perl_piped: perl-piped/Makefile
+ cd perl-piped && $(MAKE) OPTIMIZE="$(CFLAGS)"
perl-piped/Makefile: perl-piped/Makefile.PL
- (cd perl-piped && @PERL@ Makefile.PL)
+ cd perl-piped && $(PERL) Makefile.PL
+
+perl_shared: perl-shared/Makefile
+ cd perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)"
perl-shared/Makefile: perl-shared/Makefile.PL
- (cd perl-shared && @PERL@ Makefile.PL)
+ cd perl-shared && $(PERL) Makefile.PL
+
+# add the following to the all target
+all-local: @COMP_PERL@
+
+# add to install
+
+#to-autoconf:
+# aclocal -I config -I config/libtool --output=config/aclocal.m4
+# automake --foreign
+# autoconf --localdir=config
+# autoheader --localdir=config
+# ./configure
+
+to-docs: to-versync
+ (cd doc && $(MAKE) clean && $(MAKE))
+#to-autoconf
+to-versync:
+ perl -i -p -e '"$(VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/; $$v=sprintf("%1d.%02d0%02d1" ,$${1},$${2},$${3}); s|VERSION\s*=\s*[\d.]+|VERSION = $$v|' perl-*/RRD?.pm
+ perl -i -p -e 's|RRDtool\s+\d+\.\d+\.\d+|RRDtool $(VER)|' src/*.[ch]
+
+to-dist: to-docs dist
+ mv $(PACKAGE)-$(VERSION).tar.gz archive
+
+to-scp: to-dist
+ scp CHANGES oetiker at tardis.ee.ethz.ch:/home/oetiker/public_html/webtools/rrdtool/pub/
+ scp archive/$(PACKAGE)-$(VERSION).tar.gz oetiker at tardis.ee.ethz.ch:/home/oetiker/public_html/webtools/rrdtool/pub/$(ARCHIVE)
+ scp CHANGES tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+ scp archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+
+site-perl-inst:
+ cd perl-piped && $(MAKE) install
+ cd perl-shared && $(MAKE) install
+
+clean-local:
+ cd perl-piped && $(MAKE) clean
+ cd perl-shared && $(MAKE) clean
-clean:
- (cd gd1.2 && $(MAKE) clean)
- (cd src && $(MAKE) clean)
-
-distclean realclean:
- (cd gd1.2 && $(MAKE) realclean)
- (cd src && $(MAKE) realclean)
- @if test -f perl-shared/Makefile; then \
- echo '(cd perl-shared; $(MAKE) clean)' ; \
- (cd perl-shared; $(MAKE) clean); \
- fi
- @if test -f perl-piped/Makefile; then \
- echo '(cd perl-piped; $(MAKE) clean)' ; \
- (cd perl; $(MAKE) clean); \
- fi
- -rm -f config.cache config.h config.log config.status Makefile
-
-install: all
- (cd perl-piped && $(MAKE) install)
- (cd perl-shared && $(MAKE) install)
- $(INSTALL) -m 755 -o root -g root src/rrdtool $(PREFIX)/bin
- $(INSTALL) -m 644 -o root -g root doc/*.3 $(PREFIX)/man/man3
- $(INSTALL) -m 644 -o root -g root doc/*.1 $(PREFIX)/man/man1
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/orca/packages/rrdtool-1.0.7.2/configure.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/configure.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/configure.in Sat Jul 13 19:22:31 2002
@@ -1,49 +1,65 @@
-dnl This file is the master file for the configure process.
-dnl It is only edited by developers. If you are trying to compile
-dnl rrd_tool, use "sh configure" instead of this file.
+dnl RRDtool AutoConf script ...
+dnl ---------------------------
dnl
-dnl From it, config.h.in and configure are both made.
-dnl To make them, you (a developer) will need to install the latest
-dnl versions of GNU m4 and GNU autoconf. Then you run "autoheader"
-dnl in the distribution directory to make config.h.in, and
-dnl "autoconf" to make the configure script. These two files
-dnl must be shipped with the distribution; end users should not need
-dnl m4 and autoconf to be able to compile. All they need is
-dnl to run "sh configure".
+dnl Created by Jeff Allen, Tobi Oetiker, Blair Zajac
dnl
-dnl The format of this file is basically one macro to a line.
-dnl Text that is not a macro and not a comment is passed straight
-dnl through to the configure script.
dnl
-dnl Comments are "dnl" followed by comments. It means delete
-dnl to newline.
-dnl
-dnl When you want to pass a literal bit of text to a macro as
-dnl an argument, you use square brackets. Thus, you cannot use
-dnl the bracket shorthand for /bin/test... you must use the
-dnl actual program name.
-dnl
-dnl Our tests do not cache. This is because I'm too lazy to
-dnl figure out how to use the caching macros. There's not many,
-dnl so it's not a big problem.
-dnl
-dnl -jra
+dnl make sure we are being executed in the right place
AC_INIT(src/rrd_tool.c)
-AC_CONFIG_HEADER(config.h)
-dnl Check for programs.
+dnl all our local stuff like install scripts and include files
+dnl is in there
+AC_CONFIG_AUX_DIR(config)
+
+dnl determine the type of system we are running on
+AC_CANONICAL_SYSTEM
+
+dnl tell automake the this script is for rrdtool
+AM_INIT_AUTOMAKE(rrdtool, 1.0.7)
+
+dnl where we install our stuff ...
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-1.0.7 )
+
+dnl tell automake which file to use as config header
+AM_CONFIG_HEADER(config/config.h)
+
+dnl Minimum Autoconf version required.
+AC_PREREQ(2.13)
+
+dnl Define library subdirectory names here.
+CGI_LIB_DIR=cgilib-0.4
+GD_LIB_DIR=gd1.3
+PNG_LIB_DIR=libpng-1.0.3
+ZLIB_LIB_DIR=zlib-1.1.3
+
+dnl substitute them in all the files listed in AC_OUTPUT
+AC_SUBST(CGI_LIB_DIR)
+AC_SUBST(GD_LIB_DIR)
+AC_SUBST(PNG_LIB_DIR)
+AC_SUBST(ZLIB_LIB_DIR)
+
+
+dnl Check for Perl.
+AC_PATH_PROG(PERL, perl, no)
+if test "x$PERL" = "nox"; then
+ COMP_PERL=
+else
+ COMP_PERL="perl_piped perl_shared"
+fi
+AC_SUBST(COMP_PERL)
+
+
+dnl Check for the compiler and static/shared library creation.
AC_PROG_CC
AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-AC_PATH_PROG(PERL, perl, no)
+dnl RRD_ACLOCAL_FIND_LIBTOOL
+dnl don't build a shared library ... perl will do it's own magic.
+dnl this can be changed when running configure
+AC_DISABLE_SHARED
-dnl Checks for libraries.
-AC_CHECK_LIB(m, acos)
+AM_PROG_LIBTOOL
dnl Checks for header files.
AC_HEADER_STDC
@@ -54,85 +70,205 @@
AC_HEADER_TIME
AC_STRUCT_TM
+dnl Checks for libraries.
+AC_CHECK_LIB(m, acos)
+
dnl If CC is not set we assume gcc
if test ${CC-gcc} = gcc; then
- rd_cv_prog_hpcc=no
-oCFLAGS_EXTRA=$CFLAGS_EXTRA
-CFLAGS_EXTRA="$CFLAGS_EXTRA -Wall -pedantic -fPIC"
-AC_CACHE_CHECK(if we can use GCC-specific compiler options, rd_cv_gcc_opt,
-[
-AC_TRY_COMPILE( , return 0 ,
- rd_cv_gcc_opt=yes,
- rd_cv_gcc_opt=no )
-])
-if test $rd_cv_gcc_opt = no; then
- CFLAGS_EXTRA=$oCFLAGS_EXTRA
-fi
-
-else
-AC_CACHE_CHECK(if we should use HP compiler options, rd_cv_prog_hpcc,
-[
-cat > conftest.c <<EOF
-#ifdef _HPUX_SOURCE
- yes;
-#endif
-EOF
-if AC_TRY_COMMAND(${CC-cc} -Ae -z -E conftest.c) | egrep yes >/dev/null 2>&1
-then
- rd_cv_prog_hpcc=yes
-else
- rd_cv_prog_hpcc=no
-fi])
-fi
-if test $rd_cv_prog_hpcc = yes; then
- CFLAGS_EXTRA="$CFLAGS_EXTRA -Ae -z"
+ oCFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -Wall -pedantic"
+ AC_CACHE_CHECK(if we can use GCC-specific compiler options, rd_cv_gcc_opt,
+ [
+ AC_TRY_COMPILE( , return 0 ,
+ rd_cv_gcc_opt=yes,
+ rd_cv_gcc_opt=no )
+ ])
+ if test $rd_cv_gcc_opt = no; then
+ CFLAGS=$oCFLAGS
+ fi
fi
dnl Checks for library functions.
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(mktime getrusage gettimeofday)
-
-oCFLAGS_EXTRA=$CFLAGS_EXTRA
-AC_CACHE_CHECK([if the compiler does proper IEEE math], rd_cv_ieee_works,
-[AC_TRY_RUN([int main(void){
- double a=0.0/0.0,b=0.0,c;
- c=a/b;if (c==a) c=a;return isnan(a/c)?0:1;
- }],
- [rd_cv_ieee_works=yes],[
-AC_MSG_RESULT(no it does not)
-CFLAGS_EXTRA="$CFLAGS_EXTRA -ieee"
-AC_CACHE_CHECK([if the compiler does proper IEEE math with -ieee], rd_cv_ieee_switch,
-[AC_TRY_RUN([int main(void){
- double a=0.0/0.0,b=0.0,c;
- c=a/b;if (c==a) c=a;return isnan(a/c)?0:1;
+dnl for each function found we get a definition in config.h
+dnl of the form HAVE_FUNCTION
+AC_CHECK_FUNCS(snprintf fpclass isnan finite isinf memmove strchr mktime getrusage gettimeofday)
+
+dnl what does realloc do if it gets called with a NULL pointer
+
+AC_CACHE_CHECK([if realloc can deal with NULL], rd_cv_null_realloc,
+[AC_TRY_RUN([#include <stdlib.h>
+ int main(void){
+ char *x = NULL;
+ x = realloc (x,10);
+ if (x==NULL) return 1;
+ return 0;
}],
- [rd_cv_ieee_switch=yes],[rd_cv_ieee_switch=no;
-AC_MSG_RESULT(nope)
+ [rd_cv_null_realloc=yes],[rd_cv_null_realloc=nope],:)])
+
+if test x"$rd_cv_null_realloc" = xnope; then
+AC_DEFINE(NO_NULL_REALLOC)
+fi
+
+dnl determine how to get IEEE math to work on this box.
+
+AC_DEFUN(AC_IEEE,
+AC_CACHE_CHECK([if IEEE math works $1], [rd_cv_ieee_$2],
+[AC_TRY_RUN([$3
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+# define HAVE_FINITE 1
+# define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# include <ieeefp.h>
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#include <stdio.h>
+int main(void){
+ double nan,inf,c,d;
+ $4;
+ /* some math to see if we get a segfault; */
+ nan=0.0/0.0;
+ inf=1.0/0.0;
+ c = 1.0;
+ c = c / 0.0; /* try getting fpe */
+ c = inf + nan;
+ c = inf / nan;
+ if (! isnan(nan)) {printf ("isnan(NaN) ... "); return 1;}
+ if (nan == nan) {printf ("nan != nan ..."); return 1;}
+ if (! isinf(inf)) {printf ("isinf(oo) ... "); return 1;}
+ if (! isinf(-inf)) {printf ("isinf(-oo) ... "); return 1;}
+ if (! inf > 0) {printf ("inf > 0 ... "); return 1;}
+ if (! -inf < 0) {printf ("inf < 0 ... "); return 1;}
+ return 0;
+}],
+ [rd_cv_ieee_$2=yes],[rd_cv_ieee_$2=no],:)]))
+
+oCFLAGS=$CFLAGS
+unset CFLAGS
+
+AC_IEEE([out of the box],works)
+
+if test "$rd_cv_ieee_works" != yes ; then
+
+CFLAGS=-ieee
+AC_IEEE([with the -ieee switch],switch)
+
+ if test "$rd_cv_ieee_switch" != yes ; then
+
+CFLAGS=-mieee
+AC_IEEE([with the -mieee switch],mswitch)
+
+ if test "$rd_cv_ieee_mswitch" != yes ; then
+
+CFLAGS="-q float=rndsngl"
+AC_IEEE([with the -q float=rndsngl switch],qswitch)
+
+ if test "$rd_cv_ieee_qswitch" != yes ; then
+
+unset CFLAGS
+
+AC_IEEE([with fpsetmask(0)],mask,[#include <floatingpoint.h>],[fpsetmask(0)])
+
+ if test "$rd_cv_ieee_mask" != yes ; then
+
+AC_IEEE([with signal(SIGFPE,SIG_IGN)],sigfpe,[#include <signal.h>],[signal(SIGFPE,SIG_IGN)])
+
+ if test "$rd_cv_ieee_sigfpe" != yes ; then
+
+
echo "--------------------------------------------------------------"
echo "Your Compiler does not do propper IEEE math ... "
echo "Please find out how to make IEEE math work with your Compiler"
-echo "And let me know (oetiker at ee.ethz.ch)"
+echo "and let me know (oetiker at ee.ethz.ch)"
+echo "Check config.log to see what went wrong ..."
echo ""
exit 1
-],:)])
-],:)])
+ fi
+ fi
+ fi
+ fi
+ fi
+fi
+
+CFLAGS=$oCFLAGS
-CFLAGS_EXTRA=$oCFLAGS_EXTRA
+if test x$rd_cv_ieee_sigfpe = xyes; then
+ AC_DEFINE(MUST_DISABLE_SIGFPE)
+fi
+
+if test x$rd_cv_ieee_mask = xyes; then
+ AC_DEFINE(MUST_DISABLE_FPMASK)
+fi
if test x$rd_cv_ieee_switch = xyes; then
- CFLAGS_EXTRA="$CFLAGS_EXTRA -ieee"
+ CFLAGS="$CFLAGS -ieee"
+fi
+
+if test x$rd_cv_ieee_mswitch = xyes; then
+ CFLAGS="$CFLAGS -mieee"
+fi
+
+if test x$rd_cv_ieee_qswitch = xyes; then
+ CFLAGS="$CFLAGS -q float=rndsngl"
fi
-AC_SUBST(CFLAGS_EXTRA)
AC_SUBST(CFLAGS)
-AC_OUTPUT(Makefile src/Makefile gd1.2/Makefile doc/GNUmakefile perl-shared/examples/shared-demo.pl perl-piped/examples/piped-demo.pl, [chmod +x perl-*/examples/*.pl])
+AC_OUTPUT(cgilib-0.4/Makefile \
+ config/Makefile \
+ examples/shared-demo.pl \
+ examples/piped-demo.pl \
+ examples/stripes.pl \
+ examples/bigtops.pl \
+ examples/minmax.pl \
+ examples/cgi-demo.cgi \
+ examples/Makefile \
+ contrib/Makefile \
+ contrib/trytime/Makefile \
+ contrib/log2rrd/Makefile \
+ contrib/log2rrd/log2rrd.pl \
+ contrib/rrd-file-icon/Makefile \
+ doc/Makefile \
+ gd1.3/Makefile \
+ libpng-1.0.3/Makefile \
+ zlib-1.1.3/Makefile \
+ src/Makefile \
+ Makefile, \
+ [chmod +x examples/*.cgi examples/*.pl contrib/*/*.pl])
AC_MSG_CHECKING(in)
AC_MSG_RESULT(and out again)
-echo $ac_n "ordering CD from http://cdnow.com/gift/oetiker@ee.ethz.ch""... $ac_c" 1>&6
-sleep 3
-AC_MSG_RESULT([just kidding ;-)])
+echo $ac_n "ordering CD from http://cdnow.com/gift/oetiker@ee.ethz.ch $ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+echo $ac_n ".$ac_c" 1>&6
+sleep 1
+AC_MSG_RESULT([ just kidding ;-)])
+echo
+echo "----------------------------------------------------------------"
+echo "Config is DONE!"
+echo
+echo "Type 'make' to compile the software and use 'make install' to "
+echo "install everything to $prefix. If you want to install the perl"
+echo "modules in site-perl, try 'make site-perl-install'."
+echo
+echo " ... that wishlist mentioned above does realy exist. So if"
+echo "you feel like showing your appreciation for rrdtool this is the"
+echo "place to go. :-)"
+echo
+echo " -- Tobi Oetiker <oetiker at ee.ethz.ch>"
+echo "----------------------------------------------------------------"
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.c Sat Jul 13 19:22:31 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1999
+ * RRDtool Copyright Tobias Oetiker, 1999
*****************************************************************************
* rrd_format.c RRD Database Format helper functions
*****************************************************************************
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/gdpng.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/gdpng.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/gdpng.c Sat Jul 13 19:22:32 2002
@@ -0,0 +1,71 @@
+/*****************************************************************************
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
+ *****************************************************************************
+ * gdpng.c add PNG output routine to gd library
+ *****************************************************************************/
+
+#include <png.h>
+#include <gd.h>
+#include <stdlib.h>
+
+typedef struct _jmpbuf_wrapper {
+ jmp_buf jmpbuf;
+} jmpbuf_wrapper;
+
+static jmpbuf_wrapper gdPngJmpbufStruct;
+
+void gdImagePng(gdImagePtr im, FILE *out)
+{
+ int i;
+ png_colorp palette;
+ png_structp png_write_ptr =
+ png_create_write_struct(PNG_LIBPNG_VER_STRING,
+ (png_voidp)NULL,
+ /* we would need to point to error handlers
+ here to do it properly */
+ (png_error_ptr)NULL, (png_error_ptr)NULL);
+ png_infop info_ptr = png_create_info_struct(png_write_ptr);
+
+ if (setjmp(gdPngJmpbufStruct.jmpbuf)) {
+ png_destroy_write_struct(&png_write_ptr, &info_ptr);
+ return;
+ }
+
+ palette = (png_colorp)png_malloc (png_write_ptr,
+ im->colorsTotal*sizeof(png_color));
+ if (palette == NULL){
+ png_destroy_write_struct(&png_write_ptr, &info_ptr);
+ return;
+ }
+
+
+ png_init_io(png_write_ptr, out);
+ png_set_write_status_fn(png_write_ptr, NULL);
+ png_set_IHDR(png_write_ptr,info_ptr,
+ im->sx,im->sy,im->colorsTotal > 16 ? 8:4,
+ PNG_COLOR_TYPE_PALETTE,
+ im->interlace ? PNG_INTERLACE_ADAM7: PNG_INTERLACE_NONE ,
+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ for(i=0;i<im->colorsTotal;i++){
+ palette[i].red = im->red[i];
+ palette[i].green = im->green[i];
+ palette[i].blue = im->blue[i];
+ }
+ png_set_PLTE(png_write_ptr, info_ptr, palette, im->colorsTotal);
+
+ /* choose between speed (1) and space (9) optimisation */
+ /* we want to be fast ... */
+ png_set_compression_level(png_write_ptr,1);
+ png_set_filter(png_write_ptr,PNG_FILTER_TYPE_BASE,PNG_NO_FILTERS);
+ /* store file info */
+ png_write_info(png_write_ptr, info_ptr);
+ png_set_packing(png_write_ptr);
+ png_write_image(png_write_ptr, im->pixels);
+ png_write_end(png_write_ptr, info_ptr);
+ png_free(png_write_ptr, palette);
+ png_destroy_write_struct(&png_write_ptr, &info_ptr);
+}
+
+
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_error.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_error.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_error.c Sat Jul 13 19:22:32 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_error.c Common Header File
*****************************************************************************
@@ -16,13 +16,14 @@
void
rrd_set_error(char *fmt, ...)
{
- int maxlen = strlen(fmt)*4;
+ static char buffer[4096];
va_list argp;
rrd_clear_error();
- rrd_error = malloc(sizeof(char)*maxlen);
va_start(argp, fmt);
- vsprintf(rrd_error, fmt, argp);
+ vsprintf(buffer, fmt, argp);
va_end(argp);
+ rrd_error = malloc(sizeof(char)*(strlen(buffer)+1));
+ strcpy(rrd_error, buffer);
}
int
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_fetch.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_fetch.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_fetch.c Sat Jul 13 19:22:32 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_fetch.c read date from an rrd to use for further processing
*****************************************************************************
@@ -24,32 +24,16 @@
{
- long step_tmp = 1, start_tmp = -24*3600, end_tmp=time(NULL);
+ long step_tmp =1;
+ time_t start_tmp=0, end_tmp=0;
enum cf_en cf_idx;
-#ifdef WANT_AT_STYLE_TIMESPEC
struct time_value start_tv, end_tv;
char *parsetime_error = NULL;
- int start_tmp_is_ok = 0,
- end_tmp_is_ok = 0;
- end_tv.type = ABSOLUTE_TIME;
- end_tv.tm = *localtime(&end_tmp);
- end_tv.offset = 0;
-
- start_tv.type = RELATIVE_TO_END_TIME;
- start_tv.tm = *localtime(&end_tmp); /* to init tm_zone and tm_gmtoff */
- start_tv.offset = -24*3600;/* to be compatible with the original code. */
- start_tv.tm.tm_sec = 0; /** alternatively we could set tm_mday to -1 */
- start_tv.tm.tm_min = 0; /** but this would yield -23(25) hours offset */
- start_tv.tm.tm_hour = 0; /** twice a year, when DST is coming in or */
- start_tv.tm.tm_mday = 0; /** out of effect */
- start_tv.tm.tm_mon = 0;
- start_tv.tm.tm_year = 0;
- start_tv.tm.tm_wday = 0;
- start_tv.tm.tm_yday = 0;
- start_tv.tm.tm_isdst = -1; /* for mktime to guess */
-#endif
+ /* init start and end time */
+ parsetime("end-24h", &start_tv);
+ parsetime("now", &end_tv);
while (1){
static struct option long_options[] =
@@ -69,45 +53,16 @@
switch(opt) {
case 's':
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- start_tmp_is_ok = 0;
- start_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (start_tmp > 31122038 || /* 31 Dec 2038 in DDMMYYYY */
- start_tmp < 0) {
- start_tmp_is_ok = 1;
- break;
- }
if ((parsetime_error = parsetime(optarg, &start_tv))) {
rrd_set_error( "start time: %s", parsetime_error );
return -1;
- }
- }
-#else
- start_tmp = atol(optarg);
-#endif
+ }
break;
case 'e':
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- end_tmp_is_ok = 0;
- end_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (end_tmp > 31122038) { /* 31 Dec 2038 in DDMMYYYY */
- end_tmp_is_ok = 1;
- break;
- }
if ((parsetime_error = parsetime(optarg, &end_tv))) {
rrd_set_error( "end time: %s", parsetime_error );
return -1;
- }
- }
-#else
- end_tmp = atol(optarg);
-#endif
+ }
break;
case 'r':
step_tmp = atol(optarg);
@@ -117,56 +72,12 @@
return(-1);
}
}
-#ifdef WANT_AT_STYLE_TIMESPEC
- if ((start_tv.type == RELATIVE_TO_END_TIME ||
- (start_tmp_is_ok && start_tmp < 0)) && /* same as the line above */
- end_tv.type == RELATIVE_TO_START_TIME) {
- rrd_set_error("the start and end times cannot be specified "
- "relative to each other");
- return(-1);
- }
-
- if (start_tv.type == RELATIVE_TO_START_TIME) {
- rrd_set_error("the start time cannot be specified relative to itself");
- return(-1);
- }
-
- if (end_tv.type == RELATIVE_TO_END_TIME) {
- rrd_set_error("the end time cannot be specified relative to itself");
- return(-1);
- }
-
- /* We don't care to keep all the values in their range,
- mktime will do this for us */
- if (start_tv.type == RELATIVE_TO_END_TIME) {
- if (end_tmp_is_ok)
- end_tv.tm = *localtime( &end_tmp );
- start_tv.tm.tm_sec += end_tv.tm.tm_sec;
- start_tv.tm.tm_min += end_tv.tm.tm_min;
- start_tv.tm.tm_hour += end_tv.tm.tm_hour;
- start_tv.tm.tm_mday += end_tv.tm.tm_mday;
- start_tv.tm.tm_mon += end_tv.tm.tm_mon;
- start_tv.tm.tm_year += end_tv.tm.tm_year;
- }
- if (end_tv.type == RELATIVE_TO_START_TIME) {
- if (start_tmp_is_ok)
- start_tv.tm = *localtime( &start_tmp );
- end_tv.tm.tm_sec += start_tv.tm.tm_sec;
- end_tv.tm.tm_min += start_tv.tm.tm_min;
- end_tv.tm.tm_hour += start_tv.tm.tm_hour;
- end_tv.tm.tm_mday += start_tv.tm.tm_mday;
- end_tv.tm.tm_mon += start_tv.tm.tm_mon;
- end_tv.tm.tm_year += start_tv.tm.tm_year;
- }
- if (!start_tmp_is_ok)
- start_tmp = mktime(&start_tv.tm) + start_tv.offset;
- if (!end_tmp_is_ok)
- end_tmp = mktime(&end_tv.tm) + end_tv.offset;
-#endif
- if (start_tmp <= 0)
- start_tmp = end_tmp + start_tmp;
+ if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
+ return -1;
+ }
+
if (start_tmp < 3600*24*365*10){
rrd_set_error("the first entry to fetch should be after 1980");
@@ -247,7 +158,9 @@
fclose(in_file);
return(-1);
}
- strncpy((*ds_namv)[i],rrd.ds_def[i].ds_nam,DS_NAM_SIZE);
+ strncpy((*ds_namv)[i],rrd.ds_def[i].ds_nam,DS_NAM_SIZE-1);
+ (*ds_namv)[i][DS_NAM_SIZE-1]='\0';
+
}
/* find the rra which best matches the requirements */
@@ -262,8 +175,8 @@
- (rrd.rra_def[i].pdp_cnt
* rrd.rra_def[i].row_cnt
* rrd.stat_head->pdp_step));
-
- full_match = *start - *end;
+
+ full_match = *end -*start;
/* best full match */
if(cal_end >= *end
&& cal_start <= *start){
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/gifsize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/gifsize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/gifsize.c Sat Jul 13 19:22:32 2002
@@ -0,0 +1,196 @@
+/****************************************************************************
+ * RRDtool Copyright Tobias Oetiker, 1997,1998, 1999
+ ****************************************************************************
+ * gifsize.c provides the function gifsize which determines the size of a gif
+ ****************************************************************************/
+
+/* This is built from code originally created by: */
+
+/* +-------------------------------------------------------------------+ */
+/* | Copyright 1990, 1991, 1993, David Koblas. (koblas at netcom.com) | */
+/* | Permission to use, copy, modify, and distribute this software | */
+/* | and its documentation for any purpose and without fee is hereby | */
+/* | granted, provided that the above copyright notice appear in all | */
+/* | copies and that both that copyright notice and this permission | */
+/* | notice appear in supporting documentation. This software is | */
+/* | provided "as is" without express or implied warranty. | */
+/* +-------------------------------------------------------------------+ */
+
+
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+
+
+#define MAXCOLORMAPSIZE 256
+
+#define TRUE 1
+#define FALSE 0
+
+#define CM_RED 0
+#define CM_GREEN 1
+#define CM_BLUE 2
+
+
+#define LOCALCOLORMAP 0x80
+#define BitSet(byte, bit) (((byte) & (bit)) == (bit))
+
+#define ReadOK(file,buffer,len) (fread(buffer, len, 1, file) != 0)
+
+#define LM_to_uint(a,b) (((b)<<8)|(a))
+
+
+static struct {
+ int transparent;
+ int delayTime;
+ int inputFlag;
+ int disposal;
+} Gif89 = { -1, -1, -1, 0 };
+
+static int ReadColorMap (FILE *fd, int number, unsigned char (*buffer)[256]);
+static int DoExtension (FILE *fd, int label, int *Transparent);
+static int GetDataBlock (FILE *fd, unsigned char *buf);
+
+int ZeroDataBlock;
+
+int
+GifSize(FILE *fd, long *width, long *height)
+{
+ int imageNumber;
+ int BitPixel;
+ int ColorResolution;
+ int Background;
+ int AspectRatio;
+ int Transparent = (-1);
+ unsigned char buf[16];
+ unsigned char c;
+ unsigned char ColorMap[3][MAXCOLORMAPSIZE];
+ int imageCount = 0;
+ char version[4];
+ ZeroDataBlock = FALSE;
+
+ imageNumber = 1;
+ if (! ReadOK(fd,buf,6)) {
+ return 0;
+ }
+ if (strncmp((char *)buf,"GIF",3) != 0) {
+ return 0;
+ }
+ strncpy(version, (char *)buf + 3, 3);
+ version[3] = '\0';
+
+ if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) {
+ return 0;
+ }
+ if (! ReadOK(fd,buf,7)) {
+ return 0;
+ }
+ BitPixel = 2<<(buf[4]&0x07);
+ ColorResolution = (int) (((buf[4]&0x70)>>3)+1);
+ Background = buf[5];
+ AspectRatio = buf[6];
+
+ if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */
+ if (ReadColorMap(fd, BitPixel, ColorMap)) {
+ return 0;
+ }
+ }
+ for (;;) {
+ if (! ReadOK(fd,&c,1)) {
+ return 0;
+ }
+ if (c == ';') { /* GIF terminator */
+ if (imageCount < imageNumber) {
+ return 0;
+ }
+ }
+
+ if (c == '!') { /* Extension */
+ if (! ReadOK(fd,&c,1)) {
+ return 0;
+ }
+ DoExtension(fd, c, &Transparent);
+ continue;
+ }
+
+ if (c != ',') { /* Not a valid start character */
+ continue;
+ }
+
+ ++imageCount;
+
+ if (! ReadOK(fd,buf,9)) {
+ return 0;
+ }
+
+ (*width) = LM_to_uint(buf[4],buf[5]);
+ (*height) = LM_to_uint(buf[6],buf[7]);
+ return 1;
+ }
+}
+
+static int
+ReadColorMap(FILE *fd, int number, unsigned char (*buffer)[256])
+{
+ int i;
+ unsigned char rgb[3];
+
+
+ for (i = 0; i < number; ++i) {
+ if (! ReadOK(fd, rgb, sizeof(rgb))) {
+ return TRUE;
+ }
+ buffer[CM_RED][i] = rgb[0] ;
+ buffer[CM_GREEN][i] = rgb[1] ;
+ buffer[CM_BLUE][i] = rgb[2] ;
+ }
+
+
+ return FALSE;
+}
+
+static int
+DoExtension(FILE *fd, int label, int *Transparent)
+{
+ static unsigned char buf[256];
+
+ switch (label) {
+ case 0xf9: /* Graphic Control Extension */
+ (void) GetDataBlock(fd, (unsigned char*) buf);
+ Gif89.disposal = (buf[0] >> 2) & 0x7;
+ Gif89.inputFlag = (buf[0] >> 1) & 0x1;
+ Gif89.delayTime = LM_to_uint(buf[1],buf[2]);
+ if ((buf[0] & 0x1) != 0)
+ *Transparent = buf[3];
+
+ while (GetDataBlock(fd, (unsigned char*) buf) != 0)
+ ;
+ return FALSE;
+ default:
+ break;
+ }
+ while (GetDataBlock(fd, (unsigned char*) buf) != 0)
+ ;
+
+ return FALSE;
+}
+
+static int
+GetDataBlock(FILE *fd, unsigned char *buf)
+{
+ unsigned char count;
+
+ if (! ReadOK(fd,&count,1)) {
+ return -1;
+ }
+
+ ZeroDataBlock = count == 0;
+
+ if ((count != 0) && (! ReadOK(fd, buf, count))) {
+ return -1;
+ }
+
+ return count;
+}
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsw Sat Jul 13 19:22:32 2002
@@ -3,7 +3,7 @@
###############################################################################
-Project: "gd"="..\gd1.2\gd.dsp" - Package Owner=<4>
+Project: "cgilib"="..\cgilib-0.4\cgilib.dsp" - Package Owner=<4>
Package=<5>
{{{
@@ -15,6 +15,36 @@
###############################################################################
+Project: "gd"="..\gd1.3\gd.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name png
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "png"="..\libpng-1.0.3\png.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name zlib
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
Package=<5>
@@ -23,6 +53,27 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name gd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "rrd_cgi"=".\rrd_cgi.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name cgilib
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name rrd
+ End Project Dependency
}}}
###############################################################################
@@ -31,6 +82,21 @@
Package=<5>
{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name rrd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "zlib"="..\zlib-1.1.3\zlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
}}}
Package=<4>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.in Sat Jul 13 19:22:32 2002
@@ -1,54 +1,468 @@
-# things that the GNU standards document suggests all makefiles
-# should have.
-SHELL = /bin/sh
-.SUFFIXES:
-.SUFFIXES: .c .o .pl .pm .pod .html .man
-
-# variables we got from configure
-# (you can mess with these, if you want)
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+#
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
CC = @CC@
-AR = ar
-CFLAGS_EXTRA = @CFLAGS_EXTRA@
CFLAGS = @CFLAGS@
-CFLAGS_ALL = $(CFLAGS) $(CFLAGS_EXTRA) -I.. -I../gd1.2 -DHAVE_CONFIG_H \
- -DWANT_AT_STYLE_TIMESPEC
-LDFLAGS = @LDFLAGS@
-LIBS = -L../gd1.2 -lgd @LIBS@
-LIBS_DEPEND = ../gd1.2/libgd.a
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+RANLIB = @RANLIB@
+
+CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
+GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@
+PNG_LIB_DIR = $(top_srcdir)/@PNG_LIB_DIR@
+ZLIB_LIB_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
+
+INCLUDES = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR)
+
+#COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
-###
-### Things you might NOT want to play with ...
-###
+RRD_C_FILES = gdpng.c getopt.c getopt1.c gifsize.c parsetime.c pngsize.c rrd_create.c rrd_diff.c rrd_dump.c rrd_error.c rrd_fetch.c rrd_format.c rrd_graph.c rrd_last.c rrd_open.c rrd_resize.c rrd_restore.c rrd_tune.c rrd_update.c getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h
-HEADERS = rrd_tool.h rrd_format.h getopt.h parsetime.h
-SRCLIB = rrd_fetch.c rrd_create.c rrd_dump.c rrd_graph.c rrd_tune.c\
- rrd_open.c rrd_diff.c rrd_last.c rrd_update.c rrd_format.c rrd_error.c\
- getopt.c getopt1.c parsetime.c rrd_resize.c
+# Build two libraries. One is a public one that gets installed in
+# $prefix/lib. Libtool does not create an archive of the PIC compiled
+# objects for this library type. The second library is a private one
+# meant to build the RRDs.so for perl-shared. In this case libtool
+# creates a ./.lib/*.al file that contains the PIC compiled object
+# files.
-SRC = $(SRCLIB) rrd_tool.c
+RRD_LIBS = $(CGI_LIB_DIR)/librrd_cgi.la $(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la $(ZLIB_LIB_DIR)/librrd_z.la
-OBJ = $(SRC:.c=.o)
-OBJLIB = $(SRCLIB:.c=.o)
-all: rrdtool librrd.a
+lib_LTLIBRARIES = librrd.la
+noinst_LTLIBRARIES = librrd_private.la
-rrdtool: $(OBJ) $(LIBS_DEPEND)
- $(CC) -o rrdtool $(OBJ) $(LDFLAGS) $(LIBS)
+librrd_la_SOURCES = $(RRD_C_FILES)
+librrd_private_la_SOURCES = $(RRD_C_FILES)
-librrd.a: $(OBJLIB)
- $(AR) rc librrd.a $(OBJLIB)
- @RANLIB@ librrd.a
+librrd_la_LIBADD = $(RRD_LIBS)
+librrd_private_la_LIBADD = $(RRD_LIBS)
+librrd_la_LDFLAGS = -version-info 0:0:0
-rrdtool.pure: $(OBJ) $(LIBS_DEPEND)
- purify $(CC) -o rrdtool.pure $(OBJ) $(LDFLAGS) $(LIBS)
+bin_PROGRAMS = rrdcgi rrdtool
-clean:
- -rm *.o *.a
+rrdcgi_SOURCES = rrd_cgi.c
+rrdcgi_LDADD = librrd.la
-realclean: clean
- -rm rrdtool rrdtool.pure
+rrdtool_SOURCES = rrd_tool.c
+rrdtool_LDADD = librrd.la
-.c.o: $(HEADERS)
- $(CC) $(CFLAGS_ALL) -c $<
+EXTRA_DIST = rrdtool.dsp rrdtool.dsw
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+librrd_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
+$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
+$(ZLIB_LIB_DIR)/librrd_z.la
+librrd_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
+parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
+rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo rrd_last.lo \
+rrd_open.lo rrd_resize.lo rrd_restore.lo rrd_tune.lo rrd_update.lo
+librrd_private_la_LDFLAGS =
+librrd_private_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
+$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
+$(ZLIB_LIB_DIR)/librrd_z.la
+librrd_private_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
+parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
+rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo rrd_last.lo \
+rrd_open.lo rrd_resize.lo rrd_restore.lo rrd_tune.lo rrd_update.lo
+PROGRAMS = $(bin_PROGRAMS)
+
+rrdcgi_OBJECTS = rrd_cgi.o
+rrdcgi_DEPENDENCIES = librrd.la
+rrdcgi_LDFLAGS =
+rrdtool_OBJECTS = rrd_tool.o
+rrdtool_DEPENDENCIES = librrd.la
+rrdtool_LDFLAGS =
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(librrd_la_SOURCES) $(librrd_private_la_SOURCES) $(rrdcgi_SOURCES) $(rrdtool_SOURCES)
+OBJECTS = $(librrd_la_OBJECTS) $(librrd_private_la_OBJECTS) $(rrdcgi_OBJECTS) $(rrdtool_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-libLTLIBRARIES:
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+
+distclean-libLTLIBRARIES:
+
+maintainer-clean-libLTLIBRARIES:
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(libdir)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+ else :; fi; \
+ done
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ done
+
+mostlyclean-noinstLTLIBRARIES:
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+
+distclean-noinstLTLIBRARIES:
+
+maintainer-clean-noinstLTLIBRARIES:
+
+.c.o:
+ $(COMPILE) -c $<
+
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
+mostlyclean-compile:
+ -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+ -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+librrd.la: $(librrd_la_OBJECTS) $(librrd_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
+
+librrd_private.la: $(librrd_private_la_OBJECTS) $(librrd_private_la_DEPENDENCIES)
+ $(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ else :; fi; \
+ done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_PROGRAMS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ done
+
+rrdcgi: $(rrdcgi_OBJECTS) $(rrdcgi_DEPENDENCIES)
+ @rm -f rrdcgi
+ $(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS)
+
+rrdtool: $(rrdtool_OBJECTS) $(rrdtool_DEPENDENCIES)
+ @rm -f rrdtool
+ $(LINK) $(rrdtool_LDFLAGS) $(rrdtool_OBJECTS) $(rrdtool_LDADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = src
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.3/png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h ../libpng-1.0.3/pngconf.h ../gd1.3/gd.h
+getopt.lo getopt.o : getopt.c ../config/config.h
+getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
+gifsize.lo gifsize.o : gifsize.c
+parsetime.lo parsetime.o : parsetime.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.3/png.h \
+ ../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
+ ../libpng-1.0.3/pngconf.h
+rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h parsetime.h getopt.h \
+ rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h
+rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h \
+ ../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
+rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
+ ../config/config.h parsetime.h getopt.h rrd_format.h \
+ ../gd1.3/gd.h
+rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h parsetime.h \
+ getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
+ parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS
+uninstall: uninstall-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-libLTLIBRARIES \
+ mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-binPROGRAMS \
+ mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-libLTLIBRARIES clean-noinstLTLIBRARIES clean-compile \
+ clean-libtool clean-binPROGRAMS clean-tags \
+ clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-libLTLIBRARIES distclean-noinstLTLIBRARIES \
+ distclean-compile distclean-libtool \
+ distclean-binPROGRAMS distclean-tags distclean-generic \
+ clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
+ maintainer-clean-noinstLTLIBRARIES \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-binPROGRAMS maintainer-clean-tags \
+ maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES \
+mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \
+distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
+uninstall-binPROGRAMS install-binPROGRAMS tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/getopt.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/getopt.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/getopt.c Sat Jul 13 19:22:32 2002
@@ -198,12 +198,14 @@
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
+/* we must include string as there are warnings without it ... */
+#include <string.h>
+
#ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble.
On some systems, it contains special magic macros that don't work
in GCC. */
-#include <string.h>
#define my_index strchr
#else
@@ -645,7 +647,7 @@
optarg = nameend + 1;
else
{
- if (opterr)
+ if (opterr) {
if (argv[optind - 1][1] == '-')
/* --option */
fprintf (stderr,
@@ -656,7 +658,7 @@
fprintf (stderr,
_("%s: option `%c%s' doesn't allow an argument\n"),
argv[0], argv[optind - 1][0], pfound->name);
-
+ }
nextchar += strlen (nextchar);
optopt = pfound->val;
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_format.h Sat Jul 13 19:22:33 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_format.h RRD Database Format header
*****************************************************************************/
@@ -22,13 +22,19 @@
#if defined(WIN32) || defined(_HPUX_SOURCE)
#define DNAN ((double)fmod(0.0,0.0))
+#define DINF ((double)log(0.0))
#else
#define DNAN ((double)(0.0/0.0)) /* we use a DNAN to
* represent the UNKNOWN
* */
+#define DINF ((double)(1.0/0.0)) /* we use a DINF to
+ * represent a value at the upper or
+ * lower border of the graph ...
+ * */
#endif
+
typedef double rrd_value_t; /* the data storage type is
* double */
@@ -268,6 +274,7 @@
pdp_prep_t *pdp_prep; /* pdp data prep area */
cdp_prep_t *cdp_prep; /* cdp prep area */
rra_ptr_t *rra_ptr; /* list of rra pointers */
+ rrd_value_t *rrd_value; /* list of rrd values */
} rrd_t;
/****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_resize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_resize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_resize.c Sat Jul 13 19:22:33 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_resize.c Alters size of an RRA
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_graph.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_graph.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_graph.c Sat Jul 13 19:22:33 2002
@@ -1,13 +1,17 @@
/****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997,1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997,1998, 1999
****************************************************************************
* rrd__graph.c make creates ne rrds
****************************************************************************/
#include "rrd_tool.h"
#include <gd.h>
-#include <gdfonts.h>
-#include <gdfontmb.h>
+#include <gdlucidan10.h>
+#include <gdlucidab12.h>
+#include <sys/stat.h>
+
+#define SmallFont gdLucidaNormal10
+#define LargeFont gdLucidaBold12
/* #define DEBUG */
@@ -26,10 +30,15 @@
enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE1,
GF_LINE2,GF_LINE3,GF_AREA,GF_STACK, GF_DEF, GF_CDEF };
-enum op_en {OP_NUMBER=0,OP_VARIABLE,OP_ADD,OP_SUB,OP_MUL,OP_DIV,OP_SIN,
+enum op_en {OP_NUMBER=0,OP_VARIABLE,OP_INF,OP_NEGINF,
+ OP_UNKN,OP_NOW,OP_TIME,OP_ADD,OP_MOD,
+ OP_SUB,OP_MUL,
+ OP_DIV,OP_SIN, OP_DUP, OP_EXC, OP_POP,
OP_COS,OP_LOG,OP_EXP,OP_LT,OP_LE,OP_GT,OP_GE,OP_EQ,OP_IF,
OP_UN,OP_END};
+enum if_en {IF_GIF=0,IF_PNG=1};
+
typedef struct rpnp_t {
enum op_en op;
double val; /* value for a OP_NUMBER */
@@ -131,8 +140,11 @@
/* this structure describes the elements which can make up a graph.
because they are quite diverse, not all elements will use all the
possible parts of the structure. */
-
-#define FMT_LEG_LEN 120
+#ifdef HAVE_SNPRINTF
+#define FMT_LEG_LEN 200
+#else
+#define FMT_LEG_LEN 2000
+#endif
typedef struct graph_desc_t {
enum gf_en gf; /* graphing function */
@@ -145,13 +157,13 @@
col_trip_t col; /* graph color */
char format[FMT_LEG_LEN+5]; /* format for PRINT AND GPRINT */
char legend[FMT_LEG_LEN+5]; /* legend*/
- gdPoint legloc; /* location of legend */
+ gdPoint legloc; /* location of legend */
double yrule; /* value for y rule line */
time_t xrule; /* value for x rule line */
- rpnp_t *rpnp; /* instructions for CDEF function */
+ rpnp_t *rpnp; /* instructions for CDEF function */
/* description of data fetched for the graph element */
- time_t start,end; /* first and last data element */
+ time_t start,end; /* timestaps for first and last data element */
unsigned long step; /* time between samples */
unsigned long ds_cnt; /* how many data sources are there in the fetch */
long data_first; /* first pointer to this data */
@@ -161,14 +173,16 @@
} graph_desc_t;
+#define ALTYGRID 0x01 /* use alternative y grid algorithm */
+#define ALTAUTOSCALE 0x02 /* use alternative algorithm to find lower and upper bounds */
typedef struct image_desc_t {
/* configuration of graph */
- char graphfile[255]; /* filename for graphic */
+ char graphfile[1024]; /* filename for graphic */
long xsize,ysize; /* graph area size in pixels */
- col_trip_t graph_col[__GRC_END__]; /* real colors for the graph */
+ col_trip_t graph_col[__GRC_END__]; /* real colors for the graph */
char ylegend[200]; /* legend along the yaxis */
char title[200]; /* title for graph */
xlab_t xlab_user; /* user defined labeling for xaxis */
@@ -181,19 +195,25 @@
rrd_value_t minval,maxval; /* extreme values in the data */
int rigid; /* do not expand range even with
values outside */
+ char* imginfo; /* construct an <IMG ... tag and return
+ as first retval */
+ int lazy; /* only update the gif if there is reasonable
+ probablility that the existing one is out of date */
int logarithmic; /* scale the yaxis logarithmic */
-
+ enum if_en imgformat; /* image format */
+
/* status information */
-
+
long xorigin,yorigin;/* where is (0,0) of the graph */
long xgif,ygif; /* total size of the gif */
int interlaced; /* will the graph be interlaced? */
double magfact; /* numerical magnitude*/
long base; /* 1000 or 1024 depending on what we graph */
char symbol; /* magnitude symbol for y-axis */
-
+ int extra_flags; /* flags for boolean options */
/* data elements */
+ long prt_c; /* number of print elements */
long gdes_c; /* number of graphics elements */
graph_desc_t *gdes; /* points to an array of graph elements */
@@ -202,7 +222,7 @@
-/* translate time values into x coordinates */
+/* translate time values into x coordinates */
/*#define xtr(x) (int)((double)im->xorigin \
+ ((double) im->xsize / (double)(im->end - im->start) ) \
* ((double)(x) - im->start)+0.5) */
@@ -283,6 +303,14 @@
return (-1);
}
+enum if_en if_conv(char *string){
+
+ conv_if(GIF,IF_GIF)
+ conv_if(PNG,IF_PNG)
+
+ return (-1);
+}
+
enum tmt_en tmt_conv(char *string){
conv_if(SECOND,TMT_SECOND)
@@ -336,31 +364,74 @@
return 0;
}
+/* find SI magnitude symbol for the given number*/
+void
+auto_scale(
+ image_desc_t *im, /* image description */
+ double *value,
+ char **symb_ptr,
+ double *magfact
+ )
+{
+
+ char *symbol[] = {"a", /* 10e-18 Ato */
+ "f", /* 10e-15 Femto */
+ "p", /* 10e-12 Pico */
+ "n", /* 10e-9 Nano */
+ "u", /* 10e-6 Micro */
+ "m", /* 10e-3 Milli */
+ " ", /* Base */
+ "k", /* 10e3 Kilo */
+ "M", /* 10e6 Mega */
+ "G", /* 10e9 Giga */
+ "T", /* 10e12 Terra */
+ "P", /* 10e15 Peta */
+ "E"};/* 10e18 Exa */
+
+ int symbcenter = 6;
+ int index;
+
+ if (*value == 0.0 || isnan(*value) ) {
+ index = 0;
+ *magfact = 1.0;
+ } else {
+ index = floor(log(fabs(*value))/log(im->base));
+ *magfact = pow(im->base, index);
+ (*value) /= (*magfact);
+ }
+ if ( index <= symbcenter && index >= -symbcenter) {
+ (*symb_ptr) = symbol[index+symbcenter];
+ }
+ else {
+ (*symb_ptr) = "?";
+ }
+}
+
+
/* find SI magnitude symbol for the numbers on the y-axis*/
void
si_unit(
image_desc_t *im /* image description */
)
{
-
+
char symbol[] = {'a', /* 10e-18 Ato */
- 'f', /* 10e-15 Femto */
- 'p', /* 10e-12 Pico */
- 'n', /* 10e-9 Nano */
- 'µ', /* 10e-6 Micro */
- 'm', /* 10e-3 Milli */
- ' ', /* Base */
- 'k', /* 10e3 Kilo */
- 'M', /* 10e6 Mega */
- 'G', /* 10e9 Giga */
- 'T', /* 10e12 Terra */
- 'P', /* 10e15 Peta */
- 'E'};/* 10e18 Exa */
+ 'f', /* 10e-15 Femto */
+ 'p', /* 10e-12 Pico */
+ 'n', /* 10e-9 Nano */
+ 'u', /* 10e-6 Micro */
+ 'm', /* 10e-3 Milli */
+ ' ', /* Base */
+ 'k', /* 10e3 Kilo */
+ 'M', /* 10e6 Mega */
+ 'G', /* 10e9 Giga */
+ 'T', /* 10e12 Terra */
+ 'P', /* 10e15 Peta */
+ 'E'};/* 10e18 Exa */
int symbcenter = 6;
double digits;
-
digits = floor( log( max( fabs(im->minval),fabs(im->maxval)))/log(im->base));
im->magfact = pow(im->base , digits);
#ifdef DEBUG
@@ -388,36 +459,57 @@
0.8,0.7,0.6,0.5,0.4,0.3,0.2,0.1,0.0,-1};
double scaled_min,scaled_max;
+ double adj;
int i;
- scaled_min = im->minval / im->magfact;
- scaled_max = im->maxval / im->magfact;
-
+
#ifdef DEBUG
printf("Min: %6.2f Max: %6.2f MagFactor: %6.2f\n",
im->minval,im->maxval,im->magfact);
#endif
-
- for (i=1; sensiblevalues[i] > 0; i++){
- if (sensiblevalues[i-1]>=scaled_min &&
- sensiblevalues[i]<=scaled_min)
- im->minval = sensiblevalues[i]*(im->magfact);
-
- if (-sensiblevalues[i-1]<=scaled_min &&
- -sensiblevalues[i]>=scaled_min)
- im->minval = -sensiblevalues[i-1]*(im->magfact);
-
- if (sensiblevalues[i-1] >= scaled_max &&
- sensiblevalues[i] <= scaled_max)
- im->maxval = sensiblevalues[i-1]*(im->magfact);
-
- if (-sensiblevalues[i-1]<=scaled_max &&
- -sensiblevalues[i] >=scaled_max)
- im->maxval = -sensiblevalues[i]*(im->magfact);
+
+ if (isnan(im->ygridstep)){
+ if(im->extra_flags & ALTAUTOSCALE) {
+ /* measure the amplitude of the function. Make sure that
+ graph boundaries are slightly higher then max/min vals
+ so we can see amplitude on the graph */
+ adj = (im->maxval - im->minval) * 0.1;
+ im->minval -= adj;
+ im->maxval += adj;
+ }
+ else {
+ scaled_min = im->minval / im->magfact;
+ scaled_max = im->maxval / im->magfact;
+
+ for (i=1; sensiblevalues[i] > 0; i++){
+ if (sensiblevalues[i-1]>=scaled_min &&
+ sensiblevalues[i]<=scaled_min)
+ im->minval = sensiblevalues[i]*(im->magfact);
+
+ if (-sensiblevalues[i-1]<=scaled_min &&
+ -sensiblevalues[i]>=scaled_min)
+ im->minval = -sensiblevalues[i-1]*(im->magfact);
+
+ if (sensiblevalues[i-1] >= scaled_max &&
+ sensiblevalues[i] <= scaled_max)
+ im->maxval = sensiblevalues[i-1]*(im->magfact);
+
+ if (-sensiblevalues[i-1]<=scaled_max &&
+ -sensiblevalues[i] >=scaled_max)
+ im->maxval = -sensiblevalues[i]*(im->magfact);
+ }
+ }
+ } else {
+ /* adjust min and max to the grid definition if there is one */
+ im->minval = (double)im->ylabfact * im->ygridstep *
+ floor(im->minval / ((double)im->ylabfact * im->ygridstep));
+ im->maxval = (double)im->ylabfact * im->ygridstep *
+ ceil(im->maxval /( (double)im->ylabfact * im->ygridstep));
}
+
#ifdef DEBUG
- printf("SCALED Min: %6.2f Max: %6.2f Factor: %6.2f\n",
+ fprintf(stderr,"SCALED Min: %6.2f Max: %6.2f Factor: %6.2f\n",
im->minval,im->maxval,im->magfact);
#endif
}
@@ -431,38 +523,46 @@
time_t *start,
time_t *end, /* which time frame do you want ?
* will be changed to represent reality */
- unsigned long *step, /* step the data currently is in */
+ unsigned long *step, /* desired step size. Will be adjusted to new increassed step size */
unsigned long *ds_cnt, /* number of data sources in file */
rrd_value_t **data) /* two dimensional array containing the data */
{
- int i,reduce_factor = ceil((double)*step / cur_step);
- unsigned long src_row,trg_row,col,row_cnt,start_offset,rowadjust;
- row_cnt = (*end-*start)/cur_step;
+ int i,reduce_factor = ceil((double)(*step) / (double)cur_step);
+ unsigned long src_row,trg_row,col,row_cnt,start_offset,skiprows=0;
- *step = cur_step*reduce_factor;
+ (*step) = cur_step*reduce_factor; /* set new step size for reduced data */
/* adjust the start time so that it is a multiple of the new steptime */
+
+ row_cnt = ((*end)-(*start))/cur_step+1; /* +1 because start and end are pointers to first and last entry */
- start_offset = *start % *step;
+ start_offset = (*start) % (*step);
+ /* move the start pointer into the past so that the reduced data set
+ fully covers the timespan of the new dataset */
+ (*start) -= start_offset;
+
+ trg_row=0;
+ /* skip the first <skiprows> of original data because we already covered
+ by the row of *unknown* data added to the reduced dataset */
+
+ skiprows = ((*step) - start_offset) / cur_step;
+
if (start_offset > 0) {
- start_offset = *step - start_offset;
- *start = *start + start_offset - *step;
- /* we don't have any data for the first row, so fill it with
- *UNKNOWN* */
- for (col=0;col<*ds_cnt;col++)
+ /* we don't have full data for the first row, so we'll ditch
+ what is there and fill it with *UNKNOWN* */
+ for (col=0;col<(*ds_cnt);col++) {
(*data)[col] = DNAN;
- }
-
-
- rowadjust = start_offset / cur_step;
-
- trg_row=0;
+ }
+ trg_row++; /* one row of target filled already */
+
+ };
+
- for (src_row = rowadjust; src_row <= row_cnt-reduce_factor; src_row+=reduce_factor) {
- for (col=0;col<*ds_cnt;col++){
+ for (src_row = skiprows; src_row < row_cnt; src_row+=reduce_factor) {
+ for (col=0;col<(*ds_cnt);col++){
double newval=0;
unsigned long validval=0;
- for (i=0;i<reduce_factor && src_row<row_cnt;i += reduce_factor) {
- unsigned long ptr = (src_row+i)* *ds_cnt+col;
+ for (i=0;i<reduce_factor && src_row+i<row_cnt;i++) {
+ unsigned long ptr = (src_row+i)* (*ds_cnt)+col;
if (isnan((*data)[ptr])) continue; /* we can't help with NAN */
validval++;
switch (cf) {
@@ -491,12 +591,13 @@
break;
}
}
- (*data)[(trg_row)* *ds_cnt+col] = newval;
+ (*data)[(trg_row)* (*ds_cnt)+col] = newval;
}
trg_row++;
}
- *end = *start+ *step *trg_row;
- for (col=0;col<*ds_cnt;col++){
+ *end = (*start) + (*step) * (trg_row);
+ /* make sure there is some NAN at the end of the graph */
+ for (col=0;col<(*ds_cnt);col++){
(*data)[(trg_row)* *ds_cnt+col] = DNAN;
}
}
@@ -629,22 +730,16 @@
rpnp=NULL;
while(*expr){
- if ((rpnp = (rpnp_t *) realloc(rpnp, (++steps + 2)*
+ if ((rpnp = (rpnp_t *) rrd_realloc(rpnp, (++steps + 2)*
sizeof(rpnp_t)))==NULL){
return NULL;
}
-
- if(sscanf(expr,"%lf%n",&rpnp[steps].val,&pos) == 1){
+
+ else if(sscanf(expr,"%lf%n",&rpnp[steps].val,&pos) == 1){
rpnp[steps].op = OP_NUMBER;
expr+=pos;
}
- else if ((sscanf(expr,"%29[_A-Za-z0-9]%n",
- vname,&pos) == 1)
- && ((rpnp[steps].ptr = find_var(im,vname)) != -1)){
- rpnp[steps].op = OP_VARIABLE;
- expr+=pos;
- }
-
+
#define match_op(VV,VVV) \
else if (strncmp(expr, #VVV, strlen(#VVV))==0){ \
rpnp[steps].op = VV; \
@@ -655,20 +750,38 @@
match_op(OP_SUB,-)
match_op(OP_MUL,*)
match_op(OP_DIV,/)
+ match_op(OP_MOD,%)
match_op(OP_SIN,SIN)
match_op(OP_COS,COS)
match_op(OP_LOG,LOG)
match_op(OP_EXP,EXP)
+ match_op(OP_DUP,DUP)
+ match_op(OP_EXC,EXC)
+ match_op(OP_POP,POP)
match_op(OP_LT,LT)
match_op(OP_LE,LE)
match_op(OP_GT,GT)
match_op(OP_GE,GE)
match_op(OP_EQ,EQ)
match_op(OP_IF,IF)
+ /* order is important here ! .. match longest first */
+ match_op(OP_UNKN,UNKN)
match_op(OP_UN,UN)
-
+ match_op(OP_NEGINF,NEGINF)
+ match_op(OP_INF,INF)
+ match_op(OP_NOW,NOW)
+ match_op(OP_TIME,TIME)
+
#undef match_op
+
+ else if ((sscanf(expr,"%29[_A-Za-z0-9]%n",
+ vname,&pos) == 1)
+ && ((rpnp[steps].ptr = find_var(im,vname)) != -1)){
+ rpnp[steps].op = OP_VARIABLE;
+ expr+=pos;
+ }
+
else {
free(rpnp);
return NULL;
@@ -687,7 +800,7 @@
}
-#define dc_stacksize 30
+#define dc_stackblock 100
/* run the rpn calculator on all the CDEF arguments */
@@ -699,6 +812,8 @@
long *steparray;
int stepcnt;
time_t now;
+ double *stack = NULL;
+ long dc_stacksize = 0;
for (gdi=0;gdi<im->gdes_c;gdi++){
/* only GF_CDEF elements are of interest */
@@ -720,8 +835,9 @@
for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
long ptr = im->gdes[gdi].rpnp[rpi].ptr;
- if ((steparray = realloc(steparray, (++stepcnt+1)*sizeof(double)))==NULL){
+ if ((steparray = rrd_realloc(steparray, (++stepcnt+1)*sizeof(double)))==NULL){
rrd_set_error("realloc steparray");
+ free(stack);
return -1;
};
@@ -751,6 +867,7 @@
}
if(steparray == NULL){
rrd_set_error("rpn expressions without variables are not supported");
+ free(stack);
return -1;
}
steparray[stepcnt]=0;
@@ -767,6 +884,7 @@
/ im->gdes[gdi].step +1)
* sizeof(double)))==NULL){
rrd_set_error("malloc im->gdes[gdi].data");
+ free(stack);
return -1;
}
@@ -774,23 +892,22 @@
for (now = im->gdes[gdi].start;
now<=im->gdes[gdi].end;
now += im->gdes[gdi].step){
- double stack[dc_stacksize];
- int stptr=-1;
+ long stptr=-1;
/* process each op from the rpn in turn */
for (rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
- switch (im->gdes[gdi].rpnp[rpi].op){
- case OP_NUMBER:
- if(stptr>=dc_stacksize){
+ if (stptr +5 > dc_stacksize){
+ dc_stacksize += dc_stackblock;
+ stack = rrd_realloc(stack,dc_stacksize*sizeof(long));
+ if (stack==NULL){
rrd_set_error("RPN stack overflow");
return -1;
}
+ }
+ switch (im->gdes[gdi].rpnp[rpi].op){
+ case OP_NUMBER:
stack[++stptr] = im->gdes[gdi].rpnp[rpi].val;
break;
case OP_VARIABLE:
- if(stptr>=dc_stacksize){
- rrd_set_error("RPN stack overflow");
- return -1;
- }
/* make sure we pull the correct value from the *.data array */
/* adjust the pointer into the array acordingly. */
if(now > im->gdes[gdi].start &&
@@ -800,9 +917,25 @@
}
stack[++stptr] = *im->gdes[gdi].rpnp[rpi].data;
break;
+ case OP_UNKN:
+ stack[++stptr] = DNAN;
+ break;
+ case OP_INF:
+ stack[++stptr] = DINF;
+ break;
+ case OP_NEGINF:
+ stack[++stptr] = -DINF;
+ break;
+ case OP_NOW:
+ stack[++stptr] = (double)time(NULL);
+ break;
+ case OP_TIME:
+ stack[++stptr] = (double)now;
+ break;
case OP_ADD:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] + stack[stptr];
@@ -811,6 +944,7 @@
case OP_SUB:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] - stack[stptr];
@@ -819,6 +953,7 @@
case OP_MUL:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] * stack[stptr];
@@ -827,14 +962,25 @@
case OP_DIV:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] / stack[stptr];
stptr--;
break;
+ case OP_MOD:
+ if(stptr<1){
+ rrd_set_error("RPN stack underflow");
+ free(stack);
+ return -1;
+ }
+ stack[stptr-1] = fmod(stack[stptr-1],stack[stptr]);
+ stptr--;
+ break;
case OP_SIN:
if(stptr<0){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr] = sin(stack[stptr]);
@@ -842,6 +988,7 @@
case OP_COS:
if(stptr<0){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr] = cos(stack[stptr]);
@@ -849,13 +996,44 @@
case OP_LOG:
if(stptr<0){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr] = log(stack[stptr]);
break;
+ case OP_DUP:
+ if(stptr<0){
+ rrd_set_error("RPN stack underflow");
+ free(stack);
+ return -1;
+ }
+ stack[stptr+1] = stack[stptr];
+ stptr++;
+ break;
+ case OP_POP:
+ if(stptr<0){
+ rrd_set_error("RPN stack underflow");
+ free(stack);
+ return -1;
+ }
+ stptr--;
+ break;
+ case OP_EXC:
+ if(stptr<1){
+ rrd_set_error("RPN stack underflow");
+ free(stack);
+ return -1;
+ } else {
+ double dummy;
+ dummy = stack[stptr] ;
+ stack[stptr] = stack[stptr-1];
+ stack[stptr-1] = dummy;
+ }
+ break;
case OP_EXP:
if(stptr<0){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr] = exp(stack[stptr]);
@@ -863,6 +1041,7 @@
case OP_LT:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] < stack[stptr] ? 1.0 : 0.0;
@@ -871,6 +1050,7 @@
case OP_LE:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] <= stack[stptr] ? 1.0 : 0.0;
@@ -879,6 +1059,7 @@
case OP_GT:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] > stack[stptr] ? 1.0 : 0.0;
@@ -887,6 +1068,7 @@
case OP_GE:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] >= stack[stptr] ? 1.0 : 0.0;
@@ -895,6 +1077,7 @@
case OP_EQ:
if(stptr<1){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-1] = stack[stptr-1] == stack[stptr] ? 1.0 : 0.0;
@@ -903,6 +1086,7 @@
case OP_IF:
if(stptr<2){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr-2] = stack[stptr-2] != 0.0 ? stack[stptr-1] : stack[stptr];
@@ -912,6 +1096,7 @@
case OP_UN:
if(stptr<0){
rrd_set_error("RPN stack underflow");
+ free(stack);
return -1;
}
stack[stptr] = isnan(stack[stptr]) ? 1.0 : 0.0;
@@ -922,13 +1107,16 @@
}
if(stptr!=0){
rrd_set_error("RPN final stack size != 1");
+ free(stack);
return -1;
}
im->gdes[gdi].data[++dataidx] = stack[0];
}
}
+ free(stack);
return 0;
}
+
#undef dc_stacksize
/* massage data so, that we get one value for each x coordinate in the graph */
@@ -965,6 +1153,7 @@
paintval=0.0;
for(ii=0;ii<im->gdes_c;ii++){
+ double value;
switch(im->gdes[ii].gf){
case GF_LINE1:
case GF_LINE2:
@@ -973,21 +1162,27 @@
paintval = 0.0;
case GF_STACK:
vidx = im->gdes[ii].vidx;
- paintval +=
+
+ value =
im->gdes[vidx].data[
- (unsigned long)(
- (double)(gr_time
- - im->gdes[vidx].start + im->gdes[vidx].step
- )
- / (double)im->gdes[vidx].step
- )
-
- *im->gdes[vidx].ds_cnt
- +im->gdes[vidx].ds];
+ ((unsigned long)floor(
+ (gr_time - im->gdes[vidx].start )
+ / im->gdes[vidx].step)+1)
+
+ /* added one because data was not being aligned properly
+ this fixes it. We may also be having a problem in fetch ... */
+
+ *im->gdes[vidx].ds_cnt
+ +im->gdes[vidx].ds];
+
+ if (! isnan(value)) {
+ paintval += value;
+ im->gdes[ii].p_data[i] = paintval;
+ } else {
+ im->gdes[ii].p_data[i] = DNAN;
+ }
- im->gdes[ii].p_data[i] = paintval;
-
- if (! isnan(paintval)){
+ if (finite(paintval)){
if (isnan(minval) || paintval < minval)
minval = paintval;
if (isnan(maxval) || paintval > maxval)
@@ -1053,48 +1248,48 @@
long basestep /* how many if these do we jump a time */
)
{
- struct tm *tm;
- tm = localtime(&start);
+ struct tm tm;
+ tm = *localtime(&start);
switch(baseint){
case TMT_SECOND:
- tm->tm_sec -= tm->tm_sec % basestep; break;
+ tm.tm_sec -= tm.tm_sec % basestep; break;
case TMT_MINUTE:
- tm->tm_sec=0;
- tm->tm_min -= tm->tm_min % basestep;
+ tm.tm_sec=0;
+ tm.tm_min -= tm.tm_min % basestep;
break;
case TMT_HOUR:
- tm->tm_sec=0;
- tm->tm_min = 0;
- tm->tm_hour -= tm->tm_hour % basestep; break;
+ tm.tm_sec=0;
+ tm.tm_min = 0;
+ tm.tm_hour -= tm.tm_hour % basestep; break;
case TMT_DAY:
/* we do NOT look at the basestep for this ... */
- tm->tm_sec=0;
- tm->tm_min = 0;
- tm->tm_hour = 0; break;
+ tm.tm_sec=0;
+ tm.tm_min = 0;
+ tm.tm_hour = 0; break;
case TMT_WEEK:
/* we do NOT look at the basestep for this ... */
- tm->tm_sec=0;
- tm->tm_min = 0;
- tm->tm_hour = 0;
- tm->tm_mday -= tm->tm_wday -1 ; break; /* -1 because we want the monday */
- if (tm->tm_wday==0) tm->tm_mday -= 7; /* we want the *previous* monday */
+ tm.tm_sec=0;
+ tm.tm_min = 0;
+ tm.tm_hour = 0;
+ tm.tm_mday -= tm.tm_wday -1 ; break; /* -1 because we want the monday */
+ if (tm.tm_wday==0) tm.tm_mday -= 7; /* we want the *previous* monday */
case TMT_MONTH:
- tm->tm_sec=0;
- tm->tm_min = 0;
- tm->tm_hour = 0;
- tm->tm_mday = 1;
- tm->tm_mon -= tm->tm_mon % basestep; break;
+ tm.tm_sec=0;
+ tm.tm_min = 0;
+ tm.tm_hour = 0;
+ tm.tm_mday = 1;
+ tm.tm_mon -= tm.tm_mon % basestep; break;
case TMT_YEAR:
- tm->tm_sec=0;
- tm->tm_min = 0;
- tm->tm_hour = 0;
- tm->tm_mday = 1;
- tm->tm_mon = 0;
- tm->tm_year -= (tm->tm_year+1900) % basestep;
+ tm.tm_sec=0;
+ tm.tm_min = 0;
+ tm.tm_hour = 0;
+ tm.tm_mday = 1;
+ tm.tm_mon = 0;
+ tm.tm_year -= (tm.tm_year+1900) % basestep;
}
- return mktime(tm);
+ return mktime(&tm);
}
/* identify the point where the next gridline, label ... gets placed */
time_t
@@ -1104,27 +1299,27 @@
long basestep /* how many if these do we jump a time */
)
{
- struct tm *tm;
+ struct tm tm;
time_t madetime;
- tm = localtime(¤t);
+ tm = *localtime(¤t);
do {
switch(baseint){
case TMT_SECOND:
- tm->tm_sec += basestep; break;
+ tm.tm_sec += basestep; break;
case TMT_MINUTE:
- tm->tm_min += basestep; break;
+ tm.tm_min += basestep; break;
case TMT_HOUR:
- tm->tm_hour += basestep; break;
+ tm.tm_hour += basestep; break;
case TMT_DAY:
- tm->tm_mday += basestep; break;
+ tm.tm_mday += basestep; break;
case TMT_WEEK:
- tm->tm_mday += 7*basestep; break;
+ tm.tm_mday += 7*basestep; break;
case TMT_MONTH:
- tm->tm_mon += basestep; break;
+ tm.tm_mon += basestep; break;
case TMT_YEAR:
- tm->tm_year += basestep;
+ tm.tm_year += basestep;
}
- madetime = mktime(tm);
+ madetime = mktime(&tm);
} while (madetime == -1); /* this is necessary to skip impssible times
like the daylight saving time skips */
return madetime;
@@ -1177,12 +1372,16 @@
int graphelement = 0;
long vidx;
int max_ii;
+ double magfact = -1;
+ char *si_symb = "";
+ char *percent_s;
int prlines = 1;
+ if (im->imginfo) prlines++;
for(i=0;i<im->gdes_c;i++){
switch(im->gdes[i].gf){
case GF_PRINT:
prlines++;
- if((*prdata = realloc(*prdata,prlines*sizeof(char *)))==NULL){
+ if(((*prdata) = rrd_realloc((*prdata),prlines*sizeof(char *)))==NULL){
rrd_set_error("realloc prdata");
return 0;
}
@@ -1197,14 +1396,14 @@
for(ii=im->gdes[vidx].ds;
ii < max_ii;
ii+=im->gdes[vidx].ds_cnt){
- if (isnan(im->gdes[vidx].data[ii]))
+ if (! finite(im->gdes[vidx].data[ii]))
continue;
if (isnan(printval)){
printval = im->gdes[vidx].data[ii];
validsteps++;
continue;
}
-
+
switch (im->gdes[i].cf){
case CF_AVERAGE:
validsteps++;
@@ -1220,17 +1419,45 @@
printval = im->gdes[vidx].data[ii];
}
}
- if (im->gdes[i].cf == CF_AVERAGE)
- if (validsteps > 1) {
- printval = (printval / validsteps);
- }
+ if (im->gdes[i].cf == CF_AVERAGE) {
+ if (validsteps > 1) {
+ printval = (printval / validsteps);
+ }
+ }
+ if ((percent_s = strstr(im->gdes[i].format,"%S")) != NULL) {
+ /* Magfact is set to -1 upon entry to print_calc. If it
+ * is still less than 0, then we need to run auto_scale.
+ * Otherwise, put the value into the correct units. If
+ * the value is 0, then do not set the symbol or magnification
+ * so next the calculation will be performed again. */
+ if (magfact < 0.0) {
+ auto_scale(im,&printval,&si_symb,&magfact);
+ if (printval == 0.0)
+ magfact = -1.0;
+ } else {
+ printval /= magfact;
+ }
+ *(++percent_s) = 's';
+ }
+ else if (strstr(im->gdes[i].format,"%s") != NULL) {
+ auto_scale(im,&printval,&si_symb,&magfact);
+ }
if (im->gdes[i].gf == GF_PRINT){
- (*prdata)[prlines-2] = malloc((strlen(im->gdes[i].format)+100)*sizeof(char));
- sprintf((*prdata)[prlines-2],im->gdes[i].format,printval);
+ (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
+#ifdef HAVE_SNPRINTF
+ snprintf((*prdata)[prlines-2],FMT_LEG_LEN,im->gdes[i].format,printval,si_symb);
+#else
+ sprintf((*prdata)[prlines-2],im->gdes[i].format,printval,si_symb);
+#endif
(*prdata)[prlines-1] = NULL;
} else {
/* GF_GPRINT */
- sprintf(im->gdes[i].legend,im->gdes[i].format,printval);
+
+#ifdef HAVE_SNPRINTF
+ snprintf(im->gdes[i].legend,FMT_LEG_LEN-2,im->gdes[i].format,printval,si_symb);
+#else
+ sprintf(im->gdes[i].legend,im->gdes[i].format,printval,si_symb);
+#endif
graphelement = 1;
}
break;
@@ -1242,9 +1469,10 @@
case GF_STACK:
case GF_HRULE:
case GF_VRULE:
+ graphelement = 1;
+ break;
case GF_DEF:
case GF_CDEF:
- graphelement = 1;
break;
}
}
@@ -1258,9 +1486,9 @@
{
/* graph labels */
- int interleg = gdFontSmall->w*2;
- int box = gdFontSmall->h*1.2;
- int border = gdFontSmall->w*2;
+ int interleg = SmallFont->w*2;
+ int box = SmallFont->h*1.2;
+ int border = SmallFont->w*2;
int fill=0, fill_last;
int leg_c = 0;
int leg_x = border, leg_y = im->ygif;
@@ -1289,7 +1517,7 @@
if (im->gdes[i].gf != GF_GPRINT &&
im->gdes[i].gf != GF_COMMENT)
fill += box;
- fill += leg_cc * gdFontSmall->w;
+ fill += leg_cc * SmallFont->w;
leg_c++;
}
@@ -1316,7 +1544,7 @@
leg_x = border;
if (leg_c >= 2 && prt_fctn == 'j') {
glue = (im->xgif - fill - 2* border) / (leg_c-1);
- /* if (glue > 2 * gdFontSmall->w) glue = 0; */
+ /* if (glue > 2 * SmallFont->w) glue = 0; */
} else {
glue = 0;
}
@@ -1329,21 +1557,21 @@
im->gdes[ii].legloc.x = leg_x;
im->gdes[ii].legloc.y = leg_y;
leg_x = leg_x
- + strlen(im->gdes[ii].legend)*gdFontSmall->w
+ + strlen(im->gdes[ii].legend)*SmallFont->w
+ interleg
+ glue;
if (im->gdes[ii].gf != GF_GPRINT &&
im->gdes[ii].gf != GF_COMMENT)
leg_x += box;
}
- leg_y = leg_y + gdFontSmall->h*1.2;
- if (prt_fctn == 's') leg_y += gdFontSmall->h *0.5;
+ leg_y = leg_y + SmallFont->h*1.2;
+ if (prt_fctn == 's') leg_y -= SmallFont->h *0.5;
fill = 0;
leg_c = 0;
mark = ii;
}
}
- im->ygif = leg_y+(border+3);
+ im->ygif = leg_y+6;
}
@@ -1361,7 +1589,9 @@
gdPoint polyPoints[4];
int labfact,gridind;
int styleMinor[2],styleMajor[2];
-
+ int decimals, fractionals;
+ char labfmt[64];
+
labfact=2;
gridind=-1;
range = im->maxval - im->minval;
@@ -1382,22 +1612,53 @@
/* find grid spaceing */
pixel=1;
if(isnan(im->ygridstep)){
- for(i=0;ylab[i].grid > 0;i++){
- pixel = im->ysize / (scaledrange / ylab[i].grid);
- if (gridind == -1 && pixel > 5) {
- gridind = i;
- break;
+ if(im->extra_flags & ALTYGRID) {
+ /* find the value with max number of digits. Get number of digits */
+ decimals = ceil(log10(max(fabs(im->maxval), fabs(im->minval))));
+ if(decimals <= 0) /* everything is small. make place for zero */
+ decimals = 1;
+
+ fractionals = floor(log10(range));
+ if(fractionals < 0) /* small amplitude. */
+ sprintf(labfmt, "%%%d.%df", decimals - fractionals + 1, -fractionals + 1);
+ else
+ sprintf(labfmt, "%%%d.1f", decimals + 1);
+ gridstep = pow(10, fractionals);
+ if(gridstep == 0) /* range is one -> 0.1 is reasonable scale */
+ gridstep = 0.1;
+ /* should have at least 5 lines but no more then 15 */
+ if(range/gridstep < 5)
+ gridstep /= 10;
+ if(range/gridstep > 15)
+ gridstep *= 10;
+ if(range/gridstep > 5) {
+ labfact = 1;
+ if(range/gridstep > 8)
+ labfact = 2;
+ }
+ else {
+ gridstep /= 5;
+ labfact = 5;
}
}
-
- for(i=0; i<4;i++) {
- if (pixel * ylab[gridind].lfac[i] >= 2 * gdFontSmall->h) {
- labfact = ylab[gridind].lfac[i];
- break;
- }
- }
-
- gridstep = ylab[gridind].grid * im->magfact;
+ else {
+ for(i=0;ylab[i].grid > 0;i++){
+ pixel = im->ysize / (scaledrange / ylab[i].grid);
+ if (gridind == -1 && pixel > 5) {
+ gridind = i;
+ break;
+ }
+ }
+
+ for(i=0; i<4;i++) {
+ if (pixel * ylab[gridind].lfac[i] >= 2 * SmallFont->h) {
+ labfact = ylab[gridind].lfac[i];
+ break;
+ }
+ }
+
+ gridstep = ylab[gridind].grid * im->magfact;
+ }
} else {
gridstep = im->ygridstep;
labfact = im->ylabfact;
@@ -1415,7 +1676,12 @@
if(i % labfact == 0){
if (i==0 || im->symbol == ' ') {
if(scaledstep < 1){
- sprintf(graph_label,"%4.1f",scaledstep*i);
+ if(im->extra_flags & ALTYGRID) {
+ sprintf(graph_label,labfmt,scaledstep*i);
+ }
+ else {
+ sprintf(graph_label,"%4.1f",scaledstep*i);
+ }
} else {
sprintf(graph_label,"%4.0f",scaledstep*i);
}
@@ -1427,10 +1693,10 @@
}
}
- gdImageString(gif, gdFontSmall,
+ gdImageString(gif, SmallFont,
(polyPoints[0].x - (strlen(graph_label) *
- gdFontSmall->w)-7),
- polyPoints[0].y - gdFontSmall->h/2+1,
+ SmallFont->w)-7),
+ polyPoints[0].y - SmallFont->h/2+1,
graph_label, graph_col[GRC_FONT].i);
gdImageSetStyle(gif, styleMajor, 2);
@@ -1488,7 +1754,7 @@
}
pixperstep = pixpex * minstep;
if(pixperstep > 5){minoridx = i;}
- if(pixperstep > 2 * gdFontSmall->h){majoridx = i;}
+ if(pixperstep > 2 * SmallFont->h){majoridx = i;}
}
styleMinor[0] = graph_col[GRC_GRID].i;
@@ -1539,10 +1805,10 @@
gdImageLine(gif, polyPoints[0].x,polyPoints[0].y,
polyPoints[1].x,polyPoints[0].y,gdStyled);
sprintf(graph_label,"%3.0e",value * yloglab[majoridx][i]);
- gdImageString(gif, gdFontSmall,
+ gdImageString(gif, SmallFont,
(polyPoints[0].x - (strlen(graph_label) *
- gdFontSmall->w)-7),
- polyPoints[0].y - gdFontSmall->h/2+1,
+ SmallFont->w)-7),
+ polyPoints[0].y - SmallFont->h/2+1,
graph_label, graph_col[GRC_FONT].i);
}
}
@@ -1647,11 +1913,11 @@
#else
# error "your libc has no strftime I guess we'll abort the exercise here."
#endif
- width=strlen(graph_label) * gdFontSmall->w;
+ width=strlen(graph_label) * SmallFont->w;
gr_pos=xtr(im,tilab) - width/2;
if (gr_pos >= im->xorigin
&& gr_pos + width <= im->xorigin+im->xsize)
- gdImageString(gif, gdFontSmall,
+ gdImageString(gif, SmallFont,
gr_pos, polyPoints[0].y+4,
graph_label, graph_col[GRC_FONT].i);
}
@@ -1731,26 +1997,26 @@
}
if (! res) {
char *nodata = "No Data found";
- gdImageString(gif, gdFontMediumBold,
+ gdImageString(gif, LargeFont,
im->xgif/2
- - (strlen(nodata)*gdFontMediumBold->w)/2,
+ - (strlen(nodata)*LargeFont->w)/2,
(2*im->yorigin-im->ysize) / 2,
nodata, graph_col[GRC_FONT].i);
}
/* yaxis description */
- gdImageStringUp(gif, gdFontSmall,
+ gdImageStringUp(gif, SmallFont,
7,
(im->yorigin - im->ysize/2
- +(strlen(im->ylegend)*gdFontSmall->w)/2 ),
+ +(strlen(im->ylegend)*SmallFont->w)/2 ),
im->ylegend, graph_col[GRC_FONT].i);
/* graph title */
- gdImageString(gif, gdFontMediumBold,
+ gdImageString(gif, LargeFont,
im->xgif/2
- - (strlen(im->title)*gdFontMediumBold->w)/2,
+ - (strlen(im->title)*LargeFont->w)/2,
8,
im->title, graph_col[GRC_FONT].i);
@@ -1773,7 +2039,7 @@
gdImageFilledPolygon(gif,polyPoints,4,im->gdes[i].col.i);
gdImagePolygon(gif,polyPoints,4,graph_col[GRC_FRAME].i);
- gdImageString(gif, gdFontSmall,
+ gdImageString(gif, SmallFont,
polyPoints[0].x+boxH+6,
polyPoints[0].y-1,
im->gdes[i].legend,
@@ -1782,7 +2048,7 @@
polyPoints[0].x = im->gdes[i].legloc.x;
polyPoints[0].y = im->gdes[i].legloc.y;
- gdImageString(gif, gdFontSmall,
+ gdImageString(gif, SmallFont,
polyPoints[0].x,
polyPoints[0].y,
im->gdes[i].legend,
@@ -1844,22 +2110,57 @@
}
return brush;
}
+/*****************************************************
+ * lazy check make sure we rely need to create this graph
+ *****************************************************/
+
+int lazy_check(image_desc_t *im){
+ FILE *fd = NULL;
+ struct stat gifstat;
+
+ if (im->lazy == 0) return 0; /* no lazy option */
+ if (stat(im->graphfile,&gifstat) != 0)
+ return 0; /* can't stat */
+ /* one pixel in the existing graph is more then what we would
+ change here ... */
+ if (time(NULL) - gifstat.st_mtime >
+ (im->end - im->start) / im->xsize)
+ return 0;
+ if ((fd = fopen(im->graphfile,"rb")) == NULL)
+ return 0; /* the file does not exist */
+ switch (im->imgformat) {
+ case IF_GIF:
+ GifSize(fd,&(im->xgif),&(im->ygif));
+ break;
+ case IF_PNG:
+ PngSize(fd,&(im->xgif),&(im->ygif));
+ break;
+ }
+ fclose(fd);
+ return 1;
+}
/* draw that picture thing ... */
int
graph_paint(image_desc_t *im, char ***calcpr)
{
int i,ii;
+ int lazy = lazy_check(im);
FILE *fo;
/* gif stuff */
gdImagePtr gif,brush;
double areazero = 0.0;
- enum gf_en lastgf = GF_LINE1;
+ enum gf_en stack_gf = GF_PRINT;
+ graph_desc_t *lastgdes = NULL;
gdPoint canvas[4], back[4]; /* points for canvas*/
+ /* if we are lazy and there is nothing to PRINT ... quit now */
+ if (lazy && im->prt_c==0) return 0;
+
/* pull the data from the rrd files ... */
+
if(data_fetch(im)==-1)
return -1;
@@ -1870,8 +2171,9 @@
/* calculate and PRINT and GPRINT definitions. We have to do it at
* this point because it will affect the length of the legends
* if there are no graph elements we stop here ...
+ * if we are lazy, try to quit ...
*/
- if(print_calc(im,calcpr)==0)
+ if(print_calc(im,calcpr)==0 || lazy)
return 0;
/* get actual drawing data and find min and max values*/
@@ -1890,17 +2192,17 @@
draw labels and other things outside the graph area */
- im->xorigin = 10 + 9 * gdFontSmall->w+gdFontSmall->h;
+ im->xorigin = 10 + 9 * SmallFont->w+SmallFont->h;
xtr(im,0);
im->yorigin = 14 + im->ysize;
ytr(im,DNAN);
if(im->title[0] != '\0')
- im->yorigin += (gdFontMediumBold->h+4);
+ im->yorigin += (LargeFont->h+4);
im->xgif=20+im->xsize + im->xorigin;
- im->ygif= im->yorigin+2*gdFontSmall->h;
+ im->ygif= im->yorigin+2*SmallFont->h;
/* determine where to place the legends onto the graphics.
and set im->ygif to match space requirements for text */
@@ -1985,19 +2287,30 @@
case GF_LINE2:
case GF_LINE3:
case GF_AREA:
-
- lastgf = im->gdes[i].gf;
+ stack_gf = im->gdes[i].gf;
case GF_STACK:
- if (im->gdes[i].col.i != -1){
+ /* fix data points at oo and -oo */
+ for(ii=0;ii<im->xsize;ii++){
+ if (isinf(im->gdes[i].p_data[ii])){
+ if (im->gdes[i].p_data[ii] > 0) {
+ im->gdes[i].p_data[ii] = im->maxval ;
+ } else {
+ im->gdes[i].p_data[ii] = im->minval ;
+ }
+
+ }
+ }
+
+ if (im->gdes[i].col.i != -1){
/* GF_LINE and frined */
- if(lastgf == GF_LINE1 || lastgf == GF_LINE2 || lastgf == GF_LINE3 ){
- brush = MkLineBrush(im,i,lastgf);
+ if(stack_gf == GF_LINE1 || stack_gf == GF_LINE2 || stack_gf == GF_LINE3 ){
+ brush = MkLineBrush(im,i,stack_gf);
gdImageSetBrush(gif, brush);
for(ii=1;ii<im->xsize;ii++){
if (isnan(im->gdes[i].p_data[ii-1]) ||
isnan(im->gdes[i].p_data[ii]))
continue;
- gdImageLine(gif,
+ gdImageLine(gif,
ii+im->xorigin-1,ytr(im,im->gdes[i].p_data[ii-1]),
ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
gdBrushed);
@@ -2009,26 +2322,33 @@
/* GF_AREA STACK type*/
if (im->gdes[i].gf == GF_STACK )
for(ii=0;ii<im->xsize;ii++){
- if ((i>0 && isnan(im->gdes[i-1].p_data[ii])) ||
- isnan(im->gdes[i].p_data[ii]))
- continue;
- gdImageLine(gif,
- ii+im->xorigin,ytr(im,im->gdes[i-1].p_data[ii]),
- ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
- im->gdes[i].col.i);
- }
-
- else /* simple GF_AREA */
- for(ii=0;ii<im->xsize;ii++){
- if (isnan(im->gdes[i].p_data[ii]))
+ if(isnan(im->gdes[i].p_data[ii])){
+ im->gdes[i].p_data[ii] = lastgdes->p_data[ii];
+ continue;
+ }
+
+ if (lastgdes->p_data[ii] == im->gdes[i].p_data[ii]){
+ continue;
+ }
+ gdImageLine(gif,
+ ii+im->xorigin,ytr(im,lastgdes->p_data[ii]),
+ ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
+ im->gdes[i].col.i);
+ }
+
+ else /* simple GF_AREA */
+ for(ii=0;ii<im->xsize;ii++){
+ if (isnan(im->gdes[i].p_data[ii])) {
+ im->gdes[i].p_data[ii] = 0;
continue;
+ }
gdImageLine(gif,
ii+im->xorigin,ytr(im,areazero),
ii+im->xorigin,ytr(im,im->gdes[i].p_data[ii]),
im->gdes[i].col.i);
}
}
-
+ lastgdes = &(im->gdes[i]);
break;
}
}
@@ -2064,15 +2384,22 @@
fo = stdout;
} else {
if ((fo = fopen(im->graphfile,"wb")) == NULL) {
- perror("rrd_graph gif write:");
rrd_set_error("cannot open %s for write",im->graphfile);
return (-1);
}
}
- gdImageGif(gif, fo);
+ switch (im->imgformat) {
+ case IF_GIF:
+ gdImageGif(gif, fo);
+ break;
+ case IF_PNG:
+ gdImagePng(gif, fo);
+ break;
+ }
if (strcmp(im->graphfile,"-") != 0)
fclose(fo);
gdImageDestroy(gif);
+
return 0;
}
@@ -2088,7 +2415,7 @@
im->gdes_c++;
- if ((im->gdes = (graph_desc_t *) realloc(im->gdes, (im->gdes_c)
+ if ((im->gdes = (graph_desc_t *) rrd_realloc(im->gdes, (im->gdes_c)
* sizeof(graph_desc_t)))==NULL){
rrd_set_error("realloc graph_descs");
return -1;
@@ -2125,11 +2452,14 @@
input[inp] != '\0';
inp++){
if (input[inp] == '\\' &&
- input[inp+1] != '\0' &&
- input[inp+1] == ':')
+ input[inp+1] != '\0' &&
+ (input[inp+1] == '\\' ||
+ input[inp+1] == ':')){
output[outp++] = input[++inp];
- else
+ }
+ else {
output[outp++] = input[inp];
+ }
}
output[outp] = '\0';
return inp;
@@ -2141,40 +2471,21 @@
image_desc_t im;
int i;
- long long_tmp,start_tmp,end_tmp;
+ long long_tmp;
+ time_t start_tmp=0,end_tmp=0;
char scan_gtm[12],scan_mtm[12],scan_ltm[12],col_nam[12];
char symname[100];
unsigned int col_red,col_green,col_blue;
long scancount;
int linepass = 0; /* stack can only follow directly after LINE* AREA or STACK */
-#ifdef WANT_AT_STYLE_TIMESPEC
struct time_value start_tv, end_tv;
char *parsetime_error = NULL;
- int start_tmp_is_ok = 0,
- end_tmp_is_ok = 0;
-#endif
- /* default values */
- end_tmp = time(NULL);
- start_tmp = -24*3600;
-#ifdef WANT_AT_STYLE_TIMESPEC
- end_tv.type = ABSOLUTE_TIME;
- end_tv.tm = *localtime(&end_tmp);
- end_tv.offset = 0;
-
- start_tv.type = RELATIVE_TO_END_TIME;
- start_tv.tm = *localtime(&end_tmp); /* to init tm_zone and tm_gmtoff */
- start_tv.offset = -24*3600;/* to be compatible with the original code. */
- start_tv.tm.tm_sec = 0; /** alternatively we could set tm_mday to -1 */
- start_tv.tm.tm_min = 0; /** but this would yield -23(25) hours offset */
- start_tv.tm.tm_hour = 0; /** twice a year, when DST is coming in or */
- start_tv.tm.tm_mday = 0; /** out of effect */
- start_tv.tm.tm_mon = 0;
- start_tv.tm.tm_year = 0;
- start_tv.tm.tm_wday = 0;
- start_tv.tm.tm_yday = 0;
- start_tv.tm.tm_isdst = -1; /* for mktime to guess */
-#endif
+ (*prdata)=NULL;
+
+ parsetime("end-24h", &start_tv);
+ parsetime("now", &end_tv);
+
im.xlab_user.minsec = -1;
im.xgif=0;
im.ygif=0;
@@ -2185,13 +2496,17 @@
im.minval = DNAN;
im.maxval = DNAN;
im.interlaced = 0;
+ im.extra_flags= 0;
im.rigid = 0;
+ im.imginfo = NULL;
+ im.lazy = 0;
im.logarithmic = 0;
im.ygridstep = DNAN;
im.base = 1000;
+ im.prt_c = 0;
im.gdes_c = 0;
im.gdes = NULL;
-
+ im.imgformat = IF_GIF; /* we default to GIF output */
for(i=0;i<DIM(graph_col);i++)
im.graph_col[i].red=-1;
@@ -2200,86 +2515,56 @@
while (1){
static struct option long_options[] =
{
- {"start", required_argument, 0, 's'},
- {"end", required_argument,0,'e'},
- {"x-grid", required_argument,0,'x'},
- {"y-grid", required_argument,0,'y'},
+ {"start", required_argument, 0, 's'},
+ {"end", required_argument, 0, 'e'},
+ {"x-grid", required_argument, 0, 'x'},
+ {"y-grid", required_argument, 0, 'y'},
{"vertical-label",required_argument,0,'v'},
- {"width", required_argument,0,'w'},
- {"height", required_argument,0,'h'},
- {"interlaced", no_argument,0,'i'},
- {"upper-limit",required_argument,0,'u'},
- {"lower-limit",required_argument,0,'l'},
- {"rigid", no_argument,0,'r'},
- {"base", required_argument,0,'b'},
- {"logarithmic",no_argument,0,'o'},
- {"color", required_argument,0,'c'},
- {"title", required_argument,0,'t'},
+ {"width", required_argument, 0, 'w'},
+ {"height", required_argument, 0, 'h'},
+ {"interlaced", no_argument, 0, 'i'},
+ {"upper-limit",required_argument, 0, 'u'},
+ {"lower-limit",required_argument, 0, 'l'},
+ {"rigid", no_argument, 0, 'r'},
+ {"base", required_argument, 0, 'b'},
+ {"logarithmic",no_argument, 0, 'o'},
+ {"color", required_argument, 0, 'c'},
+ {"title", required_argument, 0, 't'},
+ {"imginfo", required_argument, 0, 'f'},
+ {"imgformat", required_argument, 0, 'a'},
+ {"lazy", no_argument, 0, 'z'},
+ {"alt-y-grid", no_argument, 0, 257 },
+ {"alt-autoscale", no_argument, 0, 258 },
{0,0,0,0}};
int option_index = 0;
int opt;
opt = getopt_long(argc, argv,
- "s:e:x:y:v:w:h:iu:b:l:roc:t:",
+ "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:z",
long_options, &option_index);
if (opt == EOF)
break;
switch(opt) {
+ case 257:
+ im.extra_flags |= ALTYGRID;
+ break;
+ case 258:
+ im.extra_flags |= ALTAUTOSCALE;
+ break;
case 's':
- if(im.gdes_c > 0){
- rrd_set_error("set start before graphing");
- im_free(&im);
- return -1;
- }
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- start_tmp_is_ok = 0;
- start_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (start_tmp > 31122038 || /* 31 Dec 2038 in DDMMYYYY */
- start_tmp < 0) {
- start_tmp_is_ok = 1;
- break;
- }
if ((parsetime_error = parsetime(optarg, &start_tv))) {
rrd_set_error( "start time: %s", parsetime_error );
- im_free(&im);
return -1;
- }
}
-#else
- start_tmp = atol(optarg);
-#endif
break;
case 'e':
- if(im.gdes_c > 0){
- rrd_set_error("set end before graphing");
- im_free(&im);
- return -1;
- }
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- end_tmp_is_ok = 0;
- end_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (end_tmp > 31122038) { /* 31 Dec 2038 in DDMMYYYY */
- end_tmp_is_ok = 1;
- break;
- }
if ((parsetime_error = parsetime(optarg, &end_tv))) {
rrd_set_error( "end time: %s", parsetime_error );
- im_free(&im);
return -1;
- }
}
-#else
- end_tmp = atol(optarg);
-#endif
break;
case 'x':
if(sscanf(optarg,
@@ -2294,19 +2579,19 @@
im.xlab_form) == 8){
if((im.xlab_user.gridtm = tmt_conv(scan_gtm)) == -1){
rrd_set_error("unknown keyword %s",scan_gtm);
- im_free(&im); return -1;
+ return -1;
} else if ((im.xlab_user.mgridtm = tmt_conv(scan_mtm)) == -1){
rrd_set_error("unknown keyword %s",scan_mtm);
- im_free(&im); return -1;
+ return -1;
} else if ((im.xlab_user.labtm = tmt_conv(scan_ltm)) == -1){
rrd_set_error("unknown keyword %s",scan_ltm);
- im_free(&im); return -1;
+ return -1;
}
im.xlab_user.minsec = 1;
im.xlab_user.stst = im.xlab_form;
} else {
rrd_set_error("invalid xgrid format");
- im_free(&im);return -1;
+ return -1;
}
break;
case 'y':
@@ -2316,18 +2601,19 @@
&im.ylabfact) == 2) {
if(im.ygridstep<=0){
rrd_set_error("grid step must be > 0");
- im_free(&im);return -1;
+ return -1;
} else if (im.ylabfact < 1){
rrd_set_error("label factor must be > 0");
- im_free(&im);return -1;
+ return -1;
}
} else {
rrd_set_error("invalid ygrid format");
- im_free(&im);return -1;
+ return -1;
}
break;
case 'v':
strncpy(im.ylegend,optarg,150);
+ im.ylegend[150]='\0';
break;
case 'u':
im.maxval = atof(optarg);
@@ -2339,20 +2625,14 @@
im.base = atol(optarg);
if(im.base != 1024 && im.base != 1000 ){
rrd_set_error("the only sensible value for base apart from 1000 is 1024");
- im_free(&im);
return -1;
}
break;
case 'w':
long_tmp = atol(optarg);
- if(im.gdes_c > 0){
- rrd_set_error("set width before graphing");
- im_free(&im);
- return -1;
- }
if (long_tmp < 10) {
rrd_set_error("width below 10 pixels");
- im_free(&im);return -1;
+ return -1;
}
im.xsize = long_tmp;
break;
@@ -2360,7 +2640,7 @@
long_tmp = atol(optarg);
if (long_tmp < 10) {
rrd_set_error("height below 10 pixels");
- im_free(&im); return -1;
+ return -1;
}
im.ysize = long_tmp;
break;
@@ -2370,6 +2650,18 @@
case 'r':
im.rigid = 1;
break;
+ case 'f':
+ im.imginfo = optarg;
+ break;
+ case 'a':
+ if((im.imgformat = if_conv(optarg)) == -1) {
+ rrd_set_error("unsupported graphics format '%s'",optarg);
+ return -1;
+ }
+ break;
+ case 'z':
+ im.lazy = 1;
+ break;
case 'o':
im.logarithmic = 1;
if (isnan(im.minval))
@@ -2389,121 +2681,79 @@
}
} else {
rrd_set_error("invalid color def format");
- im_free(&im);return -1;
+ return -1;
}
break;
case 't':
strncpy(im.title,optarg,150);
+ im.title[150]='\0';
break;
case '?':
rrd_set_error("unknown option '%s'",argv[optind-1]);
- return(-1);
+ return -1;
}
}
+
if (im.logarithmic == 1 && (im.minval <= 0 || isnan(im.minval))){
- rrd_set_error("for a logarithmic yaxis you must specify a lower-limit > 0");
- return(-1);
+ rrd_set_error("for a logarithmic yaxis you must specify a lower-limit > 0");
+ return -1;
}
- strncpy(im.graphfile,argv[optind],254);
+ strncpy(im.graphfile,argv[optind],sizeof(im.graphfile)-1);
+ im.graphfile[sizeof(im.graphfile)-1]='\0';
-#ifdef WANT_AT_STYLE_TIMESPEC
- if ((start_tv.type == RELATIVE_TO_END_TIME ||
- (start_tmp_is_ok && start_tmp < 0)) && /* same as the line above */
- end_tv.type == RELATIVE_TO_START_TIME) {
- rrd_set_error("the start and end times cannot be specified "
- "relative to each other");
- return(-1);
- }
-
- if (start_tv.type == RELATIVE_TO_START_TIME) {
- rrd_set_error("the start time cannot be specified relative to itself");
- return(-1);
- }
-
- if (end_tv.type == RELATIVE_TO_END_TIME) {
- rrd_set_error("the end time cannot be specified relative to itself");
- return(-1);
- }
-
- /* We don't care to keep all the values in their range,
- mktime will do this for us */
- if (start_tv.type == RELATIVE_TO_END_TIME) {
- if (end_tmp_is_ok)
- end_tv.tm = *localtime( &end_tmp );
- start_tv.tm.tm_sec += end_tv.tm.tm_sec;
- start_tv.tm.tm_min += end_tv.tm.tm_min;
- start_tv.tm.tm_hour += end_tv.tm.tm_hour;
- start_tv.tm.tm_mday += end_tv.tm.tm_mday;
- start_tv.tm.tm_mon += end_tv.tm.tm_mon;
- start_tv.tm.tm_year += end_tv.tm.tm_year;
- }
- if (end_tv.type == RELATIVE_TO_START_TIME) {
- if (start_tmp_is_ok)
- start_tv.tm = *localtime( &start_tmp );
- end_tv.tm.tm_sec += start_tv.tm.tm_sec;
- end_tv.tm.tm_min += start_tv.tm.tm_min;
- end_tv.tm.tm_hour += start_tv.tm.tm_hour;
- end_tv.tm.tm_mday += start_tv.tm.tm_mday;
- end_tv.tm.tm_mon += start_tv.tm.tm_mon;
- end_tv.tm.tm_year += start_tv.tm.tm_year;
- }
- if (!start_tmp_is_ok)
- start_tmp = mktime(&start_tv.tm) + start_tv.offset;
- if (!end_tmp_is_ok)
- end_tmp = mktime(&end_tv.tm) + end_tv.offset;
-#endif
-
- if (start_tmp < 0)
- start_tmp = end_tmp + start_tmp;
+ if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
+ return -1;
+ }
if (start_tmp < 3600*24*365*10){
rrd_set_error("the first entry to fetch should be after 1980 (%ld)",start_tmp);
- return(-1);
+ return -1;
}
if (end_tmp < start_tmp) {
rrd_set_error("start (%ld) should be less than end (%ld)",
start_tmp, end_tmp);
- return(-1);
+ return -1;
}
im.start = start_tmp;
im.end = end_tmp;
+
for(i=optind+1;i<argc;i++){
int argstart=0;
int strstart=0;
- char varname[30],rpnex[256];
+ char varname[30],*rpnex;
gdes_alloc(&im);
if(sscanf(argv[i],"%10[A-Z0-9]:%n",symname,&argstart)==1){
- if((im.gdes[im.gdes_c-1].gf=gf_conv(symname))==-1){
- im_free(&im);
- rrd_set_error("unknown function '%s'",symname);
- return -1;
- }
+ if((im.gdes[im.gdes_c-1].gf=gf_conv(symname))==-1){
+ im_free(&im);
+ rrd_set_error("unknown function '%s'",symname);
+ return -1;
+ }
} else {
rrd_set_error("can't parse '%s'",argv[i]);
- im_free(&im);
- return -1;
- }
- /* reset linepass if a non LINE/STACK/AREA operator gets parsed */
- if (im.gdes[im.gdes_c-1].gf != GF_LINE1 &&
- im.gdes[im.gdes_c-1].gf != GF_LINE2 &&
- im.gdes[im.gdes_c-1].gf != GF_LINE3 &&
- im.gdes[im.gdes_c-1].gf != GF_AREA &&
- im.gdes[im.gdes_c-1].gf != GF_STACK) {
- linepass = 0;
+ im_free(&im);
+ return -1;
}
- /* allow \: to use : in strings */
-
-
- /* if we are still alive we got a valid graph operator */
+ /* reset linepass if a non LINE/STACK/AREA operator gets parsed
+
+ if (im.gdes[im.gdes_c-1].gf != GF_LINE1 &&
+ im.gdes[im.gdes_c-1].gf != GF_LINE2 &&
+ im.gdes[im.gdes_c-1].gf != GF_LINE3 &&
+ im.gdes[im.gdes_c-1].gf != GF_AREA &&
+ im.gdes[im.gdes_c-1].gf != GF_STACK) {
+ linepass = 0;
+ }
+ */
+
switch(im.gdes[im.gdes_c-1].gf){
- case GF_PRINT:
+ case GF_PRINT:
+ im.prt_c++;
case GF_GPRINT:
if(sscanf(
&argv[i][argstart],
@@ -2526,7 +2776,7 @@
return -1;
}
break;
- case GF_COMMENT:
+ case GF_COMMENT:
if(strlen(&argv[i][argstart])>FMT_LEG_LEN) argv[i][argstart+FMT_LEG_LEN-3]='\0' ;
strcpy(im.gdes[im.gdes_c-1].legend, &argv[i][argstart]);
break;
@@ -2541,7 +2791,7 @@
im.gdes[im.gdes_c-1].col.green = col_green;
im.gdes[im.gdes_c-1].col.blue = col_blue;
if(strstart <= 0){
- im.gdes[im.gdes_c-1].legend[0] = '\0';
+ im.gdes[im.gdes_c-1].legend[0] = '\0';
} else {
scan_for_col(&argv[i][argstart+strstart],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
}
@@ -2564,7 +2814,7 @@
im.gdes[im.gdes_c-1].col.green = col_green;
im.gdes[im.gdes_c-1].col.blue = col_blue;
if(strstart <= 0){
- im.gdes[im.gdes_c-1].legend[0] = '\0';
+ im.gdes[im.gdes_c-1].legend[0] = '\0';
} else {
scan_for_col(&argv[i][argstart+strstart],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
}
@@ -2591,13 +2841,13 @@
varname,
&col_red,
&col_green,
- &col_blue,
+ &col_blue,
&strstart))>=1){
im.gdes[im.gdes_c-1].col.red = col_red;
im.gdes[im.gdes_c-1].col.green = col_green;
im.gdes[im.gdes_c-1].col.blue = col_blue;
if(strstart <= 0){
- im.gdes[im.gdes_c-1].legend[0] = '\0';
+ im.gdes[im.gdes_c-1].legend[0] = '\0';
} else {
scan_for_col(&argv[i][argstart+strstart],FMT_LEG_LEN,im.gdes[im.gdes_c-1].legend);
}
@@ -2616,12 +2866,17 @@
}
break;
case GF_CDEF:
+ if((rpnex = malloc(strlen(&argv[i][argstart])*sizeof(char)))==NULL){
+ rrd_set_error("malloc for CDEF");
+ return -1;
+ }
if(sscanf(
- &argv[i][argstart],
- "%29[_A-Za-z0-9]=%254[^: ]",
- im.gdes[im.gdes_c-1].vname,
- rpnex) != 2){
+ &argv[i][argstart],
+ "%29[_A-Za-z0-9]=%[^: ]",
+ im.gdes[im.gdes_c-1].vname,
+ rpnex) != 2){
im_free(&im);
+ free(rpnex);
rrd_set_error("can't parse CDEF '%s'",&argv[i][argstart]);
return -1;
}
@@ -2629,7 +2884,7 @@
if(find_var(&im,im.gdes[im.gdes_c-1].vname) != -1){
im_free(&im);
rrd_set_error("duplicate variable '%s'",
- im.gdes[im.gdes_c-1].vname);
+ im.gdes[im.gdes_c-1].vname);
return -1;
}
if((im.gdes[im.gdes_c-1].rpnp = str2rpn(&im,rpnex))== NULL){
@@ -2637,52 +2892,36 @@
im_free(&im);
return -1;
}
-
+ free(rpnex);
break;
case GF_DEF:
-#ifdef WIN32
-/* count the number of ':', if 2 : short filename, if 3 : complete filename */
- {
- char * a; int cnt = 0;
- for ( a = &argv[i][argstart]; *a !=0; a++ ) {
- if ( *a == ':' ) cnt++;
- }
- if (cnt == 3) {
- if(sscanf(
- &argv[i][argstart],
- "%29[_A-Za-z0-9]=%1[A-Za-z]:%252[^:]:" DS_NAM_FMT ":" CF_NAM_FMT,
- im.gdes[im.gdes_c-1].vname,
- im.gdes[im.gdes_c-1].rrd,im.gdes[im.gdes_c-1].rrd+2,
- im.gdes[im.gdes_c-1].ds_nam,
- symname) != 5) {
+ if (sscanf(
+ &argv[i][argstart],
+ "%29[_A-Za-z0-9]=%n",
+ im.gdes[im.gdes_c-1].vname,
+ &strstart)== 1){
+ if(sscanf(&argv[i][argstart
+ +strstart
+ +scan_for_col(&argv[i][argstart+strstart],
+ 254,im.gdes[im.gdes_c-1].rrd)],
+ ":" DS_NAM_FMT ":" CF_NAM_FMT,
+ im.gdes[im.gdes_c-1].ds_nam,
+ symname) != 2){
im_free(&im);
- rrd_set_error("can't parse DEF '%s'",&argv[i][argstart]);
+ rrd_set_error("can't parse DEF '%s' -2",&argv[i][argstart]);
return -1;
}
- *(im.gdes[im.gdes_c-1].rrd+1) = ':';
} else {
-#endif /*WIN32*/
- if(sscanf(
- &argv[i][argstart],
- "%29[_A-Za-z0-9]=%254[^:]:" DS_NAM_FMT ":" CF_NAM_FMT,
- im.gdes[im.gdes_c-1].vname,
- im.gdes[im.gdes_c-1].rrd,
- im.gdes[im.gdes_c-1].ds_nam,
- symname) != 4){
- im_free(&im);
- rrd_set_error("can't parse DEF '%s'",&argv[i][argstart]);
- return -1;
- }
-#ifdef WIN32
+ im_free(&im);
+ rrd_set_error("can't parse DEF '%s'",&argv[i][argstart]);
+ return -1;
}
- }
-#endif /*WIN32*/
-
+
/* checking for duplicate DEF CDEFS */
- if(find_var(&im,im.gdes[im.gdes_c-1].vname) != -1){
+ if (find_var(&im,im.gdes[im.gdes_c-1].vname) != -1){
im_free(&im);
rrd_set_error("duplicate variable '%s'",
- im.gdes[im.gdes_c-1].vname);
+ im.gdes[im.gdes_c-1].vname);
return -1;
}
if((im.gdes[im.gdes_c-1].cf=cf_conv(symname))==-1){
@@ -2694,26 +2933,45 @@
}
}
-
-
+
if (im.gdes_c==0){
rrd_set_error("can't make a graph without contents");
im_free(&im);
return(-1);
}
-
-
- /* parse rest of arguments containing information on what to draw*/
+ /* parse rest of arguments containing information on what to draw*/
if (graph_paint(&im,prdata)==-1){
im_free(&im);
return -1;
}
+
*xsize=im.xgif;
*ysize=im.ygif;
+ if (im.imginfo){
+ char *filename;
+ if (! (*prdata)) {
+ /* maybe prdata is not allocated yet ... lets do it now */
+ if((*prdata = calloc(2,sizeof(char *)))==NULL){
+ rrd_set_error("malloc imginfo");
+ return -1;
+ };
+ }
+ if(((*prdata)[0] = malloc((strlen(im.imginfo)+200+strlen(im.graphfile))*sizeof(char)))
+ ==NULL){
+ rrd_set_error("malloc imginfo");
+ return -1;
+ }
+ filename=im.graphfile+strlen(im.graphfile);
+ while(filename > im.graphfile){
+ if (*(filename-1)=='/' || *(filename-1)=='\\' ) break;
+ filename--;
+ }
+
+ sprintf((*prdata)[0],im.imginfo,filename,im.xgif,im.ygif);
+ }
im_free(&im);
return 0;
}
-
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_open.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_open.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_open.c Sat Jul 13 19:22:34 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
@@ -8,6 +8,7 @@
*****************************************************************************/
#include "rrd_tool.h"
+#define MEMBLK 8192
/* open a database file, return its header and a open filehandle */
/* positioned to the first cdp in the first rra */
@@ -16,14 +17,24 @@
rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
{
+
char *mode = NULL;
+ rrd_init(rrd);
if (rdwr == RRD_READONLY) {
+#ifndef WIN32
+ mode = "r";
+#else
mode = "rb";
+#endif
} else {
+#ifndef WIN32
+ mode = "r+";
+#else
mode = "rb+";
+#endif
}
- if ((*in_file = fopen(file_name,mode)) == NULL ){
+ if (((*in_file) = fopen(file_name,mode)) == NULL ){
rrd_set_error("rrdopen can't open '%s'",file_name);
return (-1);
}
@@ -75,6 +86,7 @@
rrd->rra_ptr = NULL;
rrd->pdp_prep = NULL;
rrd->cdp_prep = NULL;
+ rrd->rrd_value = NULL;
}
void rrd_free(rrd_t *rrd)
@@ -86,4 +98,40 @@
free(rrd->rra_ptr);
free(rrd->pdp_prep);
free(rrd->cdp_prep);
+ free(rrd->rrd_value);
+}
+
+int readfile(char *file_name, char **buffer, int skipfirst){
+ long writecnt=0,totalcnt = MEMBLK;
+ FILE *input=NULL;
+ char c ;
+ if ((strcmp("-",file_name) == 0)) { *input = *stdin; }
+ else {
+ if ((input = fopen(file_name,"rb")) == NULL ){
+ rrd_set_error("readfile can't open '%s'",file_name);
+ return (-1);
+ }
+ }
+ if (skipfirst){
+ do { c = getc(input); } while (c != '\n' && ! feof(input));
+ }
+ if (((*buffer) = (char *) malloc((MEMBLK+4)*sizeof(char))) == NULL) {
+ perror("Allocate Buffer:");
+ exit(1);
+ };
+ do{
+ writecnt += fread((*buffer)+writecnt, 1, MEMBLK * sizeof(char) ,input);
+ if (writecnt >= totalcnt){
+ totalcnt += MEMBLK;
+ if (((*buffer)=rrd_realloc((*buffer), (totalcnt+4) * sizeof(char)))==NULL){
+ perror("Realloc Buffer:");
+ exit(1);
+ };
+ }
+ } while (! feof(input));
+ (*buffer)[writecnt] = '\0';
+ fclose(input);
+ return writecnt;
}
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_cgi.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_cgi.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_cgi.c Sat Jul 13 19:22:34 2002
@@ -0,0 +1,484 @@
+/*****************************************************************************
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
+ *****************************************************************************
+ * rrd_cgi.c RRD Web Page Generator
+ *****************************************************************************/
+
+#include "rrd_tool.h"
+#include <cgi.h>
+#include <time.h>
+
+
+#define MEMBLK 1024
+
+/* global variable for libcgi */
+s_cgi **cgiArg;
+
+/* in arg[0] find tags beginning with arg[1] call arg[2] on them
+ and replace by result of arg[2] call */
+int parse(char **, long, char *, char *(*)(long , char **));
+
+/**************************************************/
+/* tag replacers ... they are called from parse */
+/* through function pointers */
+/**************************************************/
+
+/* return cgi var named arg[0] */
+char* cgiget(long , char **);
+
+/* return a quoted cgi var named arg[0] */
+char* cgigetq(long , char **);
+
+/* return a quoted and sanitized cgi variable */
+char* cgigetqp(long , char **);
+
+/* call rrd_graph and insert apropriate image tag */
+char* drawgraph(long, char **);
+
+/* return PRINT functions from last rrd_graph call */
+char* drawprint(long, char **);
+
+/* set an evironment variable */
+char* rrdsetenv(long, char **);
+
+/* include the named file at this point */
+char* includefile(long, char **);
+
+/** http protocol needs special format, and GMT time **/
+char *http_time(time_t *);
+
+
+static char **calcpr=NULL;
+static void calfree (void){
+ if (calcpr) {
+ long i;
+ for(i=0;calcpr[i];i++){
+ free(calcpr[i]);
+ }
+ free(calcpr);
+ }
+}
+
+/* create freeable version of the string */
+char * stralloc(char *str){
+ char *nstr = malloc((strlen(str)+1)*sizeof(char));
+ strcpy(nstr,str);
+ return(nstr);
+}
+int main(int argc, char *argv[]) {
+ long length;
+ char *buffer;
+ char *server_url = NULL;
+ long i;
+ long goodfor=0;
+ long filter=0;
+ long refresh=0;
+ while (1){
+ static struct option long_options[] =
+ {
+ {"goodfor", required_argument, 0, 'g'},
+ {"filter", no_argument, 0, 'f'},
+ {"refresh", no_argument, 0, 'r'},
+ {0,0,0,0}
+ };
+ int option_index = 0;
+ int opt;
+ opt = getopt_long(argc, argv, "g:fr",
+ long_options, &option_index);
+ if (opt == EOF)
+ break;
+ switch(opt) {
+ case 'g':
+ goodfor=atol(optarg);
+ break;
+ case 'f':
+ filter=1;
+ break;
+ case 'r':
+ refresh=1;
+ break;
+ case '?':
+ printf("unknown commandline option '%s'\n",argv[optind-1]);
+ return -1;
+ }
+ }
+
+ if(filter==0) {
+ cgiDebug(0,0);
+ cgiArg = cgiInit ();
+ server_url = getenv("SERVER_URL");
+ }
+ if (optind != argc-1) {
+ fprintf (stderr, "Command line error. Expected Input file name! %d\n",optind);
+ exit(1);
+ }
+
+ length = readfile(argv[optind], &buffer, 1);
+
+ if(rrd_test_error()){
+ fprintf(stderr, "ERROR: %s\n",rrd_get_error());
+ exit(1);
+ }
+
+ if(filter==0) {
+ /* pass 1 makes only sense in cgi mode */
+ for (i=0;buffer[i] != '\0'; i++){
+ i +=parse(&buffer,i,"<RRD::CV ",cgiget);
+ i +=parse(&buffer,i,"<RRD::CV::QUOTE ",cgigetq);
+ i +=parse(&buffer,i,"<RRD::CV::PATH ",cgigetqp);
+ }
+ }
+
+ /* pass 2 */
+ for (i=0;buffer[i] != '\0'; i++){
+ i += parse(&buffer,i,"<RRD::INCLUDE ",includefile);
+ }
+
+ /* pass 3 */
+ for (i=0;buffer[i] != '\0'; i++){
+ i += parse(&buffer,i,"<RRD::SETENV ",rrdsetenv);
+ i += parse(&buffer,i,"<RRD::GRAPH ",drawgraph);
+ i += parse(&buffer,i,"<RRD::PRINT ",drawprint);
+ }
+
+ if (filter==0){
+ printf ("Content-Type: text/html\n"
+ "Content-Length: %d\n", strlen(buffer));
+ if (goodfor > 0){
+ time_t now;
+ now = time(NULL);
+ printf ("Last-Modified: %s\n",http_time(&now));
+ now += goodfor;
+ printf ("Expires: %s\n",http_time(&now));
+ if (refresh) {
+ printf("Refresh: %ld\n", goodfor);
+ }
+ }
+ printf ("\n");
+ }
+ printf ("%s", buffer);
+ calfree();
+ free(buffer);
+ exit(0);
+}
+
+/* remove occurences of .. this is a general measure to make
+ paths which came in via cgi do not go UP ... */
+
+char* rrdsetenv(long argc, char **args){
+ if (argc >= 2) {
+ char *xyz=malloc((strlen(args[0])+strlen(args[1])+3)*sizeof(char));
+ if (xyz == NULL){
+ return stralloc("[ERROR: allocating setenv buffer]");
+ };
+ sprintf(xyz,"%s=%s",args[0],args[1]);
+ if( putenv(xyz) == -1) {
+ return stralloc("[ERROR: faild to do putenv]");
+ };
+ } else {
+ return stralloc("[ERROR: setenv faild because not enough arguments were defined]");
+ }
+ return stralloc("");
+}
+
+char* includefile(long argc, char **args){
+ char *buffer;
+ if (argc >= 1) {
+ readfile(args[0], &buffer, 0);
+ if (rrd_test_error()) {
+ char *err = malloc((strlen(rrd_get_error())+20)*sizeof(char));
+ sprintf(err, "[ERROR: %s]",rrd_get_error());
+ rrd_clear_error();
+ return err;
+ } else {
+ return buffer;
+ }
+ }
+ else
+ {
+ return stralloc("[ERROR: No Inclue file defined]");
+ }
+}
+
+char* rrdstrip(char *buf){
+ char *start;
+ if (buf == NULL) return NULL;
+ while ((start = strstr(buf,"<"))){
+ *start = '_';
+ }
+ while ((start = strstr(buf,">"))){
+ *start = '_';
+ }
+ return stralloc(buf);
+}
+
+char* cgigetq(long argc, char **args){
+ if (argc>= 1){
+ char *buf = rrdstrip(cgiGetValue(cgiArg,args[0]));
+ char *buf2;
+ char *c,*d;
+ int qc=0;
+ if (buf==NULL) return NULL;
+
+ for(c=buf;*c != '\0';c++)
+ if (*c == '"') qc++;
+ if((buf2=malloc((strlen(buf) + qc*4 +2) * sizeof(char)))==NULL){
+ perror("Malloc Buffer");
+ exit(1);
+ };
+ c=buf;
+ d=buf2;
+ *(d++) = '"';
+ while(*c != '\0'){
+ if (*c == '"') {
+ *(d++) = '"';
+ *(d++) = '\'';
+ *(d++) = '"';
+ *(d++) = '\'';
+ }
+ *(d++) = *(c++);
+ }
+ *(d++) = '"';
+ *(d) = '\0';
+ free(buf);
+ return buf2;
+ }
+
+ return stralloc("[ERROR: not enough argument for RRD::CV::QUOTE]");
+}
+
+/* remove occurences of .. this is a general measure to make
+ paths which came in via cgi do not go UP ... */
+
+char* cgigetqp(long argc, char **args){
+ if (argc>= 1){
+ char *buf = rrdstrip(cgiGetValue(cgiArg,args[0]));
+ char *buf2;
+ char *c,*d;
+ int qc=0;
+ if (buf==NULL) return NULL;
+
+ for(c=buf;*c != '\0';c++)
+ if (*c == '"') qc++;
+ if((buf2=malloc((strlen(buf) + qc*4 +2) * sizeof(char)))==NULL){
+ perror("Malloc Buffer");
+ exit(1);
+ };
+ c=buf;
+ d=buf2;
+ *(d++) = '"';
+ while(*c != '\0'){
+ if (*c == '"') {
+ *(d++) = '"';
+ *(d++) = '\'';
+ *(d++) = '"';
+ *(d++) = '\'';
+ }
+ if(*c == '/') {
+ *(d++) = '_';c++;
+ } else {
+ if (*c=='.' && *(c+1) == '.'){
+ c += 2;
+ *(d++) = '_'; *(d++) ='_';
+ } else {
+
+ *(d++) = *(c++);
+ }
+ }
+ }
+ *(d++) = '"';
+ *(d) = '\0';
+ free(buf);
+ return buf2;
+ }
+
+ return stralloc("[ERROR: not enough arguments for RRD::CV::PATH]");
+
+}
+
+
+char* cgiget(long argc, char **args){
+ if (argc>= 1)
+ return rrdstrip(cgiGetValue(cgiArg,args[0]));
+ else
+ return stralloc("[ERROR: not enough arguments for RRD::CV]");
+}
+
+
+
+char* drawgraph(long argc, char **args){
+ int i,xsize, ysize;
+ for(i=0;i<argc;i++)
+ if(strcmp(args[i],"--imginfo")==0 || strcmp(args[i],"-g")==0) break;
+ if(i==argc) {
+ args[argc++] = "--imginfo";
+ args[argc++] = "<IMG SRC=\"./%s\" WIDTH=\"%lu\" HEIGHT=\"%lu\">";
+ }
+ optind=0; /* reset gnu getopt */
+ opterr=0; /* reset gnu getopt */
+ calfree();
+ if( rrd_graph(argc+1, args-1, &calcpr, &xsize, &ysize) != -1 ) {
+ return stralloc(calcpr[0]);
+ } else {
+ if (rrd_test_error()) {
+ char *err = malloc((strlen(rrd_get_error())+20)*sizeof(char));
+ sprintf(err, "[ERROR: %s]",rrd_get_error());
+ rrd_clear_error();
+ calfree();
+ return err;
+ }
+ }
+ return NULL;
+}
+
+char* drawprint(long argc, char **args){
+ if (argc>=1 && calcpr != NULL){
+ long i=0;
+ while (calcpr[i] != NULL) i++; /*determine number lines in calcpr*/
+ if (atol(args[0])<i-1)
+ return calcpr[atol(args[0])+1];
+ }
+ return stralloc("[ERROR: RRD::PRINT argument error]");
+}
+
+/* scan aLine until an unescaped '>' arives */
+char* scanargs(char *aLine, long *argc, char ***args)
+{
+ char *getP, *putP;
+ char Quote = 0;
+ int argal = MEMBLK;
+ int braket = 0;
+ int inArg = 0;
+ if (((*args) = (char **) malloc(MEMBLK*sizeof(char *))) == NULL) {
+ return NULL;
+ }
+ /* sikp leading blanks */
+ while (*aLine && *aLine <= ' ') aLine++;
+
+ *argc = 0;
+ getP = aLine;
+ putP = aLine;
+ while (*getP && !( !Quote && (braket == 0) && ((*getP) == '>'))){
+ if (*getP < ' ') *getP = ' '; /*remove all special chars*/
+ switch (*getP) {
+ case ' ':
+ if (Quote){
+ *(putP++)=*getP;
+ } else
+ if(inArg) {
+ *(putP++) = 0;
+ inArg = 0;
+ }
+ break;
+ case '"':
+ case '\'':
+ if (Quote != 0) {
+ if (Quote == *getP)
+ Quote = 0;
+ else {
+ *(putP++)=*getP;
+ }
+ } else {
+ if(!inArg){
+ (*args)[++(*argc)] = putP;
+ inArg=1;
+ }
+ Quote = *getP;
+ }
+ break;
+ default:
+ if (Quote == 0 && (*getP) == '<') {
+ braket++;
+ }
+ if (Quote == 0 && (*getP) == '>') {
+ braket--;
+ }
+
+ if(!inArg){
+ (*args)[++(*argc)] = putP;
+ inArg=1;
+ }
+ *(putP++)=*getP;
+ break;
+ }
+ if ((*argc) >= argal-10 ) {
+ argal += MEMBLK;
+ if (((*args)=rrd_realloc((*args),(argal)*sizeof(char *))) == NULL) {
+ return NULL;
+ }
+ }
+ getP++;
+ }
+
+ *putP = '\0';
+ (*argc)++;
+ if (Quote)
+ return NULL;
+ else
+ return getP+1; /* pointer to next char after parameter */
+}
+
+
+
+int parse(char **buf, long i, char *tag,
+ char *(*func)(long argc, char **args)){
+
+ /* the name of the vairable ... */
+ char *val;
+ long valln;
+ char **args;
+ char *end;
+ long end_offset;
+ long argc;
+ /* do we like it ? */
+ if (strncmp((*buf)+i, tag, strlen(tag))!=0) return 0;
+ /* scanargs puts \0 into *buf ... so after scanargs it is probably
+ not a good time to use strlen on buf */
+ end = scanargs((*buf)+i+strlen(tag),&argc,&args);
+ if (! end) {
+ for (;argc>2;argc--){
+ *((args[argc-1])-1)=' ';
+ }
+ val = stralloc("[ERROR: Parsing Problem with the following text\n"
+ " Check original file. This may have been altered by parsing.]\n\n");
+ end = (*buf)+i+1;
+ } else {
+ val = func(argc-1,args+1);
+ free (args);
+ }
+ /* for (ii=0;ii<argc;ii++) printf("'%s'\n", args[ii]); */
+ if (val != NULL) {
+ valln = strlen(val);
+ } else { valln = 0;}
+
+ /* make enough room for replacement */
+ end_offset = end - (*buf);
+ if(end-(*buf) < i + valln){ /* make sure we do not shrink the mallocd block */
+ /* calculating the new length of the buffer is simple. add current
+ buffer pos (i) to length of string after replaced tag to length
+ of replacement string and add 1 for the final zero ... */
+ if(((*buf) = rrd_realloc((*buf),
+ (i+strlen(end) + valln +1) * sizeof(char)))==NULL){
+ perror("Realoc buf:");
+ exit(1);
+ };
+ }
+ end = (*buf) + end_offset; /* make sure the 'end' pointer gets moved
+ along with the buf pointer when realoc
+ moves memmory ... */
+ /* splice the variable */
+ memmove ((*buf)+i+valln,end,strlen(end)+1);
+ if (val != NULL ) memmove ((*buf)+i,val, valln);
+ free(val);
+ return valln;
+}
+
+char *
+http_time(time_t *now) {
+ struct tm *tmptime;
+ static char buf[60];
+
+ tmptime=gmtime(now);
+ strftime(buf,sizeof(buf),"%a, %d %b %Y %H:%M:%S GMT",tmptime);
+ return(buf);
+}
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_create.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_create.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_create.c Sat Jul 13 19:22:34 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_create.c creates new rrds
*****************************************************************************/
@@ -13,12 +13,11 @@
rrd_t rrd;
long i,long_tmp;
time_t last_up;
-#ifdef WANT_AT_STYLE_TIMESPEC
struct time_value last_up_tv;
char *parsetime_error = NULL;
- int last_up_is_ok = 0;
-#endif
+ /* init last_up */
+ last_up = time(NULL)-10;
/* init rrd clean */
rrd_init(&rrd);
/* static header */
@@ -44,7 +43,7 @@
/* a default value */
rrd.ds_def = NULL;
rrd.rra_def = NULL;
- last_up = time(NULL);
+
while (1){
static struct option long_options[] =
{
@@ -62,17 +61,6 @@
switch(opt) {
case 'b':
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- last_up_is_ok = 0;
- last_up = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (last_up > 31122038 || /* 31 Dec 2038 in DDMMYYYY */
- last_up < 0) {
- last_up_is_ok = 1;
- break;
- }
if ((parsetime_error = parsetime(optarg, &last_up_tv))) {
rrd_set_error("last update time: %s", parsetime_error );
rrd_free(&rrd);
@@ -85,15 +73,9 @@
rrd_free(&rrd);
return(-1);
}
- if (!last_up_is_ok)
- last_up = mktime(&last_up_tv.tm) + last_up_tv.offset;
- }/* this is for the entire block */
-
-#else
- last_up = atol(optarg);
-#endif
- if (last_up < 0) /* if time is negative this means go back from now. */
- last_up = time(NULL)+last_up;
+
+ last_up = mktime(&last_up_tv.tm) + last_up_tv.offset;
+
if (last_up < 3600*24*365*10){
rrd_set_error("the first entry to the RRD should be after 1980");
rrd_free(&rrd);
@@ -123,7 +105,7 @@
char minstr[20], maxstr[20];
if (strncmp(argv[i],"DS:",3)==0){
size_t old_size = sizeof(ds_def_t)*(rrd.stat_head->ds_cnt);
- if((rrd.ds_def = realloc(rrd.ds_def,
+ if((rrd.ds_def = rrd_realloc(rrd.ds_def,
old_size+sizeof(ds_def_t)))==NULL){
rrd_set_error("allocating rrd.ds_def");
rrd_free(&rrd);
@@ -166,7 +148,7 @@
}
} else if (strncmp(argv[i],"RRA:",3)==0){
size_t old_size = sizeof(rra_def_t)*(rrd.stat_head->rra_cnt);
- if((rrd.rra_def = realloc(rrd.rra_def,
+ if((rrd.rra_def = rrd_realloc(rrd.rra_def,
old_size+sizeof(rra_def_t)))==NULL){
rrd_set_error("allocating rrd.rra_def");
rrd_free(&rrd);
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_last.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_last.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_last.c Sat Jul 13 19:22:34 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_last.c
*****************************************************************************
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_dump.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_dump.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_dump.c Sat Jul 13 19:22:35 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_dump Display a RRD
*****************************************************************************
@@ -9,146 +9,139 @@
#include "rrd_tool.h"
+extern char *tzname[2];
+
int
rrd_dump(int argc, char **argv)
{
- int i,ii,iii,full=0;
+ int i,ii,ix,iii=0;
time_t now;
char somestring[255];
rrd_value_t my_cdp;
-
+ long rra_base, rra_start, rra_next;
FILE *in_file;
rrd_t rrd;
- while (1){
- static struct option long_options[] =
- {
- {"full", no_argument, 0, 'f'},
- {0,0,0,0}
- };
- int option_index = 0;
- int opt;
- opt = getopt_long(argc, argv, "f",
- long_options, &option_index);
- if (opt == EOF)
- break;
-
- switch(opt) {
- case 'f':
- full=1;
- break;
- case '?':
- rrd_set_error("unknown option '%s'",argv[optind-1]);
- return(-1);
- }
- }
-
- if(optind >= argc){
- rrd_set_error("please specify an rrd");
- return(-1);
- }
- if(rrd_open(argv[optind],&in_file,&rrd, RRD_READONLY)==-1){
+ if(rrd_open(argv[1],&in_file,&rrd, RRD_READONLY)==-1){
return(-1);
}
- puts("RRD Header");
- puts("---------------------------");
- puts("");
- puts("* stat_head");
- printf("\tcookie: '%s'\n",rrd.stat_head->cookie);
- printf("\tversion: '%s'\n",rrd.stat_head->version);
- printf("\tfloat_cookie: %e\n",rrd.stat_head->float_cookie);
-
- printf("\tds_cnt: %lu\n",rrd.stat_head->ds_cnt);
- printf("\trra_cnt: %lu\n",rrd.stat_head->rra_cnt);
- printf("\tpdp_step: %lu seconds\n",rrd.stat_head->pdp_step);
-
- for(i=0;i<rrd.stat_head->ds_cnt;i++){
- printf("\n* ds_def[%i]\n",i);
- printf("\tds-nam: %s\n",rrd.ds_def[i].ds_nam);
- printf("\tdst: %s\n",rrd.ds_def[i].dst);
- printf("\tds_mrhb: %lu\n",rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt);
- printf("\tmax_val: %e\n",rrd.ds_def[i].par[DS_max_val].u_val);
- printf("\tmin_val: %e\n",rrd.ds_def[i].par[DS_min_val].u_val);
- }
-
- for(i=0;i<rrd.stat_head->rra_cnt;i++){
- printf("\n* rra_def[%i]\n",i);
- printf("\tcf_name: %s\n",rrd.rra_def[i].cf_nam);
- printf("\trow_cnt: %lu\n",rrd.rra_def[i].row_cnt);
- printf("\tpdp_cnt: %lu\n",rrd.rra_def[i].pdp_cnt);
- }
-
- printf("\n* live_head\n");
+ puts("<!-- Round Robin Database Dump -->");
+ puts("<rrd>");
+ printf("\t<version> %s </version>\n",rrd.stat_head->version);
+ printf("\t<step> %lu </step> <!-- Seconds -->\n",rrd.stat_head->pdp_step);
#if HAVE_STRFTIME
- strftime(somestring,200,"%Y-%m-%d %H:%M:%S",
+ strftime(somestring,200,"%Y-%m-%d %H:%M:%S %Z",
localtime(&rrd.live_head->last_up));
#else
# error "Need strftime"
#endif
- printf("\tlast_up: '%lu' %s\n",
+ printf("\t<lastupdate> %ld </lastupdate> <!-- %s -->\n\n",
rrd.live_head->last_up,somestring);
-
- printf("\n* pdp_prep\n");
for(i=0;i<rrd.stat_head->ds_cnt;i++){
- printf("\n (ds='%s')\n",rrd.ds_def[i].ds_nam);
-
-
- printf("\tlast_ds: '%s'\n",rrd.pdp_prep[i].last_ds);
- printf("\tvalue: %e\n",rrd.pdp_prep[i].scratch[PDP_val].u_val);
- printf("\tunkn_sec: %lu seconds\n",
+ printf("\t<ds>\n");
+ printf("\t\t<name> %s </name>\n",rrd.ds_def[i].ds_nam);
+ printf("\t\t<type> %s </type>\n",rrd.ds_def[i].dst);
+ printf("\t\t<minimal_heartbeat> %lu </minimal_heartbeat>\n",rrd.ds_def[i].par[DS_mrhb_cnt].u_cnt);
+ if (isnan(rrd.ds_def[i].par[DS_min_val].u_val)){
+ printf("\t\t<min> NaN </min>\n");
+ } else {
+ printf("\t\t<min> %0.10e </min>\n",rrd.ds_def[i].par[DS_min_val].u_val);
+ }
+ if (isnan(rrd.ds_def[i].par[DS_max_val].u_val)){
+ printf("\t\t<max> NaN </max>\n");
+ } else {
+ printf("\t\t<max> %0.10e </max>\n",rrd.ds_def[i].par[DS_max_val].u_val);
+ }
+ printf("\n\t\t<!-- PDP Status -->\n");
+ printf("\t\t<last_ds> %s </last_ds>\n",rrd.pdp_prep[i].last_ds);
+ if (isnan(rrd.pdp_prep[i].scratch[PDP_val].u_val)){
+ printf("\t\t<value> NaN </value>\n");
+ } else {
+ printf("\t\t<value> %0.10e </value>\n",rrd.pdp_prep[i].scratch[PDP_val].u_val);
+ }
+ printf("\t\t<unknown_sec> %lu </unknown_sec>\n",
rrd.pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt);
+
+ printf("\t</ds>\n\n");
}
-
- printf("\n* cdp_prep");
- for(i=0;i<rrd.stat_head->rra_cnt;i++){
- printf("\n (rra=%i)\n",i);
- for(ii=0;ii<rrd.stat_head->ds_cnt;ii++){
- printf("\n (ds=%s)\n",rrd.ds_def[ii].ds_nam);
- printf("\tvalue: %e\n",
- rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_val].u_val);
- printf("\tunkn_pdp: %lu pdp\n",
- rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_unkn_pdp_cnt].u_cnt);
- }
- }
- for(i=0;i<rrd.stat_head->rra_cnt;i++){
- printf("\n* rra_ptr[%i]\n",i);
- printf("\tcur_row: %lu\n",rrd.rra_ptr[i].cur_row);
- }
+ puts("<!-- Round Robin Archives -->");
+
+ rra_base=ftell(in_file);
+ rra_next = rra_base;
- if (full) {
- puts("");
- puts("RRD Contents");
- puts("-----------------------");
- puts("");
- for(i=0;i<rrd.stat_head->rra_cnt;i++){
- printf("[%3i]:\n",i);
+ for(i=0;i<rrd.stat_head->rra_cnt;i++){
+
+ long timer=0;
+ rra_start= rra_next;
+ rra_next += ( rrd.stat_head->ds_cnt
+ * rrd.rra_def[i].row_cnt
+ * sizeof(rrd_value_t));
+ printf("\t<rra>\n");
+ printf("\t\t<cf> %s </cf>\n",rrd.rra_def[i].cf_nam);
+ printf("\t\t<pdp_per_row> %lu </pdp_per_row> <!-- %lu seconds -->\n\n",
+ rrd.rra_def[i].pdp_cnt, rrd.rra_def[i].pdp_cnt
+ *rrd.stat_head->pdp_step);
+ printf("\t\t<cdp_prep>\n");
+ for(ii=0;ii<rrd.stat_head->ds_cnt;ii++){
+ double value = rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_val].u_val;
+ printf("\t\t\t<ds>");
+ if (isnan(value)){
+ printf("<value> NaN </value>");
+ } else {
+ printf("<value> %0.10e </value>", value);
+ }
+ printf(" <unknown_datapoints> %lu </unknown_datapoints>",
+ rrd.cdp_prep[i*rrd.stat_head->ds_cnt+ii].scratch[CDP_unkn_pdp_cnt].u_cnt);
+ printf("</ds>\n");
+ }
+ printf("\t\t</cdp_prep>\n");
+
+ printf("\t\t<database>\n");
+ fseek(in_file,(rra_start
+ +(rrd.rra_ptr[i].cur_row+1)
+ * rrd.stat_head->ds_cnt
+ * sizeof(rrd_value_t)),SEEK_SET);
+ timer = - (rrd.rra_def[i].row_cnt-1);
+ ii=rrd.rra_ptr[i].cur_row;
+ for(ix=0;ix<rrd.rra_def[i].row_cnt;ix++){
+ ii++;
+ if (ii>=rrd.rra_def[i].row_cnt) {
+ fseek(in_file,rra_start,SEEK_SET);
+ ii=0; /* wrap if max row cnt is reached */
+ }
now = (rrd.live_head->last_up
- - rrd.live_head->last_up % (rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step)
- - rrd.rra_ptr[i].cur_row * rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step);
- for(ii=0;ii<rrd.rra_def[i].row_cnt;ii++){
- if (rrd.rra_ptr[i].cur_row==ii) {
- printf("-> ");
+ - rrd.live_head->last_up
+ % (rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step))
+ + (timer*rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step);
+
+ timer++;
+#if HAVE_STRFTIME
+ strftime(somestring,200,"%Y-%m-%d %H:%M:%S %Z", localtime(&now));
+#else
+# error "Need strftime"
+#endif
+ printf("\t\t\t<!-- %s --> <row>",somestring);
+ for(iii=0;iii<rrd.stat_head->ds_cnt;iii++){
+ fread(&my_cdp,sizeof(rrd_value_t),1,in_file);
+ if (isnan(my_cdp)){
+ printf("<v> NaN </v>");
} else {
- printf(" ");
- }
- printf("%10lu",now);
- now += rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step;
- if (rrd.rra_ptr[i].cur_row==ii)
- now -= rrd.rra_def[i].pdp_cnt*rrd.stat_head->pdp_step*rrd.rra_def[i].row_cnt;
-
- for(iii=0;iii<rrd.stat_head->ds_cnt;iii++){
- fread(&my_cdp,sizeof(rrd_value_t),1,in_file);
-
- printf(" %12.3f",my_cdp);
- }
- printf("\n");
+ printf("<v> %0.10e </v>",my_cdp);
+ };
}
+ printf("</row>\n");
}
+ printf("\t\t</database>\n\t</rra>\n");
+
}
+ printf("</rrd>\n");
rrd_free(&rrd);
fclose(in_file);
return(0);
}
+
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/pngsize.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/pngsize.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/pngsize.c Sat Jul 13 19:22:35 2002
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
+ *****************************************************************************
+ * pngsize.c determine the size of a PNG image
+ *****************************************************************************/
+
+#include <png.h>
+
+int
+PngSize(FILE *fd, long *width, long *height)
+{
+ png_structp png_read_ptr =
+ png_create_read_struct(PNG_LIBPNG_VER_STRING,
+ (png_voidp)NULL,
+ /* we would need to point to error handlers
+ here to do it properly */
+ (png_error_ptr)NULL, (png_error_ptr)NULL);
+
+ png_infop info_ptr = png_create_info_struct(png_read_ptr);
+
+ (*width)=0;
+ (*height)=0;
+
+ if (setjmp(png_read_ptr->jmpbuf)){
+ png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp)NULL);
+ return 0;
+ }
+
+ png_init_io(png_read_ptr,fd);
+ png_read_info(png_read_ptr, info_ptr);
+ (*width)=png_get_image_width(png_read_ptr, info_ptr);
+ (*height)=png_get_image_height(png_read_ptr, info_ptr);
+
+ png_destroy_read_struct(&png_read_ptr, &info_ptr, NULL);
+ if (*width >0 && *height >0)
+ return 1;
+ else
+ return 0;
+}
+
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_diff.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_diff.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_diff.c Sat Jul 13 19:22:35 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1999
+ * RRDtool Copyright Tobias Oetiker, 1999
* This code is stolen from rateup (mrtg-2.x) by Dave Rand
*****************************************************************************
* diff calculate the difference between two very long integers available as
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tune.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tune.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tune.c Sat Jul 13 19:22:35 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* change header parameters of an rrd
*****************************************************************************
@@ -107,7 +107,8 @@
rrd_free(&rrd);
return -1;
}
- strncpy(rrd.ds_def[ds].dst,dst,DST_SIZE);
+ strncpy(rrd.ds_def[ds].dst,dst,DST_SIZE-1);
+ rrd.ds_def[ds].dst[DST_SIZE-1]='\0';
rrd.pdp_prep[ds].last_ds[0] = 'U';
rrd.pdp_prep[ds].last_ds[1] = 'N';
@@ -127,7 +128,8 @@
rrd_free(&rrd);
return -1;
}
- strncpy(rrd.ds_def[ds].ds_nam,ds_new,DS_NAM_SIZE);
+ strncpy(rrd.ds_def[ds].ds_nam,ds_new,DS_NAM_SIZE-1);
+ rrd.ds_def[ds].ds_nam[DS_NAM_SIZE-1]='\0';
break;
case '?':
rrd_set_error("unknown option '%s'",argv[optind-1]);
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.c Sat Jul 13 19:22:35 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************
@@ -21,7 +21,7 @@
void PrintUsage(void)
{
printf("\n"
- "RRD TOOL 0.99.28 Copyright (C) 1999 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
+ "RRDtool Copyright (C) 1999 by Tobias Oetiker <tobi at oetiker.ch>\n\n"
"Usage: rrdtool [options] command command_options\n\n"
"Valid commands and command_options are listed below.\n\n"
@@ -30,14 +30,18 @@
"\t\t[--step|-s step]\n"
"\t\t[DS:ds-name:DST:heartbeat:min:max] [RRA:CF:xff:steps:rows]\n\n"
- "* dump - dump an RRD\n\n"
- "\trrdtool dump filename.rrd [--full|-f]\n\n"
+ "* dump - dump an RRD to XML\n\n"
+ "\trrdtool dump filename.rrd >filename.xml\n\n"
+
+ "* restore - restore an RRD file from its XML form\n\n"
+ "\trrdtool restore [--range-check|-r] filename.xml filename.rrd\n\n"
"* last - show last update time for RRD\n\n"
"\trrdtool last filename.rrd\n\n"
"* update - update an RRD\n\n"
"\trrdtool update filename\n"
+ "\t\t--template|-t ds-name:ds-name:...\n"
"\t\ttime|N:value[:value...]\n\n"
"\t\t[ time:value[:value...] ..]\n\n"
@@ -49,11 +53,15 @@
"* graph - generate a graph from one or several RRD\n\n"
"\trrdtool graph filename [-s|--start seconds] [-e|--end seconds]\n"
"\t\t[-x|--x-grid x-axis grid and label]\n"
+ "\t\t[--alt-y-grid]\n"
"\t\t[-y|--y-grid y-axis grid and label]\n"
"\t\t[-v|--vertical-label string] [-w|--width pixels]\n"
"\t\t[-h|--height pixels] [-o|--logarithmic]\n"
- "\t\t[-u|--upper-limit value]\n"
+ "\t\t[-u|--upper-limit value] [-z|--lazy]\n"
"\t\t[-l|--lower-limit value] [-r|--rigid]\n"
+ "\t\t[--alt-autoscale]\n"
+ "\t\t[-f|--imginfo printfstr]\n"
+ "\t\t[-a|--imgformat GIF|PNG]\n"
"\t\t[-c|--color COLORTAG#rrggbb] [-t|--title string]\n"
"\t\t[DEF:vname=rrd:ds-name:CF]\n"
"\t\t[CDEF:vname=rpn-expression]\n"
@@ -76,7 +84,7 @@
" * resize - alter the lenght of one of the RRAs in an RRD\n\n"
"\trrdtool resize filename rranum GROW|SHRINK rows\n\n"
- "RRD TOOL is distributed under the Terms of the GNU General\n"
+ "RRDtool is distributed under the Terms of the GNU General\n"
"Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n\n"
"For more information read the RRD manpages\n\n");
@@ -87,7 +95,12 @@
{
char **myargv;
char aLine[MAX_LENGTH];
-
+#ifdef MUST_DISABLE_SIGFPE
+ signal(SIGFPE,SIG_IGN);
+#endif
+#ifdef MUST_DISABLE_FPMASK
+ fpsetmask(0);
+#endif
if (argc == 1)
{
PrintUsage();
@@ -154,6 +167,9 @@
if (argc < 3
|| strcmp("help", argv[1]) == 0
+ || strcmp("--help", argv[1]) == 0
+ || strcmp("-help", argv[1]) == 0
+ || strcmp("-?", argv[1]) == 0
|| strcmp("-h", argv[1]) == 0 ) {
PrintUsage();
return 0;
@@ -163,6 +179,14 @@
rrd_create(argc-1, &argv[1]);
else if (strcmp("dump", argv[1]) == 0)
rrd_dump(argc-1, &argv[1]);
+ else if (strcmp("--version", argv[1]) == 0 ||
+ strcmp("version", argv[1]) == 0 ||
+ strcmp("v", argv[1]) == 0 ||
+ strcmp("-v", argv[1]) == 0 ||
+ strcmp("-version", argv[1]) == 0 )
+ printf("RRDtool Copyright (C) 1999 by Tobias Oetiker <tobi at oetiker.ch>\n");
+ else if (strcmp("restore", argv[1]) == 0)
+ rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
rrd_resize(argc-1, &argv[1]);
else if (strcmp("last", argv[1]) == 0)
@@ -196,7 +220,6 @@
char **calcpr;
int xsize, ysize;
int i;
- calcpr = NULL;
if( rrd_graph(argc-1, &argv[1], &calcpr, &xsize, &ysize) != -1 ) {
if (strcmp(argv[2],"-") != 0)
printf ("%dx%d\n",xsize,ysize);
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/Makefile.am Sat Jul 13 19:22:35 2002
@@ -0,0 +1,72 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+#
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
+GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@
+PNG_LIB_DIR = $(top_srcdir)/@PNG_LIB_DIR@
+ZLIB_LIB_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
+
+INCLUDES = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR)
+
+#COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+
+RRD_C_FILES = \
+ gdpng.c \
+ getopt.c \
+ getopt1.c \
+ gifsize.c \
+ parsetime.c \
+ pngsize.c \
+ rrd_create.c \
+ rrd_diff.c \
+ rrd_dump.c \
+ rrd_error.c \
+ rrd_fetch.c \
+ rrd_format.c \
+ rrd_graph.c \
+ rrd_last.c \
+ rrd_open.c \
+ rrd_resize.c \
+ rrd_restore.c \
+ rrd_tune.c \
+ rrd_update.c \
+ getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h
+
+# Build two libraries. One is a public one that gets installed in
+# $prefix/lib. Libtool does not create an archive of the PIC compiled
+# objects for this library type. The second library is a private one
+# meant to build the RRDs.so for perl-shared. In this case libtool
+# creates a ./.lib/*.al file that contains the PIC compiled object
+# files.
+
+RRD_LIBS = \
+ $(CGI_LIB_DIR)/librrd_cgi.la \
+ $(GD_LIB_DIR)/librrd_gd.la \
+ $(PNG_LIB_DIR)/librrd_png.la \
+ $(ZLIB_LIB_DIR)/librrd_z.la
+
+lib_LTLIBRARIES = librrd.la
+noinst_LTLIBRARIES = librrd_private.la
+
+librrd_la_SOURCES = $(RRD_C_FILES)
+librrd_private_la_SOURCES = $(RRD_C_FILES)
+
+librrd_la_LIBADD = $(RRD_LIBS)
+librrd_private_la_LIBADD = $(RRD_LIBS)
+librrd_la_LDFLAGS = -version-info 0:0:0
+
+bin_PROGRAMS = rrdcgi rrdtool
+
+rrdcgi_SOURCES = rrd_cgi.c
+rrdcgi_LDADD = librrd.la
+
+rrdtool_SOURCES = rrd_tool.c
+rrdtool_LDADD = librrd.la
+
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/parsetime.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/parsetime.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/parsetime.c Sat Jul 13 19:22:36 2002
@@ -1,4 +1,4 @@
-/*
+/*
* parsetime.c - parse time for at(1)
* Copyright (C) 1993, 1994 Thomas Koenig
*
@@ -9,6 +9,8 @@
* (including the new syntax being useful for RRDB)
* Copyright (C) 1999 Oleg Cherevko (aka Olwi Deer)
*
+ * severe structural damage inflicted by Tobi Oetiker in 1999
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -45,12 +47,13 @@
* TIME-REFERENCE ::= NOW | TIME-OF-DAY-SPEC [ DAY-SPEC-1 ] |
* [ TIME-OF-DAY-SPEC ] DAY-SPEC-2
*
- * TIME-OF-DAY-SPEC ::= NUMBER [(':'|'.') NUMBER] [am|pm] | # HH:MM HH.MM HH[MM]
+ * TIME-OF-DAY-SPEC ::= NUMBER (':') NUMBER [am|pm] | # HH:MM
* 'noon' | 'midnight' | 'teatime'
*
* DAY-SPEC-1 ::= NUMBER '/' NUMBER '/' NUMBER | # MM/DD/[YY]YY
* NUMBER '.' NUMBER '.' NUMBER | # DD.MM.[YY]YY
- * NUMBER # DDMM[YY]YY
+ * NUMBER # Seconds since 1970
+ * NUMBER # YYYYMMDD
*
* DAY-SPEC-2 ::= MONTH-NAME NUMBER [NUMBER] | # Month DD [YY]YY
* 'yesterday' | 'today' | 'tomorrow' |
@@ -106,17 +109,10 @@
/* System Headers */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <stdarg.h>
-
/* Local headers */
-#include "parsetime.h"
+#include "rrd_tool.h"
+#include <stdarg.h>
/* Structures and unions */
@@ -240,7 +236,7 @@
static char *sct; /* scanner - next char pointer in current argument */
static int need; /* scanner - need to advance to next argument */
-static char *sc_token; /* scanner - token buffer */
+static char *sc_token=NULL; /* scanner - token buffer */
static size_t sc_len; /* scanner - lenght of token buffer */
static int sc_tokid; /* scanner - token id */
@@ -264,6 +260,8 @@
* should return TIME_OK (aka NULL) or pointer to the error message,
* and should be called like this: try(func(args));
*
+ * if the try is not successfull it will reset the token pointer ...
+ *
* [NOTE: when try(...) is used as the only statement in the "if-true"
* part of the if statement that also has an "else" part it should be
* either enclosed in the curly braces (despite the fact that it looks
@@ -285,7 +283,6 @@
*/
#define panic(e) { \
- EnsureMemFree(); \
return (e); \
}
@@ -316,6 +313,33 @@
return( err );
}
+/* Compare S1 and S2, ignoring case, returning less than, equal to or
+ greater than zero if S1 is lexiographically less than,
+ equal to or greater than S2. -- copied from GNU libc*/
+static int
+mystrcasecmp (s1, s2)
+ const char *s1;
+ const char *s2;
+{
+ const unsigned char *p1 = (const unsigned char *) s1;
+ const unsigned char *p2 = (const unsigned char *) s2;
+ unsigned char c1, c2;
+
+ if (p1 == p2)
+ return 0;
+
+ do
+ {
+ c1 = tolower (*p1++);
+ c2 = tolower (*p2++);
+ if (c1 == '\0')
+ break;
+ }
+ while (c1 == c2);
+
+ return c1 - c2;
+}
+
/*
* parse a token, checking if it's something special to us
*/
@@ -325,7 +349,7 @@
int i;
for (i=0; Specials[i].name != NULL; i++)
- if (strcasecmp(Specials[i].name, arg) == 0)
+ if (mystrcasecmp(Specials[i].name, arg) == 0)
return sc_tokid = Specials[i].value;
/* not special - must be some random id */
@@ -333,6 +357,7 @@
} /* parse_token */
+
/*
* init_scanner() sets up the scanner to eat arguments
*/
@@ -346,7 +371,7 @@
while (argc-- > 0)
sc_len += strlen(*argv++);
- sc_token = (char *) malloc(sc_len);
+ sc_token = (char *) malloc(sc_len*sizeof(char));
if( sc_token == NULL )
return "Failed to allocate memory";
need_to_free = 1;
@@ -362,7 +387,7 @@
int idx;
while (1) {
- memset(sc_token, 0, sc_len);
+ memset(sc_token, '\0', sc_len);
sc_tokid = EOF;
idx = 0;
@@ -381,7 +406,7 @@
* we'll continue, which puts us up at the top of the while loop
* to fetch the next argument in
*/
- while (isspace(*sct) || *sct == '_' || *sct == ',' )
+ while (isspace((unsigned char)*sct) || *sct == '_' || *sct == ',' )
++sct;
if (!*sct) {
need = 1;
@@ -394,16 +419,16 @@
/* then see what it is
*/
- if (isdigit(sc_token[0])) {
- while (isdigit(*sct))
+ if (isdigit((unsigned char)(sc_token[0]))) {
+ while (isdigit((unsigned char)(*sct)))
sc_token[++idx] = *sct++;
- sc_token[++idx] = 0;
+ sc_token[++idx] = '\0';
return sc_tokid = NUMBER;
}
- else if (isalpha(sc_token[0])) {
- while (isalpha(*sct))
+ else if (isalpha((unsigned char)(sc_token[0]))) {
+ while (isalpha((unsigned char)(*sct)))
sc_token[++idx] = *sct++;
- sc_token[++idx] = 0;
+ sc_token[++idx] = '\0';
return parse_token(sc_token);
}
else switch(sc_token[0]) {
@@ -412,7 +437,10 @@
case '+': return sc_tokid = PLUS;
case '-': return sc_tokid = MINUS;
case '/': return sc_tokid = SLASH;
- default: return sc_tokid = JUNK;
+ default:
+ /*OK, we did not make it ... */
+ sct--;
+ return sc_tokid = EOF;
}
} /* while (1) */
} /* token */
@@ -477,8 +505,8 @@
break;
default:
- if( delta < 25 ) /* it may be some other value but in the context
- * of RRD who needs less than 25 min deltas? */
+ if( delta < 6 ) /* it may be some other value but in the context
+ * of RRD who needs less than 6 min deltas? */
sc_tokid = MONTHS;
else
sc_tokid = MINUTES;
@@ -496,7 +524,7 @@
delta *= 7;
/* FALLTHRU */
case DAYS:
- ptv->tm.tm_mday += (op == PLUS) ? delta : -delta;
+ ptv->tm.tm_mday += (op == PLUS) ? delta : -delta;
return TIME_OK;
case HOURS:
ptv->offset += (op == PLUS) ? delta*60*60 : -delta*60*60;
@@ -507,6 +535,9 @@
case SECONDS:
ptv->offset += (op == PLUS) ? delta : -delta;
return TIME_OK;
+ default: /*default unit is seconds */
+ ptv->offset += (op == PLUS) ? delta : -delta;
+ return TIME_OK;
}
panic(e("well-known time unit expected after %d", delta));
/* NORETURN */
@@ -522,32 +553,39 @@
{
int hour, minute = 0;
int tlen;
+ /* save token status in case we must abort */
+ int scc_sv = scc;
+ char *sct_sv = sct;
+ int sc_tokid_sv = sc_tokid;
- hour = atoi(sc_token);
tlen = strlen(sc_token);
+
+ /* first pick out the time of day - we assume a HH (COLON|DOT) MM time
+ */
+ if (tlen > 2) {
+ return TIME_OK;
+ }
+
+ hour = atoi(sc_token);
- /* first pick out the time of day - if it's 4 digits, we assume
- * a HHMM time, otherwise it's HH (COLON|DOT) MM time
- */
token();
- if (sc_tokid == COLON || sc_tokid == DOT) {
+ if (sc_tokid == SLASH || sc_tokid == DOT) {
+ /* guess we are looking at a date */
+ scc = scc_sv;
+ sct = sct_sv;
+ sc_tokid = sc_tokid_sv;
+ sprintf (sc_token,"%d", hour);
+ return TIME_OK;
+ }
+ if (sc_tokid == COLON ) {
try(expect(NUMBER,
- "Parsing HH%cMM syntax, expecting MM as number, got none",
- sc_tokid == DOT ? '.' : ':' ));
+ "Parsing HH:MM syntax, expecting MM as number, got none"));
minute = atoi(sc_token);
if (minute > 59) {
- panic(e("parsing HH%cMM syntax, got MM = %d (>59!)",
- sc_tokid == DOT ? '.' : ':', minute ));
+ panic(e("parsing HH:MM syntax, got MM = %d (>59!)", minute ));
}
token();
}
- else if (tlen == 4) {
- minute = hour%100;
- if (minute > 59) {
- panic(e("parsing HHMM syntax, got MM = %d (>59!)", minute ));
- }
- hour = hour/100;
- }
/* check if an AM or PM specifier was given
*/
@@ -563,9 +601,14 @@
hour = 0;
}
token();
- }
+ }
else if (hour > 23) {
- panic(e("the time-of-day hour > 23"));
+ /* guess it was not a time then ... */
+ scc = scc_sv;
+ sct = sct_sv;
+ sc_tokid = sc_tokid_sv;
+ sprintf (sc_token,"%d", hour);
+ return TIME_OK;
}
ptv->tm.tm_hour = hour;
ptv->tm.tm_min = minute;
@@ -615,7 +658,7 @@
static char *
day(struct time_value *ptv)
{
- long mday, wday, mon, year = ptv->tm.tm_year;
+ long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
switch (sc_tokid) {
@@ -665,48 +708,49 @@
*/
case NUMBER:
- /* get numeric DDMM[YY]YY, MM/DD/[YY]YY, or DD.MM.[YY]YY
+ /* get numeric <sec since 1970>, MM/DD/[YY]YY, or DD.MM.[YY]YY
*/
tlen = strlen(sc_token);
mon = atol(sc_token);
- token();
-
- if (sc_tokid == SLASH || sc_tokid == DOT) {
- int sep;
+ if (mon > 10*356*24*60*60) {
+ ptv->tm=*localtime(&mon);
+ token();
+ break;
+ }
+ if (mon > 19700101 && mon < 24000101){ /*works between 1900 and 2400 */
+ char cmon[3],cmday[3],cyear[5];
+ strncpy(cyear,sc_token,4);cyear[4]='\0';
+ year = atol(cyear);
+ strncpy(cmon,&(sc_token[4]),2);cmon[2]='\0';
+ mon = atol(cmon);
+ strncpy(cmday,&(sc_token[6]),2);cmday[2]='\0';
+ mday = atol(cmday);
+ token();
+ } else {
+ token();
+
+ if (mon <= 31 && (sc_tokid == SLASH || sc_tokid == DOT)) {
+ int sep;
sep = sc_tokid;
try(expect(NUMBER,"there should be %s number after '%c'",
sep == DOT ? "month" : "day", sep == DOT ? '.' : '/'));
mday = atol(sc_token);
if (token() == sep) {
- try(expect(NUMBER,"there should be year number after '%c'",
- sep == DOT ? '.' : '/'));
- year = atol(sc_token);
- token();
+ try(expect(NUMBER,"there should be year number after '%c'",
+ sep == DOT ? '.' : '/'));
+ year = atol(sc_token);
+ token();
}
-
+
/* flip months and days for european timing
*/
if (sep == DOT) {
- long x = mday;
- mday = mon;
- mon = x;
- }
- }
- else if (tlen == 6 || tlen == 8) {
- if (tlen == 8) {
- year = (mon % 10000) - 1900;
- mon /= 10000;
+ long x = mday;
+ mday = mon;
+ mon = x;
}
- else {
- year = mon % 100;
- mon /= 100;
- }
- mday = mon / 100;
- mon %= 100;
- }
- else {
- panic(e("can't parse your date as DDMM[YY]YY"));
+ }
}
mon--;
@@ -715,13 +759,12 @@
}
if(mday < 1 || mday > 31) {
panic(e("I'm afraid that %d is not a valid day of the month",
- mday));
- }
-
+ mday));
+ }
try(assign_date(ptv, mday, mon, year));
break;
} /* case */
- return TIME_OK;
+ return TIME_OK;
} /* month */
@@ -752,7 +795,7 @@
ptv->type = ABSOLUTE_TIME;
ptv->offset = 0;
ptv->tm = *localtime(&now);
- ptv->tm.tm_isdst = -1; /* ?not needed? */
+ ptv->tm.tm_isdst = -1; /* mk time can figure this out for us ... */
token();
switch (sc_tokid) {
@@ -784,15 +827,21 @@
}
else
if( sc_tokid != EOF ) {
- panic(e("'now' can be followed only be +|- offset"));
+ panic(e("if 'now' is followed by a token it must be +|- offset"));
}
};
break;
/* Only absolute time specifications below */
case NUMBER:
- try(tod(ptv));
- try(day(ptv));
+ try(tod(ptv))
+ if (sc_tokid != NUMBER) break;
+ /* fix month parsing */
+ case JAN: case FEB: case MAR: case APR: case MAY: case JUN:
+ case JUL: case AUG: case SEP: case OCT: case NOV: case DEC:
+ try(day(ptv));
+ if (sc_tokid != NUMBER) break;
+ try(tod(ptv))
break;
/* evil coding for TEATIME|NOON|MIDNIGHT - we've initialised
@@ -815,11 +864,11 @@
}
ptv->tm.tm_hour = hr;
ptv->tm.tm_min = 0;
+ ptv->tm.tm_sec = 0;
token();
- /* fall through to month setting */
- /* FALLTHRU */
+ break;
default:
- try(day(ptv));
+ panic(e("unparsable time: %s%s",sc_token,sct));
break;
} /* ugly case statement */
@@ -843,7 +892,7 @@
/* now we should be at EOF */
if( sc_tokid != EOF ) {
- panic(e("unparsable trailing text: '...%s%s'", sc_token, sct ));
+ panic(e("unparsable trailing text: '...%s%s'", sc_token, sct));
}
ptv->tm.tm_isdst = -1; /* for mktime to guess DST status */
@@ -853,5 +902,60 @@
/* when winter -> summer time correction eats a hour */
panic(e("the specified time is incorrect (out of range?)"));
}
+ EnsureMemFree();
return TIME_OK;
} /* parsetime */
+
+
+int proc_start_end (struct time_value *start_tv,
+ struct time_value *end_tv,
+ time_t *start,
+ time_t *end){
+ if (start_tv->type == RELATIVE_TO_END_TIME && /* same as the line above */
+ end_tv->type == RELATIVE_TO_START_TIME) {
+ rrd_set_error("the start and end times cannot be specified "
+ "relative to each other");
+ return -1;
+ }
+
+ if (start_tv->type == RELATIVE_TO_START_TIME) {
+ rrd_set_error("the start time cannot be specified relative to itself");
+ return -1;
+ }
+
+ if (end_tv->type == RELATIVE_TO_END_TIME) {
+ rrd_set_error("the end time cannot be specified relative to itself");
+ return -1;
+ }
+
+ if( start_tv->type == RELATIVE_TO_END_TIME) {
+ struct tm tmtmp;
+ *end = mktime(&(end_tv->tm)) + end_tv->offset;
+ tmtmp = *localtime(end); /* reinit end including offset */
+ tmtmp.tm_mday += start_tv->tm.tm_mday;
+ tmtmp.tm_mon += start_tv->tm.tm_mon;
+ tmtmp.tm_year += start_tv->tm.tm_year;
+ *start = mktime(&tmtmp) + start_tv->offset;
+ } else {
+ *start = mktime(&(start_tv->tm)) + start_tv->offset;
+ }
+ if (end_tv->type == RELATIVE_TO_START_TIME) {
+ struct tm tmtmp;
+ *start = mktime(&(start_tv->tm)) + start_tv->offset;
+ tmtmp = *localtime(start);
+ tmtmp.tm_mday += end_tv->tm.tm_mday;
+ tmtmp.tm_mon += end_tv->tm.tm_mon;
+ tmtmp.tm_year += end_tv->tm.tm_year;
+ *end = mktime(&tmtmp) + end_tv->offset;
+ } else {
+ *end = mktime(&(end_tv->tm)) + end_tv->offset;
+ }
+ return 0;
+} /* proc_start_end */
+
+
+
+
+
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrdtool.dsp Sat Jul 13 19:22:36 2002
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\gd1.2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x100c /d "NDEBUG"
# ADD RSC /l 0x100c /d "NDEBUG"
@@ -51,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.2\release\gd.lib release\rrd.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\release\gd.lib release\rrd.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386
!ELSEIF "$(CFG)" == "rrdtool - Win32 Debug"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\gd1.2" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\gd1.3" /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x100c /d "_DEBUG"
# ADD RSC /l 0x100c /d "_DEBUG"
@@ -76,7 +76,7 @@
# ADD BSC32 /nologo /o"rrdtool.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.2\debug\gd.lib debug\rrd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\gd1.3\debug\gd.lib debug\rrd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_tool.h Sat Jul 13 19:22:36 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997,1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997,1998, 1999
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************
@@ -22,6 +22,14 @@
#endif
#endif
+#ifdef MUST_DISABLE_SIGFPE
+#include <signal.h>
+#endif
+
+#ifdef MUST_DISABLE_FPMASK
+#include <floatingpoint.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -50,9 +58,8 @@
#endif /* __svr4__ && __sun__ */
#endif
-#ifdef WANT_AT_STYLE_TIMESPEC
#include "parsetime.h"
-#endif
+int proc_start_end (struct time_value *, struct time_value *, time_t *, time_t *);
#ifndef WIN32
@@ -67,7 +74,8 @@
#include <float.h> /* for _isnan */
#define isnan _isnan
-
+#define finite _finite
+#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
#endif
/* local include files -- need to be after the system ones */
@@ -91,6 +99,7 @@
int rrd_fetch(int argc, char **argv,
time_t *start, time_t *end, unsigned long *step,
unsigned long *ds_cnt, char ***ds_namv, rrd_value_t **data);
+int rrd_restore(int argc, char **argv);
int rrd_dump(int argc, char **argv);
int rrd_tune(int argc, char **argv);
time_t rrd_last(int argc, char **argv);
@@ -102,7 +111,11 @@
int rrd_test_error(void);
char *rrd_get_error(void);
int LockRRD(FILE *);
-
+int GifSize(FILE *, long *, long *);
+int PngSize(FILE *, long *, long *);
+int PngSize(FILE *, long *, long *);
+#include <gd.h>
+void gdImagePng(gdImagePtr im, FILE *out);
int rrd_create_fn(char *file_name, rrd_t *rrd);
int rrd_fetch_fn(char *filename, enum cf_en cf_idx,
time_t *start,time_t *end,
@@ -114,6 +127,7 @@
void rrd_init(rrd_t *rrd);
int rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr);
+int readfile(char *file, char **buffer, int skipfirst);
#define RRD_READONLY 0
Modified: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_update.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_update.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_update.c Sat Jul 13 19:22:36 2002
@@ -1,5 +1,5 @@
/*****************************************************************************
- * RRDTOOL 0.99.31 Copyright Tobias Oetiker, 1997, 1998, 1999
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
*****************************************************************************
* rrd_update.c RRD Update Function
*****************************************************************************
@@ -15,8 +15,6 @@
#include <sys/locking.h>
#include <sys/stat.h>
#include <io.h>
-#else
- #include <unistd.h>
#endif
@@ -39,6 +37,9 @@
* area in the rrd file. this
* pointer changes as each rrd is
* processed. */
+ unsigned long rra_current; /* byte pointer to the current write
+ * spot in the rrd file. */
+ unsigned long rra_pos_tmp; /* temporary byte pointer. */
unsigned long interval,
pre_int,post_int; /* interval between this and
* the last run */
@@ -63,7 +64,7 @@
long *tmpl_idx; /* index representing the settings
transported by the template index */
- long tmpl_max = 0;
+ long tmpl_cnt = 2; /* time and data */
FILE *rrd_file;
rrd_t rrd;
@@ -72,7 +73,6 @@
int wrote_to_file = 0;
char *template = NULL;
- rrd_init(&rrd);
while (1) {
static struct option long_options[] =
{
@@ -108,8 +108,7 @@
if(rrd_open(argv[optind],&rrd_file,&rrd, RRD_READWRITE)==-1){
return -1;
}
- rra_begin=ftell(rrd_file);
- rra_start=rra_begin;
+ rra_current = rra_start = rra_begin = ftell(rrd_file);
/* get exclusive lock to whole file.
* lock gets removed when we close the file.
@@ -147,27 +146,35 @@
return(-1);
}
/* initialize template redirector */
+
+ /* the first entry [0] points to zero as the first entry in an
+ update argument is always the time. The remaining entries point
+ the the index number of their respective datasource. */
for (i=0;i<=rrd.stat_head->ds_cnt;i++) tmpl_idx[i]=i;
- tmpl_max=rrd.stat_head->ds_cnt;
+ tmpl_cnt=rrd.stat_head->ds_cnt+1;
if (template) {
char *dsname;
- long temp_len;
+ int tmpl_len;
dsname = template;
- temp_len = strlen(template);
- tmpl_max = 0;
- for (i=0;i<=temp_len;i++) {
- if (template[i] == ':' || template[i] =='\0') {
+ template++;
+ tmpl_cnt = 1; /* the first entry is the time */
+ tmpl_len = strlen(template);
+ for(i=0;i<=tmpl_len;i++) {
+ if (template[i] == ':' || template[i] == '\0') {
template[i] = '\0';
- if ((tmpl_idx[++tmpl_max] = ds_match(&rrd,dsname)) == -1){ free(updvals);
- free(pdp_temp);
- free(tmpl_idx);
- rrd_free(&rrd);
- fclose(rrd_file);
- return(-1);
+ if ((tmpl_idx[tmpl_cnt++] = ds_match(&rrd,dsname)) == -1){
+ free(updvals); free(pdp_temp);
+ free(tmpl_idx); rrd_free(&rrd);
+ fclose(rrd_file); return(-1);
}
/* the first element is always the time */
- tmpl_idx[tmpl_max]++;
+ tmpl_idx[tmpl_cnt-1]++;
+
+ /* go to the next entry on the template */
+ dsname = &template[i+1];
+
}
+
}
}
if ((pdp_new = malloc(sizeof(rrd_value_t)
@@ -183,35 +190,27 @@
/* loop through the arguments. */
for(arg_i=optind+1; arg_i<argc;arg_i++) {
- unsigned long count_colons = 0;
-
-/* fprintf(stderr, "Handling %s\t%s\n", argv[arg_i]); */
- /* parse the update line ... the first value is the time, the
- remaining ones are the datasources */
- /* skip any initial :'s */
- i=0;
- while (argv[arg_i][i] && argv[arg_i][i] == ':')
- ++i;
-
+ char *stepper;;
/* initialize all ds input to unknown except the first one
which has always got to be set */
- for(ii=1;ii<=rrd.stat_head->ds_cnt;ii++)
- updvals[ii] = "U";
+ for(ii=1;ii<=rrd.stat_head->ds_cnt;ii++) updvals[ii] = "U";
ii=0;
- updvals[ii++] = &argv[arg_i][i];
- for (;argv[arg_i][i] != '\0';++i) {
- if (argv[arg_i][i] == ':') {
- count_colons++;
- argv[arg_i][i] = '\0';
- if (ii<=tmpl_max) {
- updvals[tmpl_idx[ii++]] = &argv[arg_i][i+1];
+ stepper = argv[arg_i];
+ updvals[0]=stepper;
+ while (*stepper) {
+ if (*stepper == ':') {
+ *stepper = '\0';
+ ii++;
+ if (ii<tmpl_cnt){
+ updvals[tmpl_idx[ii]] = stepper+1;
}
}
+ stepper++;
}
- if (ii-1 != count_colons || ii-1 != tmpl_max) {
- rrd_set_error("expected %lu data source readings (got %lu) from %s...",
- tmpl_max, count_colons, argv[arg_i]);
+ if (ii+1 != tmpl_cnt) {
+ rrd_set_error("expected %lu data source readings (got %lu) from %s:...",
+ tmpl_cnt-1, ii, argv[arg_i]);
break;
}
@@ -231,11 +230,13 @@
/* seek to the beginning of the rrd's */
- if(fseek(rrd_file, rra_begin, SEEK_SET) != 0) {
- rrd_set_error("seek error in rrd");
- break;
+ if (rra_current != rra_begin) {
+ if(fseek(rrd_file, rra_begin, SEEK_SET) != 0) {
+ rrd_set_error("seek error in rrd");
+ break;
+ }
+ rra_current = rra_begin;
}
-
rra_start = rra_begin;
/* when was the current pdp started */
@@ -335,7 +336,7 @@
if(dst_idx == DST_COUNTER || dst_idx == DST_DERIVE){
strncpy(rrd.pdp_prep[i].last_ds,
updvals[i+1],LAST_DS_LEN-1);
- rrd.pdp_prep[i].last_ds[LAST_DS_LEN]=0;
+ rrd.pdp_prep[i].last_ds[LAST_DS_LEN-1]='\0';
}
}
/* break out of the argument parsing loop if the error_string is set */
@@ -451,13 +452,15 @@
#ifdef DEBUG
fprintf(stderr," -- RRA Preseek %ld\n",ftell(rrd_file));
#endif
-
- if(fseek(rrd_file,
- (rra_start + (rrd.stat_head->ds_cnt
- *rrd.rra_ptr[i].cur_row
- * sizeof(rrd_value_t))), SEEK_SET) != 0){
- rrd_set_error("seek error in rrd");
- break;
+ /* determine if a seek is even needed. */
+ rra_pos_tmp = rra_start +
+ rrd.stat_head->ds_cnt*rrd.rra_ptr[i].cur_row*sizeof(rrd_value_t);
+ if(rra_pos_tmp != rra_current) {
+ if(fseek(rrd_file, rra_pos_tmp, SEEK_SET) != 0){
+ rrd_set_error("seek error in rrd");
+ break;
+ }
+ rra_current = rra_pos_tmp;
}
#ifdef DEBUG
fprintf(stderr," -- RRA Postseek %ld\n",ftell(rrd_file));
@@ -562,6 +565,7 @@
rrd_set_error("writing rrd");
break;
}
+ rra_current += sizeof(rrd_value_t);
wrote_to_file = 1;
#ifdef DEBUG
Added: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_restore.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_restore.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/src/rrd_restore.c Sat Jul 13 19:22:36 2002
@@ -0,0 +1,369 @@
+/*****************************************************************************
+ * RRDtool Copyright Tobias Oetiker, 1997, 1998, 1999
+ *****************************************************************************
+ * rrd_restore.c creates new rrd from data dumped by rrd_dump.c
+ *****************************************************************************/
+
+#include "rrd_tool.h"
+
+/* convert all ocurances of <BlaBlaBla> to <blablabla> */
+
+void xml_lc(char* buf){
+ int intag=0;
+ while((*buf)){
+ if (intag ==0 && (*buf) == '<') {
+ intag = 1;
+ }
+ else if (intag ==1 && (*buf) == '>') {
+ intag = 0;
+ continue;
+ } else if (intag ==1) {
+ *buf = tolower(*buf);
+ }
+ buf++;
+ }
+}
+
+int skip(char **buf){
+ char *ptr;
+ ptr=(*buf);
+ do {
+ (*buf)=ptr;
+ while((*(ptr+1)) && ((*ptr)==' ' || (*ptr)=='\r' || (*ptr)=='\n' || (*ptr)=='\t')) ptr++;
+ if (strncmp(ptr,"<!--",4) == 0) {
+ ptr= strstr(ptr,"-->");
+ if (ptr) ptr+=3; else {
+ rrd_set_error("Dangling Comment");
+ (*buf) = NULL;
+ return -1;
+ }
+ }
+ } while ((*buf)!=ptr);
+ return 1;
+}
+
+int eat_tag(char **buf, char *tag){
+ if ((*buf)==NULL) return -1; /* fall though clause */
+
+ rrd_clear_error();
+ skip(buf);
+ if ((**buf)=='<'
+ && strncmp((*buf)+1,tag,strlen(tag)) == 0
+ && *((*buf)+strlen(tag)+1)=='>') {
+ (*buf) += strlen(tag)+2;
+ }
+ else {
+ rrd_set_error("No <%s> tag found",tag);
+ (*buf) = NULL;
+ return -1;
+ }
+ skip(buf);
+ return 1;
+}
+
+int read_tag(char **buf, char *tag, char *format, void *value){
+ char *end_tag;
+ int matches;
+ if ((*buf)==NULL) return -1; /* fall though clause */
+ rrd_clear_error();
+ if (eat_tag(buf,tag)==1){
+ char *temp;
+ temp = (*buf);
+ while(*((*buf)+1) && (*(*buf) != '<')) (*buf)++; /*find start of endtag*/
+ *(*buf) = '\0';
+ matches =sscanf(temp,format,value);
+ *(*buf) = '<';
+ end_tag = malloc((strlen(tag)+2)*sizeof(char));
+ sprintf(end_tag,"/%s",tag);
+ eat_tag(buf,end_tag);
+ free(end_tag);
+ if (matches == 0 && strcmp(format,"%lf") == 0)
+ (*((double* )(value))) = DNAN;
+ if (matches != 1) return 0;
+ return 1;
+ }
+ return -1;
+}
+
+
+/* parse the data stored in buf and return a filled rrd structure */
+int xml2rrd(char* buf, rrd_t* rrd, char rc){
+ /* pass 1 identify number of RRAs */
+ char *ptr,*ptr2,*ptr3; /* walks thought the buffer */
+ long rows=0,mempool=0,i=0;
+ xml_lc(buf); /* lets lowercase all active parts of the xml */
+ ptr=buf;
+ ptr2=buf;
+ ptr3=buf;
+ /* start with an RRD tag */
+
+ eat_tag(&ptr,"rrd");
+ /* allocate static header */
+ if((rrd->stat_head = calloc(1,sizeof(stat_head_t)))==NULL){
+ rrd_set_error("allocating rrd.stat_head");
+ return -1;
+ };
+
+ strcpy(rrd->stat_head->cookie,RRD_COOKIE);
+ read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
+ rrd->stat_head->float_cookie = FLOAT_COOKIE;
+ rrd->stat_head->ds_cnt = 0;
+ rrd->stat_head->rra_cnt = 0;
+ read_tag(&ptr,"step","%lu",&(rrd->stat_head->pdp_step));
+
+ /* allocate live head */
+ if((rrd->live_head = calloc(1,sizeof(live_head_t)))==NULL){
+ rrd_set_error("allocating rrd.live_head");
+ return -1;
+ }
+ read_tag(&ptr,"lastupdate","%lu",&(rrd->live_head->last_up));
+
+ /* Data Source Definition Part */
+ ptr2 = ptr;
+ while (eat_tag(&ptr2,"ds") == 1){
+ rrd->stat_head->ds_cnt++;
+ if((rrd->ds_def = rrd_realloc(rrd->ds_def,rrd->stat_head->ds_cnt*sizeof(ds_def_t)))==NULL){
+ rrd_set_error("allocating rrd.ds_def");
+ return -1;
+ };
+ /* clean out memory to make sure no data gets stored from previous tasks */
+ memset(&(rrd->ds_def[rrd->stat_head->ds_cnt-1]), 0, sizeof(ds_def_t));
+ if((rrd->pdp_prep = rrd_realloc(rrd->pdp_prep,rrd->stat_head->ds_cnt
+ *sizeof(pdp_prep_t)))==NULL){
+ rrd_set_error("allocating pdp_prep");
+ return(-1);
+ }
+ /* clean out memory to make sure no data gets stored from previous tasks */
+ memset(&(rrd->pdp_prep[rrd->stat_head->ds_cnt-1]), 0, sizeof(pdp_prep_t));
+
+ read_tag(&ptr2,"name",DS_NAM_FMT,rrd->ds_def[rrd->stat_head->ds_cnt-1].ds_nam);
+
+ read_tag(&ptr2,"type",DST_FMT,rrd->ds_def[rrd->stat_head->ds_cnt-1].dst);
+ /* test for valid type */
+ if(dst_conv(rrd->ds_def[rrd->stat_head->ds_cnt-1].dst) == -1) return -1;
+
+ read_tag(&ptr2,"minimal_heartbeat","%lu",
+ &(rrd->ds_def[rrd->stat_head->ds_cnt-1].par[DS_mrhb_cnt].u_cnt));
+ read_tag(&ptr2,"min","%lf",&(rrd->ds_def[rrd->stat_head->ds_cnt-1].par[DS_min_val].u_val));
+ read_tag(&ptr2,"max","%lf",&(rrd->ds_def[rrd->stat_head->ds_cnt-1].par[DS_max_val].u_val));
+
+ read_tag(&ptr2,"last_ds","%30s",rrd->pdp_prep[rrd->stat_head->ds_cnt-1].last_ds);
+ read_tag(&ptr2,"value","%lf",&(rrd->pdp_prep[rrd->stat_head->ds_cnt-1].scratch[PDP_val].u_val));
+ read_tag(&ptr2,"unknown_sec","%lu",&(rrd->pdp_prep[i].scratch[PDP_unkn_sec_cnt].u_cnt));
+ eat_tag(&ptr2,"/ds");
+ ptr=ptr2;
+ }
+
+ ptr2 = ptr;
+ while (eat_tag(&ptr2,"rra") == 1){
+ long i;
+ rrd->stat_head->rra_cnt++;
+
+ /* alocate and reset rra definition areas */
+ if((rrd->rra_def = rrd_realloc(rrd->rra_def,rrd->stat_head->rra_cnt*sizeof(rra_def_t)))==NULL){
+ rrd_set_error("allocating rra_def"); return -1; }
+ memset(&(rrd->rra_def[rrd->stat_head->rra_cnt-1]), 0, sizeof(rra_def_t));
+
+ /* alocate and reset consolidation point areas */
+ if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
+ rrd->stat_head->rra_cnt
+ *rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){
+ rrd_set_error("allocating cdp_prep"); return -1; }
+
+ memset(&(rrd->cdp_prep[rrd->stat_head->ds_cnt*(rrd->stat_head->rra_cnt-1)]),
+ 0, rrd->stat_head->ds_cnt*sizeof(cdp_prep_t));
+
+
+ read_tag(&ptr2,"cf",CF_NAM_FMT,rrd->rra_def[rrd->stat_head->rra_cnt-1].cf_nam);
+ /* test for valid type */
+ if(cf_conv(rrd->rra_def[rrd->stat_head->rra_cnt-1].cf_nam) == -1) return -1;
+
+ read_tag(&ptr2,"pdp_per_row","%lu",&(rrd->rra_def[rrd->stat_head->rra_cnt-1].pdp_cnt));
+
+ eat_tag(&ptr2,"cdp_prep");
+ for(i=0;i<rrd->stat_head->ds_cnt;i++){
+ eat_tag(&ptr2,"ds");
+ read_tag(&ptr2,"value","%lf",&(rrd->cdp_prep[rrd->stat_head->ds_cnt*
+ (rrd->stat_head->rra_cnt-1)
+ +i].scratch[CDP_val].u_val));
+ read_tag(&ptr2,"unknown_datapoints","%lu",&(rrd->cdp_prep[rrd->stat_head->ds_cnt
+ *(rrd->stat_head->rra_cnt-1)
+ +i].scratch[CDP_unkn_pdp_cnt].u_cnt));
+ eat_tag(&ptr2,"/ds");
+ }
+ eat_tag(&ptr2,"/cdp_prep");
+ rrd->rra_def[rrd->stat_head->rra_cnt-1].row_cnt=0;
+ eat_tag(&ptr2,"database");
+ ptr3 = ptr2;
+ while (eat_tag(&ptr3,"row") == 1){
+
+ if(mempool==0){
+ mempool = 1000;
+ if((rrd->rrd_value = rrd_realloc(rrd->rrd_value,
+ (rows+mempool)*(rrd->stat_head->ds_cnt)
+ *sizeof(rrd_value_t)))==NULL) {
+ rrd_set_error("allocating rrd_values"); return -1; }
+ }
+ rows++;
+ mempool--;
+ rrd->rra_def[rrd->stat_head->rra_cnt-1].row_cnt++;
+ for(i=0;i<rrd->stat_head->ds_cnt;i++){
+
+ rrd_value_t * value = &(rrd->rrd_value[(rows-1)*rrd->stat_head->ds_cnt+i]);
+
+ read_tag(&ptr3,"v","%lf", value);
+
+ if (
+ (rc == 1) /* do we have to check for the ranges */
+ &&
+ (!isnan(*value)) /* not a NAN value */
+ &&
+ ( /* min defined and in the range ? */
+ (!isnan(rrd->ds_def[i].par[DS_min_val].u_val)
+ && (*value < rrd->ds_def[i].par[DS_min_val].u_val))
+ || /* max defined and in the range ? */
+ (!isnan(rrd->ds_def[i].par[DS_max_val].u_val)
+ && (*value > rrd->ds_def[i].par[DS_max_val].u_val))
+ )
+ ) {
+ fprintf (stderr, "out of range found [ds: %lu], [value : %0.10e]\n", i, *value);
+ *value = DNAN;
+ }
+ }
+ eat_tag(&ptr3,"/row");
+ ptr2=ptr3;
+ }
+ eat_tag(&ptr2,"/database");
+ eat_tag(&ptr2,"/rra");
+ ptr=ptr2;
+ }
+ eat_tag(&ptr,"/rrd");
+
+ if((rrd->rra_ptr = calloc(1,sizeof(rra_ptr_t)*rrd->stat_head->rra_cnt)) == NULL) {
+ rrd_set_error("allocating rra_ptr");
+ return(-1);
+ }
+
+ for(i=0; i <rrd->stat_head->rra_cnt; i++) {
+ rrd->rra_ptr[i].cur_row = rrd->rra_def[i].row_cnt-1;
+ }
+ if (ptr==NULL)
+ return -1;
+ return 1;
+}
+
+
+
+
+
+/* create and empty rrd file according to the specs given */
+
+int
+rrd_write(char *file_name, rrd_t *rrd)
+{
+ unsigned long i,ii,val_cnt;
+ FILE *rrd_file=NULL;
+
+ if (strcmp("-",file_name)==0){
+ *rrd_file= *stdout;
+ } else {
+ if ((rrd_file = fopen(file_name,"wb")) == NULL ) {
+ rrd_set_error("can't create '%s'",file_name);
+ rrd_free(rrd);
+ return(-1);
+ }
+ }
+ fwrite(rrd->stat_head,
+ sizeof(stat_head_t), 1, rrd_file);
+
+ fwrite(rrd->ds_def,
+ sizeof(ds_def_t), rrd->stat_head->ds_cnt, rrd_file);
+
+ fwrite(rrd->rra_def,
+ sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file);
+
+ fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
+
+ fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file);
+
+ fwrite( rrd->cdp_prep, sizeof(cdp_prep_t),rrd->stat_head->rra_cnt*
+ rrd->stat_head->ds_cnt,rrd_file);
+ fwrite( rrd->rra_ptr, sizeof(rra_ptr_t), rrd->stat_head->rra_cnt,rrd_file);
+
+
+
+ /* calculate the number of rrd_values to dump */
+ val_cnt=0;
+ for(i=0; i < rrd->stat_head->rra_cnt; i++)
+ for(ii=0; ii < rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt;ii++)
+ val_cnt++;
+ fwrite( rrd->rrd_value, sizeof(rrd_value_t),val_cnt,rrd_file);
+
+ /* lets see if we had an error */
+ if(ferror(rrd_file)){
+ rrd_set_error("a file error occurred while creating '%s'",file_name);
+ fclose(rrd_file);
+ return(-1);
+ }
+
+ fclose(rrd_file);
+ return 0;
+}
+
+
+int
+rrd_restore(int argc, char **argv)
+{
+ rrd_t rrd;
+ char *buf;
+ char rc = 0;
+
+ /* init rrd clean */
+ rrd_init(&rrd);
+ if (argc<3) {
+ rrd_set_error("usage rrdtool %s [--range-check/-r] file.xml file.rrd",argv[0]);
+ return -1;
+ }
+
+ while (1) {
+ static struct option long_options[] =
+ {
+ {"range-check", required_argument, 0, 'r'},
+ {0,0,0,0}
+ };
+ int option_index = 0;
+ int opt;
+
+
+ opt = getopt_long(argc, argv, "r", long_options, &option_index);
+
+ if (opt == EOF)
+ break;
+
+ switch(opt) {
+ case 'r':
+ rc=1;
+ break;
+ default:
+ rrd_set_error("usage rrdtool %s [--range-check|-r] file.xml file.rrd",argv[0]);
+ return -1;
+ break;
+ }
+ }
+
+ if (readfile(argv[optind],&buf,0)==-1){
+ return -1;
+ }
+ if (xml2rrd(buf,&rrd,rc)==-1) {
+ rrd_free(&rrd);
+ free(buf);
+ return -1;
+ }
+ free(buf);
+ if(rrd_write(argv[optind+1],&rrd)==-1){
+ rrd_free(&rrd);
+ return -1;
+ };
+ rrd_free(&rrd);
+ return 0;
+}
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/src/rrd.dsw
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiGetValue.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiGetValue.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiGetValue.3 Sat Jul 13 19:22:37 2002
@@ -0,0 +1,50 @@
+.\" cgiInit - Initializes cgi library
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgiInit 3 "14 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgiInit \- Initializes cgi library
+.SH SYNOPSYS
+.nf
+.B #include <cgi.h>
+.sp
+.BI "char *cgiGetValue(s_cgi **" parms ", const char *" var );
+.fi
+.SH DESCRIPTION
+This routine returns a pointer to the value of a cgi variable.
+Encoded characters (%nn) are already decoded. One must not free the
+pointer.
+
+If
+.B multiple
+fields are used (i.e. a variable that may contain several values) the
+value returned contains all these values concatenated together with a
+newline character as separator.
+
+.SH "RETURN VALUE"
+On success a pointer to a string is returned. If the variable wasn't
+transmitted through CGI or was empty NULL is returned.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiDebug (3),
+.BR cgiHeader (3),
+.BR cgiInit (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.in Sat Jul 13 19:22:37 2002
@@ -0,0 +1,303 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+
+# our local rules for autoconf (automake and libtool)
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+noinst_LTLIBRARIES = librrd_cgi.la
+
+librrd_cgi_la_SOURCES = cgi.c cgi.h
+
+EXTRA_DIST = *.[1-9] *.dsp *.dsw readme cgitest.c jumpto.c
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+librrd_cgi_la_LDFLAGS =
+librrd_cgi_la_LIBADD =
+librrd_cgi_la_OBJECTS = cgi.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(librrd_cgi_la_SOURCES)
+OBJECTS = $(librrd_cgi_la_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps cgilib-0.4/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLTLIBRARIES:
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+
+distclean-noinstLTLIBRARIES:
+
+maintainer-clean-noinstLTLIBRARIES:
+
+.c.o:
+ $(COMPILE) -c $<
+
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
+mostlyclean-compile:
+ -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+ -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+librrd_cgi.la: $(librrd_cgi_la_OBJECTS) $(librrd_cgi_la_DEPENDENCIES)
+ $(LINK) $(librrd_cgi_la_LDFLAGS) $(librrd_cgi_la_OBJECTS) $(librrd_cgi_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = cgilib-0.4
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+cgi.lo cgi.o : cgi.c cgi.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LTLIBRARIES)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
+ clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
+ distclean-libtool distclean-tags distclean-generic \
+ clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.c Sat Jul 13 19:22:37 2002
@@ -0,0 +1,271 @@
+/*
+ cgi.c - Some simple routines for cgi programming
+ Copyright (c) 1996-8 Martin Schulze <joey at infodrom.north.de>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "cgi.h"
+
+int cgiDebugLevel = 0;
+int cgiDebugStderr = 1;
+
+void cgiHeader ()
+{
+ printf ("Content-type: text/html\n\n");
+}
+
+void cgiDebug (int level, int where)
+{
+ if (level > 0)
+ cgiDebugLevel = level;
+ else
+ cgiDebugLevel = 0;
+ if (where)
+ cgiDebugStderr = 0;
+ else
+ cgiDebugStderr = 1;
+}
+
+char *cgiDecodeString (char *text)
+{
+ char *cp, *xp;
+
+ for (cp=text,xp=text; *cp; cp++) {
+ if (*cp == '%') {
+ if (strchr("0123456789ABCDEFabcdef", *(cp+1))
+ && strchr("0123456789ABCDEFabcdef", *(cp+2))) {
+ if (islower((unsigned int)*(cp+1)))
+ *(cp+1) = toupper((unsigned int)*(cp+1));
+ if (islower((unsigned int)*(cp+2)))
+ *(cp+2) = toupper((unsigned int)*(cp+2));
+ *(xp) = (*(cp+1) >= 'A' ? *(cp+1) - 'A' + 10 : *(cp+1) - '0' ) * 16
+ + (*(cp+2) >= 'A' ? *(cp+2) - 'A' + 10 : *(cp+2) - '0');
+ xp++;cp+=2;
+ }
+ } else {
+ *(xp++) = *cp;
+ }
+ }
+ memset(xp, 0, cp-xp);
+ return text;
+}
+
+/* cgiInit()
+ *
+ * Read from stdin if no string is provided via CGI. Variables that
+ * doesn't have a value associated with it doesn't get stored.
+ */
+s_cgi **cgiInit ()
+{
+ int length;
+ char *line = NULL;
+ int numargs;
+ char *cp, *ip, *esp, *sptr;
+ s_cgi **result;
+ int i, k;
+ char tmp[101];
+
+ cp = getenv("REQUEST_METHOD");
+ ip = getenv("CONTENT_LENGTH");
+
+ if (cp && !strcmp(cp, "POST")) {
+ if (ip) {
+ length = atoi(ip);
+ if ((line = (char *)malloc (length+2)) == NULL)
+ return NULL;
+ fgets(line, length+1, stdin);
+ } else
+ return NULL;
+ } else if (cp && !strcmp(cp, "GET")) {
+ esp = getenv("QUERY_STRING");
+ if (esp && strlen(esp)) {
+ if ((line = (char *)malloc (strlen(esp)+2)) == NULL)
+ return NULL;
+ sprintf (line, "%s", esp);
+ } else
+ return NULL;
+ } else {
+ length = 0;
+ printf ("(offline mode: enter name=value pairs on standard input)\n");
+ for (cp = fgets(tmp, 100, stdin); cp != NULL;
+ cp = fgets(tmp, 100, stdin) ) {
+ if (strlen(tmp)) {
+ length += strlen(tmp);
+ if ((ip = (char *)malloc ((length+1) * sizeof(char))) == NULL)
+ return NULL;
+ memset(ip,0, length);
+ if (line) {
+ if (line[strlen(line)-1] == '\n')
+ line[strlen(line)-1] = '&';
+ strcpy(ip, line);
+ }
+ ip = strcat(ip, tmp);
+ if (line)
+ free (line);
+ line = ip;
+ }
+ }
+ if (!line)
+ return NULL;
+ if (line[strlen(line)-1] == '\n')
+ line[strlen(line)-1] = '\0';
+ }
+
+ /*
+ * From now on all cgi variables are stored in the variable line
+ * and look like foo=bar&foobar=barfoo&foofoo=
+ */
+
+ if (cgiDebugLevel > 0) {
+ if (cgiDebugStderr) {
+ fprintf (stderr, "Received cgi input: %s\n", line);
+ } else {
+ printf ("<b>Received cgi input</b><br>\n<pre>\n--\n%s\n--\n</pre>\n\n", line);
+ }
+ }
+ for (cp=line; *cp; cp++) {
+ if (*cp == '+') {
+ *cp = ' ';
+ }
+ }
+ if (strlen(line)) {
+ for (numargs=1,cp=line; *cp; cp++) {
+ if (*cp == '&') numargs++;
+ }
+ } else {
+ numargs = 0;
+ }
+ if (cgiDebugLevel > 0) {
+ if (cgiDebugStderr) {
+ fprintf (stderr, "%d cgi variables found.\n", numargs);
+ } else {
+ printf ("%d cgi variables found.<br>\n", numargs);
+ }
+ }
+ if ((result = (s_cgi **)malloc((numargs+1) * sizeof(s_cgi *))) == NULL) {
+ return NULL;
+ }
+
+ memset (result, 0, (numargs+1) * sizeof(s_cgi *));
+
+ cp = line;
+ i=0;
+ while (*cp) {
+ if ((ip = (char *)strchr(cp, '&')) != NULL) {
+ *ip = '\0';
+ }else {
+ ip = cp + strlen(cp);
+ }
+
+ if ((esp=(char *)strchr(cp, '=')) == NULL) {
+ cp = ++ip;
+ continue;
+ }
+
+ if (!strlen(esp)) {
+ cp = ++ip;
+ continue;
+ }
+
+ if (i<numargs) {
+
+ for (k=0; k<i && (strncmp(result[k]->name,cp, esp-cp)); k++);
+ /* try to find out if there's already such a variable */
+ if (k == i) { /* No such variable yet */
+ if ((result[i] = (s_cgi *)malloc(sizeof(s_cgi))) == NULL)
+ return NULL;
+ if ((result[i]->name = (char *)malloc((esp-cp+1) * sizeof(char))) == NULL)
+ return NULL;
+ memset (result[i]->name, 0, esp-cp+1);
+ strncpy(result[i]->name, cp, esp-cp);
+ cp = ++esp;
+ if ((result[i]->value = (char *)malloc((ip-esp+1) * sizeof(char))) == NULL)
+ return NULL;
+ memset (result[i]->value, 0, ip-esp+1);
+ strncpy(result[i]->value, cp, ip-esp);
+ result[i]->value = cgiDecodeString(result[i]->value);
+ if (cgiDebugLevel) {
+ if (cgiDebugStderr)
+ fprintf (stderr, "%s: %s\n", result[i]->name, result[i]->value);
+ else
+ printf ("<h3>Variable %s</h3>\n<pre>\n%s\n</pre>\n\n", result[i]->name, result[i]->value);
+ }
+ i++;
+ } else { /* There is already such a name, suppose a mutiple field */
+ if ((sptr = (char *)malloc((strlen(result[k]->value)+(ip-esp)+2)* sizeof(char))) == NULL)
+ return NULL;
+ memset (sptr, 0, strlen(result[k]->value)+(ip-esp)+2);
+ sprintf (sptr, "%s\n", result[k]->value);
+ cp = ++esp;
+ strncat(sptr, cp, ip-esp);
+ free(result[k]->value);
+ result[k]->value = sptr;
+ }
+ }
+ cp = ++ip;
+ }
+ return result;
+}
+
+char *cgiGetValue(s_cgi **parms, const char *var)
+{
+ int i;
+
+ if (parms) {
+ for (i=0;parms[i]; i++) {
+ if (!strcmp(var,parms[i]->name)) {
+ if (cgiDebugLevel > 0) {
+ if (cgiDebugStderr) {
+ fprintf (stderr, "%s found as %s\n", var, parms[i]->value);
+ } else {
+ printf ("%s found as %s<br>\n", var, parms[i]->value);
+ }
+ }
+ return parms[i]->value;
+ }
+ }
+ }
+ if (cgiDebugLevel) {
+ if (cgiDebugStderr) {
+ fprintf (stderr, "%s not found\n", var);
+ } else {
+ printf ("%s not found<br>\n", var);
+ }
+ }
+ return NULL;
+}
+
+void cgiRedirect (const char *url)
+{
+ if (url && strlen(url)) {
+ printf ("Content-type: text/html\nContent-length: %d\n", 77+(strlen(url)*2));
+ printf ("Status: 302 Temporal Relocation\n");
+ printf ("Location: %s\n\n", url);
+ printf ("<html>\n<body>\nThe page has been moved to <a href=\"%s\">%s</a>\n</body>\n</html>\n", url, url);
+ }
+}
+
+/*
+ * Local variables:
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 8
+ * End:
+ */
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgitest.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgitest.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgitest.c Sat Jul 13 19:22:37 2002
@@ -0,0 +1,89 @@
+/*
+ cgitest.c - Testprogram for cgi.o
+ Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+/*
+ * Compile with: cc -o cgitest cgitest.c -lcgi
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <cgi.h>
+
+s_cgi **cgi;
+
+void print_form()
+{
+ printf ("<h1>Test-Form</h1>\n");
+ printf ("<form action=\"/cgi-bin/cgitest/insertdata\" method=post>\n");
+ printf ("Input: <input name=string size=50>\n<br>");
+ printf ("<select name=select multiple>\n<option>Nr. 1\n<option>Nr. 2\n<option>Nr. 3\n<option>Nr. 4\n</select>\n");
+ printf ("Text: <textarea name=text cols=50>\n</textarea>\n");
+ printf ("<center><input type=submit value=Submit> ");
+ printf ("<input type=reset value=Reset></center>\n");
+ printf ("</form>\n");
+}
+
+void eval_cgi()
+{
+ printf ("<h1>Results</h1>\n\n");
+ printf ("<b>string</b>: %s<p>\n", cgiGetValue(cgi, "string"));
+ printf ("<b>text</b>: %s<p>\n", cgiGetValue(cgi, "text"));
+ printf ("<b>select</b>: %s<p>\n", cgiGetValue(cgi, "select"));
+}
+
+
+void main ()
+{
+ char *path_info = NULL;
+
+ cgiDebug(0, 0);
+ cgi = cgiInit();
+
+ path_info = getenv("PATH_INFO");
+ if (path_info) {
+ if (!strcmp(path_info, "/redirect")) {
+ cgiRedirect("http://www.infodrom.north.de/");
+ exit (0);
+ } else {
+ cgiHeader();
+ printf ("<html>\n<head><title>cgilib</title></title>\n\n<body>\n");
+ printf ("<h1>cgilib</h1>\n");
+ printf ("path_info: %s<br>\n", path_info);
+ if (!strcmp(path_info, "/insertdata")) {
+ eval_cgi();
+ } else
+ print_form();
+ }
+ } else {
+ cgiHeader();
+ printf ("<html>\n<head><title>cgilib</title></title>\n\n<body>\n");
+ printf ("<h1>cgilib</h1>\n");
+ print_form();
+ }
+
+ printf ("\n<hr>\n</body>\n</html>\n");
+}
+
+/*
+ * Local variables:
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 8
+ * End:
+ */
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiRedirect.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiRedirect.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiRedirect.3 Sat Jul 13 19:22:38 2002
@@ -0,0 +1,45 @@
+.\" cgiRedirect - Redirect the browser somewhere else
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgiRedirect 3 "17 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgiRedirect \- Redirect the browser somewhere else
+.SH SYNOPSYS
+.nf
+.B #include <cgi.h>
+.sp
+.BI "void cgiRedirect(char *" url );
+.fi
+.SH DESCRIPTION
+The
+.B cgiRedirect
+routine redirects the browser to another
+.IR url .
+This mechanism may be useful to redirect invalid requests to some
+static pages describing the policy.
+.SH "RETURN VALUE"
+.BR cgiRedirect ()
+does not return a value.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiInit (3),
+.BR cgiHeader (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.5
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.5 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.5 Sat Jul 13 19:22:38 2002
@@ -0,0 +1,115 @@
+.\" cgi - Common Gateway Interface
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgi 5 "15 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgi \- Common Gateway Interface
+
+.SH DESCRIPTION
+The Common Gateway Interface is a way to create dynamic web pages.
+It defines rules for interaction between a program and the web server
+while the server talks to the client. There are some ways to use it.
+
+.SH "ENVIRONMENT"
+Normally the webserver sets several environment variables to give some
+information to the CGI program so it can determine various stuff.
+.TP
+.B AUTH_TYPE
+This reflects the authentification method used to validate a user.
+.TP
+.B CONTENT_LENGTH
+The length of the data in bytes passed to the CGI program through
+standard input. This is used by the POST method.
+.TP
+.B CONTENT_TYPE
+The MIME type of the query data, such as "text/html", optional.
+.TP
+.B DOCUMENT_ROOT
+This reflects the document root directory of the webserver.
+.TP
+.B GATEWAY_INTERFACE
+Reflects the version of the Common Gateway Interface that the server
+is using
+.TP
+.B HTTP_ACCEPT
+A comma separated list of MIME type that the client is willing to
+accept.
+.TP
+.B HTTP_FROM
+The email address of the user issuing the information request. This
+is not supported by most browsers.
+.TP
+.B HTTP_REFERER
+Reflects the URL from which tis cgi program was accessed.
+.TP
+.B HTTP_USER_AGENT
+The name, version and libraries of the browser making the request.
+This information can be used to determine if the browser is capable of
+graphics and is able to display frames and tables.
+.TP
+.B PATH_INFO
+This shows extra information that was passed to the cgi program via
+command line. Normally it's empty or non-existant.
+.TP
+.B PATH_TRANSLATED
+The translated path on the local filesystem.
+.TP
+.B QUERY_STRING
+This variable refers to additional arguments that were appended to the
+cgi programm - normally with the '?' sign.
+.TP
+.B REMOTE_ADDR
+This refers to the host from which the information request was issued,
+as ip number.
+.TP
+.B REMOTE_HOST
+This refers to the host from which the information request was issued.
+.TP
+.B REMOTE_USER
+The authenticated name of the user.
+.TP
+.B REQUEST_METHOD
+This refers to the method with which the information request was
+issued. Normally this is either GET or POST.
+.TP
+.B SCRIPT_NAME
+The virtual name of the script being executed.
+.TP
+.B SERVER_NAME
+The server's hostname or ip number. This may be used to determine the
+correct paths or resulting HTML code for cgi programs that are used on
+the same machine for several servers.
+.TP
+.B SERVER_PROTOCOL
+This is the nae and version of the information protocol the request
+came in with. Normally this is "HTTP/1.0" or "HTTP/1.1".
+.TP
+.B SERVER_PORT
+This refers to the TCP/IP port on which the webserver is running.
+.TP
+.B SERVER_SOFTWARE
+This reflects the name and revision of the webserver software.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiDebug (3),
+.BR cgiHeader (3),
+.BR cgiGetValue (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsw Sat Jul 13 19:22:38 2002
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "cgilib"=".\cgilib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiInit.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiInit.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiInit.3 Sat Jul 13 19:22:38 2002
@@ -0,0 +1,49 @@
+.\" cgiInit - Initializes cgi library
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgiInit 3 "14 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgiInit \- Initializes cgi library
+.SH SYNOPSYS
+.nf
+.B #include <cgi.h>
+.sp
+.B s_cgi **cgiInit();
+.fi
+.SH DESCRIPTION
+This routine initializes the cgi routines. Mainly it reads in and
+decodes cgi data for later processing. If the program is not called
+via cgi interface the user is prompted to type in cgi variable
+bindings via stdin - just like GGI.pm does.
+
+This routine normally is the first or second. Only
+.BR cgiDebug ()
+may be called before. If debugging is enabled this routine produces
+some additional output.
+.SH "RETURN VALUE"
+On success a set of cgi variable bindings is returned that is needed
+for later processing. If an error occurs NULL is returned.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiDebug (3),
+.BR cgiHeader (3),
+.BR cgiGetValue (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgi.h Sat Jul 13 19:22:38 2002
@@ -0,0 +1,59 @@
+/*
+ cgi.h - Some simple routines for cgi programming
+ Copyright (c) 1996-8 Martin Schulze <joey at infodrom.north.de>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ */
+
+#ifndef _CGI_H_
+#define _CGI_H_
+
+typedef struct cgi_s {
+ char *name,
+ *value;
+} s_cgi;
+
+/* cgiHeader
+ *
+ * returns a valid CGI Header (Content-type...)
+ */
+void cgiHeader ();
+
+/* cgiDebug
+ *
+ * Set/unsets debugging
+ */
+void cgiDebug (int level, int where);
+
+/* cgiInit
+ *
+ * Reads in variables set via POST or stdin
+ */
+s_cgi **cgiInit ();
+
+/* cgiGetValue
+ *
+ * Returns the value of the specified variable or NULL if it's empty
+ * or doesn't exist.
+ */
+char *cgiGetValue(s_cgi **parms, const char *var);
+
+/* cgiRedirect
+ *
+ * Provides a valid redirect for web pages.
+ */
+void cgiRedirect (const char *url);
+
+#endif /* _CGI_H_ */
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/Makefile.am Sat Jul 13 19:22:38 2002
@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+
+# our local rules for autoconf (automake and libtool)
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+noinst_LTLIBRARIES = librrd_cgi.la
+
+librrd_cgi_la_SOURCES = cgi.c cgi.h
+
+EXTRA_DIST= *.[1-9] *.dsp *.dsw readme cgitest.c jumpto.c
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiDebug.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiDebug.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiDebug.3 Sat Jul 13 19:22:39 2002
@@ -0,0 +1,48 @@
+.\" cgiDebug - Set the debug level for cgi programming
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgiDebug 3 "14 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgiDebug \- Set the debug level for cgi programming
+.SH SYNOPSYS
+.nf
+.B #include <cgi.h>
+.sp
+.BI "void cgiDebug(int " level ", int " where );
+.fi
+.SH DESCRIPTION
+This routine controls debugging for the cgi library. At the moment
+only level 0 (default, no debugging) and 1 (debugging enabled) are
+supported. The second argument
+.I where
+specifies if debug output should be written to stdout using HTML (1)
+or to stderr as plain text (0, default).
+
+This shoud be the first one called from the cgi library.
+.SH "RETURN VALUE"
+.BR cgiDebug ()
+does not return a value.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiInit (3),
+.BR cgiHeader (3),
+.BR cgiGetValue (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiHeader.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiHeader.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgiHeader.3 Sat Jul 13 19:22:39 2002
@@ -0,0 +1,42 @@
+.\" cgiHeader - Write the cgi-bin header
+.\" Copyright (c) 1998 Martin Schulze <joey at infodrom.north.de>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.TH cgiInit 3 "14 February 1998" "Debian GNU/Linux" "Programmer's Manual"
+.SH NAME
+cgiHeader \- Write the cgi-bin header
+.SH SYNOPSYS
+.nf
+.B #include <cgi.h>
+.sp
+.B void cgiHeader();
+.fi
+.SH DESCRIPTION
+This routine just prints out the Contents-type: line to make the web
+server happy.
+
+.SH "RETURN VALUE"
+This routine does not return a value.
+
+.SH "AUTHOR"
+This cgi library is written by Martin Schulze
+<joey at infodrom.north.de>. If you have additions or improvements
+please get in touch with him.
+
+.SH "SEE ALSO"
+.BR cgiDebug (3),
+.BR cgiInit (3),
+.BR cgiGetValue (3).
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/readme
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/readme (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/readme Sat Jul 13 19:22:39 2002
@@ -0,0 +1,24 @@
+To use this library simply include the cgi.h include file with the
+following command in your C programs:
+
+#include <cgi.h>
+
+And add the libcgi.a to the linker either by modifying the LDFLAGS in
+your makefiles or by adding `-lcgi' to the appropriate commandline.
+
+
+HTTP Return Codes
+
+ http://www.w3.org/Protocols/HTTP/HTRESP.html
+
+HTTP Headers
+
+ http://www.w3.org/Protocols/HTTP/Object_Headers.html
+
+
+If you have additions, questions or improvements please don't hesitate
+to contact me.
+
+Infodrom Oldenburg
+Martin Schulze
+joey at infodrom.north.de
Added: trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/cgilib-0.4/cgilib.dsp Sat Jul 13 19:22:39 2002
@@ -0,0 +1,98 @@
+# Microsoft Developer Studio Project File - Name="cgilib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=cgilib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "cgilib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "cgilib.mak" CFG="cgilib - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "cgilib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "cgilib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "cgilib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "cgilib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_!
Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "cgilib - Win32 Release"
+# Name "cgilib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\cgi.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
Modified: trunk/orca/packages/rrdtool-1.0.7.2/CONTRIBUTORS
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/CONTRIBUTORS (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/CONTRIBUTORS Sat Jul 13 19:22:39 2002
@@ -9,38 +9,47 @@
Debugging and code contributions
+ Andreas Kroomaa <andre at ml.ee>
+ Andrew Turner <turner at mint.net> (LAST consolidator)
+ Blair Zajac <bzajac at geostaff.com>
+ Dan Dunn <dandunn at computer.org>
+ Hermann Hueni <hueni at glue.ch> (SunOS porting)
Jeff R. Allen <jeff.allen at acm.org> (autoconfigure, portability)
+ Jost.Krieger <Jost.Krieger at ruhr-uni-bochum.de>
+ Otmar Lendl <O.Lendl at Austria.EU.net> (lots of bugfixes)
Philippe.Simonet <Philippe.Simonet at swisscom.com> (NT porting)
- Wrolf Courtney <wrolf at concentric.net> (HP-UX)
- Dan Dunn <dandunn at computer.org>
- Russ Wright <wright at LBL.Gov>
+ Russ Wright <rwwright at home.com>
Simon Leinen <simon at switch.ch>
- Jost.Krieger <Jost.Krieger at ruhr-uni-bochum.de>
- Blair Zajac <bzajac at geostaff.com>
- Andrew Turner <turner at mint.net> (LAST and TOTAL consolidators)
- Andreas Kroomaa <andre at ml.ee>
- Oleg Cherevko <olwi at icyb.kiev.ua>
- Otmar Lendl <O.Lendl at Austria.EU.net> (core dump fix)
- Tom Crawley <Tom.Crawley at hi.riotinto.com.au> (GCC&HP configuration)
- Jeremy Fischer <jeremy at pobox.com> (Makefile changes & RPM builds)
+ Wrolf Courtney <wrolf at concentric.net> (HP-UX)
Alan Lichty <alan_lichty at eli.net>
+ Alex van den Bogaerdt <alex at ergens.op.het.net> (rrd_resize.c and more)
+ Jeremy Fischer <jeremy at pobox.com> (Makefile changes & RPM builds)
+ Oleg Cherevko <olwi at icyb.kiev.ua>
Steen Linden <Steen.Linden at ebone.net>
- Alex van den Bogaerdt <alex at ergens.op.het.net> (rrd_resize.c)
+ Tom Crawley <Tom.Crawley at hi.riotinto.com.au> (GCC&HP configuration)
Documentation
- Russ Wright <rwwright at home.com>
- Wrolf Courtney <wrolf at concentric.net>
+ Alan Lichty <alan_lichty at eli.net>
+ Alex van den Bogaerdt <alex at ergens.op.het.net>
Amos Shapira <amos at gezernet.co.il>
Kai Siering <kai.siering at mediaways.net>
- Alex van den Bogaerdt <alex at ergens.op.het.net>
- Alan Lichty <alan_lichty at eli.net>
+ Russ Wright <rwwright at home.com>
+ Wrolf Courtney <wrolf at concentric.net>
+ Tobias Weingartner <weingart at cs.ualberta.ca>
+
+Internet Resources
+ LAN Services AG (www.lan.ch) for the http://rrdtool.eu.org domain reflector
Further I would like to note, that rrdtool would not exist without
the following free software products:
Perl by Larry Wall
gd library by Thomas Boutell
+ gifcode from David Koblas
+ libpng by Glenn Randers-Pehrson / Andreas Eric Dilger / Guy Eric Schalnat
+ cgilib by Martin Schulze
+ zlib by Jean-loup Gailly and Mark Adler
SNMP Perl-Module by Simon Leinen
and last but not least
@@ -51,4 +60,7 @@
at the Swiss Federal Institute of Technology who allow me to
use their network resources to publish rrdtool ...
+During Summer 1999 CAIDA (www.caida.org) has supported me in working full
+time on RRDtool ... A big thank you to them as well.
+
Tobias Oetiker <oetiker at ee.ethz.ch>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/README
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/README (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/README Sat Jul 13 19:22:39 2002
@@ -5,8 +5,8 @@
ranging from the temperature in your office to the number of octets which
have passed through the FDDI interface of your router. But it is not so
trivial to store this data in a efficient and systematic manner. This is
-where rrdtool kicks in. It lets you log and analyze the data you gather from
-all kinds of data- sources (DS). The data analysis part of rrdtool is based
+where RRDtool kicks in. It lets you log and analyze the data you gather from
+all kinds of data-sources (DS). The data analysis part of RRDtool is based
on the ability to quickly generate graphical representations of the data
values collected over a definable time period.
@@ -14,47 +14,75 @@
To compile:
-----------
- sh configure
- make
+ sh configure
+ make <------ GNU make
+ make install <------ GNU make
- (Please report configure/compilation problems to
- the developers list, so I can make it better. -jra)
-
- Please note that you should get perl-5.004 for things to work
+This will configure, compile and install RRDtool in /usr/local/rrdtool-VERSION.
+If you prefer to install RRDtool in some other place, use
- Win32 users:
- ------------
+ sh configure --prefix=/some/other/RRDtool-dir
- Win32 things are controlled by the #define WIN32.
- If your compiler doesn't define that, you should add it to
- the compile line. -jeff (jeff.allen at acm.org)
+If you prefer to live with shared libraries, make sure you add the --enable-shared
+option to your configure call.
+ sh configure --enable-shared
-Perl bindings:
---------------
-The package contains two sets of Perl bindings.
+The configure script will try to find your perl installation (5.004 preferred).
+If it does not find it, you can still build RRDtool but no perl modules will be
+generated.
+
+By default the perl modules will be installed under the RRDtool install directory.
+This will require you to use a 'use lib' statement in your RRDtool perl programs.
+If you do not care what happens to your site-perl directory, you can also use
-a) perl-piped which uses teh rrdtool through a set of pipes
-b) perl-shared which builds a shared library from rrdtool
+ make site-perl-install
-Both bindings get built by the toplevel make. Additionally
-you might want to:
+will install the perl modules whereever you keep your local perl modules.
+Doing this reliefs you from using 'use lib' in your scripts.
-make test
-make install
+Getting Started:
+----------------
-There is an example script in each of the directories. The example
-scrips work even when you don't intall the perl extensions.
+Either after compiling or after installing you can try the example
+RRDtool applications in the examples directory.
To learn:
---------
Read the documentation in the doc directory. Start of with
-rrdtool. All documents are available as html and as ascii text.
+RRDtool. All documents are available as html and as ASCII text.
-If you want to know about the format of the logfiles check
+If you are looking for a more slow paced introduction, make sure to read
+Alex van den Bogaerdts rrdintro which is also available from the doc
+directory.
+
+If you want to know about the format of the log files check
src/rrd_format.h there are a lot of comments in there ...
+How to make Tobi happy:
+-----------------------
+
+If you want to show your appreciation for RRDtool you could make me happy
+by going to www.cdnow.com/gift/oetiker at ee.ethz.ch and getting me a CD from
+my CD wish list ...
+
+
+How to keep in touch:
+---------------------
+
+There are 3 Mailing lists for RRDtool:
+
+rrd-announce LOW volume RRDtool Announcements List (Only Stable Releases)
+rrd-users For discussion amongst people who use RRDtool in their applications
+rrd-developers For people who actually HACK RRDtool code
+
+To subscribe to <MAILGLIST> send a message with the subject 'subscribe'
+to <MAILGLIST>-request at list.ee.ethz.ch.
+
+Note, that postings to rrd-announce will always be cross-posted
+to rrd-users and rrd-developers as well.
+
To Contribute:
--------------
@@ -62,16 +90,11 @@
send complete patches. A complete patch patches the CODE as well
as the CHANGES, CONTRIBUTORS and the POD files.
-If you want to keep in touch, make sure you subscribe to the
-mrtg-developers mailinglist by sending a message with the subject
-'subscribe' to mrtg-developers-request at list.ee.ethz.ch
+Use GNU diff --unified --recursive olddir newdir to build your patches.
The latest Version:
-------------------
-
Is available from http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/
Tobias Oetiker <oetiker at ee.ethz.ch>
-
-
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.h Sat Jul 13 19:22:39 2002
@@ -0,0 +1,27 @@
+/* infcodes.h -- header to use infcodes.c
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+struct inflate_codes_state;
+typedef struct inflate_codes_state FAR inflate_codes_statef;
+
+extern inflate_codes_statef *inflate_codes_new OF((
+ uInt, uInt,
+ inflate_huft *, inflate_huft *,
+ z_streamp ));
+
+extern int inflate_codes OF((
+ inflate_blocks_statef *,
+ z_streamp ,
+ int));
+
+extern void inflate_codes_free OF((
+ inflate_codes_statef *,
+ z_streamp ));
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/configure
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/configure (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/configure Sat Jul 13 19:22:40 2002
@@ -0,0 +1,212 @@
+#!/bin/sh
+# configure script for zlib. This script is needed only if
+# you wish to build a shared library and your system supports them,
+# of if you need special compiler, flags or install directory.
+# Otherwise, you can just use directly "make test; make install"
+#
+# To create a shared library, use "configure --shared"; by default a static
+# library is created. If the primitive shared library support provided here
+# does not work, use ftp://prep.ai.mit.edu/pub/gnu/libtool-*.tar.gz
+#
+# To impose specific compiler or flags or install directory, use for example:
+# prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+# LDSHARED is the command to be used to create a shared library
+
+# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
+# If you have problems, try without defining CC and CFLAGS before reporting
+# an error.
+
+LIBS=libz.a
+SHAREDLIB=libz.so
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+AR=${AR-"ar rc"}
+RANLIB=${RANLIB-"ranlib"}
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+includedir=${includedir-'${prefix}/include'}
+shared_ext='.so'
+shared=0
+gcc=0
+old_cc="$CC"
+old_cflags="$CFLAGS"
+
+while test $# -ge 1
+do
+case "$1" in
+ -h* | --h*)
+ echo 'usage:'
+ echo ' configure [--shared] [--prefix=PREFIX] [--exec_prefix=EXPREFIX]'
+ echo ' [--libdir=LIBDIR] [--includedir=INCLUDEDIR]'
+ exit 0;;
+ -p*=* | --p*=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+ -e*=* | --e*=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift;;
+ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift;;
+ -p* | --p*) prefix="$2"; shift; shift;;
+ -e* | --e*) exec_prefix="$2"; shift; shift;;
+ -l* | --l*) libdir="$2"; shift; shift;;
+ -i* | --i*) includedir="$2"; shift; shift;;
+ -s* | --s*) shared=1; shift;;
+ esac
+done
+
+test=ztest$$
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+
+test -z "$CC" && echo Checking for gcc...
+cc=${CC-gcc}
+cflags=${CFLAGS-"-O3"}
+# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+case "$cc" in
+ *gcc*) gcc=1;;
+esac
+
+if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
+ CC="$cc"
+ SFLAGS=${CFLAGS-"-fPIC -O3"}
+ CFLAGS="$cflags"
+ case `(uname -s || echo unknown) 2>/dev/null` in
+ Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};;
+ *) LDSHARED=${LDSHARED-"gcc -shared"};;
+ esac
+else
+ # find system name and corresponding cc options
+ CC=${CC-cc}
+ case `(uname -sr || echo unknown) 2>/dev/null` in
+ HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
+ CFLAGS=${CFLAGS-"-O"}
+# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
+ LDSHARED=${LDSHARED-"ld -b"}
+ shared_ext='.sl'
+ SHAREDLIB='libz.sl';;
+ IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+ CFLAGS=${CFLAGS-"-ansi -O2"}
+ LDSHARED=${LDSHARED-"cc -shared"};;
+ OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+ CFLAGS=${CFLAGS-"-O -std1"}
+ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,$SHAREDLIB -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};;
+ OSF1*) SFLAGS=${CFLAGS-"-O -std1"}
+ CFLAGS=${CFLAGS-"-O -std1"}
+ LDSHARED=${LDSHARED-"cc -shared"};;
+ QNX*) SFLAGS=${CFLAGS-"-4 -O"}
+ CFLAGS=${CFLAGS-"-4 -O"}
+ LDSHARED=${LDSHARED-"cc"}
+ RANLIB=${RANLIB-"true"}
+ AR="cc -A";;
+ SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+ CFLAGS=${CFLAGS-"-O3"}
+ LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
+ SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
+ CFLAGS=${CFLAGS-"-fast -xcg89"}
+ LDSHARED=${LDSHARED-"cc -G"};;
+ SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+ CFLAGS=${CFLAGS-"-O2"}
+ LDSHARED=${LDSHARED-"ld"};;
+ UNIX_System_V\ 4.2.0)
+ SFLAGS=${CFLAGS-"-KPIC -O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -G"};;
+ UNIX_SV\ 4.2MP)
+ SFLAGS=${CFLAGS-"-Kconform_pic -O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -G"};;
+ # send working options for other systems to support at gzip.org
+ *) SFLAGS=${CFLAGS-"-O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -shared"};;
+ esac
+fi
+
+if test $shared -eq 1; then
+ echo Checking for shared library support...
+ # we must test in two steps (cc then ld), required at least on SunOS 4.x
+ if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
+ test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
+ CFLAGS="$SFLAGS"
+ LIBS="$SHAREDLIB.$VER"
+ echo Building shared library $SHAREDLIB.$VER with $CC.
+ elif test -z "$old_cc" -a -z "$old_cflags"; then
+ echo No shared library suppport.
+ shared=0;
+ else
+ echo 'No shared library suppport; try without defining CC and CFLAGS'
+ shared=0;
+ fi
+fi
+if test $shared -eq 0; then
+ LDSHARED="$CC"
+ echo Building static library $LIBS version $VER with $CC.
+fi
+
+cat > $test.c <<EOF
+#include <unistd.h>
+int main() { return 0; }
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+ CFLAGS="$CFLAGS -DHAVE_UNISTD_H"
+ echo "Checking for unistd.h... Yes."
+else
+ echo "Checking for unistd.h... No."
+fi
+
+cat > $test.c <<EOF
+#include <errno.h>
+int main() { return 0; }
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+ echo "Checking for errno.h... Yes."
+else
+ echo "Checking for errno.h... No."
+ CFLAGS="$CFLAGS -DNO_ERRNO_H"
+fi
+
+cat > $test.c <<EOF
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+caddr_t hello() {
+ return mmap((caddr_t)0, (off_t)0, PROT_READ, MAP_SHARED, 0, (off_t)0);
+}
+EOF
+if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
+ CFLAGS="$CFLAGS -DUSE_MMAP"
+ echo Checking for mmap support... Yes.
+else
+ echo Checking for mmap support... No.
+fi
+
+CPP=${CPP-"$CC -E"}
+case $CFLAGS in
+ *ASMV*)
+ if test "`nm $test.o | grep _hello`" = ""; then
+ CPP="$CPP -DNO_UNDERLINE"
+ echo Checking for underline in external names... No.
+ else
+ echo Checking for underline in external names... Yes.
+ fi;;
+esac
+
+rm -f $test.[co] $test$shared_ext
+
+# udpate Makefile
+sed < Makefile.in "
+/^CC *=/s%=.*%=$CC%
+/^CFLAGS *=/s%=.*%=$CFLAGS%
+/^CPP *=/s%=.*%=$CPP%
+/^LDSHARED *=/s%=.*%=$LDSHARED%
+/^LIBS *=/s%=.*%=$LIBS%
+/^SHAREDLIB *=/s%=.*%=$SHAREDLIB%
+/^AR *=/s%=.*%=$AR%
+/^RANLIB *=/s%=.*%=$RANLIB%
+/^VER *=/s%=.*%=$VER%
+/^prefix *=/s%=.*%=$prefix%
+/^exec_prefix *=/s%=.*%=$exec_prefix%
+/^libdir *=/s%=.*%=$libdir%
+/^includedir *=/s%=.*%=$includedir%
+" > Makefile
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README.rrdtool
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README.rrdtool (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README.rrdtool Sat Jul 13 19:22:40 2002
@@ -0,0 +1,2 @@
+this version of zlib has been included with rrdtool ...
+the contrib directory has been removed ...
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.in Sat Jul 13 19:22:40 2002
@@ -0,0 +1,324 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+
+# read local config files
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+EXTRA_DIST = ChangeLog FAQ INDEX README README.rrdtool algorithm.txt zlib.dsp zlib.dsw zlib.3
+
+noinst_LTLIBRARIES = librrd_z.la
+
+librrd_z_la_SOURCES = adler32.c compress.c crc32.c deflate.c gzio.c infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c zutil.c deflate.h infcodes.h inffixed.h infutil.h zconf.h zutil.h infblock.h inffast.h inftrees.h trees.h zlib.h
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+librrd_z_la_LDFLAGS =
+librrd_z_la_LIBADD =
+librrd_z_la_OBJECTS = adler32.lo compress.lo crc32.lo deflate.lo \
+gzio.lo infblock.lo infcodes.lo inffast.lo inflate.lo inftrees.lo \
+infutil.lo trees.lo uncompr.lo zutil.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = README ChangeLog Makefile.am Makefile.in configure
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(librrd_z_la_SOURCES)
+OBJECTS = $(librrd_z_la_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps zlib-1.1.3/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLTLIBRARIES:
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+
+distclean-noinstLTLIBRARIES:
+
+maintainer-clean-noinstLTLIBRARIES:
+
+.c.o:
+ $(COMPILE) -c $<
+
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
+mostlyclean-compile:
+ -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+ -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+librrd_z.la: $(librrd_z_la_OBJECTS) $(librrd_z_la_DEPENDENCIES)
+ $(LINK) $(librrd_z_la_LDFLAGS) $(librrd_z_la_OBJECTS) $(librrd_z_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = zlib-1.1.3
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+adler32.lo adler32.o : adler32.c zlib.h zconf.h
+compress.lo compress.o : compress.c zlib.h zconf.h
+crc32.lo crc32.o : crc32.c zlib.h zconf.h
+deflate.lo deflate.o : deflate.c deflate.h zutil.h zlib.h zconf.h
+gzio.lo gzio.o : gzio.c zutil.h zlib.h zconf.h
+infblock.lo infblock.o : infblock.c zutil.h zlib.h zconf.h infblock.h \
+ inftrees.h infcodes.h infutil.h
+infcodes.lo infcodes.o : infcodes.c zutil.h zlib.h zconf.h inftrees.h \
+ infblock.h infcodes.h infutil.h inffast.h
+inffast.lo inffast.o : inffast.c zutil.h zlib.h zconf.h inftrees.h \
+ infblock.h infcodes.h infutil.h inffast.h
+inflate.lo inflate.o : inflate.c zutil.h zlib.h zconf.h infblock.h
+inftrees.lo inftrees.o : inftrees.c zutil.h zlib.h zconf.h inftrees.h \
+ inffixed.h
+infutil.lo infutil.o : infutil.c zutil.h zlib.h zconf.h infblock.h \
+ inftrees.h infcodes.h infutil.h
+trees.lo trees.o : trees.c deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.lo uncompr.o : uncompr.c zlib.h zconf.h
+zutil.lo zutil.o : zutil.c zutil.h zlib.h zconf.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LTLIBRARIES)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
+ clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
+ distclean-libtool distclean-tags distclean-generic \
+ clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffixed.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffixed.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffixed.h Sat Jul 13 19:22:40 2002
@@ -0,0 +1,151 @@
+/* inffixed.h -- table for decoding fixed codes
+ * Generated automatically by the maketree.c program
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+local uInt fixed_bl = 9;
+local uInt fixed_bd = 5;
+local inflate_huft fixed_tl[] = {
+ {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
+ {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
+ {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
+ {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
+ {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
+ {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
+ {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
+ {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
+ {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
+ {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
+ {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
+ {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
+ {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
+ {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
+ {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
+ {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
+ {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
+ {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
+ {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
+ {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
+ {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
+ {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
+ {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
+ {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
+ {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
+ {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
+ {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
+ {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
+ {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
+ {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
+ {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
+ {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
+ {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
+ {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
+ {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
+ {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
+ {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
+ {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
+ {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
+ {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
+ {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
+ {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
+ {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
+ {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
+ {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
+ {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
+ {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
+ {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
+ {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
+ {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
+ {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
+ {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
+ {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
+ {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
+ {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
+ {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
+ {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
+ {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
+ {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
+ {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
+ {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
+ {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
+ {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
+ {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
+ {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
+ {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
+ {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
+ {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
+ {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
+ {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
+ {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
+ {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
+ {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
+ {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
+ {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
+ {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
+ {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
+ {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
+ {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
+ {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
+ {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
+ {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
+ {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
+ {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
+ {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
+ {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
+ {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
+ {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
+ {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
+ {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
+ {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
+ {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
+ {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
+ {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
+ {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
+ {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
+ {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
+ {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
+ {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
+ {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
+ {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
+ {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
+ {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
+ {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
+ {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
+ {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
+ {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
+ {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
+ {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
+ {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
+ {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
+ {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
+ {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
+ {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
+ {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
+ {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
+ {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
+ {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
+ {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
+ {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
+ {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
+ {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
+ {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
+ {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
+ {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
+ {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
+ {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
+ {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
+ };
+local inflate_huft fixed_td[] = {
+ {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
+ {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
+ {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
+ {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
+ {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
+ {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
+ {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
+ {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
+ };
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.c Sat Jul 13 19:22:40 2002
@@ -0,0 +1,1350 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * ALGORITHM
+ *
+ * The "deflation" process depends on being able to identify portions
+ * of the input text which are identical to earlier input (within a
+ * sliding window trailing behind the input currently being processed).
+ *
+ * The most straightforward technique turns out to be the fastest for
+ * most input files: try all possible matches and select the longest.
+ * The key feature of this algorithm is that insertions into the string
+ * dictionary are very simple and thus fast, and deletions are avoided
+ * completely. Insertions are performed at each input character, whereas
+ * string matches are performed only when the previous match ends. So it
+ * is preferable to spend more time in matches to allow very fast string
+ * insertions and avoid deletions. The matching algorithm for small
+ * strings is inspired from that of Rabin & Karp. A brute force approach
+ * is used to find longer strings when a small match has been found.
+ * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ * (by Leonid Broukhis).
+ * A previous version of this file used a more sophisticated algorithm
+ * (by Fiala and Greene) which is guaranteed to run in linear amortized
+ * time, but has a larger average cost, uses more memory and is patented.
+ * However the F&G algorithm may be faster for some highly redundant
+ * files if the parameter max_chain_length (described below) is too large.
+ *
+ * ACKNOWLEDGEMENTS
+ *
+ * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ * I found it in 'freeze' written by Leonid Broukhis.
+ * Thanks to many people for bug reports and testing.
+ *
+ * REFERENCES
+ *
+ * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ * Available in ftp://ds.internic.net/rfc/rfc1951.txt
+ *
+ * A description of the Rabin and Karp algorithm is given in the book
+ * "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ * Fiala,E.R., and Greene,D.H.
+ * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+ " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly ";
+/*
+ If you use the zlib library in a product, an acknowledgment is welcome
+ in the documentation of your product. If for some reason you cannot
+ include such an acknowledgment, I would appreciate that you keep this
+ copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ * Function prototypes.
+ */
+typedef enum {
+ need_more, /* block not completed, need more input or more output */
+ block_done, /* block flush performed */
+ finish_started, /* finish started, need only more output at next deflate */
+ finish_done /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast OF((deflate_state *s, int flush));
+local block_state deflate_slow OF((deflate_state *s, int flush));
+local void lm_init OF((deflate_state *s));
+local void putShortMSB OF((deflate_state *s, uInt b));
+local void flush_pending OF((z_streamp strm));
+local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+ void match_init OF((void)); /* asm code initialization */
+ uInt longest_match OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local void check_match OF((deflate_state *s, IPos start, IPos match,
+ int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+# define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+ ush good_length; /* reduce lazy search above this match length */
+ ush max_lazy; /* do not perform lazy search above this match length */
+ ush nice_length; /* quit search above this match length */
+ ush max_chain;
+ compress_func func;
+} config;
+
+local const config configuration_table[10] = {
+/* good lazy nice chain */
+/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
+/* 1 */ {4, 4, 8, 4, deflate_fast}, /* maximum speed, no lazy matches */
+/* 2 */ {4, 5, 16, 8, deflate_fast},
+/* 3 */ {4, 6, 32, 32, deflate_fast},
+
+/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */
+/* 5 */ {8, 16, 32, 32, deflate_slow},
+/* 6 */ {8, 16, 128, 128, deflate_slow},
+/* 7 */ {8, 32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN assertion: all calls to to UPDATE_HASH are made with consecutive
+ * input characters, so that a running hash key can be computed from the
+ * previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN assertion: all calls to to INSERT_STRING are made with consecutive
+ * input characters and the first MIN_MATCH bytes of str are valid
+ * (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+ (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+ match_head = s->head[s->ins_h], \
+ s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+ (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+ s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
+ s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+ s->head[s->hash_size-1] = NIL; \
+ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+ z_streamp strm;
+ int level;
+ const char *version;
+ int stream_size;
+{
+ return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+ Z_DEFAULT_STRATEGY, version, stream_size);
+ /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ version, stream_size)
+ z_streamp strm;
+ int level;
+ int method;
+ int windowBits;
+ int memLevel;
+ int strategy;
+ const char *version;
+ int stream_size;
+{
+ deflate_state *s;
+ int noheader = 0;
+ static const char* my_version = ZLIB_VERSION;
+
+ ushf *overlay;
+ /* We overlay pending_buf and d_buf+l_buf. This works since the average
+ * output size for (length,distance) codes is <= 24 bits.
+ */
+
+ if (version == Z_NULL || version[0] != my_version[0] ||
+ stream_size != sizeof(z_stream)) {
+ return Z_VERSION_ERROR;
+ }
+ if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+ strm->msg = Z_NULL;
+ if (strm->zalloc == Z_NULL) {
+ strm->zalloc = zcalloc;
+ strm->opaque = (voidpf)0;
+ }
+ if (strm->zfree == Z_NULL) strm->zfree = zcfree;
+
+ if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#ifdef FASTEST
+ level = 1;
+#endif
+
+ if (windowBits < 0) { /* undocumented feature: suppress zlib header */
+ noheader = 1;
+ windowBits = -windowBits;
+ }
+ if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+ windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+ strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+ return Z_STREAM_ERROR;
+ }
+ s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+ if (s == Z_NULL) return Z_MEM_ERROR;
+ strm->state = (struct internal_state FAR *)s;
+ s->strm = strm;
+
+ s->noheader = noheader;
+ s->w_bits = windowBits;
+ s->w_size = 1 << s->w_bits;
+ s->w_mask = s->w_size - 1;
+
+ s->hash_bits = memLevel + 7;
+ s->hash_size = 1 << s->hash_bits;
+ s->hash_mask = s->hash_size - 1;
+ s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+ s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+ s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
+ s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+ s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+ overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+ s->pending_buf = (uchf *) overlay;
+ s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+ if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+ s->pending_buf == Z_NULL) {
+ strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ deflateEnd (strm);
+ return Z_MEM_ERROR;
+ }
+ s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+ s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+ s->level = level;
+ s->strategy = strategy;
+ s->method = (Byte)method;
+
+ return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+ z_streamp strm;
+ const Bytef *dictionary;
+ uInt dictLength;
+{
+ deflate_state *s;
+ uInt length = dictLength;
+ uInt n;
+ IPos hash_head = 0;
+
+ if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+ strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
+
+ s = strm->state;
+ strm->adler = adler32(strm->adler, dictionary, dictLength);
+
+ if (length < MIN_MATCH) return Z_OK;
+ if (length > MAX_DIST(s)) {
+ length = MAX_DIST(s);
+#ifndef USE_DICT_HEAD
+ dictionary += dictLength - length; /* use the tail of the dictionary */
+#endif
+ }
+ zmemcpy(s->window, dictionary, length);
+ s->strstart = length;
+ s->block_start = (long)length;
+
+ /* Insert all strings in the hash table (except for the last two bytes).
+ * s->lookahead stays null, so s->ins_h will be recomputed at the next
+ * call of fill_window.
+ */
+ s->ins_h = s->window[0];
+ UPDATE_HASH(s, s->ins_h, s->window[1]);
+ for (n = 0; n <= length - MIN_MATCH; n++) {
+ INSERT_STRING(s, n, hash_head);
+ }
+ if (hash_head) hash_head = 0; /* to make compiler happy */
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+ z_streamp strm;
+{
+ deflate_state *s;
+
+ if (strm == Z_NULL || strm->state == Z_NULL ||
+ strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
+
+ strm->total_in = strm->total_out = 0;
+ strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+ strm->data_type = Z_UNKNOWN;
+
+ s = (deflate_state *)strm->state;
+ s->pending = 0;
+ s->pending_out = s->pending_buf;
+
+ if (s->noheader < 0) {
+ s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+ }
+ s->status = s->noheader ? BUSY_STATE : INIT_STATE;
+ strm->adler = 1;
+ s->last_flush = Z_NO_FLUSH;
+
+ _tr_init(s);
+ lm_init(s);
+
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+ z_streamp strm;
+ int level;
+ int strategy;
+{
+ deflate_state *s;
+ compress_func func;
+ int err = Z_OK;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ s = strm->state;
+
+ if (level == Z_DEFAULT_COMPRESSION) {
+ level = 6;
+ }
+ if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+ return Z_STREAM_ERROR;
+ }
+ func = configuration_table[s->level].func;
+
+ if (func != configuration_table[level].func && strm->total_in != 0) {
+ /* Flush the last buffer: */
+ err = deflate(strm, Z_PARTIAL_FLUSH);
+ }
+ if (s->level != level) {
+ s->level = level;
+ s->max_lazy_match = configuration_table[level].max_lazy;
+ s->good_match = configuration_table[level].good_length;
+ s->nice_match = configuration_table[level].nice_length;
+ s->max_chain_length = configuration_table[level].max_chain;
+ }
+ s->strategy = strategy;
+ return err;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+ deflate_state *s;
+ uInt b;
+{
+ put_byte(s, (Byte)(b >> 8));
+ put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+ z_streamp strm;
+{
+ unsigned len = strm->state->pending;
+
+ if (len > strm->avail_out) len = strm->avail_out;
+ if (len == 0) return;
+
+ zmemcpy(strm->next_out, strm->state->pending_out, len);
+ strm->next_out += len;
+ strm->state->pending_out += len;
+ strm->total_out += len;
+ strm->avail_out -= len;
+ strm->state->pending -= len;
+ if (strm->state->pending == 0) {
+ strm->state->pending_out = strm->state->pending_buf;
+ }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+ z_streamp strm;
+ int flush;
+{
+ int old_flush; /* value of flush param for previous deflate call */
+ deflate_state *s;
+
+ if (strm == Z_NULL || strm->state == Z_NULL ||
+ flush > Z_FINISH || flush < 0) {
+ return Z_STREAM_ERROR;
+ }
+ s = strm->state;
+
+ if (strm->next_out == Z_NULL ||
+ (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+ (s->status == FINISH_STATE && flush != Z_FINISH)) {
+ ERR_RETURN(strm, Z_STREAM_ERROR);
+ }
+ if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+ s->strm = strm; /* just in case */
+ old_flush = s->last_flush;
+ s->last_flush = flush;
+
+ /* Write the zlib header */
+ if (s->status == INIT_STATE) {
+
+ uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+ uInt level_flags = (s->level-1) >> 1;
+
+ if (level_flags > 3) level_flags = 3;
+ header |= (level_flags << 6);
+ if (s->strstart != 0) header |= PRESET_DICT;
+ header += 31 - (header % 31);
+
+ s->status = BUSY_STATE;
+ putShortMSB(s, header);
+
+ /* Save the adler32 of the preset dictionary: */
+ if (s->strstart != 0) {
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ }
+ strm->adler = 1L;
+ }
+
+ /* Flush as much pending output as possible */
+ if (s->pending != 0) {
+ flush_pending(strm);
+ if (strm->avail_out == 0) {
+ /* Since avail_out is 0, deflate will be called again with
+ * more output space, but possibly with both pending and
+ * avail_in equal to zero. There won't be anything to do,
+ * but this is not an error situation so make sure we
+ * return OK instead of BUF_ERROR at next call of deflate:
+ */
+ s->last_flush = -1;
+ return Z_OK;
+ }
+
+ /* Make sure there is something to do and avoid duplicate consecutive
+ * flushes. For repeated and useless calls with Z_FINISH, we keep
+ * returning Z_STREAM_END instead of Z_BUFF_ERROR.
+ */
+ } else if (strm->avail_in == 0 && flush <= old_flush &&
+ flush != Z_FINISH) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
+ /* User must not provide more input after the first FINISH: */
+ if (s->status == FINISH_STATE && strm->avail_in != 0) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
+ /* Start a new block or continue the current one.
+ */
+ if (strm->avail_in != 0 || s->lookahead != 0 ||
+ (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+ block_state bstate;
+
+ bstate = (*(configuration_table[s->level].func))(s, flush);
+
+ if (bstate == finish_started || bstate == finish_done) {
+ s->status = FINISH_STATE;
+ }
+ if (bstate == need_more || bstate == finish_started) {
+ if (strm->avail_out == 0) {
+ s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+ }
+ return Z_OK;
+ /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+ * of deflate should use the same flush parameter to make sure
+ * that the flush is complete. So we don't have to output an
+ * empty block here, this will be done at next call. This also
+ * ensures that for a very small output buffer, we emit at most
+ * one empty block.
+ */
+ }
+ if (bstate == block_done) {
+ if (flush == Z_PARTIAL_FLUSH) {
+ _tr_align(s);
+ } else { /* FULL_FLUSH or SYNC_FLUSH */
+ _tr_stored_block(s, (char*)0, 0L, 0);
+ /* For a full flush, this empty block will be recognized
+ * as a special marker by inflate_sync().
+ */
+ if (flush == Z_FULL_FLUSH) {
+ CLEAR_HASH(s); /* forget history */
+ }
+ }
+ flush_pending(strm);
+ if (strm->avail_out == 0) {
+ s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+ return Z_OK;
+ }
+ }
+ }
+ Assert(strm->avail_out > 0, "bug2");
+
+ if (flush != Z_FINISH) return Z_OK;
+ if (s->noheader) return Z_STREAM_END;
+
+ /* Write the zlib trailer (adler32) */
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ flush_pending(strm);
+ /* If avail_out is zero, the application will call deflate again
+ * to flush the rest.
+ */
+ s->noheader = -1; /* write the trailer only once! */
+ return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+ z_streamp strm;
+{
+ int status;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+ status = strm->state->status;
+ if (status != INIT_STATE && status != BUSY_STATE &&
+ status != FINISH_STATE) {
+ return Z_STREAM_ERROR;
+ }
+
+ /* Deallocate in reverse order of allocations: */
+ TRY_FREE(strm, strm->state->pending_buf);
+ TRY_FREE(strm, strm->state->head);
+ TRY_FREE(strm, strm->state->prev);
+ TRY_FREE(strm, strm->state->window);
+
+ ZFREE(strm, strm->state);
+ strm->state = Z_NULL;
+
+ return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+ z_streamp dest;
+ z_streamp source;
+{
+#ifdef MAXSEG_64K
+ return Z_STREAM_ERROR;
+#else
+ deflate_state *ds;
+ deflate_state *ss;
+ ushf *overlay;
+
+
+ if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+ return Z_STREAM_ERROR;
+ }
+
+ ss = source->state;
+
+ *dest = *source;
+
+ ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+ if (ds == Z_NULL) return Z_MEM_ERROR;
+ dest->state = (struct internal_state FAR *) ds;
+ *ds = *ss;
+ ds->strm = dest;
+
+ ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+ ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
+ ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
+ overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+ ds->pending_buf = (uchf *) overlay;
+
+ if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+ ds->pending_buf == Z_NULL) {
+ deflateEnd (dest);
+ return Z_MEM_ERROR;
+ }
+ /* following zmemcpy do not work for 16-bit MSDOS */
+ zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+ zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
+ zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+ zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+ ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+ ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+ ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+ ds->l_desc.dyn_tree = ds->dyn_ltree;
+ ds->d_desc.dyn_tree = ds->dyn_dtree;
+ ds->bl_desc.dyn_tree = ds->bl_tree;
+
+ return Z_OK;
+#endif
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read. All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+ z_streamp strm;
+ Bytef *buf;
+ unsigned size;
+{
+ unsigned len = strm->avail_in;
+
+ if (len > size) len = size;
+ if (len == 0) return 0;
+
+ strm->avail_in -= len;
+
+ if (!strm->state->noheader) {
+ strm->adler = adler32(strm->adler, strm->next_in, len);
+ }
+ zmemcpy(buf, strm->next_in, len);
+ strm->next_in += len;
+ strm->total_in += len;
+
+ return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+ deflate_state *s;
+{
+ s->window_size = (ulg)2L*s->w_size;
+
+ CLEAR_HASH(s);
+
+ /* Set the default configuration parameters:
+ */
+ s->max_lazy_match = configuration_table[s->level].max_lazy;
+ s->good_match = configuration_table[s->level].good_length;
+ s->nice_match = configuration_table[s->level].nice_length;
+ s->max_chain_length = configuration_table[s->level].max_chain;
+
+ s->strstart = 0;
+ s->block_start = 0L;
+ s->lookahead = 0;
+ s->match_length = s->prev_length = MIN_MATCH-1;
+ s->match_available = 0;
+ s->ins_h = 0;
+#ifdef ASMV
+ match_init(); /* initialize the asm code */
+#endif
+}
+
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+#ifndef FASTEST
+local uInt longest_match(s, cur_match)
+ deflate_state *s;
+ IPos cur_match; /* current match */
+{
+ unsigned chain_length = s->max_chain_length;/* max hash chain length */
+ register Bytef *scan = s->window + s->strstart; /* current string */
+ register Bytef *match; /* matched string */
+ register int len; /* length of current match */
+ int best_len = s->prev_length; /* best match length so far */
+ int nice_match = s->nice_match; /* stop if match long enough */
+ IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+ s->strstart - (IPos)MAX_DIST(s) : NIL;
+ /* Stop when cur_match becomes <= limit. To simplify the code,
+ * we prevent matches with the string of window index 0.
+ */
+ Posf *prev = s->prev;
+ uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+ /* Compare two bytes at a time. Note: this is not always beneficial.
+ * Try with and without -DUNALIGNED_OK to check.
+ */
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+ register ush scan_start = *(ushf*)scan;
+ register ush scan_end = *(ushf*)(scan+best_len-1);
+#else
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+ register Byte scan_end1 = scan[best_len-1];
+ register Byte scan_end = scan[best_len];
+#endif
+
+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+ * It is easy to get rid of this optimization if necessary.
+ */
+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+ /* Do not waste too much time if we already have a good match: */
+ if (s->prev_length >= s->good_match) {
+ chain_length >>= 2;
+ }
+ /* Do not look for matches beyond the end of the input. This is necessary
+ * to make deflate deterministic.
+ */
+ if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+ do {
+ Assert(cur_match < s->strstart, "no future");
+ match = s->window + cur_match;
+
+ /* Skip to next match if the match length cannot increase
+ * or if the match length is less than 2:
+ */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+ /* This code assumes sizeof(unsigned short) == 2. Do not use
+ * UNALIGNED_OK if your compiler uses a different size.
+ */
+ if (*(ushf*)(match+best_len-1) != scan_end ||
+ *(ushf*)match != scan_start) continue;
+
+ /* It is not necessary to compare scan[2] and match[2] since they are
+ * always equal when the other bytes match, given that the hash keys
+ * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+ * strstart+3, +5, ... up to strstart+257. We check for insufficient
+ * lookahead only every 4th comparison; the 128th check will be made
+ * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+ * necessary to put more guard bytes at the end of the window, or
+ * to check more often for insufficient lookahead.
+ */
+ Assert(scan[2] == match[2], "scan[2]?");
+ scan++, match++;
+ do {
+ } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ scan < strend);
+ /* The funny "do {}" generates better code on most compilers */
+
+ /* Here, scan <= window+strstart+257 */
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+ if (*scan == *match) scan++;
+
+ len = (MAX_MATCH - 1) - (int)(strend-scan);
+ scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+ if (match[best_len] != scan_end ||
+ match[best_len-1] != scan_end1 ||
+ *match != *scan ||
+ *++match != scan[1]) continue;
+
+ /* The check at best_len-1 can be removed because it will be made
+ * again later. (This heuristic is not always a win.)
+ * It is not necessary to compare scan[2] and match[2] since they
+ * are always equal when the other bytes match, given that
+ * the hash keys are equal and that HASH_BITS >= 8.
+ */
+ scan += 2, match++;
+ Assert(*scan == *match, "match[2]?");
+
+ /* We check for insufficient lookahead only every 8th comparison;
+ * the 256th check will be made at strstart+258.
+ */
+ do {
+ } while (*++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ scan < strend);
+
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+ len = MAX_MATCH - (int)(strend - scan);
+ scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+ if (len > best_len) {
+ s->match_start = cur_match;
+ best_len = len;
+ if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+ scan_end = *(ushf*)(scan+best_len-1);
+#else
+ scan_end1 = scan[best_len-1];
+ scan_end = scan[best_len];
+#endif
+ }
+ } while ((cur_match = prev[cur_match & wmask]) > limit
+ && --chain_length != 0);
+
+ if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+ return s->lookahead;
+}
+
+#else /* FASTEST */
+/* ---------------------------------------------------------------------------
+ * Optimized version for level == 1 only
+ */
+local uInt longest_match(s, cur_match)
+ deflate_state *s;
+ IPos cur_match; /* current match */
+{
+ register Bytef *scan = s->window + s->strstart; /* current string */
+ register Bytef *match; /* matched string */
+ register int len; /* length of current match */
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+ * It is easy to get rid of this optimization if necessary.
+ */
+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+ Assert(cur_match < s->strstart, "no future");
+
+ match = s->window + cur_match;
+
+ /* Return failure if the match length is less than 2:
+ */
+ if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+ /* The check at best_len-1 can be removed because it will be made
+ * again later. (This heuristic is not always a win.)
+ * It is not necessary to compare scan[2] and match[2] since they
+ * are always equal when the other bytes match, given that
+ * the hash keys are equal and that HASH_BITS >= 8.
+ */
+ scan += 2, match += 2;
+ Assert(*scan == *match, "match[2]?");
+
+ /* We check for insufficient lookahead only every 8th comparison;
+ * the 256th check will be made at strstart+258.
+ */
+ do {
+ } while (*++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ scan < strend);
+
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+ len = MAX_MATCH - (int)(strend - scan);
+
+ if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+ s->match_start = cur_match;
+ return len <= s->lookahead ? len : s->lookahead;
+}
+#endif /* FASTEST */
+#endif /* ASMV */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+ deflate_state *s;
+ IPos start, match;
+ int length;
+{
+ /* check that the match is indeed a match */
+ if (zmemcmp(s->window + match,
+ s->window + start, length) != EQUAL) {
+ fprintf(stderr, " start %u, match %u, length %d\n",
+ start, match, length);
+ do {
+ fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+ } while (--length != 0);
+ z_error("invalid match");
+ }
+ if (z_verbose > 1) {
+ fprintf(stderr,"\\[%d,%d]", start-match, length);
+ do { putc(s->window[start++], stderr); } while (--length != 0);
+ }
+}
+#else
+# define check_match(s, start, match, length)
+#endif
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ * At least one byte has been read, or avail_in == 0; reads are
+ * performed for at least two bytes (required for the zip translate_eol
+ * option -- not supported here).
+ */
+local void fill_window(s)
+ deflate_state *s;
+{
+ register unsigned n, m;
+ register Posf *p;
+ unsigned more; /* Amount of free space at the end of the window. */
+ uInt wsize = s->w_size;
+
+ do {
+ more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+ /* Deal with !@#$% 64K limit: */
+ if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+ more = wsize;
+
+ } else if (more == (unsigned)(-1)) {
+ /* Very unlikely, but possible on 16 bit machine if strstart == 0
+ * and lookahead == 1 (input done one byte at time)
+ */
+ more--;
+
+ /* If the window is almost full and there is insufficient lookahead,
+ * move the upper half to the lower one to make room in the upper half.
+ */
+ } else if (s->strstart >= wsize+MAX_DIST(s)) {
+
+ zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+ s->match_start -= wsize;
+ s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
+ s->block_start -= (long) wsize;
+
+ /* Slide the hash table (could be avoided with 32 bit values
+ at the expense of memory usage). We slide even when level == 0
+ to keep the hash table consistent if we switch back to level > 0
+ later. (Using level 0 permanently is not an optimal usage of
+ zlib, so we don't care about this pathological case.)
+ */
+ n = s->hash_size;
+ p = &s->head[n];
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
+ } while (--n);
+
+ n = wsize;
+#ifndef FASTEST
+ p = &s->prev[n];
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
+ /* If n is not on any hash chain, prev[n] is garbage but
+ * its value will never be used.
+ */
+ } while (--n);
+#endif
+ more += wsize;
+ }
+ if (s->strm->avail_in == 0) return;
+
+ /* If there was no sliding:
+ * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+ * more == window_size - lookahead - strstart
+ * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+ * => more >= window_size - 2*WSIZE + 2
+ * In the BIG_MEM or MMAP case (not yet supported),
+ * window_size == input_size + MIN_LOOKAHEAD &&
+ * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+ * Otherwise, window_size == 2*WSIZE so more >= 2.
+ * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+ */
+ Assert(more >= 2, "more < 2");
+
+ n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+ s->lookahead += n;
+
+ /* Initialize the hash value now that we have some input: */
+ if (s->lookahead >= MIN_MATCH) {
+ s->ins_h = s->window[s->strstart];
+ UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+ Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+ }
+ /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+ * but this is not important since only literal bytes will be emitted.
+ */
+
+ } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, eof) { \
+ _tr_flush_block(s, (s->block_start >= 0L ? \
+ (charf *)&s->window[(unsigned)s->block_start] : \
+ (charf *)Z_NULL), \
+ (ulg)((long)s->strstart - s->block_start), \
+ (eof)); \
+ s->block_start = s->strstart; \
+ flush_pending(s->strm); \
+ Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, eof) { \
+ FLUSH_BLOCK_ONLY(s, eof); \
+ if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+ * to pending_buf_size, and each stored block has a 5 byte header:
+ */
+ ulg max_block_size = 0xffff;
+ ulg max_start;
+
+ if (max_block_size > s->pending_buf_size - 5) {
+ max_block_size = s->pending_buf_size - 5;
+ }
+
+ /* Copy as much as possible from input to output: */
+ for (;;) {
+ /* Fill the window as much as possible: */
+ if (s->lookahead <= 1) {
+
+ Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+ s->block_start >= (long)s->w_size, "slide too late");
+
+ fill_window(s);
+ if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+ Assert(s->block_start >= 0L, "block gone");
+
+ s->strstart += s->lookahead;
+ s->lookahead = 0;
+
+ /* Emit a stored block if pending_buf will be full: */
+ max_start = s->block_start + max_block_size;
+ if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+ /* strstart == 0 is possible when wraparound on 16-bit machine */
+ s->lookahead = (uInt)(s->strstart - max_start);
+ s->strstart = (uInt)max_start;
+ FLUSH_BLOCK(s, 0);
+ }
+ /* Flush if we may have to slide, otherwise block_start may become
+ * negative and the data will be gone:
+ */
+ if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+ FLUSH_BLOCK(s, 0);
+ }
+ }
+ FLUSH_BLOCK(s, flush == Z_FINISH);
+ return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ IPos hash_head = NIL; /* head of the hash chain */
+ int bflush; /* set if current block must be flushed */
+
+ for (;;) {
+ /* Make sure that we always have enough lookahead, except
+ * at the end of the input file. We need MAX_MATCH bytes
+ * for the next match, plus MIN_MATCH bytes to insert the
+ * string following the next match.
+ */
+ if (s->lookahead < MIN_LOOKAHEAD) {
+ fill_window(s);
+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+ return need_more;
+ }
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+
+ /* Insert the string window[strstart .. strstart+2] in the
+ * dictionary, and set hash_head to the head of the hash chain:
+ */
+ if (s->lookahead >= MIN_MATCH) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+
+ /* Find the longest match, discarding those <= prev_length.
+ * At this point we have always match_length < MIN_MATCH
+ */
+ if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+ /* To simplify the code, we prevent matches with the string
+ * of window index 0 (in particular we have to avoid a match
+ * of the string with itself at the start of the input file).
+ */
+ if (s->strategy != Z_HUFFMAN_ONLY) {
+ s->match_length = longest_match (s, hash_head);
+ }
+ /* longest_match() sets match_start */
+ }
+ if (s->match_length >= MIN_MATCH) {
+ check_match(s, s->strstart, s->match_start, s->match_length);
+
+ _tr_tally_dist(s, s->strstart - s->match_start,
+ s->match_length - MIN_MATCH, bflush);
+
+ s->lookahead -= s->match_length;
+
+ /* Insert new strings in the hash table only if the match length
+ * is not too large. This saves time but degrades compression.
+ */
+#ifndef FASTEST
+ if (s->match_length <= s->max_insert_length &&
+ s->lookahead >= MIN_MATCH) {
+ s->match_length--; /* string at strstart already in hash table */
+ do {
+ s->strstart++;
+ INSERT_STRING(s, s->strstart, hash_head);
+ /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+ * always MIN_MATCH bytes ahead.
+ */
+ } while (--s->match_length != 0);
+ s->strstart++;
+ } else
+#endif
+ {
+ s->strstart += s->match_length;
+ s->match_length = 0;
+ s->ins_h = s->window[s->strstart];
+ UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+ Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+ /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+ * matter since it will be recomputed at next deflate call.
+ */
+ }
+ } else {
+ /* No match, output a literal byte */
+ Tracevv((stderr,"%c", s->window[s->strstart]));
+ _tr_tally_lit (s, s->window[s->strstart], bflush);
+ s->lookahead--;
+ s->strstart++;
+ }
+ if (bflush) FLUSH_BLOCK(s, 0);
+ }
+ FLUSH_BLOCK(s, flush == Z_FINISH);
+ return flush == Z_FINISH ? finish_done : block_done;
+}
+
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ IPos hash_head = NIL; /* head of hash chain */
+ int bflush; /* set if current block must be flushed */
+
+ /* Process the input block. */
+ for (;;) {
+ /* Make sure that we always have enough lookahead, except
+ * at the end of the input file. We need MAX_MATCH bytes
+ * for the next match, plus MIN_MATCH bytes to insert the
+ * string following the next match.
+ */
+ if (s->lookahead < MIN_LOOKAHEAD) {
+ fill_window(s);
+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+ return need_more;
+ }
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+
+ /* Insert the string window[strstart .. strstart+2] in the
+ * dictionary, and set hash_head to the head of the hash chain:
+ */
+ if (s->lookahead >= MIN_MATCH) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+
+ /* Find the longest match, discarding those <= prev_length.
+ */
+ s->prev_length = s->match_length, s->prev_match = s->match_start;
+ s->match_length = MIN_MATCH-1;
+
+ if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+ s->strstart - hash_head <= MAX_DIST(s)) {
+ /* To simplify the code, we prevent matches with the string
+ * of window index 0 (in particular we have to avoid a match
+ * of the string with itself at the start of the input file).
+ */
+ if (s->strategy != Z_HUFFMAN_ONLY) {
+ s->match_length = longest_match (s, hash_head);
+ }
+ /* longest_match() sets match_start */
+
+ if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
+ (s->match_length == MIN_MATCH &&
+ s->strstart - s->match_start > TOO_FAR))) {
+
+ /* If prev_match is also MIN_MATCH, match_start is garbage
+ * but we will ignore the current match anyway.
+ */
+ s->match_length = MIN_MATCH-1;
+ }
+ }
+ /* If there was a match at the previous step and the current
+ * match is not better, output the previous match:
+ */
+ if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+ uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+ /* Do not insert strings in hash table beyond this. */
+
+ check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+ _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+ s->prev_length - MIN_MATCH, bflush);
+
+ /* Insert in hash table all strings up to the end of the match.
+ * strstart-1 and strstart are already inserted. If there is not
+ * enough lookahead, the last two strings are not inserted in
+ * the hash table.
+ */
+ s->lookahead -= s->prev_length-1;
+ s->prev_length -= 2;
+ do {
+ if (++s->strstart <= max_insert) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+ } while (--s->prev_length != 0);
+ s->match_available = 0;
+ s->match_length = MIN_MATCH-1;
+ s->strstart++;
+
+ if (bflush) FLUSH_BLOCK(s, 0);
+
+ } else if (s->match_available) {
+ /* If there was no match at the previous position, output a
+ * single literal. If there was a match but the current match
+ * is longer, truncate the previous match to a single literal.
+ */
+ Tracevv((stderr,"%c", s->window[s->strstart-1]));
+ _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+ if (bflush) {
+ FLUSH_BLOCK_ONLY(s, 0);
+ }
+ s->strstart++;
+ s->lookahead--;
+ if (s->strm->avail_out == 0) return need_more;
+ } else {
+ /* There is no previous match to compare with, wait for
+ * the next step to decide.
+ */
+ s->match_available = 1;
+ s->strstart++;
+ s->lookahead--;
+ }
+ }
+ Assert (flush != Z_NO_FLUSH, "no flush?");
+ if (s->match_available) {
+ Tracevv((stderr,"%c", s->window[s->strstart-1]));
+ _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+ s->match_available = 0;
+ }
+ FLUSH_BLOCK(s, flush == Z_FINISH);
+ return flush == Z_FINISH ? finish_done : block_done;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.c Sat Jul 13 19:22:41 2002
@@ -0,0 +1,225 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+struct internal_state {int dummy;}; /* for buggy compilers */
+
+#ifndef STDC
+extern void exit OF((int));
+#endif
+
+const char *z_errmsg[10] = {
+"need dictionary", /* Z_NEED_DICT 2 */
+"stream end", /* Z_STREAM_END 1 */
+"", /* Z_OK 0 */
+"file error", /* Z_ERRNO (-1) */
+"stream error", /* Z_STREAM_ERROR (-2) */
+"data error", /* Z_DATA_ERROR (-3) */
+"insufficient memory", /* Z_MEM_ERROR (-4) */
+"buffer error", /* Z_BUF_ERROR (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+ return ZLIB_VERSION;
+}
+
+#ifdef DEBUG
+
+# ifndef verbose
+# define verbose 0
+# endif
+int z_verbose = verbose;
+
+void z_error (m)
+ char *m;
+{
+ fprintf(stderr, "%s\n", m);
+ exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+ int err;
+{
+ return ERR_MSG(err);
+}
+
+
+#ifndef HAVE_MEMCPY
+
+void zmemcpy(dest, source, len)
+ Bytef* dest;
+ const Bytef* source;
+ uInt len;
+{
+ if (len == 0) return;
+ do {
+ *dest++ = *source++; /* ??? to be unrolled */
+ } while (--len != 0);
+}
+
+int zmemcmp(s1, s2, len)
+ const Bytef* s1;
+ const Bytef* s2;
+ uInt len;
+{
+ uInt j;
+
+ for (j = 0; j < len; j++) {
+ if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+ }
+ return 0;
+}
+
+void zmemzero(dest, len)
+ Bytef* dest;
+ uInt len;
+{
+ if (len == 0) return;
+ do {
+ *dest++ = 0; /* ??? to be unrolled */
+ } while (--len != 0);
+}
+#endif
+
+#ifdef __TURBOC__
+#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
+/* Small and medium model in Turbo C are for now limited to near allocation
+ * with reduced MAX_WBITS and MAX_MEM_LEVEL
+ */
+# define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+ voidpf org_ptr;
+ voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+ voidpf buf = opaque; /* just to make some compilers happy */
+ ulg bsize = (ulg)items*size;
+
+ /* If we allocate less than 65520 bytes, we assume that farmalloc
+ * will return a usable pointer which doesn't have to be normalized.
+ */
+ if (bsize < 65520L) {
+ buf = farmalloc(bsize);
+ if (*(ush*)&buf != 0) return buf;
+ } else {
+ buf = farmalloc(bsize + 16L);
+ }
+ if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+ table[next_ptr].org_ptr = buf;
+
+ /* Normalize the pointer to seg:0 */
+ *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+ *(ush*)&buf = 0;
+ table[next_ptr++].new_ptr = buf;
+ return buf;
+}
+
+void zcfree (voidpf opaque, voidpf ptr)
+{
+ int n;
+ if (*(ush*)&ptr != 0) { /* object < 64K */
+ farfree(ptr);
+ return;
+ }
+ /* Find the original pointer */
+ for (n = 0; n < next_ptr; n++) {
+ if (ptr != table[n].new_ptr) continue;
+
+ farfree(table[n].org_ptr);
+ while (++n < next_ptr) {
+ table[n-1] = table[n];
+ }
+ next_ptr--;
+ return;
+ }
+ ptr = opaque; /* just to make some compilers happy */
+ Assert(0, "zcfree: ptr not found");
+}
+#endif
+#endif /* __TURBOC__ */
+
+
+#if defined(M_I86) && !defined(__32BIT__)
+/* Microsoft C in 16-bit mode */
+
+# define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+# define _halloc halloc
+# define _hfree hfree
+#endif
+
+voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+ if (opaque) opaque = 0; /* to make compiler happy */
+ return _halloc((long)items, size);
+}
+
+void zcfree (voidpf opaque, voidpf ptr)
+{
+ if (opaque) opaque = 0; /* to make compiler happy */
+ _hfree(ptr);
+}
+
+#endif /* MSC */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp calloc OF((uInt items, uInt size));
+extern void free OF((voidpf ptr));
+#endif
+
+voidpf zcalloc (opaque, items, size)
+ voidpf opaque;
+ unsigned items;
+ unsigned size;
+{
+ if (opaque) items += size - size; /* make compiler happy */
+ return (voidpf)calloc(items, size);
+}
+
+void zcfree (opaque, ptr)
+ voidpf opaque;
+ voidpf ptr;
+{
+ free(ptr);
+ if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/gzio.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/gzio.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/gzio.c Sat Jul 13 19:22:41 2002
@@ -0,0 +1,875 @@
+/* gzio.c -- IO on .gz files
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Compile this file with -DNO_DEFLATE to avoid the compression code.
+ */
+
+/* @(#) $Id$ */
+
+#include <stdio.h>
+
+#include "zutil.h"
+
+struct internal_state {int dummy;}; /* for buggy compilers */
+
+#ifndef Z_BUFSIZE
+# ifdef MAXSEG_64K
+# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
+# else
+# define Z_BUFSIZE 16384
+# endif
+#endif
+#ifndef Z_PRINTF_BUFSIZE
+# define Z_PRINTF_BUFSIZE 4096
+#endif
+
+#define ALLOC(size) malloc(size)
+#define TRYFREE(p) {if (p) free(p);}
+
+static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
+
+/* gzip flag byte */
+#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
+#define COMMENT 0x10 /* bit 4 set: file comment present */
+#define RESERVED 0xE0 /* bits 5..7: reserved */
+
+typedef struct gz_stream {
+ z_stream stream;
+ int z_err; /* error code for last stream operation */
+ int z_eof; /* set if end of input file */
+ FILE *file; /* .gz file */
+ Byte *inbuf; /* input buffer */
+ Byte *outbuf; /* output buffer */
+ uLong crc; /* crc32 of uncompressed data */
+ char *msg; /* error message */
+ char *path; /* path name for debugging only */
+ int transparent; /* 1 if input file is not a .gz file */
+ char mode; /* 'w' or 'r' */
+ long startpos; /* start of compressed data in file (header skipped) */
+} gz_stream;
+
+
+local gzFile gz_open OF((const char *path, const char *mode, int fd));
+local int do_flush OF((gzFile file, int flush));
+local int get_byte OF((gz_stream *s));
+local void check_header OF((gz_stream *s));
+local int destroy OF((gz_stream *s));
+local void putLong OF((FILE *file, uLong x));
+local uLong getLong OF((gz_stream *s));
+
+/* ===========================================================================
+ Opens a gzip (.gz) file for reading or writing. The mode parameter
+ is as in fopen ("rb" or "wb"). The file is given either by file descriptor
+ or path name (if fd == -1).
+ gz_open return NULL if the file could not be opened or if there was
+ insufficient memory to allocate the (de)compression state; errno
+ can be checked to distinguish the two cases (if errno is zero, the
+ zlib error is Z_MEM_ERROR).
+*/
+local gzFile gz_open (path, mode, fd)
+ const char *path;
+ const char *mode;
+ int fd;
+{
+ int err;
+ int level = Z_DEFAULT_COMPRESSION; /* compression level */
+ int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
+ char *p = (char*)mode;
+ gz_stream *s;
+ char fmode[80]; /* copy of mode, without the compression level */
+ char *m = fmode;
+
+ if (!path || !mode) return Z_NULL;
+
+ s = (gz_stream *)ALLOC(sizeof(gz_stream));
+ if (!s) return Z_NULL;
+
+ s->stream.zalloc = (alloc_func)0;
+ s->stream.zfree = (free_func)0;
+ s->stream.opaque = (voidpf)0;
+ s->stream.next_in = s->inbuf = Z_NULL;
+ s->stream.next_out = s->outbuf = Z_NULL;
+ s->stream.avail_in = s->stream.avail_out = 0;
+ s->file = NULL;
+ s->z_err = Z_OK;
+ s->z_eof = 0;
+ s->crc = crc32(0L, Z_NULL, 0);
+ s->msg = NULL;
+ s->transparent = 0;
+
+ s->path = (char*)ALLOC(strlen(path)+1);
+ if (s->path == NULL) {
+ return destroy(s), (gzFile)Z_NULL;
+ }
+ strcpy(s->path, path); /* do this early for debugging */
+
+ s->mode = '\0';
+ do {
+ if (*p == 'r') s->mode = 'r';
+ if (*p == 'w' || *p == 'a') s->mode = 'w';
+ if (*p >= '0' && *p <= '9') {
+ level = *p - '0';
+ } else if (*p == 'f') {
+ strategy = Z_FILTERED;
+ } else if (*p == 'h') {
+ strategy = Z_HUFFMAN_ONLY;
+ } else {
+ *m++ = *p; /* copy the mode */
+ }
+ } while (*p++ && m != fmode + sizeof(fmode));
+ if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
+
+ if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+ err = Z_STREAM_ERROR;
+#else
+ err = deflateInit2(&(s->stream), level,
+ Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+ /* windowBits is passed < 0 to suppress zlib header */
+
+ s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+#endif
+ if (err != Z_OK || s->outbuf == Z_NULL) {
+ return destroy(s), (gzFile)Z_NULL;
+ }
+ } else {
+ s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
+
+ err = inflateInit2(&(s->stream), -MAX_WBITS);
+ /* windowBits is passed < 0 to tell that there is no zlib header.
+ * Note that in this case inflate *requires* an extra "dummy" byte
+ * after the compressed stream in order to complete decompression and
+ * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
+ * present after the compressed stream.
+ */
+ if (err != Z_OK || s->inbuf == Z_NULL) {
+ return destroy(s), (gzFile)Z_NULL;
+ }
+ }
+ s->stream.avail_out = Z_BUFSIZE;
+
+ errno = 0;
+ s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
+
+ if (s->file == NULL) {
+ return destroy(s), (gzFile)Z_NULL;
+ }
+ if (s->mode == 'w') {
+ /* Write a very simple .gz header:
+ */
+ fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+ Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+ s->startpos = 10L;
+ /* We use 10L instead of ftell(s->file) to because ftell causes an
+ * fflush on some systems. This version of the library doesn't use
+ * startpos anyway in write mode, so this initialization is not
+ * necessary.
+ */
+ } else {
+ check_header(s); /* skip the .gz header */
+ s->startpos = (ftell(s->file) - s->stream.avail_in);
+ }
+
+ return (gzFile)s;
+}
+
+/* ===========================================================================
+ Opens a gzip (.gz) file for reading or writing.
+*/
+gzFile ZEXPORT gzopen (path, mode)
+ const char *path;
+ const char *mode;
+{
+ return gz_open (path, mode, -1);
+}
+
+/* ===========================================================================
+ Associate a gzFile with the file descriptor fd. fd is not dup'ed here
+ to mimic the behavio(u)r of fdopen.
+*/
+gzFile ZEXPORT gzdopen (fd, mode)
+ int fd;
+ const char *mode;
+{
+ char name[20];
+
+ if (fd < 0) return (gzFile)Z_NULL;
+ sprintf(name, "<fd:%d>", fd); /* for debugging */
+
+ return gz_open (name, mode, fd);
+}
+
+/* ===========================================================================
+ * Update the compression level and strategy
+ */
+int ZEXPORT gzsetparams (file, level, strategy)
+ gzFile file;
+ int level;
+ int strategy;
+{
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+ /* Make room to allow flushing */
+ if (s->stream.avail_out == 0) {
+
+ s->stream.next_out = s->outbuf;
+ if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+ s->z_err = Z_ERRNO;
+ }
+ s->stream.avail_out = Z_BUFSIZE;
+ }
+
+ return deflateParams (&(s->stream), level, strategy);
+}
+
+/* ===========================================================================
+ Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+ for end of file.
+ IN assertion: the stream s has been sucessfully opened for reading.
+*/
+local int get_byte(s)
+ gz_stream *s;
+{
+ if (s->z_eof) return EOF;
+ if (s->stream.avail_in == 0) {
+ errno = 0;
+ s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+ if (s->stream.avail_in == 0) {
+ s->z_eof = 1;
+ if (ferror(s->file)) s->z_err = Z_ERRNO;
+ return EOF;
+ }
+ s->stream.next_in = s->inbuf;
+ }
+ s->stream.avail_in--;
+ return *(s->stream.next_in)++;
+}
+
+/* ===========================================================================
+ Check the gzip header of a gz_stream opened for reading. Set the stream
+ mode to transparent if the gzip magic header is not present; set s->err
+ to Z_DATA_ERROR if the magic header is present but the rest of the header
+ is incorrect.
+ IN assertion: the stream s has already been created sucessfully;
+ s->stream.avail_in is zero for the first time, but may be non-zero
+ for concatenated .gz files.
+*/
+local void check_header(s)
+ gz_stream *s;
+{
+ int method; /* method byte */
+ int flags; /* flags byte */
+ uInt len;
+ int c;
+
+ /* Check the gzip magic header */
+ for (len = 0; len < 2; len++) {
+ c = get_byte(s);
+ if (c != gz_magic[len]) {
+ if (len != 0) s->stream.avail_in++, s->stream.next_in--;
+ if (c != EOF) {
+ s->stream.avail_in++, s->stream.next_in--;
+ s->transparent = 1;
+ }
+ s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
+ return;
+ }
+ }
+ method = get_byte(s);
+ flags = get_byte(s);
+ if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+ s->z_err = Z_DATA_ERROR;
+ return;
+ }
+
+ /* Discard time, xflags and OS code: */
+ for (len = 0; len < 6; len++) (void)get_byte(s);
+
+ if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+ len = (uInt)get_byte(s);
+ len += ((uInt)get_byte(s))<<8;
+ /* len is garbage if EOF but the loop below will quit anyway */
+ while (len-- != 0 && get_byte(s) != EOF) ;
+ }
+ if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+ while ((c = get_byte(s)) != 0 && c != EOF) ;
+ }
+ if ((flags & COMMENT) != 0) { /* skip the .gz file comment */
+ while ((c = get_byte(s)) != 0 && c != EOF) ;
+ }
+ if ((flags & HEAD_CRC) != 0) { /* skip the header crc */
+ for (len = 0; len < 2; len++) (void)get_byte(s);
+ }
+ s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
+}
+
+ /* ===========================================================================
+ * Cleanup then free the given gz_stream. Return a zlib error code.
+ Try freeing in the reverse order of allocations.
+ */
+local int destroy (s)
+ gz_stream *s;
+{
+ int err = Z_OK;
+
+ if (!s) return Z_STREAM_ERROR;
+
+ TRYFREE(s->msg);
+
+ if (s->stream.state != NULL) {
+ if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+ err = Z_STREAM_ERROR;
+#else
+ err = deflateEnd(&(s->stream));
+#endif
+ } else if (s->mode == 'r') {
+ err = inflateEnd(&(s->stream));
+ }
+ }
+ if (s->file != NULL && fclose(s->file)) {
+#ifdef ESPIPE
+ if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
+#endif
+ err = Z_ERRNO;
+ }
+ if (s->z_err < 0) err = s->z_err;
+
+ TRYFREE(s->inbuf);
+ TRYFREE(s->outbuf);
+ TRYFREE(s->path);
+ TRYFREE(s);
+ return err;
+}
+
+/* ===========================================================================
+ Reads the given number of uncompressed bytes from the compressed file.
+ gzread returns the number of bytes actually read (0 for end of file).
+*/
+int ZEXPORT gzread (file, buf, len)
+ gzFile file;
+ voidp buf;
+ unsigned len;
+{
+ gz_stream *s = (gz_stream*)file;
+ Bytef *start = (Bytef*)buf; /* starting point for crc computation */
+ Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */
+
+ if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
+
+ if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
+ if (s->z_err == Z_STREAM_END) return 0; /* EOF */
+
+ next_out = (Byte*)buf;
+ s->stream.next_out = (Bytef*)buf;
+ s->stream.avail_out = len;
+
+ while (s->stream.avail_out != 0) {
+
+ if (s->transparent) {
+ /* Copy first the lookahead bytes: */
+ uInt n = s->stream.avail_in;
+ if (n > s->stream.avail_out) n = s->stream.avail_out;
+ if (n > 0) {
+ zmemcpy(s->stream.next_out, s->stream.next_in, n);
+ next_out += n;
+ s->stream.next_out = next_out;
+ s->stream.next_in += n;
+ s->stream.avail_out -= n;
+ s->stream.avail_in -= n;
+ }
+ if (s->stream.avail_out > 0) {
+ s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
+ s->file);
+ }
+ len -= s->stream.avail_out;
+ s->stream.total_in += (uLong)len;
+ s->stream.total_out += (uLong)len;
+ if (len == 0) s->z_eof = 1;
+ return (int)len;
+ }
+ if (s->stream.avail_in == 0 && !s->z_eof) {
+
+ errno = 0;
+ s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+ if (s->stream.avail_in == 0) {
+ s->z_eof = 1;
+ if (ferror(s->file)) {
+ s->z_err = Z_ERRNO;
+ break;
+ }
+ }
+ s->stream.next_in = s->inbuf;
+ }
+ s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+
+ if (s->z_err == Z_STREAM_END) {
+ /* Check CRC and original size */
+ s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+ start = s->stream.next_out;
+
+ if (getLong(s) != s->crc) {
+ s->z_err = Z_DATA_ERROR;
+ } else {
+ (void)getLong(s);
+ /* The uncompressed length returned by above getlong() may
+ * be different from s->stream.total_out) in case of
+ * concatenated .gz files. Check for such files:
+ */
+ check_header(s);
+ if (s->z_err == Z_OK) {
+ uLong total_in = s->stream.total_in;
+ uLong total_out = s->stream.total_out;
+
+ inflateReset(&(s->stream));
+ s->stream.total_in = total_in;
+ s->stream.total_out = total_out;
+ s->crc = crc32(0L, Z_NULL, 0);
+ }
+ }
+ }
+ if (s->z_err != Z_OK || s->z_eof) break;
+ }
+ s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+
+ return (int)(len - s->stream.avail_out);
+}
+
+
+/* ===========================================================================
+ Reads one byte from the compressed file. gzgetc returns this byte
+ or -1 in case of end of file or error.
+*/
+int ZEXPORT gzgetc(file)
+ gzFile file;
+{
+ unsigned char c;
+
+ return gzread(file, &c, 1) == 1 ? c : -1;
+}
+
+
+/* ===========================================================================
+ Reads bytes from the compressed file until len-1 characters are
+ read, or a newline character is read and transferred to buf, or an
+ end-of-file condition is encountered. The string is then terminated
+ with a null character.
+ gzgets returns buf, or Z_NULL in case of error.
+
+ The current implementation is not optimized at all.
+*/
+char * ZEXPORT gzgets(file, buf, len)
+ gzFile file;
+ char *buf;
+ int len;
+{
+ char *b = buf;
+ if (buf == Z_NULL || len <= 0) return Z_NULL;
+
+ while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
+ *buf = '\0';
+ return b == buf && len > 0 ? Z_NULL : b;
+}
+
+
+#ifndef NO_DEFLATE
+/* ===========================================================================
+ Writes the given number of uncompressed bytes into the compressed file.
+ gzwrite returns the number of bytes actually written (0 in case of error).
+*/
+int ZEXPORT gzwrite (file, buf, len)
+ gzFile file;
+ const voidp buf;
+ unsigned len;
+{
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+ s->stream.next_in = (Bytef*)buf;
+ s->stream.avail_in = len;
+
+ while (s->stream.avail_in != 0) {
+
+ if (s->stream.avail_out == 0) {
+
+ s->stream.next_out = s->outbuf;
+ if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+ s->z_err = Z_ERRNO;
+ break;
+ }
+ s->stream.avail_out = Z_BUFSIZE;
+ }
+ s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+ if (s->z_err != Z_OK) break;
+ }
+ s->crc = crc32(s->crc, (const Bytef *)buf, len);
+
+ return (int)(len - s->stream.avail_in);
+}
+
+/* ===========================================================================
+ Converts, formats, and writes the args to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
+ uncompressed bytes actually written (0 in case of error).
+*/
+#ifdef STDC
+#include <stdarg.h>
+
+int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
+{
+ char buf[Z_PRINTF_BUFSIZE];
+ va_list va;
+ int len;
+
+ va_start(va, format);
+#ifdef HAS_vsnprintf
+ (void)vsnprintf(buf, sizeof(buf), format, va);
+#else
+ (void)vsprintf(buf, format, va);
+#endif
+ va_end(va);
+ len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
+ if (len <= 0) return 0;
+
+ return gzwrite(file, buf, (unsigned)len);
+}
+#else /* not ANSI C */
+
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+ gzFile file;
+ const char *format;
+ int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+ char buf[Z_PRINTF_BUFSIZE];
+ int len;
+
+#ifdef HAS_snprintf
+ snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#else
+ sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#endif
+ len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
+ if (len <= 0) return 0;
+
+ return gzwrite(file, buf, len);
+}
+#endif
+
+/* ===========================================================================
+ Writes c, converted to an unsigned char, into the compressed file.
+ gzputc returns the value that was written, or -1 in case of error.
+*/
+int ZEXPORT gzputc(file, c)
+ gzFile file;
+ int c;
+{
+ unsigned char cc = (unsigned char) c; /* required for big endian systems */
+
+ return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
+}
+
+
+/* ===========================================================================
+ Writes the given null-terminated string to the compressed file, excluding
+ the terminating null character.
+ gzputs returns the number of characters written, or -1 in case of error.
+*/
+int ZEXPORT gzputs(file, s)
+ gzFile file;
+ const char *s;
+{
+ return gzwrite(file, (char*)s, (unsigned)strlen(s));
+}
+
+
+/* ===========================================================================
+ Flushes all pending output into the compressed file. The parameter
+ flush is as in the deflate() function.
+*/
+local int do_flush (file, flush)
+ gzFile file;
+ int flush;
+{
+ uInt len;
+ int done = 0;
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+ s->stream.avail_in = 0; /* should be zero already anyway */
+
+ for (;;) {
+ len = Z_BUFSIZE - s->stream.avail_out;
+
+ if (len != 0) {
+ if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
+ s->z_err = Z_ERRNO;
+ return Z_ERRNO;
+ }
+ s->stream.next_out = s->outbuf;
+ s->stream.avail_out = Z_BUFSIZE;
+ }
+ if (done) break;
+ s->z_err = deflate(&(s->stream), flush);
+
+ /* Ignore the second of two consecutive flushes: */
+ if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
+
+ /* deflate has finished flushing only when it hasn't used up
+ * all the available space in the output buffer:
+ */
+ done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
+
+ if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
+ }
+ return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+
+int ZEXPORT gzflush (file, flush)
+ gzFile file;
+ int flush;
+{
+ gz_stream *s = (gz_stream*)file;
+ int err = do_flush (file, flush);
+
+ if (err) return err;
+ fflush(s->file);
+ return s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+#endif /* NO_DEFLATE */
+
+/* ===========================================================================
+ Sets the starting position for the next gzread or gzwrite on the given
+ compressed file. The offset represents a number of bytes in the
+ gzseek returns the resulting offset location as measured in bytes from
+ the beginning of the uncompressed stream, or -1 in case of error.
+ SEEK_END is not implemented, returns error.
+ In this version of the library, gzseek can be extremely slow.
+*/
+z_off_t ZEXPORT gzseek (file, offset, whence)
+ gzFile file;
+ z_off_t offset;
+ int whence;
+{
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL || whence == SEEK_END ||
+ s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
+ return -1L;
+ }
+
+ if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+ return -1L;
+#else
+ if (whence == SEEK_SET) {
+ offset -= s->stream.total_in;
+ }
+ if (offset < 0) return -1L;
+
+ /* At this point, offset is the number of zero bytes to write. */
+ if (s->inbuf == Z_NULL) {
+ s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
+ zmemzero(s->inbuf, Z_BUFSIZE);
+ }
+ while (offset > 0) {
+ uInt size = Z_BUFSIZE;
+ if (offset < Z_BUFSIZE) size = (uInt)offset;
+
+ size = gzwrite(file, s->inbuf, size);
+ if (size == 0) return -1L;
+
+ offset -= size;
+ }
+ return (z_off_t)s->stream.total_in;
+#endif
+ }
+ /* Rest of function is for reading only */
+
+ /* compute absolute position */
+ if (whence == SEEK_CUR) {
+ offset += s->stream.total_out;
+ }
+ if (offset < 0) return -1L;
+
+ if (s->transparent) {
+ /* map to fseek */
+ s->stream.avail_in = 0;
+ s->stream.next_in = s->inbuf;
+ if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
+
+ s->stream.total_in = s->stream.total_out = (uLong)offset;
+ return offset;
+ }
+
+ /* For a negative seek, rewind and use positive seek */
+ if ((uLong)offset >= s->stream.total_out) {
+ offset -= s->stream.total_out;
+ } else if (gzrewind(file) < 0) {
+ return -1L;
+ }
+ /* offset is now the number of bytes to skip. */
+
+ if (offset != 0 && s->outbuf == Z_NULL) {
+ s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+ }
+ while (offset > 0) {
+ int size = Z_BUFSIZE;
+ if (offset < Z_BUFSIZE) size = (int)offset;
+
+ size = gzread(file, s->outbuf, (uInt)size);
+ if (size <= 0) return -1L;
+ offset -= size;
+ }
+ return (z_off_t)s->stream.total_out;
+}
+
+/* ===========================================================================
+ Rewinds input file.
+*/
+int ZEXPORT gzrewind (file)
+ gzFile file;
+{
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL || s->mode != 'r') return -1;
+
+ s->z_err = Z_OK;
+ s->z_eof = 0;
+ s->stream.avail_in = 0;
+ s->stream.next_in = s->inbuf;
+ s->crc = crc32(0L, Z_NULL, 0);
+
+ if (s->startpos == 0) { /* not a compressed file */
+ rewind(s->file);
+ return 0;
+ }
+
+ (void) inflateReset(&s->stream);
+ return fseek(s->file, s->startpos, SEEK_SET);
+}
+
+/* ===========================================================================
+ Returns the starting position for the next gzread or gzwrite on the
+ given compressed file. This position represents a number of bytes in the
+ uncompressed data stream.
+*/
+z_off_t ZEXPORT gztell (file)
+ gzFile file;
+{
+ return gzseek(file, 0L, SEEK_CUR);
+}
+
+/* ===========================================================================
+ Returns 1 when EOF has previously been detected reading the given
+ input stream, otherwise zero.
+*/
+int ZEXPORT gzeof (file)
+ gzFile file;
+{
+ gz_stream *s = (gz_stream*)file;
+
+ return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
+}
+
+/* ===========================================================================
+ Outputs a long in LSB order to the given file
+*/
+local void putLong (file, x)
+ FILE *file;
+ uLong x;
+{
+ int n;
+ for (n = 0; n < 4; n++) {
+ fputc((int)(x & 0xff), file);
+ x >>= 8;
+ }
+}
+
+/* ===========================================================================
+ Reads a long in LSB order from the given gz_stream. Sets z_err in case
+ of error.
+*/
+local uLong getLong (s)
+ gz_stream *s;
+{
+ uLong x = (uLong)get_byte(s);
+ int c;
+
+ x += ((uLong)get_byte(s))<<8;
+ x += ((uLong)get_byte(s))<<16;
+ c = get_byte(s);
+ if (c == EOF) s->z_err = Z_DATA_ERROR;
+ x += ((uLong)c)<<24;
+ return x;
+}
+
+/* ===========================================================================
+ Flushes all pending output if necessary, closes the compressed file
+ and deallocates all the (de)compression state.
+*/
+int ZEXPORT gzclose (file)
+ gzFile file;
+{
+ int err;
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL) return Z_STREAM_ERROR;
+
+ if (s->mode == 'w') {
+#ifdef NO_DEFLATE
+ return Z_STREAM_ERROR;
+#else
+ err = do_flush (file, Z_FINISH);
+ if (err != Z_OK) return destroy((gz_stream*)file);
+
+ putLong (s->file, s->crc);
+ putLong (s->file, s->stream.total_in);
+#endif
+ }
+ return destroy((gz_stream*)file);
+}
+
+/* ===========================================================================
+ Returns the error message for the last error which occured on the
+ given compressed file. errnum is set to zlib error number. If an
+ error occured in the file system and not in the compression library,
+ errnum is set to Z_ERRNO and the application may consult errno
+ to get the exact error code.
+*/
+const char* ZEXPORT gzerror (file, errnum)
+ gzFile file;
+ int *errnum;
+{
+ char *m;
+ gz_stream *s = (gz_stream*)file;
+
+ if (s == NULL) {
+ *errnum = Z_STREAM_ERROR;
+ return (const char*)ERR_MSG(Z_STREAM_ERROR);
+ }
+ *errnum = s->z_err;
+ if (*errnum == Z_OK) return (const char*)"";
+
+ m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
+
+ if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
+
+ TRYFREE(s->msg);
+ s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
+ strcpy(s->msg, s->path);
+ strcat(s->msg, ": ");
+ strcat(s->msg, m);
+ return (const char*)s->msg;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/deflate.h Sat Jul 13 19:22:41 2002
@@ -0,0 +1,318 @@
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-1998 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef _DEFLATE_H
+#define _DEFLATE_H
+
+#include "zutil.h"
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS 256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES 30
+/* number of distance codes */
+
+#define BL_CODES 19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define INIT_STATE 42
+#define BUSY_STATE 113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+ union {
+ ush freq; /* frequency count */
+ ush code; /* bit string */
+ } fc;
+ union {
+ ush dad; /* father node in Huffman tree */
+ ush len; /* length of bit string */
+ } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad dl.dad
+#define Len dl.len
+
+typedef struct static_tree_desc_s static_tree_desc;
+
+typedef struct tree_desc_s {
+ ct_data *dyn_tree; /* the dynamic tree */
+ int max_code; /* largest code with non zero frequency */
+ static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+ z_streamp strm; /* pointer back to this zlib stream */
+ int status; /* as the name implies */
+ Bytef *pending_buf; /* output still pending */
+ ulg pending_buf_size; /* size of pending_buf */
+ Bytef *pending_out; /* next pending byte to output to the stream */
+ int pending; /* nb of bytes in the pending buffer */
+ int noheader; /* suppress zlib header and adler32 */
+ Byte data_type; /* UNKNOWN, BINARY or ASCII */
+ Byte method; /* STORED (for zip only) or DEFLATED */
+ int last_flush; /* value of flush param for previous deflate call */
+
+ /* used by deflate.c: */
+
+ uInt w_size; /* LZ77 window size (32K by default) */
+ uInt w_bits; /* log2(w_size) (8..16) */
+ uInt w_mask; /* w_size - 1 */
+
+ Bytef *window;
+ /* Sliding window. Input bytes are read into the second half of the window,
+ * and move to the first half later to keep a dictionary of at least wSize
+ * bytes. With this organization, matches are limited to a distance of
+ * wSize-MAX_MATCH bytes, but this ensures that IO is always
+ * performed with a length multiple of the block size. Also, it limits
+ * the window size to 64K, which is quite useful on MSDOS.
+ * To do: use the user input buffer as sliding window.
+ */
+
+ ulg window_size;
+ /* Actual size of window: 2*wSize, except when the user input buffer
+ * is directly used as sliding window.
+ */
+
+ Posf *prev;
+ /* Link to older string with same hash index. To limit the size of this
+ * array to 64K, this link is maintained only for the last 32K strings.
+ * An index in this array is thus a window index modulo 32K.
+ */
+
+ Posf *head; /* Heads of the hash chains or NIL. */
+
+ uInt ins_h; /* hash index of string to be inserted */
+ uInt hash_size; /* number of elements in hash table */
+ uInt hash_bits; /* log2(hash_size) */
+ uInt hash_mask; /* hash_size-1 */
+
+ uInt hash_shift;
+ /* Number of bits by which ins_h must be shifted at each input
+ * step. It must be such that after MIN_MATCH steps, the oldest
+ * byte no longer takes part in the hash key, that is:
+ * hash_shift * MIN_MATCH >= hash_bits
+ */
+
+ long block_start;
+ /* Window position at the beginning of the current output block. Gets
+ * negative when the window is moved backwards.
+ */
+
+ uInt match_length; /* length of best match */
+ IPos prev_match; /* previous match */
+ int match_available; /* set if previous match exists */
+ uInt strstart; /* start of string to insert */
+ uInt match_start; /* start of matching string */
+ uInt lookahead; /* number of valid bytes ahead in window */
+
+ uInt prev_length;
+ /* Length of the best match at previous step. Matches not greater than this
+ * are discarded. This is used in the lazy match evaluation.
+ */
+
+ uInt max_chain_length;
+ /* To speed up deflation, hash chains are never searched beyond this
+ * length. A higher limit improves compression ratio but degrades the
+ * speed.
+ */
+
+ uInt max_lazy_match;
+ /* Attempt to find a better match only when the current match is strictly
+ * smaller than this value. This mechanism is used only for compression
+ * levels >= 4.
+ */
+# define max_insert_length max_lazy_match
+ /* Insert new strings in the hash table only if the match length is not
+ * greater than this length. This saves time but degrades compression.
+ * max_insert_length is used only for compression levels <= 3.
+ */
+
+ int level; /* compression level (1..9) */
+ int strategy; /* favor or force Huffman coding*/
+
+ uInt good_match;
+ /* Use a faster search when the previous match is longer than this */
+
+ int nice_match; /* Stop searching when current match exceeds this */
+
+ /* used by trees.c: */
+ /* Didn't use ct_data typedef below to supress compiler warning */
+ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
+ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
+
+ struct tree_desc_s l_desc; /* desc. for literal tree */
+ struct tree_desc_s d_desc; /* desc. for distance tree */
+ struct tree_desc_s bl_desc; /* desc. for bit length tree */
+
+ ush bl_count[MAX_BITS+1];
+ /* number of codes at each bit length for an optimal tree */
+
+ int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */
+ int heap_len; /* number of elements in the heap */
+ int heap_max; /* element of largest frequency */
+ /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+ * The same heap array is used to build all trees.
+ */
+
+ uch depth[2*L_CODES+1];
+ /* Depth of each subtree used as tie breaker for trees of equal frequency
+ */
+
+ uchf *l_buf; /* buffer for literals or lengths */
+
+ uInt lit_bufsize;
+ /* Size of match buffer for literals/lengths. There are 4 reasons for
+ * limiting lit_bufsize to 64K:
+ * - frequencies can be kept in 16 bit counters
+ * - if compression is not successful for the first block, all input
+ * data is still in the window so we can still emit a stored block even
+ * when input comes from standard input. (This can also be done for
+ * all blocks if lit_bufsize is not greater than 32K.)
+ * - if compression is not successful for a file smaller than 64K, we can
+ * even emit a stored file instead of a stored block (saving 5 bytes).
+ * This is applicable only for zip (not gzip or zlib).
+ * - creating new Huffman trees less frequently may not provide fast
+ * adaptation to changes in the input data statistics. (Take for
+ * example a binary file with poorly compressible code followed by
+ * a highly compressible string table.) Smaller buffer sizes give
+ * fast adaptation but have of course the overhead of transmitting
+ * trees more frequently.
+ * - I can't count above 4
+ */
+
+ uInt last_lit; /* running index in l_buf */
+
+ ushf *d_buf;
+ /* Buffer for distances. To simplify the code, d_buf and l_buf have
+ * the same number of elements. To use different lengths, an extra flag
+ * array would be necessary.
+ */
+
+ ulg opt_len; /* bit length of current block with optimal trees */
+ ulg static_len; /* bit length of current block with static trees */
+ uInt matches; /* number of string matches in current block */
+ int last_eob_len; /* bit length of EOB code for last block */
+
+#ifdef DEBUG
+ ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+ ulg bits_sent; /* bit length of compressed data sent mod 2^32 */
+#endif
+
+ ush bi_buf;
+ /* Output buffer. bits are inserted starting at the bottom (least
+ * significant bits).
+ */
+ int bi_valid;
+ /* Number of valid bits in bi_buf. All bits above the last valid bit
+ * are always zero.
+ */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+ /* in trees.c */
+void _tr_init OF((deflate_state *s));
+int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len,
+ int eof));
+void _tr_align OF((deflate_state *s));
+void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
+ int eof));
+
+#define d_code(dist) \
+ ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+ extern uch _length_code[];
+ extern uch _dist_code[];
+#else
+ extern const uch _length_code[];
+ extern const uch _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+ { uch cc = (c); \
+ s->d_buf[s->last_lit] = 0; \
+ s->l_buf[s->last_lit++] = cc; \
+ s->dyn_ltree[cc].Freq++; \
+ flush = (s->last_lit == s->lit_bufsize-1); \
+ }
+# define _tr_tally_dist(s, distance, length, flush) \
+ { uch len = (length); \
+ ush dist = (distance); \
+ s->d_buf[s->last_lit] = dist; \
+ s->l_buf[s->last_lit++] = len; \
+ dist--; \
+ s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+ s->dyn_dtree[d_code(dist)].Freq++; \
+ flush = (s->last_lit == s->lit_bufsize-1); \
+ }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+ flush = _tr_tally(s, distance, length)
+#endif
+
+#endif
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.c Sat Jul 13 19:22:41 2002
@@ -0,0 +1,87 @@
+/* inflate_util.c -- data and routines common to blocks and codes
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+#include "inftrees.h"
+#include "infcodes.h"
+#include "infutil.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* And'ing with mask[n] masks the lower n bits */
+uInt inflate_mask[17] = {
+ 0x0000,
+ 0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+ 0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+};
+
+
+/* copy as much as possible from the sliding window to the output area */
+int inflate_flush(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+ uInt n;
+ Bytef *p;
+ Bytef *q;
+
+ /* local copies of source and destination pointers */
+ p = z->next_out;
+ q = s->read;
+
+ /* compute number of bytes to copy as far as end of window */
+ n = (uInt)((q <= s->write ? s->write : s->end) - q);
+ if (n > z->avail_out) n = z->avail_out;
+ if (n && r == Z_BUF_ERROR) r = Z_OK;
+
+ /* update counters */
+ z->avail_out -= n;
+ z->total_out += n;
+
+ /* update check information */
+ if (s->checkfn != Z_NULL)
+ z->adler = s->check = (*s->checkfn)(s->check, q, n);
+
+ /* copy as far as end of window */
+ zmemcpy(p, q, n);
+ p += n;
+ q += n;
+
+ /* see if more to copy at beginning of window */
+ if (q == s->end)
+ {
+ /* wrap pointers */
+ q = s->window;
+ if (s->write == s->end)
+ s->write = s->window;
+
+ /* compute bytes to copy */
+ n = (uInt)(s->write - q);
+ if (n > z->avail_out) n = z->avail_out;
+ if (n && r == Z_BUF_ERROR) r = Z_OK;
+
+ /* update counters */
+ z->avail_out -= n;
+ z->total_out += n;
+
+ /* update check information */
+ if (s->checkfn != Z_NULL)
+ z->adler = s->check = (*s->checkfn)(s->check, q, n);
+
+ /* copy */
+ zmemcpy(p, q, n);
+ p += n;
+ q += n;
+ }
+
+ /* update pointers */
+ z->next_out = p;
+ s->read = q;
+
+ /* done */
+ return r;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/crc32.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/crc32.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/crc32.c Sat Jul 13 19:22:41 2002
@@ -0,0 +1,162 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+
+#define local static
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local int crc_table_empty = 1;
+local uLongf crc_table[256];
+local void make_crc_table OF((void));
+
+/*
+ Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
+ x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+ Polynomials over GF(2) are represented in binary, one bit per coefficient,
+ with the lowest powers in the most significant bit. Then adding polynomials
+ is just exclusive-or, and multiplying a polynomial by x is a right shift by
+ one. If we call the above polynomial p, and represent a byte as the
+ polynomial q, also with the lowest power in the most significant bit (so the
+ byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+ where a mod b means the remainder after dividing a by b.
+
+ This calculation is done using the shift-register method of multiplying and
+ taking the remainder. The register is initialized to zero, and for each
+ incoming bit, x^32 is added mod p to the register if the bit is a one (where
+ x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+ x (which is shifting right by one and adding x^32 mod p if the bit shifted
+ out is a one). We start with the highest power (least significant bit) of
+ q and repeat for all eight bits of q.
+
+ The table is simply the CRC of all possible eight bit values. This is all
+ the information needed to generate CRC's on data a byte at a time for all
+ combinations of CRC register values and incoming bytes.
+*/
+local void make_crc_table()
+{
+ uLong c;
+ int n, k;
+ uLong poly; /* polynomial exclusive-or pattern */
+ /* terms of polynomial defining this crc (except x^32): */
+ static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+ /* make exclusive-or pattern from polynomial (0xedb88320L) */
+ poly = 0L;
+ for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
+ poly |= 1L << (31 - p[n]);
+
+ for (n = 0; n < 256; n++)
+ {
+ c = (uLong)n;
+ for (k = 0; k < 8; k++)
+ c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+ crc_table[n] = c;
+ }
+ crc_table_empty = 0;
+}
+#else
+/* ========================================================================
+ * Table of CRC-32's of all single-byte values (made by make_crc_table)
+ */
+local const uLongf crc_table[256] = {
+ 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+ 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+ 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+ 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+ 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+ 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+ 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+ 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+ 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+ 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+ 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+ 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+ 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+ 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+ 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+ 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+ 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+ 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+ 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+ 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+ 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+ 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+ 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+ 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+ 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+ 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+ 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+ 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+ 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+ 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+ 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+ 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+ 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+ 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+ 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+ 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+ 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+ 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+ 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+ 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+ 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+ 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+ 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+ 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+ 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+ 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+ 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+ 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+ 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+ 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+ 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+ 0x2d02ef8dL
+};
+#endif
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const uLongf * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+ if (crc_table_empty) make_crc_table();
+#endif
+ return (const uLongf *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
+#define DO2(buf) DO1(buf); DO1(buf);
+#define DO4(buf) DO2(buf); DO2(buf);
+#define DO8(buf) DO4(buf); DO4(buf);
+
+/* ========================================================================= */
+uLong ZEXPORT crc32(crc, buf, len)
+ uLong crc;
+ const Bytef *buf;
+ uInt len;
+{
+ if (buf == Z_NULL) return 0L;
+#ifdef DYNAMIC_CRC_TABLE
+ if (crc_table_empty)
+ make_crc_table();
+#endif
+ crc = crc ^ 0xffffffffL;
+ while (len >= 8)
+ {
+ DO8(buf);
+ len -= 8;
+ }
+ if (len) do {
+ DO1(buf);
+ } while (--len);
+ return crc ^ 0xffffffffL;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zutil.h Sat Jul 13 19:22:41 2002
@@ -0,0 +1,220 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef _Z_UTIL_H
+#define _Z_UTIL_H
+
+#include "zlib.h"
+
+#ifdef STDC
+# include <stddef.h>
+# include <string.h>
+# include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+ extern int errno;
+#else
+# include <errno.h>
+#endif
+
+#ifndef local
+# define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long ulg;
+
+extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+ return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+ /* common constants */
+
+#ifndef DEF_WBITS
+# define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+# define DEF_MEM_LEVEL 8
+#else
+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES 2
+/* The three kinds of block type */
+
+#define MIN_MATCH 3
+#define MAX_MATCH 258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+ /* target dependencies */
+
+#ifdef MSDOS
+# define OS_CODE 0x00
+# if defined(__TURBOC__) || defined(__BORLANDC__)
+# if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+ /* Allow compilation with ANSI keywords only enabled */
+ void _Cdecl farfree( void *block );
+ void *_Cdecl farmalloc( unsigned long nbytes );
+# else
+# include <alloc.h>
+# endif
+# else /* MSC or DJGPP */
+# include <malloc.h>
+# endif
+#endif
+
+#ifdef OS2
+# define OS_CODE 0x06
+#endif
+
+#ifdef WIN32 /* Window 95 & Windows NT */
+# define OS_CODE 0x0b
+#endif
+
+#if defined(VAXC) || defined(VMS)
+# define OS_CODE 0x02
+# define F_OPEN(name, mode) \
+ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#ifdef AMIGA
+# define OS_CODE 0x01
+#endif
+
+#if defined(ATARI) || defined(atarist)
+# define OS_CODE 0x05
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+# define OS_CODE 0x07
+# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+# include <unix.h> /* for fdopen */
+# else
+# ifndef fdopen
+# define fdopen(fd,mode) NULL /* No fdopen() */
+# endif
+# endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+# define OS_CODE 0x0F
+#endif
+
+#ifdef TOPS20
+# define OS_CODE 0x0a
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+# define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600))
+# define fdopen(fd,type) _fdopen(fd,type)
+#endif
+
+
+ /* Common defaults */
+
+#ifndef OS_CODE
+# define OS_CODE 0x03 /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+# define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+ /* functions */
+
+#ifdef HAVE_STRERROR
+ extern char *strerror OF((int));
+# define zstrerror(errnum) strerror(errnum)
+#else
+# define zstrerror(errnum) ""
+#endif
+
+#if defined(pyr)
+# define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+ * You may have to use the same strategy for Borland C (untested).
+ * The __SC__ check is for Symantec.
+ */
+# define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+# define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+# define zmemcpy _fmemcpy
+# define zmemcmp _fmemcmp
+# define zmemzero(dest, len) _fmemset(dest, 0, len)
+# else
+# define zmemcpy memcpy
+# define zmemcmp memcmp
+# define zmemzero(dest, len) memset(dest, 0, len)
+# endif
+#else
+ extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+ extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+ extern void zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+# include <stdio.h>
+ extern int z_verbose;
+ extern void z_error OF((char *m));
+# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+# define Trace(x) {if (z_verbose>=0) fprintf x ;}
+# define Tracev(x) {if (z_verbose>0) fprintf x ;}
+# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+# define Assert(cond,msg)
+# define Trace(x)
+# define Tracev(x)
+# define Tracevv(x)
+# define Tracec(c,x)
+# define Tracecv(c,x)
+#endif
+
+
+typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
+ uInt len));
+voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+void zcfree OF((voidpf opaque, voidpf ptr));
+
+#define ZALLOC(strm, items, size) \
+ (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+#endif /* _Z_UTIL_H */
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infutil.h Sat Jul 13 19:22:42 2002
@@ -0,0 +1,98 @@
+/* infutil.h -- types and macros common to blocks and codes
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+#ifndef _INFUTIL_H
+#define _INFUTIL_H
+
+typedef enum {
+ TYPE, /* get type bits (3, including end bit) */
+ LENS, /* get lengths for stored */
+ STORED, /* processing stored block */
+ TABLE, /* get table lengths */
+ BTREE, /* get bit lengths tree for a dynamic block */
+ DTREE, /* get length, distance trees for a dynamic block */
+ CODES, /* processing fixed or dynamic block */
+ DRY, /* output remaining window bytes */
+ DONE, /* finished last block, done */
+ BAD} /* got a data error--stuck here */
+inflate_block_mode;
+
+/* inflate blocks semi-private state */
+struct inflate_blocks_state {
+
+ /* mode */
+ inflate_block_mode mode; /* current inflate_block mode */
+
+ /* mode dependent information */
+ union {
+ uInt left; /* if STORED, bytes left to copy */
+ struct {
+ uInt table; /* table lengths (14 bits) */
+ uInt index; /* index into blens (or border) */
+ uIntf *blens; /* bit lengths of codes */
+ uInt bb; /* bit length tree depth */
+ inflate_huft *tb; /* bit length decoding tree */
+ } trees; /* if DTREE, decoding info for trees */
+ struct {
+ inflate_codes_statef
+ *codes;
+ } decode; /* if CODES, current state */
+ } sub; /* submode */
+ uInt last; /* true if this block is the last block */
+
+ /* mode independent information */
+ uInt bitk; /* bits in bit buffer */
+ uLong bitb; /* bit buffer */
+ inflate_huft *hufts; /* single malloc for tree space */
+ Bytef *window; /* sliding window */
+ Bytef *end; /* one byte after sliding window */
+ Bytef *read; /* window read pointer */
+ Bytef *write; /* window write pointer */
+ check_func checkfn; /* check function */
+ uLong check; /* check on output */
+
+};
+
+
+/* defines for inflate input/output */
+/* update pointers and return */
+#define UPDBITS {s->bitb=b;s->bitk=k;}
+#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
+#define UPDOUT {s->write=q;}
+#define UPDATE {UPDBITS UPDIN UPDOUT}
+#define LEAVE {UPDATE return inflate_flush(s,z,r);}
+/* get bytes and bits */
+#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
+#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
+#define NEXTBYTE (n--,*p++)
+#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
+#define DUMPBITS(j) {b>>=(j);k-=(j);}
+/* output bytes */
+#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
+#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
+#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
+#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
+#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
+#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
+/* load local pointers */
+#define LOAD {LOADIN LOADOUT}
+
+/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
+extern uInt inflate_mask[17];
+
+/* copy as much as possible from the sliding window to the output area */
+extern int inflate_flush OF((
+ inflate_blocks_statef *,
+ z_streamp ,
+ int));
+
+struct internal_state {int dummy;}; /* for buggy compilers */
+
+#endif
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.c Sat Jul 13 19:22:42 2002
@@ -0,0 +1,1214 @@
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-1998 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * ALGORITHM
+ *
+ * The "deflation" process uses several Huffman trees. The more
+ * common source values are represented by shorter bit sequences.
+ *
+ * Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values). The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ * REFERENCES
+ *
+ * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ * Storer, James A.
+ * Data Compression: Methods and Theory, pp. 49-50.
+ * Computer Science Press, 1988. ISBN 0-7167-8156-5.
+ *
+ * Sedgewick, R.
+ * Algorithms, p290.
+ * Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+/* @(#) $Id$ */
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+# include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6 16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10 17
+/* repeat a zero length 3-10 times (3 bits of repeat count) */
+
+#define REPZ_11_138 18
+/* repeat a zero length 11-138 times (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+ = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+ = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+ = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+ = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN 512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+# include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+ const ct_data *static_tree; /* static tree or NULL */
+ const intf *extra_bits; /* extra bits for each code or NULL */
+ int extra_base; /* base index for extra_bits */
+ int elems; /* max number of elements in the tree */
+ int max_length; /* max bit length for the codes */
+};
+
+local static_tree_desc static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc static_d_desc =
+{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS};
+
+local static_tree_desc static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block OF((deflate_state *s));
+local void pqdownheap OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen OF((deflate_state *s, tree_desc *desc));
+local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree OF((deflate_state *s, tree_desc *desc));
+local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree OF((deflate_state *s, ct_data *tree, int max_code));
+local int build_bl_tree OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+ int blcodes));
+local void compress_block OF((deflate_state *s, ct_data *ltree,
+ ct_data *dtree));
+local void set_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup OF((deflate_state *s));
+local void bi_flush OF((deflate_state *s));
+local void copy_block OF((deflate_state *s, charf *buf, unsigned len,
+ int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+ /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+# define send_code(s, c, tree) \
+ { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+ send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+ put_byte(s, (uch)((w) & 0xff)); \
+ put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+ deflate_state *s;
+ int value; /* value to send */
+ int length; /* number of bits */
+{
+ Tracevv((stderr," l %2d v %4x ", length, value));
+ Assert(length > 0 && length <= 15, "invalid length");
+ s->bits_sent += (ulg)length;
+
+ /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+ * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+ * unused bits in value.
+ */
+ if (s->bi_valid > (int)Buf_size - length) {
+ s->bi_buf |= (value << s->bi_valid);
+ put_short(s, s->bi_buf);
+ s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+ s->bi_valid += length - Buf_size;
+ } else {
+ s->bi_buf |= value << s->bi_valid;
+ s->bi_valid += length;
+ }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+ if (s->bi_valid > (int)Buf_size - len) {\
+ int val = value;\
+ s->bi_buf |= (val << s->bi_valid);\
+ put_short(s, s->bi_buf);\
+ s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+ s->bi_valid += len - Buf_size;\
+ } else {\
+ s->bi_buf |= (value) << s->bi_valid;\
+ s->bi_valid += len;\
+ }\
+}
+#endif /* DEBUG */
+
+
+#define MAX(a,b) (a >= b ? a : b)
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+ static int static_init_done = 0;
+ int n; /* iterates over tree elements */
+ int bits; /* bit counter */
+ int length; /* length value */
+ int code; /* code value */
+ int dist; /* distance index */
+ ush bl_count[MAX_BITS+1];
+ /* number of codes at each bit length for an optimal tree */
+
+ if (static_init_done) return;
+
+ /* For some embedded targets, global variables are not initialized: */
+ static_l_desc.static_tree = static_ltree;
+ static_l_desc.extra_bits = extra_lbits;
+ static_d_desc.static_tree = static_dtree;
+ static_d_desc.extra_bits = extra_dbits;
+ static_bl_desc.extra_bits = extra_blbits;
+
+ /* Initialize the mapping length (0..255) -> length code (0..28) */
+ length = 0;
+ for (code = 0; code < LENGTH_CODES-1; code++) {
+ base_length[code] = length;
+ for (n = 0; n < (1<<extra_lbits[code]); n++) {
+ _length_code[length++] = (uch)code;
+ }
+ }
+ Assert (length == 256, "tr_static_init: length != 256");
+ /* Note that the length 255 (match length 258) can be represented
+ * in two different ways: code 284 + 5 bits or code 285, so we
+ * overwrite length_code[255] to use the best encoding:
+ */
+ _length_code[length-1] = (uch)code;
+
+ /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+ dist = 0;
+ for (code = 0 ; code < 16; code++) {
+ base_dist[code] = dist;
+ for (n = 0; n < (1<<extra_dbits[code]); n++) {
+ _dist_code[dist++] = (uch)code;
+ }
+ }
+ Assert (dist == 256, "tr_static_init: dist != 256");
+ dist >>= 7; /* from now on, all distances are divided by 128 */
+ for ( ; code < D_CODES; code++) {
+ base_dist[code] = dist << 7;
+ for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+ _dist_code[256 + dist++] = (uch)code;
+ }
+ }
+ Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+ /* Construct the codes of the static literal tree */
+ for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+ n = 0;
+ while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+ while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+ while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+ while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+ /* Codes 286 and 287 do not exist, but we must include them in the
+ * tree construction to get a canonical Huffman tree (longest code
+ * all ones)
+ */
+ gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+ /* The static distance tree is trivial: */
+ for (n = 0; n < D_CODES; n++) {
+ static_dtree[n].Len = 5;
+ static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+ }
+ static_init_done = 1;
+
+# ifdef GEN_TREES_H
+ gen_trees_header();
+# endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+# ifndef DEBUG
+# include <stdio.h>
+# endif
+
+# define SEPARATOR(i, last, width) \
+ ((i) == (last)? "\n};\n\n" : \
+ ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+ FILE *header = fopen("trees.h", "w");
+ int i;
+
+ Assert (header != NULL, "Can't open trees.h");
+ fprintf(header,
+ "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+ fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+ for (i = 0; i < L_CODES+2; i++) {
+ fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+ static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+ }
+
+ fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+ for (i = 0; i < D_CODES; i++) {
+ fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+ static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+ }
+
+ fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+ for (i = 0; i < DIST_CODE_LEN; i++) {
+ fprintf(header, "%2u%s", _dist_code[i],
+ SEPARATOR(i, DIST_CODE_LEN-1, 20));
+ }
+
+ fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+ for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+ fprintf(header, "%2u%s", _length_code[i],
+ SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+ }
+
+ fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+ for (i = 0; i < LENGTH_CODES; i++) {
+ fprintf(header, "%1u%s", base_length[i],
+ SEPARATOR(i, LENGTH_CODES-1, 20));
+ }
+
+ fprintf(header, "local const int base_dist[D_CODES] = {\n");
+ for (i = 0; i < D_CODES; i++) {
+ fprintf(header, "%5u%s", base_dist[i],
+ SEPARATOR(i, D_CODES-1, 10));
+ }
+
+ fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void _tr_init(s)
+ deflate_state *s;
+{
+ tr_static_init();
+
+ s->l_desc.dyn_tree = s->dyn_ltree;
+ s->l_desc.stat_desc = &static_l_desc;
+
+ s->d_desc.dyn_tree = s->dyn_dtree;
+ s->d_desc.stat_desc = &static_d_desc;
+
+ s->bl_desc.dyn_tree = s->bl_tree;
+ s->bl_desc.stat_desc = &static_bl_desc;
+
+ s->bi_buf = 0;
+ s->bi_valid = 0;
+ s->last_eob_len = 8; /* enough lookahead for inflate */
+#ifdef DEBUG
+ s->compressed_len = 0L;
+ s->bits_sent = 0L;
+#endif
+
+ /* Initialize the first block of the first file: */
+ init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+ deflate_state *s;
+{
+ int n; /* iterates over tree elements */
+
+ /* Initialize the trees. */
+ for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0;
+ for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0;
+ for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+ s->dyn_ltree[END_BLOCK].Freq = 1;
+ s->opt_len = s->static_len = 0L;
+ s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+ top = s->heap[SMALLEST]; \
+ s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+ pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+ (tree[n].Freq < tree[m].Freq || \
+ (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+ deflate_state *s;
+ ct_data *tree; /* the tree to restore */
+ int k; /* node to move down */
+{
+ int v = s->heap[k];
+ int j = k << 1; /* left son of k */
+ while (j <= s->heap_len) {
+ /* Set j to the smallest of the two sons: */
+ if (j < s->heap_len &&
+ smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+ j++;
+ }
+ /* Exit if v is smaller than both sons */
+ if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+ /* Exchange v with the smallest son */
+ s->heap[k] = s->heap[j]; k = j;
+
+ /* And continue down the tree, setting j to the left son of k */
+ j <<= 1;
+ }
+ s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ * above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ * array bl_count contains the frequencies for each bit length.
+ * The length opt_len is updated; static_len is also updated if stree is
+ * not null.
+ */
+local void gen_bitlen(s, desc)
+ deflate_state *s;
+ tree_desc *desc; /* the tree descriptor */
+{
+ ct_data *tree = desc->dyn_tree;
+ int max_code = desc->max_code;
+ const ct_data *stree = desc->stat_desc->static_tree;
+ const intf *extra = desc->stat_desc->extra_bits;
+ int base = desc->stat_desc->extra_base;
+ int max_length = desc->stat_desc->max_length;
+ int h; /* heap index */
+ int n, m; /* iterate over the tree elements */
+ int bits; /* bit length */
+ int xbits; /* extra bits */
+ ush f; /* frequency */
+ int overflow = 0; /* number of elements with bit length too large */
+
+ for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+ /* In a first pass, compute the optimal bit lengths (which may
+ * overflow in the case of the bit length tree).
+ */
+ tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+ for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+ n = s->heap[h];
+ bits = tree[tree[n].Dad].Len + 1;
+ if (bits > max_length) bits = max_length, overflow++;
+ tree[n].Len = (ush)bits;
+ /* We overwrite tree[n].Dad which is no longer needed */
+
+ if (n > max_code) continue; /* not a leaf node */
+
+ s->bl_count[bits]++;
+ xbits = 0;
+ if (n >= base) xbits = extra[n-base];
+ f = tree[n].Freq;
+ s->opt_len += (ulg)f * (bits + xbits);
+ if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+ }
+ if (overflow == 0) return;
+
+ Trace((stderr,"\nbit length overflow\n"));
+ /* This happens for example on obj2 and pic of the Calgary corpus */
+
+ /* Find the first bit length which could increase: */
+ do {
+ bits = max_length-1;
+ while (s->bl_count[bits] == 0) bits--;
+ s->bl_count[bits]--; /* move one leaf down the tree */
+ s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+ s->bl_count[max_length]--;
+ /* The brother of the overflow item also moves one step up,
+ * but this does not affect bl_count[max_length]
+ */
+ overflow -= 2;
+ } while (overflow > 0);
+
+ /* Now recompute all bit lengths, scanning in increasing frequency.
+ * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+ * lengths instead of fixing only the wrong ones. This idea is taken
+ * from 'ar' written by Haruhiko Okumura.)
+ */
+ for (bits = max_length; bits != 0; bits--) {
+ n = s->bl_count[bits];
+ while (n != 0) {
+ m = s->heap[--h];
+ if (m > max_code) continue;
+ if (tree[m].Len != (unsigned) bits) {
+ Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+ s->opt_len += ((long)bits - (long)tree[m].Len)
+ *(long)tree[m].Freq;
+ tree[m].Len = (ush)bits;
+ }
+ n--;
+ }
+ }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ * zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+ ct_data *tree; /* the tree to decorate */
+ int max_code; /* largest code with non zero frequency */
+ ushf *bl_count; /* number of codes at each bit length */
+{
+ ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+ ush code = 0; /* running code value */
+ int bits; /* bit index */
+ int n; /* code index */
+
+ /* The distribution counts are first used to generate the code values
+ * without bit reversal.
+ */
+ for (bits = 1; bits <= MAX_BITS; bits++) {
+ next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+ }
+ /* Check that the bit counts in bl_count are consistent. The last code
+ * must be all ones.
+ */
+ Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+ "inconsistent bit counts");
+ Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+ for (n = 0; n <= max_code; n++) {
+ int len = tree[n].Len;
+ if (len == 0) continue;
+ /* Now reverse the bits */
+ tree[n].Code = bi_reverse(next_code[len]++, len);
+
+ Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+ n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+ }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ * and corresponding code. The length opt_len is updated; static_len is
+ * also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+ deflate_state *s;
+ tree_desc *desc; /* the tree descriptor */
+{
+ ct_data *tree = desc->dyn_tree;
+ const ct_data *stree = desc->stat_desc->static_tree;
+ int elems = desc->stat_desc->elems;
+ int n, m; /* iterate over heap elements */
+ int max_code = -1; /* largest code with non zero frequency */
+ int node; /* new node being created */
+
+ /* Construct the initial heap, with least frequent element in
+ * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+ * heap[0] is not used.
+ */
+ s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+ for (n = 0; n < elems; n++) {
+ if (tree[n].Freq != 0) {
+ s->heap[++(s->heap_len)] = max_code = n;
+ s->depth[n] = 0;
+ } else {
+ tree[n].Len = 0;
+ }
+ }
+
+ /* The pkzip format requires that at least one distance code exists,
+ * and that at least one bit should be sent even if there is only one
+ * possible code. So to avoid special checks later on we force at least
+ * two codes of non zero frequency.
+ */
+ while (s->heap_len < 2) {
+ node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+ tree[node].Freq = 1;
+ s->depth[node] = 0;
+ s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+ /* node is 0 or 1 so it does not have extra bits */
+ }
+ desc->max_code = max_code;
+
+ /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+ * establish sub-heaps of increasing lengths:
+ */
+ for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+ /* Construct the Huffman tree by repeatedly combining the least two
+ * frequent nodes.
+ */
+ node = elems; /* next internal node of the tree */
+ do {
+ pqremove(s, tree, n); /* n = node of least frequency */
+ m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+ s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+ s->heap[--(s->heap_max)] = m;
+
+ /* Create a new node father of n and m */
+ tree[node].Freq = tree[n].Freq + tree[m].Freq;
+ s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
+ tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+ if (tree == s->bl_tree) {
+ fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+ node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+ }
+#endif
+ /* and insert the new node in the heap */
+ s->heap[SMALLEST] = node++;
+ pqdownheap(s, tree, SMALLEST);
+
+ } while (s->heap_len >= 2);
+
+ s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+ /* At this point, the fields freq and dad are set. We can now
+ * generate the bit lengths.
+ */
+ gen_bitlen(s, (tree_desc *)desc);
+
+ /* The field len is now set, we can generate the bit codes */
+ gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+ deflate_state *s;
+ ct_data *tree; /* the tree to be scanned */
+ int max_code; /* and its largest code of non zero frequency */
+{
+ int n; /* iterates over all tree elements */
+ int prevlen = -1; /* last emitted length */
+ int curlen; /* length of current code */
+ int nextlen = tree[0].Len; /* length of next code */
+ int count = 0; /* repeat count of the current code */
+ int max_count = 7; /* max repeat count */
+ int min_count = 4; /* min repeat count */
+
+ if (nextlen == 0) max_count = 138, min_count = 3;
+ tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+ for (n = 0; n <= max_code; n++) {
+ curlen = nextlen; nextlen = tree[n+1].Len;
+ if (++count < max_count && curlen == nextlen) {
+ continue;
+ } else if (count < min_count) {
+ s->bl_tree[curlen].Freq += count;
+ } else if (curlen != 0) {
+ if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+ s->bl_tree[REP_3_6].Freq++;
+ } else if (count <= 10) {
+ s->bl_tree[REPZ_3_10].Freq++;
+ } else {
+ s->bl_tree[REPZ_11_138].Freq++;
+ }
+ count = 0; prevlen = curlen;
+ if (nextlen == 0) {
+ max_count = 138, min_count = 3;
+ } else if (curlen == nextlen) {
+ max_count = 6, min_count = 3;
+ } else {
+ max_count = 7, min_count = 4;
+ }
+ }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+ deflate_state *s;
+ ct_data *tree; /* the tree to be scanned */
+ int max_code; /* and its largest code of non zero frequency */
+{
+ int n; /* iterates over all tree elements */
+ int prevlen = -1; /* last emitted length */
+ int curlen; /* length of current code */
+ int nextlen = tree[0].Len; /* length of next code */
+ int count = 0; /* repeat count of the current code */
+ int max_count = 7; /* max repeat count */
+ int min_count = 4; /* min repeat count */
+
+ /* tree[max_code+1].Len = -1; */ /* guard already set */
+ if (nextlen == 0) max_count = 138, min_count = 3;
+
+ for (n = 0; n <= max_code; n++) {
+ curlen = nextlen; nextlen = tree[n+1].Len;
+ if (++count < max_count && curlen == nextlen) {
+ continue;
+ } else if (count < min_count) {
+ do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+ } else if (curlen != 0) {
+ if (curlen != prevlen) {
+ send_code(s, curlen, s->bl_tree); count--;
+ }
+ Assert(count >= 3 && count <= 6, " 3_6?");
+ send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+ } else if (count <= 10) {
+ send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+ } else {
+ send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+ }
+ count = 0; prevlen = curlen;
+ if (nextlen == 0) {
+ max_count = 138, min_count = 3;
+ } else if (curlen == nextlen) {
+ max_count = 6, min_count = 3;
+ } else {
+ max_count = 7, min_count = 4;
+ }
+ }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+ deflate_state *s;
+{
+ int max_blindex; /* index of last bit length code of non zero freq */
+
+ /* Determine the bit length frequencies for literal and distance trees */
+ scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+ scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+ /* Build the bit length tree: */
+ build_tree(s, (tree_desc *)(&(s->bl_desc)));
+ /* opt_len now includes the length of the tree representations, except
+ * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+ */
+
+ /* Determine the number of bit length codes to send. The pkzip format
+ * requires that at least 4 bit length codes be sent. (appnote.txt says
+ * 3 but the actual value used is 4.)
+ */
+ for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+ if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+ }
+ /* Update opt_len to include the bit length tree and counts */
+ s->opt_len += 3*(max_blindex+1) + 5+5+4;
+ Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+ s->opt_len, s->static_len));
+
+ return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+ deflate_state *s;
+ int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+ int rank; /* index in bl_order */
+
+ Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+ Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+ "too many codes");
+ Tracev((stderr, "\nbl counts: "));
+ send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+ send_bits(s, dcodes-1, 5);
+ send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */
+ for (rank = 0; rank < blcodes; rank++) {
+ Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+ send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+ }
+ Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+ send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+ Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+ send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+ Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void _tr_stored_block(s, buf, stored_len, eof)
+ deflate_state *s;
+ charf *buf; /* input block */
+ ulg stored_len; /* length of input block */
+ int eof; /* true if this is the last block for a file */
+{
+ send_bits(s, (STORED_BLOCK<<1)+eof, 3); /* send block type */
+#ifdef DEBUG
+ s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+ s->compressed_len += (stored_len + 4) << 3;
+#endif
+ copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
+ */
+void _tr_align(s)
+ deflate_state *s;
+{
+ send_bits(s, STATIC_TREES<<1, 3);
+ send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+ s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+ bi_flush(s);
+ /* Of the 10 bits for the empty block, we have already sent
+ * (10 - bi_valid) bits. The lookahead for the last real code (before
+ * the EOB of the previous block) was thus at least one plus the length
+ * of the EOB plus what we have just sent of the empty static block.
+ */
+ if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+ send_bits(s, STATIC_TREES<<1, 3);
+ send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+ s->compressed_len += 10L;
+#endif
+ bi_flush(s);
+ }
+ s->last_eob_len = 7;
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void _tr_flush_block(s, buf, stored_len, eof)
+ deflate_state *s;
+ charf *buf; /* input block, or NULL if too old */
+ ulg stored_len; /* length of input block */
+ int eof; /* true if this is the last block for a file */
+{
+ ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+ int max_blindex = 0; /* index of last bit length code of non zero freq */
+
+ /* Build the Huffman trees unless a stored block is forced */
+ if (s->level > 0) {
+
+ /* Check if the file is ascii or binary */
+ if (s->data_type == Z_UNKNOWN) set_data_type(s);
+
+ /* Construct the literal and distance trees */
+ build_tree(s, (tree_desc *)(&(s->l_desc)));
+ Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+ s->static_len));
+
+ build_tree(s, (tree_desc *)(&(s->d_desc)));
+ Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+ s->static_len));
+ /* At this point, opt_len and static_len are the total bit lengths of
+ * the compressed block data, excluding the tree representations.
+ */
+
+ /* Build the bit length tree for the above two trees, and get the index
+ * in bl_order of the last bit length code to send.
+ */
+ max_blindex = build_bl_tree(s);
+
+ /* Determine the best encoding. Compute first the block length in bytes*/
+ opt_lenb = (s->opt_len+3+7)>>3;
+ static_lenb = (s->static_len+3+7)>>3;
+
+ Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+ opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+ s->last_lit));
+
+ if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+ } else {
+ Assert(buf != (char*)0, "lost buf");
+ opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+ }
+
+#ifdef FORCE_STORED
+ if (buf != (char*)0) { /* force stored block */
+#else
+ if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+ /* 4: two words for the lengths */
+#endif
+ /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+ * Otherwise we can't have processed more than WSIZE input bytes since
+ * the last block flush, because compression would have been
+ * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+ * transform a block into a stored block.
+ */
+ _tr_stored_block(s, buf, stored_len, eof);
+
+#ifdef FORCE_STATIC
+ } else if (static_lenb >= 0) { /* force static trees */
+#else
+ } else if (static_lenb == opt_lenb) {
+#endif
+ send_bits(s, (STATIC_TREES<<1)+eof, 3);
+ compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+#ifdef DEBUG
+ s->compressed_len += 3 + s->static_len;
+#endif
+ } else {
+ send_bits(s, (DYN_TREES<<1)+eof, 3);
+ send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+ max_blindex+1);
+ compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+ s->compressed_len += 3 + s->opt_len;
+#endif
+ }
+ Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+ /* The above check is made mod 2^32, for files larger than 512 MB
+ * and uLong implemented on 32 bits.
+ */
+ init_block(s);
+
+ if (eof) {
+ bi_windup(s);
+#ifdef DEBUG
+ s->compressed_len += 7; /* align on byte boundary */
+#endif
+ }
+ Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+ s->compressed_len-7*eof));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int _tr_tally (s, dist, lc)
+ deflate_state *s;
+ unsigned dist; /* distance of matched string */
+ unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+ s->d_buf[s->last_lit] = (ush)dist;
+ s->l_buf[s->last_lit++] = (uch)lc;
+ if (dist == 0) {
+ /* lc is the unmatched char */
+ s->dyn_ltree[lc].Freq++;
+ } else {
+ s->matches++;
+ /* Here, lc is the match length - MIN_MATCH */
+ dist--; /* dist = match distance - 1 */
+ Assert((ush)dist < (ush)MAX_DIST(s) &&
+ (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+ (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match");
+
+ s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+ s->dyn_dtree[d_code(dist)].Freq++;
+ }
+
+#ifdef TRUNCATE_BLOCK
+ /* Try to guess if it is profitable to stop the current block here */
+ if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+ /* Compute an upper bound for the compressed length */
+ ulg out_length = (ulg)s->last_lit*8L;
+ ulg in_length = (ulg)((long)s->strstart - s->block_start);
+ int dcode;
+ for (dcode = 0; dcode < D_CODES; dcode++) {
+ out_length += (ulg)s->dyn_dtree[dcode].Freq *
+ (5L+extra_dbits[dcode]);
+ }
+ out_length >>= 3;
+ Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+ s->last_lit, in_length, out_length,
+ 100L - out_length*100L/in_length));
+ if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+ }
+#endif
+ return (s->last_lit == s->lit_bufsize-1);
+ /* We avoid equality with lit_bufsize because of wraparound at 64K
+ * on 16 bit machines and because stored blocks are restricted to
+ * 64K-1 bytes.
+ */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+ deflate_state *s;
+ ct_data *ltree; /* literal tree */
+ ct_data *dtree; /* distance tree */
+{
+ unsigned dist; /* distance of matched string */
+ int lc; /* match length or unmatched char (if dist == 0) */
+ unsigned lx = 0; /* running index in l_buf */
+ unsigned code; /* the code to send */
+ int extra; /* number of extra bits to send */
+
+ if (s->last_lit != 0) do {
+ dist = s->d_buf[lx];
+ lc = s->l_buf[lx++];
+ if (dist == 0) {
+ send_code(s, lc, ltree); /* send a literal byte */
+ Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+ } else {
+ /* Here, lc is the match length - MIN_MATCH */
+ code = _length_code[lc];
+ send_code(s, code+LITERALS+1, ltree); /* send the length code */
+ extra = extra_lbits[code];
+ if (extra != 0) {
+ lc -= base_length[code];
+ send_bits(s, lc, extra); /* send the extra length bits */
+ }
+ dist--; /* dist is now the match distance - 1 */
+ code = d_code(dist);
+ Assert (code < D_CODES, "bad d_code");
+
+ send_code(s, code, dtree); /* send the distance code */
+ extra = extra_dbits[code];
+ if (extra != 0) {
+ dist -= base_dist[code];
+ send_bits(s, dist, extra); /* send the extra distance bits */
+ }
+ } /* literal or match pair ? */
+
+ /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+ Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
+
+ } while (lx < s->last_lit);
+
+ send_code(s, END_BLOCK, ltree);
+ s->last_eob_len = ltree[END_BLOCK].Len;
+}
+
+/* ===========================================================================
+ * Set the data type to ASCII or BINARY, using a crude approximation:
+ * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
+ * IN assertion: the fields freq of dyn_ltree are set and the total of all
+ * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
+ */
+local void set_data_type(s)
+ deflate_state *s;
+{
+ int n = 0;
+ unsigned ascii_freq = 0;
+ unsigned bin_freq = 0;
+ while (n < 7) bin_freq += s->dyn_ltree[n++].Freq;
+ while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq;
+ while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
+ s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+ unsigned code; /* the value to invert */
+ int len; /* its bit length */
+{
+ register unsigned res = 0;
+ do {
+ res |= code & 1;
+ code >>= 1, res <<= 1;
+ } while (--len > 0);
+ return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+ deflate_state *s;
+{
+ if (s->bi_valid == 16) {
+ put_short(s, s->bi_buf);
+ s->bi_buf = 0;
+ s->bi_valid = 0;
+ } else if (s->bi_valid >= 8) {
+ put_byte(s, (Byte)s->bi_buf);
+ s->bi_buf >>= 8;
+ s->bi_valid -= 8;
+ }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+ deflate_state *s;
+{
+ if (s->bi_valid > 8) {
+ put_short(s, s->bi_buf);
+ } else if (s->bi_valid > 0) {
+ put_byte(s, (Byte)s->bi_buf);
+ }
+ s->bi_buf = 0;
+ s->bi_valid = 0;
+#ifdef DEBUG
+ s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+ deflate_state *s;
+ charf *buf; /* the input data */
+ unsigned len; /* its length */
+ int header; /* true if block header must be written */
+{
+ bi_windup(s); /* align on byte boundary */
+ s->last_eob_len = 8; /* enough lookahead for inflate */
+
+ if (header) {
+ put_short(s, (ush)len);
+ put_short(s, (ush)~len);
+#ifdef DEBUG
+ s->bits_sent += 2*16;
+#endif
+ }
+#ifdef DEBUG
+ s->bits_sent += (ulg)len<<3;
+#endif
+ while (len--) {
+ put_byte(s, *buf++);
+ }
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/algorithm.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/algorithm.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/algorithm.txt Sat Jul 13 19:22:42 2002
@@ -0,0 +1,213 @@
+1. Compression algorithm (deflate)
+
+The deflation algorithm used by gzip (also zip and zlib) is a variation of
+LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
+the input data. The second occurrence of a string is replaced by a
+pointer to the previous string, in the form of a pair (distance,
+length). Distances are limited to 32K bytes, and lengths are limited
+to 258 bytes. When a string does not occur anywhere in the previous
+32K bytes, it is emitted as a sequence of literal bytes. (In this
+description, `string' must be taken as an arbitrary sequence of bytes,
+and is not restricted to printable characters.)
+
+Literals or match lengths are compressed with one Huffman tree, and
+match distances are compressed with another tree. The trees are stored
+in a compact form at the start of each block. The blocks can have any
+size (except that the compressed data for one block must fit in
+available memory). A block is terminated when deflate() determines that
+it would be useful to start another block with fresh trees. (This is
+somewhat similar to the behavior of LZW-based _compress_.)
+
+Duplicated strings are found using a hash table. All input strings of
+length 3 are inserted in the hash table. A hash index is computed for
+the next 3 bytes. If the hash chain for this index is not empty, all
+strings in the chain are compared with the current input string, and
+the longest match is selected.
+
+The hash chains are searched starting with the most recent strings, to
+favor small distances and thus take advantage of the Huffman encoding.
+The hash chains are singly linked. There are no deletions from the
+hash chains, the algorithm simply discards matches that are too old.
+
+To avoid a worst-case situation, very long hash chains are arbitrarily
+truncated at a certain length, determined by a runtime option (level
+parameter of deflateInit). So deflate() does not always find the longest
+possible match but generally finds a match which is long enough.
+
+deflate() also defers the selection of matches with a lazy evaluation
+mechanism. After a match of length N has been found, deflate() searches for
+a longer match at the next input byte. If a longer match is found, the
+previous match is truncated to a length of one (thus producing a single
+literal byte) and the process of lazy evaluation begins again. Otherwise,
+the original match is kept, and the next match search is attempted only N
+steps later.
+
+The lazy match evaluation is also subject to a runtime parameter. If
+the current match is long enough, deflate() reduces the search for a longer
+match, thus speeding up the whole process. If compression ratio is more
+important than speed, deflate() attempts a complete second search even if
+the first match is already long enough.
+
+The lazy match evaluation is not performed for the fastest compression
+modes (level parameter 1 to 3). For these fast modes, new strings
+are inserted in the hash table only when no match was found, or
+when the match is not too long. This degrades the compression ratio
+but saves time since there are both fewer insertions and fewer searches.
+
+
+2. Decompression algorithm (inflate)
+
+2.1 Introduction
+
+The real question is, given a Huffman tree, how to decode fast. The most
+important realization is that shorter codes are much more common than
+longer codes, so pay attention to decoding the short codes fast, and let
+the long codes take longer to decode.
+
+inflate() sets up a first level table that covers some number of bits of
+input less than the length of longest code. It gets that many bits from the
+stream, and looks it up in the table. The table will tell if the next
+code is that many bits or less and how many, and if it is, it will tell
+the value, else it will point to the next level table for which inflate()
+grabs more bits and tries to decode a longer code.
+
+How many bits to make the first lookup is a tradeoff between the time it
+takes to decode and the time it takes to build the table. If building the
+table took no time (and if you had infinite memory), then there would only
+be a first level table to cover all the way to the longest code. However,
+building the table ends up taking a lot longer for more bits since short
+codes are replicated many times in such a table. What inflate() does is
+simply to make the number of bits in the first table a variable, and set it
+for the maximum speed.
+
+inflate() sends new trees relatively often, so it is possibly set for a
+smaller first level table than an application that has only one tree for
+all the data. For inflate, which has 286 possible codes for the
+literal/length tree, the size of the first table is nine bits. Also the
+distance trees have 30 possible values, and the size of the first table is
+six bits. Note that for each of those cases, the table ended up one bit
+longer than the ``average'' code length, i.e. the code length of an
+approximately flat code which would be a little more than eight bits for
+286 symbols and a little less than five bits for 30 symbols. It would be
+interesting to see if optimizing the first level table for other
+applications gave values within a bit or two of the flat code size.
+
+
+2.2 More details on the inflate table lookup
+
+Ok, you want to know what this cleverly obfuscated inflate tree actually
+looks like. You are correct that it's not a Huffman tree. It is simply a
+lookup table for the first, let's say, nine bits of a Huffman symbol. The
+symbol could be as short as one bit or as long as 15 bits. If a particular
+symbol is shorter than nine bits, then that symbol's translation is duplicated
+in all those entries that start with that symbol's bits. For example, if the
+symbol is four bits, then it's duplicated 32 times in a nine-bit table. If a
+symbol is nine bits long, it appears in the table once.
+
+If the symbol is longer than nine bits, then that entry in the table points
+to another similar table for the remaining bits. Again, there are duplicated
+entries as needed. The idea is that most of the time the symbol will be short
+and there will only be one table look up. (That's whole idea behind data
+compression in the first place.) For the less frequent long symbols, there
+will be two lookups. If you had a compression method with really long
+symbols, you could have as many levels of lookups as is efficient. For
+inflate, two is enough.
+
+So a table entry either points to another table (in which case nine bits in
+the above example are gobbled), or it contains the translation for the symbol
+and the number of bits to gobble. Then you start again with the next
+ungobbled bit.
+
+You may wonder: why not just have one lookup table for how ever many bits the
+longest symbol is? The reason is that if you do that, you end up spending
+more time filling in duplicate symbol entries than you do actually decoding.
+At least for deflate's output that generates new trees every several 10's of
+kbytes. You can imagine that filling in a 2^15 entry table for a 15-bit code
+would take too long if you're only decoding several thousand symbols. At the
+other extreme, you could make a new table for every bit in the code. In fact,
+that's essentially a Huffman tree. But then you spend two much time
+traversing the tree while decoding, even for short symbols.
+
+So the number of bits for the first lookup table is a trade of the time to
+fill out the table vs. the time spent looking at the second level and above of
+the table.
+
+Here is an example, scaled down:
+
+The code being decoded, with 10 symbols, from 1 to 6 bits long:
+
+A: 0
+B: 10
+C: 1100
+D: 11010
+E: 11011
+F: 11100
+G: 11101
+H: 11110
+I: 111110
+J: 111111
+
+Let's make the first table three bits long (eight entries):
+
+000: A,1
+001: A,1
+010: A,1
+011: A,1
+100: B,2
+101: B,2
+110: -> table X (gobble 3 bits)
+111: -> table Y (gobble 3 bits)
+
+Each entry is what the bits decode to and how many bits that is, i.e. how
+many bits to gobble. Or the entry points to another table, with the number of
+bits to gobble implicit in the size of the table.
+
+Table X is two bits long since the longest code starting with 110 is five bits
+long:
+
+00: C,1
+01: C,1
+10: D,2
+11: E,2
+
+Table Y is three bits long since the longest code starting with 111 is six
+bits long:
+
+000: F,2
+001: F,2
+010: G,2
+011: G,2
+100: H,2
+101: H,2
+110: I,3
+111: J,3
+
+So what we have here are three tables with a total of 20 entries that had to
+be constructed. That's compared to 64 entries for a single table. Or
+compared to 16 entries for a Huffman tree (six two entry tables and one four
+entry table). Assuming that the code ideally represents the probability of
+the symbols, it takes on the average 1.25 lookups per symbol. That's compared
+to one lookup for the single table, or 1.66 lookups per symbol for the
+Huffman tree.
+
+There, I think that gives you a picture of what's going on. For inflate, the
+meaning of a particular symbol is often more than just a letter. It can be a
+byte (a "literal"), or it can be either a length or a distance which
+indicates a base value and a number of bits to fetch after the code that is
+added to the base value. Or it might be the special end-of-block code. The
+data structures created in inftrees.c try to encode all that information
+compactly in the tables.
+
+
+Jean-loup Gailly Mark Adler
+jloup at gzip.org madler at alumni.caltech.edu
+
+
+References:
+
+[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
+Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
+pp. 337-343.
+
+``DEFLATE Compressed Data Format Specification'' available in
+ftp://ds.internic.net/rfc/rfc1951.txt
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zconf.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zconf.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zconf.h Sat Jul 13 19:22:42 2002
@@ -0,0 +1,279 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef _ZCONF_H
+#define _ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+# define deflateInit_ z_deflateInit_
+# define deflate z_deflate
+# define deflateEnd z_deflateEnd
+# define inflateInit_ z_inflateInit_
+# define inflate z_inflate
+# define inflateEnd z_inflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateCopy z_deflateCopy
+# define deflateReset z_deflateReset
+# define deflateParams z_deflateParams
+# define inflateInit2_ z_inflateInit2_
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateReset z_inflateReset
+# define compress z_compress
+# define compress2 z_compress2
+# define uncompress z_uncompress
+# define adler32 z_adler32
+# define crc32 z_crc32
+# define get_crc_table z_get_crc_table
+
+# define Byte z_Byte
+# define uInt z_uInt
+# define uLong z_uLong
+# define Bytef z_Bytef
+# define charf z_charf
+# define intf z_intf
+# define uIntf z_uIntf
+# define uLongf z_uLongf
+# define voidpf z_voidpf
+# define voidp z_voidp
+#endif
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+# define WIN32
+#endif
+#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
+# ifndef __32BIT__
+# define __32BIT__
+# endif
+#endif
+#if defined(__MSDOS__) && !defined(MSDOS)
+# define MSDOS
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#if defined(MSDOS) && !defined(__32BIT__)
+# define MAXSEG_64K
+#endif
+#ifdef MSDOS
+# define UNALIGNED_OK
+#endif
+
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)) && !defined(STDC)
+# define STDC
+#endif
+#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
+# ifndef STDC
+# define STDC
+# endif
+#endif
+
+#ifndef STDC
+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+# define const
+# endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
+# define NO_DUMMY_DECL
+#endif
+
+/* Old Borland C incorrectly complains about missing returns: */
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+# define NEED_DUMMY_RETURN
+#endif
+
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+# ifdef MAXSEG_64K
+# define MAX_MEM_LEVEL 8
+# else
+# define MAX_MEM_LEVEL 9
+# endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+# define MAX_WBITS 15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+ /* Type declarations */
+
+#ifndef OF /* function prototypes */
+# ifdef STDC
+# define OF(args) args
+# else
+# define OF(args) ()
+# endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
+ /* MSC small or medium model */
+# define SMALL_MEDIUM
+# ifdef _MSC_VER
+# define FAR _far
+# else
+# define FAR far
+# endif
+#endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+# ifndef __32BIT__
+# define SMALL_MEDIUM
+# define FAR _far
+# endif
+#endif
+
+/* Compile with -DZLIB_DLL for Windows DLL support */
+#if defined(ZLIB_DLL)
+# if defined(_WINDOWS) || defined(WINDOWS)
+# ifdef FAR
+# undef FAR
+# endif
+# include <windows.h>
+# define ZEXPORT WINAPI
+# ifdef WIN32
+# define ZEXPORTVA WINAPIV
+# else
+# define ZEXPORTVA FAR _cdecl _export
+# endif
+# endif
+# if defined (__BORLANDC__)
+# if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+# include <windows.h>
+# define ZEXPORT __declspec(dllexport) WINAPI
+# define ZEXPORTRVA __declspec(dllexport) WINAPIV
+# else
+# if defined (_Windows) && defined (__DLL__)
+# define ZEXPORT _export
+# define ZEXPORTVA _export
+# endif
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# if defined (ZLIB_DLL)
+# define ZEXTERN extern __declspec(dllexport)
+# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+#endif
+
+#ifndef ZEXPORT
+# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+# define ZEXPORTVA
+#endif
+#ifndef ZEXTERN
+# define ZEXTERN extern
+#endif
+
+#ifndef FAR
+# define FAR
+#endif
+
+#if !defined(MACOS) && !defined(TARGET_OS_MAC)
+typedef unsigned char Byte; /* 8 bits */
+#endif
+typedef unsigned int uInt; /* 16 bits or more */
+typedef unsigned long uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+# define Bytef Byte FAR
+#else
+ typedef Byte FAR Bytef;
+#endif
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+ typedef void FAR *voidpf;
+ typedef void *voidp;
+#else
+ typedef Byte FAR *voidpf;
+ typedef Byte *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <sys/types.h> /* for off_t */
+# include <unistd.h> /* for SEEK_* and off_t */
+# define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+# define SEEK_SET 0 /* Seek from beginning of file. */
+# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+# define z_off_t long
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+# pragma map(deflateInit_,"DEIN")
+# pragma map(deflateInit2_,"DEIN2")
+# pragma map(deflateEnd,"DEEND")
+# pragma map(inflateInit_,"ININ")
+# pragma map(inflateInit2_,"ININ2")
+# pragma map(inflateEnd,"INEND")
+# pragma map(inflateSync,"INSY")
+# pragma map(inflateSetDictionary,"INSEDI")
+# pragma map(inflate_blocks,"INBL")
+# pragma map(inflate_blocks_new,"INBLNE")
+# pragma map(inflate_blocks_free,"INBLFR")
+# pragma map(inflate_blocks_reset,"INBLRE")
+# pragma map(inflate_codes_free,"INCOFR")
+# pragma map(inflate_codes,"INCO")
+# pragma map(inflate_fast,"INFA")
+# pragma map(inflate_flush,"INFLU")
+# pragma map(inflate_mask,"INMA")
+# pragma map(inflate_set_dictionary,"INSEDI2")
+# pragma map(inflate_copyright,"INCOPY")
+# pragma map(inflate_trees_bits,"INTRBI")
+# pragma map(inflate_trees_dynamic,"INTRDY")
+# pragma map(inflate_trees_fixed,"INTRFI")
+# pragma map(inflate_trees_free,"INTRFR")
+#endif
+
+#endif /* _ZCONF_H */
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/INDEX
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/INDEX (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/INDEX Sat Jul 13 19:22:42 2002
@@ -0,0 +1,86 @@
+ChangeLog history of changes
+INDEX this file
+FAQ Frequently Asked Questions about zlib
+Make_vms.com script for Vax/VMS
+Makefile makefile for Unix (generated by configure)
+Makefile.in makefile for Unix (template for configure)
+Makefile.riscos makefile for RISCOS
+README guess what
+algorithm.txt description of the (de)compression algorithm
+configure configure script for Unix
+descrip.mms makefile for Vax/VMS
+zlib.3 mini man page for zlib (volunteers to write full
+ man pages from zlib.h welcome. write to jloup at gzip.org)
+
+amiga/Makefile.sas makefile for Amiga SAS/C
+amiga/Makefile.pup makefile for Amiga powerUP SAS/C PPC
+
+msdos/Makefile.w32 makefile for Microsoft Visual C++ 32-bit
+msdos/Makefile.b32 makefile for Borland C++ 32-bit
+msdos/Makefile.bor makefile for Borland C/C++ 16-bit
+msdos/Makefile.dj2 makefile for DJGPP 2.x
+msdos/Makefile.emx makefile for EMX 0.9c (32-bit DOS/OS2)
+msdos/Makefile.msc makefile for Microsoft C 16-bit
+msdos/Makefile.tc makefile for Turbo C
+msdos/Makefile.wat makefile for Watcom C
+msdos/zlib.def definition file for Windows DLL
+msdos/zlib.rc definition file for Windows DLL
+
+nt/Makefile.nt makefile for Windows NT
+nt/zlib.dnt definition file for Windows NT DLL
+nt/Makefile.emx makefile for EMX 0.9c/RSXNT 1.41 (Win32 Intel)
+nt/Makefile.gcc makefile for Windows NT using GCC (mingw32)
+
+
+ zlib public header files (must be kept):
+zconf.h
+zlib.h
+
+ private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+deflate.c
+deflate.h
+gzio.c
+infblock.c
+infblock.h
+infcodes.c
+infcodes.h
+inffast.c
+inffast.h
+inflate.c
+inftrees.c
+inftrees.h
+infutil.c
+infutil.h
+maketree.c
+trees.c
+uncompr.c
+zutil.c
+zutil.h
+
+ source files for sample programs:
+example.c
+minigzip.c
+
+ unsupported contribution by third parties
+
+contrib/asm386/ by Gilles Vollant <info at winimage.com>
+ 386 asm code replacing longest_match().
+
+contrib/minizip/ by Gilles Vollant <info at winimage.com>
+ Mini zip and unzip based on zlib
+ See http://www.winimage.com/zLibDll/unzip.html
+
+contrib/iostream/ by Kevin Ruland <kevin at rodin.wustl.edu>
+ A C++ I/O streams interface to the zlib gz* functions
+
+contrib/iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
+ Another C++ I/O streams interface
+
+contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag at tid.es>
+ A very simple tar.gz extractor using zlib
+
+contrib/visual-basic.txt by Carlos Rios <c_rios at sonda.cl>
+ How to use compress(), uncompress() and the gz* functions from VB.
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.c Sat Jul 13 19:22:42 2002
@@ -0,0 +1,398 @@
+/* infblock.c -- interpret and process block types to last block
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+#include "inftrees.h"
+#include "infcodes.h"
+#include "infutil.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* Table for deflate from PKZIP's appnote.txt. */
+local const uInt border[] = { /* Order of the bit length code lengths */
+ 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+/*
+ Notes beyond the 1.93a appnote.txt:
+
+ 1. Distance pointers never point before the beginning of the output
+ stream.
+ 2. Distance pointers can point back across blocks, up to 32k away.
+ 3. There is an implied maximum of 7 bits for the bit length table and
+ 15 bits for the actual data.
+ 4. If only one code exists, then it is encoded using one bit. (Zero
+ would be more efficient, but perhaps a little confusing.) If two
+ codes exist, they are coded using one bit each (0 and 1).
+ 5. There is no way of sending zero distance codes--a dummy must be
+ sent if there are none. (History: a pre 2.0 version of PKZIP would
+ store blocks with no distance codes, but this was discovered to be
+ too harsh a criterion.) Valid only for 1.93a. 2.04c does allow
+ zero distance codes, which is sent as one code of zero bits in
+ length.
+ 6. There are up to 286 literal/length codes. Code 256 represents the
+ end-of-block. Note however that the static length tree defines
+ 288 codes just to fill out the Huffman codes. Codes 286 and 287
+ cannot be used though, since there is no length base or extra bits
+ defined for them. Similarily, there are up to 30 distance codes.
+ However, static trees define 32 codes (all 5 bits) to fill out the
+ Huffman codes, but the last two had better not show up in the data.
+ 7. Unzip can check dynamic Huffman blocks for complete code sets.
+ The exception is that a single code would not be complete (see #4).
+ 8. The five bits following the block type is really the number of
+ literal codes sent minus 257.
+ 9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
+ (1+6+6). Therefore, to output three times the length, you output
+ three codes (1+1+1), whereas to output four times the same length,
+ you only need two codes (1+3). Hmm.
+ 10. In the tree reconstruction algorithm, Code = Code + Increment
+ only if BitLength(i) is not zero. (Pretty obvious.)
+ 11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19)
+ 12. Note: length code 284 can represent 227-258, but length code 285
+ really is 258. The last length deserves its own, short code
+ since it gets used a lot in very redundant files. The length
+ 258 is special since 258 - 3 (the min match length) is 255.
+ 13. The literal/length and distance code bit lengths are read as a
+ single stream of lengths. It is possible (and advantageous) for
+ a repeat code (16, 17, or 18) to go across the boundary between
+ the two sets of lengths.
+ */
+
+
+void inflate_blocks_reset(s, z, c)
+inflate_blocks_statef *s;
+z_streamp z;
+uLongf *c;
+{
+ if (c != Z_NULL)
+ *c = s->check;
+ if (s->mode == BTREE || s->mode == DTREE)
+ ZFREE(z, s->sub.trees.blens);
+ if (s->mode == CODES)
+ inflate_codes_free(s->sub.decode.codes, z);
+ s->mode = TYPE;
+ s->bitk = 0;
+ s->bitb = 0;
+ s->read = s->write = s->window;
+ if (s->checkfn != Z_NULL)
+ z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
+ Tracev((stderr, "inflate: blocks reset\n"));
+}
+
+
+inflate_blocks_statef *inflate_blocks_new(z, c, w)
+z_streamp z;
+check_func c;
+uInt w;
+{
+ inflate_blocks_statef *s;
+
+ if ((s = (inflate_blocks_statef *)ZALLOC
+ (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
+ return s;
+ if ((s->hufts =
+ (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
+ {
+ ZFREE(z, s);
+ return Z_NULL;
+ }
+ if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
+ {
+ ZFREE(z, s->hufts);
+ ZFREE(z, s);
+ return Z_NULL;
+ }
+ s->end = s->window + w;
+ s->checkfn = c;
+ s->mode = TYPE;
+ Tracev((stderr, "inflate: blocks allocated\n"));
+ inflate_blocks_reset(s, z, Z_NULL);
+ return s;
+}
+
+
+int inflate_blocks(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+ uInt t; /* temporary storage */
+ uLong b; /* bit buffer */
+ uInt k; /* bits in bit buffer */
+ Bytef *p; /* input data pointer */
+ uInt n; /* bytes available there */
+ Bytef *q; /* output window write pointer */
+ uInt m; /* bytes to end of window or read pointer */
+
+ /* copy input/output information to locals (UPDATE macro restores) */
+ LOAD
+
+ /* process input based on current state */
+ while (1) switch (s->mode)
+ {
+ case TYPE:
+ NEEDBITS(3)
+ t = (uInt)b & 7;
+ s->last = t & 1;
+ switch (t >> 1)
+ {
+ case 0: /* stored */
+ Tracev((stderr, "inflate: stored block%s\n",
+ s->last ? " (last)" : ""));
+ DUMPBITS(3)
+ t = k & 7; /* go to byte boundary */
+ DUMPBITS(t)
+ s->mode = LENS; /* get length of stored block */
+ break;
+ case 1: /* fixed */
+ Tracev((stderr, "inflate: fixed codes block%s\n",
+ s->last ? " (last)" : ""));
+ {
+ uInt bl, bd;
+ inflate_huft *tl, *td;
+
+ inflate_trees_fixed(&bl, &bd, &tl, &td, z);
+ s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
+ if (s->sub.decode.codes == Z_NULL)
+ {
+ r = Z_MEM_ERROR;
+ LEAVE
+ }
+ }
+ DUMPBITS(3)
+ s->mode = CODES;
+ break;
+ case 2: /* dynamic */
+ Tracev((stderr, "inflate: dynamic codes block%s\n",
+ s->last ? " (last)" : ""));
+ DUMPBITS(3)
+ s->mode = TABLE;
+ break;
+ case 3: /* illegal */
+ DUMPBITS(3)
+ s->mode = BAD;
+ z->msg = (char*)"invalid block type";
+ r = Z_DATA_ERROR;
+ LEAVE
+ }
+ break;
+ case LENS:
+ NEEDBITS(32)
+ if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
+ {
+ s->mode = BAD;
+ z->msg = (char*)"invalid stored block lengths";
+ r = Z_DATA_ERROR;
+ LEAVE
+ }
+ s->sub.left = (uInt)b & 0xffff;
+ b = k = 0; /* dump bits */
+ Tracev((stderr, "inflate: stored length %u\n", s->sub.left));
+ s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
+ break;
+ case STORED:
+ if (n == 0)
+ LEAVE
+ NEEDOUT
+ t = s->sub.left;
+ if (t > n) t = n;
+ if (t > m) t = m;
+ zmemcpy(q, p, t);
+ p += t; n -= t;
+ q += t; m -= t;
+ if ((s->sub.left -= t) != 0)
+ break;
+ Tracev((stderr, "inflate: stored end, %lu total out\n",
+ z->total_out + (q >= s->read ? q - s->read :
+ (s->end - s->read) + (q - s->window))));
+ s->mode = s->last ? DRY : TYPE;
+ break;
+ case TABLE:
+ NEEDBITS(14)
+ s->sub.trees.table = t = (uInt)b & 0x3fff;
+#ifndef PKZIP_BUG_WORKAROUND
+ if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
+ {
+ s->mode = BAD;
+ z->msg = (char*)"too many length or distance symbols";
+ r = Z_DATA_ERROR;
+ LEAVE
+ }
+#endif
+ t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
+ if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
+ {
+ r = Z_MEM_ERROR;
+ LEAVE
+ }
+ DUMPBITS(14)
+ s->sub.trees.index = 0;
+ Tracev((stderr, "inflate: table sizes ok\n"));
+ s->mode = BTREE;
+ case BTREE:
+ while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
+ {
+ NEEDBITS(3)
+ s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
+ DUMPBITS(3)
+ }
+ while (s->sub.trees.index < 19)
+ s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
+ s->sub.trees.bb = 7;
+ t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
+ &s->sub.trees.tb, s->hufts, z);
+ if (t != Z_OK)
+ {
+ ZFREE(z, s->sub.trees.blens);
+ r = t;
+ if (r == Z_DATA_ERROR)
+ s->mode = BAD;
+ LEAVE
+ }
+ s->sub.trees.index = 0;
+ Tracev((stderr, "inflate: bits tree ok\n"));
+ s->mode = DTREE;
+ case DTREE:
+ while (t = s->sub.trees.table,
+ s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
+ {
+ inflate_huft *h;
+ uInt i, j, c;
+
+ t = s->sub.trees.bb;
+ NEEDBITS(t)
+ h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
+ t = h->bits;
+ c = h->base;
+ if (c < 16)
+ {
+ DUMPBITS(t)
+ s->sub.trees.blens[s->sub.trees.index++] = c;
+ }
+ else /* c == 16..18 */
+ {
+ i = c == 18 ? 7 : c - 14;
+ j = c == 18 ? 11 : 3;
+ NEEDBITS(t + i)
+ DUMPBITS(t)
+ j += (uInt)b & inflate_mask[i];
+ DUMPBITS(i)
+ i = s->sub.trees.index;
+ t = s->sub.trees.table;
+ if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
+ (c == 16 && i < 1))
+ {
+ ZFREE(z, s->sub.trees.blens);
+ s->mode = BAD;
+ z->msg = (char*)"invalid bit length repeat";
+ r = Z_DATA_ERROR;
+ LEAVE
+ }
+ c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
+ do {
+ s->sub.trees.blens[i++] = c;
+ } while (--j);
+ s->sub.trees.index = i;
+ }
+ }
+ s->sub.trees.tb = Z_NULL;
+ {
+ uInt bl, bd;
+ inflate_huft *tl, *td;
+ inflate_codes_statef *c;
+
+ bl = 9; /* must be <= 9 for lookahead assumptions */
+ bd = 6; /* must be <= 9 for lookahead assumptions */
+ t = s->sub.trees.table;
+ t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
+ s->sub.trees.blens, &bl, &bd, &tl, &td,
+ s->hufts, z);
+ ZFREE(z, s->sub.trees.blens);
+ if (t != Z_OK)
+ {
+ if (t == (uInt)Z_DATA_ERROR)
+ s->mode = BAD;
+ r = t;
+ LEAVE
+ }
+ Tracev((stderr, "inflate: trees ok\n"));
+ if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
+ {
+ r = Z_MEM_ERROR;
+ LEAVE
+ }
+ s->sub.decode.codes = c;
+ }
+ s->mode = CODES;
+ case CODES:
+ UPDATE
+ if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
+ return inflate_flush(s, z, r);
+ r = Z_OK;
+ inflate_codes_free(s->sub.decode.codes, z);
+ LOAD
+ Tracev((stderr, "inflate: codes end, %lu total out\n",
+ z->total_out + (q >= s->read ? q - s->read :
+ (s->end - s->read) + (q - s->window))));
+ if (!s->last)
+ {
+ s->mode = TYPE;
+ break;
+ }
+ s->mode = DRY;
+ case DRY:
+ FLUSH
+ if (s->read != s->write)
+ LEAVE
+ s->mode = DONE;
+ case DONE:
+ r = Z_STREAM_END;
+ LEAVE
+ case BAD:
+ r = Z_DATA_ERROR;
+ LEAVE
+ default:
+ r = Z_STREAM_ERROR;
+ LEAVE
+ }
+}
+
+
+int inflate_blocks_free(s, z)
+inflate_blocks_statef *s;
+z_streamp z;
+{
+ inflate_blocks_reset(s, z, Z_NULL);
+ ZFREE(z, s->window);
+ ZFREE(z, s->hufts);
+ ZFREE(z, s);
+ Tracev((stderr, "inflate: blocks freed\n"));
+ return Z_OK;
+}
+
+
+void inflate_set_dictionary(s, d, n)
+inflate_blocks_statef *s;
+const Bytef *d;
+uInt n;
+{
+ zmemcpy(s->window, d, n);
+ s->read = s->write = s->window + n;
+}
+
+
+/* Returns true if inflate is currently at the end of a block generated
+ * by Z_SYNC_FLUSH or Z_FULL_FLUSH.
+ * IN assertion: s != Z_NULL
+ */
+int inflate_blocks_sync_point(s)
+inflate_blocks_statef *s;
+{
+ return s->mode == LENS;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/trees.h Sat Jul 13 19:22:43 2002
@@ -0,0 +1,128 @@
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}},
+{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}},
+{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}},
+{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}},
+{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}},
+{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}},
+{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}},
+{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}},
+{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}},
+{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}},
+{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}},
+{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}},
+{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}},
+{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}},
+{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}},
+{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}},
+{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}},
+{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}},
+{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}},
+{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}},
+{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}},
+{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}},
+{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}},
+{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}},
+{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}},
+{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}},
+{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}},
+{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}},
+{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}},
+{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}},
+{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}},
+{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}},
+{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}},
+{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}},
+{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}},
+{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}},
+{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}},
+{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}},
+{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}},
+{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}},
+{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}},
+{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}},
+{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}},
+{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}},
+{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}},
+{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}},
+{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}},
+{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}},
+{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}},
+{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}},
+{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}},
+{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}},
+{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}},
+{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}},
+{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}},
+{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}},
+{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}},
+{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch _dist_code[DIST_CODE_LEN] = {
+ 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
+ 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+ 0, 1, 2, 3, 4, 6, 8, 12, 16, 24,
+ 32, 48, 64, 96, 128, 192, 256, 384, 512, 768,
+ 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576
+};
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.c Sat Jul 13 19:22:43 2002
@@ -0,0 +1,170 @@
+/* inffast.c -- process literals and length/distance pairs fast
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
+#include "infutil.h"
+#include "inffast.h"
+
+struct inflate_codes_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+/* macros for bit input with no checking and for returning unused bytes */
+#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
+#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
+
+/* Called with number of bytes left to write in window at least 258
+ (the maximum string length) and number of input bytes available
+ at least ten. The ten bytes are six bytes for the longest length/
+ distance pair plus four bytes for overloading the bit buffer. */
+
+int inflate_fast(bl, bd, tl, td, s, z)
+uInt bl, bd;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
+inflate_blocks_statef *s;
+z_streamp z;
+{
+ inflate_huft *t; /* temporary pointer */
+ uInt e; /* extra bits or operation */
+ uLong b; /* bit buffer */
+ uInt k; /* bits in bit buffer */
+ Bytef *p; /* input data pointer */
+ uInt n; /* bytes available there */
+ Bytef *q; /* output window write pointer */
+ uInt m; /* bytes to end of window or read pointer */
+ uInt ml; /* mask for literal/length tree */
+ uInt md; /* mask for distance tree */
+ uInt c; /* bytes to copy */
+ uInt d; /* distance back to copy from */
+ Bytef *r; /* copy source pointer */
+
+ /* load input, output, bit values */
+ LOAD
+
+ /* initialize masks */
+ ml = inflate_mask[bl];
+ md = inflate_mask[bd];
+
+ /* do until not enough input or output space for fast loop */
+ do { /* assume called with m >= 258 && n >= 10 */
+ /* get literal/length code */
+ GRABBITS(20) /* max bits for literal/length code */
+ if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
+ {
+ DUMPBITS(t->bits)
+ Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+ "inflate: * literal '%c'\n" :
+ "inflate: * literal 0x%02x\n", t->base));
+ *q++ = (Byte)t->base;
+ m--;
+ continue;
+ }
+ do {
+ DUMPBITS(t->bits)
+ if (e & 16)
+ {
+ /* get extra bits for length */
+ e &= 15;
+ c = t->base + ((uInt)b & inflate_mask[e]);
+ DUMPBITS(e)
+ Tracevv((stderr, "inflate: * length %u\n", c));
+
+ /* decode distance base of block to copy */
+ GRABBITS(15); /* max bits for distance code */
+ e = (t = td + ((uInt)b & md))->exop;
+ do {
+ DUMPBITS(t->bits)
+ if (e & 16)
+ {
+ /* get extra bits to add to distance base */
+ e &= 15;
+ GRABBITS(e) /* get extra bits (up to 13) */
+ d = t->base + ((uInt)b & inflate_mask[e]);
+ DUMPBITS(e)
+ Tracevv((stderr, "inflate: * distance %u\n", d));
+
+ /* do the copy */
+ m -= c;
+ if ((uInt)(q - s->window) >= d) /* offset before dest */
+ { /* just copy */
+ r = q - d;
+ *q++ = *r++; c--; /* minimum count is three, */
+ *q++ = *r++; c--; /* so unroll loop a little */
+ }
+ else /* else offset after destination */
+ {
+ e = d - (uInt)(q - s->window); /* bytes from offset to end */
+ r = s->end - e; /* pointer to offset */
+ if (c > e) /* if source crosses, */
+ {
+ c -= e; /* copy to end of window */
+ do {
+ *q++ = *r++;
+ } while (--e);
+ r = s->window; /* copy rest from start of window */
+ }
+ }
+ do { /* copy all or what's left */
+ *q++ = *r++;
+ } while (--c);
+ break;
+ }
+ else if ((e & 64) == 0)
+ {
+ t += t->base;
+ e = (t += ((uInt)b & inflate_mask[e]))->exop;
+ }
+ else
+ {
+ z->msg = (char*)"invalid distance code";
+ UNGRAB
+ UPDATE
+ return Z_DATA_ERROR;
+ }
+ } while (1);
+ break;
+ }
+ if ((e & 64) == 0)
+ {
+ t += t->base;
+ if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
+ {
+ DUMPBITS(t->bits)
+ Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+ "inflate: * literal '%c'\n" :
+ "inflate: * literal 0x%02x\n", t->base));
+ *q++ = (Byte)t->base;
+ m--;
+ break;
+ }
+ }
+ else if (e & 32)
+ {
+ Tracevv((stderr, "inflate: * end of block\n"));
+ UNGRAB
+ UPDATE
+ return Z_STREAM_END;
+ }
+ else
+ {
+ z->msg = (char*)"invalid literal/length code";
+ UNGRAB
+ UPDATE
+ return Z_DATA_ERROR;
+ }
+ } while (1);
+ } while (m >= 258 && n >= 10);
+
+ /* not enough input or output--restore pointers and return */
+ UNGRAB
+ UPDATE
+ return Z_OK;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/compress.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/compress.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/compress.c Sat Jul 13 19:22:43 2002
@@ -0,0 +1,68 @@
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+
+/* ===========================================================================
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+ length of the source buffer. Upon entry, destLen is the total size of the
+ destination buffer, which must be at least 0.1% larger than sourceLen plus
+ 12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+ Bytef *dest;
+ uLongf *destLen;
+ const Bytef *source;
+ uLong sourceLen;
+ int level;
+{
+ z_stream stream;
+ int err;
+
+ stream.next_in = (Bytef*)source;
+ stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+ /* Check for source > 64K on 16-bit machine: */
+ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+ stream.next_out = dest;
+ stream.avail_out = (uInt)*destLen;
+ if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+ stream.zalloc = (alloc_func)0;
+ stream.zfree = (free_func)0;
+ stream.opaque = (voidpf)0;
+
+ err = deflateInit(&stream, level);
+ if (err != Z_OK) return err;
+
+ err = deflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ deflateEnd(&stream);
+ return err == Z_OK ? Z_BUF_ERROR : err;
+ }
+ *destLen = stream.total_out;
+
+ err = deflateEnd(&stream);
+ return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+ Bytef *dest;
+ uLongf *destLen;
+ const Bytef *source;
+ uLong sourceLen;
+{
+ return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infblock.h Sat Jul 13 19:22:43 2002
@@ -0,0 +1,39 @@
+/* infblock.h -- header to use infblock.c
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+struct inflate_blocks_state;
+typedef struct inflate_blocks_state FAR inflate_blocks_statef;
+
+extern inflate_blocks_statef * inflate_blocks_new OF((
+ z_streamp z,
+ check_func c, /* check function */
+ uInt w)); /* window size */
+
+extern int inflate_blocks OF((
+ inflate_blocks_statef *,
+ z_streamp ,
+ int)); /* initial return code */
+
+extern void inflate_blocks_reset OF((
+ inflate_blocks_statef *,
+ z_streamp ,
+ uLongf *)); /* check value on output */
+
+extern int inflate_blocks_free OF((
+ inflate_blocks_statef *,
+ z_streamp));
+
+extern void inflate_set_dictionary OF((
+ inflate_blocks_statef *s,
+ const Bytef *d, /* dictionary */
+ uInt n)); /* dictionary length */
+
+extern int inflate_blocks_sync_point OF((
+ inflate_blocks_statef *s));
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inffast.h Sat Jul 13 19:22:43 2002
@@ -0,0 +1,17 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+extern int inflate_fast OF((
+ uInt,
+ uInt,
+ inflate_huft *,
+ inflate_huft *,
+ inflate_blocks_statef *,
+ z_streamp ));
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsp Sat Jul 13 19:22:44 2002
@@ -0,0 +1,148 @@
+# Microsoft Developer Studio Project File - Name="zlib" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=zlib - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "zlib - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "zlib - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD B!
ASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\adler32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\compress.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\crc32.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\deflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gzio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infblock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inffast.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inflate.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\inftrees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\infutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\trees.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\uncompr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.h Sat Jul 13 19:22:44 2002
@@ -0,0 +1,893 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.1.3, July 9th, 1998
+
+ Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup at gzip.org madler at alumni.caltech.edu
+
+
+ The data format used by the zlib library is described by RFCs (Request for
+ Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef _ZLIB_H
+#define _ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.1.3"
+
+/*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed
+ data. This version of the library supports only one compression method
+ (deflation) but other algorithms will be added later and will have the same
+ stream interface.
+
+ Compression can be done in a single step if the buffers are large
+ enough (for example if an input file is mmap'ed), or can be done by
+ repeated calls of the compression function. In the latter case, the
+ application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never
+ crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void (*free_func) OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+ Bytef *next_in; /* next input byte */
+ uInt avail_in; /* number of bytes available at next_in */
+ uLong total_in; /* total nb of input bytes read so far */
+
+ Bytef *next_out; /* next output byte should be put there */
+ uInt avail_out; /* remaining free space at next_out */
+ uLong total_out; /* total nb of bytes output so far */
+
+ char *msg; /* last error message, NULL if no error */
+ struct internal_state FAR *state; /* not visible by applications */
+
+ alloc_func zalloc; /* used to allocate the internal state */
+ free_func zfree; /* used to free the internal state */
+ voidpf opaque; /* private data object passed to zalloc and zfree */
+
+ int data_type; /* best guess about the data type: ascii or binary */
+ uLong adler; /* adler32 value of the uncompressed data */
+ uLong reserved; /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+ The application must update next_in and avail_in when avail_in has
+ dropped to zero. It must update next_out and avail_out when avail_out
+ has dropped to zero. The application must initialize zalloc, zfree and
+ opaque before calling the init function. All other fields are set by the
+ compression library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this
+ if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+ pointers returned by zalloc for objects of exactly 65536 bytes *must*
+ have their offset normalized to zero. The default allocation function
+ provided by this library ensures this (see zutil.c). To reduce memory
+ requirements and avoid any allocation of 64K objects, at the expense of
+ compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or
+ progress reports. After compression, total_in holds the total size of
+ the uncompressed data and may be saved for use in the decompressor
+ (particularly if the decompressor wants to decompress everything in
+ a single step).
+*/
+
+ /* constants */
+
+#define Z_NO_FLUSH 0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH 2
+#define Z_FULL_FLUSH 3
+#define Z_FINISH 4
+/* Allowed flush values; see deflate() below for details */
+
+#define Z_OK 0
+#define Z_STREAM_END 1
+#define Z_NEED_DICT 2
+#define Z_ERRNO (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR (-3)
+#define Z_MEM_ERROR (-4)
+#define Z_BUF_ERROR (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION 0
+#define Z_BEST_SPEED 1
+#define Z_BEST_COMPRESSION 9
+#define Z_DEFAULT_COMPRESSION (-1)
+/* compression levels */
+
+#define Z_FILTERED 1
+#define Z_HUFFMAN_ONLY 2
+#define Z_DEFAULT_STRATEGY 0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY 0
+#define Z_ASCII 1
+#define Z_UNKNOWN 2
+/* Possible values of the data_type field */
+
+#define Z_DEFLATED 8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+ /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is
+ not compatible with the zlib.h header file used by the application.
+ This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller.
+ If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+ use default allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at
+ all (the input data is simply copied a block at a time).
+ Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+ compression (currently equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION).
+ msg is set to null if there is no error message. deflateInit does not
+ perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce some
+ output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications).
+ Some output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating avail_in or avail_out accordingly; avail_out
+ should never be zero before the call. The application can consume the
+ compressed output when it wants, for example when the output buffer is full
+ (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+ and with zero avail_out, it must be called again after making room in the
+ output buffer because there might be more output pending.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In particular
+ avail_in is zero after the call if enough output space has been provided
+ before the call.) Flushing may degrade compression for some compression
+ algorithms and so it should be used only when necessary.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ the compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out).
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there
+ was enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the
+ stream are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least
+ 0.1% larger than avail_in plus 12 bytes. If deflate does not return
+ Z_STREAM_END, then it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update data_type if it can make a good guess about
+ the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect
+ the compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero).
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case,
+ msg may be set but then points to a static string (which must not be
+ deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+ Initializes the internal stream state for decompression. The fields
+ next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+ the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+ value depends on the compression method), inflateInit determines the
+ compression method from the zlib header and allocates all data structures
+ accordingly; otherwise the allocation will be deferred to the first call of
+ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+ use default allocation functions.
+
+ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller. msg is set to null if there is no error
+ message. inflateInit does not perform any decompression apart from reading
+ the zlib header if present: this will be done by inflate(). (So next_in and
+ avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+ inflate decompresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may some
+ introduce some output latency (reading input without producing any output)
+ except when forced to flush.
+
+ The detailed semantics are as follows. inflate performs one or both of the
+ following actions:
+
+ - Decompress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in is updated and processing
+ will resume at this point for the next call of inflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. inflate() provides as much output as possible, until there
+ is no more input data or no more space in the output buffer (see below
+ about the flush parameter).
+
+ Before the call of inflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming
+ more output, and updating the next_* and avail_* values accordingly.
+ The application can consume the uncompressed output when it wants, for
+ example when the output buffer is full (avail_out == 0), or after each
+ call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+ must be called again after making room in the output buffer because there
+ might be more output pending.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
+ output as possible to the output buffer. The flushing behavior of inflate is
+ not specified for values of the flush parameter other than Z_SYNC_FLUSH
+ and Z_FINISH, but the current implementation actually flushes as much output
+ as possible anyway.
+
+ inflate() should normally be called until it returns Z_STREAM_END or an
+ error. However if all decompression is to be performed in a single step
+ (a single call of inflate), the parameter flush should be set to
+ Z_FINISH. In this case all pending input is processed and all pending
+ output is flushed; avail_out must be large enough to hold all the
+ uncompressed data. (The size of the uncompressed data may have been saved
+ by the compressor for this purpose.) The next operation on this stream must
+ be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+ is never required, but can be used to inform inflate that a faster routine
+ may be used for the single inflate() call.
+
+ If a preset dictionary is needed at this point (see inflateSetDictionary
+ below), inflate sets strm-adler to the adler32 checksum of the
+ dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
+ it sets strm->adler to the adler32 checksum of all output produced
+ so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
+ an error code as described below. At the end of the stream, inflate()
+ checks that its computed adler32 checksum is equal to that saved by the
+ compressor and returns Z_STREAM_END only if the checksum is correct.
+
+ inflate() returns Z_OK if some progress has been made (more input processed
+ or more output produced), Z_STREAM_END if the end of the compressed data has
+ been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+ corrupted (input stream not conforming to the zlib format or incorrect
+ adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
+ (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if no progress is possible or if there was not
+ enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
+ case, the application may then call inflateSync to look for a good
+ compression block.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any
+ pending output.
+
+ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+ was inconsistent. In the error case, msg may be set but then points to a
+ static string (which must not be deallocated).
+*/
+
+ /* Advanced functions */
+
+/*
+ The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+ int level,
+ int method,
+ int windowBits,
+ int memLevel,
+ int strategy));
+
+ This is another version of deflateInit with more compression options. The
+ fields next_in, zalloc, zfree and opaque must be initialized before by
+ the caller.
+
+ The method parameter is the compression method. It must be Z_DEFLATED in
+ this version of the library.
+
+ The windowBits parameter is the base two logarithm of the window size
+ (the size of the history buffer). It should be in the range 8..15 for this
+ version of the library. Larger values of this parameter result in better
+ compression at the expense of memory usage. The default value is 15 if
+ deflateInit is used instead.
+
+ The memLevel parameter specifies how much memory should be allocated
+ for the internal compression state. memLevel=1 uses minimum memory but
+ is slow and reduces compression ratio; memLevel=9 uses maximum memory
+ for optimal speed. The default value is 8. See zconf.h for total memory
+ usage as a function of windowBits and memLevel.
+
+ The strategy parameter is used to tune the compression algorithm. Use the
+ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+ filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
+ string match). Filtered data consists mostly of small values with a
+ somewhat random distribution. In this case, the compression algorithm is
+ tuned to compress them better. The effect of Z_FILTERED is to force more
+ Huffman coding and less string matching; it is somewhat intermediate
+ between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
+ the compression ratio but not the correctness of the compressed output even
+ if it is not set appropriately.
+
+ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+ method). msg is set to null if there is no error message. deflateInit2 does
+ not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the compression dictionary from the given byte sequence
+ without producing any compressed output. This function must be called
+ immediately after deflateInit, deflateInit2 or deflateReset, before any
+ call of deflate. The compressor and decompressor must use exactly the same
+ dictionary (see inflateSetDictionary).
+
+ The dictionary should consist of strings (byte sequences) that are likely
+ to be encountered later in the data to be compressed, with the most commonly
+ used strings preferably put towards the end of the dictionary. Using a
+ dictionary is most useful when the data to be compressed is short and can be
+ predicted with good accuracy; the data can then be compressed better than
+ with the default empty dictionary.
+
+ Depending on the size of the compression data structures selected by
+ deflateInit or deflateInit2, a part of the dictionary may in effect be
+ discarded, for example if the dictionary is larger than the window size in
+ deflate or deflate2. Thus the strings most likely to be useful should be
+ put at the end of the dictionary, not at the front.
+
+ Upon return of this function, strm->adler is set to the Adler32 value
+ of the dictionary; the decompressor may later use this value to determine
+ which dictionary has been used by the compressor. (The Adler32 value
+ applies to the whole dictionary even if only a subset of the dictionary is
+ actually used by the compressor.)
+
+ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+ parameter is invalid (such as NULL dictionary) or the stream state is
+ inconsistent (for example if deflate has already been called for this stream
+ or if the compression method is bsort). deflateSetDictionary does not
+ perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when several compression strategies will be
+ tried, for example when there are several ways of pre-processing the input
+ data with a filter. The streams that will be discarded should then be freed
+ by calling deflateEnd. Note that deflateCopy duplicates the internal
+ compression state which can be quite large, so this strategy is slow and
+ can consume lots of memory.
+
+ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to deflateEnd followed by deflateInit,
+ but does not free and reallocate all the internal compression state.
+ The stream will keep the same compression level and any other attributes
+ that may have been set by deflateInit2.
+
+ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+ int level,
+ int strategy));
+/*
+ Dynamically update the compression level and compression strategy. The
+ interpretation of level and strategy is as in deflateInit2. This can be
+ used to switch between compression and straight copy of the input data, or
+ to switch to a different kind of input data requiring a different
+ strategy. If the compression level is changed, the input available so far
+ is compressed with the old level (and may be flushed); the new level will
+ take effect only at the next call of deflate().
+
+ Before the call of deflateParams, the stream state must be set as for
+ a call of deflate(), since the currently available input may have to
+ be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+ if strm->avail_out was zero.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+ int windowBits));
+
+ This is another version of inflateInit with an extra parameter. The
+ fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+ before by the caller.
+
+ The windowBits parameter is the base two logarithm of the maximum window
+ size (the size of the history buffer). It should be in the range 8..15 for
+ this version of the library. The default value is 15 if inflateInit is used
+ instead. If a compressed stream with a larger window size is given as
+ input, inflate() will return with the error code Z_DATA_ERROR instead of
+ trying to allocate a larger window.
+
+ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+ memLevel). msg is set to null if there is no error message. inflateInit2
+ does not perform any decompression apart from reading the zlib header if
+ present: this will be done by inflate(). (So next_in and avail_in may be
+ modified, but next_out and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the decompression dictionary from the given uncompressed byte
+ sequence. This function must be called immediately after a call of inflate
+ if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+ can be determined from the Adler32 value returned by this call of
+ inflate. The compressor and decompressor must use exactly the same
+ dictionary (see deflateSetDictionary).
+
+ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+ parameter is invalid (such as NULL dictionary) or the stream state is
+ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+ expected one (incorrect Adler32 value). inflateSetDictionary does not
+ perform any decompression: this will be done by subsequent calls of
+ inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+ Skips invalid compressed data until a full flush point (see above the
+ description of deflate with Z_FULL_FLUSH) can be found, or until all
+ available input is skipped. No output is provided.
+
+ inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+ if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+ or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+ case, the application may save the current current value of total_in which
+ indicates where valid compressed data was found. In the error case, the
+ application may repeatedly call inflateSync, providing more input each time,
+ until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to inflateEnd followed by inflateInit,
+ but does not free and reallocate all the internal decompression state.
+ The stream will keep attributes that may have been set by inflateInit2.
+
+ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+
+ /* utility functions */
+
+/*
+ The following utility functions are implemented on top of the
+ basic stream-oriented functions. To simplify the interface, some
+ default options are assumed (compression level and memory usage,
+ standard memory allocation functions). The source code of these
+ utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Compresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total
+ size of the destination buffer, which must be at least 0.1% larger than
+ sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+ compressed buffer.
+ This function can be used to compress a whole file at once if the
+ input file is mmap'ed.
+ compress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen,
+ int level));
+/*
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+ length of the source buffer. Upon entry, destLen is the total size of the
+ destination buffer, which must be at least 0.1% larger than sourceLen plus
+ 12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Decompresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total
+ size of the destination buffer, which must be large enough to hold the
+ entire uncompressed data. (The size of the uncompressed data must have
+ been saved previously by the compressor and transmitted to the decompressor
+ by some mechanism outside the scope of this compression library.)
+ Upon exit, destLen is the actual size of the compressed buffer.
+ This function can be used to decompress a whole file at once if the
+ input file is mmap'ed.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+/*
+ Opens a gzip (.gz) file for reading or writing. The mode parameter
+ is as in fopen ("rb" or "wb") but can also include a compression level
+ ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+ Huffman only compression as in "wb1h". (See the description
+ of deflateInit2 for more information about the strategy parameter.)
+
+ gzopen can be used to read a file which is not in gzip format; in this
+ case gzread will directly read from the file without decompression.
+
+ gzopen returns NULL if the file could not be opened or if there was
+ insufficient memory to allocate the (de)compression state; errno
+ can be checked to distinguish the two cases (if errno is zero, the
+ zlib error is Z_MEM_ERROR). */
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+ gzdopen() associates a gzFile with the file descriptor fd. File
+ descriptors are obtained from calls like open, dup, creat, pipe or
+ fileno (in the file has been previously opened with fopen).
+ The mode parameter is as in gzopen.
+ The next call of gzclose on the returned gzFile will also close the
+ file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+ descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+ gzdopen returns NULL if there was insufficient memory to allocate
+ the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+ Dynamically update the compression level or strategy. See the description
+ of deflateInit2 for the meaning of these parameters.
+ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+ opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+ Reads the given number of uncompressed bytes from the compressed file.
+ If the input file was not in gzip format, gzread copies the given number
+ of bytes into the buffer.
+ gzread returns the number of uncompressed bytes actually read (0 for
+ end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+ const voidp buf, unsigned len));
+/*
+ Writes the given number of uncompressed bytes into the compressed file.
+ gzwrite returns the number of uncompressed bytes actually written
+ (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+/*
+ Converts, formats, and writes the args to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
+ uncompressed bytes actually written (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+ Writes the given null-terminated string to the compressed file, excluding
+ the terminating null character.
+ gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+ Reads bytes from the compressed file until len-1 characters are read, or
+ a newline character is read and transferred to buf, or an end-of-file
+ condition is encountered. The string is then terminated with a null
+ character.
+ gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+ Writes c, converted to an unsigned char, into the compressed file.
+ gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+ Reads one byte from the compressed file. gzgetc returns this byte
+ or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+ Flushes all pending output into the compressed file. The parameter
+ flush is as in the deflate() function. The return value is the zlib
+ error number (see function gzerror below). gzflush returns Z_OK if
+ the flush parameter is Z_FINISH and all output could be flushed.
+ gzflush should be called only when strictly necessary because it can
+ degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+ z_off_t offset, int whence));
+/*
+ Sets the starting position for the next gzread or gzwrite on the
+ given compressed file. The offset represents a number of bytes in the
+ uncompressed data stream. The whence parameter is defined as in lseek(2);
+ the value SEEK_END is not supported.
+ If the file is opened for reading, this function is emulated but can be
+ extremely slow. If the file is opened for writing, only forward seeks are
+ supported; gzseek then compresses a sequence of zeroes up to the new
+ starting position.
+
+ gzseek returns the resulting offset location as measured in bytes from
+ the beginning of the uncompressed stream, or -1 in case of error, in
+ particular if the file is opened for writing and the new starting position
+ would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
+/*
+ Rewinds the given file. This function is supported only for reading.
+
+ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
+/*
+ Returns the starting position for the next gzread or gzwrite on the
+ given compressed file. This position represents a number of bytes in the
+ uncompressed data stream.
+
+ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+ Returns 1 when EOF has previously been detected reading the given
+ input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
+/*
+ Flushes all pending output if necessary, closes the compressed file
+ and deallocates all the (de)compression state. The return value is the zlib
+ error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+ Returns the error message for the last error which occurred on the
+ given compressed file. errnum is set to zlib error number. If an
+ error occurred in the file system and not in the compression library,
+ errnum is set to Z_ERRNO and the application may consult errno
+ to get the exact error code.
+*/
+
+ /* checksum functions */
+
+/*
+ These functions are not related to compression but are exported
+ anyway because they might be useful in applications using the
+ compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+
+/*
+ Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+ return the updated checksum. If buf is NULL, this function returns
+ the required initial value for the checksum.
+ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+ much faster. Usage example:
+
+ uLong adler = adler32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ adler = adler32(adler, buffer, length);
+ }
+ if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+ Update a running crc with the bytes buf[0..len-1] and return the updated
+ crc. If buf is NULL, this function returns the required initial value
+ for the crc. Pre- and post-conditioning (one's complement) is performed
+ within this function so it shouldn't be done by the application.
+ Usage example:
+
+ uLong crc = crc32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ crc = crc32(crc, buffer, length);
+ }
+ if (crc != original_crc) error();
+*/
+
+
+ /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
+ int windowBits, int memLevel,
+ int strategy, const char *version,
+ int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
+ const char *version, int stream_size));
+#define deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
+ struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char * ZEXPORT zError OF((int err));
+ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ZLIB_H */
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/ChangeLog
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/ChangeLog (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/ChangeLog Sat Jul 13 19:22:44 2002
@@ -0,0 +1,471 @@
+
+ ChangeLog file for zlib
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+ occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+ (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+ See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean" (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+ . zutil.c, zutil.h: added "const" for zmem*
+ . Make_vms.com: fixed some typos
+ . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+ . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+ . msdos/Makefile.*: use model-dependent name for the built zlib library
+ . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+ new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+ See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+ completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+ (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+ compression ratio on some files. This also allows inlining _tr_tally for
+ matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+ on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+ the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+ them at run time (thanks to Ken Raeburn for this suggestion). To create
+ trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+ gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occuring only with compression level 0 (thanks to
+ Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+ (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+ (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+ inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+ contrib/asm386/ by Gilles Vollant <info at winimage.com>
+ 386 asm code replacing longest_match().
+ contrib/iostream/ by Kevin Ruland <kevin at rodin.wustl.edu>
+ A C++ I/O streams interface to the zlib gz* functions
+ contrib/iostream2/ by Tyge Løvset <Tyge.Lovset at cmr.no>
+ Another C++ I/O streams interface
+ contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag at tid.es>
+ A very simple tar.gz file extractor using zlib
+ contrib/visual-basic.txt by Carlos Rios <c_rios at sonda.cl>
+ How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+ level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+ (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+ bit, so the decompressor could decompress all the correct data but went
+ on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+ small and medium models; this makes the library incompatible with previous
+ versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+ avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+ Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+ and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+ -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+ warning C4746: 'inflate_mask' : unsized array treated as '__far'
+ (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+ not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+ (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+ typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+ was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+ pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+ is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+ (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+ TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+ (one's complement) is now done inside crc32(). WARNING: this is
+ incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+ not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+ Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+ if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+ user-provided history buffer. This is supported only in deflateInit2
+ and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.dsw Sat Jul 13 19:22:44 2002
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "zlib"=".\zlib.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/README Sat Jul 13 19:22:44 2002
@@ -0,0 +1,148 @@
+zlib 1.1.3 is a general purpose data compression library. All the code
+is thread safe. The data format used by the zlib library
+is described by RFCs (Request for Comments) 1950 to 1952 in the files
+ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
+format) and rfc1952.txt (gzip format). These documents are also available in
+other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact jloup at gzip.org). A usage
+example of the library is given in the file example.c which also tests that
+the library is working correctly. Another example is given in the file
+minigzip.c. The compression library itself is composed of all source files
+except example.c and minigzip.c.
+
+To compile all files and run the test program, follow the instructions
+given at the top of Makefile. In short "make test; make install"
+should work for most machines. For Unix: "configure; make test; make install"
+For MSDOS, use one of the special makefiles such as Makefile.msc.
+For VMS, use Make_vms.com or descrip.mms.
+
+Questions about zlib should be sent to <zlib at quest.jpl.nasa.gov>, or to
+Gilles Vollant <info at winimage.com> for the Windows DLL version.
+The zlib home page is http://www.cdrom.com/pub/infozip/zlib/
+The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/
+Before reporting a problem, please check those sites to verify that
+you have the latest version of zlib; otherwise get the latest version and
+check whether the problem still exists or not.
+
+Mark Nelson <markn at tiny.com> wrote an article about zlib for the Jan. 1997
+issue of Dr. Dobb's Journal; a copy of the article is available in
+http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
+
+The changes made in version 1.1.3 are documented in the file ChangeLog.
+The main changes since 1.1.2 are:
+
+- fix "an inflate input buffer bug that shows up on rare but persistent
+ occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+ (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+ See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+plus many changes for portability.
+
+Unsupported third party contributions are provided in directory "contrib".
+
+A Java implementation of zlib is available in the Java Development Kit 1.1
+http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
+See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details.
+
+A Perl interface to zlib written by Paul Marquess <pmarquess at bfsec.bt.co.uk>
+is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
+ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
+
+A Python interface to zlib written by A.M. Kuchling <amk at magnet.com>
+is available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html
+
+A zlib binding for TCL written by Andreas Kupries <a.kupries at westend.com>
+is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html
+
+An experimental package to read and write files in .zip format,
+written on top of zlib by Gilles Vollant <info at winimage.com>, is
+available at http://www.winimage.com/zLibDll/unzip.html
+and also in the contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
+ and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
+ The zlib DLL support was initially done by Alessandro Iacopetti and is
+ now maintained by Gilles Vollant <info at winimage.com>. Check the zlib DLL
+ home page at http://www.winimage.com/zLibDll
+
+ From Visual Basic, you can call the DLL functions which do not take
+ a structure as argument: compress, uncompress and all gz* functions.
+ See contrib/visual-basic.txt for more information, or get
+ http://www.tcfb.com/dowseware/cmp-z-it.zip
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization.
+ With -O, one libpng test fails. The test works in 32 bit mode (with
+ the -n32 compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1
+ it works when compiled with cc.
+
+- on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1
+ is necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
+ with other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
+
+- For Turbo C the small model is supported only with reduced performance to
+ avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
+
+- For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html
+ Per Harald Myrvang <perm at stud.cs.uit.no>
+
+
+Acknowledgments:
+
+ The deflate format used by zlib was defined by Phil Katz. The deflate
+ and zlib specifications were written by L. Peter Deutsch. Thanks to all the
+ people who reported problems and suggested various improvements in zlib;
+ they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-1998 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup at gzip.org madler at alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not*
+receiving lengthy legal documents to sign. The sources are provided
+for free but without warranty of any kind. The library has been
+entirely written by Jean-loup Gailly and Mark Adler; it does not
+include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include
+in the file ChangeLog history information documenting your changes.
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.c Sat Jul 13 19:22:45 2002
@@ -0,0 +1,455 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#if !defined(BUILDFIXED) && !defined(STDC)
+# define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */
+#endif
+
+const char inflate_copyright[] =
+ " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
+/*
+ If you use the zlib library in a product, an acknowledgment is welcome
+ in the documentation of your product. If for some reason you cannot
+ include such an acknowledgment, I would appreciate that you keep this
+ copyright string in the executable of your product.
+ */
+struct internal_state {int dummy;}; /* for buggy compilers */
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+
+local int huft_build OF((
+ uIntf *, /* code lengths in bits */
+ uInt, /* number of codes */
+ uInt, /* number of "simple" codes */
+ const uIntf *, /* list of base values for non-simple codes */
+ const uIntf *, /* list of extra bits for non-simple codes */
+ inflate_huft * FAR*,/* result: starting table */
+ uIntf *, /* maximum lookup bits (returns actual) */
+ inflate_huft *, /* space for trees */
+ uInt *, /* hufts used in space */
+ uIntf * )); /* space for values */
+
+/* Tables for deflate from PKZIP's appnote.txt. */
+local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+ 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+ /* see note #13 above about 258 */
+local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+ 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
+local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
+ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+ 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+ 8193, 12289, 16385, 24577};
+local const uInt cpdext[30] = { /* Extra bits for distance codes */
+ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+ 7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+ 12, 12, 13, 13};
+
+/*
+ Huffman code decoding is performed using a multi-level table lookup.
+ The fastest way to decode is to simply build a lookup table whose
+ size is determined by the longest code. However, the time it takes
+ to build this table can also be a factor if the data being decoded
+ is not very long. The most common codes are necessarily the
+ shortest codes, so those codes dominate the decoding time, and hence
+ the speed. The idea is you can have a shorter table that decodes the
+ shorter, more probable codes, and then point to subsidiary tables for
+ the longer codes. The time it costs to decode the longer codes is
+ then traded against the time it takes to make longer tables.
+
+ This results of this trade are in the variables lbits and dbits
+ below. lbits is the number of bits the first level table for literal/
+ length codes can decode in one step, and dbits is the same thing for
+ the distance codes. Subsequent tables are also less than or equal to
+ those sizes. These values may be adjusted either when all of the
+ codes are shorter than that, in which case the longest code length in
+ bits is used, or when the shortest code is *longer* than the requested
+ table size, in which case the length of the shortest code in bits is
+ used.
+
+ There are two different values for the two tables, since they code a
+ different number of possibilities each. The literal/length table
+ codes 286 possible values, or in a flat code, a little over eight
+ bits. The distance table codes 30 possible values, or a little less
+ than five bits, flat. The optimum values for speed end up being
+ about one bit more than those, so lbits is 8+1 and dbits is 5+1.
+ The optimum values may differ though from machine to machine, and
+ possibly even between compilers. Your mileage may vary.
+ */
+
+
+/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
+#define BMAX 15 /* maximum bit length of any code */
+
+local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
+uIntf *b; /* code lengths in bits (all assumed <= BMAX) */
+uInt n; /* number of codes (assumed <= 288) */
+uInt s; /* number of simple-valued codes (0..s-1) */
+const uIntf *d; /* list of base values for non-simple codes */
+const uIntf *e; /* list of extra bits for non-simple codes */
+inflate_huft * FAR *t; /* result: starting table */
+uIntf *m; /* maximum lookup bits, returns actual */
+inflate_huft *hp; /* space for trees */
+uInt *hn; /* hufts used in space */
+uIntf *v; /* working area: values in order of bit length */
+/* Given a list of code lengths and a maximum table size, make a set of
+ tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR
+ if the given code set is incomplete (the tables are still built in this
+ case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
+ lengths), or Z_MEM_ERROR if not enough memory. */
+{
+
+ uInt a; /* counter for codes of length k */
+ uInt c[BMAX+1]; /* bit length count table */
+ uInt f; /* i repeats in table every f entries */
+ int g; /* maximum code length */
+ int h; /* table level */
+ register uInt i; /* counter, current code */
+ register uInt j; /* counter */
+ register int k; /* number of bits in current code */
+ int l; /* bits per table (returned in m) */
+ uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */
+ register uIntf *p; /* pointer into c[], b[], or v[] */
+ inflate_huft *q; /* points to current table */
+ struct inflate_huft_s r; /* table entry for structure assignment */
+ inflate_huft *u[BMAX]; /* table stack */
+ register int w; /* bits before this table == (l * h) */
+ uInt x[BMAX+1]; /* bit offsets, then code stack */
+ uIntf *xp; /* pointer into x */
+ int y; /* number of dummy codes added */
+ uInt z; /* number of entries in current table */
+
+
+ /* Generate counts for each bit length */
+ p = c;
+#define C0 *p++ = 0;
+#define C2 C0 C0 C0 C0
+#define C4 C2 C2 C2 C2
+ C4 /* clear c[]--assume BMAX+1 is 16 */
+ p = b; i = n;
+ do {
+ c[*p++]++; /* assume all entries <= BMAX */
+ } while (--i);
+ if (c[0] == n) /* null input--all zero length codes */
+ {
+ *t = (inflate_huft *)Z_NULL;
+ *m = 0;
+ return Z_OK;
+ }
+
+
+ /* Find minimum and maximum length, bound *m by those */
+ l = *m;
+ for (j = 1; j <= BMAX; j++)
+ if (c[j])
+ break;
+ k = j; /* minimum code length */
+ if ((uInt)l < j)
+ l = j;
+ for (i = BMAX; i; i--)
+ if (c[i])
+ break;
+ g = i; /* maximum code length */
+ if ((uInt)l > i)
+ l = i;
+ *m = l;
+
+
+ /* Adjust last length count to fill out codes, if needed */
+ for (y = 1 << j; j < i; j++, y <<= 1)
+ if ((y -= c[j]) < 0)
+ return Z_DATA_ERROR;
+ if ((y -= c[i]) < 0)
+ return Z_DATA_ERROR;
+ c[i] += y;
+
+
+ /* Generate starting offsets into the value table for each length */
+ x[1] = j = 0;
+ p = c + 1; xp = x + 2;
+ while (--i) { /* note that i == g from above */
+ *xp++ = (j += *p++);
+ }
+
+
+ /* Make a table of values in order of bit lengths */
+ p = b; i = 0;
+ do {
+ if ((j = *p++) != 0)
+ v[x[j]++] = i;
+ } while (++i < n);
+ n = x[g]; /* set n to length of v */
+
+
+ /* Generate the Huffman codes and for each, make the table entries */
+ x[0] = i = 0; /* first Huffman code is zero */
+ p = v; /* grab values in bit order */
+ h = -1; /* no tables yet--level -1 */
+ w = -l; /* bits decoded == (l * h) */
+ u[0] = (inflate_huft *)Z_NULL; /* just to keep compilers happy */
+ q = (inflate_huft *)Z_NULL; /* ditto */
+ z = 0; /* ditto */
+
+ /* go through the bit lengths (k already is bits in shortest code) */
+ for (; k <= g; k++)
+ {
+ a = c[k];
+ while (a--)
+ {
+ /* here i is the Huffman code of length k bits for value *p */
+ /* make tables up to required level */
+ while (k > w + l)
+ {
+ h++;
+ w += l; /* previous table always l bits */
+
+ /* compute minimum size table less than or equal to l bits */
+ z = g - w;
+ z = z > (uInt)l ? l : z; /* table size upper limit */
+ if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */
+ { /* too few codes for k-w bit table */
+ f -= a + 1; /* deduct codes from patterns left */
+ xp = c + k;
+ if (j < z)
+ while (++j < z) /* try smaller tables up to z bits */
+ {
+ if ((f <<= 1) <= *++xp)
+ break; /* enough codes to use up j bits */
+ f -= *xp; /* else deduct codes from patterns */
+ }
+ }
+ z = 1 << j; /* table entries for j-bit table */
+
+ /* allocate new table */
+ if (*hn + z > MANY) /* (note: doesn't matter for fixed) */
+ return Z_MEM_ERROR; /* not enough memory */
+ u[h] = q = hp + *hn;
+ *hn += z;
+
+ /* connect to last table, if there is one */
+ if (h)
+ {
+ x[h] = i; /* save pattern for backing up */
+ r.bits = (Byte)l; /* bits to dump before this table */
+ r.exop = (Byte)j; /* bits in this table */
+ j = i >> (w - l);
+ r.base = (uInt)(q - u[h-1] - j); /* offset to this table */
+ u[h-1][j] = r; /* connect to last table */
+ }
+ else
+ *t = q; /* first table is returned result */
+ }
+
+ /* set up table entry in r */
+ r.bits = (Byte)(k - w);
+ if (p >= v + n)
+ r.exop = 128 + 64; /* out of values--invalid code */
+ else if (*p < s)
+ {
+ r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */
+ r.base = *p++; /* simple code is just the value */
+ }
+ else
+ {
+ r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
+ r.base = d[*p++ - s];
+ }
+
+ /* fill code-like entries with r */
+ f = 1 << (k - w);
+ for (j = i >> w; j < z; j += f)
+ q[j] = r;
+
+ /* backwards increment the k-bit code i */
+ for (j = 1 << (k - 1); i & j; j >>= 1)
+ i ^= j;
+ i ^= j;
+
+ /* backup over finished tables */
+ mask = (1 << w) - 1; /* needed on HP, cc -O bug */
+ while ((i & mask) != x[h])
+ {
+ h--; /* don't need to update q */
+ w -= l;
+ mask = (1 << w) - 1;
+ }
+ }
+ }
+
+
+ /* Return Z_BUF_ERROR if we were given an incomplete table */
+ return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
+}
+
+
+int inflate_trees_bits(c, bb, tb, hp, z)
+uIntf *c; /* 19 code lengths */
+uIntf *bb; /* bits tree desired/actual depth */
+inflate_huft * FAR *tb; /* bits tree result */
+inflate_huft *hp; /* space for trees */
+z_streamp z; /* for messages */
+{
+ int r;
+ uInt hn = 0; /* hufts used in space */
+ uIntf *v; /* work area for huft_build */
+
+ if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
+ return Z_MEM_ERROR;
+ r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
+ tb, bb, hp, &hn, v);
+ if (r == Z_DATA_ERROR)
+ z->msg = (char*)"oversubscribed dynamic bit lengths tree";
+ else if (r == Z_BUF_ERROR || *bb == 0)
+ {
+ z->msg = (char*)"incomplete dynamic bit lengths tree";
+ r = Z_DATA_ERROR;
+ }
+ ZFREE(z, v);
+ return r;
+}
+
+
+int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
+uInt nl; /* number of literal/length codes */
+uInt nd; /* number of distance codes */
+uIntf *c; /* that many (total) code lengths */
+uIntf *bl; /* literal desired/actual bit depth */
+uIntf *bd; /* distance desired/actual bit depth */
+inflate_huft * FAR *tl; /* literal/length tree result */
+inflate_huft * FAR *td; /* distance tree result */
+inflate_huft *hp; /* space for trees */
+z_streamp z; /* for messages */
+{
+ int r;
+ uInt hn = 0; /* hufts used in space */
+ uIntf *v; /* work area for huft_build */
+
+ /* allocate work area */
+ if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+ return Z_MEM_ERROR;
+
+ /* build literal/length tree */
+ r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
+ if (r != Z_OK || *bl == 0)
+ {
+ if (r == Z_DATA_ERROR)
+ z->msg = (char*)"oversubscribed literal/length tree";
+ else if (r != Z_MEM_ERROR)
+ {
+ z->msg = (char*)"incomplete literal/length tree";
+ r = Z_DATA_ERROR;
+ }
+ ZFREE(z, v);
+ return r;
+ }
+
+ /* build distance tree */
+ r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
+ if (r != Z_OK || (*bd == 0 && nl > 257))
+ {
+ if (r == Z_DATA_ERROR)
+ z->msg = (char*)"oversubscribed distance tree";
+ else if (r == Z_BUF_ERROR) {
+#ifdef PKZIP_BUG_WORKAROUND
+ r = Z_OK;
+ }
+#else
+ z->msg = (char*)"incomplete distance tree";
+ r = Z_DATA_ERROR;
+ }
+ else if (r != Z_MEM_ERROR)
+ {
+ z->msg = (char*)"empty distance tree with lengths";
+ r = Z_DATA_ERROR;
+ }
+ ZFREE(z, v);
+ return r;
+#endif
+ }
+
+ /* done */
+ ZFREE(z, v);
+ return Z_OK;
+}
+
+
+/* build fixed tables only once--keep them here */
+#ifdef BUILDFIXED
+local int fixed_built = 0;
+#define FIXEDH 544 /* number of hufts used by fixed tables */
+local inflate_huft fixed_mem[FIXEDH];
+local uInt fixed_bl;
+local uInt fixed_bd;
+local inflate_huft *fixed_tl;
+local inflate_huft *fixed_td;
+#else
+#include "inffixed.h"
+#endif
+
+
+int inflate_trees_fixed(bl, bd, tl, td, z)
+uIntf *bl; /* literal desired/actual bit depth */
+uIntf *bd; /* distance desired/actual bit depth */
+inflate_huft * FAR *tl; /* literal/length tree result */
+inflate_huft * FAR *td; /* distance tree result */
+z_streamp z; /* for memory allocation */
+{
+#ifdef BUILDFIXED
+ /* build fixed tables if not already */
+ if (!fixed_built)
+ {
+ int k; /* temporary variable */
+ uInt f = 0; /* number of hufts used in fixed_mem */
+ uIntf *c; /* length list for huft_build */
+ uIntf *v; /* work area for huft_build */
+
+ /* allocate memory */
+ if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+ return Z_MEM_ERROR;
+ if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
+ {
+ ZFREE(z, c);
+ return Z_MEM_ERROR;
+ }
+
+ /* literal table */
+ for (k = 0; k < 144; k++)
+ c[k] = 8;
+ for (; k < 256; k++)
+ c[k] = 9;
+ for (; k < 280; k++)
+ c[k] = 7;
+ for (; k < 288; k++)
+ c[k] = 8;
+ fixed_bl = 9;
+ huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
+ fixed_mem, &f, v);
+
+ /* distance table */
+ for (k = 0; k < 30; k++)
+ c[k] = 5;
+ fixed_bd = 5;
+ huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
+ fixed_mem, &f, v);
+
+ /* done */
+ ZFREE(z, v);
+ ZFREE(z, c);
+ fixed_built = 1;
+ }
+#endif
+ *bl = fixed_bl;
+ *bd = fixed_bd;
+ *tl = fixed_tl;
+ *td = fixed_td;
+ return Z_OK;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/zlib.3 Sat Jul 13 19:22:45 2002
@@ -0,0 +1,107 @@
+.TH ZLIB 3 "9 July 1998"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms will be added later and will have the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+(for example if an input file is mmap'ed),
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.I gzip
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler. The decoder checks
+the consistency of the compressed data, so the library should never
+crash even in case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h.
+The distribution source includes examples of use of the library
+the files
+.I example.c
+and
+.IR minigzip.c .
+.LP
+A Java implementation of
+.IR zlib
+is available in the Java Development Kit 1.1
+.IP
+http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
+.LP
+A Perl interface to
+.IR zlib ,
+written by Paul Marquess (pmarquess at bfsec.bt.co.uk)
+is available at CPAN (Comprehensive Perl Archive Network) sites,
+such as:
+.IP
+ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
+.LP
+A Python interface to
+.IR zlib
+written by A.M. Kuchling <amk at magnet.com>
+is available from the Python Software Association sites, such as:
+.IP
+ftp://ftp.python.org/pub/python/contrib/Encoding/zlib*.tar.gz
+.SH "SEE ALSO"
+Questions about zlib should be sent to:
+.IP
+zlib at quest.jpl.nasa.gov
+or, if this fails, to the author addresses given below.
+The zlib home page is:
+.IP
+http://www.cdrom.com/pub/infozip/zlib/
+.LP
+The data format used by the zlib library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+ftp://ds.internic.net/rfc/rfc1950.txt (zlib format)
+.br
+rfc1951.txt (deflate format)
+.br
+rfc1952.txt (gzip format)
+.LP
+These documents are also available in other formats from:
+.IP
+ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+.SH AUTHORS
+Version 1.1.3
+Copyright (C) 1995-1998 Jean-loup Gailly (jloup at gzip.org)
+and Mark Adler (madler at alumni.caltech.edu).
+.LP
+This software is provided "as-is,"
+without any express or implied warranty.
+In no event will the authors be held liable for any damages
+arising from the use of this software.
+See the distribution directory with respect to requirements
+governing redistribution.
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers at nlm.nih.gov).
+.\" end of man page
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inflate.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inflate.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inflate.c Sat Jul 13 19:22:45 2002
@@ -0,0 +1,366 @@
+/* inflate.c -- zlib interface to inflate modules
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "infblock.h"
+
+struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
+
+typedef enum {
+ METHOD, /* waiting for method byte */
+ FLAG, /* waiting for flag byte */
+ DICT4, /* four dictionary check bytes to go */
+ DICT3, /* three dictionary check bytes to go */
+ DICT2, /* two dictionary check bytes to go */
+ DICT1, /* one dictionary check byte to go */
+ DICT0, /* waiting for inflateSetDictionary */
+ BLOCKS, /* decompressing blocks */
+ CHECK4, /* four check bytes to go */
+ CHECK3, /* three check bytes to go */
+ CHECK2, /* two check bytes to go */
+ CHECK1, /* one check byte to go */
+ DONE, /* finished check, done */
+ BAD} /* got an error--stay here */
+inflate_mode;
+
+/* inflate private state */
+struct internal_state {
+
+ /* mode */
+ inflate_mode mode; /* current inflate mode */
+
+ /* mode dependent information */
+ union {
+ uInt method; /* if FLAGS, method byte */
+ struct {
+ uLong was; /* computed check value */
+ uLong need; /* stream check value */
+ } check; /* if CHECK, check values to compare */
+ uInt marker; /* if BAD, inflateSync's marker bytes count */
+ } sub; /* submode */
+
+ /* mode independent information */
+ int nowrap; /* flag for no wrapper */
+ uInt wbits; /* log2(window size) (8..15, defaults to 15) */
+ inflate_blocks_statef
+ *blocks; /* current inflate_blocks state */
+
+};
+
+
+int ZEXPORT inflateReset(z)
+z_streamp z;
+{
+ if (z == Z_NULL || z->state == Z_NULL)
+ return Z_STREAM_ERROR;
+ z->total_in = z->total_out = 0;
+ z->msg = Z_NULL;
+ z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
+ inflate_blocks_reset(z->state->blocks, z, Z_NULL);
+ Tracev((stderr, "inflate: reset\n"));
+ return Z_OK;
+}
+
+
+int ZEXPORT inflateEnd(z)
+z_streamp z;
+{
+ if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
+ return Z_STREAM_ERROR;
+ if (z->state->blocks != Z_NULL)
+ inflate_blocks_free(z->state->blocks, z);
+ ZFREE(z, z->state);
+ z->state = Z_NULL;
+ Tracev((stderr, "inflate: end\n"));
+ return Z_OK;
+}
+
+
+int ZEXPORT inflateInit2_(z, w, version, stream_size)
+z_streamp z;
+int w;
+const char *version;
+int stream_size;
+{
+ if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+ stream_size != sizeof(z_stream))
+ return Z_VERSION_ERROR;
+
+ /* initialize state */
+ if (z == Z_NULL)
+ return Z_STREAM_ERROR;
+ z->msg = Z_NULL;
+ if (z->zalloc == Z_NULL)
+ {
+ z->zalloc = zcalloc;
+ z->opaque = (voidpf)0;
+ }
+ if (z->zfree == Z_NULL) z->zfree = zcfree;
+ if ((z->state = (struct internal_state FAR *)
+ ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
+ return Z_MEM_ERROR;
+ z->state->blocks = Z_NULL;
+
+ /* handle undocumented nowrap option (no zlib header or check) */
+ z->state->nowrap = 0;
+ if (w < 0)
+ {
+ w = - w;
+ z->state->nowrap = 1;
+ }
+
+ /* set window size */
+ if (w < 8 || w > 15)
+ {
+ inflateEnd(z);
+ return Z_STREAM_ERROR;
+ }
+ z->state->wbits = (uInt)w;
+
+ /* create inflate_blocks state */
+ if ((z->state->blocks =
+ inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
+ == Z_NULL)
+ {
+ inflateEnd(z);
+ return Z_MEM_ERROR;
+ }
+ Tracev((stderr, "inflate: allocated\n"));
+
+ /* reset state */
+ inflateReset(z);
+ return Z_OK;
+}
+
+
+int ZEXPORT inflateInit_(z, version, stream_size)
+z_streamp z;
+const char *version;
+int stream_size;
+{
+ return inflateInit2_(z, DEF_WBITS, version, stream_size);
+}
+
+
+#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
+#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
+
+int ZEXPORT inflate(z, f)
+z_streamp z;
+int f;
+{
+ int r;
+ uInt b;
+
+ if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
+ return Z_STREAM_ERROR;
+ f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
+ r = Z_BUF_ERROR;
+ while (1) switch (z->state->mode)
+ {
+ case METHOD:
+ NEEDBYTE
+ if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
+ {
+ z->state->mode = BAD;
+ z->msg = (char*)"unknown compression method";
+ z->state->sub.marker = 5; /* can't try inflateSync */
+ break;
+ }
+ if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
+ {
+ z->state->mode = BAD;
+ z->msg = (char*)"invalid window size";
+ z->state->sub.marker = 5; /* can't try inflateSync */
+ break;
+ }
+ z->state->mode = FLAG;
+ case FLAG:
+ NEEDBYTE
+ b = NEXTBYTE;
+ if (((z->state->sub.method << 8) + b) % 31)
+ {
+ z->state->mode = BAD;
+ z->msg = (char*)"incorrect header check";
+ z->state->sub.marker = 5; /* can't try inflateSync */
+ break;
+ }
+ Tracev((stderr, "inflate: zlib header ok\n"));
+ if (!(b & PRESET_DICT))
+ {
+ z->state->mode = BLOCKS;
+ break;
+ }
+ z->state->mode = DICT4;
+ case DICT4:
+ NEEDBYTE
+ z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+ z->state->mode = DICT3;
+ case DICT3:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+ z->state->mode = DICT2;
+ case DICT2:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+ z->state->mode = DICT1;
+ case DICT1:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE;
+ z->adler = z->state->sub.check.need;
+ z->state->mode = DICT0;
+ return Z_NEED_DICT;
+ case DICT0:
+ z->state->mode = BAD;
+ z->msg = (char*)"need dictionary";
+ z->state->sub.marker = 0; /* can try inflateSync */
+ return Z_STREAM_ERROR;
+ case BLOCKS:
+ r = inflate_blocks(z->state->blocks, z, r);
+ if (r == Z_DATA_ERROR)
+ {
+ z->state->mode = BAD;
+ z->state->sub.marker = 0; /* can try inflateSync */
+ break;
+ }
+ if (r == Z_OK)
+ r = f;
+ if (r != Z_STREAM_END)
+ return r;
+ r = f;
+ inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
+ if (z->state->nowrap)
+ {
+ z->state->mode = DONE;
+ break;
+ }
+ z->state->mode = CHECK4;
+ case CHECK4:
+ NEEDBYTE
+ z->state->sub.check.need = (uLong)NEXTBYTE << 24;
+ z->state->mode = CHECK3;
+ case CHECK3:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE << 16;
+ z->state->mode = CHECK2;
+ case CHECK2:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE << 8;
+ z->state->mode = CHECK1;
+ case CHECK1:
+ NEEDBYTE
+ z->state->sub.check.need += (uLong)NEXTBYTE;
+
+ if (z->state->sub.check.was != z->state->sub.check.need)
+ {
+ z->state->mode = BAD;
+ z->msg = (char*)"incorrect data check";
+ z->state->sub.marker = 5; /* can't try inflateSync */
+ break;
+ }
+ Tracev((stderr, "inflate: zlib check ok\n"));
+ z->state->mode = DONE;
+ case DONE:
+ return Z_STREAM_END;
+ case BAD:
+ return Z_DATA_ERROR;
+ default:
+ return Z_STREAM_ERROR;
+ }
+#ifdef NEED_DUMMY_RETURN
+ return Z_STREAM_ERROR; /* Some dumb compilers complain without this */
+#endif
+}
+
+
+int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
+z_streamp z;
+const Bytef *dictionary;
+uInt dictLength;
+{
+ uInt length = dictLength;
+
+ if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
+ return Z_STREAM_ERROR;
+
+ if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
+ z->adler = 1L;
+
+ if (length >= ((uInt)1<<z->state->wbits))
+ {
+ length = (1<<z->state->wbits)-1;
+ dictionary += dictLength - length;
+ }
+ inflate_set_dictionary(z->state->blocks, dictionary, length);
+ z->state->mode = BLOCKS;
+ return Z_OK;
+}
+
+
+int ZEXPORT inflateSync(z)
+z_streamp z;
+{
+ uInt n; /* number of bytes to look at */
+ Bytef *p; /* pointer to bytes */
+ uInt m; /* number of marker bytes found in a row */
+ uLong r, w; /* temporaries to save total_in and total_out */
+
+ /* set up */
+ if (z == Z_NULL || z->state == Z_NULL)
+ return Z_STREAM_ERROR;
+ if (z->state->mode != BAD)
+ {
+ z->state->mode = BAD;
+ z->state->sub.marker = 0;
+ }
+ if ((n = z->avail_in) == 0)
+ return Z_BUF_ERROR;
+ p = z->next_in;
+ m = z->state->sub.marker;
+
+ /* search */
+ while (n && m < 4)
+ {
+ static const Byte mark[4] = {0, 0, 0xff, 0xff};
+ if (*p == mark[m])
+ m++;
+ else if (*p)
+ m = 0;
+ else
+ m = 4 - m;
+ p++, n--;
+ }
+
+ /* restore */
+ z->total_in += p - z->next_in;
+ z->next_in = p;
+ z->avail_in = n;
+ z->state->sub.marker = m;
+
+ /* return no joy or set up to restart on a new block */
+ if (m != 4)
+ return Z_DATA_ERROR;
+ r = z->total_in; w = z->total_out;
+ inflateReset(z);
+ z->total_in = r; z->total_out = w;
+ z->state->mode = BLOCKS;
+ return Z_OK;
+}
+
+
+/* Returns true if inflate is currently at the end of a block generated
+ * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+ * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
+ * but removes the length bytes of the resulting empty stored block. When
+ * decompressing, PPP checks that at the end of input packet, inflate is
+ * waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(z)
+z_streamp z;
+{
+ if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
+ return Z_STREAM_ERROR;
+ return inflate_blocks_sync_point(z->state->blocks);
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/uncompr.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/uncompr.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/uncompr.c Sat Jul 13 19:22:45 2002
@@ -0,0 +1,58 @@
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+
+/* ===========================================================================
+ Decompresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total
+ size of the destination buffer, which must be large enough to hold the
+ entire uncompressed data. (The size of the uncompressed data must have
+ been saved previously by the compressor and transmitted to the decompressor
+ by some mechanism outside the scope of this compression library.)
+ Upon exit, destLen is the actual size of the compressed buffer.
+ This function can be used to decompress a whole file at once if the
+ input file is mmap'ed.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+ Bytef *dest;
+ uLongf *destLen;
+ const Bytef *source;
+ uLong sourceLen;
+{
+ z_stream stream;
+ int err;
+
+ stream.next_in = (Bytef*)source;
+ stream.avail_in = (uInt)sourceLen;
+ /* Check for source > 64K on 16-bit machine: */
+ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+
+ stream.next_out = dest;
+ stream.avail_out = (uInt)*destLen;
+ if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+ stream.zalloc = (alloc_func)0;
+ stream.zfree = (free_func)0;
+
+ err = inflateInit(&stream);
+ if (err != Z_OK) return err;
+
+ err = inflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ inflateEnd(&stream);
+ return err == Z_OK ? Z_BUF_ERROR : err;
+ }
+ *destLen = stream.total_out;
+
+ err = inflateEnd(&stream);
+ return err;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/inftrees.h Sat Jul 13 19:22:45 2002
@@ -0,0 +1,58 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+/* Huffman code lookup table entry--this entry is four bytes for machines
+ that have 16-bit pointers (e.g. PC's in the small or medium model). */
+
+typedef struct inflate_huft_s FAR inflate_huft;
+
+struct inflate_huft_s {
+ union {
+ struct {
+ Byte Exop; /* number of extra bits or operation */
+ Byte Bits; /* number of bits in this code or subcode */
+ } what;
+ uInt pad; /* pad structure to a power of 2 (4 bytes for */
+ } word; /* 16-bit, 8 bytes for 32-bit int's) */
+ uInt base; /* literal, length base, distance base,
+ or table offset */
+};
+
+/* Maximum size of dynamic tree. The maximum found in a long but non-
+ exhaustive search was 1004 huft structures (850 for length/literals
+ and 154 for distances, the latter actually the result of an
+ exhaustive search). The actual maximum is not known, but the
+ value below is more than safe. */
+#define MANY 1440
+
+extern int inflate_trees_bits OF((
+ uIntf *, /* 19 code lengths */
+ uIntf *, /* bits tree desired/actual depth */
+ inflate_huft * FAR *, /* bits tree result */
+ inflate_huft *, /* space for trees */
+ z_streamp)); /* for messages */
+
+extern int inflate_trees_dynamic OF((
+ uInt, /* number of literal/length codes */
+ uInt, /* number of distance codes */
+ uIntf *, /* that many (total) code lengths */
+ uIntf *, /* literal desired/actual bit depth */
+ uIntf *, /* distance desired/actual bit depth */
+ inflate_huft * FAR *, /* literal/length tree result */
+ inflate_huft * FAR *, /* distance tree result */
+ inflate_huft *, /* space for trees */
+ z_streamp)); /* for messages */
+
+extern int inflate_trees_fixed OF((
+ uIntf *, /* literal desired/actual bit depth */
+ uIntf *, /* distance desired/actual bit depth */
+ inflate_huft * FAR *, /* literal/length tree result */
+ inflate_huft * FAR *, /* distance tree result */
+ z_streamp)); /* for memory allocation */
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/FAQ
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/FAQ (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/FAQ Sat Jul 13 19:22:45 2002
@@ -0,0 +1,72 @@
+
+ Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://www.cdrom.com/pub/infozip/zlib/ which may have more recent information.
+
+
+1) I need a Windows DLL
+2) I need a Visual Basic interface to zlib
+3) compress() returns Z_BUF_ERROR
+4) deflate or inflate returns Z_BUF_ERROR
+5) Where is the zlib documentation (man pages, etc...)?
+6) Why don't you use GNU autoconf, libtool, etc...?
+7) There is a bug in zlib.
+8) I get "undefined reference to gzputc"
+
+
+
+1) I need a Windows DLL
+
+ The zlib sources can be compiled without change to produce a DLL.
+ If you want a precompiled DLL, see http://www.winimage.com/zLibDll
+
+
+2) I need a Visual Basic interface to zlib
+
+ See http://www.tcfb.com/dowseware/cmp-z-it.zip
+ http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
+ and contrib/visual-basic.txt
+
+3) compress() returns Z_BUF_ERROR
+
+ Make sure that before the call of compress, the length of the
+ compressed buffer is equal to the total size of the compressed buffer
+ and not zero. For Visual Basic, check that this parameter is passed
+ by reference ("as any"), not by value ("as long").
+
+
+4) deflate or inflate returns Z_BUF_ERROR
+
+ Make sure that before the call avail_in and avail_out are not zero.
+
+
+5) Where is the zlib documentation (man pages, etc...)?
+
+ It's in zlib.h for the moment. Volunteers to transform this
+ to man pages, please contact jloup at gzip.org. Examples of zlib usage
+ are in the files example.c and minigzip.c.
+
+
+6) Why don't you use GNU autoconf, libtool, etc...?
+
+ Because we would like to keep zlib as a very small and simple package.
+ zlib is rather portable and doesn't need much configuration.
+
+
+7) There is a bug in zlib.
+
+ Most of the time, such problems are due to an incorrect usage
+ of zlib. Please try to reproduce the problem with a small
+ program and send us the corresponding source at zlib at quest.jpl.nasa.gov
+ Do not send multi-megabyte data files without prior agreement.
+
+
+8) I get "undefined reference to gzputc"
+
+ If "make test" produces something like
+ example.o(.text+0x174):
+ check that you don't have old files libz.* in /usr/lib, /usr/local/lib
+ or /usr/X11R6/lib. Remove old versions then do "make install".
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/Makefile.am Sat Jul 13 19:22:46 2002
@@ -0,0 +1,29 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+
+# read local config files
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+EXTRA_DIST= ChangeLog FAQ INDEX README README.rrdtool algorithm.txt zlib.dsp zlib.dsw zlib.3
+
+noinst_LTLIBRARIES = librrd_z.la
+
+librrd_z_la_SOURCES = \
+ adler32.c \
+ compress.c \
+ crc32.c \
+ deflate.c \
+ gzio.c \
+ infblock.c \
+ infcodes.c \
+ inffast.c \
+ inflate.c \
+ inftrees.c \
+ infutil.c \
+ trees.c \
+ uncompr.c \
+ zutil.c \
+ deflate.h infcodes.h inffixed.h infutil.h zconf.h zutil.h \
+ infblock.h inffast.h inftrees.h trees.h zlib.h
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/infcodes.c Sat Jul 13 19:22:46 2002
@@ -0,0 +1,257 @@
+/* infcodes.c -- process literals and length/distance pairs
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "infblock.h"
+#include "infcodes.h"
+#include "infutil.h"
+#include "inffast.h"
+
+/* simplify the use of the inflate_huft type with some defines */
+#define exop word.what.Exop
+#define bits word.what.Bits
+
+typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+ START, /* x: set up for LEN */
+ LEN, /* i: get length/literal/eob next */
+ LENEXT, /* i: getting length extra (have base) */
+ DIST, /* i: get distance next */
+ DISTEXT, /* i: getting distance extra */
+ COPY, /* o: copying bytes in window, waiting for space */
+ LIT, /* o: got literal, waiting for output space */
+ WASH, /* o: got eob, possibly still output waiting */
+ END, /* x: got eob and all data flushed */
+ BADCODE} /* x: got error */
+inflate_codes_mode;
+
+/* inflate codes private state */
+struct inflate_codes_state {
+
+ /* mode */
+ inflate_codes_mode mode; /* current inflate_codes mode */
+
+ /* mode dependent information */
+ uInt len;
+ union {
+ struct {
+ inflate_huft *tree; /* pointer into tree */
+ uInt need; /* bits needed */
+ } code; /* if LEN or DIST, where in tree */
+ uInt lit; /* if LIT, literal */
+ struct {
+ uInt get; /* bits to get for extra */
+ uInt dist; /* distance back to copy from */
+ } copy; /* if EXT or COPY, where and how much */
+ } sub; /* submode */
+
+ /* mode independent information */
+ Byte lbits; /* ltree bits decoded per branch */
+ Byte dbits; /* dtree bits decoder per branch */
+ inflate_huft *ltree; /* literal/length/eob tree */
+ inflate_huft *dtree; /* distance tree */
+
+};
+
+
+inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
+uInt bl, bd;
+inflate_huft *tl;
+inflate_huft *td; /* need separate declaration for Borland C++ */
+z_streamp z;
+{
+ inflate_codes_statef *c;
+
+ if ((c = (inflate_codes_statef *)
+ ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
+ {
+ c->mode = START;
+ c->lbits = (Byte)bl;
+ c->dbits = (Byte)bd;
+ c->ltree = tl;
+ c->dtree = td;
+ Tracev((stderr, "inflate: codes new\n"));
+ }
+ return c;
+}
+
+
+int inflate_codes(s, z, r)
+inflate_blocks_statef *s;
+z_streamp z;
+int r;
+{
+ uInt j; /* temporary storage */
+ inflate_huft *t; /* temporary pointer */
+ uInt e; /* extra bits or operation */
+ uLong b; /* bit buffer */
+ uInt k; /* bits in bit buffer */
+ Bytef *p; /* input data pointer */
+ uInt n; /* bytes available there */
+ Bytef *q; /* output window write pointer */
+ uInt m; /* bytes to end of window or read pointer */
+ Bytef *f; /* pointer to copy strings from */
+ inflate_codes_statef *c = s->sub.decode.codes; /* codes state */
+
+ /* copy input/output information to locals (UPDATE macro restores) */
+ LOAD
+
+ /* process input and output based on current state */
+ while (1) switch (c->mode)
+ { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
+ case START: /* x: set up for LEN */
+#ifndef SLOW
+ if (m >= 258 && n >= 10)
+ {
+ UPDATE
+ r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
+ LOAD
+ if (r != Z_OK)
+ {
+ c->mode = r == Z_STREAM_END ? WASH : BADCODE;
+ break;
+ }
+ }
+#endif /* !SLOW */
+ c->sub.code.need = c->lbits;
+ c->sub.code.tree = c->ltree;
+ c->mode = LEN;
+ case LEN: /* i: get length/literal/eob next */
+ j = c->sub.code.need;
+ NEEDBITS(j)
+ t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
+ DUMPBITS(t->bits)
+ e = (uInt)(t->exop);
+ if (e == 0) /* literal */
+ {
+ c->sub.lit = t->base;
+ Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
+ "inflate: literal '%c'\n" :
+ "inflate: literal 0x%02x\n", t->base));
+ c->mode = LIT;
+ break;
+ }
+ if (e & 16) /* length */
+ {
+ c->sub.copy.get = e & 15;
+ c->len = t->base;
+ c->mode = LENEXT;
+ break;
+ }
+ if ((e & 64) == 0) /* next table */
+ {
+ c->sub.code.need = e;
+ c->sub.code.tree = t + t->base;
+ break;
+ }
+ if (e & 32) /* end of block */
+ {
+ Tracevv((stderr, "inflate: end of block\n"));
+ c->mode = WASH;
+ break;
+ }
+ c->mode = BADCODE; /* invalid code */
+ z->msg = (char*)"invalid literal/length code";
+ r = Z_DATA_ERROR;
+ LEAVE
+ case LENEXT: /* i: getting length extra (have base) */
+ j = c->sub.copy.get;
+ NEEDBITS(j)
+ c->len += (uInt)b & inflate_mask[j];
+ DUMPBITS(j)
+ c->sub.code.need = c->dbits;
+ c->sub.code.tree = c->dtree;
+ Tracevv((stderr, "inflate: length %u\n", c->len));
+ c->mode = DIST;
+ case DIST: /* i: get distance next */
+ j = c->sub.code.need;
+ NEEDBITS(j)
+ t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
+ DUMPBITS(t->bits)
+ e = (uInt)(t->exop);
+ if (e & 16) /* distance */
+ {
+ c->sub.copy.get = e & 15;
+ c->sub.copy.dist = t->base;
+ c->mode = DISTEXT;
+ break;
+ }
+ if ((e & 64) == 0) /* next table */
+ {
+ c->sub.code.need = e;
+ c->sub.code.tree = t + t->base;
+ break;
+ }
+ c->mode = BADCODE; /* invalid code */
+ z->msg = (char*)"invalid distance code";
+ r = Z_DATA_ERROR;
+ LEAVE
+ case DISTEXT: /* i: getting distance extra */
+ j = c->sub.copy.get;
+ NEEDBITS(j)
+ c->sub.copy.dist += (uInt)b & inflate_mask[j];
+ DUMPBITS(j)
+ Tracevv((stderr, "inflate: distance %u\n", c->sub.copy.dist));
+ c->mode = COPY;
+ case COPY: /* o: copying bytes in window, waiting for space */
+#ifndef __TURBOC__ /* Turbo C bug for following expression */
+ f = (uInt)(q - s->window) < c->sub.copy.dist ?
+ s->end - (c->sub.copy.dist - (q - s->window)) :
+ q - c->sub.copy.dist;
+#else
+ f = q - c->sub.copy.dist;
+ if ((uInt)(q - s->window) < c->sub.copy.dist)
+ f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
+#endif
+ while (c->len)
+ {
+ NEEDOUT
+ OUTBYTE(*f++)
+ if (f == s->end)
+ f = s->window;
+ c->len--;
+ }
+ c->mode = START;
+ break;
+ case LIT: /* o: got literal, waiting for output space */
+ NEEDOUT
+ OUTBYTE(c->sub.lit)
+ c->mode = START;
+ break;
+ case WASH: /* o: got eob, possibly more output */
+ if (k > 7) /* return unused byte, if any */
+ {
+ Assert(k < 16, "inflate_codes grabbed too many bytes")
+ k -= 8;
+ n++;
+ p--; /* can always return one */
+ }
+ FLUSH
+ if (s->read != s->write)
+ LEAVE
+ c->mode = END;
+ case END:
+ r = Z_STREAM_END;
+ LEAVE
+ case BADCODE: /* x: got error */
+ r = Z_DATA_ERROR;
+ LEAVE
+ default:
+ r = Z_STREAM_ERROR;
+ LEAVE
+ }
+#ifdef NEED_DUMMY_RETURN
+ return Z_STREAM_ERROR; /* Some dumb compilers complain without this */
+#endif
+}
+
+
+void inflate_codes_free(c, z)
+inflate_codes_statef *c;
+z_streamp z;
+{
+ ZFREE(z, c);
+ Tracev((stderr, "inflate: codes free\n"));
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/adler32.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/adler32.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/zlib-1.1.3/adler32.c Sat Jul 13 19:22:46 2002
@@ -0,0 +1,48 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-1998 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+
+#define BASE 65521L /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i) {s1 += buf[i]; s2 += s1;}
+#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf) DO8(buf,0); DO8(buf,8);
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+ uLong adler;
+ const Bytef *buf;
+ uInt len;
+{
+ unsigned long s1 = adler & 0xffff;
+ unsigned long s2 = (adler >> 16) & 0xffff;
+ int k;
+
+ if (buf == Z_NULL) return 1L;
+
+ while (len > 0) {
+ k = len < NMAX ? len : NMAX;
+ len -= k;
+ while (k >= 16) {
+ DO16(buf);
+ buf += 16;
+ k -= 16;
+ }
+ if (k != 0) do {
+ s1 += *buf++;
+ s2 += s1;
+ } while (--k);
+ s1 %= BASE;
+ s2 %= BASE;
+ }
+ return (s2 << 16) | s1;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.in Sat Jul 13 19:22:46 2002
@@ -0,0 +1,313 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+SUBDIRS = log2rrd rrd-file-icon trytime
+
+contribdir = $(prefix)/contrib
+contrib_DATA = README
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+DATA = $(contrib_DATA)
+
+DIST_COMMON = README Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-contribDATA: $(contrib_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+ @list='$(contrib_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-contribDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(contrib_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(contribdir)/$$p; \
+ done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+ at SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
+ dot_seen=no; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" = "." && dot_seen=yes; \
+ done; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = contrib
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+ for subdir in $(SUBDIRS); do \
+ if test "$$subdir" = .; then :; else \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+ chmod 777 $(distdir)/$$subdir; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+ || exit 1; \
+ fi; \
+ done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am: install-contribDATA
+install-data: install-data-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am: uninstall-contribDATA
+uninstall: uninstall-recursive
+all-am: Makefile $(DATA)
+all-redirect: all-recursive
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am: clean-tags clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am: distclean-tags distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-recursive
+
+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+
+.PHONY: uninstall-contribDATA install-contribDATA install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/Makefile.am Sat Jul 13 19:22:46 2002
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS= log2rrd rrd-file-icon trytime
+
+contribdir = $(prefix)/contrib
+contrib_DATA = README
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.in Sat Jul 13 19:22:47 2002
@@ -0,0 +1,208 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+EXTRA_DIST = rrd.png
+contribdir = $(prefix)/contrib/rrd-file-icon
+contrib_DATA = README rrd.png
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../../config/config.h
+CONFIG_CLEAN_FILES =
+DATA = $(contrib_DATA)
+
+DIST_COMMON = README Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/rrd-file-icon/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-contribDATA: $(contrib_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+ @list='$(contrib_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-contribDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(contrib_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(contribdir)/$$p; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = contrib/rrd-file-icon
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-contribDATA
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-contribDATA
+uninstall: uninstall-am
+all-am: Makefile $(DATA)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-contribDATA install-contribDATA tags distdir info-am \
+info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/Makefile.am Sat Jul 13 19:22:47 2002
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+EXTRA_DIST = rrd.png
+contribdir = $(prefix)/contrib/rrd-file-icon
+contrib_DATA = README rrd.png
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/rrd.png
==============================================================================
Binary files trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/rrd.png (original) and trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/rrd.png differ
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/README
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/README (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/rrd-file-icon/README Sat Jul 13 19:22:47 2002
@@ -0,0 +1,19 @@
+From: "Alex van den Bogaerdt" <alex at ergens.op.Het.Net>
+
+This icon can be used, for instance, by apache httpd.
+
+(note: path names may differ in your setup)
+
+Copy the icon to /home/apache/icons/
+Modify /etc/httpd/conf/srm.conf by adding:
+
+ AddIcon /icons/rrd.png .rrd
+ AddDescription "Round Robin Database" .rrd
+
+You could even run a script when an rrd file is clicked on:
+
+ AddHandler rrd-handler rrd
+ Action rrd-handler /cgi-bin/some-general-rrd-script.cgi
+
+
+Alex
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.in Sat Jul 13 19:22:47 2002
@@ -0,0 +1,234 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+EXTRA_DIST = log2rrd.pl.in
+
+contribdir = $(prefix)/contrib/log2rrd
+contrib_DATA = README
+contrib_SCRIPTS = log2rrd.pl
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../../config/config.h
+CONFIG_CLEAN_FILES = log2rrd.pl
+SCRIPTS = $(contrib_SCRIPTS)
+
+DATA = $(contrib_DATA)
+
+DIST_COMMON = README Makefile.am Makefile.in log2rrd.pl.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/log2rrd/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+log2rrd.pl: $(top_builddir)/config.status log2rrd.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+install-contribSCRIPTS: $(contrib_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+ @list='$(contrib_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(contribdir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(contribdir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-contribSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(contrib_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(contribdir)/`echo $$p|sed '$(transform)'`; \
+ done
+
+install-contribDATA: $(contrib_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+ @list='$(contrib_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-contribDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(contrib_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(contribdir)/$$p; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = contrib/log2rrd
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-contribSCRIPTS install-contribDATA
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-contribSCRIPTS uninstall-contribDATA
+uninstall: uninstall-am
+all-am: Makefile $(SCRIPTS) $(DATA)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(contribdir) $(DESTDIR)$(contribdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-contribSCRIPTS install-contribSCRIPTS \
+uninstall-contribDATA install-contribDATA tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/Makefile.am Sat Jul 13 19:22:48 2002
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = log2rrd.pl.in
+
+contribdir = $(prefix)/contrib/log2rrd
+contrib_DATA = README
+contrib_SCRIPTS = log2rrd.pl
Modified: trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/log2rrd.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/log2rrd.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/log2rrd/log2rrd.pl.in Sat Jul 13 19:22:48 2002
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl
+#! @PERL@
#
# Log 2 RRD. This script translates a MRTG 2.x log file
# into a RRD archive. The original version was written by
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.in Sat Jul 13 19:22:48 2002
@@ -0,0 +1,208 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+EXTRA_DIST = trytime.c
+contribdir = $(prefix)/contrib/trytime
+contrib_DATA = README trytime.c
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../../config/config.h
+CONFIG_CLEAN_FILES =
+DATA = $(contrib_DATA)
+
+DIST_COMMON = README Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/trytime/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-contribDATA: $(contrib_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+ @list='$(contrib_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(contribdir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(contribdir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-contribDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(contrib_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(contribdir)/$$p; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = contrib/trytime
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-contribDATA
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-contribDATA
+uninstall: uninstall-am
+all-am: Makefile $(DATA)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(contribdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-contribDATA install-contribDATA tags distdir info-am \
+info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile.am Sat Jul 13 19:22:48 2002
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+EXTRA_DIST = trytime.c
+contribdir = $(prefix)/contrib/trytime
+contrib_DATA = README trytime.c
Modified: trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/trytime.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/trytime.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/trytime.c Sat Jul 13 19:22:48 2002
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include "getopt.h"
-#include "parsetime.h"
+#include <rrd_tool.h>
#ifndef WANT_AT_STYLE_TIMESPEC
#define WANT_AT_STYLE_TIMESPEC
@@ -23,235 +23,82 @@
{0,0,0,0}};
int option_index = 0;
int opt;
-
+
time_t start_tmp, end_tmp, Now = time(NULL);
- char *ct;
-
-#ifdef WANT_AT_STYLE_TIMESPEC
- struct time_value start_tv, end_tv;
- char *parsetime_error = NULL;
- int start_tmp_is_ok = 0,
- end_tmp_is_ok = 0;
-#endif
-
- /* default values */
- end_tmp = time(NULL);
- start_tmp = -24*3600;
-#ifdef WANT_AT_STYLE_TIMESPEC
- end_tv.type = ABSOLUTE_TIME;
- end_tv.tm = *localtime(&end_tmp);
- end_tv.offset = 0;
-
- start_tv.type = RELATIVE_TO_END_TIME;
- start_tv.tm = *localtime(&end_tmp); /* to init tm_zone and tm_gmtoff */
- start_tv.offset = -24*3600;/* to be compatible with the original code. */
- start_tv.tm.tm_sec = 0; /** alternatively we could set tm_mday to -1 */
- start_tv.tm.tm_min = 0; /** but this would yield -23(25) hours offset */
- start_tv.tm.tm_hour = 0; /** twice a year, when DST is coming in or */
- start_tv.tm.tm_mday = 0; /** out of effect */
- start_tv.tm.tm_mon = 0;
- start_tv.tm.tm_year = 0;
- start_tv.tm.tm_wday = 0;
- start_tv.tm.tm_yday = 0;
- start_tv.tm.tm_isdst = -1; /* for mktime to guess */
-#endif
- *soption = '\0';
- *eoption = '\0';
+ char tim_b[200];
+
+ struct time_value start_tv, end_tv;
+ char *parsetime_error = NULL;
+
+ /* default values */
+ parsetime("end-24h", &start_tv);
+ parsetime("now", &end_tv);
if( ac < 2 )
{
- printf( "usage: %s time-specification-to-try\n"
- "or %s [--start|-s start] [--end|-e end]\n"
+ printf( "usage: %s [--start|-s start] [--end|-e end]\n"
"\n"
"In plain English, this means that to time specification try\n"
"a single time specification (just like in the rrdtool create)\n"
"you can use the first form, while to try two of them at once\n"
"(just like in rrdtool graph or fetch) you need the seconf form\n",
- av[0], av[0] );
+ av[0] );
exit(0);
}
-
+
printf( "The time now is: %s\n", ctime(&Now) );
-
- if( av[1][0] != '-' )
- {
- if( ac > 2 )
- {
- printf( "Warning: you specified several arguments,\n"
- " of those I will use only one: '%s'\n"
- "(hint: perhaps, you should put quotes around your timespec?)\n",
- av[1] );
- }
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- start_tmp_is_ok = 0;
- start_tmp = strtol(av[1], &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (start_tmp > 31122038 || /* 31 Dec 2038 in DDMMYYYY */
- start_tmp < 0) {
- start_tmp_is_ok = 1;
- goto CheckRelative;
- }
- if ((parsetime_error = parsetime(av[1], &start_tv))) {
- fprintf( stderr, "ERROR: %s\n", parsetime_error );
- return(-1);
- }
- if (start_tv.type == RELATIVE_TO_END_TIME ||
- start_tv.type == RELATIVE_TO_START_TIME) {
- fprintf( stderr, "ERROR: specifying time relative to the 'start' "
- "or 'end' makes no sense here\n");
- return(-1);
- }
- if (!start_tmp_is_ok)
- start_tmp = mktime(&start_tv.tm) + start_tv.offset;
- }/* this is for the entire block */
-
-#else
- start_tmp = atol(av[1]);
-#endif
-CheckRelative:
- if (start_tmp < 0) /* if time is negative this means go back from now. */
- start_tmp = time(NULL)+start_tmp;
-
- {
- ct = ctime(&start_tmp);
- ct[24] = '\0'; /* zap that nasty embedded'\n' */
- printf( "You specified the following: '%s',\n"
- "for me this means: %s (or %ld sec since epoch)\n\n",
- av[1], ct, start_tmp );
-
- }
- exit(0);
- }/* if( av[1][0]... */
-
- while(1)
- {
- opt = getopt_long(ac, av, "s:e:", long_options, &option_index);
-
- if (opt == EOF)
- break;
+
+ while(1){
+ opt = getopt_long(ac, av, "s:e:", long_options, &option_index);
- switch(opt)
- {
- case 's':
- strncpy( soption, optarg, BUF_LEN );
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- start_tmp_is_ok = 0;
- start_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (start_tmp > 31122038 || /* 31 Dec 2038 in DDMMYYYY */
- start_tmp < 0) {
- start_tmp_is_ok = 1;
- break;
- }
+ if (opt == EOF)
+ break;
+
+ switch(opt)
+ {
+ case 's':
+ strncpy( soption, optarg, BUF_LEN );
if ((parsetime_error = parsetime(optarg, &start_tv))) {
- fprintf( stderr, "ERROR: start time: %s\n", parsetime_error );
- return -1;
- }
+ fprintf( stderr, "ERROR: start time: %s\n", parsetime_error );
+ exit(1);
}
-#else
- start_tmp = atol(optarg);
-#endif
+
break;
- case 'e':
- strncpy( eoption, optarg, BUF_LEN );
-#ifdef WANT_AT_STYLE_TIMESPEC
- {
- char *endp;
- end_tmp_is_ok = 0;
- end_tmp = strtol(optarg, &endp, 0);
- if (*endp == '\0') /* it was a valid number */
- if (end_tmp > 31122038) { /* 31 Dec 2038 in DDMMYYYY */
- end_tmp_is_ok = 1;
- break;
- }
+ case 'e':
+ strncpy( eoption, optarg, BUF_LEN );
if ((parsetime_error = parsetime(optarg, &end_tv))) {
fprintf( stderr, "ERROR: end time: %s\n", parsetime_error );
- return -1;
- }
- }
-#else
- end_tmp = atol(optarg);
-#endif
+ exit(1);
+ }
break;
- }
- }
-
-#ifdef WANT_AT_STYLE_TIMESPEC
- if ((start_tv.type == RELATIVE_TO_END_TIME ||
- (start_tmp_is_ok && start_tmp < 0)) && /* same as the line above */
- end_tv.type == RELATIVE_TO_START_TIME) {
- fprintf( stderr, "the start and end times cannot be specified "
- "relative to each other\n");
- return(-1);
- }
-
- if (start_tv.type == RELATIVE_TO_START_TIME) {
- fprintf( stderr, "the start time cannot be specified relative to itself\n");
- return(-1);
- }
-
- if (end_tv.type == RELATIVE_TO_END_TIME) {
- fprintf( stderr, "the end time cannot be specified relative to itself\n");
- return(-1);
- }
-
- /* We don't care to keep all the values in their range,
- mktime will do this for us */
- if (start_tv.type == RELATIVE_TO_END_TIME) {
- if (end_tmp_is_ok)
- end_tv.tm = *localtime( &end_tmp );
- start_tv.tm.tm_sec += end_tv.tm.tm_sec;
- start_tv.tm.tm_min += end_tv.tm.tm_min;
- start_tv.tm.tm_hour += end_tv.tm.tm_hour;
- start_tv.tm.tm_mday += end_tv.tm.tm_mday;
- start_tv.tm.tm_mon += end_tv.tm.tm_mon;
- start_tv.tm.tm_year += end_tv.tm.tm_year;
- }
- if (end_tv.type == RELATIVE_TO_START_TIME) {
- if (start_tmp_is_ok)
- start_tv.tm = *localtime( &start_tmp );
- end_tv.tm.tm_sec += start_tv.tm.tm_sec;
- end_tv.tm.tm_min += start_tv.tm.tm_min;
- end_tv.tm.tm_hour += start_tv.tm.tm_hour;
- end_tv.tm.tm_mday += start_tv.tm.tm_mday;
- end_tv.tm.tm_mon += start_tv.tm.tm_mon;
- end_tv.tm.tm_year += start_tv.tm.tm_year;
- }
- if (!start_tmp_is_ok)
- start_tmp = mktime(&start_tv.tm) + start_tv.offset;
- if (!end_tmp_is_ok)
- end_tmp = mktime(&end_tv.tm) + end_tv.offset;
-#endif
-
- if (start_tmp < 0)
- start_tmp = end_tmp + start_tmp;
-
- ct = ctime(&start_tmp);
- ct[24] = '\0'; /* zap that nasty embedded'\n' */
- if( *soption )
+ }
+ }
+
+ if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
+ printf("ERROR: %s\n",rrd_get_error());
+ rrd_clear_error();
+ exit(1);
+ }
+
+ strftime(tim_b,100,"%c %Z",localtime(&start_tmp));
+ if( *soption )
printf( "Start time was specified as: '%s',\n"
"for me this means: %s (or %ld sec since epoch)\n\n",
- soption, ct, start_tmp );
+ soption, tim_b, start_tmp );
else
- printf( "Start time was not specified, default value will be used (-86400)\n"
+ printf( "Start time was not specified, default value will be used (end-24h)\n"
"for me this means: %s (or %ld sec since epoch)\n\n",
- ct, start_tmp );
+ tim_b, start_tmp );
- ct = ctime(&end_tmp);
- ct[24] = '\0';
- if( *eoption )
+ strftime(tim_b,100,"%c %Z",localtime(&end_tmp));
+ if( *eoption )
printf( "End time was specified as: '%s',\n"
"for me this means: %s (or %ld sec since epoch)\n",
- eoption, ct, end_tmp );
- else
+ eoption, tim_b, end_tmp );
+ else
printf( "End time was not specified, default value will be used (now)\n"
"for me this means: %s (or %ld sec since epoch)\n\n",
- ct, start_tmp );
-
+ tim_b, end_tmp );
exit(0);
}
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/contrib/trytime/Makefile
Modified: trunk/orca/packages/rrdtool-1.0.7.2/contrib/README
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/contrib/README (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/contrib/README Sat Jul 13 19:22:49 2002
@@ -2,6 +2,5 @@
each script should come with an apropriate README file ...
-
cheees
tobi
Added: trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsw Sat Jul 13 19:22:49 2002
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/RRDp.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/RRDp.pm (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/RRDp.pm Sat Jul 13 19:22:49 2002
@@ -110,7 +110,7 @@
sub end ();
sub read ();
-$VERSION = 0.99031 ;
+$VERSION = 1.000072 ;
sub start ($){
croak "rrdtool is already running"
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/MANIFEST
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/MANIFEST (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/MANIFEST Sat Jul 13 19:22:49 2002
@@ -3,4 +3,3 @@
Makefile.PL
RRDp.pm
t/base.t
-examples/piped-demo.pl
Added: trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-piped/rrdpl.dsp Sat Jul 13 19:22:50 2002
@@ -0,0 +1,115 @@
+# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=rrd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "rrdpl.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "rrdpl.mak" CFG="rrd - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "rrd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x100c /d "NDEBUG"
+# ADD RSC /l 0x100c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi3!
2.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+
+!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "C:\perl\lib\site\auto\RRD\"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /W3 /I "C:\perl\lib\CORE" /D "WIN32" /D VERSION=\"0.02\" /D XS_VERSION=\"0.02\" /D "_DEBUG" /D "_CONSOLE" /FR -I../src/ -I../gd1.2 RRD.c /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x100c /d "_DEBUG"
+# ADD RSC /l 0x100c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 c:\perl\lib\core\perl.lib ..\src\debug\rrd.lib ..\gd1.2\debug\gd.lib /dll /incremental:no /debug /machine:IX86 /out:"C:\perl\lib\site\auto\RRD\rrd.dll"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "rrd - Win32 Release"
+# Name "rrd - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\RRD.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\RRD.xs
+
+!IF "$(CFG)" == "rrd - Win32 Release"
+
+!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\RRD.xs
+
+"rrd.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ C:\Perl\bin\perl -Ic:\perl\lib -Ic:\perl\lib C:\perl\lib\ExtUtils/xsubpp\
+ -typemap C:\perl\lib\ExtUtils\typemap RRD.xs >RRD.tc && C:\Perl\bin\perl\
+ -Ic:\perl\lib -Ic:\perl\lib -MExtUtils::Command -e mv RRD.tc RRD.c
+
+#!
End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/acconfig.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/acconfig.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/acconfig.h Sat Jul 13 19:22:50 2002
@@ -0,0 +1,62 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+ at TOP@
+
+/* IEEE can be prevented from raising signals with fpsetmask(0) */
+#undef MUST_DISABLE_FPMASK
+
+/* IEEE math only works if SIGFPE gets actively set to IGNORE */
+
+#undef MUST_DISABLE_SIGFPE
+
+/* realloc does not support NULL as argument */
+#undef NO_NULL_REALLOC
+
+ at BOTTOM@
+
+/* define strrchr, strchr and memcpy, memmove in terms of bsd funcs
+ make sure you are NOT using bcopy, index or rindex in the code */
+
+#if STDC_HEADERS
+# include <string.h>
+#else
+# ifndef HAVE_STRCHR
+# define strchr index
+# define strrchr rindex
+# endif
+char *strchr (), *strrchr ();
+# ifndef HAVE_MEMMOVE
+# define memcpy(d, s, n) bcopy ((s), (d), (n))
+# define memmove(d, s, n) bcopy ((s), (d), (n))
+# endif
+#endif
+
+#if NO_NULL_REALLOC
+# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
+#else
+# define rrd_realloc(a,b) realloc((a), (b))
+#endif
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+#define HAVE_FINITE 1
+#define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+#define HAVE_ISINF 1
+#include <ieeefp.h>
+#define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#ifndef HAVE_FINITE
+#error "Can't compile without finite function"
+#endif
+
+#ifndef HAVE_ISINF
+#error "Can't compile without isinf function"
+#endif
+
+#endif /* CONFIG_H */
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/mkinstalldirs
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/mkinstalldirs (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/mkinstalldirs Sat Jul 13 19:22:50 2002
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
+errstatus=0
+
+for file
+do
+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+ shift
+
+ pathcomp=
+ for d
+ do
+ pathcomp="$pathcomp$d"
+ case "$pathcomp" in
+ -* ) pathcomp=./$pathcomp ;;
+ esac
+
+ if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ fi
+ fi
+
+ pathcomp="$pathcomp/"
+ done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
Modified: trunk/orca/packages/rrdtool-1.0.7.2/config/config.h.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/config.h.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/config.h.in Sat Jul 13 19:22:50 2002
@@ -1,20 +1,73 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config/config.h.in. Generated automatically from configure.in by autoheader. */
+#ifndef CONFIG_H
+#define CONFIG_H
+
+
+/* Define to empty if the keyword does not work. */
+#undef const
+
+/* Define if you don't have vprintf but do have _doprnt. */
+#undef HAVE_DOPRNT
/* Define if you have the strftime function. */
#undef HAVE_STRFTIME
+/* Define if you have the vprintf function. */
+#undef HAVE_VPRINTF
+
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
/* Define if your <sys/time.h> declares struct tm. */
#undef TM_IN_SYS_TIME
+/* IEEE can be prevented from raising signals with fpsetmask(0) */
+#undef MUST_DISABLE_FPMASK
+
+#undef MUST_DISABLE_SIGFPE
+
+/* realloc does not support NULL as argument */
+#undef NO_NULL_REALLOC
+
+/* Define if you have the finite function. */
+#undef HAVE_FINITE
+
+/* Define if you have the fpclass function. */
+#undef HAVE_FPCLASS
+
/* Define if you have the getrusage function. */
#undef HAVE_GETRUSAGE
+/* Define if you have the gettimeofday function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have the isinf function. */
+#undef HAVE_ISINF
+
+/* Define if you have the isnan function. */
+#undef HAVE_ISNAN
+
+/* Define if you have the memmove function. */
+#undef HAVE_MEMMOVE
+
/* Define if you have the mktime function. */
#undef HAVE_MKTIME
+/* Define if you have the snprintf function. */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the strchr function. */
+#undef HAVE_STRCHR
+
+/* Define if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
/* Define if you have the <math.h> header file. */
#undef HAVE_MATH_H
@@ -32,3 +85,56 @@
/* Define if you have the m library (-lm). */
#undef HAVE_LIBM
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+
+/* define strrchr, strchr and memcpy, memmove in terms of bsd funcs
+ make sure you are NOT using bcopy, index or rindex in the code */
+
+#if STDC_HEADERS
+# include <string.h>
+#else
+# ifndef HAVE_STRCHR
+# define strchr index
+# define strrchr rindex
+# endif
+char *strchr (), *strrchr ();
+# ifndef HAVE_MEMMOVE
+# define memcpy(d, s, n) bcopy ((s), (d), (n))
+# define memmove(d, s, n) bcopy ((s), (d), (n))
+# endif
+#endif
+
+#if NO_NULL_REALLOC
+# define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))
+#else
+# define rrd_realloc(a,b) realloc((a), (b))
+#endif
+
+#if (! defined(HAVE_FINITE) && defined(HAVE_ISNAN) && defined(HAVE_ISINF))
+#define HAVE_FINITE 1
+#define finite(a) (! isnan(a) && ! isinf(a))
+#endif
+
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+#define HAVE_ISINF 1
+#include <ieeefp.h>
+#define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+
+#ifndef HAVE_FINITE
+#error "Can't compile without finite function"
+#endif
+
+#ifndef HAVE_ISINF
+#error "Can't compile without isinf function"
+#endif
+
+#endif /* CONFIG_H */
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.in Sat Jul 13 19:22:50 2002
@@ -0,0 +1,230 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+
+#where we keep local rules for automake
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+
+# make sure autoheader finds aclocal
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+#additional files to distribute
+EXTRA_DIST = aclocal.m4 libtool/libtool.m4 config.guess config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in acconfig.h \
+acinclude.m4 config.guess config.h.in config.sub install-sh ltconfig \
+ltmain.sh missing mkinstalldirs
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps config/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+config.h: stamp-h
+ @if test ! -f $@; then \
+ rm -f stamp-h; \
+ $(MAKE) stamp-h; \
+ else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES= CONFIG_HEADERS=config/config.h \
+ $(SHELL) ./config.status
+ @echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+ @if test ! -f $@; then \
+ rm -f $(srcdir)/stamp-h.in; \
+ $(MAKE) $(srcdir)/stamp-h.in; \
+ else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+ -rm -f config.h
+
+maintainer-clean-hdr:
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = config
+
+distdir: $(DISTFILES)
+ $(mkinstalldirs) $(distdir)/libtool
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+all-recursive-am: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile config.h
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-hdr mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-hdr clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-hdr distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+tags distdir info-am info dvi-am dvi check check-am installcheck-am \
+installcheck all-recursive-am install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/libtool/libtool.m4
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/libtool/libtool.m4 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/libtool/libtool.m4 Sat Jul 13 19:22:51 2002
@@ -0,0 +1,427 @@
+## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+## Copyright (C) 1996-1999 Free Software Foundation, Inc.
+## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool. ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags="--cache-file=$cache_file"
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+ [ --disable-libtool-lock avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$host" in
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+])
+esac
+])
+
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
+
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+changequote(,)dnl
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ ac_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_SUBST(LD)
+AC_PROG_LD_GNU
+])
+
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ ac_cv_prog_gnu_ld=yes
+else
+ ac_cv_prog_gnu_ld=no
+fi])
+])
+
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
+[AC_MSG_CHECKING([for BSD-compatible nm])
+AC_CACHE_VAL(ac_cv_path_NM,
+[if test -n "$NM"; then
+ # Let the user override the test.
+ ac_cv_path_NM="$NM"
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -B"
+ break
+ elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -p"
+ break
+ else
+ ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+AC_SUBST(NM)
+])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$host" in
+*-*-beos* | *-*-cygwin*)
+ # These system don't have libm
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, main, LIBM="-lm")
+ ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case "$enable_ltdl_convenience" in
+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_CHECK_LIB(ltdl, main,
+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+ [if test x"$enable_ltdl_install" = xno; then
+ AC_MSG_WARN([libltdl not installed, but installation disabled])
+ else
+ enable_ltdl_install=yes
+ fi
+ ])
+ if test x"$enable_ltdl_install" = x"yes"; then
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ INCLTDL=
+ fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/ltconfig
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/ltconfig (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/ltconfig Sat Jul 13 19:22:51 2002
@@ -0,0 +1,3017 @@
+#! /bin/sh
+
+# ltconfig - Create a system-specific libtool.
+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A lot of this script is taken from autoconf-2.10.
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+echo=echo
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+ # Yippee, $echo works!
+ :
+else
+ # Restart under the correct shell.
+ exec "$SHELL" "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit 0
+fi
+
+# Find the correct PATH separator. Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != "Xset"; then
+ UNAME=${UNAME-`uname 2>/dev/null`}
+ case X$UNAME in
+ *-DOS) PATH_SEPARATOR=';' ;;
+ *) PATH_SEPARATOR=':' ;;
+ esac
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+if test "X${echo_test_string+set}" != "Xset"; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+ echo_test_string="`eval $cmd`" &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
+ break
+ fi
+ done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
+ test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ for dir in $PATH /usr/ucb; do
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+ echo="$dir/echo"
+ break
+ fi
+ done
+ IFS="$save_ifs"
+
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+ test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ echo='print -r'
+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running ltconfig again with it.
+ ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+ else
+ # Try using printf.
+ echo='printf "%s\n"'
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
+ test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+ CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ echo="$CONFIG_SHELL $0 --fallback-echo"
+ elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
+ test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+ echo="$CONFIG_SHELL $0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ echo=echo
+ fi
+ fi
+ fi
+ fi
+fi
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# The name of this program.
+progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
+
+# Constants:
+PROGRAM=ltconfig
+PACKAGE=libtool
+VERSION=1.3.3
+TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
+rm="rm -f"
+
+help="Try \`$progname --help' for more information."
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+enable_shared=yes
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+enable_static=yes
+enable_fast_install=yes
+enable_dlopen=unknown
+enable_win32_dll=no
+ltmain=
+silent=
+srcdir=
+ac_config_guess=
+ac_config_sub=
+host=
+nonopt=
+ofile="$default_ofile"
+verify_host=yes
+with_gcc=no
+with_gnu_ld=no
+need_locks=yes
+ac_ext=c
+objext=o
+libext=a
+exeext=
+cache_file=
+
+old_AR="$AR"
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+old_CPPFLAGS="$CPPFLAGS"
+old_LDFLAGS="$LDFLAGS"
+old_LD="$LD"
+old_LN_S="$LN_S"
+old_LIBS="$LIBS"
+old_NM="$NM"
+old_RANLIB="$RANLIB"
+old_DLLTOOL="$DLLTOOL"
+old_OBJDUMP="$OBJDUMP"
+old_AS="$AS"
+
+# Parse the command line options.
+args=
+prev=
+for option
+do
+ case "$option" in
+ -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ eval "$prev=\$option"
+ prev=
+ continue
+ fi
+
+ case "$option" in
+ --help) cat <<EOM
+Usage: $progname [OPTION]... [HOST [LTMAIN]]
+
+Generate a system-specific libtool script.
+
+ --debug enable verbose shell tracing
+ --disable-shared do not build shared libraries
+ --disable-static do not build static libraries
+ --disable-fast-install do not optimize for fast installation
+ --enable-dlopen enable dlopen support
+ --enable-win32-dll enable building dlls on win32 hosts
+ --help display this help and exit
+ --no-verify do not verify that HOST is a valid host type
+-o, --output=FILE specify the output file [default=$default_ofile]
+ --quiet same as \`--silent'
+ --silent do not print informational messages
+ --srcdir=DIR find \`config.guess' in DIR
+ --version output version information and exit
+ --with-gcc assume that the GNU C compiler will be used
+ --with-gnu-ld assume that the C compiler uses the GNU linker
+ --disable-lock disable file locking
+ --cache-file=FILE configure cache file
+
+LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
+that provides basic libtool functionality.
+
+HOST is the canonical host system name [default=guessed].
+EOM
+ exit 0
+ ;;
+
+ --debug)
+ echo "$progname: enabling shell trace mode"
+ set -x
+ ;;
+
+ --disable-shared) enable_shared=no ;;
+
+ --disable-static) enable_static=no ;;
+
+ --disable-fast-install) enable_fast_install=no ;;
+
+ --enable-dlopen) enable_dlopen=yes ;;
+
+ --enable-win32-dll) enable_win32_dll=yes ;;
+
+ --quiet | --silent) silent=yes ;;
+
+ --srcdir) prev=srcdir ;;
+ --srcdir=*) srcdir="$optarg" ;;
+
+ --no-verify) verify_host=no ;;
+
+ --output | -o) prev=ofile ;;
+ --output=*) ofile="$optarg" ;;
+
+ --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
+
+ --with-gcc) with_gcc=yes ;;
+ --with-gnu-ld) with_gnu_ld=yes ;;
+
+ --disable-lock) need_locks=no ;;
+
+ --cache-file=*) cache_file="$optarg" ;;
+
+ -*)
+ echo "$progname: unrecognized option \`$option'" 1>&2
+ echo "$help" 1>&2
+ exit 1
+ ;;
+
+ *)
+ if test -z "$ltmain"; then
+ ltmain="$option"
+ elif test -z "$host"; then
+# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
+# if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
+# echo "$progname: warning \`$option' is not a valid host type" 1>&2
+# fi
+ host="$option"
+ else
+ echo "$progname: too many arguments" 1>&2
+ echo "$help" 1>&2
+ exit 1
+ fi ;;
+ esac
+done
+
+if test -z "$ltmain"; then
+ echo "$progname: you must specify a LTMAIN file" 1>&2
+ echo "$help" 1>&2
+ exit 1
+fi
+
+if test ! -f "$ltmain"; then
+ echo "$progname: \`$ltmain' does not exist" 1>&2
+ echo "$help" 1>&2
+ exit 1
+fi
+
+# Quote any args containing shell metacharacters.
+ltconfig_args=
+for arg
+do
+ case "$arg" in
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+ ltconfig_args="$ltconfig_args '$arg'" ;;
+ *) ltconfig_args="$ltconfig_args $arg" ;;
+ esac
+done
+
+# A relevant subset of AC_INIT.
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 5 compiler messages saved in config.log
+# 6 checking for... messages and results
+if test "$silent" = yes; then
+ exec 6>/dev/null
+else
+ exec 6>&1
+fi
+exec 5>>./config.log
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+
+if test -n "$cache_file" && test -r "$cache_file"; then
+ echo "loading cache $cache_file within ltconfig"
+ . $cache_file
+fi
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+ # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
+ if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+ ac_n= ac_c='
+' ac_t=' '
+ else
+ ac_n=-n ac_c= ac_t=
+ fi
+else
+ ac_n= ac_c='\c' ac_t=
+fi
+
+if test -z "$srcdir"; then
+ # Assume the source directory is the same one as the path to LTMAIN.
+ srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
+ test "$srcdir" = "$ltmain" && srcdir=.
+fi
+
+trap "$rm conftest*; exit 1" 1 2 15
+if test "$verify_host" = yes; then
+ # Check for config.guess and config.sub.
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/config.guess; then
+ ac_aux_dir=$ac_dir
+ break
+ fi
+ done
+ if test -z "$ac_aux_dir"; then
+ echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
+ echo "$help" 1>&2
+ exit 1
+ fi
+ ac_config_guess=$ac_aux_dir/config.guess
+ ac_config_sub=$ac_aux_dir/config.sub
+
+ # Make sure we can run config.sub.
+ if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else
+ echo "$progname: cannot run $ac_config_sub" 1>&2
+ echo "$help" 1>&2
+ exit 1
+ fi
+
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+
+ host_alias=$host
+ case "$host_alias" in
+ "")
+ if host_alias=`$SHELL $ac_config_guess`; then :
+ else
+ echo "$progname: cannot guess host type; you must specify one" 1>&2
+ echo "$help" 1>&2
+ exit 1
+ fi ;;
+ esac
+ host=`$SHELL $ac_config_sub $host_alias`
+ echo "$ac_t$host" 1>&6
+
+ # Make sure the host verified.
+ test -z "$host" && exit 1
+
+elif test -z "$host"; then
+ echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
+ echo "$help" 1>&2
+ exit 1
+else
+ host_alias=$host
+fi
+
+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+case "$host_os" in
+linux-gnu*) ;;
+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+case "$host_os" in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "${COLLECT_NAMES+set}" != set; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR cru $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+# Set a sane default for `AR'.
+test -z "$AR" && AR=ar
+
+# Set a sane default for `OBJDUMP'.
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+# If RANLIB is not set, then run the test.
+if test "${RANLIB+set}" != "set"; then
+ result=no
+
+ echo $ac_n "checking for ranlib... $ac_c" 1>&6
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ for dir in $PATH; do
+ test -z "$dir" && dir=.
+ if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
+ RANLIB="ranlib"
+ result="ranlib"
+ break
+ fi
+ done
+ IFS="$save_ifs"
+
+ echo "$ac_t$result" 1>&6
+fi
+
+if test -n "$RANLIB"; then
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+fi
+
+# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$AS" && AS=as
+
+# Check to see if we are using GCC.
+if test "$with_gcc" != yes || test -z "$CC"; then
+ # If CC is not set, then try to find GCC or a usable CC.
+ if test -z "$CC"; then
+ echo $ac_n "checking for gcc... $ac_c" 1>&6
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ for dir in $PATH; do
+ test -z "$dir" && dir=.
+ if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
+ CC="gcc"
+ break
+ fi
+ done
+ IFS="$save_ifs"
+
+ if test -n "$CC"; then
+ echo "$ac_t$CC" 1>&6
+ else
+ echo "$ac_t"no 1>&6
+ fi
+ fi
+
+ # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
+ if test -z "$CC"; then
+ echo $ac_n "checking for cc... $ac_c" 1>&6
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ cc_rejected=no
+ for dir in $PATH; do
+ test -z "$dir" && dir=.
+ if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
+ if test "$dir/cc" = "/usr/ucb/cc"; then
+ cc_rejected=yes
+ continue
+ fi
+ CC="cc"
+ break
+ fi
+ done
+ IFS="$save_ifs"
+ if test $cc_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same name, so the bogon will be chosen
+ # first if we set CC to just the name; use the full file name.
+ shift
+ set dummy "$dir/cc" "$@"
+ shift
+ CC="$@"
+ fi
+ fi
+
+ if test -n "$CC"; then
+ echo "$ac_t$CC" 1>&6
+ else
+ echo "$ac_t"no 1>&6
+ fi
+
+ if test -z "$CC"; then
+ echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
+ exit 1
+ fi
+ fi
+
+ # Now see if the compiler is really GCC.
+ with_gcc=no
+ echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
+ echo "$progname:581: checking whether we are using GNU C" >&5
+
+ $rm conftest.c
+ cat > conftest.c <<EOF
+#ifdef __GNUC__
+ yes;
+#endif
+EOF
+ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ with_gcc=yes
+ fi
+ $rm conftest.c
+ echo "$ac_t$with_gcc" 1>&6
+fi
+
+# Allow CC to be a program name with arguments.
+set dummy $CC
+compiler="$2"
+
+echo $ac_n "checking for object suffix... $ac_c" 1>&6
+$rm conftest*
+echo 'int i = 1;' > conftest.c
+echo "$progname:603: checking for object suffix" >& 5
+if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
+ # Append any warnings to the config.log.
+ cat conftest.err 1>&5
+
+ for ac_file in conftest.*; do
+ case $ac_file in
+ *.c) ;;
+ *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
+ esac
+ done
+else
+ cat conftest.err 1>&5
+ echo "$progname: failed program was:" >&5
+ cat conftest.c >&5
+fi
+$rm conftest*
+echo "$ac_t$objext" 1>&6
+
+echo $ac_n "checking for executable suffix... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_cv_exeext="no"
+ $rm conftest*
+ echo 'main () { return 0; }' > conftest.c
+ echo "$progname:629: checking for executable suffix" >& 5
+ if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
+ # Append any warnings to the config.log.
+ cat conftest.err 1>&5
+
+ for ac_file in conftest.*; do
+ case $ac_file in
+ *.c | *.err | *.$objext ) ;;
+ *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
+ esac
+ done
+ else
+ cat conftest.err 1>&5
+ echo "$progname: failed program was:" >&5
+ cat conftest.c >&5
+ fi
+ $rm conftest*
+fi
+if test "X$ac_cv_exeext" = Xno; then
+ exeext=""
+else
+ exeext="$ac_cv_exeext"
+fi
+echo "$ac_t$ac_cv_exeext" 1>&6
+
+echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
+pic_flag=
+special_shlib_compile_flags=
+wl=
+link_static_flag=
+no_builtin_flag=
+
+if test "$with_gcc" = yes; then
+ wl='-Wl,'
+ link_static_flag='-static'
+
+ case "$host_os" in
+ beos* | irix5* | irix6* | osf3* | osf4*)
+ # PIC is the default for these OSes.
+ ;;
+ aix*)
+ # Below there is a dirty hack to force normal static linking with -ldl
+ # The problem is because libdl dynamically linked with both libc and
+ # libC (AIX C++ library), which obviously doesn't included in libraries
+ # list by gcc. This cause undefined symbols with -static flags.
+ # This hack allows C programs to be linked with "-static -ldl", but
+ # we not sure about C++ programs.
+ link_static_flag="$link_static_flag ${wl}-lC"
+ ;;
+ cygwin* | mingw* | os2*)
+ # We can build DLLs from non-PIC.
+ ;;
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ pic_flag='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ pic_flag=-Kconform_pic
+ fi
+ ;;
+ *)
+ pic_flag='-fPIC'
+ ;;
+ esac
+else
+ # PORTME Check for PIC flags for the system compiler.
+ case "$host_os" in
+ aix3* | aix4*)
+ # All AIX code is PIC.
+ link_static_flag='-bnso -bI:/lib/syscalls.exp'
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ # Is there a better link_static_flag that works with the bundled CC?
+ wl='-Wl,'
+ link_static_flag="${wl}-a ${wl}archive"
+ pic_flag='+Z'
+ ;;
+
+ irix5* | irix6*)
+ wl='-Wl,'
+ link_static_flag='-non_shared'
+ # PIC (with -KPIC) is the default.
+ ;;
+
+ cygwin* | mingw* | os2*)
+ # We can build DLLs from non-PIC.
+ ;;
+
+ osf3* | osf4*)
+ # All OSF/1 code is PIC.
+ wl='-Wl,'
+ link_static_flag='-non_shared'
+ ;;
+
+ sco3.2v5*)
+ pic_flag='-Kpic'
+ link_static_flag='-dn'
+ special_shlib_compile_flags='-belf'
+ ;;
+
+ solaris*)
+ pic_flag='-KPIC'
+ link_static_flag='-Bstatic'
+ wl='-Wl,'
+ ;;
+
+ sunos4*)
+ pic_flag='-PIC'
+ link_static_flag='-Bstatic'
+ wl='-Qoption ld '
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ pic_flag='-KPIC'
+ link_static_flag='-Bstatic'
+ wl='-Wl,'
+ ;;
+
+ uts4*)
+ pic_flag='-pic'
+ link_static_flag='-Bstatic'
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ pic_flag='-Kconform_pic'
+ link_static_flag='-Bstatic'
+ fi
+ ;;
+ *)
+ can_build_shared=no
+ ;;
+ esac
+fi
+
+if test -n "$pic_flag"; then
+ echo "$ac_t$pic_flag" 1>&6
+
+ # Check to make sure the pic_flag actually works.
+ echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
+ $rm conftest*
+ echo "int some_variable = 0;" > conftest.c
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $pic_flag -DPIC"
+ echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
+ if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+ # Append any warnings to the config.log.
+ cat conftest.err 1>&5
+
+ case "$host_os" in
+ hpux9* | hpux10* | hpux11*)
+ # On HP-UX, both CC and GCC only warn that PIC is supported... then they
+ # create non-PIC objects. So, if there were any warnings, we assume that
+ # PIC is not supported.
+ if test -s conftest.err; then
+ echo "$ac_t"no 1>&6
+ can_build_shared=no
+ pic_flag=
+ else
+ echo "$ac_t"yes 1>&6
+ pic_flag=" $pic_flag"
+ fi
+ ;;
+ *)
+ echo "$ac_t"yes 1>&6
+ pic_flag=" $pic_flag"
+ ;;
+ esac
+ else
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ can_build_shared=no
+ pic_flag=
+ echo "$ac_t"no 1>&6
+ fi
+ CFLAGS="$save_CFLAGS"
+ $rm conftest*
+else
+ echo "$ac_t"none 1>&6
+fi
+
+# Check to see if options -o and -c are simultaneously supported by compiler
+echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
+$rm -r conftest 2>/dev/null
+mkdir conftest
+cd conftest
+$rm conftest*
+echo "int some_variable = 0;" > conftest.c
+mkdir out
+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+# that will create temporary files in the current directory regardless of
+# the output directory. Thus, making CWD read-only will cause this test
+# to fail, enabling locking or at least warning the user not to do parallel
+# builds.
+chmod -w .
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -o out/conftest2.o"
+echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
+if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
+
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s out/conftest.err; then
+ echo "$ac_t"no 1>&6
+ compiler_c_o=no
+ else
+ echo "$ac_t"yes 1>&6
+ compiler_c_o=yes
+ fi
+else
+ # Append any errors to the config.log.
+ cat out/conftest.err 1>&5
+ compiler_c_o=no
+ echo "$ac_t"no 1>&6
+fi
+CFLAGS="$save_CFLAGS"
+chmod u+w .
+$rm conftest* out/*
+rmdir out
+cd ..
+rmdir conftest
+$rm -r conftest 2>/dev/null
+
+if test x"$compiler_c_o" = x"yes"; then
+ # Check to see if we can write to a .lo
+ echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
+ $rm conftest*
+ echo "int some_variable = 0;" > conftest.c
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -c -o conftest.lo"
+ echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
+if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
+
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ echo "$ac_t"no 1>&6
+ compiler_o_lo=no
+ else
+ echo "$ac_t"yes 1>&6
+ compiler_o_lo=yes
+ fi
+ else
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ compiler_o_lo=no
+ echo "$ac_t"no 1>&6
+ fi
+ CFLAGS="$save_CFLAGS"
+ $rm conftest*
+else
+ compiler_o_lo=no
+fi
+
+# Check to see if we can do hard links to lock some files if needed
+hard_links="nottested"
+if test "$compiler_c_o" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ echo "$ac_t$hard_links" 1>&6
+ $rm conftest*
+ if test "$hard_links" = no; then
+ echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+
+if test "$with_gcc" = yes; then
+ # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+ echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
+ $rm conftest*
+ echo "int some_variable = 0;" > conftest.c
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
+ echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
+
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ echo "$ac_t"no 1>&6
+ compiler_rtti_exceptions=no
+ else
+ echo "$ac_t"yes 1>&6
+ compiler_rtti_exceptions=yes
+ fi
+ else
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ compiler_rtti_exceptions=no
+ echo "$ac_t"no 1>&6
+ fi
+ CFLAGS="$save_CFLAGS"
+ $rm conftest*
+
+ if test "$compiler_rtti_exceptions" = "yes"; then
+ no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+ else
+ no_builtin_flag=' -fno-builtin'
+ fi
+
+fi
+
+# Check for any special shared library compilation flags.
+if test -n "$special_shlib_compile_flags"; then
+ echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
+ if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$special_shlib_compile_flags[ ]" >/dev/null; then :
+ else
+ echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
+ can_build_shared=no
+ fi
+fi
+
+echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
+$rm conftest*
+echo 'main(){return(0);}' > conftest.c
+save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS $link_static_flag"
+echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
+if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ echo "$ac_t$link_static_flag" 1>&6
+else
+ echo "$ac_t"none 1>&6
+ link_static_flag=
+fi
+LDFLAGS="$save_LDFLAGS"
+$rm conftest*
+
+if test -z "$LN_S"; then
+ # Check to see if we can use ln -s, or we need hard links.
+ echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
+ $rm conftest.dat
+ if ln -s X conftest.dat 2>/dev/null; then
+ $rm conftest.dat
+ LN_S="ln -s"
+ else
+ LN_S=ln
+ fi
+ if test "$LN_S" = "ln -s"; then
+ echo "$ac_t"yes 1>&6
+ else
+ echo "$ac_t"no 1>&6
+ fi
+fi
+
+# Make sure LD is an absolute path.
+if test -z "$LD"; then
+ ac_prog=ld
+ if test "$with_gcc" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
+ echo "$progname:991: checking for ld used by GCC" >&5
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we are not using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+ elif test "$with_gnu_ld" = yes; then
+ echo $ac_n "checking for GNU ld... $ac_c" 1>&6
+ echo "$progname:1015: checking for GNU ld" >&5
+ else
+ echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+ echo "$progname:1018: checking for non-GNU ld" >&5
+ fi
+
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ fi
+
+ if test -n "$LD"; then
+ echo "$ac_t$LD" 1>&6
+ else
+ echo "$ac_t"no 1>&6
+ fi
+
+ if test -z "$LD"; then
+ echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
+ exit 1
+ fi
+fi
+
+# Check to see if it really is or is not GNU ld.
+echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+echo "$ac_t$with_gnu_ld" 1>&6
+
+# See if the linker supports building shared libraries.
+echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
+
+allow_undefined_flag=
+no_undefined_flag=
+need_lib_prefix=unknown
+need_version=unknown
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+archive_cmds=
+archive_expsym_cmds=
+old_archive_from_new_cmds=
+export_dynamic_flag_spec=
+whole_archive_flag_spec=
+thread_safe_flag_spec=
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+hardcode_shlibpath_var=unsupported
+runpath_var=
+always_export_symbols=no
+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+# include_expsyms should be a list of space-separated symbols to be *always*
+# included in the symbol list
+include_expsyms=
+# exclude_expsyms can be an egrep regular expression of symbols to exclude
+# it will be wrapped by ` (' and `)$', so one must not match beginning or
+# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+# as well as any symbol that contains `d'.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+# platforms (ab)use it in PIC code, but their linkers get confused if
+# the symbol is explicitly referenced. Since portable code cannot
+# rely on this symbol name, it's probably fine to never include it in
+# preloaded symbol tables.
+
+case "$host_os" in
+cygwin* | mingw*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$with_gcc" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+ # See if GNU ld supports shared libraries.
+ case "$host_os" in
+ aix3* | aix4*)
+ # On AIX, the GNU linker is very broken
+ ld_shlibs=no
+ cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+ ;;
+
+ amigaos*)
+ archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+
+ # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we can use
+ # them.
+ ld_shlibs=no
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ cygwin* | mingw*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+
+ # Extract the symbol export list from an `--export-all' def file,
+ # then regenerate the def file from the symbol export list, so that
+ # the compiled dll only exports the symbol export list.
+ export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
+ test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
+ $DLLTOOL --export-all --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --output-def $objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~
+ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
+
+ archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
+ _lt_hint=1;
+ for symbol in `cat $export_symbols`; do
+ echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
+ _lt_hint=`expr 1 + \$_lt_hint`;
+ done~
+ test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
+ test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
+ $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
+ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+ $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
+ $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+ $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
+
+ old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
+ ;;
+
+ netbsd*)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+ # can we support soname and/or expsyms with a.out? -oliva
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+ elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ wlarc=
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+
+ if test "$ld_shlibs" = yes; then
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec='${wl}--export-dynamic'
+ case $host_os in
+ cygwin* | mingw*)
+ # dlltool doesn't understand --whole-archive et. al.
+ whole_archive_flag_spec=
+ ;;
+ *)
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ ;;
+ esac
+ fi
+else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case "$host_os" in
+ aix3*)
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$with_gcc" = yes && test -z "$link_static_flag"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+
+ aix4*)
+ hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
+ hardcode_libdir_separator=':'
+ if test "$with_gcc" = yes; then
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ hardcode_direct=yes
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ shared_flag='-shared'
+ else
+ shared_flag='${wl}-bM:SRE'
+ hardcode_direct=yes
+ fi
+ allow_undefined_flag=' ${wl}-berok'
+ archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
+ archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
+ case "$host_os" in aix4.[01]|aix4.[01].*)
+ # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
+ always_export_symbols=yes ;;
+ esac
+ ;;
+
+ amigaos*)
+ archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # see comment about different semantics on the GNU ld section
+ ld_shlibs=no
+ ;;
+
+ cygwin* | mingw*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib /OUT:$oldlib$oldobjs'
+ fix_srcfile_path='`cygpath -w $srcfile`'
+ ;;
+
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ case "$host_os" in
+ hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
+ *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
+ esac
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_minus_L=yes # Not in the search PATH, but as the default
+ # location of the library.
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
+
+ irix5* | irix6*)
+ if test "$with_gcc" = yes; then
+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ else
+ archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ fi
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out
+ else
+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts' # ELF
+ fi
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ openbsd*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
+ ;;
+
+ osf3* | osf4*)
+ if test "$with_gcc" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ fi
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ sco3.2v5*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ hardcode_shlibpath_var=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ ;;
+
+ solaris*)
+ no_undefined_flag=' -z text'
+ # $CC -shared without GNU ld will not create a library from C++
+ # object files and a static libstdc++, better avoid it by now
+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+ case "$host_os" in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ esac
+ ;;
+
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ runpath_var='LD_RUN_PATH'
+ hardcode_shlibpath_var=no
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+
+ sysv4.3*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ hardcode_shlibpath_var=no
+ export_dynamic_flag_spec='-Bexport'
+ ;;
+
+ uts4*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ dgux*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ # archive_cmds='$LD -G -z text -h $soname -o $lib$libobjs$deplibs'
+ archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
+ hardcode_shlibpath_var=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ ld_shlibs=yes
+ fi
+ ;;
+
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+fi
+echo "$ac_t$ld_shlibs" 1>&6
+test "$ld_shlibs" = no && can_build_shared=no
+
+if test -z "$NM"; then
+ echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
+ case "$NM" in
+ [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+ for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ NM="$ac_dir/nm -B"
+ break
+ elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ NM="$ac_dir/nm -p"
+ break
+ else
+ NM=${NM="$ac_dir/nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$NM" && NM=nm
+ ;;
+ esac
+ echo "$ac_t$NM" 1>&6
+fi
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+ symcode='[BCDT]'
+ ;;
+cygwin* | mingw*)
+ symcode='[ABCDGISTW]'
+ ;;
+hpux*) # Its linker distinguishes data from code symbols
+ global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+ ;;
+irix*)
+ symcode='[BCDEGRST]'
+ ;;
+solaris*)
+ symcode='[BDT]'
+ ;;
+sysv4)
+ symcode='[DFNSTU]'
+ ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+ symcode='[ABCDGISTW]'
+fi
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Write the raw and C identifiers.
+ global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode\)[ ][ ]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+ $rm conftest*
+ cat > conftest.c <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+ echo "$progname:1592: checking if global_symbol_pipe works" >&5
+ if { (eval echo $progname:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if { echo "$progname:1596: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+ else
+ rm -f "$nlist"T
+ fi
+
+ # Make sure that we snagged all the symbols we need.
+ if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+ if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+ # Now generate the symbol file.
+ eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
+
+ cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+ sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
+ cat <<\EOF >> conftest.c
+ {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+ # Now try linking the two files.
+ mv conftest.$objext conftstm.$objext
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="conftstm.$objext"
+ CFLAGS="$CFLAGS$no_builtin_flag"
+ if { (eval echo $progname:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ pipe_works=yes
+ else
+ echo "$progname: failed program was:" >&5
+ cat conftest.c >&5
+ fi
+ LIBS="$save_LIBS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&5
+ fi
+ else
+ echo "cannot find nm_test_var in $nlist" >&5
+ fi
+ else
+ echo "cannot run $global_symbol_pipe" >&5
+ fi
+ else
+ echo "$progname: failed program was:" >&5
+ cat conftest.c >&5
+ fi
+ $rm conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+ break
+ else
+ global_symbol_pipe=
+ fi
+done
+if test "$pipe_works" = yes; then
+ echo "${ac_t}ok" 1>&6
+else
+ echo "${ac_t}failed" 1>&6
+fi
+
+if test -z "$global_symbol_pipe"; then
+ global_symbol_to_cdecl=
+fi
+
+# Check hardcoding attributes.
+echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+ test -n "$runpath_var"; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$hardcode_shlibpath_var" != no &&
+ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+echo "$ac_t$hardcode_action" 1>&6
+
+
+reload_flag=
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
+# PORTME Some linkers may need a different reload flag.
+reload_flag='-r'
+echo "$ac_t$reload_flag" 1>&6
+test -n "$reload_flag" && reload_flag=" $reload_flag"
+
+# PORTME Fill in your ld.so characteristics
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+file_magic_cmd=
+file_magic_test_file=
+deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [regex]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given egrep regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
+case "$host_os" in
+aix3*)
+ version_type=linux
+ library_names_spec='${libname}${release}.so$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}.so$major'
+ ;;
+
+aix4*)
+ version_type=linux
+ # AIX has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ # We preserve .a as extension for shared libraries though AIX4.2
+ # and later linker supports .so
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
+ shlibpath_var=LIBPATH
+ deplibs_check_method=pass_all
+ ;;
+
+amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+ ;;
+
+beos*)
+ library_names_spec='${libname}.so'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ deplibs_check_method=pass_all
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+bsdi4*)
+ version_type=linux
+ library_names_spec='${libname}.so$major ${libname}.so'
+ soname_spec='${libname}.so'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=/shlib/libc.so
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw*)
+ version_type=windows
+ need_version=no
+ need_lib_prefix=no
+ if test "$with_gcc" = yes; then
+ library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
+ else
+ library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+ fi
+ dynamic_linker='Win32 ld.exe'
+ deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ file_magic_cmd='${OBJDUMP} -f'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+freebsd1*)
+ dynamic_linker=no
+ ;;
+
+freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ case "$version_type" in
+ freebsd-elf*)
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so*`
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ deplibs_check_method=unknown
+ library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+ need_version=yes
+ ;;
+ esac
+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ case "$host_os" in
+ freebsd2* | freebsd3.[01]*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ *) # from 3.2 on
+ shlibpath_overrides_runpath=no
+ ;;
+ esac
+ ;;
+
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ dynamic_linker="$host_os dld.sl"
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+ soname_spec='${libname}${release}.sl$major'
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+irix5* | irix6*)
+ version_type=irix
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}.so.$major'
+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
+ case "$host_os" in
+ irix5*)
+ libsuff= shlibsuff=
+ # this will be overridden with pass_all, but let us keep it just in case
+ deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+ ;;
+ *)
+ case "$LD" in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ # this will be overridden with pass_all, but let us keep it just in case
+ deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+ deplibs_check_method='pass_all'
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+ dynamic_linker=no
+ ;;
+
+# This must be Linux ELF.
+linux-gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+
+ if test -f /lib/ld.so.1; then
+ dynamic_linker='GNU ld.so'
+ else
+ # Only the GNU ld.so supports shared libraries on MkLinux.
+ case "$host_cpu" in
+ powerpc*) dynamic_linker=no ;;
+ *) dynamic_linker='Linux ld.so' ;;
+ esac
+ fi
+ ;;
+
+netbsd*)
+ version_type=sunos
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+ soname_spec='${libname}${release}.so$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+openbsd*)
+ version_type=sunos
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ need_version=no
+ fi
+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+os2*)
+ libname_spec='$name'
+ need_lib_prefix=no
+ library_names_spec='$libname.dll $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4*)
+ version_type=osf
+ need_version=no
+ soname_spec='${libname}${release}.so'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+ shlibpath_var=LD_LIBRARY_PATH
+ # this will be overridden with pass_all, but let us keep it just in case
+ deplibs_check_method='file_magic COFF format alpha shared library'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=/shlib/libc.so
+ deplibs_check_method='pass_all'
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+sco3.2v5*)
+ version_type=osf
+ soname_spec='${libname}${release}.so$major'
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=/lib/libc.so
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ version_type=linux
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case "$host_vendor" in
+ ncr)
+ deplibs_check_method='pass_all'
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ esac
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+ soname_spec='${libname}${release}.so$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+ soname_spec='$libname.so.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+echo "$ac_t$dynamic_linker" 1>&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+# Report the final consequences.
+echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
+
+# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
+# configure.in, otherwise build static only libraries.
+case "$host_os" in
+cygwin* | mingw* | os2*)
+ if test x$can_build_shared = xyes; then
+ test x$enable_win32_dll = xno && can_build_shared=no
+ echo "checking if package supports dlls... $can_build_shared" 1>&6
+ fi
+;;
+esac
+
+if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
+ case "$deplibs_check_method" in
+ "file_magic "*)
+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ egrep "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+EOF
+ fi ;;
+ esac
+fi
+
+echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+
+aix4*)
+ test "$enable_shared" = yes && enable_static=no
+ ;;
+esac
+
+echo "$ac_t$enable_shared" 1>&6
+
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+
+echo "checking whether to build static libraries... $enable_static" 1>&6
+
+if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+echo $ac_n "checking for objdir... $ac_c" 1>&6
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+echo "$ac_t$objdir" 1>&6
+
+if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
+ lt_cv_dlopen=no lt_cv_dlopen_libs=
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "$progname:2170: checking for dlopen in -ldl" >&5
+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldl $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2178 "ltconfig"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo $progname:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+echo "$progname:2207: checking for dlopen" >&5
+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2212 "ltconfig"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlopen(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dlopen();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_dlopen) || defined (__stub___dlopen)
+choke me
+#else
+dlopen();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo $progname:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_dlopen=yes"
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_dlopen=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ lt_cv_dlopen="dlopen"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+echo "$progname:2251: checking for dld_link in -ldld" >&5
+ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldld $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2259 "ltconfig"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dld_link();
+
+int main() {
+dld_link()
+; return 0; }
+EOF
+if { (eval echo $progname:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+echo "$progname:2288: checking for shl_load" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2293 "ltconfig"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shl_load(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char shl_load();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_shl_load) || defined (__stub___shl_load)
+choke me
+#else
+shl_load();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo $progname:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_shl_load=yes"
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_shl_load=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ lt_cv_dlopen="shl_load"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+echo "$progname:2333: checking for shl_load in -ldld" >&5
+ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ldld $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2341 "ltconfig"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char shl_load();
+
+int main() {
+shl_load()
+; return 0; }
+EOF
+if { (eval echo $progname:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+fi
+
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ fi
+
+ case "$lt_cv_dlopen" in
+ dlopen)
+for ac_hdr in dlfcn.h; do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$progname:2395: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2400 "ltconfig"
+#include <$ac_hdr>
+int fnord = 0;
+EOF
+ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo $progname:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+ if test "x$ac_cv_header_dlfcn_h" = xyes; then
+ CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ fi
+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
+echo "$progname:2433: checking whether a program can dlopen itself" >&5
+if test "${lt_cv_dlopen_self+set}" = set; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ lt_cv_dlopen_self=cross
+ else
+ cat > conftest.c <<EOF
+#line 2441 "ltconfig"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LTDL_GLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LTDL_GLOBAL DL_GLOBAL
+# else
+# define LTDL_GLOBAL 0
+# endif
+#endif
+
+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LTDL_LAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LTDL_LAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LTDL_LAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LTDL_LAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LTDL_LAZY_OR_NOW DL_NOW
+# else
+# define LTDL_LAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+fnord() { int i=42;}
+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
+ if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+ if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
+
+EOF
+if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+ lt_cv_dlopen_self=yes
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ lt_cv_dlopen_self=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+
+ if test "$lt_cv_dlopen_self" = yes; then
+ LDFLAGS="$LDFLAGS $link_static_flag"
+ echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
+echo "$progname:2506: checking whether a statically linked program can dlopen itself" >&5
+if test "${lt_cv_dlopen_self_static+set}" = set; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test "$cross_compiling" = yes; then
+ lt_cv_dlopen_self_static=cross
+ else
+ cat > conftest.c <<EOF
+#line 2514 "ltconfig"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LTDL_GLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LTDL_GLOBAL DL_GLOBAL
+# else
+# define LTDL_GLOBAL 0
+# endif
+#endif
+
+/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LTDL_LAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LTDL_LAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LTDL_LAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LTDL_LAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LTDL_LAZY_OR_NOW DL_NOW
+# else
+# define LTDL_LAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+fnord() { int i=42;}
+main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
+ if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+ if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
+
+EOF
+if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+ lt_cv_dlopen_self_static=yes
+else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ lt_cv_dlopen_self_static=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
+fi
+ ;;
+ esac
+
+ case "$lt_cv_dlopen_self" in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case "$lt_cv_dlopen_self_static" in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+
+# Copy echo and quote the copy, instead of the original, because it is
+# used later.
+ltecho="$echo"
+if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+ ltecho="$CONFIG_SHELL \$0 --fallback-echo"
+fi
+LTSHELL="$SHELL"
+
+LTCONFIG_VERSION="$VERSION"
+
+# Only quote variables if we're using ltmain.sh.
+case "$ltmain" in
+*.sh)
+ # Now quote all the things that may contain metacharacters.
+ for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
+ old_LD old_LDFLAGS old_LIBS \
+ old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
+ AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
+ reload_flag reload_cmds wl \
+ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+ thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+ library_names_spec soname_spec \
+ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+ old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
+ file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
+ finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+ hardcode_libdir_flag_spec hardcode_libdir_separator \
+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+ compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
+
+ case "$var" in
+ reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+ old_postinstall_cmds | old_postuninstall_cmds | \
+ export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+ postinstall_cmds | postuninstall_cmds | \
+ finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+ # Double-quote double-evaled strings.
+ eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ ;;
+ *)
+ eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+ ;;
+ esac
+ done
+
+ case "$ltecho" in
+ *'\$0 --fallback-echo"')
+ ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
+ esac
+
+ trap "$rm \"$ofile\"; exit 1" 1 2 15
+ echo "creating $ofile"
+ $rm "$ofile"
+ cat <<EOF > "$ofile"
+#! $SHELL
+
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+#
+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+### BEGIN LIBTOOL CONFIG
+EOF
+ cfgfile="$ofile"
+ ;;
+
+*)
+ # Double-quote the variables that need it (for aesthetics).
+ for var in old_CC old_CFLAGS old_CPPFLAGS \
+ old_LD old_LDFLAGS old_LIBS \
+ old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
+ eval "$var=\\\"\$var\\\""
+ done
+
+ # Just create a config file.
+ cfgfile="$ofile.cfg"
+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+ echo "creating $cfgfile"
+ $rm "$cfgfile"
+ cat <<EOF > "$cfgfile"
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+EOF
+ ;;
+esac
+
+cat <<EOF >> "$cfgfile"
+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
+# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
+# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
+# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
+# $0$ltconfig_args
+#
+# Compiler and other test output produced by $progname, useful for
+# debugging $progname, is in ./config.log if it exists.
+
+# The version of $progname that generated this script.
+LTCONFIG_VERSION=$LTCONFIG_VERSION
+
+# Shell to use when invoking shell scripts.
+SHELL=$LTSHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$ltecho
+
+# The archiver.
+AR=$AR
+
+# The default C compiler.
+CC=$CC
+
+# The linker used to build libraries.
+LD=$LD
+
+# Whether we need hard or soft links.
+LN_S=$LN_S
+
+# A BSD-compatible nm program.
+NM=$NM
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$reload_flag
+reload_cmds=$reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$wl
+
+# Object file suffix (normally "o").
+objext="$objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$pic_flag
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$compiler_c_o
+
+# Can we write directly to a .lo ?
+compiler_o_lo=$compiler_o_lo
+
+# Must we lock files when doing compilation ?
+need_locks=$need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$link_static_flag
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$whole_archive_flag_spec
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$thread_safe_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$libname_spec
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$RANLIB
+old_archive_cmds=$old_archive_cmds
+old_postinstall_cmds=$old_postinstall_cmds
+old_postuninstall_cmds=$old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$old_archive_from_new_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$archive_cmds
+archive_expsym_cmds=$archive_expsym_cmds
+postinstall_cmds=$postinstall_cmds
+postuninstall_cmds=$postuninstall_cmds
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$global_symbol_to_cdecl
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$include_expsyms
+
+EOF
+
+case "$ltmain" in
+*.sh)
+ echo '### END LIBTOOL CONFIG' >> "$ofile"
+ echo >> "$ofile"
+ case "$host_os" in
+ aix3*)
+ cat <<\EOF >> "$ofile"
+
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "${COLLECT_NAMES+set}" != set; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+EOF
+ ;;
+ esac
+
+ # Append the ltmain.sh script.
+ sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
+
+ chmod +x "$ofile"
+ ;;
+
+*)
+ # Compile the libtool program.
+ echo "FIXME: would compile $ltmain"
+ ;;
+esac
+
+test -n "$cache_file" || exit 0
+
+# AC_CACHE_SAVE
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs. It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already. You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote substitution
+ # turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ -e "s/'/'\\\\''/g" \
+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+ ;;
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+ ;;
+ esac >> confcache
+if cmp -s $cache_file confcache; then
+ :
+else
+ if test -w $cache_file; then
+ echo "updating cache $cache_file"
+ cat confcache > $cache_file
+ else
+ echo "not updating unwritable cache $cache_file"
+ fi
+fi
+rm -f confcache
+
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/acinclude.m4
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/acinclude.m4 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/acinclude.m4 Sat Jul 13 19:22:51 2002
@@ -0,0 +1,33 @@
+dnl Check if aclocal can the find libtool macros.
+AC_DEFUN(RRD_ACLOCAL_FIND_LIBTOOL,
+ [
+ AC_CACHE_CHECK(
+ [whether aclocal can find libtool macros],
+ rrd_cv_libtool_macros,
+ [
+ rm -rf .test-libtool
+ mkdir .test-libtool
+ cd .test-libtool
+ cat >configure.in <<EOF
+[AM_PROG_LIBTOOL]
+EOF
+ aclocal >/dev/null 2>/dev/null
+ if grep LIBTOOL aclocal.m4 >/dev/null 2>&1; then
+ rrd_cv_libtool_macros=yes
+ else
+ rrd_cv_libtool_macros=no
+ fi
+ cd ..
+ rm -rf .test-libtool
+ ]
+ )
+ if test "$amanda_cv_libtool_macros" = yes; then
+ LIBTOOL_M4_MACRO_DIR=
+ else
+ # We don't want top_srcdir here, because, when we run aclocal,
+ # we're already in top_srcdir.
+ LIBTOOL_M4_MACRO_DIR='-I config/libtool'
+ fi
+ AC_SUBST(LIBTOOL_M4_MACRO_DIR)
+ ]
+)
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/Makefile.am Sat Jul 13 19:22:51 2002
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+
+#where we keep local rules for automake
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+
+# make sure autoheader finds aclocal
+
+AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+#additional files to distribute
+EXTRA_DIST = aclocal.m4 libtool/libtool.m4 config.guess \
+ config.sub install-sh ltconfig \
+ ltmain.sh missing mkinstalldirs
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/missing
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/missing (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/missing Sat Jul 13 19:22:52 2002
@@ -0,0 +1,190 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Franc,ois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+case "$1" in
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing - GNU libit 0.0"
+ ;;
+
+ -*)
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+ ;;
+
+ aclocal)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`acinclude.m4' or \`configure.in'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`configure.in'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`acconfig.h' or \`configure.in'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case "$f" in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ bison|yacc)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f y.tab.h ]; then
+ echo >y.tab.h
+ fi
+ if [ ! -f y.tab.c ]; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex|flex)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f lex.yy.c ]; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ makeinfo)
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ fi
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequirements for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/config.guess
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/config.guess (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/config.guess Sat Jul 13 19:22:52 2002
@@ -0,0 +1,1087 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+# Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner at cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf at gnu.org>.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+ if test x"$HOST_CC" != x; then
+ CC_FOR_BUILD="$HOST_CC"
+ else
+ if test x"$CC" != x; then
+ CC_FOR_BUILD="$CC"
+ else
+ CC_FOR_BUILD=cc
+ fi
+ fi
+fi
+
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi at noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ alpha:OSF1:*:*)
+ if test $UNAME_RELEASE = "V4.0"; then
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ fi
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ cat <<EOF >$dummy.s
+ .globl main
+ .ent main
+main:
+ .frame \$30,0,\$26,0
+ .prologue 0
+ .long 0x47e03d80 # implver $0
+ lda \$2,259
+ .long 0x47e20c21 # amask $2,$1
+ srl \$1,8,\$2
+ sll \$2,2,\$2
+ sll \$0,3,\$0
+ addl \$1,\$0,\$0
+ addl \$2,\$0,\$0
+ ret \$31,(\$26),1
+ .end main
+EOF
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy
+ case "$?" in
+ 7)
+ UNAME_MACHINE="alpha"
+ ;;
+ 15)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 14)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 10)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 16)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ esac
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-cbm-sysv4
+ exit 0;;
+ amiga:NetBSD:*:*)
+ echo m68k-cbm-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
+ arc64:OpenBSD:*:*)
+ echo mips64el-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hkmips:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ arm32:NetBSD:*:*)
+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ SR2?01:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:NetBSD:*:*)
+ echo m68k-atari-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit 0 ;;
+ sun3*:NetBSD:*:*)
+ echo m68k-sun-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:NetBSD:*:*)
+ echo m68k-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:NetBSD:*:*)
+ echo powerpc-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy \
+ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+ -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i?86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:4)
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=4.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[34678]??:HP-UX:*:*)
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ sed 's/^ //' << EOF >$dummy.c
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ rm -f $dummy.c $dummy
+ esac
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ i?86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ hppa*:OpenBSD:*:*)
+ echo hppa-unknown-openbsd
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*X-MP:*:*:*)
+ echo xmp-cray-unicos
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo t3e-cray-unicosmk${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY-2:*:*:*)
+ echo cray2-cray-unicos
+ exit 0 ;;
+ F300:UNIX_System_V:*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ F301:UNIX_System_V:*:*)
+ echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+ exit 0 ;;
+ hp3[0-9][05]:NetBSD:*:*)
+ echo m68k-hp-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ if test -x /usr/bin/objformat; then
+ if test "elf" = "`/usr/bin/objformat`"; then
+ echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ exit 0
+ fi
+ fi
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:NetBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i386-pc-interix
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ *:Linux:*:*)
+ # uname on the ARM produces all sorts of strangeness, and we need to
+ # filter it out.
+ case "$UNAME_MACHINE" in
+ armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
+ arm* | sa110*) UNAME_MACHINE="arm" ;;
+ esac
+
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ ld_help_string=`cd /; ld --help 2>&1`
+ ld_supported_emulations=`echo $ld_help_string \
+ | sed -ne '/supported emulations:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported emulations: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_emulations" in
+ i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
+ i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
+ sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+ armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+ m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+ elf32ppc)
+ # Determine Lib Version
+ cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+ int argc;
+ char *argv[];
+{
+#if defined(__GLIBC__)
+ printf("%s %s\n", __libc_version, __libc_release);
+#else
+ printf("unkown\n");
+#endif
+ return 0;
+}
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy | grep 1\.99 > /dev/null
+ if test "$?" = 0 ; then
+ LIBC="libc1"
+ fi
+ fi
+ rm -f $dummy.c $dummy
+ echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+ esac
+
+ if test "${UNAME_MACHINE}" = "alpha" ; then
+ sed 's/^ //' <<EOF >$dummy.s
+ .globl main
+ .ent main
+ main:
+ .frame \$30,0,\$26,0
+ .prologue 0
+ .long 0x47e03d80 # implver $0
+ lda \$2,259
+ .long 0x47e20c21 # amask $2,$1
+ srl \$1,8,\$2
+ sll \$2,2,\$2
+ sll \$0,3,\$0
+ addl \$1,\$0,\$0
+ addl \$2,\$0,\$0
+ ret \$31,(\$26),1
+ .end main
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy
+ case "$?" in
+ 7)
+ UNAME_MACHINE="alpha"
+ ;;
+ 15)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 14)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 10)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 16)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ esac
+
+ objdump --private-headers $dummy | \
+ grep ld.so.1 > /dev/null
+ if test "$?" = 0 ; then
+ LIBC="libc1"
+ fi
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+ elif test "${UNAME_MACHINE}" = "mips" ; then
+ cat >$dummy.c <<EOF
+#ifdef __cplusplus
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+ printf ("%s-unknown-linux-gnu\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+ printf ("%sel-unknown-linux-gnu\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ else
+ # Either a pre-BFD a.out linker (linux-gnuoldld)
+ # or one that does not give us useful --help.
+ # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+ # If ld does not provide *any* "supported emulations:"
+ # that means it is gnuoldld.
+ echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+ test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+ case "${UNAME_MACHINE}" in
+ i?86)
+ VENDOR=pc;
+ ;;
+ *)
+ VENDOR=unknown;
+ ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+# if __GLIBC__ >= 2
+ printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+# else
+ printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+# else
+ printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+ printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+ i?86:DYNIX/ptx:4*:*)
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i?86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
+ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ i?86:*:5:7*)
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ i?86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
+ pc:*:*:*)
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ M68*:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m68*:LynxOS:2.*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes at openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf at swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ news*:NEWS-OS:*:6*)
+ echo mips-sony-newsos6
+ exit 0 ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+ printf ("vax-dec-bsd\n"); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/ltmain.sh
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/ltmain.sh (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/ltmain.sh Sat Jul 13 19:22:52 2002
@@ -0,0 +1,3975 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+#
+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+ # Yippee, $echo works!
+ :
+else
+ # Restart under the correct shell, and then maybe $echo will work.
+ exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit 0
+fi
+
+# The name of this program.
+progname=`$echo "$0" | sed 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.3.3
+TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+SP2NL='tr \040 \012'
+NL2SP='tr \015\012 \040\040'
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+ save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+if test "$LTCONFIG_VERSION" != "$VERSION"; then
+ echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit 1
+fi
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ echo "$modename: not configured to build any kind of library" 1>&2
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit 1
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+# Parse our command line options once, thoroughly.
+while test $# -gt 0
+do
+ arg="$1"
+ shift
+
+ case "$arg" in
+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case "$prev" in
+ execute_dlfiles)
+ eval "$prev=\"\$$prev \$arg\""
+ ;;
+ *)
+ eval "$prev=\$arg"
+ ;;
+ esac
+
+ prev=
+ prevopt=
+ continue
+ fi
+
+ # Have we seen a non-optional argument yet?
+ case "$arg" in
+ --help)
+ show_help=yes
+ ;;
+
+ --version)
+ echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+ exit 0
+ ;;
+
+ --config)
+ sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
+ exit 0
+ ;;
+
+ --debug)
+ echo "$progname: enabling shell trace mode"
+ set -x
+ ;;
+
+ --dry-run | -n)
+ run=:
+ ;;
+
+ --features)
+ echo "host: $host"
+ if test "$build_libtool_libs" = yes; then
+ echo "enable shared libraries"
+ else
+ echo "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+ echo "enable static libraries"
+ else
+ echo "disable static libraries"
+ fi
+ exit 0
+ ;;
+
+ --finish) mode="finish" ;;
+
+ --mode) prevopt="--mode" prev=mode ;;
+ --mode=*) mode="$optarg" ;;
+
+ --quiet | --silent)
+ show=:
+ ;;
+
+ -dlopen)
+ prevopt="-dlopen"
+ prev=execute_dlfiles
+ ;;
+
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ ;;
+
+ *)
+ nonopt="$arg"
+ break
+ ;;
+ esac
+done
+
+if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+fi
+
+if test -z "$show_help"; then
+
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ case "$nonopt" in
+ *cc | *++ | gcc* | *-gcc*)
+ mode=link
+ for arg
+ do
+ case "$arg" in
+ -c)
+ mode=compile
+ break
+ ;;
+ esac
+ done
+ ;;
+ *db | *dbx | *strace | *truss)
+ mode=execute
+ ;;
+ *install*|cp|mv)
+ mode=install
+ ;;
+ *rm)
+ mode=uninstall
+ ;;
+ *)
+ # If we have no mode, but dlfiles were specified, then do execute mode.
+ test -n "$execute_dlfiles" && mode=execute
+
+ # Just use the default operation mode.
+ if test -z "$mode"; then
+ if test -n "$nonopt"; then
+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+ else
+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+ fi
+ fi
+ ;;
+ esac
+ fi
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$modename --help --mode=$mode' for more information."
+
+ # These modes are in order of execution frequency so that they run quickly.
+ case "$mode" in
+ # libtool compile mode
+ compile)
+ modename="$modename: compile"
+ # Get the compilation command and the source file.
+ base_compile=
+ lastarg=
+ srcfile="$nonopt"
+ suppress_output=
+
+ user_target=no
+ for arg
+ do
+ # Accept any command-line options.
+ case "$arg" in
+ -o)
+ if test "$user_target" != "no"; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+ exit 1
+ fi
+ user_target=next
+ ;;
+
+ -static)
+ build_old_libs=yes
+ continue
+ ;;
+ esac
+
+ case "$user_target" in
+ next)
+ # The next one is the -o target name
+ user_target=yes
+ continue
+ ;;
+ yes)
+ # We got the output file
+ user_target=set
+ libobj="$arg"
+ continue
+ ;;
+ esac
+
+ # Accept the current argument as the source file.
+ lastarg="$srcfile"
+ srcfile="$arg"
+
+ # Aesthetically quote the previous argument.
+
+ # Backslashify any backslashes, double quotes, and dollar signs.
+ # These are the only characters that are still specially
+ # interpreted inside of double-quoted scrings.
+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly in scan
+ # sets, so we specify it separately.
+ case "$lastarg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ lastarg="\"$lastarg\""
+ ;;
+ esac
+
+ # Add the previous argument to base_compile.
+ if test -z "$base_compile"; then
+ base_compile="$lastarg"
+ else
+ base_compile="$base_compile $lastarg"
+ fi
+ done
+
+ case "$user_target" in
+ set)
+ ;;
+ no)
+ # Get the name of the library object.
+ libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ ;;
+ *)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+ exit 1
+ ;;
+ esac
+
+ # Recognize several different file suffixes.
+ # If the user specifies -o file.o, it is replaced with file.lo
+ xform='[cCFSfmso]'
+ case "$libobj" in
+ *.ada) xform=ada ;;
+ *.adb) xform=adb ;;
+ *.ads) xform=ads ;;
+ *.asm) xform=asm ;;
+ *.c++) xform=c++ ;;
+ *.cc) xform=cc ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+ *.f90) xform=f90 ;;
+ *.for) xform=for ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+ case "$libobj" in
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+ exit 1
+ ;;
+ esac
+
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ # Delete any leftover library objects.
+ if test "$build_old_libs" = yes; then
+ removelist="$obj $libobj"
+ else
+ removelist="$libobj"
+ fi
+
+ $run $rm $removelist
+ trap "$run $rm $removelist; exit 1" 1 2 15
+
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+ if test "$compiler_c_o" = no; then
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+ trap "$run $rm $removelist; exit 1" 1 2 15
+ else
+ need_locks=no
+ lockfile=
+ fi
+
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+ until ln "$0" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+ echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit 1
+ fi
+ echo $srcfile > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
+
+ # Only build a PIC object if we are building libtool libraries.
+ if test "$build_libtool_libs" = yes; then
+ # Without this assignment, base_compile gets emptied.
+ fbsd_hideous_sh_bug=$base_compile
+
+ # All platforms use -DPIC, to notify preprocessed assembler code.
+ command="$base_compile $pic_flag -DPIC $srcfile"
+ if test "$build_old_libs" = yes; then
+ lo_libobj="$libobj"
+ dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$libobj"; then
+ dir="$objdir"
+ else
+ dir="$dir/$objdir"
+ fi
+ libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+
+ if test -d "$dir"; then
+ $show "$rm $libobj"
+ $run $rm $libobj
+ else
+ $show "$mkdir $dir"
+ $run $mkdir $dir
+ status=$?
+ if test $status -ne 0 && test ! -d $dir; then
+ exit $status
+ fi
+ fi
+ fi
+ if test "$compiler_o_lo" = yes; then
+ output_obj="$libobj"
+ command="$command -o $output_obj"
+ elif test "$compiler_c_o" = yes; then
+ output_obj="$obj"
+ command="$command -o $output_obj"
+ fi
+
+ $run $rm "$output_obj"
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+ exit 1
+ fi
+
+ if test "$need_locks" = warn &&
+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+ echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit 1
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+ if test x"$output_obj" != x"$libobj"; then
+ $show "$mv $output_obj $libobj"
+ if $run $mv $output_obj $libobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # If we have no pic_flag, then copy the object into place and finish.
+ if test -z "$pic_flag" && test "$build_old_libs" = yes; then
+ # Rename the .lo from within objdir to obj
+ if test -f $obj; then
+ $show $rm $obj
+ $run $rm $obj
+ fi
+
+ $show "$mv $libobj $obj"
+ if $run $mv $libobj $obj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+
+ # Now arrange that obj and lo_libobj become the same file
+ $show "$LN_S $obj $lo_libobj"
+ if $run $LN_S $obj $lo_libobj; then
+ exit 0
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Allow error messages only from the first compilation.
+ suppress_output=' >/dev/null 2>&1'
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+ if test "$build_old_libs" = yes; then
+ command="$base_compile $srcfile"
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+ output_obj="$obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+ command="$command$suppress_output"
+ $run $rm "$output_obj"
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+ exit 1
+ fi
+
+ if test "$need_locks" = warn &&
+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+ echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit 1
+ fi
+
+ # Just move the object if needed
+ if test x"$output_obj" != x"$obj"; then
+ $show "$mv $output_obj $obj"
+ if $run $mv $output_obj $obj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Create an invalid libtool object if no PIC, so that we do not
+ # accidentally link it into a program.
+ if test "$build_libtool_libs" != yes; then
+ $show "echo timestamp > $libobj"
+ $run eval "echo timestamp > \$libobj" || exit $?
+ else
+ # Move the .lo from within objdir
+ $show "$mv $libobj $lo_libobj"
+ if $run $mv $libobj $lo_libobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+ fi
+
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $rm "$lockfile"
+ fi
+
+ exit 0
+ ;;
+
+ # libtool link mode
+ link)
+ modename="$modename: link"
+ C_compiler="$CC" # save it, to compile generated C sources
+ CC="$nonopt"
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invokation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+ allow_undefined=yes
+
+ # This is a source program that is used to create dlls on Windows
+ # Don't remove nor modify the starting and closing comments
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# #ifndef __CYGWIN__
+# # ifdef __CYGWIN32__
+# # define __CYGWIN__ __CYGWIN32__
+# # endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+# __hDllInstance_base = hInst;
+# return TRUE;
+# }
+# /* ltdll.c ends here */
+ # This is a source program that is used to create import libraries
+ # on Windows for dlls which lack them. Don't remove nor modify the
+ # starting and closing comments
+# /* impgen.c starts here */
+# /* Copyright (C) 1999 Free Software Foundation, Inc.
+#
+# This file is part of GNU libtool.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# */
+#
+# #include <stdio.h> /* for printf() */
+# #include <unistd.h> /* for open(), lseek(), read() */
+# #include <fcntl.h> /* for O_RDONLY, O_BINARY */
+# #include <string.h> /* for strdup() */
+#
+# static unsigned int
+# pe_get16 (fd, offset)
+# int fd;
+# int offset;
+# {
+# unsigned char b[2];
+# lseek (fd, offset, SEEK_SET);
+# read (fd, b, 2);
+# return b[0] + (b[1]<<8);
+# }
+#
+# static unsigned int
+# pe_get32 (fd, offset)
+# int fd;
+# int offset;
+# {
+# unsigned char b[4];
+# lseek (fd, offset, SEEK_SET);
+# read (fd, b, 4);
+# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# static unsigned int
+# pe_as32 (ptr)
+# void *ptr;
+# {
+# unsigned char *b = ptr;
+# return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+# }
+#
+# int
+# main (argc, argv)
+# int argc;
+# char *argv[];
+# {
+# int dll;
+# unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+# unsigned long export_rva, export_size, nsections, secptr, expptr;
+# unsigned long name_rvas, nexp;
+# unsigned char *expdata, *erva;
+# char *filename, *dll_name;
+#
+# filename = argv[1];
+#
+# dll = open(filename, O_RDONLY|O_BINARY);
+# if (!dll)
+# return 1;
+#
+# dll_name = filename;
+#
+# for (i=0; filename[i]; i++)
+# if (filename[i] == '/' || filename[i] == '\\' || filename[i] == ':')
+# dll_name = filename + i +1;
+#
+# pe_header_offset = pe_get32 (dll, 0x3c);
+# opthdr_ofs = pe_header_offset + 4 + 20;
+# num_entries = pe_get32 (dll, opthdr_ofs + 92);
+#
+# if (num_entries < 1) /* no exports */
+# return 1;
+#
+# export_rva = pe_get32 (dll, opthdr_ofs + 96);
+# export_size = pe_get32 (dll, opthdr_ofs + 100);
+# nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+# secptr = (pe_header_offset + 4 + 20 +
+# pe_get16 (dll, pe_header_offset + 4 + 16));
+#
+# expptr = 0;
+# for (i = 0; i < nsections; i++)
+# {
+# char sname[8];
+# unsigned long secptr1 = secptr + 40 * i;
+# unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+# unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+# unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+# lseek(dll, secptr1, SEEK_SET);
+# read(dll, sname, 8);
+# if (vaddr <= export_rva && vaddr+vsize > export_rva)
+# {
+# expptr = fptr + (export_rva - vaddr);
+# if (export_rva + export_size > vaddr + vsize)
+# export_size = vsize - (export_rva - vaddr);
+# break;
+# }
+# }
+#
+# expdata = (unsigned char*)malloc(export_size);
+# lseek (dll, expptr, SEEK_SET);
+# read (dll, expdata, export_size);
+# erva = expdata - export_rva;
+#
+# nexp = pe_as32 (expdata+24);
+# name_rvas = pe_as32 (expdata+32);
+#
+# printf ("EXPORTS\n");
+# for (i = 0; i<nexp; i++)
+# {
+# unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+# printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+# }
+#
+# return 0;
+# }
+# /* impgen.c ends here */
+ ;;
+ *)
+ allow_undefined=yes
+ ;;
+ esac
+ compile_command="$CC"
+ finalize_command="$CC"
+
+ compile_rpath=
+ finalize_rpath=
+ compile_shlibpath=
+ finalize_shlibpath=
+ convenience=
+ old_convenience=
+ deplibs=
+ linkopts=
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+ eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ else
+ lib_search_path=
+ fi
+ # now prepend the system-specific ones
+ eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+ avoid_version=no
+ dlfiles=
+ dlprefiles=
+ dlself=no
+ export_dynamic=no
+ export_symbols=
+ export_symbols_regex=
+ generated=
+ libobjs=
+ link_against_libtool_libs=
+ ltlibs=
+ module=no
+ objs=
+ prefer_static_libs=no
+ preload=no
+ prev=
+ prevarg=
+ release=
+ rpath=
+ xrpath=
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+ vinfo=
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case "$arg" in
+ -all-static | -static)
+ if test "X$arg" = "X-all-static"; then
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ else
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ fi
+ build_libtool_libs=no
+ build_old_libs=yes
+ prefer_static_libs=yes
+ break
+ ;;
+ esac
+ done
+
+ # See if our shared archives depend on static archives.
+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+ # Go through the arguments, transforming them on the way.
+ while test $# -gt 0; do
+ arg="$1"
+ shift
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case "$prev" in
+ output)
+ compile_command="$compile_command @OUTPUT@"
+ finalize_command="$finalize_command @OUTPUT@"
+ ;;
+ esac
+
+ case "$prev" in
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ compile_command="$compile_command @SYMFILE@"
+ finalize_command="$finalize_command @SYMFILE@"
+ preload=yes
+ fi
+ case "$arg" in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ self)
+ if test "$prev" = dlprefiles; then
+ dlself=yes
+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
+ else
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ else
+ dlprefiles="$dlprefiles $arg"
+ fi
+ prev=
+ ;;
+ esac
+ ;;
+ expsyms)
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+ exit 1
+ fi
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
+ rpath | xrpath)
+ # We need an absolute path.
+ case "$arg" in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit 1
+ ;;
+ esac
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) rpath="$rpath $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+ *) xrpath="$xrpath $arg" ;;
+ esac
+ fi
+ prev=
+ continue
+ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+ continue
+ ;;
+ esac
+ fi
+
+ prevarg="$arg"
+
+ case "$arg" in
+ -all-static)
+ if test -n "$link_static_flag"; then
+ compile_command="$compile_command $link_static_flag"
+ finalize_command="$finalize_command $link_static_flag"
+ fi
+ continue
+ ;;
+
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+ continue
+ ;;
+
+ -avoid-version)
+ avoid_version=yes
+ continue
+ ;;
+
+ -dlopen)
+ prev=dlfiles
+ continue
+ ;;
+
+ -dlpreopen)
+ prev=dlprefiles
+ continue
+ ;;
+
+ -export-dynamic)
+ export_dynamic=yes
+ continue
+ ;;
+
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: not more than one -exported-symbols argument allowed"
+ exit 1
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+ else
+ prev=expsyms_regex
+ fi
+ continue
+ ;;
+
+ -L*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ # We need an absolute path.
+ case "$dir" in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ absdir="$dir"
+ fi
+ dir="$absdir"
+ ;;
+ esac
+ case " $deplibs " in
+ *" $arg "*) ;;
+ *) deplibs="$deplibs $arg";;
+ esac
+ case " $lib_search_path " in
+ *" $dir "*) ;;
+ *) lib_search_path="$lib_search_path $dir";;
+ esac
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2*)
+ dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
+ case ":$dllsearchpath:" in
+ ::) dllsearchpath="$dllsearchdir";;
+ *":$dllsearchdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
+ esac
+ ;;
+ esac
+ ;;
+
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ # These systems don't actually have c library (as such)
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lm"; then
+ case "$host" in
+ *-*-cygwin* | *-*-beos*)
+ # These systems don't actually have math library (as such)
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -module)
+ module=yes
+ continue
+ ;;
+
+ -no-undefined)
+ allow_undefined=no
+ continue
+ ;;
+
+ -o) prev=output ;;
+
+ -release)
+ prev=release
+ continue
+ ;;
+
+ -rpath)
+ prev=rpath
+ continue
+ ;;
+
+ -R)
+ prev=xrpath
+ continue
+ ;;
+
+ -R*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ # We need an absolute path.
+ case "$dir" in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit 1
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ continue
+ ;;
+
+ -static)
+ # If we have no pic_flag, then this is the same as -all-static.
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ compile_command="$compile_command $link_static_flag"
+ finalize_command="$finalize_command $link_static_flag"
+ fi
+ continue
+ ;;
+
+ -thread-safe)
+ thread_safe=yes
+ continue
+ ;;
+
+ -version-info)
+ prev=vinfo
+ continue
+ ;;
+
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case "$arg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+
+ *.o | *.obj | *.a | *.lib)
+ # A standard object.
+ objs="$objs $arg"
+ ;;
+
+ *.lo)
+ # A library object.
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
+
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+ prev=
+ fi
+ libobjs="$libobjs $arg"
+ ;;
+
+ *.la)
+ # A libtool-controlled library.
+
+ dlname=
+ libdir=
+ library_names=
+ old_library=
+
+ # Check to see that this really is a libtool archive.
+ if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
+ exit 1
+ fi
+
+ # If the library was installed with an old release of libtool,
+ # it will not redefine variable installed.
+ installed=yes
+
+ # Read the .la file
+ # If there is no directory component, then add one.
+ case "$arg" in
+ */* | *\\*) . $arg ;;
+ *) . ./$arg ;;
+ esac
+
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
+ exit 1
+ fi
+
+ # Find the relevant object directory and library name.
+ name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
+
+ if test "X$installed" = Xyes; then
+ dir="$libdir"
+ else
+ dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$arg"; then
+ dir="$objdir"
+ else
+ dir="$dir/$objdir"
+ fi
+ fi
+
+ if test -n "$dependency_libs"; then
+ # Extract -R and -L from dependency_libs
+ temp_deplibs=
+ for deplib in $dependency_libs; do
+ case "$deplib" in
+ -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ case " $rpath $xrpath " in
+ *" $temp_xrpath "*) ;;
+ *) xrpath="$xrpath $temp_xrpath";;
+ esac;;
+ -L*) case "$compile_command $temp_deplibs " in
+ *" $deplib "*) ;;
+ *) temp_deplibs="$temp_deplibs $deplib";;
+ esac
+ temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ case " $lib_search_path " in
+ *" $temp_dir "*) ;;
+ *) lib_search_path="$lib_search_path $temp_dir";;
+ esac
+ ;;
+ *) temp_deplibs="$temp_deplibs $deplib";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+ if test -z "$libdir"; then
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $dir/$old_library"
+ old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$deplibs$dependency_libs"
+ compile_command="$compile_command $dir/$old_library$dependency_libs"
+ finalize_command="$finalize_command $dir/$old_library$dependency_libs"
+ continue
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking statically,
+ # we need to preload.
+ prev=dlprefiles
+ else
+ # We should not create a dependency on this library, but we
+ # may need any libraries it requires.
+ compile_command="$compile_command$dependency_libs"
+ finalize_command="$finalize_command$dependency_libs"
+ prev=
+ continue
+ fi
+ fi
+
+ # The library was specified with -dlpreopen.
+ if test "$prev" = dlprefiles; then
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ dlprefiles="$dlprefiles $dir/$old_library"
+ else
+ dlprefiles="$dlprefiles $dir/$linklib"
+ fi
+ prev=
+ fi
+
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ link_against_libtool_libs="$link_against_libtool_libs $arg"
+ if test -n "$shlibpath_var"; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *) temp_rpath="$temp_rpath $dir" ;;
+ esac
+ fi
+
+ # We need an absolute path.
+ case "$dir" in
+ [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ absdir="$dir"
+ fi
+ ;;
+ esac
+
+ # This is the magic to use -rpath.
+ # Skip directories that are in the system default run-time
+ # search path, unless they have been requested with -R.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+
+ lib_linked=yes
+ case "$hardcode_action" in
+ immediate | unsupported)
+ if test "$hardcode_direct" = no; then
+ compile_command="$compile_command $dir/$linklib"
+ deplibs="$deplibs $dir/$linklib"
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2*)
+ dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
+ if test -n "$dllsearchpath"; then
+ dllsearchpath="$dllsearchpath:$dllsearchdir"
+ else
+ dllsearchpath="$dllsearchdir"
+ fi
+ ;;
+ esac
+ elif test "$hardcode_minus_L" = no; then
+ case "$host" in
+ *-*-sunos*)
+ compile_shlibpath="$compile_shlibpath$dir:"
+ ;;
+ esac
+ case "$compile_command " in
+ *" -L$dir "*) ;;
+ *) compile_command="$compile_command -L$dir";;
+ esac
+ compile_command="$compile_command -l$name"
+ deplibs="$deplibs -L$dir -l$name"
+ elif test "$hardcode_shlibpath_var" = no; then
+ case ":$compile_shlibpath:" in
+ *":$dir:"*) ;;
+ *) compile_shlibpath="$compile_shlibpath$dir:";;
+ esac
+ compile_command="$compile_command -l$name"
+ deplibs="$deplibs -l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+
+ relink)
+ if test "$hardcode_direct" = yes; then
+ compile_command="$compile_command $absdir/$linklib"
+ deplibs="$deplibs $absdir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ case "$compile_command " in
+ *" -L$absdir "*) ;;
+ *) compile_command="$compile_command -L$absdir";;
+ esac
+ compile_command="$compile_command -l$name"
+ deplibs="$deplibs -L$absdir -l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case ":$compile_shlibpath:" in
+ *":$absdir:"*) ;;
+ *) compile_shlibpath="$compile_shlibpath$absdir:";;
+ esac
+ compile_command="$compile_command -l$name"
+ deplibs="$deplibs -l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+
+ *)
+ lib_linked=no
+ ;;
+ esac
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+ exit 1
+ fi
+
+ # Finalize command for both is simple: just hardcode it.
+ if test "$hardcode_direct" = yes; then
+ finalize_command="$finalize_command $libdir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ case "$finalize_command " in
+ *" -L$libdir "*) ;;
+ *) finalize_command="$finalize_command -L$libdir";;
+ esac
+ finalize_command="$finalize_command -l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case ":$finalize_shlibpath:" in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
+ esac
+ finalize_command="$finalize_command -l$name"
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+ case "$finalize_command " in
+ *" -L$dir "*) ;;
+ *) finalize_command="$finalize_command -L$libdir";;
+ esac
+ finalize_command="$finalize_command -l$name"
+ fi
+ else
+ # Transform directly to old archives if we don't build new libraries.
+ if test -n "$pic_flag" && test -z "$old_library"; then
+ $echo "$modename: cannot find static library for \`$arg'" 1>&2
+ exit 1
+ fi
+
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+ if test "$hardcode_direct" != unsupported; then
+ test -n "$old_library" && linklib="$old_library"
+ compile_command="$compile_command $dir/$linklib"
+ finalize_command="$finalize_command $dir/$linklib"
+ else
+ case "$compile_command " in
+ *" -L$dir "*) ;;
+ *) compile_command="$compile_command -L$dir";;
+ esac
+ compile_command="$compile_command -l$name"
+ case "$finalize_command " in
+ *" -L$dir "*) ;;
+ *) finalize_command="$finalize_command -L$dir";;
+ esac
+ finalize_command="$finalize_command -l$name"
+ fi
+ fi
+
+ # Add in any libraries that this one depends upon.
+ compile_command="$compile_command$dependency_libs"
+ finalize_command="$finalize_command$dependency_libs"
+ continue
+ ;;
+
+ # Some other compiler argument.
+ *)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case "$arg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+ esac
+
+ # Now actually substitute the argument into the commands.
+ if test -n "$arg"; then
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+ done
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+
+ oldlibs=
+ # calculate the name of the file, without its directory
+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+ libobjs_save="$libobjs"
+
+ case "$output" in
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ ;;
+
+ *.a | *.lib)
+ if test -n "$link_against_libtool_libs"; then
+ $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
+ exit 1
+ fi
+
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+ fi
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+ ;;
+
+ *.la)
+ # Make sure we only generate libraries of the form `libNAME.la'.
+ case "$outputname" in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ fi
+ ;;
+ esac
+
+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$output_objdir" = "X$output"; then
+ output_objdir="$objdir"
+ else
+ output_objdir="$output_objdir/$objdir"
+ fi
+
+ if test -n "$objs"; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+ exit 1
+ fi
+
+ # How the heck are we supposed to write a wrapper for a shared library?
+ if test -n "$link_against_libtool_libs"; then
+ $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
+ exit 1
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
+ fi
+
+ set dummy $rpath
+ if test $# -gt 2; then
+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+ fi
+ install_libdir="$2"
+
+ oldlibs=
+ if test -z "$rpath"; then
+ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+ libext=al
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ build_libtool_libs=convenience
+ build_old_libs=yes
+ fi
+ dependency_libs="$deplibs"
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ fi
+ else
+
+ # Parse the version information argument.
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ IFS="$save_ifs"
+
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ current="$2"
+ revision="$3"
+ age="$4"
+
+ # Check that each of the things are valid numbers.
+ case "$current" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
+
+ case "$revision" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
+
+ case "$age" in
+ 0 | [1-9] | [1-9][0-9]*) ;;
+ *)
+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ ;;
+ esac
+
+ if test $age -gt $current; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit 1
+ fi
+
+ # Calculate the version variables.
+ major=
+ versuffix=
+ verstring=
+ case "$version_type" in
+ none) ;;
+
+ irix)
+ major=`expr $current - $age + 1`
+ versuffix="$major.$revision"
+ verstring="sgi$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+ while test $loop != 0; do
+ iface=`expr $revision - $loop`
+ loop=`expr $loop - 1`
+ verstring="sgi$major.$iface:$verstring"
+ done
+ ;;
+
+ linux)
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ major=`expr $current - $age`
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+ while test $loop != 0; do
+ iface=`expr $current - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+ verstring="$verstring:${current}.0"
+ ;;
+
+ sunos)
+ major=".$current"
+ versuffix=".$current.$revision"
+ ;;
+
+ freebsd-aout)
+ major=".$current"
+ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+ major=".$current"
+ versuffix=".$current";
+ ;;
+
+ windows)
+ # Like Linux, but with '-' rather than '.', since we only
+ # want one extension on Windows 95.
+ major=`expr $current - $age`
+ versuffix="-$major-$age-$revision"
+ ;;
+
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit 1
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+ verstring="0.0"
+ if test "$need_version" = no; then
+ versuffix=
+ else
+ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+ if test "$allow_undefined" = yes; then
+ if test "$allow_undefined_flag" = unsupported; then
+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ build_libtool_libs=no
+ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+ allow_undefined_flag="$no_undefined_flag"
+ fi
+
+ dependency_libs="$deplibs"
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
+ fi
+
+ # Create the output directory, or remove our outputs if we need to.
+ if test -d $output_objdir; then
+ $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+ $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+ else
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+ status=$?
+ if test $status -ne 0 && test ! -d $output_objdir; then
+ exit $status
+ fi
+ fi
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ fi
+
+ if test "$build_libtool_libs" = yes; then
+ # Transform deplibs into only deplibs that can be linked in shared.
+ name_save=$name
+ libname_save=$libname
+ release_save=$release
+ versuffix_save=$versuffix
+ major_save=$major
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+ release=""
+ versuffix=""
+ major=""
+ newdeplibs=
+ droppeddeps=no
+ case "$deplibs_check_method" in
+ pass_all)
+ # Don't check for shared/static. Everything works.
+ # This might be a little naive. We might want to check
+ # whether the library exists or not. But this is on
+ # osf3 & osf4 and I'm not really sure... Just
+ # implementing what was already the behaviour.
+ newdeplibs=$deplibs
+ ;;
+ test_compile)
+ # This code stresses the "libraries are programs" paradigm to its
+ # limits. Maybe even breaks it. We compile a program, linking it
+ # against the deplibs as a proxy for the library. Then we can check
+ # whether they linked in statically or dynamically with ldd.
+ $rm conftest.c
+ cat > conftest.c <<EOF
+ int main() { return 0; }
+EOF
+ $rm conftest
+ $C_compiler -o conftest conftest.c $deplibs
+ if test $? -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ echo
+ echo "*** Warning: This library needs some functionality provided by $i."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ else
+ # Error occured in the first compile. Let's try to salvage the situation:
+ # Compile a seperate program for each library.
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" ; then
+ $rm conftest
+ $C_compiler -o conftest conftest.c $i
+ # Did it work?
+ if test $? -eq 0 ; then
+ ldd_output=`ldd conftest`
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ echo
+ echo "*** Warning: This library needs some functionality provided by $i."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
+ fi
+ else
+ droppeddeps=yes
+ echo
+ echo "*** Warning! Library $i is needed by this library but I was not able to"
+ echo "*** make it link in! You will probably need to install it or some"
+ echo "*** library that it depends on before this library will be fully"
+ echo "*** functional. Installing it before continuing would be even better."
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ fi
+ ;;
+ file_magic*)
+ set dummy $deplibs_check_method
+ file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
+ for a_deplib in $deplibs; do
+ name="`expr $a_deplib : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ for i in $lib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null \
+ | grep " -> " >/dev/null; then
+ continue
+ fi
+ # The statement above tries to avoid entering an
+ # endless loop below, in case of cyclic links.
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+ potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+ case "$potliblink" in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ | sed 10q \
+ | egrep "$file_magic_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ echo
+ echo "*** Warning: This library needs some functionality provided by $a_deplib."
+ echo "*** I have the capability to make that library automatically link in when"
+ echo "*** you link to this library. But I can only do this if you have a"
+ echo "*** shared version of the library, which you do not appear to have."
+ fi
+ else
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ fi
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+ if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+ -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' |
+ grep . >/dev/null; then
+ echo
+ if test "X$deplibs_check_method" = "Xnone"; then
+ echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ echo "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+ echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+ fi
+ ;;
+ esac
+ versuffix=$versuffix_save
+ major=$major_save
+ release=$release_save
+ libname=$libname_save
+ name=$name_save
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+ echo
+ echo "*** Warning: libtool could not satisfy all declared inter-library"
+ echo "*** dependencies of module $libname. Therefore, libtool will create"
+ echo "*** a static module, that should work as long as the dlopening"
+ echo "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+ echo
+ echo "*** However, this would only work if libtool was able to extract symbol"
+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** not find such a program. So, this module is probably useless."
+ echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ else
+ echo "*** The inter-library dependencies that have been dropped here will be"
+ echo "*** automatically added whenever a program is linked with this library"
+ echo "*** or is declared to -dlopen it."
+ fi
+ fi
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
+ # Get the real and link names of the library.
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+
+ lib="$output_objdir/$realname"
+ for link
+ do
+ linknames="$linknames $link"
+ done
+
+ # Ensure that we have .o objects for linkers which dislike .lo
+ # (e.g. aix) incase we are running --disable-static
+ for obj in $libobjs; do
+ oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"`
+ if test ! -f $oldobj; then
+ $show "${LN_S} $obj $oldobj"
+ $run ${LN_S} $obj $oldobj || exit $?
+ fi
+ done
+
+ # Use standard objects if they are pic
+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+ eval cmds=\"$export_symbols_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ if test -n "$export_symbols_regex"; then
+ $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+ $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ fi
+ fi
+ fi
+
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ fi
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
+ status=$?
+ if test $status -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case "$xlib" in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
+ status=$?
+ if test $status -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+ libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linkopts="$linkopts $flag"
+ fi
+
+ # Do each of the archive commands.
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval cmds=\"$archive_expsym_cmds\"
+ else
+ eval cmds=\"$archive_cmds\"
+ fi
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Create links to the real library.
+ for linkname in $linknames; do
+ if test "$realname" != "$linkname"; then
+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ fi
+ done
+
+ # If -module or -export-dynamic was specified, set the dlname.
+ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+ dlname="$soname"
+ fi
+ fi
+ ;;
+
+ *.lo | *.o | *.obj)
+ if test -n "$link_against_libtool_libs"; then
+ $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
+ exit 1
+ fi
+
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+ fi
+
+ case "$output" in
+ *.lo)
+ if test -n "$objs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+ exit 1
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ ;;
+ *)
+ libobj=
+ obj="$output"
+ ;;
+ esac
+
+ # Delete the old objects.
+ $run $rm $obj $libobj
+
+ # Objects from convenience libraries. This assumes
+ # single-version convenience libraries. Whenever we create
+ # different ones for PIC/non-PIC, this we'll have to duplicate
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+ # -Wl from whole_archive_flag_spec
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
+ status=$?
+ if test $status -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case "$xlib" in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
+ status=$?
+ if test $status -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ # Create the old-style object.
+ reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
+
+ output="$obj"
+ eval cmds=\"$reload_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Exit if we aren't doing a library object file.
+ if test -z "$libobj"; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit 0
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ # Create an invalid libtool object if no PIC, so that we don't
+ # accidentally link it into a program.
+ $show "echo timestamp > $libobj"
+ $run eval "echo timestamp > $libobj" || exit $?
+ exit 0
+ fi
+
+ if test -n "$pic_flag"; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+ eval cmds=\"$reload_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ else
+ # Just create a symlink.
+ $show $rm $libobj
+ $run $rm $libobj
+ $show "$LN_S $obj $libobj"
+ $run $LN_S $obj $libobj || exit $?
+ fi
+
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit 0
+ ;;
+
+ # Anything else should be a program.
+ *)
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+ fi
+
+ if test "$preload" = yes; then
+ if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
+ test "$dlopen_self_static" = unknown; then
+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+ fi
+ fi
+
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ for libdir in $rpath $xrpath; do
+ # This is the magic to use -rpath.
+ case "$compile_rpath " in
+ *" $libdir "*) ;;
+ *) compile_rpath="$compile_rpath $libdir" ;;
+ esac
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ fi
+
+ # Now hardcode the library paths
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ compile_rpath="$rpath"
+
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ finalize_rpath="$rpath"
+
+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$output_objdir" = "X$output"; then
+ output_objdir="$objdir"
+ else
+ output_objdir="$output_objdir/$objdir"
+ fi
+
+ # Create the binary in the object directory, then wrap it.
+ if test ! -d $output_objdir; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+ status=$?
+ if test $status -ne 0 && test ! -d $output_objdir; then
+ exit $status
+ fi
+ fi
+
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ fi
+
+ dlsyms=
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ dlsyms="${outputname}S.c"
+ else
+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ fi
+ fi
+
+ if test -n "$dlsyms"; then
+ case "$dlsyms" in
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+ nlist="$output_objdir/${outputname}.nm"
+
+ $show "$rm $nlist ${nlist}S ${nlist}T"
+ $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+ # Parse the name list into a source file.
+ $show "creating $output_objdir/$dlsyms"
+
+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+ if test "$dlself" = yes; then
+ $show "generating symbol list for \`$output'"
+
+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+ progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for arg in $progfiles; do
+ $show "extracting global C symbols from \`$arg'"
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+ $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ if test -n "$export_symbols_regex"; then
+ $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ export_symbols="$output_objdir/$output.exp"
+ $run $rm $export_symbols
+ $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ else
+ $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
+ fi
+ fi
+
+ for arg in $dlprefiles; do
+ $show "extracting global C symbols from \`$arg'"
+ name=`echo "$arg" | sed -e 's%^.*/%%'`
+ $run eval 'echo ": $name " >> "$nlist"'
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -z "$run"; then
+ # Make sure we have at least an empty file.
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+ egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $mv "$nlist"T "$nlist"
+ fi
+
+ # Try sorting and uniquifying the output.
+ if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+ :
+ else
+ grep -v "^: " < "$nlist" > "$nlist"S
+ fi
+
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ else
+ echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ fi
+
+ $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+ sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \
+ -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \
+ < "$nlist" >> "$output_objdir/$dlsyms"
+
+ $echo >> "$output_objdir/$dlsyms" "\
+ {0, (lt_ptr_t) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+ fi
+
+ pic_flag_for_symtable=
+ case "$host" in
+ # compiling the symbol table file with pic_flag works around
+ # a FreeBSD bug that causes programs to crash when -lm is
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ *-*-freebsd2*|*-*-freebsd3.0*)
+ case "$compile_command " in
+ *" -static "*) ;;
+ *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
+ esac
+ esac
+
+ # Now compile the dynamic symbol file.
+ $show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+ exit 1
+ ;;
+ esac
+ else
+ # We keep going just in case the user didn't refer to
+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
+ # really was required.
+
+ # Nullify the symbol file.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+
+ if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+ status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+ $show "$rm $output_objdir/${outputname}S.${objext}"
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+ exit $status
+ fi
+
+ if test -n "$shlibpath_var"; then
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
+ case "$dir" in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+ rpath="$rpath$dir:"
+ ;;
+ *)
+ # Relative path: add a thisdir entry.
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
+ done
+ temp_rpath="$rpath"
+ fi
+
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+ fi
+ if test -n "$finalize_shlibpath"; then
+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+ fi
+
+ compile_var=
+ finalize_var=
+ if test -n "$runpath_var"; then
+ if test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ if test -n "$finalize_perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ fi
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+ $echo "$modename: \`$output' will be relinked during installation" 1>&2
+ else
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+ fi
+ else
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+ fi
+ fi
+
+ # Replace the output file specification.
+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+ # Delete the old output files.
+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+
+ # Now create the wrapper script.
+ $show "creating $output"
+
+ # Quote the relink command for shipping.
+ if test -n "$relink_command"; then
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $echo for shipping.
+ if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+ case "$0" in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if our run command is non-null.
+ if test -z "$run"; then
+ # win32 will think the script is a binary if it has
+ # a .exe suffix, so we strip it off here.
+ case $output in
+ *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+ esac
+ $rm $output
+ trap "$rm $output; exit 1" 1 2 15
+
+ $echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+ # install mode needs the following variable:
+ link_against_libtool_libs='$link_against_libtool_libs'
+else
+ # When we are sourced in execute mode, \$file and \$echo are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ echo=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$echo works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$echo will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
+"
+ $echo >> $output "\
+
+ # Find the directory that this script lives in.
+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+ file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+ case \"\$destdir\" in
+ [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;;
+ *) thisdir=\"\$thisdir/\$destdir\" ;;
+ esac
+ fi
+
+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+ done
+
+ # Try to get the absolute directory name.
+ absdir=\`cd \"\$thisdir\" && pwd\`
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+ if test "$fast_install" = yes; then
+ echo >> $output "\
+ program=lt-'$outputname'
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" || \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+
+ if test ! -d \"\$progdir\"; then
+ $mkdir \"\$progdir\"
+ else
+ $rm \"\$progdir/\$file\"
+ fi"
+
+ echo >> $output "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+ if (cd \"\$thisdir\" && eval \$relink_command); then :
+ else
+ $rm \"\$progdir/\$file\"
+ exit 1
+ fi
+ fi
+
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+ { $rm \"\$progdir/\$program\";
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+ $rm \"\$progdir/\$file\"
+ fi"
+ else
+ echo >> $output "\
+ program='$outputname$exeext'
+ progdir=\"\$thisdir/$objdir\"
+"
+ fi
+
+ echo >> $output "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $echo >> $output "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+"
+ fi
+
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $echo >> $output "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
+ $echo >> $output "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+"
+ case $host in
+ *-*-cygwin* | *-*-mingw | *-*-os2*)
+ # win32 systems need to use the prog path for dll
+ # lookup to work
+ $echo >> $output "\
+ exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+ ;;
+ *)
+ $echo >> $output "\
+ # Export the path to the program.
+ PATH=\"\$progdir:\$PATH\"
+ export PATH
+
+ exec \$program \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $echo >> $output "\
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ exit 1
+ fi
+ else
+ # The program doesn't exist.
+ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ echo \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+ fi
+fi\
+"
+ chmod +x $output
+ fi
+ exit 0
+ ;;
+ esac
+
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
+
+ if test "$build_libtool_libs" = convenience; then
+ oldobjs="$libobjs_save"
+ addlibs="$convenience"
+ build_libtool_libs=no
+ else
+ if test "$build_libtool_libs" = module; then
+ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+ else
+ oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+ fi
+ addlibs="$old_convenience"
+ fi
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
+ status=$?
+ if test $status -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ # Add in members from convenience archives.
+ for xlib in $addlibs; do
+ # Extract the objects.
+ case "$xlib" in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
+ status=$?
+ if test $status -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ eval cmds=\"$old_archive_from_new_cmds\"
+ else
+ # Ensure that we have .o objects in place incase we decided
+ # not to build a shared library, and have fallen back to building
+ # static libs even though --disable-static was passed!
+ for oldobj in $oldobjs; do
+ if test ! -f $oldobj; then
+ obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
+ $show "${LN_S} $obj $oldobj"
+ $run ${LN_S} $obj $oldobj || exit $?
+ fi
+ done
+
+ eval cmds=\"$old_archive_cmds\"
+ fi
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$generated"; then
+ $show "${rm}r$generated"
+ $run ${rm}r$generated
+ fi
+
+ # Now create the libtool archive.
+ case "$output" in
+ *.la)
+ old_library=
+ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ $show "creating $output"
+
+ if test -n "$xrpath"; then
+ temp_xrpath=
+ for libdir in $xrpath; do
+ temp_xrpath="$temp_xrpath -R$libdir"
+ done
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+ output="$output_objdir/$outputname"i
+ fi
+ $rm $output
+ $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$dlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'\
+"
+ done
+ fi
+
+ # Do a symbolic link so that the libtool archive can be found in
+ # LD_LIBRARY_PATH before the program is installed.
+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+ $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
+ ;;
+ esac
+ exit 0
+ ;;
+
+ # libtool install mode
+ install)
+ modename="$modename: install"
+
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case "$arg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$arg "
+ arg="$1"
+ shift
+ else
+ install_prog=
+ arg="$nonopt"
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case "$arg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog$arg"
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+ files=
+ opts=
+ prev=
+ install_type=
+ isdir=no
+ stripme=
+ for arg
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest="$arg"
+ continue
+ fi
+
+ case "$arg" in
+ -d) isdir=yes ;;
+ -f) prev="-f" ;;
+ -g) prev="-g" ;;
+ -m) prev="-m" ;;
+ -o) prev="-o" ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+ -*) ;;
+
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+ dest="$arg"
+ continue
+ fi
+ ;;
+ esac
+
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case "$arg" in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog $arg"
+ done
+
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ $echo "$modename: no file or destination specified" 1>&2
+ else
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ # Strip any trailing slash from the destination.
+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
+ if test "$isdir" = yes; then
+ destdir="$dest"
+ destname=
+ else
+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$destdir" = "X$dest" && destdir=.
+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files
+ if test $# -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+ fi
+ case "$destdir" in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ for file in $files; do
+ case "$file" in
+ *.lo) ;;
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+ current_libdirs=
+ for file in $files; do
+
+ # Do each installation.
+ case "$file" in
+ *.a | *.lib)
+ # Do the static libraries later.
+ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ library_names=
+ old_library=
+ # If there is no directory component, then add one.
+ case "$file" in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Add the libdir to current_libdirs if it is the destination.
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
+
+ dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
+ test "X$dir" = "X$file/" && dir=
+ dir="$dir$objdir"
+
+ # See the names of the shared library.
+ set dummy $library_names
+ if test -n "$2"; then
+ realname="$2"
+ shift
+ shift
+
+ # Install the shared library and build the symlinks.
+ $show "$install_prog $dir/$realname $destdir/$realname"
+ $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
+
+ if test $# -gt 0; then
+ # Delete the old symlinks, and create new ones.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+ $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+ eval cmds=\"$postinstall_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ # Install the pseudo-library for information purposes.
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
+ # Install (i.e. copy) a libtool object.
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+ case "$destfile" in
+ *.lo)
+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+ ;;
+ *.o | *.obj)
+ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ ;;
+ esac
+
+ # Install the libtool object if requested.
+ if test -n "$destfile"; then
+ $show "$install_prog $file $destfile"
+ $run eval "$install_prog $file $destfile" || exit $?
+ fi
+
+ # Install the old object if enabled.
+ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+ exit 0
+ ;;
+
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # Do a test to see if this is really a libtool program.
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ link_against_libtool_libs=
+ relink_command=
+
+ # If there is no directory component, then add one.
+ case "$file" in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$link_against_libtool_libs"; then
+ $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+ exit 1
+ fi
+
+ finalize=yes
+ for lib in $link_against_libtool_libs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ # If there is no directory component, then add one.
+ case "$lib" in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+ fi
+ libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ finalize=no
+ fi
+ done
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+ tmpdir="/tmp"
+ test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ tmpdir="$tmpdir/libtool-$$"
+ if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ else
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ continue
+ fi
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ ${rm}r "$tmpdir"
+ continue
+ fi
+ file="$outputname"
+ else
+ $echo "$modename: warning: cannot relink \`$file'" 1>&2
+ fi
+ else
+ # Install the binary that we compiled earlier.
+ file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+ $show "$install_prog$stripme $file $destfile"
+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+ test -n "$outputname" && ${rm}r "$tmpdir"
+ ;;
+ esac
+ done
+
+ for file in $staticlibs; do
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
+
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+ # Do each command in the postinstall commands.
+ eval cmds=\"$old_postinstall_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$future_libdirs"; then
+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+ fi
+
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+ exec $SHELL $0 --finish$current_libdirs
+ exit 1
+ fi
+
+ exit 0
+ ;;
+
+ # libtool finish mode
+ finish)
+ modename="$modename: finish"
+ libdirs="$nonopt"
+ admincmds=
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+ eval cmds=\"$finish_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+ done
+ IFS="$save_ifs"
+ fi
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+ $run eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
+ fi
+
+ # Exit here if they wanted silent mode.
+ test "$show" = : && exit 0
+
+ echo "----------------------------------------------------------------------"
+ echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ echo " $libdir"
+ done
+ echo
+ echo "If you ever happen to want to link against installed libraries"
+ echo "in a given directory, LIBDIR, you must either use libtool, and"
+ echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+ echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
+
+ echo " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ echo " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ echo
+ echo "See any operating system documentation about shared libraries for"
+ echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ echo "----------------------------------------------------------------------"
+ exit 0
+ ;;
+
+ # libtool execute mode
+ execute)
+ modename="$modename: execute"
+
+ # The first argument is the command name.
+ cmd="$nonopt"
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+ exit 1
+ fi
+
+ # Handle -dlopen flags immediately.
+ for file in $execute_dlfiles; do
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ dir=
+ case "$file" in
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ # Read the libtool library.
+ dlname=
+ library_names=
+
+ # If there is no directory component, then add one.
+ case "$file" in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Skip this library if it cannot be dlopened.
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ exit 1
+ fi
+ ;;
+
+ *.lo)
+ # Just add the directory containing the .lo file.
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+ ;;
+
+ *)
+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+ eval "$shlibpath_var=\"\$dir\""
+ else
+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+ fi
+ done
+
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+ libtool_execute_magic="$magic"
+
+ # Check if any of the arguments is a wrapper script.
+ args=
+ for file
+ do
+ case "$file" in
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ # If there is no directory component, then add one.
+ case "$file" in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ fi
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+ args="$args \"$file\""
+ done
+
+ if test -z "$run"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+
+ # Restore saved enviroment variables
+ if test "${save_LC_ALL+set}" = set; then
+ LC_ALL="$save_LC_ALL"; export LC_ALL
+ fi
+ if test "${save_LANG+set}" = set; then
+ LANG="$save_LANG"; export LANG
+ fi
+
+ # Now actually exec the command.
+ eval "exec \$cmd$args"
+
+ $echo "$modename: cannot exec \$cmd$args"
+ exit 1
+ else
+ # Display what would be done.
+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ $echo "export $shlibpath_var"
+ $echo "$cmd$args"
+ exit 0
+ fi
+ ;;
+
+ # libtool uninstall mode
+ uninstall)
+ modename="$modename: uninstall"
+ rm="$nonopt"
+ files=
+
+ for arg
+ do
+ case "$arg" in
+ -*) rm="$rm $arg" ;;
+ *) files="$files $arg" ;;
+ esac
+ done
+
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ fi
+
+ for file in $files; do
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+ rmfiles="$file"
+
+ case "$name" in
+ *.la)
+ # Possibly a libtool archive, so verify it.
+ if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ . $dir/$name
+
+ # Delete the libtool libraries and symlinks.
+ for n in $library_names; do
+ rmfiles="$rmfiles $dir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
+
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles
+
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+ eval cmds=\"$postuninstall_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd"
+ done
+ IFS="$save_ifs"
+ fi
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+ eval cmds=\"$old_postuninstall_cmds\"
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd"
+ done
+ IFS="$save_ifs"
+ fi
+
+ # FIXME: should reinstall the best remaining shared library.
+ fi
+ ;;
+
+ *.lo)
+ if test "$build_old_libs" = yes; then
+ oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+ rmfiles="$rmfiles $dir/$oldobj"
+ fi
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles
+ ;;
+
+ *)
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles
+ ;;
+ esac
+ done
+ exit 0
+ ;;
+
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+ exit 1
+ ;;
+ esac
+
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+ exit 1
+fi # test -z "$show_help"
+
+# We need to display help for each of the modes.
+case "$mode" in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+-n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --finish same as \`--mode=finish'
+ --help display this help message and exit
+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
+ --quiet same as \`--silent'
+ --silent don't print informational messages
+ --version print version information
+
+MODE must be one of the following:
+
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE."
+ exit 0
+ ;;
+
+compile)
+ $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -static always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+ ;;
+
+execute)
+ $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+ ;;
+
+finish)
+ $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges. Use
+the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+install)
+ $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command. The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+ ;;
+
+link)
+ $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+ -static do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename. Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+ ;;
+
+uninstall)
+ $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+*)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+ exit 1
+ ;;
+esac
+
+echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/config.sub
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/config.sub (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/config.sub Sat Jul 13 19:22:52 2002
@@ -0,0 +1,1215 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+ echo Configuration name missing. 1>&2
+ echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+ echo "or $0 ALIAS" 1>&2
+ echo where ALIAS is a recognized configuration type. 1>&2
+ exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+ *local*)
+ echo $1
+ exit 0
+ ;;
+ *)
+ ;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ linux-gnu*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=vxworks
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+ | 580 | i960 | h8300 \
+ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+ | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+ | mips64vr5000 | miprs64vr5000el \
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+ | thumb | d10v)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i[34567]86)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+ | xmp-* | ymp-* \
+ | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+ | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ | clipper-* | orion-* \
+ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ | mipstx39-* | mipstx39el-* \
+ | f301-* | armv*-* | t3e-* \
+ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+ | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-cbm
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-cbm
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-cbm
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ cray2)
+ basic_machine=cray2-cray
+ os=-unicos
+ ;;
+ [ctj]90-cray)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i[34567]86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i[34567]86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i[34567]86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i[34567]86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ i386-go32 | go32)
+ basic_machine=i386-unknown
+ os=-go32
+ ;;
+ i386-mingw32 | mingw32)
+ basic_machine=i386-unknown
+ os=-mingw32
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | *MiNT)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mipsel*-linux*)
+ basic_machine=mipsel-unknown
+ os=-linux-gnu
+ ;;
+ mips*-linux*)
+ basic_machine=mips-unknown
+ os=-linux-gnu
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ msdos)
+ basic_machine=i386-unknown
+ os=-msdos
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-corel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexen)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexen-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=rs6000-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sparclite-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=t3e-cray
+ os=-unicos
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ xmp)
+ basic_machine=xmp-cray
+ os=-unicos
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ mips)
+ if [ x$os = x-linux-gnu ]; then
+ basic_machine=mips-unknown
+ else
+ basic_machine=mips-mips
+ fi
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sparc | sparcv9)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ c4x*)
+ basic_machine=c4x-none
+ os=-coff
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -*MiNT)
+ os=-mint
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-corel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f301-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -vxsim* | -vxworks*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -*MiNT)
+ vendor=atari
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/aclocal.m4
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/aclocal.m4 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/aclocal.m4 Sat Jul 13 19:22:53 2002
@@ -0,0 +1,533 @@
+dnl config/aclocal.m4 generated automatically by aclocal 1.4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# Do all the work for Automake. This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ if test "[$]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftestfile`
+ fi
+ if test "[$]*" != "X $srcdir/configure conftestfile" \
+ && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "[$]2" = conftestfile
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+ $1=$2
+ AC_MSG_RESULT(found)
+else
+ $1="$3/missing $2"
+ AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated. We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+ case " <<$>>CONFIG_HEADERS " in
+ *" <<$>>am_file "*<<)>>
+ echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+ ;;
+ esac
+ am_indx=`expr "<<$>>am_indx" + 1`
+done<<>>dnl>>)
+changequote([,]))])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool. ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags="--cache-file=$cache_file"
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+[libtool_flags="$libtool_flags --enable-dlopen"])
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[libtool_flags="$libtool_flags --enable-win32-dll"])
+AC_ARG_ENABLE(libtool-lock,
+ [ --disable-libtool-lock avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$host" in
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+])
+esac
+])
+
+# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+
+# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)])
+
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+# `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+ for pkg in $enableval; do
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$ac_save_ifs"
+ ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+])
+
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)])
+
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
+[AC_ARG_WITH(gnu-ld,
+[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by GCC])
+ ac_prog=`($CC -print-prog-name=ld) 2>&5`
+ case "$ac_prog" in
+ # Accept absolute paths.
+changequote(,)dnl
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ ac_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_SUBST(LD)
+AC_PROG_LD_GNU
+])
+
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+ ac_cv_prog_gnu_ld=yes
+else
+ ac_cv_prog_gnu_ld=no
+fi])
+])
+
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
+[AC_MSG_CHECKING([for BSD-compatible nm])
+AC_CACHE_VAL(ac_cv_path_NM,
+[if test -n "$NM"; then
+ # Let the user override the test.
+ ac_cv_path_NM="$NM"
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -B"
+ break
+ elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+ ac_cv_path_NM="$ac_dir/nm -p"
+ break
+ else
+ ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+AC_SUBST(NM)
+])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case "$host" in
+*-*-beos* | *-*-cygwin*)
+ # These system don't have libm
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, main, LIBM="-lm")
+ ;;
+esac
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case "$enable_ltdl_convenience" in
+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_CHECK_LIB(ltdl, main,
+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+ [if test x"$enable_ltdl_install" = xno; then
+ AC_MSG_WARN([libltdl not installed, but installation disabled])
+ else
+ enable_ltdl_install=yes
+ fi
+ ])
+ if test x"$enable_ltdl_install" = x"yes"; then
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ INCLTDL=
+ fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/config/install-sh
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/install-sh (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/install-sh Sat Jul 13 19:22:53 2002
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
@@ -118,6 +118,7 @@
if [ -d $dst ]; then
instcmd=:
+ chmodcmd=""
else
instcmd=mkdir
fi
Added: trunk/orca/packages/rrdtool-1.0.7.2/config/stamp-h.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/config/stamp-h.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/config/stamp-h.in Sat Jul 13 19:22:53 2002
@@ -0,0 +1 @@
+timestamp
Modified: trunk/orca/packages/rrdtool-1.0.7.2/TODO
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/TODO (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/TODO Sat Jul 13 19:22:53 2002
@@ -1,9 +1,45 @@
-let the user define the base resolution of the
-graph independantly of the pixle resolution. If it is smaller than one
-pixle it will simply be ignored
-
-do not fail if the same DEF gets stacked twice
-im->gdes[ii].p_data = im->gdes[vidx].p_data;
-is a bad idea ...
+1.1.x Goals
+-----------
-get 1.0 out ...
+let the user define the base resolution of the graph independently of
+the pixel resolution. If it is smaller than one pixel it will simply
+be ignored
+
+allow sub second presition for step definition
+
+modularise consolidation and aquisition functions
+
+Allow the user to define vertical scaling of graphs in a more flexible way.
+some thing like --inner-range 0-1000 and --outer-range 0-10000 which means
+that the grapher can choose its vertical scaling in the given range ...
+this would replace upper and lower limit
+
+make the inclusion of G?PRINT like output in to the lables of other graph
+elements possible
+
+add axis on the right and on top of the graph ...
+
+add configurable counter wrap
+
+95th percentile plotting
+
+build derivatives while plotting
+
+show trend by building moving average and represent it as an arrow
+
+offer side by side tiny box plots for each succesive hour, or some other
+means of seeing the variation rather than just the mean level
+
+circular periodic plots ... (polar)
+
+analyse data in non time domain ...
+
+add smothing functions to grapher, using rolling average ...
+
+make VRULE and HRULE with 123 versions ...
+
+configurable fonts ... truetype ? colors ...
+antialiasing ...
+
+make it possible to define order of legend items independant of their order
+on the commandline ...
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.in Sat Jul 13 19:22:54 2002
@@ -0,0 +1,299 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+SUFFIXES = .pod .1 .man .html .txt .pm
+
+#AUTOMAKE_OPTIONS = foreign
+
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+
+CLEANFILES = *.1 *.html *.txt *-dircache *.pm
+
+POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod rrdgraph.pod bin_dec_hex.pod rrdfetch.pod rrdrestore.pod rrddump.pod rrdtune.pod rrdresize.pod rrdcgi.pod rrdtutorial.pod
+
+
+PMP = RRDs.pm RRDp.pm
+
+MAN = $(POD:.pod=.1) $(PMP:.pm=.1)
+TXT = $(MAN:.1=.txt)
+HTML = $(POD:.pod=.html) $(PMP:.pm=.html)
+
+# what should go into the distribution
+EXTRA_DIST = $(POD) $(HTML) $(TXT)
+
+# some install rules
+idocdir = $(prefix)/doc
+idoc_DATA = $(POD) $(TXT)
+ihtmldir = $(prefix)/html
+ihtml_DATA = $(HTML)
+imandir = $(prefix)/man/man1
+iman_DATA = $(MAN)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+DATA = $(idoc_DATA) $(ihtml_DATA) $(iman_DATA)
+
+DIST_COMMON = Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .1 .html .man .pm .pod .txt
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-idocDATA: $(idoc_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(idocdir)
+ @list='$(idoc_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idocdir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(idocdir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(idocdir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(idocdir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-idocDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(idoc_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(idocdir)/$$p; \
+ done
+
+install-ihtmlDATA: $(ihtml_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(ihtmldir)
+ @list='$(ihtml_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ihtmldir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ihtmldir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(ihtmldir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(ihtmldir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-ihtmlDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(ihtml_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(ihtmldir)/$$p; \
+ done
+
+install-imanDATA: $(iman_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(imandir)
+ @list='$(iman_DATA)'; for p in $$list; do \
+ if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imandir)/$$p"; \
+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imandir)/$$p; \
+ else if test -f $$p; then \
+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(imandir)/$$p"; \
+ $(INSTALL_DATA) $$p $(DESTDIR)$(imandir)/$$p; \
+ fi; fi; \
+ done
+
+uninstall-imanDATA:
+ @$(NORMAL_UNINSTALL)
+ list='$(iman_DATA)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(imandir)/$$p; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = doc
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-idocDATA install-ihtmlDATA install-imanDATA
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-idocDATA uninstall-ihtmlDATA uninstall-imanDATA
+uninstall: uninstall-am
+all-am: Makefile $(DATA) all-local
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(idocdir) $(DESTDIR)$(ihtmldir) \
+ $(DESTDIR)$(imandir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-idocDATA install-idocDATA uninstall-ihtmlDATA \
+install-ihtmlDATA uninstall-imanDATA install-imanDATA tags distdir \
+info-am info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-local all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+all-local: link txt man html
+
+.pod.1 .pm.1 .pl.1:
+ pod2man --release=$(VERSION) --center=rrdtool $< > $@
+
+.1.txt:
+ nroff -man -Tlp $< > $@
+
+.pm.html .pod.html .pl.html:
+ pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
+
+RRDs.pm:
+ ln -s ../perl-shared/RRDs.pm .
+
+RRDp.pm:
+ ln -s ../perl-piped/RRDp.pm .
+
+link: RRDp.pm RRDs.pm
+
+man: $(MAN)
+
+html: $(HTML)
+
+txt: $(TXT)
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.txt Sat Jul 13 19:22:54 2002
@@ -61,6 +61,6 @@
-25/May/99 19990525.23 1
+9/Aug/99 1.0.7 1
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.txt Sat Jul 13 19:22:54 2002
@@ -13,7 +13,7 @@
[RRRRRRRRAAAA::::_C_F::::_x_f_f::::_s_t_e_p_s::::_r_o_w_s]
DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
- The create function of the rrd tool lets you set up new
+ The create function of the RRDtool lets you set up new
Round Robin Database (RRRRRRRRDDDD) files. The file is created at
its final, full size and filled with _*_U_N_K_N_O_W_N_* data.
@@ -22,17 +22,15 @@
should end with the extension _._r_r_d. However,
rrrrrrrrddddttttoooooooollll will accept any filename.
- --------ssssttttaaaarrrrtttt|----bbbb _s_t_a_r_t _t_i_m_e (default: current time)
+ --------ssssttttaaaarrrrtttt|----bbbb _s_t_a_r_t _t_i_m_e (default: now - 10s)
Specifies the time in seconds since 1970-01-01 UTC
when the first value should be added to the RRRRRRRRDDDD.
rrrrrrrrddddttttoooooooollll will not accept any data timed before or
at the time specified.
- Negative input is treated as current time minus
- the specified number of seconds. See also AT-STYLE
- TIME SPECIFICATION section in the _r_r_d_f_e_t_c_h
- documentation for alternative ways to specify
- time.
+ See also AT-STYLE TIME SPECIFICATION section in
+ the _r_r_d_f_e_t_c_h documentation for more ways to
+ specify time.
--------sssstttteeeepppp|----ssss _s_t_e_p (default: 300 seconds)
Specifies the base interval in seconds with which
@@ -58,10 +56,12 @@
like the InOctets counter in a router. The CCCCOOOOUUUUNNNNTTTTEEEERRRR
data source assumes that the counter never
decreases, except when a counter overflows. The
+ update function takes the overflow into account.
+ The counter is stored as a per-second rate. DDDDEEEERRRRIIIIVVVVEEEE
-21/Apr/99 19990426.22 1
+20/Aug/99 1.0.7 1
@@ -70,8 +70,6 @@
RRDCREATE(1) rrdtool RRDCREATE(1)
- update function takes the overflow into account.
- The counter is stored as a per-second rate. DDDDEEEERRRRIIIIVVVVEEEE
will store the the derivative of the line going
from the last to the current value of the data
source. This can be useful for gauges, for
@@ -90,11 +88,17 @@
outside the defined range will be regarded as
_*_U_N_K_N_O_W_N_*. If you do not know or care about min
and max, set them to U for unknown. Note that min
- and max always refere to the processed values of
+ and max always refer to the processed values of
the DS. For a traffic-CCCCOOOOUUUUNNNNTTTTEEEERRRR type DS this would
be the max and min data-rate expected from the
device.
+ _I_f _i_n_f_o_r_m_a_t_i_o_n _o_n _m_i_n_i_m_a_l_/_m_a_x_i_m_a_l _e_x_p_e_c_t_e_d _v_a_l_u_e_s
+ _i_s _a_v_a_i_l_a_b_l_e_, _a_l_w_a_y_s _s_e_t _t_h_e _m_i_n _a_n_d_/_o_r _m_a_x
+ _p_r_o_p_e_r_t_i_e_s_. _T_h_i_s _w_i_l_l _h_e_l_p _R_R_D_t_o_o_l _i_n _d_o_i_n_g _a
+ _s_i_m_p_l_e _s_a_n_i_t_y _c_h_e_c_k _o_n _t_h_e _d_a_t_a _s_u_p_p_l_i_e_d _w_h_e_n
+ _r_u_n_n_i_n_g _u_p_d_a_t_e_.
+
RRRRRRRRAAAA::::_C_F::::_x_f_f::::_s_t_e_p_s::::_r_o_w_s
The purpose of an RRRRRRRRDDDD is to store data in the
round robin archives (RRRRRRRRAAAA). An archive consists of
@@ -120,14 +124,10 @@
which then goes into the archive.
_r_o_w_s defines how many generations of data values
- are kept in an RRRRRRRRAAAA.
-
-EEEEXXXXAAAAMMMMPPPPLLLLEEEE
- rrdtool create temperature.rrd --step 300
-21/Apr/99 19990426.22 2
+20/Aug/99 1.0.7 2
@@ -136,6 +136,10 @@
RRDCREATE(1) rrdtool RRDCREATE(1)
+ are kept in an RRRRRRRRAAAA.
+
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE
+ rrdtool create temperature.rrd --step 300
DS:temp:GAUGE:600:-273:5000 RRA:AVERAGE:0.5:1:1200
RRA:MIN:0.5:12:2400 RRA:MAX:0.5:12:2400
RRA:AVERAGE:0.5:12:2400
@@ -189,10 +193,6 @@
-
-
-
-
-21/Apr/99 19990426.22 3
+20/Aug/99 1.0.7 3
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.html Sat Jul 13 19:22:54 2002
@@ -153,8 +153,8 @@
digit 1. This is difficult and prone to errors. Therefore we normally would
use another base, called hexadecimal. It uses 16 different symbols. First
the symbols from the decimal system are used, thereafter we continue with
-the alfabetic characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D,
-E and F. This system is choosen because the hexadecimal form can be
+the alphabetic characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D,
+E and F. This system is chosen because the hexadecimal form can be
converted into the binary system very easy (and back).
@@ -232,7 +232,7 @@
Computers (or rather the parsers running on them) would have a hard time
converting a number like <CODE>1234(16).</CODE> Therefore hexadecimal
numbers get a prefix. This prefix depends on the language you're writing
-in. Some of the prefixes are ``0x'' for C, ``$'' for pascal, ``#'' for
+in. Some of the prefixes are ``0x'' for C, ``$'' for Pascal, ``#'' for
HTML. It is common to assume that if a number starts with a zero, it is
octal. It does not matter what is used as long as you know what it is. I
will use ``0x'' for hexadecimal, ``%'' for binary and ``0'' for octal. The
@@ -522,15 +522,15 @@
For low values, try to do the calculations yourself, check them with a
calculator. The more you do the calculations yourself, the more you find
-that you didn't make mistakes. In the end, you'll do calcula in other bases
+that you didn't make mistakes. In the end, you'll do calculi in other bases
as easy as you do in decimal.
<P>
-When the numbers get bigger, you'll have to realise that a computer is not
+When the numbers get bigger, you'll have to realize that a computer is not
called a computer just to have a nice name. There are many different
-calculators available. Use them. For unix you could use ``bc'' which is
+calculators available. Use them. For Unix you could use ``bc'' which is
called so as it is short for Binary Calculator. It calculates not only in
decimal, but in all bases you'll ever use (among them Binary).
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.pod Sat Jul 13 19:22:55 2002
@@ -12,7 +12,7 @@
=head1 DESCRIPTION
-The create function of the rrd tool lets you set up new
+The create function of the RRDtool lets you set up new
Round Robin Database (B<RRD>) files.
The file is created at its final, full size and filled
with I<*UNKNOWN*> data.
@@ -25,15 +25,14 @@
with the extension F<.rrd>. However, B<rrdtool> will accept any
filename.
-=item B<--start>|B<-b> I<start time> (default: current time)
+=item B<--start>|B<-b> I<start time> (default: now - 10s)
Specifies the time in seconds since 1970-01-01 UTC when the first
value should be added to the B<RRD>. B<rrdtool> will not accept
any data timed before or at the time specified.
-Negative input is treated as current time minus the specified number
-of seconds. See also AT-STYLE TIME SPECIFICATION section in the
-I<rrdfetch> documentation for alternative ways to specify time.
+See also AT-STYLE TIME SPECIFICATION section in the
+I<rrdfetch> documentation for more ways to specify time.
=item B<--step>|B<-s> I<step> (default: 300 seconds)
@@ -71,10 +70,14 @@
the data supplied by this data source. If I<min> and/or I<max> are
defined, any value outside the defined range will be regarded as
I<*UNKNOWN*>. If you do not know or care about min and max, set them
-to U for unknown. Note that min and max always refere to the processed values
+to U for unknown. Note that min and max always refer to the processed values
of the DS. For a traffic-B<COUNTER> type DS this would be the max and min
data-rate expected from the device.
+I<If information on minimal/maximal expected values is available,
+always set the min and/or max properties. This will help RRDtool in
+doing a simple sanity check on the data supplied when running update.>
+
=item B<RRA:>I<CF>B<:>I<xff>B<:>I<steps>B<:>I<rows>
The purpose of an B<RRD> is to store data in the round robin archives
@@ -119,4 +122,4 @@
=head1 AUTHOR
-Tobias Oetiker <oetiker at ee.ethz.ch>
+Tobias Oetiker E<lt>oetiker at ee.ethz.chE<gt>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.html Sat Jul 13 19:22:55 2002
@@ -77,8 +77,8 @@
<P>
-The template switch alows you to specify which data sources you are going
-to update and in which order. If the datasources specified in the template
+The template switch allows you to specify which data sources you are going
+to update and in which order. If the data sources specified in the template
are not available in the rrd file, the update process will abort with an
error message.
@@ -100,17 +100,17 @@
<P>
The remaining elements of the argument are DS updates. The order of this
-list is the same as the order the datasources were defined in the rra. If
+list is the same as the order the data sources were defined in the rra. If
there is no data for a certain data-source, the letter
<STRONG>U</STRONG> (eg. N:0.1:U:1) can be defined.
<P>
-The format of the value acquired from the datasource is dependent of the
-datasource type chosen. Normally it will be numeric, but the data
+The format of the value acquired from the data source is dependent of the
+data source type chosen. Normally it will be numeric, but the data
acquisition modules my impose their very own parsing of this parameter as
-long as the colon (<STRONG>:</STRONG>) remains the datasource value separator.
+long as the colon (<STRONG>:</STRONG>) remains the data source value separator.
<P>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.txt Sat Jul 13 19:22:55 2002
@@ -61,7 +61,7 @@
-14/Jan/99 19990426.22 1
+9/Aug/99 1.0.7 1
@@ -127,6 +127,6 @@
-14/Jan/99 19990426.22 2
+9/Aug/99 1.0.7 2
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.html Sat Jul 13 19:22:55 2002
@@ -95,22 +95,23 @@
<P>
-<DT><STRONG><A NAME="item__start_s">--start|-s start (default -24*3600)
+<DT><STRONG><A NAME="item__start_s">--start|-s start (default end-1day)
</A></STRONG><DD>
when should the data begin. A time in seconds since epoch (1970-01-01) is
-required. Negative numbers are relative to the end time. By default one day
-worth of data will be fetched. See also AT-STYLE TIME SPECIFICATION section
-for alternative ways to specify start time.
+required. Negative numbers are relative to the current time. By default one
+day worth of data will be fetched. See also AT-STYLE TIME SPECIFICATION
+section for a detailed explanation on ways to specify start time.
<P>
-<DT><STRONG><A NAME="item__end_e">--end|-e end (default current time)
+<DT><STRONG><A NAME="item__end_e">--end|-e end (default now)
</A></STRONG><DD>
when should the data end. Time in seconds since epoch. See also AT-STYLE
-TIME SPECIFICATION section for alternative ways to specify end time.
+TIME SPECIFICATION section for a detailed explanation of how to specify end
+time.
<P>
@@ -121,11 +122,11 @@
<H2><A NAME="AT_STYLE_TIME_SPECIFICATION">AT-STYLE TIME SPECIFICATION
</A></H2>
-The rrdtool does also understand at-style time specification. The
-specification is called ``at-style'' after unix command <CODE>at(1)</CODE>
+Apart from the traditional <EM>Seconds since epoch</EM>, rrdtool does also understand at-style time specification. The
+specification is called ``at-style'' after Unix command <CODE>at(1)</CODE>
that has moderately complex ways to specify time to run your job at. The
-at-style specification consists of two parts: <STRONG>TIME REFERENCE</STRONG>
-specification and <STRONG>TIME OFFSET</STRONG> specification.
+at-style specification consists of two parts: <STRONG>TIME REFERENCE</STRONG> specification and <STRONG>TIME
+OFFSET</STRONG> specification.
<P>
@@ -142,18 +143,18 @@
<P>
-<EM>Time-of-day</EM> can be specified as <STRONG>HH:MM</STRONG>, <STRONG>HH.MM</STRONG>, <STRONG>HHMM</STRONG>, or just <STRONG>HH</STRONG>, you can suffix it with <STRONG>am</STRONG> or <STRONG>pm</STRONG> or use 24-hours clock. The few special times of day are understood as well,
-these include <STRONG>midnight</STRONG> (00:00), <STRONG>noon</STRONG> (12:00) and british
+<EM>Time-of-day</EM> can be specified as <STRONG>HH:MM</STRONG>, <STRONG>HH.MM</STRONG>, or just <STRONG>HH</STRONG>, you can suffix it with <STRONG>am</STRONG> or <STRONG>pm</STRONG> or use 24-hours clock. The few special times of day are understood as well,
+these include <STRONG>midnight</STRONG> (00:00), <STRONG>noon</STRONG> (12:00) and British
<STRONG>teatime</STRONG> (16:00).
<P>
The <EM>day</EM> can be specified as <EM>month-name</EM> <EM>day-of-the-month</EM>
-and optional 2- or 4-digit <EM>year</EM> number (e.g. March 8 1999). Alternatively, you can use <EM>day-of-week-name</EM> (e.g. Monday), or one of the words: <STRONG>yesterday</STRONG>, <STRONG>today</STRONG>, <STRONG>tomorrow</STRONG>. You can also specify <EM>day</EM> as a full date in several numerical formats; these include: <STRONG>MM/DD/[YY]YY</STRONG>, <STRONG>DD.MM.[YY]YY</STRONG>, <STRONG>DDMM[YY]YY</STRONG>
+and optional 2- or 4-digit <EM>year</EM> number (e.g. March 8 1999). Alternatively, you can use <EM>day-of-week-name</EM> (e.g. Monday), or one of the words: <STRONG>yesterday</STRONG>, <STRONG>today</STRONG>, <STRONG>tomorrow</STRONG>. You can also specify <EM>day</EM> as a full date in several numerical formats; these include: <STRONG>MM/DD/[YY]YY</STRONG>, <STRONG>DD.MM.[YY]YY</STRONG>, <STRONG>YYYYMMDD</STRONG>
(<EM>NOTE1</EM>: this is different from the original <CODE>at(1)</CODE> behavior, which
interprets a single-number date as MMDD[YY]YY)
-<EM>NOTE2</EM>: if you specify <EM>day</EM> this way, the <EM>time-of-day</EM> is REQUIRED to be present in front of it.
+<EM>NOTE2</EM>: if you specify <EM>day</EM> this way, the <EM>time-of-day</EM> is REQUIRED to be present.
<P>
@@ -176,7 +177,7 @@
<H2><A NAME="TIME_OFFSET_SPECIFICATION">TIME OFFSET SPECIFICATION
</A></H2>
-Time offset specification is used to add (or substract) certain time
+Time offset specification is used to add (or subtract) certain time
interval to (from) the time reference moment. It consists of <EM>sign</EM>
(<STRONG>+</STRONG> or <STRONG>-</STRONG>) and <EM>amount</EM>. The following time units can be used to specify the <EM>amount</EM>: <STRONG>years</STRONG>, <STRONG>months</STRONG>, <STRONG>weeks</STRONG>, <STRONG>days</STRONG>,
<STRONG>hours</STRONG>, <STRONG>minutes</STRONG>, <STRONG>seconds</STRONG>, these can be used in singular or plural form, and abbreviated naturally
@@ -201,7 +202,7 @@
(after <CODE>mktime(3)</CODE> normalization); in the EET timezone '3:30am
Mar 29 1999 -1 day' yields '3:30am Mar 28 1999' (Sunday) which is invalid
time/date combination (because of 3am -> 4am DST forward clock
-ajustment, see the below example). On the other hand, hours, minutes, and
+adjustment, see the below example). On the other hand, hours, minutes, and
seconds are well defined time intervals, and these are guaranteed to always
produce time offsets exactly as specified (e.g. for EET timezone, '8:00 Mar 27 1999 +2 days' =
'8:00 Mar 29 1999', but since there is 1-hour DST forward clock adjustment takes place around 3:00 Mar 28 1999, the actual time interval between
@@ -212,7 +213,7 @@
<P>
<EM>NOTE4</EM>: The single-letter abbreviation for both <STRONG>months</STRONG> and <STRONG>minutes</STRONG>
-is <STRONG>m</STRONG>. To disambiguiate, the parser tries to read your mind :)
+is <STRONG>m</STRONG>. To disambiguate, the parser tries to read your mind :)
by applying the following two heuristics:
@@ -242,7 +243,7 @@
<EM>Final NOTES</EM>: Time specification is case-insensitive. Whitespace can be inserted freely
or omitted altogether, there are, however, cases when whitespace is
required (e.g., 'midnight Thu'). In this case you should either quote the whole phrase to prevent it from
-bieng taken apart by your shell or use '_' (underscore) or ',' (comma)
+being taken apart by your shell or use '_' (underscore) or ',' (comma)
which also count as whitespace (e.g., midnight_Thu or midnight,Thu)
@@ -276,7 +277,12 @@
<P>
-<EM>12am 010101</EM> -- start of the new millenium
+<EM>12/31/99 11:59pm</EM> -- 1 minute to the year 2000 for imperialists
+
+
+<P>
+
+<EM>12am 01/01/01</EM> -- start of the new millennium
<P>
@@ -290,6 +296,16 @@
<P>
+
+<EM>931225537</EM> -- 18:45 July 5th, 1999 (yes, seconds since 1970 are valid as well)
+
+
+<P>
+
+<EM>19970703 12:45</EM> -- 12:45 July 3th, 1997 (not quote standard, but I love this ...)
+
+
+<P>
<P>
<HR>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.txt Sat Jul 13 19:22:56 2002
@@ -61,7 +61,7 @@
-4/May/99 19990504.23 1
+9/Aug/99 1.0.7 1
@@ -120,14 +120,14 @@
is difficult and prone to errors. Therefore we normally
would use another base, called hexadecimal. It uses 16
different symbols. First the symbols from the decimal
- system are used, thereafter we continue with the alfabetic
- characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C,
- D, E and F. This system is choosen because the hexadecimal
- form can be converted into the binary system very easy
+ system are used, thereafter we continue with the
+ alphabetic characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8,
+ 9, A, B, C, D, E and F. This system is chosen because the
+ hexadecimal form can be converted into the binary system
-4/May/99 19990504.23 2
+9/Aug/99 1.0.7 2
@@ -136,7 +136,7 @@
BIN_DEC_HEX(1) rrdtool BIN_DEC_HEX(1)
- (and back).
+ very easy (and back).
There is yet another system in use, called the octal
system. This was more common in the old days but not
@@ -193,7 +193,7 @@
-4/May/99 19990504.23 3
+9/Aug/99 1.0.7 3
@@ -209,7 +209,7 @@
have a hard time converting a number like _1_2_3_4(16).
Therefore hexadecimal numbers get a prefix. This prefix
depends on the language you're writing in. Some of the
- prefixes are "0x" for C, "$" for pascal, "#" for HTML. It
+ prefixes are "0x" for C, "$" for Pascal, "#" for HTML. It
is common to assume that if a number starts with a zero,
it is octal. It does not matter what is used as long as
you know what it is. I will use "0x" for hexadecimal, "%"
@@ -259,7 +259,7 @@
-4/May/99 19990504.23 4
+9/Aug/99 1.0.7 4
@@ -325,7 +325,7 @@
-4/May/99 19990504.23 5
+9/Aug/99 1.0.7 5
@@ -391,7 +391,7 @@
-4/May/99 19990504.23 6
+9/Aug/99 1.0.7 6
@@ -450,14 +450,14 @@
For low values, try to do the calculations yourself, check
them with a calculator. The more you do the calculations
yourself, the more you find that you didn't make mistakes.
- In the end, you'll do calcula in other bases as easy as
+ In the end, you'll do calculi in other bases as easy as
you do in decimal.
- When the numbers get bigger, you'll have to realise that a
+ When the numbers get bigger, you'll have to realize that a
-4/May/99 19990504.23 7
+9/Aug/99 1.0.7 7
@@ -468,7 +468,7 @@
computer is not called a computer just to have a nice
name. There are many different calculators available. Use
- them. For unix you could use "bc" which is called so as it
+ them. For Unix you could use "bc" which is called so as it
is short for Binary Calculator. It calculates not only in
decimal, but in all bases you'll ever use (among them
Binary).
@@ -523,6 +523,6 @@
-4/May/99 19990504.23 8
+9/Aug/99 1.0.7 8
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.pod Sat Jul 13 19:22:56 2002
@@ -87,8 +87,8 @@
This is difficult and prone to errors. Therefore we normally would use
another base, called hexadecimal. It uses 16 different symbols. First
the symbols from the decimal system are used, thereafter we continue
-with the alfabetic characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A,
-B, C, D, E and F. This system is choosen because the hexadecimal form
+with the alphabetic characters. We get 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A,
+B, C, D, E and F. This system is chosen because the hexadecimal form
can be converted into the binary system very easy (and back).
There is yet another system in use, called the octal system. This was
@@ -146,7 +146,7 @@
Computers (or rather the parsers running on them) would have a hard time
converting a number like 1234(16). Therefore hexadecimal numbers get a
prefix. This prefix depends on the language you're writing in. Some of
-the prefixes are "0x" for C, "$" for pascal, "#" for HTML.
+the prefixes are "0x" for C, "$" for Pascal, "#" for HTML.
It is common to assume that if a number starts with a zero, it is octal.
It does not matter what is used as long as you know what it is.
I will use "0x" for hexadecimal, "%" for binary and "0" for octal.
@@ -338,12 +338,12 @@
For low values, try to do the calculations yourself, check them with
a calculator. The more you do the calculations yourself, the more you
-find that you didn't make mistakes. In the end, you'll do calcula in
+find that you didn't make mistakes. In the end, you'll do calculi in
other bases as easy as you do in decimal.
-When the numbers get bigger, you'll have to realise that a computer is
+When the numbers get bigger, you'll have to realize that a computer is
not called a computer just to have a nice name. There are many different
-calculators available. Use them. For unix you could use "bc" which is
+calculators available. Use them. For Unix you could use "bc" which is
called so as it is short for Binary Calculator. It calculates not only
in decimal, but in all bases you'll ever use (among them Binary).
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.html Sat Jul 13 19:22:56 2002
@@ -19,7 +19,8 @@
<LI><A HREF="#NOTE_2">NOTE 2</A>
<LI><A HREF="#NOTE_3">NOTE 3</A>
<LI><A HREF="#EXAMPLE">EXAMPLE</A>
- <LI><A HREF="#AUTHOR">AUTHOR</A>
+ <LI><A HREF="#EXAMPLE2">EXAMPLE2</A>
+ <LI><A HREF="#EXAMPLE3">EXAMPLE3</A>
<LI><A HREF="#REFERENCES">REFERENCES</A>
</UL>
-->
@@ -49,6 +50,10 @@
[<STRONG>-y</STRONG>|<STRONG>--y-grid</STRONG> <EM>y-axis grid and label</EM>]
+[<STRONG>--alt-y-grid</STRONG>]
+
+[<STRONG>--alt-autoscale</STRONG>]
+
[<STRONG>-v</STRONG>|<STRONG>--vertical-label</STRONG> <EM>text</EM>]
[<STRONG>-w</STRONG>|<STRONG>--width</STRONG> <EM>pixels</EM>]
@@ -57,6 +62,12 @@
[<STRONG>-i</STRONG>|<STRONG>--interlaced</STRONG>]
+[<STRONG>-f</STRONG>|<STRONG>--imginfo</STRONG> <EM>formatstring</EM>]
+
+[<STRONG>-a</STRONG>|<STRONG>--imgformat</STRONG> <STRONG>GIF</STRONG>|<STRONG>PNG</STRONG>]
+
+[<STRONG>-z</STRONG>|<STRONG>--lazy</STRONG>]
+
[<STRONG>-o</STRONG>|<STRONG>--logarithmic</STRONG>]
[<STRONG>-u</STRONG>|<STRONG>--upper-limit</STRONG> <EM>value</EM>]
@@ -69,6 +80,11 @@
[<STRONG>-c</STRONG>|<STRONG>--color</STRONG> <EM>COLORTAG</EM><STRONG>#</STRONG><EM>rrggbb</EM>]
+
+
+
+<P>
+
[<STRONG>-t</STRONG>|<STRONG>--title</STRONG> <EM>title</EM>]
[<STRONG>DEF:</STRONG><EM>vname</EM><STRONG>=</STRONG><EM>rrd</EM><STRONG>:</STRONG><EM>ds-name</EM><STRONG>:</STRONG><EM>CF</EM>]
@@ -111,10 +127,15 @@
<DT><STRONG><A NAME="item_filename">filename
</A></STRONG><DD>
-The name of the graph to generate. Since <STRONG>rrdtool</STRONG> outputs GIF's, it's recommended that the filename end in <EM>.gif</EM>.
-<STRONG>rrdtool</STRONG> does not enforce this, however. If the <EM>filename</EM>
-is et to '-' the gif file will be written to standard out. All other output
-will get supressd.
+The name of the graph to generate. Since <STRONG>rrdtool</STRONG> outputs GIFs and PNGs, it's recommended that the filename end in either
+<EM>.gif</EM> or <EM>.png</EM>. <STRONG>rrdtool</STRONG> does not enforce this, however. If the <EM>filename</EM> is set to '-' the image file will be written to standard out. All other
+output will get suppressed.
+
+
+<P>
+
+PNG output is recommended, since it takes up to 40% less disk space and
+20-30% less time to generate than a GIF file.
<P>
@@ -124,24 +145,24 @@
<P>
-<DT><STRONG><A NAME="item__s_start">-s|--start seconds (default -24*3600)
+<DT><STRONG><A NAME="item__s_start">-s|--start seconds (default end-1day)
</A></STRONG><DD>
The time when the graph should begin. Time in seconds since epoch
-(1970-01-01) is required. Negative numbers are relative to the end time. By
-default one day worth of data will be graphed. See also AT-STYLE TIME
-SPECIFICATION section in the <EM>rrdfetch</EM>
-documentation for alternative ways to specify start time.
+(1970-01-01) is required. Negative numbers are relative to the current
+time. By default one day worth of data will be graphed. See also AT-STYLE
+TIME SPECIFICATION section in the <EM>rrdfetch</EM>
+documentation for a detailed explanation on how to specify time.
<P>
-<DT><STRONG><A NAME="item__e_end">-e|--end seconds (default current time)
+<DT><STRONG><A NAME="item__e_end">-e|--end seconds (default now)
</A></STRONG><DD>
The time when the graph should end. Time in seconds since epoch. See also
AT-STYLE TIME SPECIFICATION section in the <EM>rrdfetch</EM>
-documentation for alternative ways to specify end time.
+documentation for a detailed explanation of ways to specify time.
<P>
@@ -150,7 +171,7 @@
</A></STRONG><DD>
The x-axis label is quite complex to configure. So if you don't have very
-special needs, you can relay on the autoconfiguration to get this right.
+special needs, you can rely on the autoconfiguration to get this right.
<P>
@@ -216,6 +237,31 @@
<P>
+<DT><STRONG><A NAME="item__alt_y_grid">--alt-y-grid
+
+</A></STRONG><DD>
+Place Y grid dynamically based on graph Y range. Algorithm ensures that you
+always have grid, that there are enough but not too many grid lines and the
+grid is metric. That is grid lines are placed every 1, 2, 5 or 10 units.
+(contributed by Sasha Mikheev)
+
+
+<P>
+
+<DT><STRONG><A NAME="item__alt_autoscale">--alt-autoscale
+
+</A></STRONG><DD>
+Compute Y range based on function absolute minimum and maximum values.
+Default algorithm uses predefined set of ranges. This is good in many cases
+but it fails miserably when you need to graph something like 260 + 0.001 *
+<CODE>sin(x).</CODE> Default algorithm will use Y range from 250 to 300 and
+on the graph you will see almost straight line. With --alt-autoscale Y
+range will be from slightly less the 260 - 0.001 to slightly more then 260
++ 0.001 and periodic behavior will be seen. (contributed by Sasha Mikheev)
+
+
+<P>
+
<DT><STRONG><A NAME="item__v_vertical_label">-v|--vertical-label text
</A></STRONG><DD>
@@ -255,6 +301,39 @@
<P>
+<DT><STRONG><A NAME="item__f_imginfo">-f|--imginfo formatstring
+
+</A></STRONG><DD>
+After the image has been created, the graph function uses printf together
+with this format string to create output similar to the PRINT function,
+only that the printf is supplied with the parameters
+<EM>filename</EM>, <EM>xsize</EM> and <EM>ysize</EM>. In order to generate an <STRONG>IMG</STRONG> tag suitable for including the graph into a web page, the command line
+would look like this:
+
+
+<P>
+
+<PRE> --imginfo '<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">'
+</PRE>
+
+<P>
+
+<DT><STRONG><A NAME="item__a_imgformat">-a|--imgformat GIF|PNG (default: GIF)
+
+</A></STRONG><DD>
+Allows you to produce PNG output from rrdtool.
+
+
+<P>
+
+<DT><STRONG><A NAME="item__z_lazy">-z|--lazy (default: false)
+
+</A></STRONG><DD>
+Only generate the graph, if the current gif is out of date or not existent.
+
+
+<P>
+
<DT><STRONG><A NAME="item__u_upper_limit">-u|--upper-limit value (default autoconfigure)
</A></STRONG><DD>
@@ -286,7 +365,7 @@
<DT><STRONG><A NAME="item__b_base">-b|--base value
</A></STRONG><DD>
-if you are graphing memmory (and NOT network traffic) this switch should be
+if you are graphing memory (and NOT network traffic) this switch should be
set to 1024 so that one Kb is 1024 byte. For traffic measurement, 1 kb/s is
1000 b/s.
@@ -346,15 +425,13 @@
<P>
If this is all a big load of incomprehensible words for you, maybe an
-example helps (a more complete explanation is given in [1]): The expression
-vname+3/2 becomes vname,3,2,/,+ in RPN. First the three values get pushed
-onto the stack (which now contains (the current value of) vname, a 3 and a
-2). Then the / operator pops two values from the stack (3 and 2), divides
-the first argument by the second (3/2) and pushes the result (1.5) back
-onto the stack. Then the + operator pops two values (vname and 1.5) from
-the stack; both values are added up and the result gets pushes back onto
-the stack. In the end there is only one value left on the stack: The result
-of the expression.
+example helps (a more complete explanation is given in [1]): The expression <EM>vname+3/2</EM> becomes <CODE>vname,3,2,/,+</CODE> in RPN. First the three values get pushed onto the stack (which now
+contains (the current value of) vname, a 3 and a 2). Then the / operator
+pops two values from the stack (3 and 2), divides the first argument by the
+second (3/2) and pushes the result (1.5) back onto the stack. Then the +
+operator pops two values (vname and 1.5) from the stack; both values are
+added up and the result gets pushes back onto the stack. In the end there
+is only one value left on the stack: The result of the expression.
<P>
@@ -365,11 +442,11 @@
<P>
<DL>
-<DT><STRONG><A NAME="item__">+, -, *, /
+<DT><STRONG><A NAME="item__">+, -, *, /, %
</A></STRONG><DD>
pops two values from the stack applies the selected operator and pushes the
-result back onto the stack.
+result back onto the stack. The % operator stands for the modulo operation.
<P>
@@ -411,10 +488,57 @@
<P>
+<DT><STRONG><A NAME="item_DUP">DUP, EXC, POP
+
+</A></STRONG><DD>
+These manipulate the stack directly. DUP will duplicate the top of the
+stack, pushing the result back onto the stack. EXC will exchange the top
+two elements of the stack, and POP will pop off the top element of the
+stack. Having insufficient elements on the stack for these operations is an
+error.
+
+
+<P>
+
<DT><STRONG><A NAME="item_UN">UN
</A></STRONG><DD>
-Pops one value of the stack, if it is <EM>*UNKNOWN*</EM>, 1 will be pushed back otherwise 0.
+Pops one value off the stack, if it is <EM>*UNKNOWN*</EM>, 1 will be pushed back otherwise 0.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_UNKN">UNKN
+
+</A></STRONG><DD>
+Push an <EM>*UNKNOWN*</EM> value onto the stack.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_INF">INF, NEGINF
+
+</A></STRONG><DD>
+Push a positive or negative infinite (oo) value onto the stack. When
+drawing an infinite number it appears right at the top or bottom edge of
+the graph, depending whether you have a positive or negative infinite
+number.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_NOW">NOW
+
+</A></STRONG><DD>
+Push the current (real world) time onto the stack.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_TIME">TIME
+
+</A></STRONG><DD>
+Push the time the current sample was taken onto the stack.
<P>
@@ -431,7 +555,27 @@
<DT><STRONG><A NAME="item_PRINT">PRINT:vname:CF:format
</A></STRONG><DD>
-Calculate the chosen consolidation function <EM>CF</EM> over the data-source variable <EM>vname</EM> and <CODE>printf</CODE> the result to stdout using <EM>format</EM>.
+Calculate the chosen consolidation function <EM>CF</EM> over the data-source variable <EM>vname</EM> and <CODE>printf</CODE> the result to stdout using <EM>format</EM>. In the <EM>format</EM> string there should be a '%lf' or '%le' marker in the place where the
+number should be printed.
+
+
+<P>
+
+If an additional '%s' is found AFTER the marker, the value will be scaled
+and an appropriate SI magnitude unit will be printed in place of the '%s'
+marker. The scaling will take the '--base' argument into consideration!
+
+
+<P>
+
+If a '%S' is used instead of a '%s', then instead of calculating the
+appropriate SI magnitude unit for this value, the previously calculated SI
+magnitude unit will be used. This is useful if you want all the values in a
+PRINT statement to have the same SI magnitude unit. If there was no
+previous SI magnitude calculation made, then '%S' behaves like a '%s',
+unless the value is 0, in which case it does not remember a SI magnitude
+unit and a SI magnitude unit will only be calculated when the next '%s' is
+seen or the next '%S' for a non-zero value.
<P>
@@ -494,15 +638,20 @@
</A></STRONG><DD>
Does the same as <STRONG>LINE?</STRONG>, but the graph gets stacked on top of the previous
-<STRONG>LINE?</STRONG>, <STRONG>AREA</STRONG> or <STRONG>STACK</STRONG> graph. Depending on the type of the previous graph, the <STRONG>STACK</STRONG> will be either a <STRONG>LINE?</STRONG> or an <STRONG>AREA</STRONG>. This obviously implies that the first <STRONG>STACK</STRONG> must be preceeded by an
+<STRONG>LINE?</STRONG>, <STRONG>AREA</STRONG> or <STRONG>STACK</STRONG> graph. Depending on the type of the previous graph, the <STRONG>STACK</STRONG> will be either a <STRONG>LINE?</STRONG> or an <STRONG>AREA</STRONG>. This obviously implies that the first <STRONG>STACK</STRONG> must be preceded by an
<STRONG>AREA</STRONG> or <STRONG>LINE?</STRONG> -- you need something to stack something onto in the first place ;)
<P>
-</DL>
+Note, that when you STACK onto *UNKNOWN* data, rrdtool will not draw any
+graphics ... *UNKNOWN* is not zero ... if you want it to zero then you
+might want to use a CDEF argument with IF and UN functions to turn
+*UNKNOWN* into zero ... =back
+
+
<P>
-<HR>
+
<H1><A NAME="NOTE">NOTE
</A></H1>
@@ -514,15 +663,13 @@
<P>
-<P>
-<HR>
<H1><A NAME="NOTE_2">NOTE 2
</A></H1>
The text printed below the actual graph can be formated by appending
-special escaped charactes at the end of a text. When ever such a character
-occurs, all pending text is pushed onto the grah acording to the character
-specified.
+special escaped characters at the end of a text. When ever such a character
+occurs, all pending text is pushed onto the graph according to the
+character specified.
<P>
@@ -540,8 +687,6 @@
<P>
-<P>
-<HR>
<H1><A NAME="NOTE_3">NOTE 3
</A></H1>
@@ -551,8 +696,6 @@
<P>
-<P>
-<HR>
<H1><A NAME="EXAMPLE">EXAMPLE
</A></H1>
@@ -565,19 +708,109 @@
<P>
+<H1><A NAME="EXAMPLE2">EXAMPLE2
+
+</A></H1>
+This example demonstrates the syntax for using IF and UN to set
+<EM>*UNKNOWN*</EM> values to 0. This technique is useful if you are aggregating interface data
+where the start dates of the data sets doesn't match.
+
+
+<P>
+
+<PRE> rrdtool graph demo.gif --title="Demo Graph" \
+ DEF:idat1=interface1.rrd:ds0:AVERAGE \
+ DEF:idat2=interface2.rrd:ds0:AVERAGE \
+ DEF:odat1=interface1.rrd:ds1:AVERAGE \
+ DEF:odat2=interface2.rrd:ds1:AVERAGE \
+ CDEF:agginput=idat1,UN,0,idat1,IF,idat2,UN,0,idat2,IF,+,8,* \
+ CDEF:aggoutput=odat1,UN,0,odat1,IF,odat2,UN,0,odat2,IF,+,8,* \
+ AREA:agginput#00cc00:Input Aggregate \
+ LINE1:agginput#0000FF:Output Aggregate
+
+Assuming that idat1 has a data value of I<*UNKNOWN*>, the CDEF expression
+</PRE>
+
<P>
-<HR>
-<H1><A NAME="AUTHOR">AUTHOR
+
+<PRE> idat1,UN,0,idat1,IF
+</PRE>
+
+<P>
+
+leaves us with a stack with contents of 1,0,NaN and the IF function will
+pop off the 3 values and replace them with 0. If idat1 had a real value
+like 7942099, then the stack would have 0,0,7942099 and the real value
+would be the replacement.
+
+
+<P>
+
+<H1><A NAME="EXAMPLE3">EXAMPLE3
</A></H1>
+This example shows two ways to use the INF function. First it makes the
+background change color during half of the hours. Then, it uses AREA and
+STACK to draw a picture. If one of the inputs was UNKNOWN, all inputs are
+overlaid with another AREA.
+
+
+<P>
+
+<PRE> rrdtool graph example.png --title="INF demo" \
+ DEF:val1=some.rrd:ds0:AVERAGE \
+ DEF:val2=some.rrd:ds1:AVERAGE \
+ DEF:val3=some.rrd:ds2:AVERAGE \
+ DEF:val4=other.rrd:ds0:AVERAGE \
+ CDEF:background=val4,POP,TIME,7200,%,3600,LE,INF,UNKN,IF \
+ CDEF:wipeout=val1,val2,val3,val4,+,+,+,UN,INF,UNKN,IF \
+ AREA:background#F0F0F0 \
+ AREA:val1#0000FF:Value1 \
+ STACK:val2#00C000:Value2 \
+ STACK:val3#FFFF00:Value3 \
+ STACK:val4#FFC000:Value4 \
+ AREA:whipeout#FF0000:Unknown
+</PRE>
+
+<P>
+
+The first CDEF uses val4 as a dummy value. It's value is removed
+immediately from the stack. Then a decision is made based on the time that
+a sample was taken. If it is an even hour (UTC time !) then the area will
+be filled. If it is not, the value is set to UNKN and is not plotted.
+
+
+<P>
+
+The second CDEF looks if any of val1,val2,val3,val4 is unknown. It does so
+by checking the outcome of <CODE>sum(val1,val2,val3,val4).</CODE> Again,
+INF is returned when the condition is true, UNKN is used to not plot the
+data.
+
+
+<P>
+
+The different items are plotted in a particular order. First do the
+background,+then use a normal area to overlay it with data. Stack the other
+data until they+are all plotted. Last but not least, overlay everything
+with eye-hurting red to signal any unknown data.
+
+
+<P>
+
+Note that this example assumesthat your data is in the positive half of the
+y-axis otherwhise you would would have to add NEGINF in order to extend the
+coverage of the rea to whole graph. =head1 AUTHOR
+
+
+<P>
+
Tobias Oetiker <A
HREF="MAILTO:<oetiker at ee.ethz.ch>"><oetiker at ee.ethz.ch></A>
<P>
-<P>
-<HR>
<H1><A NAME="REFERENCES">REFERENCES
</A></H1>
@@ -589,6 +822,7 @@
<P>
</DL>
+</DL>
</BODY>
</HTML>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.html Sat Jul 13 19:22:57 2002
@@ -1,6 +1,6 @@
<HTML>
<HEAD>
- <TITLE>rrdtutorial - Alex van den Bogaerdts RRD Tool tutorial
+ <TITLE>rrdtutorial - Alex van den Bogaerdts RRDtool tutorial
</TITLE>
</HEAD>
@@ -34,7 +34,7 @@
<LI><A HREF="#Consolidation_Functions">Consolidation Functions</A>
<LI><A HREF="#Let_s_review_what_you_now_should">Let's review what you now should know.</A>
<LI><A HREF="#Data_Source_Types">Data Source Types</A>
- <LI><A HREF="#RRD_Tool_under_the_Microscope">RRD Tool under the Microscope</A>
+ <LI><A HREF="#RRDtool_under_the_Microscope">RRDtool under the Microscope</A>
<LI><A HREF="#Counter_Wraps">Counter Wraps</A>
<LI><A HREF="#Data_Resampling">Data Resampling</A>
</UL>
@@ -51,7 +51,7 @@
<H1><A NAME="NAME">NAME
</A></H1>
-rrdtutorial - Alex van den Bogaerdts RRD Tool tutorial
+rrdtutorial - Alex van den Bogaerdts RRDtool tutorial
<P>
@@ -150,12 +150,12 @@
and process data collected via SNMP. The data will most likely be bytes (or
bits) transfered from and to a network or a computer. RRDtool lets you
create a database, store data in it, retrieve that data and create graphs
-in GIF format for display on a web browser. Those GIF images are dependant
+in GIF format for display on a web browser. Those GIF images are dependent
on the data you collected and could be, for instance, an overview of the
average network usage, or rather the peaks that occurred. It can also be
used to display tidal waves, solar radiation, power consumption, number of
-visitors at an exibition, noise levels near an airport, temperature on your
-favorite holiday location, temperature in the fridge and whatever you
+visitors at an exhibition, noise levels near an airport, temperature on
+your favorite holiday location, temperature in the fridge and whatever you
imagination can come up with. You need a sensor to measure the data and be
able to feed the numbers to RRDtool. Many devices have such a sensor.
@@ -190,9 +190,9 @@
<P>
I suggest you take a moment to subscribe to the mailing list right now by
-sending an email to <A
-HREF="MAILTO:<rrdtool-users-request at list.ee.ethz.ch>"><rrdtool-users-request at list.ee.ethz.ch></A>
-with a subject of ``subscribe''. If you ever want to leave this list, you
+sending an email to <<A
+HREF="MAILTO:rrd-users-request at list.ee.ethz.ch">rrd-users-request at list.ee.ethz.ch</A>
+> with a subject of ``subscribe''. If you ever want to leave this list, you
write an email to the same address but now with a subject of
``unsubscribe''.
@@ -533,7 +533,7 @@
displays the range we entered. We provided kilometers and when divided by
300 seconds, we get very small numbers. To be exact, the first value was 12
(12357-12345) and divided by 300 this makes 0.04 RRDtool displays this as
-40 m which means 40 mili (so: NOT meters). What we did wrong was that we
+40 m which means 40 milli (so: NOT meters). What we did wrong was that we
should have measured in meters, this would have been
(12357000-12345000)/300 = 12000/300 = 40.
@@ -551,7 +551,7 @@
--start 920804400 --end 920808000 \
--vertical-label m/s \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:realspeed=myspeed,1000,* \
+ "CDEF:realspeed=myspeed,1000,*" \
LINE2:realspeed#FF0000
</PRE>
@@ -595,7 +595,7 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,kmh,0,IF \
CDEF:good=kmh,100,GT,0,kmh,IF \
HRULE:100#0000FF:"Maximum allowed" \
@@ -665,10 +665,10 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,100,0,IF \
CDEF:over=kmh,100,GT,kmh,100,-,0,IF \
- CDEF:good=kmh,0,kmh,100,GT,IF \
+ CDEF:good=kmh,100,GT,0,kmh,IF \
HRULE:100#0000FF:"Maximum allowed" \
AREA:good#00FF00:"Good speed" \
AREA:fast#550000:"Too fast" \
@@ -1068,7 +1068,7 @@
<P>
-Display in bytes per second and in bits per second. Make the ethernet
+Display in bytes per second and in bits per second. Make the Ethernet
graphics go red if they are over four megabits per second.
@@ -1277,7 +1277,7 @@
<P>
<HR>
-<H2><A NAME="RRD_Tool_under_the_Microscope">RRD Tool under the Microscope
+<H2><A NAME="RRDtool_under_the_Microscope">RRDtool under the Microscope
</A></H2>
<UL>
@@ -1668,7 +1668,7 @@
<H1><A NAME="SEE_ALSO">SEE ALSO
</A></H1>
-The RRD Tool manpages
+The RRDtool manpages
<P>
@@ -1686,8 +1686,10 @@
<P>
-Alex van den Bogaerdt <A
-HREF="MAILTO:<alex at ergens.op.het.net>"><alex at ergens.op.het.net></A>
+Alex van den Bogaerdt
+<<A HREF="MAILTO:alex at ergens.op.het.net">alex at ergens.op.het.net</A>>
+
+
<P>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.txt Sat Jul 13 19:22:58 2002
@@ -34,34 +34,34 @@
but it will return data even if no absolute match
is possible.
- --------ssssttttaaaarrrrtttt|----ssss _s_t_a_r_t (default -24*3600)
+ --------ssssttttaaaarrrrtttt|----ssss _s_t_a_r_t (default end-1day)
when should the data begin. A time in seconds
since epoch (1970-01-01) is required. Negative
- numbers are relative to the end time. By default
- one day worth of data will be fetched. See also
- AT-STYLE TIME SPECIFICATION section for
- alternative ways to specify start time.
+ numbers are relative to the current time. By
+ default one day worth of data will be fetched. See
+ also AT-STYLE TIME SPECIFICATION section for a
+ detailed explanation on ways to specify start
+ time.
- --------eeeennnndddd|----eeee _e_n_d (default current time)
+ --------eeeennnndddd|----eeee _e_n_d (default now)
when should the data end. Time in seconds since
epoch. See also AT-STYLE TIME SPECIFICATION
- section for alternative ways to specify end time.
+ section for a detailed explanation of how to
+ specify end time.
AAAATTTT----SSSSTTTTYYYYLLLLEEEE TTTTIIIIMMMMEEEE SSSSPPPPEEEECCCCIIIIFFFFIIIICCCCAAAATTTTIIIIOOOONNNN
- The rrdtool does also understand at-style time
- specification. The specification is called "at-style"
- after unix command _a_t(1) that has moderately complex ways
- to specify time to run your job at. The at-style
- specification consists of two parts: TTTTIIIIMMMMEEEE RRRREEEEFFFFEEEERRRREEEENNNNCCCCEEEE
- specification and TTTTIIIIMMMMEEEE OOOOFFFFFFFFSSSSEEEETTTT specification.
+ Apart from the traditional _S_e_c_o_n_d_s _s_i_n_c_e _e_p_o_c_h, rrdtool
+ does also understand at-style time specification. The
+ specification is called "at-style" after Unix command
+ _a_t(1) that has moderately complex ways to specify time to
+ run your job at. The at-style specification consists of
+ two parts: TTTTIIIIMMMMEEEE RRRREEEEFFFFEEEERRRREEEENNNNCCCCEEEE specification and TTTTIIIIMMMMEEEE OOOOFFFFFFFFSSSSEEEETTTT
+ specification.
-
-
-
-21/Apr/99 19990426.22 1
+17/Aug/99 1.0.7 1
@@ -79,11 +79,11 @@
reference consists of _t_i_m_e_-_o_f_-_d_a_y reference (which should
come first, if present) and _d_a_y reference.
- _T_i_m_e_-_o_f_-_d_a_y can be specified as HHHHHHHH::::MMMMMMMM, HHHHHHHH....MMMMMMMM, HHHHHHHHMMMMMMMM, or
- just HHHHHHHH, you can suffix it with aaaammmm or ppppmmmm or use 24-hours
- clock. The few special times of day are understood as
- well, these include mmmmiiiiddddnnnniiiigggghhhhtttt (00:00), nnnnoooooooonnnn (12:00) and
- british tttteeeeaaaattttiiiimmmmeeee (16:00).
+ _T_i_m_e_-_o_f_-_d_a_y can be specified as HHHHHHHH::::MMMMMMMM, HHHHHHHH....MMMMMMMM, or just HHHHHHHH,
+ you can suffix it with aaaammmm or ppppmmmm or use 24-hours clock. The
+ few special times of day are understood as well, these
+ include mmmmiiiiddddnnnniiiigggghhhhtttt (00:00), nnnnoooooooonnnn (12:00) and British tttteeeeaaaattttiiiimmmmeeee
+ (16:00).
The _d_a_y can be specified as _m_o_n_t_h_-_n_a_m_e _d_a_y_-_o_f_-_t_h_e_-_m_o_n_t_h
and optional 2- or 4-digit _y_e_a_r number (e.g. March 8
@@ -91,11 +91,10 @@
Monday), or one of the words: yyyyeeeesssstttteeeerrrrddddaaaayyyy, ttttooooddddaaaayyyy, ttttoooommmmoooorrrrrrrroooowwww.
You can also specify _d_a_y as a full date in several
numerical formats; these include: MMMMMMMM////DDDDDDDD////[[[[YYYYYYYY]]]]YYYYYYYY,
- DDDDDDDD....MMMMMMMM....[[[[YYYYYYYY]]]]YYYYYYYY, DDDDDDDDMMMMMMMM[[[[YYYYYYYY]]]]YYYYYYYY (_N_O_T_E_1: this is different from
- the original _a_t(1) behavior, which interprets a single-
- number date as MMDD[YY]YY) _N_O_T_E_2: if you specify _d_a_y this
- way, the _t_i_m_e_-_o_f_-_d_a_y is REQUIRED to be present in front of
- it.
+ DDDDDDDD....MMMMMMMM....[[[[YYYYYYYY]]]]YYYYYYYY, YYYYYYYYYYYYYYYYMMMMMMMMDDDDDDDD (_N_O_T_E_1: this is different from the
+ original _a_t(1) behavior, which interprets a single-number
+ date as MMDD[YY]YY) _N_O_T_E_2: if you specify _d_a_y this way,
+ the _t_i_m_e_-_o_f_-_d_a_y is REQUIRED to be present.
Finally, you can use words nnnnoooowwww, ssssttttaaaarrrrtttt, or eeeennnndddd as your time
reference. NNNNoooowwww refers to the current moment (and is also a
@@ -110,7 +109,7 @@
TTTTIIIIMMMMEEEE OOOOFFFFFFFFSSSSEEEETTTT SSSSPPPPEEEECCCCIIIIFFFFIIIICCCCAAAATTTTIIIIOOOONNNN
- Time offset specification is used to add (or substract)
+ Time offset specification is used to add (or subtract)
certain time interval to (from) the time reference moment.
It consists of _s_i_g_n (++++ or ----) and _a_m_o_u_n_t. The following
time units can be used to specify the _a_m_o_u_n_t: yyyyeeeeaaaarrrrssss,
@@ -124,10 +123,11 @@
_N_O_T_E_3: If you specify time offset in days, weeks, months,
or years, you will end with the time offset that may vary
depending on you time reference, because all those time
+ units have no single well defined time interval value
-21/Apr/99 19990426.22 2
+17/Aug/99 1.0.7 2
@@ -136,7 +136,6 @@
RRDFETCH(1) rrdtool RRDFETCH(1)
- units have no single well defined time interval value
(1 year contains either 365 or 366 days, 1 month is 28 to
31 days long, and even 1 day may be not equal to 24 hours
twice a year, when DST-related clock adjustments take
@@ -150,7 +149,7 @@
(after _m_k_t_i_m_e(3) normalization); in the EET timezone
'3:30am Mar 29 1999 -1 day' yields '3:30am Mar 28 1999'
(Sunday) which is invalid time/date combination (because
- of 3am -> 4am DST forward clock ajustment, see the below
+ of 3am -> 4am DST forward clock adjustment, see the below
example). On the other hand, hours, minutes, and seconds
are well defined time intervals, and these are guaranteed
to always produce time offsets exactly as specified (e.g.
@@ -163,7 +162,7 @@
expected)
_N_O_T_E_4: The single-letter abbreviation for both mmmmoooonnnntttthhhhssss and
- mmmmiiiinnnnuuuutttteeeessss is mmmm. To disambiguiate, the parser tries to read
+ mmmmiiiinnnnuuuutttteeeessss is mmmm. To disambiguate, the parser tries to read
your mind :) by applying the following two heuristics:
1 If mmmm is used in context of (i.e. right after the)
@@ -183,7 +182,7 @@
Whitespace can be inserted freely or omitted altogether,
there are, however, cases when whitespace is required
(e.g., 'midnight Thu'). In this case you should either
- quote the whole phrase to prevent it from bieng taken
+ quote the whole phrase to prevent it from being taken
apart by your shell or use '_' (underscore) or ',' (comma)
which also count as whitespace (e.g., midnight_Thu or
midnight,Thu)
@@ -193,7 +192,8 @@
-21/Apr/99 19990426.22 3
+
+17/Aug/99 1.0.7 3
@@ -214,7 +214,10 @@
_2_3_:_5_9 _3_1_._1_2_._1_9_9_9 -- 1 minute to the year 2000
- _1_2_a_m _0_1_0_1_0_1 -- start of the new millenium
+ _1_2_/_3_1_/_9_9 _1_1_:_5_9_p_m -- 1 minute to the year 2000 for
+ imperialists
+
+ _1_2_a_m _0_1_/_0_1_/_0_1 -- start of the new millennium
_e_n_d_-_3_w_e_e_k_s or _e_-_3_w -- 3 weeks before end time (may be used
as start time specification)
@@ -222,17 +225,14 @@
_s_t_a_r_t_+_6_h_o_u_r_s or _s_+_6_h -- 6 hours after start time (may be
used as end time specification)
-AAAAUUUUTTTTHHHHOOOORRRR
- Tobias Oetiker <oetiker at ee.ethz.ch>
-
-
-
-
-
-
-
+ _9_3_1_2_2_5_5_3_7 -- 18:45 July 5th, 1999 (yes, seconds since
+ 1970 are valid as well)
+ _1_9_9_7_0_7_0_3 _1_2_:_4_5 -- 12:45 July 3th, 1997 (not quote
+ standard, but I love this ...)
+AAAAUUUUTTTTHHHHOOOORRRR
+ Tobias Oetiker <oetiker at ee.ethz.ch>
@@ -259,6 +259,6 @@
-21/Apr/99 19990426.22 4
+17/Aug/99 1.0.7 4
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.html Sat Jul 13 19:22:58 2002
@@ -1,6 +1,6 @@
<HTML>
<HEAD>
- <TITLE>dump - dump the contents of an B<RRD> in human readable form
+ <TITLE>dump - dump the contents of an B<RRD> to XML format
</TITLE>
</HEAD>
@@ -24,7 +24,7 @@
<H1><A NAME="NAME">NAME
</A></H1>
-rrdtool dump - dump the contents of an <STRONG>RRD</STRONG> in human readable form
+rrdtool dump - dump the contents of an <STRONG>RRD</STRONG> to XML format
<P>
@@ -34,7 +34,9 @@
<H1><A NAME="SYNOPSIS">SYNOPSIS
</A></H1>
-<STRONG>rrdtool</STRONG> <STRONG>dump</STRONG> <EM>filename</EM> [<STRONG>--full</STRONG>|<STRONG>-f</STRONG>]
+<STRONG>rrdtool</STRONG> <STRONG>dump</STRONG> <EM>filename.rrd</EM> > <EM>filename.xml</EM>
+
+
<P>
@@ -44,13 +46,15 @@
<H1><A NAME="DESCRIPTION">DESCRIPTION
</A></H1>
-The <STRONG>dump</STRONG> function prints the contents of an <STRONG>RRD</STRONG> in human readable form.
+The <STRONG>dump</STRONG> function prints the contents of an <STRONG>RRD</STRONG> in human readable (?) XML format. This format can be read by rrdrestore.
+Together they allow you to transfer your files from one architecture to
+another as well as manipulating the contents of an <STRONG>RRD</STRONG> file in a somewhat more convenient manner.
<P>
<DL>
-<DT><STRONG><A NAME="item_filename">filename
+<DT><STRONG><A NAME="item_filename">filename.rrd
</A></STRONG><DD>
The name of the <STRONG>RRD</STRONG> you want to dump.
@@ -58,22 +62,15 @@
<P>
-<DT><STRONG><A NAME="item__full_f">--full|-f
-
-</A></STRONG><DD>
-By default only the headers of the <STRONG>RRD</STRONG> are printed. With this option you get the actual data as well.
-
-
-<P>
-
</DL>
<P>
<HR>
<H1><A NAME="AUTHOR">AUTHOR
</A></H1>
-Tobias Oetiker <A
-HREF="MAILTO:<oetiker at ee.ethz.ch>"><oetiker at ee.ethz.ch></A>
+Tobias Oetiker <<A HREF="MAILTO:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</A>>
+
+
<P>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.pod Sat Jul 13 19:22:58 2002
@@ -35,28 +35,29 @@
to match your request, but it will return data even if no absolute
match is possible.
-=item B<--start>|B<-s> I<start> (default -24*3600)
+=item B<--start>|B<-s> I<start> (default end-1day)
when should the data begin. A time in seconds since epoch (1970-01-01)
-is required. Negative numbers are relative to the end time. By default
+is required. Negative numbers are relative to the current time. By default
one day worth of data will be fetched. See also AT-STYLE TIME SPECIFICATION
-section for alternative ways to specify start time.
+section for a detailed explanation on ways to specify start time.
-=item B<--end>|B<-e> I<end> (default current time)
+=item B<--end>|B<-e> I<end> (default now)
when should the data end. Time in seconds since epoch. See also
-AT-STYLE TIME SPECIFICATION section for alternative ways to specify
+AT-STYLE TIME SPECIFICATION section for a detailed explanation of how to specify
end time.
=back
=head2 AT-STYLE TIME SPECIFICATION
-The rrdtool does also understand at-style time specification.
-The specification is called "at-style" after unix command at(1)
-that has moderately complex ways to specify time to run your job at.
-The at-style specification consists of two parts: B<TIME REFERENCE>
-specification and B<TIME OFFSET> specification.
+Apart from the traditional I<Seconds since epoch>, rrdtool does also
+understand at-style time specification. The specification is called
+"at-style" after Unix command at(1) that has moderately complex ways
+to specify time to run your job at. The at-style specification
+consists of two parts: B<TIME REFERENCE> specification and B<TIME
+OFFSET> specification.
=head2 TIME REFERENCE SPECIFICATION
@@ -66,10 +67,10 @@
time reference consists of I<time-of-day> reference (which should come
first, if present) and I<day> reference.
-I<Time-of-day> can be specified as B<HH:MM>, B<HH.MM>, B<HHMM>,
+I<Time-of-day> can be specified as B<HH:MM>, B<HH.MM>,
or just B<HH>, you can suffix it with B<am> or B<pm> or use
24-hours clock. The few special times of day are understood as well,
-these include B<midnight> (00:00), B<noon> (12:00) and british
+these include B<midnight> (00:00), B<noon> (12:00) and British
B<teatime> (16:00).
The I<day> can be specified as I<month-name> I<day-of-the-month>
@@ -77,11 +78,11 @@
Alternatively, you can use I<day-of-week-name> (e.g. Monday),
or one of the words: B<yesterday>, B<today>, B<tomorrow>.
You can also specify I<day> as a full date in several numerical formats;
-these include: B<MM/DD/[YY]YY>, B<DD.MM.[YY]YY>, B<DDMM[YY]YY>
+these include: B<MM/DD/[YY]YY>, B<DD.MM.[YY]YY>, B<YYYYMMDD>
(I<NOTE1>: this is different from the original at(1) behavior,
which interprets a single-number date as MMDD[YY]YY)
I<NOTE2>: if you specify I<day> this way, the I<time-of-day> is REQUIRED
-to be present in front of it.
+to be present.
Finally, you can use words B<now>, B<start>, or B<end> as your time
reference. B<Now> refers to the current moment (and is also a default
@@ -93,9 +94,10 @@
(e.g., Dec for December, Sun for Sunday, etc.). The words B<now>,
B<start>, B<end> can be abbreviated to B<n>, B<s>, B<e>.
+
=head2 TIME OFFSET SPECIFICATION
-Time offset specification is used to add (or substract) certain time
+Time offset specification is used to add (or subtract) certain time
interval to (from) the time reference moment. It consists of I<sign>
(S<B<+> or B<->>) and I<amount>. The following time units can be used
to specify the I<amount>: B<years>, B<months>, B<weeks>, B<days>,
@@ -120,7 +122,7 @@
(after mktime(3) normalization); in the EET timezone
'3:30am Mar 29 1999 -1 day' yields '3:30am Mar 28 1999' (Sunday)
which is invalid time/date combination (because of 3am -> 4am DST
-forward clock ajustment, see the below example).
+forward clock adjustment, see the below example).
On the other hand, hours, minutes, and seconds are well defined time
intervals, and these are guaranteed to always produce time offsets
exactly as specified (e.g. for EET timezone, S<'8:00 Mar 27 1999 +2 days'> =
@@ -130,7 +132,7 @@
S<'8:00 Mar 27 1999 +48 hours'> = S<'9:00 Mar 29 1999'>, as expected)
I<NOTE4>: The single-letter abbreviation for both B<months> and B<minutes>
-is B<m>. To disambiguiate, the parser tries to read your S<mind :)>
+is B<m>. To disambiguate, the parser tries to read your S<mind :)>
by applying the following two heuristics:
=over 3
@@ -157,7 +159,7 @@
Whitespace can be inserted freely or omitted altogether,
there are, however, cases when whitespace is required
(e.g., S<'midnight Thu'>). In this case you should either quote the
-whole phrase to prevent it from bieng taken apart by your shell or use
+whole phrase to prevent it from being taken apart by your shell or use
'_' (underscore) or ',' (comma) which also count as whitespace
(e.g., midnight_Thu or midnight,Thu)
@@ -173,7 +175,9 @@
I<23:59 31.12.1999> -- 1 minute to the year 2000
-I<12am 010101> -- start of the new millenium
+I<12/31/99 11:59pm> -- 1 minute to the year 2000 for imperialists
+
+I<12am 01/01/01> -- start of the new millennium
I<end-3weeks> or I<e-3w> -- 3 weeks before end time
(may be used as start time specification)
@@ -181,6 +185,13 @@
I<start+6hours> or I<s+6h> -- 6 hours after start time
(may be used as end time specification)
+I<931225537> -- 18:45 July 5th, 1999
+(yes, seconds since 1970 are valid as well)
+
+I<19970703 12:45> -- 12:45 July 3th, 1997
+(not quote standard, but I love this ...)
+
+
=head1 AUTHOR
Tobias Oetiker <oetiker at ee.ethz.ch>
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.txt Sat Jul 13 19:22:58 2002
@@ -0,0 +1,132 @@
+
+
+
+RRDp(3pm) rrdtool RRDp(3pm)
+
+
+NNNNAAAAMMMMEEEE
+ RRDp - Attach rrdtool from within a perl script via a set
+ of pipes;
+
+SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
+ use RRRRRRRRDDDDpppp
+
+ RRRRRRRRDDDDpppp::::::::ssssttttaaaarrrrtttt _p_a_t_h _t_o _r_r_d_t_o_o_l _e_x_e_c_u_t_a_b_l_e
+
+ RRRRRRRRDDDDpppp::::::::ccccmmmmdddd _r_r_d_t_o_o_l _c_o_m_m_a_n_d_l_i_n_e
+
+ $answer = RRRRRRRRDDDD::::::::rrrreeeeaaaadddd
+
+ $status = RRRRRRRRDDDD::::::::eeeennnndddd
+
+ $$$$RRRRRRRRDDDDpppp::::::::uuuusssseeeerrrr, $$$$RRRRRRRRDDDDpppp::::::::ssssyyyyssss, $$$$RRRRRRRRDDDDpppp::::::::rrrreeeeaaaallll
+
+DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
+ With this module you can safely communicate with the
+ rrdtool.
+
+ After every RRRRRRRRDDDDpppp::::::::ccccmmmmdddd you have to issue an RRRRRRRRDDDDpppp::::::::rrrreeeeaaaadddd
+ command to get rrrrrrrrddddttttoooooooolllls answer to your command. The answer
+ is returned as a pointer, in order to speed things up. If
+ the last command did not return any data, RRRRRRRRDDDDpppp::::::::rrrreeeeaaaadddd will
+ return an undefined variable.
+
+ If you import the PERFORMANCE variables into your
+ namespace, you can access rrdtools internal performance
+ measurements.
+
+ use RRRRRRRRDDDDpppp
+ Load the RRDp::pipe module.
+
+ RRRRRRRRDDDDpppp::::::::ssssttttaaaarrrrtttt _p_a_t_h _t_o _r_r_d_t_o_o_l _e_x_e_c_u_t_a_b_l_e
+ start rrdtool. The argument must be the path to
+ the rrdtool executable
+
+ RRRRRRRRDDDDpppp::::::::ccccmmmmdddd _r_r_d_t_o_o_l _c_o_m_m_a_n_d_l_i_n_e
+ pass commands on to rrdtool. check the rrdtool
+ documentation for more info on the rrdtool
+ commands.
+
+ $answer = RRRRRRRRDDDDpppp::::::::rrrreeeeaaaadddd
+ read rrdtools response to your command. Note that
+ the $answer variable will only contain a pointer
+ to the returned data. The reason for this is, that
+ rrdtool can potentially return quite excessive
+ amounts of data and we don't want to copy this
+ around in memory. So when you want to access the
+ contents of $answer you have to use $$answer which
+ dereferences the variable.
+
+
+
+
+
+27/Aug/99 1.0.7 1
+
+
+
+
+
+RRDp(3pm) rrdtool RRDp(3pm)
+
+
+ $status = RRRRRRRRDDDDpppp::::::::eeeennnndddd
+ terminates rrdtool and returns rrdtools status ...
+
+ $$$$RRRRRRRRDDDDpppp::::::::uuuusssseeeerrrr, $$$$RRRRRRRRDDDDpppp::::::::ssssyyyyssss, $$$$RRRRRRRRDDDDpppp::::::::rrrreeeeaaaallll
+ these variables will contain totals of the user
+ time, system time and real time as seen by
+ rrdtool. User time is the time rrdtool is
+ running, System time is the time spend in system
+ calls and real time is the total time rrdtool has
+ been running.
+
+ The difference between user + system and real is
+ the time spent waiting for things like the hard
+ disk and new input from the perl script.
+
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE
+ use RRDp;
+ RRDp::start "/usr/local/bin/rrdtool";
+ RRDp::cmd qw(create demo.rrd --step 100
+ DS:in:GAUGE:100:U:U
+ RRA:AVERAGE:0.5:1:10);
+ $answer = RRDp::read;
+ print $$answer;
+ ($usertime,$systemtime,$realtime) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+
+
+SSSSEEEEEEEE AAAALLLLSSSSOOOO
+ For more information on how to use rrdtool, check the
+ manpages.
+
+AAAAUUUUTTTTHHHHOOOORRRR
+ Tobias Oetiker <oetiker at ee.ethz.ch>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27/Aug/99 1.0.7 2
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.txt Sat Jul 13 19:22:59 2002
@@ -11,16 +11,18 @@
SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
rrrrrrrrddddttttoooooooollll ggggrrrraaaapppphhhh _f_i_l_e_n_a_m_e [----ssss|--------ssssttttaaaarrrrtttt _s_e_c_o_n_d_s]
[----eeee|--------eeeennnndddd _s_e_c_o_n_d_s] [----xxxx|--------xxxx----ggggrrrriiiidddd _x_-_a_x_i_s _g_r_i_d _a_n_d _l_a_b_e_l]
- [----yyyy|--------yyyy----ggggrrrriiiidddd _y_-_a_x_i_s _g_r_i_d _a_n_d _l_a_b_e_l]
- [----vvvv|--------vvvveeeerrrrttttiiiiccccaaaallll----llllaaaabbbbeeeellll _t_e_x_t] [----wwww|--------wwwwiiiiddddtttthhhh _p_i_x_e_l_s]
- [----hhhh|--------hhhheeeeiiiigggghhhhtttt _p_i_x_e_l_s] [----iiii|--------iiiinnnntttteeeerrrrllllaaaacccceeeedddd] [----oooo|--------llllooooggggaaaarrrriiiitttthhhhmmmmiiiicccc]
- [----uuuu|--------uuuuppppppppeeeerrrr----lllliiiimmmmiiiitttt _v_a_l_u_e] [----llll|--------lllloooowwwweeeerrrr----lllliiiimmmmiiiitttt _v_a_l_u_e]
- [----rrrr|--------rrrriiiiggggiiiidddd] [----bbbb|--------bbbbaaaasssseeee _v_a_l_u_e]
- [----cccc|--------ccccoooolllloooorrrr _C_O_L_O_R_T_A_G####_r_r_g_g_b_b] [----tttt|--------ttttiiiittttlllleeee _t_i_t_l_e]
- [DDDDEEEEFFFF::::_v_n_a_m_e====_r_r_d::::_d_s_-_n_a_m_e::::_C_F] [CCCCDDDDEEEEFFFF::::_v_n_a_m_e====_r_p_n_-_e_x_p_r_e_s_s_i_o_n]
- [PPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t] [GGGGPPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t]
- [CCCCOOOOMMMMMMMMEEEENNNNTTTT::::_t_e_x_t] [HHHHRRRRUUUULLLLEEEE::::_v_a_l_u_e####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]
- [VVVVRRRRUUUULLLLEEEE::::_t_i_m_e####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]
+ [----yyyy|--------yyyy----ggggrrrriiiidddd _y_-_a_x_i_s _g_r_i_d _a_n_d _l_a_b_e_l] [--------aaaalllltttt----yyyy----ggggrrrriiiidddd] [--------aaaalllltttt----
+ aaaauuuuttttoooossssccccaaaalllleeee] [----vvvv|--------vvvveeeerrrrttttiiiiccccaaaallll----llllaaaabbbbeeeellll _t_e_x_t] [----wwww|--------wwwwiiiiddddtttthhhh _p_i_x_e_l_s]
+ [----hhhh|--------hhhheeeeiiiigggghhhhtttt _p_i_x_e_l_s] [----iiii|--------iiiinnnntttteeeerrrrllllaaaacccceeeedddd]
+ [----ffff|--------iiiimmmmggggiiiinnnnffffoooo _f_o_r_m_a_t_s_t_r_i_n_g] [----aaaa|--------iiiimmmmggggffffoooorrrrmmmmaaaatttt GGGGIIIIFFFF|PPPPNNNNGGGG]
+ [----zzzz|--------llllaaaazzzzyyyy] [----oooo|--------llllooooggggaaaarrrriiiitttthhhhmmmmiiiicccc] [----uuuu|--------uuuuppppppppeeeerrrr----lllliiiimmmmiiiitttt _v_a_l_u_e]
+ [----llll|--------lllloooowwwweeeerrrr----lllliiiimmmmiiiitttt _v_a_l_u_e] [----rrrr|--------rrrriiiiggggiiiidddd] [----bbbb|--------bbbbaaaasssseeee _v_a_l_u_e]
+ [----cccc|--------ccccoooolllloooorrrr _C_O_L_O_R_T_A_G####_r_r_g_g_b_b]
+
+ [----tttt|--------ttttiiiittttlllleeee _t_i_t_l_e] [DDDDEEEEFFFF::::_v_n_a_m_e====_r_r_d::::_d_s_-_n_a_m_e::::_C_F]
+ [CCCCDDDDEEEEFFFF::::_v_n_a_m_e====_r_p_n_-_e_x_p_r_e_s_s_i_o_n] [PPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t]
+ [GGGGPPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t] [CCCCOOOOMMMMMMMMEEEENNNNTTTT::::_t_e_x_t]
+ [HHHHRRRRUUUULLLLEEEE::::_v_a_l_u_e####_r_r_g_g_b_b[::::_l_e_g_e_n_d]] [VVVVRRRRUUUULLLLEEEE::::_t_i_m_e####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]
[LLLLIIIINNNNEEEE{1111|2222|3333}::::_v_n_a_m_e[####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]]
[AAAARRRREEEEAAAA::::_v_n_a_m_e[####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]]
[SSSSTTTTAAAACCCCKKKK::::_v_n_a_m_e[####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]]
@@ -33,35 +35,33 @@
_f_i_l_e_n_a_m_e
The name of the graph to generate. Since rrrrrrrrddddttttoooooooollll
- outputs GIF's, it's recommended that the filename
- end in _._g_i_f. rrrrrrrrddddttttoooooooollll does not enforce this,
- however. If the _f_i_l_e_n_a_m_e is et to '-' the gif
- file will be written to standard out. All other
- output will get supressd.
+ outputs GIFs and PNGs, it's recommended that the
+ filename end in either _._g_i_f or _._p_n_g. rrrrrrrrddddttttoooooooollll does
+ not enforce this, however. If the _f_i_l_e_n_a_m_e is
+ set to '-' the image file will be written to
+ standard out. All other output will get
+ suppressed.
+
+ PNG output is recommended, since it takes up to
+ 40% less disk space and 20-30% less time to
+ generate than a GIF file.
If no graph functions are called, the graph will
not be created.
- ----ssss|--------ssssttttaaaarrrrtttt _s_e_c_o_n_d_s (default -24*3600)
+ ----ssss|--------ssssttttaaaarrrrtttt _s_e_c_o_n_d_s (default end-1day)
The time when the graph should begin. Time in
seconds since epoch (1970-01-01) is required.
- Negative numbers are relative to the end time. By
- default one day worth of data will be graphed.
+ Negative numbers are relative to the current time.
+ By default one day worth of data will be graphed.
See also AT-STYLE TIME SPECIFICATION section in
- the _r_r_d_f_e_t_c_h documentation for alternative ways to
- specify start time.
+ the _r_r_d_f_e_t_c_h documentation for a detailed
+ explanation on how to specify time.
- ----eeee|--------eeeennnndddd _s_e_c_o_n_d_s (default current time)
- The time when the graph should end. Time in
- seconds since epoch. See also AT-STYLE TIME
- SPECIFICATION section in the _r_r_d_f_e_t_c_h
- documentation for alternative ways to specify end
- time.
-
-4/May/99 19990504.23 1
+14/Aug/99 1.0.7 1
@@ -70,10 +70,17 @@
RRDGRAPH(1) rrdtool RRDGRAPH(1)
+ ----eeee|--------eeeennnndddd _s_e_c_o_n_d_s (default now)
+ The time when the graph should end. Time in
+ seconds since epoch. See also AT-STYLE TIME
+ SPECIFICATION section in the _r_r_d_f_e_t_c_h
+ documentation for a detailed explanation of ways
+ to specify time.
+
----xxxx|--------xxxx----ggggrrrriiiidddd _x_-_a_x_i_s _g_r_i_d _a_n_d _l_a_b_e_l (default autoconfigure)
The x-axis label is quite complex to configure. So
- if you don't have very special needs, you can
- relay on the autoconfiguration to get this right.
+ if you don't have very special needs, you can rely
+ on the autoconfiguration to get this right.
The x-axis label is configured, using the
following format:
@@ -117,17 +124,10 @@
grid line is printed, along with label showing the
value of the grid line.
- ----vvvv|--------vvvveeeerrrrttttiiiiccccaaaallll----llllaaaabbbbeeeellll _t_e_x_t
- vertical label on the left side of the graph. This
- is normally used to specify the units used.
-
- ----wwww|--------wwwwiiiiddddtttthhhh _p_i_x_e_l_s (default 400 pixel)
- Width of the drawing area within the graph. This
- affects the size of the gif.
-4/May/99 19990504.23 2
+14/Aug/99 1.0.7 2
@@ -136,6 +136,35 @@
RRDGRAPH(1) rrdtool RRDGRAPH(1)
+ --------aaaalllltttt----yyyy----ggggrrrriiiidddd
+ Place Y grid dynamically based on graph Y range.
+ Algorithm ensures that you always have grid, that
+ there are enough but not too many grid lines and
+ the grid is metric. That is grid lines are placed
+ every 1, 2, 5 or 10 units. (contributed by Sasha
+ Mikheev)
+
+ --------aaaalllltttt----aaaauuuuttttoooossssccccaaaalllleeee
+ Compute Y range based on function absolute
+ minimum and maximum values. Default algorithm uses
+ predefined set of ranges. This is good in many
+ cases but it fails miserably when you need to
+ graph something like 260 + 0.001 * _s_i_n(x). Default
+ algorithm will use Y range from 250 to 300 and on
+ the graph you will see almost straight line. With
+ --alt-autoscale Y range will be from slightly less
+ the 260 - 0.001 to slightly more then 260 + 0.001
+ and periodic behavior will be seen. (contributed
+ by Sasha Mikheev)
+
+ ----vvvv|--------vvvveeeerrrrttttiiiiccccaaaallll----llllaaaabbbbeeeellll _t_e_x_t
+ vertical label on the left side of the graph. This
+ is normally used to specify the units used.
+
+ ----wwww|--------wwwwiiiiddddtttthhhh _p_i_x_e_l_s (default 400 pixel)
+ Width of the drawing area within the graph. This
+ affects the size of the gif.
+
----hhhh|--------hhhheeeeiiiigggghhhhtttt _p_i_x_e_l_s (default 100 pixel)
Width of the drawing area within the graph. This
affects the size of the gif.
@@ -150,6 +179,36 @@
disk. It makes no changes to the layout or
contents of the graph.
+ ----ffff|--------iiiimmmmggggiiiinnnnffffoooo _f_o_r_m_a_t_s_t_r_i_n_g
+ After the image has been created, the graph
+ function uses printf together with this format
+ string to create output similar to the PRINT
+ function, only that the printf is supplied with
+ the parameters _f_i_l_e_n_a_m_e, _x_s_i_z_e and _y_s_i_z_e. In order
+ to generate an IIIIMMMMGGGG tag suitable for including the
+ graph into a web page, the command line would look
+ like this:
+
+ --imginfo '<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">'
+
+
+
+14/Aug/99 1.0.7 3
+
+
+
+
+
+RRDGRAPH(1) rrdtool RRDGRAPH(1)
+
+
+ ----aaaa|--------iiiimmmmggggffffoooorrrrmmmmaaaatttt GGGGIIIIFFFF|PPPPNNNNGGGG (default: GIF)
+ Allows you to produce PNG output from rrdtool.
+
+ ----zzzz|--------llllaaaazzzzyyyy (default: false)
+ Only generate the graph, if the current gif is out
+ of date or not existent.
+
----uuuu|--------uuuuppppppppeeeerrrr----lllliiiimmmmiiiitttt _v_a_l_u_e (default autoconfigure)
The maximum value to be graphed. By default This
will be autoconfigured from the data you select
@@ -168,7 +227,7 @@
behavior
----bbbb|--------bbbbaaaasssseeee _v_a_l_u_e
- if you are graphing memmory (and NOT network
+ if you are graphing memory (and NOT network
traffic) this switch should be set to 1024 so that
one Kb is 1024 byte. For traffic measurement, 1
kb/s is 1000 b/s.
@@ -190,10 +249,17 @@
DDDDEEEEFFFF::::_v_n_a_m_e====_r_r_d::::_d_s_-_n_a_m_e::::_C_F
Define virtual name for a data source. This name
+ can then be used in the functions explained below.
+ The DEF call automatically chooses an RRRRRRRRAAAA which
+ provides data in a resolution appropriate for the
+ size of the graph to be drawn. Ideally this means
+ that one data point from the RRRRRRRRAAAA should be
+ represented by one pixel in the graph. If the
+ resolution of the RRRRRRRRAAAA is higher than the
-4/May/99 19990504.23 3
+14/Aug/99 1.0.7 4
@@ -202,13 +268,6 @@
RRDGRAPH(1) rrdtool RRDGRAPH(1)
- can then be used in the functions explained below.
- The DEF call automatically chooses an RRRRRRRRAAAA which
- provides data in a resolution appropriate for the
- size of the graph to be drawn. Ideally this means
- that one data point from the RRRRRRRRAAAA should be
- represented by one pixel in the graph. If the
- resolution of the RRRRRRRRAAAA is higher than the
resolution of the graph, the data in the RRA will
be consolidated according to the consolidation
function (_C_F) chosen.
@@ -229,7 +288,7 @@
If this is all a big load of incomprehensible
words for you, maybe an example helps (a more
complete explanation is given in [1]): The
- expression vname+3/2 becomes vname,3,2,/,+ in RPN.
+ expression _v_n_a_m_e_+_3_/_2 becomes vname,3,2,/,+ in RPN.
First the three values get pushed onto the stack
(which now contains (the current value of) vname,
a 3 and a 2). Then the / operator pops two values
@@ -247,19 +306,26 @@
The following operators can be used on these
values:
- +, -, *, / pops two values from the stack applies the
+ +, -, *, /, % pops two values from the stack applies the
selected operator and pushes the result
- back onto the stack.
+ back onto the stack. The % operator stands
+ for the modulo operation.
SIN, COS, LOG, EXP
pops one value from the stack, applies the
selected function and pushes the result
back onto the stack.
+ LT, LE, GT, GE, EQ
+ pops two values from the stack, compares
+ them according to the selected condition
+ and pushes either 1 back onto the stack if
+ the condition is true and 0 if the
+ condition was not true.
-4/May/99 19990504.23 4
+14/Aug/99 1.0.7 5
@@ -268,13 +334,6 @@
RRDGRAPH(1) rrdtool RRDGRAPH(1)
- LT, LE, GT, GE, EQ
- pops two values from the stack, compares
- them according to the selected condition
- and pushes either 1 back onto the stack if
- the condition is true and 0 if the
- condition was not true.
-
IF pops three values from the stack. If the
last value is not 0, the second value will
be pushed back onto the stack, otherwise
@@ -288,10 +347,34 @@
otherwise E will be sent back to the
stack.
- UN Pops one value of the stack, if it is
+ DUP, EXC, POP These manipulate the stack directly. DUP
+ will duplicate the top of the stack,
+ pushing the result back onto the stack.
+ EXC will exchange the top two elements of
+ the stack, and POP will pop off the top
+ element of the stack. Having insufficient
+ elements on the stack for these operations
+ is an error.
+
+ UN Pops one value off the stack, if it is
_*_U_N_K_N_O_W_N_*, 1 will be pushed back otherwise
0.
+ UNKN Push an _*_U_N_K_N_O_W_N_* value onto the stack.
+
+ INF, NEGINF Push a positive or negative infinite (oo)
+ value onto the stack. When drawing an
+ infinite number it appears right at the
+ top or bottom edge of the graph, depending
+ whether you have a positive or negative
+ infinite number.
+
+ NOW Push the current (real world) time onto
+ the stack.
+
+ TIME Push the time the current sample was taken
+ onto the stack.
+
Please note that you may only use _v_n_a_m_e
variables that you previously defined by
either DDDDEEEEFFFF or CCCCDDDDEEEEFFFF. Furthermore, as of
@@ -304,7 +387,40 @@
PPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t
Calculate the chosen consolidation function _C_F
over the data-source variable _v_n_a_m_e and printf the
- result to stdout using _f_o_r_m_a_t.
+ result to stdout using _f_o_r_m_a_t. In the _f_o_r_m_a_t
+
+
+
+14/Aug/99 1.0.7 6
+
+
+
+
+
+RRDGRAPH(1) rrdtool RRDGRAPH(1)
+
+
+ string there should be a '%lf' or '%le' marker in
+ the place where the number should be printed.
+
+ If an additional '%s' is found AFTER the marker,
+ the value will be scaled and an appropriate SI
+ magnitude unit will be printed in place of the
+ '%s' marker. The scaling will take the '--base'
+ argument into consideration!
+
+ If a '%S' is used instead of a '%s', then instead
+ of calculating the appropriate SI magnitude unit
+ for this value, the previously calculated SI
+ magnitude unit will be used. This is useful if
+ you want all the values in a PRINT statement to
+ have the same SI magnitude unit. If there was no
+ previous SI magnitude calculation made, then '%S'
+ behaves like a '%s', unless the value is 0, in
+ which case it does not remember a SI magnitude
+ unit and a SI magnitude unit will only be
+ calculated when the next '%s' is seen or the next
+ '%S' for a non-zero value.
GGGGPPPPRRRRIIIINNNNTTTT::::_v_n_a_m_e::::_C_F::::_f_o_r_m_a_t
Same as PPPPRRRRIIIINNNNTTTT but the result is printed into the
@@ -322,18 +438,6 @@
Draw a vertical rule into the graph and optionally
add a legend
-
-
-
-4/May/99 19990504.23 5
-
-
-
-
-
-RRDGRAPH(1) rrdtool RRDGRAPH(1)
-
-
LLLLIIIINNNNEEEE{1111|2222|3333}::::_v_n_a_m_e[####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]
Plot for the requested data, using the color
specified. Write a legend into the graph. The 3
@@ -350,13 +454,32 @@
SSSSTTTTAAAACCCCKKKK:_v_n_a_m_e[####_r_r_g_g_b_b[::::_l_e_g_e_n_d]]
Does the same as LLLLIIIINNNNEEEE????, but the graph gets stacked
+
+
+
+14/Aug/99 1.0.7 7
+
+
+
+
+
+RRDGRAPH(1) rrdtool RRDGRAPH(1)
+
+
on top of the previous LLLLIIIINNNNEEEE????, AAAARRRREEEEAAAA or SSSSTTTTAAAACCCCKKKK graph.
Depending on the type of the previous graph, the
SSSSTTTTAAAACCCCKKKK will be either a LLLLIIIINNNNEEEE???? or an AAAARRRREEEEAAAA. This
obviously implies that the first SSSSTTTTAAAACCCCKKKK must be
- preceeded by an AAAARRRREEEEAAAA or LLLLIIIINNNNEEEE???? -- you need
- something to stack something onto in the first
- place ;)
+ preceded by an AAAARRRREEEEAAAA or LLLLIIIINNNNEEEE???? -- you need something
+ to stack something onto in the first place ;)
+
+ Note, that when you STACK onto *UNKNOWN* data,
+ rrdtool will not draw any graphics ... *UNKNOWN*
+ is not zero ... if you want it to zero then you
+ might want to use a CDEF argument with IF and UN
+ functions to turn *UNKNOWN* into zero ...
+
+ =back
NNNNOOOOTTTTEEEE
In a ':' in a _l_e_g_e_n_d argument will mark the end of the
@@ -368,9 +491,10 @@
NNNNOOOOTTTTEEEE 2222
The text printed below the actual graph can be formated by
- appending special escaped charactes at the end of a text.
+ appending special escaped characters at the end of a text.
When ever such a character occurs, all pending text is
- pushed onto the grah acording to the character specified.
+ pushed onto the graph according to the character
+ specified.
Valid characters are: jjjj for justified, llll for left aligned,
rrrr for right aligned and cccc for centered. In the next
@@ -386,12 +510,20 @@
line looks like this: XSIZExYSIZE.
EEEEXXXXAAAAMMMMPPPPLLLLEEEE
+ rrdtool graph demo.gif --title="Demo Graph" \
+ DEF:cel=demo.rrd:exhaust:AVERAGE \
+ "CDEF:far=cel,32,-,0.55555,*" \
+ LINE2:cel#00a000:"D. Celsius" \
+ LINE2:far#ff0000:"D. Fahrenheit\c"
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE2222
+ This example demonstrates the syntax for using IF and UN
+ to set _*_U_N_K_N_O_W_N_* values to 0. This technique is useful if
-4/May/99 19990504.23 6
+14/Aug/99 1.0.7 8
@@ -400,23 +532,89 @@
RRDGRAPH(1) rrdtool RRDGRAPH(1)
+ you are aggregating interface data where the start dates
+ of the data sets doesn't match.
+
rrdtool graph demo.gif --title="Demo Graph" \
- DEF:cel=demo.rrd:exhaust:AVERAGE \
- "CDEF:far=cel,32,-,0.55555,*" \
- LINE2:cel#00a000:"D. Celsius" \
- LINE2:far#ff0000:"D. Fahrenheit\c"
+ DEF:idat1=interface1.rrd:ds0:AVERAGE \
+ DEF:idat2=interface2.rrd:ds0:AVERAGE \
+ DEF:odat1=interface1.rrd:ds1:AVERAGE \
+ DEF:odat2=interface2.rrd:ds1:AVERAGE \
+ CDEF:agginput=idat1,UN,0,idat1,IF,idat2,UN,0,idat2,IF,+,8,* \
+ CDEF:aggoutput=odat1,UN,0,odat1,IF,odat2,UN,0,odat2,IF,+,8,* \
+ AREA:agginput#00cc00:Input Aggregate \
+ LINE1:agginput#0000FF:Output Aggregate
+
+ Assuming that idat1 has a data value of I<*UNKNOWN*>, the CDEF expression
+
+ idat1,UN,0,idat1,IF
+
+ leaves us with a stack with contents of 1,0,NaN and the IF
+ function will pop off the 3 values and replace them with
+ 0. If idat1 had a real value like 7942099, then the stack
+ would have 0,0,7942099 and the real value would be the
+ replacement.
+
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE3333
+ This example shows two ways to use the INF function. First
+ it makes the background change color during half of the
+ hours. Then, it uses AREA and STACK to draw a picture. If
+ one of the inputs was UNKNOWN, all inputs are overlaid
+ with another AREA.
+
+ rrdtool graph example.png --title="INF demo" \
+ DEF:val1=some.rrd:ds0:AVERAGE \
+ DEF:val2=some.rrd:ds1:AVERAGE \
+ DEF:val3=some.rrd:ds2:AVERAGE \
+ DEF:val4=other.rrd:ds0:AVERAGE \
+ CDEF:background=val4,POP,TIME,7200,%,3600,LE,INF,UNKN,IF \
+ CDEF:wipeout=val1,val2,val3,val4,+,+,+,UN,INF,UNKN,IF \
+ AREA:background#F0F0F0 \
+ AREA:val1#0000FF:Value1 \
+ STACK:val2#00C000:Value2 \
+ STACK:val3#FFFF00:Value3 \
+ STACK:val4#FFC000:Value4 \
+ AREA:whipeout#FF0000:Unknown
+
+ The first CDEF uses val4 as a dummy value. It's value is
+ removed immediately from the stack. Then a decision is
+ made based on the time that a sample was taken. If it is
+ an even hour (UTC time !) then the area will be filled. If
+ it is not, the value is set to UNKN and is not plotted.
+
+ The second CDEF looks if any of val1,val2,val3,val4 is
+ unknown. It does so by checking the outcome of
+ _s_u_m(val1,val2,val3,val4). Again, INF is returned when the
+ condition is true, UNKN is used to not plot the data.
-AAAAUUUUTTTTHHHHOOOORRRR
- Tobias Oetiker <oetiker at ee.ethz.ch>
-RRRREEEEFFFFEEEERRRREEEENNNNCCCCEEEESSSS
- [1] http://www.dotpoint.com/xnumber/rpn_or_adl.htm
+14/Aug/99 1.0.7 9
+
+RRDGRAPH(1) rrdtool RRDGRAPH(1)
+
+
+ The different items are plotted in a particular order.
+ First do the background,+then use a normal area to overlay
+ it with data. Stack the other data until they+are all
+ plotted. Last but not least, overlay everything with eye-
+ hurting red to signal any unknown data.
+
+ Note that this example assumesthat your data is in the
+ positive half of the y-axis otherwhise you would would
+ have to add NEGINF in order to extend the coverage of the
+ rea to whole graph.
+
+ =head1 AUTHOR
+ Tobias Oetiker <oetiker at ee.ethz.ch>
+
+RRRREEEEFFFFEEEERRRREEEENNNNCCCCEEEESSSS
+ [1] http://www.dotpoint.com/xnumber/rpn_or_adl.htm
@@ -457,7 +655,7 @@
-4/May/99 19990504.23 7
+14/Aug/99 1.0.7 10
@@ -523,6 +721,6 @@
-4/May/99 19990504.23 8
+14/Aug/99 1.0.7 11
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.txt Sat Jul 13 19:22:59 2002
@@ -0,0 +1,132 @@
+
+
+
+RRDs(3pm) rrdtool RRDs(3pm)
+
+
+NNNNAAAAMMMMEEEE
+ RRDs - Access rrdtool as a shared module
+
+SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
+ use RRDs::ext
+ RRDs::error
+ RRDs::last ...
+ RRDs::create ...
+ RRDs::update ...
+ RRDs::graph ...
+ RRDs::fetch ...
+ RRDs::tune ...
+
+
+DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
+ CCCCaaaalllllllliiiinnnngggg SSSSeeeeqqqquuuueeeennnncccceeee
+
+ This module accesses rrdtool functionality directly from
+ within perl. The arguments to the functions listed in the
+ SYNOPSIS are explained in the regular rrdtool
+ documentation. The commandline call
+
+ rrdtool update mydemo.rrd N:12:13
+
+ gets turned into
+
+ RRDs::update qw(mydemo.rrd N:12:13);
+
+
+ EEEErrrrrrrroooorrrr HHHHaaaannnnddddlllliiiinnnngggg
+
+ The RRD functions will not abort your program even when
+ they can not make sense out of the arguments you fed them.
+ There are two ways to determine if an error has occured.
+
+ First the every function will return the value -1 if an
+ error occured. Second, the function RRDs::error can be
+ called to get the error message from the last function
+ call. If RRDs::error does not return an error then the
+ previous function has completed its task succesfully.
+
+ RRDs::update qw(mydemo.rrd N:12:13);
+ my $ERR=RRDs::error;
+ die "ERROR while updating mydemo.rrd: $ERR\n" if $ERR;
+
+
+ RRRReeeettttuuuurrrrnnnn VVVVaaaalllluuuueeeessss
+
+ The functions RRDs::last, RRDs::graph and RRDs::fetchgive
+ return their findigs.
+
+ RRDs::last returns a single INTEGER representing the last
+ update time.
+
+
+
+
+27/Aug/99 1.0.7 1
+
+
+
+
+
+RRDs(3pm) rrdtool RRDs(3pm)
+
+
+ $lastupdate = RRDs::last ...
+
+ RRDs::graph returns an pointer to an ARRAY containing the
+ x-size and y-size of the created gif and results of the
+ PRINT arguments.
+
+ ($averages,$xsize,$ysize) = RRDs::graph ...
+ print "Gifsize: ${xsize}x${ysize}\n";
+ print "Averages: ", (join ", ", @$averages);
+
+ RRDs::fetch is the most complex of the pack regarding
+ return values. There are 4 values. Two normal integers, a
+ pointer to an array and a pointer to a array of pointers.
+
+ my ($start,$step,$names,$data) = RRDs::fetch ...
+ print "Start: ".localtime($start)."\n";
+ print "Stepsize: $step seconds\n";
+ print "Column Names: ".join (", ", @$names)."\n";
+ print "Date:\n";
+ foreach my $line (@$array){
+ print "".localtime($start)," ";
+ $start += $step;
+ foreach my $val (@$line) {
+ printf "%12.1f", $val;
+ }
+ print "\n";
+ }
+
+ See the examples directory for more ways to use this
+ extension.
+
+AAAAUUUUTTTTHHHHOOOORRRR
+ Tobias Oetiker <oeitker at ee.ethy.ch>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27/Aug/99 1.0.7 2
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.txt Sat Jul 13 19:22:59 2002
@@ -0,0 +1,264 @@
+
+
+
+RRDCGI(1) rrdtool RRDCGI(1)
+
+
+NNNNAAAAMMMMEEEE
+ rrdcgi - create web pages containing RRD graphs based on
+ templates
+
+SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
+ #!/path/to/rrrrrrrrddddccccggggiiii [--------ggggooooooooddddffffoooorrrr|----gggg _s_e_c_o_n_d_s] [--------ffffiiiilllltttteeeerrrr]
+ [--------rrrreeeeffffrrrreeeesssshhhh|----rrrr]
+
+DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
+ rrrrrrrrddddccccggggiiii is a sort of very limited script interpreter. Its
+ purpose is to run as a cgi-program and parse a web page
+ template containing special <RRD:: tags. rrrrrrrrddddccccggggiiii will
+ interpret and act according to these tags. In the end it
+ will printout a web page including the necessary CGI
+ headers.
+
+ rrrrrrrrddddccccggggiiii parses the contents of the template in 2 steps. In
+ each step it looks only for a subset of tags. This allows
+ to nest tags.
+
+ The argument parser uses the same semantics as you are
+ used from your c shell.
+
+ --------ggggooooooooddddffffoooorrrr|----gggg _s_e_c_o_n_d_s
+ Specify the number of seconds this page should
+ remain valid. This will prompt the rrdcgi to
+ output a Last-Modified and a Expire header.
+
+ --------ffffiiiilllltttteeeerrrr
+ Assume that rrdcgi is being run as a filter and
+ not as a cgi.
+
+ --------rrrreeeeffffrrrreeeesssshhhh|----rrrr
+ If the --------ggggooooooooddddffffoooorrrr flag is specified, then --------rrrreeeeffffrrrreeeesssshhhh
+ will cause rrdcgi to output a Refresh header with
+ the value of the --------ggggooooooooddddffffoooorrrr value.
+
+ PPPPaaaassssssss 1111
+
+
+ RRD::CV _n_a_m_e
+ Inserts the CGI variable of the given name.
+
+ RRD::CV::QUOTE _n_a_m_e
+ Inserts the CGI variable of the given name but
+ quotes it, ready for use as an argument in another
+ RRD:: tag. So even when there are spaces in the
+ value of the CGI variable it will still be
+ considered as one argument.
+
+ RRD::CV::PATH _n_a_m_e
+ Inserts the CGI variable of the given name, quotes
+ it and makes sure the it starts neither with a '/'
+ nor contains '..'. This is to make sure that no
+
+
+
+9/Aug/99 1.0.7 1
+
+
+
+
+
+RRDCGI(1) rrdtool RRDCGI(1)
+
+
+ problematic pathnames can be introduced through
+ the CGI interface.
+
+ PPPPaaaassssssss 2222
+
+
+ RRD::INCLUDE _f_i_l_e_n_a_m_e
+ Include the contents of the given file into the
+ page returned from the cgi
+
+ PPPPaaaassssssss 3333
+
+
+ RRD::GRAPH _r_r_d_g_r_a_p_h _a_r_g_u_m_e_n_t_s
+ This tag creates the RRD graph defined in its
+ argument and then gets replaced by an appropriate
+ <IMG> tag referring to the graph. The --------llllaaaazzzzyyyy
+ option in RRD graph can be used to make sure that
+ graphs are only regenerated when they are out of
+ date. The arguments to the RRRRRRRRDDDD::::::::GGGGRRRRAAAAPPPPHHHH tag work as
+ described in the rrrrrrrrddddggggrrrraaaapppphhhh manual page.
+
+ Use the --------llllaaaazzzzyyyy option in your RRD::GRAPH tags, to
+ reduce the load on your server. This option makes
+ sure that graphs are only regenerated when the old
+ ones are out of date.
+
+ If you do not specify your own --------iiiimmmmggggiiiinnnnffffoooo format,
+ the following will be used:
+
+ <IMG SRC="%s" WIDTH="%lu" HEIGHT="%lu">
+
+ Note that %s stands for the filename part of the
+ graph generated, all directories given in the GIF
+ file argument will get dropped.
+
+ RRD::PRINT _n_u_m_b_e_r
+ If the preceding RRRRRRRRDDDD::::::::GGGGRRRRAAAAPPPPHHHH tag contained and
+ PPPPRRRRIIIINNNNTTTT arguments, then you can access their output
+ with this tag. The _n_u_m_b_e_r argument refers to the
+ number of the PPPPRRRRIIIINNNNTTTT argument. This first PPPPRRRRIIIINNNNTTTT has
+ _n_u_m_b_e_r 0.
+
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE
+ The example below creates a web pages with a single RRD
+ graph.
+
+
+
+
+
+
+
+
+
+
+
+9/Aug/99 1.0.7 2
+
+
+
+
+
+RRDCGI(1) rrdtool RRDCGI(1)
+
+
+ #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page</H1>
+ <P>
+ <RRD::GRAPH demo.gif --lazy --title="Temperatures"
+ DEF:cel=demo.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+
+ </P>
+ </BODY>
+ </HTML>
+
+
+EEEEXXXXAAAAMMMMPPPPLLLLEEEE 2222
+ This script is slightly more elaborate, it allows you to
+ run it from a form which sets RRD_NAME. RRD_NAME is then
+ used to select which RRD you want to use a source for your
+ graph.
+
+ #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page for <RRD::CV RRD_NAME></H1>
+ <H2>Selection</H2>
+ <FORM><INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomA> Room A,
+ <INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomB> Room B.
+ <INPUT TYPE=SUBMIT></FORM>
+ <H2>Graph</H2>
+ <P>
+ <RRD::GRAPH <RRD::CV::PATH RRD_NAME>.gif --lazy
+ --title "Temperatures for "<RRD::CV::QUOTE RRD_NAME>
+ DEF:cel=<RRD::CV::PATH RRD_NAME>.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+
+ </P>
+ </BODY>
+ </HTML>
+
+
+AAAAUUUUTTTTHHHHOOOORRRR
+ Tobias Oetiker <oetiker at ee.ethz.ch>
+
+
+
+
+
+
+
+
+
+
+
+
+
+9/Aug/99 1.0.7 3
+
+
+
+
+
+RRDCGI(1) rrdtool RRDCGI(1)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9/Aug/99 1.0.7 4
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.html Sat Jul 13 19:23:00 2002
@@ -81,6 +81,11 @@
<P>
+For an introduction to the usage of rrdtool make sure you check <A HREF="././rrdtutorial.html#">the rrdtutorial manpage</A>.
+
+
+<P>
+
<P>
<HR>
<H2><A NAME="FUNCTIONS">FUNCTIONS
@@ -97,7 +102,7 @@
<DT><STRONG><A NAME="item_create">create
</A></STRONG><DD>
-Set up a new Round Robin Database (RRD). Check rrdcreate
+Set up a new Round Robin Database (RRD). Check <A HREF="././rrdcreate.html#">the rrdcreate manpage</A>.
<P>
@@ -105,7 +110,7 @@
<DT><STRONG><A NAME="item_update">update
</A></STRONG><DD>
-Store new data values into an RRD. Check rrdupdate
+Store new data values into an RRD. Check <A HREF="././rrdupdate.html#">the rrdupdate manpage</A>.
<P>
@@ -114,7 +119,7 @@
</A></STRONG><DD>
Create a graph from data stored in one or several RRD. Apart from
-generating graphs, data can also be extracted to stdout. Check rrdgraph
+generating graphs, data can also be extracted to stdout. Check <A HREF="././rrdgraph.html#">the rrdgraph manpage</A>.
<P>
@@ -122,8 +127,18 @@
<DT><STRONG><A NAME="item_dump">dump
</A></STRONG><DD>
-Dump the contents of an RRD in plain ASCII. This is manly used for
-debugging. Check rrddump
+Dump the contents of an RRD in plain ASCII. In connection with restore you
+can use it to transport an rrd from one architecture to another. Check <A HREF="././rrddump.html#">the rrddump manpage</A>.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_restore">restore
+
+</A></STRONG><DD>
+Restore an RRD in XML format to a binary rrd ... Check <A HREF="././rrdrestore.html#">the rrdrestore manpage</A>
+
+
<P>
@@ -132,7 +147,7 @@
</A></STRONG><DD>
Get data for a certain time period from a RRD. The graph function uses
-fetch to retrieve its data from an rrd. Check rrdfetch
+fetch to retrieve its data from an rrd. Check <A HREF="././rrdfetch.html#">the rrdfetch manpage</A>.
<P>
@@ -140,7 +155,7 @@
<DT><STRONG><A NAME="item_tune">tune
</A></STRONG><DD>
-Alter setup of an RRD
+Alter setup of an RRD. Check <A HREF="././rrdtune.html#">the rrdtune manpage</A>.
<P>
@@ -148,7 +163,24 @@
<DT><STRONG><A NAME="item_last">last
</A></STRONG><DD>
-Find last update time of an RRD
+Find last update time of an RRD. Check <A HREF="././rrdlast.html#">the rrdlast manpage</A>.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_rrdresize">rrdresize
+
+</A></STRONG><DD>
+Change the size of individual RRAs ... Dangerous! Check <A HREF="././rrdresize.html#">the rrdresize manpage</A>.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_rrdcgi">rrdcgi
+
+</A></STRONG><DD>
+This is a standalone tool for producing rrd graphs on the fly. Check
+<A HREF="././rrdcgi.html#">the rrdcgi manpage</A>.
<P>
@@ -238,8 +270,8 @@
The <STRONG>rrdtool</STRONG> also allows one to generate reports in numerical and graphical form based
on the data stored in one or several
<STRONG>RRD</STRONG>s. The graphing feature is fully configurable. Size, color and contents of
-the graph can be defined freely. Check rrdgraph for more information on
-this.
+the graph can be defined freely. Check <A HREF="././rrdgraph.html#">the rrdgraph manpage</A>
+for more information on this.
<P>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.txt Sat Jul 13 19:23:00 2002
@@ -61,6 +61,6 @@
-24/Oct/98 19990426.22 1
+9/Aug/99 1.0.7 1
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.txt Sat Jul 13 19:23:01 2002
@@ -5,7 +5,7 @@
NNNNAAAAMMMMEEEE
- rrdtutorial - Alex van den Bogaerdts RRD Tool tutorial
+ rrdtutorial - Alex van den Bogaerdts RRDtool tutorial
DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
RRDtool is written by Tobias Oetiker <oetiker at ee.ethz.ch>
@@ -61,7 +61,7 @@
-10/May/99 19990510.19 1
+9/Aug/99 1.0.7 1
@@ -85,12 +85,12 @@
bits) transfered from and to a network or a computer.
RRDtool lets you create a database, store data in it,
retrieve that data and create graphs in GIF format for
- display on a web browser. Those GIF images are dependant
+ display on a web browser. Those GIF images are dependent
on the data you collected and could be, for instance, an
overview of the average network usage, or rather the peaks
that occurred. It can also be used to display tidal
waves, solar radiation, power consumption, number of
- visitors at an exibition, noise levels near an airport,
+ visitors at an exhibition, noise levels near an airport,
temperature on your favorite holiday location, temperature
in the fridge and whatever you imagination can come up
with. You need a sensor to measure the data and be able to
@@ -122,12 +122,12 @@
location and usage of the list.
I suggest you take a moment to subscribe to the mailing
- list right now by sending an email to <rrdtool-users-
+ list right now by sending an email to <rrd-users-
request at list.ee.ethz.ch> with a subject of "subscribe". If
-10/May/99 19990510.19 2
+9/Aug/99 1.0.7 2
@@ -193,7 +193,7 @@
-10/May/99 19990510.19 3
+9/Aug/99 1.0.7 3
@@ -259,7 +259,7 @@
-10/May/99 19990510.19 4
+9/Aug/99 1.0.7 4
@@ -325,7 +325,7 @@
-10/May/99 19990510.19 5
+9/Aug/99 1.0.7 5
@@ -391,7 +391,7 @@
-10/May/99 19990510.19 6
+9/Aug/99 1.0.7 6
@@ -438,7 +438,7 @@
when divided by 300 seconds, we get very small numbers. To
be exact, the first value was 12 (12357-12345) and divided
by 300 this makes 0.04 RRDtool displays this as 40 m which
- means 40 mili (so: NOT meters). What we did wrong was
+ means 40 milli (so: NOT meters). What we did wrong was
that we should have measured in meters, this would have
been (12357000-12345000)/300 = 12000/300 = 40.
@@ -450,14 +450,14 @@
--start 920804400 --end 920808000 \
--vertical-label m/s \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:realspeed=myspeed,1000,* \
+ "CDEF:realspeed=myspeed,1000,*" \
LINE2:realspeed#FF0000
After viewing this GIF, you notice the "m" has
-10/May/99 19990510.19 7
+9/Aug/99 1.0.7 7
@@ -496,7 +496,7 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,kmh,0,IF \
CDEF:good=kmh,100,GT,0,kmh,IF \
HRULE:100#0000FF:"Maximum allowed" \
@@ -523,7 +523,7 @@
-10/May/99 19990510.19 8
+9/Aug/99 1.0.7 8
@@ -545,10 +545,10 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,100,0,IF \
CDEF:over=kmh,100,GT,kmh,100,-,0,IF \
- CDEF:good=kmh,0,kmh,100,GT,IF \
+ CDEF:good=kmh,100,GT,0,kmh,IF \
HRULE:100#0000FF:"Maximum allowed" \
AREA:good#00FF00:"Good speed" \
AREA:fast#550000:"Too fast" \
@@ -589,7 +589,7 @@
-10/May/99 19990510.19 9
+9/Aug/99 1.0.7 9
@@ -655,7 +655,7 @@
-10/May/99 19990510.19 10
+9/Aug/99 1.0.7 10
@@ -721,7 +721,7 @@
-10/May/99 19990510.19 11
+9/Aug/99 1.0.7 11
@@ -787,7 +787,7 @@
-10/May/99 19990510.19 12
+9/Aug/99 1.0.7 12
@@ -853,7 +853,7 @@
-10/May/99 19990510.19 13
+9/Aug/99 1.0.7 13
@@ -876,7 +876,7 @@
Suggestion:
Display in bytes per second and in bits per second. Make
- the ethernet graphics go red if they are over four
+ the Ethernet graphics go red if they are over four
megabits per second.
CCCCoooonnnnssssoooolllliiiiddddaaaattttiiiioooonnnn FFFFuuuunnnnccccttttiiiioooonnnnssss
@@ -919,7 +919,7 @@
-10/May/99 19990510.19 14
+9/Aug/99 1.0.7 14
@@ -985,7 +985,7 @@
-10/May/99 19990510.19 15
+9/Aug/99 1.0.7 15
@@ -1051,7 +1051,7 @@
-10/May/99 19990510.19 16
+9/Aug/99 1.0.7 16
@@ -1084,7 +1084,7 @@
DEF:lined=all.rrd:d:AVERAGE LINE3:lined#000000:"Line D"
- RRRRRRRRDDDD TTTToooooooollll uuuunnnnddddeeeerrrr tttthhhheeee MMMMiiiiccccrrrroooossssccccooooppppeeee
+ RRRRRRRRDDDDttttoooooooollll uuuunnnnddddeeeerrrr tttthhhheeee MMMMiiiiccccrrrroooossssccccooooppppeeee
+o Line A is a counter so it should continuously increment
@@ -1117,7 +1117,7 @@
-10/May/99 19990510.19 17
+9/Aug/99 1.0.7 17
@@ -1183,7 +1183,7 @@
-10/May/99 19990510.19 18
+9/Aug/99 1.0.7 18
@@ -1249,7 +1249,7 @@
-10/May/99 19990510.19 19
+9/Aug/99 1.0.7 19
@@ -1315,7 +1315,7 @@
-10/May/99 19990510.19 20
+9/Aug/99 1.0.7 20
@@ -1381,7 +1381,7 @@
-10/May/99 19990510.19 21
+9/Aug/99 1.0.7 21
@@ -1432,7 +1432,7 @@
didn't.
SSSSEEEEEEEE AAAALLLLSSSSOOOO
- The RRD Tool manpages
+ The RRDtool manpages
AAAAUUUUTTTTHHHHOOOORRRR
I hope you enjoyed the examples and their descriptions. If
@@ -1447,7 +1447,7 @@
-10/May/99 19990510.19 22
+9/Aug/99 1.0.7 22
@@ -1513,6 +1513,6 @@
-10/May/99 19990510.19 23
+9/Aug/99 1.0.7 23
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.pod Sat Jul 13 19:23:02 2002
@@ -9,16 +9,22 @@
S<[B<-e>|B<--end> I<seconds>]>
S<[B<-x>|B<--x-grid> I<x-axis grid and label>]>
S<[B<-y>|B<--y-grid> I<y-axis grid and label>]>
+S<[B<--alt-y-grid>]>
+S<[B<--alt-autoscale>]>
S<[B<-v>|B<--vertical-label> I<text>]>
S<[B<-w>|B<--width> I<pixels>]>
S<[B<-h>|B<--height> I<pixels>]>
S<[B<-i>|B<--interlaced>]>
+S<[B<-f>|B<--imginfo> I<formatstring>]>
+S<[B<-a>|B<--imgformat> B<GIF>|B<PNG>]>
+S<[B<-z>|B<--lazy>]>
S<[B<-o>|B<--logarithmic>]>
S<[B<-u>|B<--upper-limit> I<value>]>
S<[B<-l>|B<--lower-limit> I<value>]>
S<[B<-r>|B<--rigid>]>
S<[B<-b>|B<--base> I<value>]>
S<[B<-c>|B<--color> I<COLORTAG>B<#>I<rrggbb>]>
+
S<[B<-t>|B<--title> I<title>]>
S<[B<DEF:>I<vname>B<=>I<rrd>B<:>I<ds-name>B<:>I<CF>]>
S<[B<CDEF:>I<vname>B<=>I<rpn-expression>]>
@@ -42,31 +48,34 @@
=item I<filename>
The name of the graph to generate. Since B<rrdtool> outputs
-GIF's, it's recommended that the filename end in F<.gif>.
-B<rrdtool> does not enforce this, however. If the I<filename>
-is et to '-' the gif file will be written to standard out. All
-other output will get supressd.
+GIFs and PNGs, it's recommended that the filename end in either
+F<.gif> or F<.png>. B<rrdtool> does not enforce this, however.
+If the I<filename> is set to '-' the image file will be written
+to standard out. All other output will get suppressed.
+
+PNG output is recommended, since it takes up to 40% less disk space
+and 20-30% less time to generate than a GIF file.
If no graph functions are called, the graph will not be created.
-=item B<-s>|B<--start> I<seconds> (default -24*3600)
+=item B<-s>|B<--start> I<seconds> (default end-1day)
The time when the graph should begin. Time in seconds since
epoch (1970-01-01) is required. Negative numbers are relative to the
-end time. By default one day worth of data will be graphed.
+current time. By default one day worth of data will be graphed.
See also AT-STYLE TIME SPECIFICATION section in the I<rrdfetch>
-documentation for alternative ways to specify start time.
+documentation for a detailed explanation on how to specify time.
-=item B<-e>|B<--end> I<seconds> (default current time)
+=item B<-e>|B<--end> I<seconds> (default now)
The time when the graph should end. Time in seconds since epoch.
See also AT-STYLE TIME SPECIFICATION section in the I<rrdfetch>
-documentation for alternative ways to specify end time.
+documentation for a detailed explanation of ways to specify time.
=item B<-x>|B<--x-grid> I<x-axis grid and label> (default autoconfigure)
The x-axis label is quite complex to configure. So if you don't have
-very special needs, you can relay on the autoconfiguration to get this
+very special needs, you can rely on the autoconfiguration to get this
right.
The x-axis label is configured, using the following format:
@@ -104,6 +113,25 @@
I<label factor> gridstep, a major grid line is printed, along with
label showing the value of the grid line.
+=item B<--alt-y-grid>
+
+Place Y grid dynamically based on graph Y range. Algorithm ensures
+that you always have grid, that there are enough but not too many
+grid lines and the grid is metric. That is grid lines are placed
+every 1, 2, 5 or 10 units. (contributed by Sasha Mikheev)
+
+
+=item B<--alt-autoscale>
+
+Compute Y range based on function absolute minimum and
+maximum values. Default algorithm uses predefined set of ranges.
+This is good in many cases but it fails miserably when you need
+to graph something like 260 + 0.001 * sin(x). Default algorithm
+will use Y range from 250 to 300 and on the graph you will see
+almost straight line. With --alt-autoscale Y range will be
+from slightly less the 260 - 0.001 to slightly more then 260 + 0.001
+and periodic behavior will be seen. (contributed by Sasha Mikheev)
+
=item B<-v>|B<--vertical-label> I<text>
vertical label on the left side of the graph. This is normally used to
@@ -128,6 +156,26 @@
of the GIF on disk. It makes no changes to the layout or contents
of the graph.
+=item B<-f>|B<--imginfo> I<formatstring>
+
+After the image has been created, the graph function uses printf
+together with this format string to create output similar to the PRINT
+function, only that the printf is supplied with the parameters
+I<filename>, I<xsize> and I<ysize>. In order to generate an B<IMG> tag
+suitable for including the graph into a web page, the command line
+would look like this:
+
+ --imginfo '<IMG SRC="/img/%s" WIDTH="%lu" HEIGHT="%lu" ALT="Demo">'
+
+=item B<-a>|B<--imgformat> B<GIF>|B<PNG> (default: GIF)
+
+Allows you to produce PNG output from rrdtool.
+
+=item B<-z>|B<--lazy> (default: false)
+
+Only generate the graph, if the current gif is out of date or not
+existent.
+
=item B<-u>|B<--upper-limit> I<value> (default autoconfigure)
The maximum value to be graphed. By default This will be
@@ -146,7 +194,7 @@
=item B<-b>|B<--base> I<value>
-if you are graphing memmory (and NOT network traffic) this switch
+if you are graphing memory (and NOT network traffic) this switch
should be set to 1024 so that one Kb is 1024 byte. For traffic
measurement, 1 kb/s is 1000 b/s.
@@ -187,19 +235,17 @@
as needed. The pushing of data is implicit, so when ever you specify a number
or a variable, it gets pushed automatically.
-If this is all a big load of
-incomprehensible words for you, maybe an example helps (a more
-complete explanation is given in [1]):
-The expression
-vname+3/2 becomes vname,3,2,/,+ in RPN. First the three values get
-pushed onto the stack (which now contains (the current value of)
-vname, a 3 and a 2).
-Then the / operator pops two values from the stack (3 and 2), divides
-the first argument by the second (3/2) and pushes the result (1.5)
-back onto the stack. Then the + operator pops two values (vname and
-1.5) from the stack; both values are added up and the result gets
-pushes back onto the stack. In the end there is only one value left on
-the stack: The result of the expression.
+If this is all a big load of incomprehensible words for you, maybe an
+example helps (a more complete explanation is given in [1]): The
+expression I<vname+3/2> becomes C<vname,3,2,/,+> in RPN. First the three
+values get pushed onto the stack (which now contains (the current
+value of) vname, a 3 and a 2). Then the / operator pops two values
+from the stack (3 and 2), divides the first argument by the second
+(3/2) and pushes the result (1.5) back onto the stack. Then the +
+operator pops two values (vname and 1.5) from the stack; both values
+are added up and the result gets pushes back onto the stack. In the
+end there is only one value left on the stack: The result of the
+expression.
The I<rpn-expression> in the B<CDEF> function takes both, constant values
as well as I<vname> variables. The following operators can be used on these
@@ -207,10 +253,11 @@
=over 8
-=item +, -, *, /
+=item +, -, *, /, %
pops two values from the stack applies the selected operator and pushes
-the result back onto the stack.
+the result back onto the stack. The % operator stands for the modulo
+operation.
=item SIN, COS, LOG, EXP
@@ -223,8 +270,6 @@
condition and pushes either 1 back onto the stack if the condition is true
and 0 if the condition was not true.
-
-
=item IF
pops three values from the stack. If the last value is not 0, the
@@ -236,11 +281,37 @@
look at C and if it is not 0 it will push D back onto the stack, otherwise
E will be sent back to the stack.
+=item DUP, EXC, POP
+
+These manipulate the stack directly. DUP will duplicate the top of the
+stack, pushing the result back onto the stack. EXC will exchange the top
+two elements of the stack, and POP will pop off the top element of the
+stack. Having insufficient elements on the stack for these operations is
+an error.
+
=item UN
-Pops one value of the stack, if it is I<*UNKNOWN*>, 1 will be pushed
+Pops one value off the stack, if it is I<*UNKNOWN*>, 1 will be pushed
back otherwise 0.
+=item UNKN
+
+Push an I<*UNKNOWN*> value onto the stack.
+
+=item INF, NEGINF
+
+Push a positive or negative infinite (oo) value onto the stack. When
+drawing an infinite number it appears right at the top or bottom edge of the
+graph, depending whether you have a positive or negative infinite number.
+
+=item NOW
+
+Push the current (real world) time onto the stack.
+
+=item TIME
+
+Push the time the current sample was taken onto the stack.
+
=back
Please note that you may only use I<vname> variables that you
@@ -252,8 +323,22 @@
=item B<PRINT:>I<vname>B<:>I<CF>B<:>I<format>
Calculate the chosen consolidation function I<CF> over the data-source
-variable I<vname> and C<printf> the
-result to stdout using I<format>.
+variable I<vname> and C<printf> the result to stdout using I<format>.
+In the I<format> string there should be a '%lf' or '%le' marker in the
+place where the number should be printed.
+
+If an additional '%s' is found AFTER the marker, the value will be scaled
+and an appropriate SI magnitude unit will be printed in place of the '%s'
+marker. The scaling will take the '--base' argument into consideration!
+
+If a '%S' is used instead of a '%s', then instead of calculating the
+appropriate SI magnitude unit for this value, the previously calculated
+SI magnitude unit will be used. This is useful if you want all the values
+in a PRINT statement to have the same SI magnitude unit. If there was
+no previous SI magnitude calculation made, then '%S' behaves like a '%s',
+unless the value is 0, in which case it does not remember a SI magnitude
+unit and a SI magnitude unit will only be calculated when the next '%s' is
+seen or the next '%S' for a non-zero value.
=item B<GPRINT:>I<vname>B<:>I<CF>B<:>I<format>
@@ -290,10 +375,15 @@
Does the same as B<LINE?>, but the graph gets stacked on top of the previous
B<LINE?>, B<AREA> or B<STACK> graph. Depending on the type of the
previous graph, the B<STACK> will be either a B<LINE?> or an B<AREA>.
-This obviously implies that the first B<STACK> must be preceeded by an
+This obviously implies that the first B<STACK> must be preceded by an
B<AREA> or B<LINE?> -- you need something to stack something onto in
the first place ;)
+Note, that when you STACK onto *UNKNOWN* data, rrdtool will not draw
+any graphics ... *UNKNOWN* is not zero ... if you want it to zero
+then you might want to use a CDEF argument with IF and UN functions to
+turn *UNKNOWN* into zero ...
+
=back
=head1 NOTE
@@ -306,8 +396,8 @@
=head1 NOTE 2
The text printed below the actual graph can be formated by appending special
-escaped charactes at the end of a text. When ever such a character occurs,
-all pending text is pushed onto the grah acording to the character specified.
+escaped characters at the end of a text. When ever such a character occurs,
+all pending text is pushed onto the graph according to the character specified.
Valid characters are: B<j> for justified, B<l> for left aligned, B<r>
for right aligned and B<c> for centered. In the next section there is an example
@@ -329,6 +419,71 @@
LINE2:cel#00a000:"D. Celsius" \
LINE2:far#ff0000:"D. Fahrenheit\c"
+=head1 EXAMPLE2
+
+This example demonstrates the syntax for using IF and UN to set
+I<*UNKNOWN*> values to 0. This technique is useful if you are
+aggregating interface data where the start dates of the data sets
+doesn't match.
+
+ rrdtool graph demo.gif --title="Demo Graph" \
+ DEF:idat1=interface1.rrd:ds0:AVERAGE \
+ DEF:idat2=interface2.rrd:ds0:AVERAGE \
+ DEF:odat1=interface1.rrd:ds1:AVERAGE \
+ DEF:odat2=interface2.rrd:ds1:AVERAGE \
+ CDEF:agginput=idat1,UN,0,idat1,IF,idat2,UN,0,idat2,IF,+,8,* \
+ CDEF:aggoutput=odat1,UN,0,odat1,IF,odat2,UN,0,odat2,IF,+,8,* \
+ AREA:agginput#00cc00:Input Aggregate \
+ LINE1:agginput#0000FF:Output Aggregate
+
+Assuming that idat1 has a data value of I<*UNKNOWN*>, the CDEF expression
+
+ idat1,UN,0,idat1,IF
+
+leaves us with a stack with contents of 1,0,NaN and the IF function
+will pop off the 3 values and replace them with 0. If idat1 had a
+real value like 7942099, then the stack would have 0,0,7942099 and the
+real value would be the replacement.
+
+=head1 EXAMPLE3
+
+This example shows two ways to use the INF function. First it makes
+the background change color during half of the hours. Then, it uses
+AREA and STACK to draw a picture. If one of the inputs was UNKNOWN,
+all inputs are overlaid with another AREA.
+
+ rrdtool graph example.png --title="INF demo" \
+ DEF:val1=some.rrd:ds0:AVERAGE \
+ DEF:val2=some.rrd:ds1:AVERAGE \
+ DEF:val3=some.rrd:ds2:AVERAGE \
+ DEF:val4=other.rrd:ds0:AVERAGE \
+ CDEF:background=val4,POP,TIME,7200,%,3600,LE,INF,UNKN,IF \
+ CDEF:wipeout=val1,val2,val3,val4,+,+,+,UN,INF,UNKN,IF \
+ AREA:background#F0F0F0 \
+ AREA:val1#0000FF:Value1 \
+ STACK:val2#00C000:Value2 \
+ STACK:val3#FFFF00:Value3 \
+ STACK:val4#FFC000:Value4 \
+ AREA:whipeout#FF0000:Unknown
+
+The first CDEF uses val4 as a dummy value. It's value is removed immediately
+from the stack. Then a decision is made based on the time that a sample was
+taken. If it is an even hour (UTC time !) then the area will be filled. If
+it is not, the value is set to UNKN and is not plotted.
+
+The second CDEF looks if any of val1,val2,val3,val4 is unknown. It does so by
+checking the outcome of sum(val1,val2,val3,val4). Again, INF is returned when
+the condition is true, UNKN is used to not plot the data.
+
+The different items are plotted in a particular order. First do the background,+then use a
+normal area to overlay it with data. Stack the other data until they+are all plotted. Last but
+not least, overlay everything with eye-hurting red
+to signal any unknown data.
+
+Note that this example assumesthat your data is in the positive half of the y-axis
+otherwhise you would would have to add NEGINF in order to extend the coverage
+of the rea to whole graph.
+
=head1 AUTHOR
Tobias Oetiker <oetiker at ee.ethz.ch>
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.pod Sat Jul 13 19:23:02 2002
@@ -0,0 +1,158 @@
+=head1 NAME
+
+rrdcgi - create web pages containing RRD graphs based on templates
+
+=head1 SYNOPSIS
+
+#!/path/to/B<rrdcgi>
+S<[B<--goodfor>|B<-g> I<seconds>]>
+S<[B<--filter>]>
+S<[B<--refresh>|B<-r>]>
+
+=head1 DESCRIPTION
+
+B<rrdcgi> is a sort of very limited script interpreter. Its purpose
+is to run as a cgi-program and parse a web page template containing special
+E<lt>RRD:: tags. B<rrdcgi> will interpret and act according to these tags.
+In the end it will printout a web page including the necessary CGI headers.
+
+B<rrdcgi> parses the contents of the template in 2 steps. In each step it looks
+only for a subset of tags. This allows to nest tags.
+
+The argument parser uses the same semantics as you are used from your c shell.
+
+=over 8
+
+=item B<--goodfor>|B<-g> I<seconds>
+
+Specify the number of seconds this page should remain valid. This will prompt
+the rrdcgi to output a Last-Modified and a Expire header.
+
+=item B<--filter>
+
+Assume that rrdcgi is being run as a filter and not as a cgi.
+
+=item B<--refresh>|B<-r>
+
+If the B<--goodfor> flag is specified, then B<--refresh> will cause rrdcgi
+to output a Refresh header with the value of the B<--goodfor> value.
+
+=back
+
+=head2 Pass 1
+
+=over 8
+
+=item RRD::CV I<name>
+
+Inserts the CGI variable of the given name.
+
+=item RRD::CV::QUOTE I<name>
+
+Inserts the CGI variable of the given name but quotes it, ready for
+use as an argument in another RRD:: tag. So even when there are spaces in the
+value of the CGI variable it will still be considered as one argument.
+
+=item RRD::CV::PATH I<name>
+
+Inserts the CGI variable of the given name, quotes it and makes sure
+the it starts neither with a '/' nor contains '..'. This is to make
+sure that no problematic pathnames can be introduced through the
+CGI interface.
+
+=back
+
+=head2 Pass 2
+
+=over 8
+
+=item RRD::INCLUDE I<filename>
+
+Include the contents of the given file into the page returned from the cgi
+
+=back
+
+=head2 Pass 3
+
+=over 8
+
+=item RRD::GRAPH I<rrdgraph arguments>
+
+This tag creates the RRD graph defined in its argument and then gets
+replaced by an appropriate E<lt>IMGE<gt> tag referring to the graph.
+The B<--lazy> option in RRD graph can be used to make sure that graphs
+are only regenerated when they are out of date. The arguments
+to the B<RRD::GRAPH> tag work as described in the B<rrdgraph> manual page.
+
+Use the B<--lazy> option in your RRD::GRAPH tags, to reduce the load
+on your server. This option makes sure that graphs are only regenerated when
+the old ones are out of date.
+
+If you do not specify your own B<--imginfo> format, the following will
+be used:
+
+ <IMG SRC="%s" WIDTH="%lu" HEIGHT="%lu">
+
+Note that %s stands for the filename part of the graph generated, all
+directories given in the GIF file argument will get dropped.
+
+=item RRD::PRINT I<number>
+
+If the preceding B<RRD::GRAPH> tag contained and B<PRINT> arguments,
+then you can access their output with this tag. The I<number> argument refers to the
+number of the B<PRINT> argument. This first B<PRINT> has I<number> 0.
+
+=back
+
+=head1 EXAMPLE
+
+The example below creates a web pages with a single RRD graph.
+
+ #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page</H1>
+ <P>
+ <RRD::GRAPH demo.gif --lazy --title="Temperatures"
+ DEF:cel=demo.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+
+ </P>
+ </BODY>
+ </HTML>
+
+=head1 EXAMPLE 2
+
+This script is slightly more elaborate, it allows you to run it from
+a form which sets RRD_NAME. RRD_NAME is then used to select which RRD
+you want to use a source for your graph.
+
+ #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page for <RRD::CV RRD_NAME></H1>
+ <H2>Selection</H2>
+ <FORM><INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomA> Room A,
+ <INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomB> Room B.
+ <INPUT TYPE=SUBMIT></FORM>
+ <H2>Graph</H2>
+ <P>
+ <RRD::GRAPH <RRD::CV::PATH RRD_NAME>.gif --lazy
+ --title "Temperatures for "<RRD::CV::QUOTE RRD_NAME>
+ DEF:cel=<RRD::CV::PATH RRD_NAME>.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+
+ </P>
+ </BODY>
+ </HTML>
+
+=head1 AUTHOR
+
+Tobias Oetiker E<lt>oetiker at ee.ethz.chE<gt>
+
+
+
+
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.txt Sat Jul 13 19:23:02 2002
@@ -5,24 +5,22 @@
NNNNAAAAMMMMEEEE
- rrdtool dump - dump the contents of an RRRRRRRRDDDD in human
- readable form
+ rrdtool dump - dump the contents of an RRRRRRRRDDDD to XML format
SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
- rrrrrrrrddddttttoooooooollll dddduuuummmmpppp _f_i_l_e_n_a_m_e [--------ffffuuuullllllll|----ffff]
+ rrrrrrrrddddttttoooooooollll dddduuuummmmpppp _f_i_l_e_n_a_m_e_._r_r_d > _f_i_l_e_n_a_m_e_._x_m_l
DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
The dddduuuummmmpppp function prints the contents of an RRRRRRRRDDDD in human
- readable form.
+ readable (?) XML format. This format can be read by
+ rrdrestore. Together they allow you to transfer your
+ files from one architecture to another as well as
+ manipulating the contents of an RRRRRRRRDDDD file in a somewhat
+ more convenient manner.
- _f_i_l_e_n_a_m_e
+ _f_i_l_e_n_a_m_e_._r_r_d
The name of the RRRRRRRRDDDD you want to dump.
- --------ffffuuuullllllll|----ffff
- By default only the headers of the RRRRRRRRDDDD are
- printed. With this option you get the actual data
- as well.
-
AAAAUUUUTTTTHHHHOOOORRRR
Tobias Oetiker <oetiker at ee.ethz.ch>
@@ -61,6 +59,8 @@
-29/Mar/98 19990426.22 1
+
+
+9/Aug/99 1.0.7 1
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.pod Sat Jul 13 19:23:03 2002
@@ -1,6 +1,6 @@
=head1 NAME
-rrdtutorial - Alex van den Bogaerdts RRD Tool tutorial
+rrdtutorial - Alex van den Bogaerdts RRDtool tutorial
=head1 DESCRIPTION
@@ -60,10 +60,10 @@
(or bits) transfered from and to a network or a computer.
RRDtool lets you create a database, store data in it, retrieve that data
and create graphs in GIF format for display on a web browser. Those GIF
-images are dependant on the data you collected and could be, for instance,
+images are dependent on the data you collected and could be, for instance,
an overview of the average network usage, or rather the peaks that occurred.
It can also be used to display tidal waves, solar radiation, power
-consumption, number of visitors at an exibition, noise levels near an
+consumption, number of visitors at an exhibition, noise levels near an
airport, temperature on your favorite holiday location, temperature in the
fridge and whatever you imagination can come up with. You need a sensor to
measure the data and be able to feed the numbers to RRDtool. Many devices
@@ -89,7 +89,7 @@
came with RRDtool for the location and usage of the list.
I suggest you take a moment to subscribe to the mailing list right now
-by sending an email to <rrdtool-users-request at list.ee.ethz.ch> with a
+by sending an email to E<lt>rrd-users-request at list.ee.ethz.chE<gt> with a
subject of "subscribe". If you ever want to leave this list, you write
an email to the same address but now with a subject of "unsubscribe".
@@ -311,7 +311,7 @@
The vertical axis displays the range we entered. We provided kilometers
and when divided by 300 seconds, we get very small numbers. To be exact,
the first value was 12 (12357-12345) and divided by 300 this makes 0.04
-RRDtool displays this as 40 m which means 40 mili (so: NOT meters).
+RRDtool displays this as 40 m which means 40 milli (so: NOT meters).
What we did wrong was that we should have measured in meters, this would
have been (12357000-12345000)/300 = 12000/300 = 40.
@@ -323,7 +323,7 @@
--start 920804400 --end 920808000 \
--vertical-label m/s \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:realspeed=myspeed,1000,* \
+ "CDEF:realspeed=myspeed,1000,*" \
LINE2:realspeed#FF0000
After viewing this GIF, you notice the "m" has disappeared. This it what
@@ -352,7 +352,7 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,kmh,0,IF \
CDEF:good=kmh,100,GT,0,kmh,IF \
HRULE:100#0000FF:"Maximum allowed" \
@@ -401,7 +401,7 @@
--start 920804400 --end 920808000 \
--vertical-label km/h \
DEF:myspeed=test.rrd:speed:AVERAGE \
- CDEF:kmh=myspeed,3600,* \
+ "CDEF:kmh=myspeed,3600,*" \
CDEF:fast=kmh,100,GT,100,0,IF \
CDEF:over=kmh,100,GT,kmh,100,-,0,IF \
CDEF:good=kmh,100,GT,0,kmh,IF \
@@ -641,7 +641,7 @@
Suggestion:
-Display in bytes per second and in bits per second. Make the ethernet
+Display in bytes per second and in bits per second. Make the Ethernet
graphics go red if they are over four megabits per second.
=head2 Consolidation Functions
@@ -792,7 +792,7 @@
DEF:linec=all.rrd:c:AVERAGE LINE3:linec#0000FF:"Line C" \
DEF:lined=all.rrd:d:AVERAGE LINE3:lined#000000:"Line D"
-=head2 RRD Tool under the Microscope
+=head2 RRDtool under the Microscope
=over 2
@@ -1064,7 +1064,7 @@
=head1 SEE ALSO
-The RRD Tool manpages
+The RRDtool manpages
=head1 AUTHOR
@@ -1074,5 +1074,5 @@
time learn a whole lot more.
Alex van den Bogaerdt
-<alex at ergens.op.het.net>
+E<lt>alex at ergens.op.het.netE<gt>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.pod Sat Jul 13 19:23:03 2002
@@ -1,30 +1,30 @@
=head1 NAME
-rrdtool dump - dump the contents of an B<RRD> in human readable form
+rrdtool dump - dump the contents of an B<RRD> to XML format
=head1 SYNOPSIS
-B<rrdtool> B<dump> I<filename> [B<--full>|B<-f>]
+B<rrdtool> B<dump> I<filename.rrd> E<gt> I<filename.xml>
=head1 DESCRIPTION
The B<dump> function prints the contents of an B<RRD> in human
-readable form.
+readable (?) XML format. This format can be read by rrdrestore.
+Together they allow you to transfer your files from one architecture
+to another as well as manipulating the contents of an B<RRD> file in a
+somewhat more convenient manner.
-=over 8
-=item I<filename>
-The name of the B<RRD> you want to dump.
+=over 8
-=item B<--full>|B<-f>
+=item I<filename.rrd>
-By default only the headers of the B<RRD> are printed. With this
-option you get the actual data as well.
+The name of the B<RRD> you want to dump.
=back
=head1 AUTHOR
-Tobias Oetiker <oetiker at ee.ethz.ch>
+Tobias Oetiker E<lt>oetiker at ee.ethz.chE<gt>
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.html Sat Jul 13 19:23:03 2002
@@ -0,0 +1,97 @@
+ <HTML>
+ <HEAD>
+ <TITLE>restore - restore the contents of an B<RRD> from its XML dump format
+
+</TITLE>
+ </HEAD>
+
+ <BODY>
+
+<!-- INDEX BEGIN -->
+<!--
+
+<UL>
+
+ <LI><A HREF="#NAME">NAME</A>
+ <LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+ <LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+ <LI><A HREF="#AUTHOR">AUTHOR</A>
+</UL>
+-->
+<!-- INDEX END -->
+
+<P>
+<H1><A NAME="NAME">NAME
+
+</A></H1>
+rrdtool restore - restore the contents of an <STRONG>RRD</STRONG> from its XML dump format
+
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS
+
+</A></H1>
+<STRONG>rrdtool</STRONG> <STRONG>restore</STRONG> <EM>filename.xml</EM> <EM>filename.rrd</EM>
+
+[<STRONG>--range-check</STRONG>|<STRONG>-r</STRONG>]
+
+
+
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION
+
+</A></H1>
+The <STRONG>restore</STRONG> function reads the XML representation of an RRD and converts it into the
+native <STRONG>RRD</STRONG> format.
+
+
+<P>
+
+<DL>
+<DT><STRONG><A NAME="item_filename">filename.xml
+
+</A></STRONG><DD>
+The name of the <STRONG>XML</STRONG> you want to restore.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_filename">filename.rrd
+
+</A></STRONG><DD>
+The name of the <STRONG>RRD</STRONG> to restore.
+
+
+<P>
+
+<DT><STRONG><A NAME="item__range_check_r">--range-check|-r
+
+</A></STRONG><DD>
+Make sure the values in the RRAs do not exceed the limits defined for the
+different datasources.
+
+
+<P>
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="AUTHOR">AUTHOR
+
+</A></H1>
+Tobias Oetiker <A
+HREF="MAILTO:<oetiker at ee.ethz.ch>"><oetiker at ee.ethz.ch></A>
+
+<P>
+
+</DL>
+ </BODY>
+
+ </HTML>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.txt Sat Jul 13 19:23:04 2002
@@ -31,6 +31,9 @@
the individual functions of the rrrrrrrrddddttttoooooooollll check the
corresponding man page.
+ For an introduction to the usage of rrdtool make sure you
+ check the _r_r_d_t_u_t_o_r_i_a_l manpage.
+
FFFFUUUUNNNNCCCCTTTTIIIIOOOONNNNSSSS
While the man pages talk of command line switches you have
@@ -41,38 +44,52 @@
quickly. Check the section on the section on _R_e_m_o_t_e
_C_o_n_t_r_o_l further down.
- ccccrrrreeeeaaaatttteeee Set up a new Round Robin Database (RRD). Check
- rrdcreate
+ ccccrrrreeeeaaaatttteeee Set up a new Round Robin Database (RRD). Check the
+ _r_r_d_c_r_e_a_t_e manpage.
- uuuuppppddddaaaatttteeee Store new data values into an RRD. Check rrdupdate
+ uuuuppppddddaaaatttteeee Store new data values into an RRD. Check the
+ _r_r_d_u_p_d_a_t_e manpage.
ggggrrrraaaapppphhhh Create a graph from data stored in one or several
RRD. Apart from generating graphs, data can also
- be extracted to stdout. Check rrdgraph
+ be extracted to stdout. Check the _r_r_d_g_r_a_p_h
+ manpage.
- dddduuuummmmpppp Dump the contents of an RRD in plain ASCII. This
- is manly used for debugging. Check rrddump
+ dddduuuummmmpppp Dump the contents of an RRD in plain ASCII. In
+ connection with restore you can use it to
+ transport an rrd from one architecture to another.
- ffffeeeettttcccchhhh Get data for a certain time period from a RRD. The
- graph function uses fetch to retrieve its data
- from an rrd. Check rrdfetch
+25/Aug/99 1.0.7 1
-16/May/99 19990525.23 1
+RRDTOOL(1) rrdtool RRDTOOL(1)
+ Check the _r_r_d_d_u_m_p manpage.
-RRDTOOL(1) rrdtool RRDTOOL(1)
+ rrrreeeessssttttoooorrrreeee Restore an RRD in XML format to a binary rrd ...
+ Check the _r_r_d_r_e_s_t_o_r_e manpage
+ ffffeeeettttcccchhhh Get data for a certain time period from a RRD. The
+ graph function uses fetch to retrieve its data
+ from an rrd. Check the _r_r_d_f_e_t_c_h manpage.
- ttttuuuunnnneeee Alter setup of an RRD
+ ttttuuuunnnneeee Alter setup of an RRD. Check the _r_r_d_t_u_n_e manpage.
- llllaaaasssstttt Find last update time of an RRD
+ llllaaaasssstttt Find last update time of an RRD. Check the _r_r_d_l_a_s_t
+ manpage.
+
+ rrrrrrrrddddrrrreeeessssiiiizzzzeeee
+ Change the size of individual RRAs ... Dangerous!
+ Check the _r_r_d_r_e_s_i_z_e manpage.
+
+ rrrrrrrrddddccccggggiiii This is a standalone tool for producing rrd graphs
+ on the fly. Check the _r_r_d_c_g_i manpage.
HHHHOOOOWWWW DDDDOOOOEEEESSSS RRRRRRRRDDDDTTTTOOOOOOOOLLLL WWWWOOOORRRRKKKK????
@@ -107,6 +124,18 @@
maximum, total, last) should be used to build the
consolidated values (see rrdcreate). You can
define any number of different consolidation
+
+
+
+25/Aug/99 1.0.7 2
+
+
+
+
+
+RRDTOOL(1) rrdtool RRDTOOL(1)
+
+
setups within one RRRRRRRRDDDD. They will all be maintained
on the fly when new data is loaded into the RRRRRRRRDDDD.
@@ -124,18 +153,6 @@
one of the values in the storage area was last
written to. New values are written to the Round
Robin Archive in a ... you guess it ... round
-
-
-
-16/May/99 19990525.23 2
-
-
-
-
-
-RRDTOOL(1) rrdtool RRDTOOL(1)
-
-
robin manner. This automatically limits the
history to the last 1000 values. Because you can
define several RRRRRRRRAAAAs within a single RRRRRRRRDDDD, you can
@@ -173,13 +190,25 @@
configurable level. If so, an _*_U_N_K_N_O_W_N_* value will
be written to the RRRRRRRRAAAA.
+
+
+
+25/Aug/99 1.0.7 3
+
+
+
+
+
+RRDTOOL(1) rrdtool RRDTOOL(1)
+
+
Graphing
The rrrrrrrrddddttttoooooooollll also allows one to generate reports in
numerical and graphical form based on the data
stored in one or several RRRRRRRRDDDDs. The graphing
feature is fully configurable. Size, color and
contents of the graph can be defined freely. Check
- rrdgraph for more information on this.
+ the _r_r_d_g_r_a_p_h manpage for more information on this.
RRRREEEEMMMMOOOOTTTTEEEE CCCCOOOONNNNTTTTRRRROOOOLLLL
@@ -190,18 +219,6 @@
the pipes rrrrrrrrddddttttoooooooollll accepts the same arguments as on the
command line. When a command is completed, rrdtool will
print the string 'OK', followed by timing information of
-
-
-
-16/May/99 19990525.23 3
-
-
-
-
-
-RRDTOOL(1) rrdtool RRDTOOL(1)
-
-
the form uuuu::::_u_s_e_r_t_i_m_e ssss::::_s_y_s_t_e_m_t_i_m_e both values are running
totals of seconds since rrdtool was started. If an error
occurs, a line of the form 'ERROR: _D_e_s_c_r_i_p_t_i_o_n _o_f _e_r_r_o_r'
@@ -242,6 +259,55 @@
+25/Aug/99 1.0.7 4
+
+
+
+
+
+RRDTOOL(1) rrdtool RRDTOOL(1)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -259,6 +325,6 @@
-16/May/99 19990525.23 4
+25/Aug/99 1.0.7 5
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.pod Sat Jul 13 19:23:04 2002
@@ -25,6 +25,8 @@
detailed description of how to use the individual functions of the
B<rrdtool> check the corresponding man page.
+For an introduction to the usage of rrdtool make sure you check L<rrdtutorial>.
+
=head2 FUNCTIONS
While the man pages talk of command line switches you have to set in order to
@@ -37,34 +39,48 @@
=item B<create>
-Set up a new Round Robin Database (RRD). Check rrdcreate
+Set up a new Round Robin Database (RRD). Check L<rrdcreate>.
=item B<update>
-Store new data values into an RRD. Check rrdupdate
+Store new data values into an RRD. Check L<rrdupdate>.
=item B<graph>
Create a graph from data stored in one or several RRD. Apart from
-generating graphs, data can also be extracted to stdout. Check rrdgraph
+generating graphs, data can also be extracted to stdout. Check L<rrdgraph>.
=item B<dump>
-Dump the contents of an RRD in plain ASCII. This is manly used for
-debugging. Check rrddump
+Dump the contents of an RRD in plain ASCII. In connection with
+restore you can use it to transport an rrd from one architecture to another.
+Check L<rrddump>.
+
+=item B<restore>
+
+Restore an RRD in XML format to a binary rrd ... Check L<rrdrestore>
=item B<fetch>
Get data for a certain time period from a RRD. The graph function
-uses fetch to retrieve its data from an rrd. Check rrdfetch
+uses fetch to retrieve its data from an rrd. Check L<rrdfetch>.
=item B<tune>
-Alter setup of an RRD
+Alter setup of an RRD. Check L<rrdtune>.
=item B<last>
-Find last update time of an RRD
+Find last update time of an RRD. Check L<rrdlast>.
+
+=item B<rrdresize>
+
+Change the size of individual RRAs ... Dangerous! Check L<rrdresize>.
+
+=item B<rrdcgi>
+
+This is a standalone tool for producing rrd graphs on the fly. Check
+L<rrdcgi>.
=back
@@ -146,7 +162,7 @@
The B<rrdtool> also allows one to generate reports in numerical and
graphical form based on the data stored in one or several
B<RRD>s. The graphing feature is fully configurable. Size, color and
-contents of the graph can be defined freely. Check rrdgraph
+contents of the graph can be defined freely. Check L<rrdgraph>
for more information on this.
=back
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.txt Sat Jul 13 19:23:04 2002
@@ -26,9 +26,9 @@
in the RRD. This is not very error resistant, as
you might be sending the wrong data into a RRD.
- The template switch alows you to specify which
+ The template switch allows you to specify which
data sources you are going to update and in which
- order. If the datasources specified in the
+ order. If the data sources specified in the
template are not available in the rrd file, the
update process will abort with an error message.
@@ -45,23 +45,23 @@
The remaining elements of the argument are DS
updates. The order of this list is the same as the
- order the datasources were defined in the rra. If
- there is no data for a certain data-source, the
+ order the data sources were defined in the rra.
+ If there is no data for a certain data-source, the
letter UUUU (eg. N:0.1:U:1) can be defined.
- The format of the value acquired from the
- datasource is dependent of the datasource type
+ The format of the value acquired from the data
+ source is dependent of the data source type
chosen. Normally it will be numeric, but the data
acquisition modules my impose their very own
parsing of this parameter as long as the colon (::::)
- remains the datasource value separator.
+ remains the data source value separator.
EEEEXXXXAAAAMMMMPPPPLLLLEEEE
rrdtool update demo1.rrd N:3.44:3.15:U:23
-7/Mar/99 19990426.22 1
+9/Aug/99 1.0.7 1
@@ -127,6 +127,6 @@
-7/Mar/99 19990426.22 2
+9/Aug/99 1.0.7 2
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.txt Sat Jul 13 19:23:05 2002
@@ -0,0 +1,66 @@
+
+
+
+RRDRESTORE(1) rrdtool RRDRESTORE(1)
+
+
+NNNNAAAAMMMMEEEE
+ rrdtool restore - restore the contents of an RRRRRRRRDDDD from its
+ XML dump format
+
+SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
+ rrrrrrrrddddttttoooooooollll rrrreeeessssttttoooorrrreeee _f_i_l_e_n_a_m_e_._x_m_l _f_i_l_e_n_a_m_e_._r_r_d [--------rrrraaaannnnggggeeee----
+ cccchhhheeeecccckkkk|----rrrr]
+
+DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
+ The rrrreeeessssttttoooorrrreeee function reads the XML representation of an
+ RRD and converts it into the native RRRRRRRRDDDD format.
+
+ _f_i_l_e_n_a_m_e_._x_m_l
+ The name of the XXXXMMMMLLLL you want to restore.
+
+ _f_i_l_e_n_a_m_e_._r_r_d
+ The name of the RRRRRRRRDDDD to restore.
+
+ --------rrrraaaannnnggggeeee----cccchhhheeeecccckkkk|----rrrr
+ Make sure the values in the RRAs do not exceed the
+ limits defined for the different datasources.
+
+AAAAUUUUTTTTHHHHOOOORRRR
+ Tobias Oetiker <oetiker at ee.ethz.ch>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+20/Aug/99 1.0.7 1
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/Makefile.am Sat Jul 13 19:23:05 2002
@@ -0,0 +1,56 @@
+## Process this file with automake to produce Makefile.in
+
+SUFFIXES = .pod .1 .man .html .txt .pm
+
+#AUTOMAKE_OPTIONS = foreign
+
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+
+CLEANFILES = *.1 *.html *.txt *-dircache *.pm
+
+POD = rrdtool.pod rrdlast.pod rrdcreate.pod rrdupdate.pod \
+ rrdgraph.pod bin_dec_hex.pod rrdfetch.pod \
+ rrdrestore.pod rrddump.pod rrdtune.pod rrdresize.pod \
+ rrdcgi.pod rrdtutorial.pod
+
+PMP = RRDs.pm RRDp.pm
+
+MAN = $(POD:.pod=.1) $(PMP:.pm=.1)
+TXT = $(MAN:.1=.txt)
+HTML = $(POD:.pod=.html) $(PMP:.pm=.html)
+
+# what should go into the distribution
+EXTRA_DIST= $(POD) $(HTML) $(TXT)
+
+# some install rules
+idocdir = $(prefix)/doc
+idoc_DATA = $(POD) $(TXT)
+ihtmldir = $(prefix)/html
+ihtml_DATA = $(HTML)
+imandir = $(prefix)/man/man1
+iman_DATA = $(MAN)
+
+all-local: link txt man html
+
+.pod.1 .pm.1 .pl.1:
+ pod2man --release=$(VERSION) --center=rrdtool $< > $@
+
+.1.txt:
+ nroff -man -Tlp $< > $@
+
+.pm.html .pod.html .pl.html:
+ pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
+
+RRDs.pm:
+ ln -s ../perl-shared/RRDs.pm .
+
+RRDp.pm:
+ ln -s ../perl-piped/RRDp.pm .
+
+link: RRDp.pm RRDs.pm
+
+man: $(MAN)
+
+html: $(HTML)
+
+txt: $(TXT)
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.pod Sat Jul 13 19:23:05 2002
@@ -27,8 +27,8 @@
the data sources are defined in the RRD. This is not very error
resistant, as you might be sending the wrong data into a RRD.
-The template switch alows you to specify which data sources you are
-going to update and in which order. If the datasources specified in
+The template switch allows you to specify which data sources you are
+going to update and in which order. If the data sources specified in
the template are not available in the rrd file, the update process
will abort with an error message.
@@ -43,14 +43,14 @@
B<DERIVE> or B<ABSOLUTE>.
The remaining elements of the argument are DS updates. The order of this list is
-the same as the order the datasources were defined in the rra.
+the same as the order the data sources were defined in the rra.
If there is no data for a certain data-source, the letter
B<U> (eg. N:0.1:U:1) can be defined.
-The format of the value acquired from the datasource is dependent of the
-datasource type chosen. Normally it will be numeric, but the data acquisition
+The format of the value acquired from the data source is dependent of the
+data source type chosen. Normally it will be numeric, but the data acquisition
modules my impose their very own parsing of this parameter as long as the colon
-(B<:>) remains the datasource value separator.
+(B<:>) remains the data source value separator.
=back
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.pod
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.pod (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdrestore.pod Sat Jul 13 19:23:06 2002
@@ -0,0 +1,34 @@
+=head1 NAME
+
+rrdtool restore - restore the contents of an B<RRD> from its XML dump format
+
+=head1 SYNOPSIS
+
+B<rrdtool> B<restore> I<filename.xml> I<filename.rrd>
+S<[B<--range-check>|B<-r>]>
+
+=head1 DESCRIPTION
+
+The B<restore> function reads the XML representation of an RRD and converts
+it into the native B<RRD> format.
+
+=over 8
+
+=item I<filename.xml>
+
+The name of the B<XML> you want to restore.
+
+=item I<filename.rrd>
+
+The name of the B<RRD> to restore.
+
+=item B<--range-check>|B<-r>
+
+Make sure the values in the RRAs do not exceed the limits defined for
+the different datasources.
+
+=back
+
+=head1 AUTHOR
+
+Tobias Oetiker <oetiker at ee.ethz.ch>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.html Sat Jul 13 19:23:06 2002
@@ -141,7 +141,7 @@
<PRE> ($averages,$xsize,$ysize) = RRDs::graph ...
print "Gifsize: ${xsize}x${ysize}\n";
- print "Averages: ", (join ", ", @averages);
+ print "Averages: ", (join ", ", @$averages);
</PRE>
<P>
Added: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcgi.html Sat Jul 13 19:23:06 2002
@@ -0,0 +1,292 @@
+ <HTML>
+ <HEAD>
+ <TITLE>rrdcgi - create web pages containing RRD graphs based on templates
+
+</TITLE>
+ </HEAD>
+
+ <BODY>
+
+<!-- INDEX BEGIN -->
+<!--
+
+<UL>
+
+ <LI><A HREF="#NAME">NAME</A>
+ <LI><A HREF="#SYNOPSIS">SYNOPSIS</A>
+ <LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+ <UL>
+
+ <LI><A HREF="#Pass_1">Pass 1</A>
+ <LI><A HREF="#Pass_2">Pass 2</A>
+ <LI><A HREF="#Pass_3">Pass 3</A>
+ </UL>
+
+ <LI><A HREF="#EXAMPLE">EXAMPLE</A>
+ <LI><A HREF="#EXAMPLE_2">EXAMPLE 2</A>
+ <LI><A HREF="#AUTHOR">AUTHOR</A>
+</UL>
+-->
+<!-- INDEX END -->
+
+<P>
+<H1><A NAME="NAME">NAME
+
+</A></H1>
+rrdcgi - create web pages containing RRD graphs based on templates
+
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="SYNOPSIS">SYNOPSIS
+
+</A></H1>
+#!/path/to/<STRONG>rrdcgi</STRONG>
+
+[<STRONG>--goodfor</STRONG>|<STRONG>-g</STRONG> <EM>seconds</EM>]
+
+[<STRONG>--filter</STRONG>]
+
+[<STRONG>--refresh</STRONG>|<STRONG>-r</STRONG>]
+
+
+
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION
+
+</A></H1>
+<STRONG>rrdcgi</STRONG> is a sort of very limited script interpreter. Its purpose is to run as a
+cgi-program and parse a web page template containing special
+<RRD:: tags. <STRONG>rrdcgi</STRONG> will interpret and act according to these tags. In the end it will printout
+a web page including the necessary CGI headers.
+
+
+<P>
+
+<STRONG>rrdcgi</STRONG> parses the contents of the template in 2 steps. In each step it looks only
+for a subset of tags. This allows to nest tags.
+
+
+<P>
+
+The argument parser uses the same semantics as you are used from your c
+shell.
+
+
+<P>
+
+<DL>
+<DT><STRONG><A NAME="item__goodfor_g">--goodfor|-g seconds
+
+</A></STRONG><DD>
+Specify the number of seconds this page should remain valid. This will
+prompt the rrdcgi to output a Last-Modified and a Expire header.
+
+
+<P>
+
+<DT><STRONG><A NAME="item__filter">--filter
+
+</A></STRONG><DD>
+Assume that rrdcgi is being run as a filter and not as a cgi.
+
+
+<P>
+
+<DT><STRONG><A NAME="item__refresh_r">--refresh|-r
+
+</A></STRONG><DD>
+If the <STRONG>--goodfor</STRONG> flag is specified, then <STRONG>--refresh</STRONG> will cause rrdcgi to output a Refresh header with the value of the <STRONG>--goodfor</STRONG> value.
+
+
+<P>
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Pass_1">Pass 1
+
+</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_RRD">RRD::CV name
+
+</A></STRONG><DD>
+Inserts the CGI variable of the given name.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_RRD">RRD::CV::QUOTE name
+
+</A></STRONG><DD>
+Inserts the CGI variable of the given name but quotes it, ready for use as
+an argument in another RRD:: tag. So even when there are spaces in the
+value of the CGI variable it will still be considered as one argument.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_RRD">RRD::CV::PATH name
+
+</A></STRONG><DD>
+Inserts the CGI variable of the given name, quotes it and makes sure the it
+starts neither with a '/' nor contains '..'. This is to make sure that no
+problematic pathnames can be introduced through the CGI interface.
+
+
+<P>
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Pass_2">Pass 2
+
+</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_RRD">RRD::INCLUDE filename
+
+</A></STRONG><DD>
+Include the contents of the given file into the page returned from the cgi
+
+
+<P>
+
+</DL>
+<P>
+<HR>
+<H2><A NAME="Pass_3">Pass 3
+
+</A></H2>
+<DL>
+<DT><STRONG><A NAME="item_RRD">RRD::GRAPH rrdgraph arguments
+
+</A></STRONG><DD>
+This tag creates the RRD graph defined in its argument and then gets
+replaced by an appropriate <IMG> tag referring to the graph. The <STRONG>--lazy</STRONG> option in RRD graph can be used to make sure that graphs are only
+regenerated when they are out of date. The arguments to the <STRONG>RRD::GRAPH</STRONG> tag work as described in the <STRONG>rrdgraph</STRONG> manual page.
+
+
+<P>
+
+Use the <STRONG>--lazy</STRONG> option in your RRD::GRAPH tags, to reduce the load on your server. This
+option makes sure that graphs are only regenerated when the old ones are
+out of date.
+
+
+<P>
+
+If you do not specify your own <STRONG>--imginfo</STRONG> format, the following will be used:
+
+
+<P>
+
+<PRE> <IMG SRC="%s" WIDTH="%lu" HEIGHT="%lu">
+</PRE>
+
+<P>
+
+Note that <CODE>%s</CODE> stands for the filename part of the graph
+generated, all directories given in the GIF file argument will get dropped.
+
+
+<P>
+
+<DT><STRONG><A NAME="item_RRD">RRD::PRINT number
+
+</A></STRONG><DD>
+If the preceding <STRONG>RRD::GRAPH</STRONG> tag contained and <STRONG>PRINT</STRONG> arguments, then you can access their output with this tag. The <EM>number</EM> argument refers to the number of the <STRONG>PRINT</STRONG> argument. This first <STRONG>PRINT</STRONG> has <EM>number</EM> 0.
+
+
+<P>
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="EXAMPLE">EXAMPLE
+
+</A></H1>
+The example below creates a web pages with a single RRD graph.
+
+
+<P>
+
+<PRE> #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page</H1>
+ <P>
+ <RRD::GRAPH demo.gif --lazy --title="Temperatures"
+ DEF:cel=demo.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+</PRE>
+
+<P>
+
+<PRE> </P>
+ </BODY>
+ </HTML>
+</PRE>
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="EXAMPLE_2">EXAMPLE 2
+
+</A></H1>
+This script is slightly more elaborate, it allows you to run it from a form
+which sets RRD_NAME. RRD_NAME is then used to select which RRD you want to
+use a source for your graph.
+
+
+<P>
+
+<PRE> #!/usr/local/bin/rrdcgi
+ <HTML>
+ <HEAD><TITLE>RRDCGI Demo</TITLE></HEAD>
+ <BODY>
+ <H1>RRDCGI Example Page for <RRD::CV RRD_NAME></H1>
+ <H2>Selection</H2>
+ <FORM><INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomA> Room A,
+ <INPUT NAME=RRD_NAME TYPE=RADIO VALUE=roomB> Room B.
+ <INPUT TYPE=SUBMIT></FORM>
+ <H2>Graph</H2>
+ <P>
+ <RRD::GRAPH <RRD::CV::PATH RRD_NAME>.gif --lazy
+ --title "Temperatures for "<RRD::CV::QUOTE RRD_NAME>
+ DEF:cel=<RRD::CV::PATH RRD_NAME>.rrd:exhaust:AVERAGE
+ LINE2:cel#00a000:"D. Celsius">
+</PRE>
+
+<P>
+
+<PRE> </P>
+ </BODY>
+ </HTML>
+</PRE>
+
+<P>
+
+<P>
+<HR>
+<H1><A NAME="AUTHOR">AUTHOR
+
+</A></H1>
+Tobias Oetiker <<A HREF="MAILTO:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</A>>
+
+
+
+
+<P>
+
+</DL>
+ </BODY>
+
+ </HTML>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.html Sat Jul 13 19:23:06 2002
@@ -55,8 +55,8 @@
<H1><A NAME="DESCRIPTION">DESCRIPTION
</A></H1>
-The create function of the rrd tool lets you set up new Round Robin
-Database (<STRONG>RRD</STRONG>) files. The file is created at its final, full size and filled with <EM>*UNKNOWN*</EM> data.
+The create function of the RRDtool lets you set up new Round Robin Database
+(<STRONG>RRD</STRONG>) files. The file is created at its final, full size and filled with <EM>*UNKNOWN*</EM> data.
<P>
@@ -70,7 +70,7 @@
<P>
-<DT><STRONG><A NAME="item__start_b">--start|-b start time (default: current time)
+<DT><STRONG><A NAME="item__start_b">--start|-b start time (default: now - 10s)
</A></STRONG><DD>
Specifies the time in seconds since 1970-01-01 UTC when the first value
@@ -79,9 +79,8 @@
<P>
-Negative input is treated as current time minus the specified number of
-seconds. See also AT-STYLE TIME SPECIFICATION section in the
-<EM>rrdfetch</EM> documentation for alternative ways to specify time.
+See also AT-STYLE TIME SPECIFICATION section in the
+<EM>rrdfetch</EM> documentation for more ways to specify time.
<P>
@@ -129,8 +128,17 @@
<EM>min</EM> and <EM>max</EM> are optional entries defining the expected range of the data supplied by
this data source. If <EM>min</EM> and/or <EM>max</EM> are defined, any value outside the defined range will be regarded as
<EM>*UNKNOWN*</EM>. If you do not know or care about min and max, set them to U for unknown.
-Note that min and max always refere to the processed values of the DS. For
-a traffic-<STRONG>COUNTER</STRONG> type DS this would be the max and min data-rate expected from the device.
+Note that min and max always refer to the processed values of the DS. For a
+traffic-<STRONG>COUNTER</STRONG> type DS this would be the max and min data-rate expected from the device.
+
+
+<P>
+
+<EM>If information on minimal/maximal expected values is available,
+always set the min and/or max properties. This will help RRDtool in
+doing a simple sanity check on the data supplied when running update.</EM>
+
+
<P>
@@ -206,8 +214,8 @@
<H1><A NAME="AUTHOR">AUTHOR
</A></H1>
-Tobias Oetiker <A
-HREF="MAILTO:<oetiker at ee.ethz.ch>"><oetiker at ee.ethz.ch></A>
+Tobias Oetiker <<A HREF="MAILTO:oetiker at ee.ethz.ch">oetiker at ee.ethz.ch</A>>
+
<P>
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtool.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdupdate.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/GNUmakefile.in
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdresize.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdcreate.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtune.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/bin_dec_hex.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdfetch.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdgraph.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDp.3
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdtutorial.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrdlast.1
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/RRDs.3
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/doc/rrddump.1
Added: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsw Sat Jul 13 19:23:11 2002
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "rrd"=".\rrd.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.xs
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.xs (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.xs Sat Jul 13 19:23:11 2002
@@ -31,6 +31,15 @@
MODULE = RRDs PACKAGE = RRDs PREFIX = rrd_
+BOOT:
+#ifdef MUST_DISABLE_SIGFPE
+ signal(SIGFPE,SIG_IGN);
+#endif
+#ifdef MUST_DISABLE_FPMASK
+ fpsetmask(0);
+#endif
+
+
SV*
rrd_error()
CODE:
@@ -87,7 +96,6 @@
char **argv;
AV *retar;
PPCODE:
- calcpr = NULL;
argv = (char **) malloc((items+1)*sizeof(char *));
argv[0] = "dummy";
for (i = 0; i < items; i++) argv[i+1] = (char *) SvPV(ST(i),na);
@@ -110,7 +118,7 @@
free(calcpr);
}
EXTEND(sp,4);
- PUSHs(sv_2mortal(newRV_inc((SV*)retar)));
+ PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
PUSHs(sv_2mortal(newSViv(xsize)));
PUSHs(sv_2mortal(newSViv(ysize)));
@@ -153,8 +161,8 @@
EXTEND(sp,5);
PUSHs(sv_2mortal(newSViv(start)));
PUSHs(sv_2mortal(newSViv(step)));
- PUSHs(sv_2mortal(newRV_inc((SV*)names)));
- PUSHs(sv_2mortal(newRV_inc((SV*)retar)));
+ PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
+ PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
int
rrd_tune(...)
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/t/base.t
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/t/base.t (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/t/base.t Sat Jul 13 19:23:11 2002
@@ -126,8 +126,10 @@
"LINE3:epsilon#000000:Line 4",
"HRULE:1500#ff8800:Horizontal Line at 1500",
"PRINT:alpha:AVERAGE:Average Alpha %1.2f",
+ "PRINT:alpha:MIN:Min Alpha %1.2f %s",
"PRINT:alpha:MIN:Min Alpha %1.2f",
"PRINT:alpha:MAX:Max Alpha %1.2f",
+ "GPRINT:calc:AVERAGE:Average calc %1.2f %s",
"GPRINT:calc:AVERAGE:Average calc %1.2f",
"GPRINT:calc:MAX:Max calc %1.2f",
"GPRINT:calc:MIN:Min calc %1.2f",
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.pm
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.pm (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/RRDs.pm Sat Jul 13 19:23:12 2002
@@ -7,7 +7,7 @@
require DynaLoader;
-$VERSION = 0.99031 ;
+$VERSION = 1.000072;
bootstrap RRDs $VERSION;
@@ -72,7 +72,7 @@
($averages,$xsize,$ysize) = RRDs::graph ...
print "Gifsize: ${xsize}x${ysize}\n";
- print "Averages: ", (join ", ", @averages);
+ print "Averages: ", (join ", ", @$averages);
RRDs::fetch is the most complex of the pack regarding return values. There are
4 values. Two normal integers, a pointer to an array and a pointer to a
Modified: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/Makefile.PL
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/Makefile.PL (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/Makefile.PL Sat Jul 13 19:23:12 2002
@@ -1,13 +1,18 @@
use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
+
+# Specify the location of the archive containing PIC compiled object files.
+my $librrd = -f "../src/.libs/librrd_private.a" ? '../src/.libs/librrd_private.a' : '../src/.libs/librrd_private.al' ;
+
WriteMakefile(
'NAME' => 'RRDs',
'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
'OPTIMIZE' => '-g',
- 'INC' => '-I../src/',
+ 'INC' => '-I../src -I../gd1.3',
# where to look for the necessary libraries
# Perl will figure out which one is valid
- 'LIBS' => [ '-L../src -lrrd -L../gd1.2 -lgd -lm' ],
+ 'depend' => {'RRDs.c' => $librrd},
+ 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
);
Added: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/rrdpl.dsp Sat Jul 13 19:23:12 2002
@@ -0,0 +1,115 @@
+# Microsoft Developer Studio Project File - Name="rrd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=rrd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "rrdpl.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "rrdpl.mak" CFG="rrd - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "rrd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "rrd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "rrd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x100c /d "NDEBUG"
+# ADD RSC /l 0x100c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi3!
2.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
+
+!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "C:\perl\lib\site\auto\RRD\"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /W3 /I "C:\perl\lib\CORE" /D "WIN32" /D VERSION=\"0.02\" /D XS_VERSION=\"0.02\" /D "_DEBUG" /D "_CONSOLE" /FR -I../src/ -I../gd1.2 RRD.c /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x100c /d "_DEBUG"
+# ADD RSC /l 0x100c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 c:\perl\lib\core\perl.lib ..\src\debug\rrd.lib ..\gd1.2\debug\gd.lib /dll /incremental:no /debug /machine:IX86 /out:"C:\perl\lib\site\auto\RRD\rrd.dll"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF
+
+# Begin Target
+
+# Name "rrd - Win32 Release"
+# Name "rrd - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\RRD.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\RRD.xs
+
+!IF "$(CFG)" == "rrd - Win32 Release"
+
+!ELSEIF "$(CFG)" == "rrd - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\RRD.xs
+
+"rrd.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ C:\Perl\bin\perl -Ic:\perl\lib -Ic:\perl\lib C:\perl\lib\ExtUtils/xsubpp\
+ -typemap C:\perl\lib\ExtUtils\typemap RRD.xs >RRD.tc && C:\Perl\bin\perl\
+ -Ic:\perl\lib -Ic:\perl\lib -MExtUtils::Command -e mv RRD.tc RRD.c
+
+#!
End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Target
+# End Project
Added: trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/ntmake.pl
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/ntmake.pl (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/perl-shared/ntmake.pl Sat Jul 13 19:23:13 2002
@@ -0,0 +1,14 @@
+use ExtUtils::MakeMaker;
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written.
+WriteMakefile(
+ 'NAME' => 'RRDs',
+ 'VERSION_FROM' => 'RRDs.pm',
+ #'DEFINE' => '-D_DEBUG -DWIN32 -D_CONSOLE',
+ 'OPTIMIZE' => '-O2',
+ 'INC' => '-I../src/ -I../gd1.3',
+ #'LIBS' => ['-L../src/debug -lrrd.lib -L../gd1.3/debug -lgd.lib'],
+ #'LIBC' => 'libc.lib',
+ 'MYEXTLIB' => '../src/release/rrd.lib ../gd1.3/release/gd.lib ..\zlib-1.1.3\Release\zlib.lib ..\libpng-1.0.3\Release\png.lib',
+ 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
+);
Modified: trunk/orca/packages/rrdtool-1.0.7.2/CHANGES
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/CHANGES (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/CHANGES Sat Jul 13 19:23:13 2002
@@ -1,852 +1,191 @@
-0.99.31
-From: Tobi
-0) hmpf ... forgot to add rrdresize.pod and friends to MANIFEST
-
-0.99.30
-From: Alex
-0) We can now alter the number of rows in an RRA with rrd_resize
-
-0.99.29
-From: Blair
-0) Prevent Makefile from rebuilding the perl modules on every run
-
-0.99.28
-From: Blair
-0) fixed filedescriptor leak in rrd_graph
-From: Alan Lichty <alan_lichty at eli.net>
-0) fixes for rrdintroduction
-1) contrib/log2rrd for mrtg *.log file to *.rrd conversion
-From: Tobi
-0) fixed data_fetch bug ... I did not set the requested
- data resolution properly ... the data resolution returned
- by rrd_fetch was more or less random ...
-
-0.99.27
-From: Tobi
-0) fixed the - file-name to really work.
-1) The rrdintro is now in the doc tree.
-
-0.99.26
-From: Tobi and Jeremy
-0) fixed documentaion GNUMakefile
-From: Kai Siering <kai.siering at mediaways.net>
-0) Updated rrdgraph.pod ...
-From: Tobi with inspiration from Kai
-0) if rrdgraph get - as a filename, its output will go to standard out
-1) ****INCOMPATIBLE***** the IF operator was not taking its argments in the
- correct order ... I have put an example into the manpage to show how
- it should be done and how it is now done ...
-From: Alex van den Bogaerdt <alex at ergens.op.het.net>
-0) Contributed two tutorial, make sure you visit
- bin_dec_hex.man and rrdtutorial.man in the doc directory.
-
-0.99.25
-From: Blair Zajac <bzajac at geostaff.com>
-0) do not set PATH in top Makefile ...
-From: Tobi
-0) added better IEEE test to configure
-
-0.99.24
-From: Jeremy Fischer <jeremy at kiva.net>
-0) install functionality for Makefile
-From: Tobi
-0) removed TOTAL function ...
-
-0.99.23
-* fixed cache bug in configure script ... CFLAGS_EXTRA were disregarded in
- the second run ... found by Douglas Brunk
-
-0.99.22
-* From Russ Wright <rwwright at home.com>
-0) use PIC instead of pic
-* From Tobi
-0) fixed a memory leak in rrd_graph (p_data was not fully freed)
- purify is a cool tool indeed :-)
-
-0.99.21
-* From Tobi
-0) Checking for IEEE math in configure ... find out if -ieee helps
-1) rrdtool checks its base arguments with strcmp
-2) errors get sent to stderr when called from the command line
-3) various documentation problems
-4) fixed display bug discovered by Alex van den Bogaerdt
- the graph display was off by one step
-5) fixed infinite loop which occurs when trying to paint a grid line
- at 2:00 am on a day when day light saving time gets activated ... (now
- guess what happens today :-)
-
-* From Blair
-0) Fewer spelling errors for CHANGES file ... thanks !
-1) some additional memory cleanup so that rrdfiles do not contain
- random date in unused areas ...
-
-0.99.20
-* From Oleg Cherevko <olwi at icyb.kiev.ua>
-0) Allowed uppercase letters in DEF and CDEF names for rrd_graph (note
- that you now can produce conflicts when using strings which match
- the name of an rpn function call
-1) make at style time code understand long weekday names
-2) corrected documentation about the length of ds names (it 19 chars and not 9)
-
-* From Tobi
-0) Switched to calloc in rrd_create, to prevent from arbitrary strings
- showing up in the rrdfiles
-1) Made the two graphs produced by the perl-shared example code match by
- specifying the end time in addition to the start time ... There is still
- a potential difference between the gifs, because there seem to be some
- random entries in the color map, which do not define colors for any pixels
- actually in the graph. If you convert the graphs to PNM format they are
- completely the same
-
-0.99.19
-* From Tobi
-0) Fixed example in rrd_create man-page
-1) Fixed rpn parser to properly track through the expressions ...
-2) Fixed stacking code so that it is possible to stack the same variable several times.
-3) Added --base switch to rrd_graph which allows to switch the scaling base to 1024
- this takes care of situations where you want to graph memory instead of
- traffic
-
-0.99.18
-* From Oleg Cherevko <olwi at icyb.kiev.ua>
-0) Removed vsnprintf from parsetime for portability reasons ...
-
-0.99.17
-* From Tobi
-0) added the missing files from Olegs at patch ... now the thing
- compiles again ...
-1) massively enhanced the number of functions accepted in the
- CDEF arguments of rrd_graph. Things like if, less than, larger or equal,
- is unknown and more are available. Check the rrd_graph documentation for
- more info on this ...
-
-0.99.16
-* From Oleg Cherevko <olwi at icyb.kiev.ua>
-0) The rrdtool function HandleInputLine never checks the return values of the
- rrd_fetch() and rrd_graph() calls.
-1) Added AT-STYLE TIME SPECIFICATION. This allows to specify the time
- using a more user-friendly format than all just seconds since 1970.
- See the rrdfetch manpage for a long description of these features ...
-0.99.15
-* From Blair
-1) Uses CFLAGS to compile RRDs.o with the same optimization
- flags.
-2) Remove some extra ;'s
-3) Spelling fixes.
-
-0.99.14
-* From Tobi
-0) rrd_graph now returns the gif image size. The commandline version just
- prints XSIZExYSIZE after being called and the perl version returns
- the size as two additional return values from the graph call.
-
- PLEASE NOTE THIS mAY BREAK SCRIPTS ANALYZING THE DATA RETURNED BY
- RRD_GRAPH ...
-
-1) added perl-piped/ perl-shared/ to make all building
-
-0.99.13
-* From: Oleg Cherevko <olwi at icyb.kiev.ua>
-0) fixed typo in the prt_fctn code of rrd_graph ..
-
-0.99.12
-* From Tobi:
-0) New graph function COMMENT added. It prints simple text into the legend.
- No evaluation occurs
-1) New graph legend feature added. The legend area formating can now be
- influenced by adding special escaped characters to the end of some
- of the legend entries. Whenever such an entry is processed, the placement
- of the pending legend items is done as defined the special character.
- See NOTE 2 at the end of the rrdgraph manual for details.
-
-0.99.11
-* From Tobi:
-0) added --template switch to rrd_update. This allows to specify which
- datasources you intend to update. It provides some protection against
- updating the wrong datasources.
-
-0.99.10
-* From Tobi:
-0) added missing : in optarg template of rrd_create
-
-0.99.9
-* From Tobi:
-1) removed rrd_format2.h this was not used ...
-2) renamed diff to rrd_diff and added ranlib step to library
- creation ... this is all for the benefit of FreeBSD
-* From: Andrew Turner <turner at mint.net>
-1) added new consolidation functions LAST and TOTAL
-
-0.99.8 Thu Feb 4 1999
-* From Tobi:
-1) Removed compiler waring from rrd_graph.c (blair, I went to default all
- the way ...)
-2) revisited configure.in ... made gcc option test work properly
-
-0.99.7 Mon Feb 1 1999
-* From Tobi
-1) removed kill command from the end of RRDp.pm
-2) fixed rrdtune ... ds selector did not work ...
-3) removed warnings from diff.c
-4) fixed default -start time when creating new rrds ...
- this was 1.1.1970 instead of NOW ...
-
-0.99.6 Fri Jan 29 1999
-* From Tobi
-1) more ... don't compare with nan fixes ... this time in rrd_update
-2) on request from Russ Wright made VRULE and HRULE being painted on top
- of the grid
-
-* From Blair
-1) real decimal version numbers for perl modules
-2) better argument checking for rrd_update
-
-0.99.5 was only available to 30 minutes ...
-
-0.99.4 Thu Jan 28 1999
-* From Tobi
-1) Happy BSD patch ... it seems that RRDTOOL will work on BSD once
- there are no compares with NAN ... I have altered one if in rrd_create.
- lets see if this helps
-
-0.99.3 Wed Jan 27 1999
-* From Tobi
-1) ran with electric fence ... found bugs in RPN processing, and in data
- fetch (related to DS naming)
-2) removed superfluous im_free calls which were in fact causing segfaults by
- trying to release memory which was already released ...
-
-0.99.2 Tue Jan 26 1999
-* From Tobi trying to find the cores reported by Jesper Skriver
- changed rrd_create to use DNAN instead of unknown. Maybe we have
- a problem with the representation of UNKNOWN as NAN on FreeBSD ...
- We should not get floating point exceptions because of this or should we ?
+CangeLog for RRDtool 1.0.x
+--------------------------
+- bugfix, + enhancement, * contrib, = RELEASE
+---------------------------------------------
+
+= 1.0.7 1999/08/27 -- Tobi
+
+- 1999/08/27 -- bdowling at noc.faxnet.net
+ some strncpy were lacking the x[LAST]='\0'; safeguard ...
+
+- 1999/08/25 -- Tobi
+ Samples were shifted one interval into the future by rrdgraph ...
+ check minmax.pl in the examples directory ...
+
+- 1999/08/25 -- Tobi
+ Updated rrdtools manpage to point to all the newer functions in the
+ package which have been left out before ...
+
+- 1999/08/25 -- Tobi
+ RRDs.xs: changed newRV_inc to newRV_noinc in a few places (graph and
+ fetch) otherwhise I'm afraid we got the refference count wrong and perl
+ was leaking memmory like a sive ...
+
+- 1999/08/24 -- Tobi
+ added -lm to perl Makefile.PL just to be sure it is there when
+ perl builds its shared module ...
+
++ 1999/08/23 -- Tobi
+ added test for "-q float=rndsngl" todo proper IEEE math on AIX 4.2.0 with
+ IBM xlC
+
++ 1999/08/23 -- Tobi
+ added new stripes example ...
+
+- 1999/08/23 -- Tobi
+ fixed spacing adjustment with '\s' instead of 1.5 it now adds 0.5
+ line-hights ...
+
+- 1999/08/20 -- Tobi + Jesper Skriver <jesper at skriver.dk>
+ found and fixed buffer overflow in legend processing when dealing with
+ large numbers
-* From Blair
- 1) Spelling mistakes in the pod files.
- 2) Updated 0.99.0 to 0.99.1 in the RRDs.pm and RRDp.pm files.
- 3) Updated the rrdcreate.pod file to accurately reflect the
- correct options to rrd_create().
- 4) Allow uppercase characters in the ds-name in rrd_create.
-
-0.99.1 Fri Jan 22 1999
-
-* Fixed notice in gifs
-* Fixed color selection for base elements
-
-Thu Jan 14 1999
-*****************************************************************************
-* BIG CHANGE ... The new format is in place .....
-* drop your old files ... everything is new now .....
-*****************************************************************************
-
-* Tobi ... user visible changes are that the data sources do have
- names now and that the xxf can be set individually for each RRA
- this means that some command line options had to be changed ...
- Basically everything which deals with DS selection.
-
-*****************************************************************************
-*****************************************************************************
-*****************************************************************************
-
-Mon Jan 11 1999
-* Tobi
-1) Fixed data_reduce again ... blair pointed out a core dump condition in the
- perl module ...
-
-Sat Jan 9 1999
-* Tobi
-1) Fixed rounding error in rrd_graph/ytr ... it lead to zero values
- not being identified correctly ...
-2) applied Philippe fixes for better compilation of the Perl module under NT
-3) new version number for perl module
-4) Fixed AVERAGE calculator in print_calc ... thanks to Sasha Mikheev for the hint
-5) Fixed bug in reduce_data function which killed CDEF under certain circumstances because start
- was not adjusted according to the new step size ...
-
-Wed Dec 16 1998
-* Tobi
-1) when using the rigid option and the data would be outside the graph, the
- line gets drawn 2 pixels out side graph ... this is not tested :-)
- rrd_graph.c ~ line 246 around line 1900 I removed all the sanity checks for
- the graphics to be inside the valid area ...
-
-* jeff alan
-I'd like to be able to turn off interlaced gifs, since I think they
-look messy when they are coming in. I added an option called
-"interlaced" (abbrev: "i") which will set the graph to interlaced. The
-graphs now default to progressive.
-
-*phillipe
-moved #include "../src/rrd_tool.h" in RRD.xs to etern"C" section
-to make it work on NT ...
-
-
-Sat Nov 21 1998
-* Blair Zajac <bzajac at geostaff.com>
-1) Update the rrd_update function to be able to take multiple
- timestamp/DATA pairs. When there's a lot of data to dump
- into an RRD, this will save a lot of time. In one test I
- ran updating 1000 data points into a single RRD trimmed
- 40% off the execution time. This reduction is caused by
- two factors: rrd_update gets called only once and the RRD
- gets opened and closed only once. The new input to
- rrd_update still takes the old format, but allows trailing
- time and DATA: pairs:
-
- rrdtool update demo.rrd [--time|-t timestamp] DATA:...
- timestamp DATA:... timestamp DATA:... ....
-
- This change did a lot of work to rrd_update.c. To see all
- the changes I would do a diff -ruWb between the previous
- and this version. This will ignore lines that have had
- their indentation changed due to the addition of a while
- loop around the whole update structure.
-
- The only problem I see is that in the loop where the
- timestamp/DATA pairs are processed there is a single
- fwrite call to write some data to the RRD. If some of
- these succeed and then one fails, should the remaining
- data that needs to be written at the end of rrd_update
- still be written to the file or should we just exit
- and leave the RRD alone. If the first fwrite succeeds and
- everything else fails, will the RRD still be ok for
- future updates.
-
- I've run some comparisons between the RRDs generated by
- the old rrd_update and this rrd_update and I've found only
- a few instances where the RRDs differ. The output of
- rrdtool dump did not differ however and the resulting GIFs
- looked identical. I would recommend that we be careful
- with the code for a little bit. I would greatly appreciate
- it if somebody else could take a look at it. I do think
- it's important, as that 40% savings in time is very important
- for how I'm using RRD.
-
-2) Update the POD for rrd_update.
-
-3) Some spelling corrections.
-
-4) Update test.pl to output demo1 and demo2 RRDs and GIFs.
- Demo1 is created using single timestamp/DATA pair calls
- to rrd_update while demo2 is updated using one single
- call. This allows us to compare the output RRDs and GIFs.
-
-5) To allow the comparison of RRDs created and updated using
- slightly different code, I found a problem where the filler
- bytes the compiler uses to align doubles and other types
- in the structs in rrd_format.h would be filled with random
- data. This would cause simple cmp compares to fail on
- newly created RRDs. Now rrd_create does a memset to 0 of
- all newly malloc memory to set these filler bytes to a
- consistent value.
-
-Wed Nov 18 1998
-* Tobi
-1) rrdtool graph will now consolidate data previous before plotting it, if
- the resolution of the data is higher than the resolution of the plotting
- area.
-
-Tue Nov 17 1998
-* Tobi
-1) allow negative --start time in create. This means go back the specified
- amount of time from NOW ... this is the same as it is supported with other
- modules ...
-2) make sure we do draw outside the appointed area. With the --rigid
- option this could be accomplished and would make gdlib work so hard that
- rrdtool appears to be dead ..
-
-Sat Nov 14 1998
-* Blair Zajac <bzajac at geostaff.com>
-1) 1000 spelling fixes (thanks!)
-2) a new Datasource type called DERIVE. It calculates the derivative between
- the current and previous value of the datasource.
- This lets you plot the rate of increase or decrease of a counter
- value, such as the number of people in a room.
-3) some contents fixes for the pod docs ...
-4) more tests for the binary perl module
-
-Fri Nov 6 1998
-* Blair Zajac <bzajac at geostaff.com>
- more spelling and other fixes ... especially a few remaining exits were
- replaced by returns ...
-
-* tobi
-1) fixed the parsing of : in string arguments of rrd_graph. An output string
- can now contain a : if it is escaped with \ .. a \ has to be escaped as
- well ... this makes the changes from the 24-oct really work ...
-2) in connection with 1) there were also problems with arguments where the
- string was blank ...
-
-Tue Nov 3 1998
-* Blair Zajac <bzajac at geostaff.com>
-1) added a missing fclose to rrd_open ...
-
-Mon Nov 2 1998
-* Tobias Oetiker
-1) configurable color for arrow in Graph
-2) added new format definition header to distribution .. this is bound to
- be integrated ... once I get some time to do it ... (any takers?)
-
-Sat Oct 31 1998
-* Win32 patches from Philipp Simonet <philipp.simonet at swisscom.ch>
-1) New Visual Studio Config files for building WIN32 binaries
-2) Locking enabled under WIN32
-
-* Tobias Oetiker
-1) fixed scaling again ... when there is no data, the graph will show 0..1
- and not -1..1
-2) Added a little arrow indicating the positive x axis direction
-3) paint x and y axis before the graph, so that it does not hide it
-
-Sat Oct 24 1998
-* Perl and other patches from Blair Zajac <bzajac at geostaff.com>
-1) Have rrd_last return a time_t instead of an int, so the real
- time from the RRD file is returned.
-2) Fixed an error where rrd.live_head->last_up was returned from
- rrd_last after rrd was freed.
-3) Make perl/Makefile.PL a little neater.
-4) Add a realclean option to perl/Makefile.PL.
-5) Small formatting change to RRD.xs.
-6) Added a little RRD::last testing code to test.pl and added some
- more ok's for now and future use for more tests. Changed the code
- to run under use strict.
-* Tobi O.
-1) removed machine option from rrd_last ... it will now only return
- the unix time_t when the rrd was last updated ...
-2) allo ':' in graph arguments, if the : is escaped with a \. In perl
- strings you have to enter two \ because perl interprets them
- as well: eg "Max\\: %2f"
-
-Fri Oct 23 1998
-* Makefile Patches from Blair Zajac <bzajac at geostaff.com>
-1) Allow the user to do something like make CFLAGS=-O3 and not loose
- the other important flags, such as -DHAVE_CONFIG_H, etc.
-2) Move all OS and compiler dependent flags into CFLAGS_EXTRA. This
- changes Makefile.in's and configure.in.
-3) Add realclean targets to all Makefiles.
-4) Have realclean clean up many more things to return the package to
- a clean state.
-
-Mon Oct 19 1998
-* Fixed rrdcreate.pod ... the example was out of date ...
-
-Sun Oct 18 1998
-* From Jeff: rrd_open will open readonly when ever possible. This
- allows to graph without write permission ...
-* From Jeff Allan: Removed all remaining \n from the error
- messages and fixed some spelling
-* From Jeff: Improved handling of cases where no data is
- found
-* rrd_graph: if minval == maxval pumb max up and pull min down 1%
- ... by tobi as suggested by allan.
-
-Mon Oct 12 1998
-* This time the diff.c fix for negative numbers
- and counter wrap detector code are really in ... tobi
-
-Thu Oct 08 1998
-* Added file locking code to rrd_update ... written by Russ Wright.
- The locking code uses fcntl so I guess it will not work on NT ...
- any takers ?
-
-* Fixed longstanding bug in diff.c ... now it works even for 0-10
- Tobi.
-
-* made rrd_graph work even when there is no data to plot ... Russ Wright
-
-* added new last function provided by Russ Wright. This func allows
- to query an RRD for it's last modification date ...
-
-* added counter overflow patch as suggested by Andres Kroonmaa <andre at ml.ee>
- to rrd_update. This will only work for 32 bit and 64 bit counters.
- Are there any others in SNMP land ?
-
-Thu Aug 13 1998
-* raised stacksize in rrd_graphs rpn machine to 30 (otmar)
-* fixed label placement in graph for precisions != 0 (otmar)
-
-Sat June 13 1998
-* added ms devstudio stuff from philippe
-
-Mon June 8 1998
-* WIN32 Portability fixes from Philippe
-
-Sun June 7 1998
-* fixed coredumps with rrd_error ... I was freeing free memory.
- somehow I had assumed, that free(x) would set x to NULL ...
- this is not true :-)
-
-Wed June 3 1998
-* fix for PRINT and GPRINT calc in rrd_graph ...
-* fix for STACK function command line parsing ... It must follow
- directly after a LINE*, AREA or STACK function
-
-Tue June 2 1998
-* lots of fixes from Jost Krieger integrated
-* increased MAX_LENGTH to 10000 in rrd_tool as suggested by simon ...
-
-Tue May 26 1998
-* did some instruction reordering in rrd_graph.c to make
- a segfault go away which was discovered by David Vickers
-
-Sun May 24 1998
-* cleanup session. In order to improve rrdtools perl integration
- I have started moving all the printf code out of the individual
- functions. Now they all return their findings (except rrd_dump)
- to rrd_tool.c which then prints them.
-
-* the perlmodule got extended to use these new possibilities. The
- RRD::fetch and RRD::graph return the things they used to print
- directly to perl. See the test.pl for an example. There is still
- no documentation though for the perl module
-
-Tue May 12 1998
-* Patch to rrdcreate.pod from Amos Shapira <amos at gezernet.co.il>
++ 1999/08/20 -- Philippe.Simonet at swisscom.com
+ range-check option for rrdrestore
-Thu May 7 1998
-* debugged memory allocation and access errors in CDEF. Now
- things should work as advertised ... Thanks to
- David Vickers <David.Vickers at citec.com.au> for finding the
- bug ...
-
-Fri May 1 1998
-* finally added the --logarithm switch ... or rather the logic behind it.
- you can now draw graphs with logarithmic scale in the data axis ...
-
-* fixed some minor drawing bugs ...
-
-Thu Apr 30 1998
-* hp portability patch from "Crawley, Tom" <Tom.Crawley at hi.riotinto.com.au>
- you should now be able to compile with gcc on hp as well ...
-
-Fri Apr 18 1998
-
-* Patch from Otmar Lendl (O.Lendl at Austria.EU.net) to
- fix perl coredump ...
-
-* Split the top makefile into Makefile.dist and Makefile
- Makefile does not contain any gnu only things anymore
-
-* Renamed doc Makefile to GNUmakefile because it contains
- several GNU only constructs. Lets be straight in this respect
- and stop pretending it was a Makefile.
-
-Thu Apr 9 1998
-**** INCOMPATIBLE CHANGES ****
-
-* altered PRINT and GPRINT functions ... we really need to give
- them a consolidation function ... [G]PRINT:<vname>:<cf>:<format>
- otherwise things are not clear for calculation. You can now
- define the operation for PRINT and GPRINT independent from the
- data source consolidation method. This allows to calc things
- like average maximum, or maximal 5 minute average ... or what ever
- you choose ...
-
-* options of graph, create and update have changed again. The old style
- LINE1:..., DS:..., DATA:... arguments are back. I found that this
- is more logical than doing everything with options. This will be
- especially helpful for the perl interface
-
-* Completed CDEF/DEF implementation. Now you can create new
- data sources on the fly by doing some rpn math. Check rrd_demo.pl for
- an example of CDEF rpn math.
-
-* updated rrdgraph, rrdupdate and rrdcreate man-pages to reflect new
- command-line options
-
-* updated rrd_demo.pl to work with new command-line options
- log2rrd.pl and graphrrd.pl are *NOT* updated yet ...
-
-* updated perl test.pl to work with new options ... unfortunately
- test.pl crashes after generating about 3 graphs ... I guess there is
- a memory leak, but debugging the core of an shared library perl
- is quite a problem ... no solution yet ... When I link perl statically
- to the rrd stuff things work without core ...
-
-Wed Apr 8 1998 -- Wrolf / Russ
-* new scripts log2rrd.pl and graphrrd.pl
-
-Mon Apr 6 1998
-* compete RPN implementation ... things compile ... too tired to
- test, will do later
-
-Sun Apr 5 1998
-* added -fpic for gcc and -z for hp compilers to generate
- position independent code which helps when doing shared
- libraries ...
-
-Thu Apr 2 1998 -- Wrolf
-* Makefile.in fixes
+- 1999/08/19 -- Tobi
+ replaced micro by u in SI prefix array
+
+- 1999/08/19 -- Tobi
+ better floating point veryfication in IEEE test ... missed SIGFPE
+ condition in freeBSD.
+
+- 1999/08/17 -- Tobi reacting to a bug report from W. James Showalter, Jr.
+ made time parser work as expected with dates of the form august 20 1999 as
+ well as dates of the form 8/17/1999 and 17.8.1999
+
+- 1999/08/17 -- Blair Zajac <bzajac at geostaff.com>
+ propagate CFLAGS from configure to PERL module compilation
+
+- 1999/08/17 -- Ragnar Kjørstad <mrtg at ragnark.vestdata.no>
+ fixed perl path in log2rrd contrib script
+
+- 1999/08/16 -- Philippe.Simonet at swisscom.com
+ DINF and friends for NT
-Wed Apr 1 1998
-* Updated docs for rrd graph ... will take the graph functions out of long
- opts ... as they are not really options ...
-
-Tue Mar 31 1998
-* small Makfile.in fixes ...
-
-Tue Mar 31 1998 -- Wrolf
-* spelling fixes
-
-Mon Mar 30 1998
-* big source split ... its now all neatly separated
- in subdirectories.
-
-* gd1.2 is now included in the release ...
-
-Mon Mar 30 1998 -- Philippe.Simonet at swisscom.com
-* rrd_open.c use rb+ instead of r+ for fopen
-* ntdemo.pl created to the test rrdtool.exe under NT
-
-Sun Mar 29 1998
-* INCOMPATIBLE CHANGE remaining functions converted to getopt_long
-* started loadable perl module ... its all in the RRD directory
-
-Thu Mar 26 1998 -- jeff.allen at acm.org
-* added some files to make things work under DevStudio
- not tested yet ...
-
-Tue Mar 24 1998
-* started changing calling sequence rrd_graph.c done
-* updated to much newer getopt ... maybe it has a few potential
- bugs fixed
-* updated rrdgraph.pod for new calling sequence
-
-Mon Mar 23 1998
-* improved labeling for horizontal grid
-
-Sat Mar 21 1998 -- jeff.allen at acm.org
-* hpux portability improved
-* sunos port
-
-Wed Mar 18 1998
-* added log2rrd.pl to configure.in and Makefile.in
-* about 1'000 spelling fixes from Wrolf applied
-* Fixed help screen in rrd_tune (LINE1 ...)
-* Fixed error in GPRINT and PRINT function of rrd_graph.c (Philippe)
-* added log2rrd.pl by Russ and Wrolf
-
-Sun Mar 15 1998
-* Updated Makefile to produce *.pl.in files from *.pl files on tar and dist
-* Updated Makefile to generate *.html and *.man files from *.pl and *.pm
-* total rewrite of horizontal grid lines I guess now things look more the
- way they should ...
-* INCOMPATIBLE CHANGE the -y option is now called -v and -y is now
- equivalent to x in the respect, that it allows to configure the horizontal
- -grid. (log grid will come soon)
-* implemented title function -t (it was already there but not active)
-* made RRD.pm complain if it is not used correctly
-* updated documentation for RRD.pm
-* INCOMPATIBLE CHANGE ... there are now 3 types of LINE -- LINE1 LINE2 and
-LINE3
- they are increasing in size.
-* if there are only PRINT commands in a graph command line, no GIF will be
- created ...
-
-Fri Mar 13 1998
-* fixed some potentially ambiguous else statements (gcc-2.8.1 objected)
-* fixed error in STACK option
-* added documentation for log scale
-* added documentation for y-axis spacing config
-
-Thu Mar 12 1998
-* added rule to configure so that it looks in
- /usr/local/include/gd for include files
-* added -d option to rrd_tune.c to allow to change
- the DST of a DS ... (special request from Alan)
-
-Thu Mar 12 1998 -- jeff.allen at acm.org
-* cleaned up rrd_tool.h to make better use of configure
-* tried to separate out Win32 stuff better
-* made calls to strftime fail if it doesn't exist (probably
- need to ship a substitute, unless this is more portable than it sounds)
-* created config.h.nt, which will probably be useful for porting
- to NT. We'll see.
-
-Wed Mar 11 1998
-* oops nonblocking was NOT in last release ... sorry ... here it is ..
-* started to create RRD.pm
-* adapted rrd_demo.pl to work with it ...
-
-Mon Mar 9 1998
-* better values for xlab array ...
-* fixed error with rrd_fetch
- (it was not fetching the right data if the pointer wrapped straight from
- the beginning)
-* check VRULE and HRULE placement
-* changed linking order -lgd and then -lm as floor from gd is in m
-* made rrd_demo use nonblocking read to get data from pipe
-
-Mon Mar 9 1988 -- Wrolf (how about using diff -u )
-* lots of spelling fixes
-* some linting fixes
-* better Makefile portability
-
-Sun Mar 8 1998
-* added rrd_tune.c and rrdtune.pod ... read the docs ...
-* compiled rrdtool and gdlib with -pg in order to run it
- under gprof ... the results were, that most time is spent
- compressing the gif file. As the profiling is only on a function level, I
- was not able to identify hot spots within the code ...
-* added getrusage and gettimeofday call to rrd_tool.c in order to get
- better grip on time spent on each function ... the results will be printed
- after the OK prompt. Adapted rrd_demo.pl accordingly ...
-
-Sun Mar 8 1998 -- jeff.allen at acm.org
-* Fix to first line of rrd_demo.pl. Autoconf docs say that
- Sequent's unix needs the space. Whatever...
-* cosmetic changes to rrd_demo.pl.in
-* changed getopt.c to suck in rrdtool.h, so that it includes
- string.h. The comments in getopt.c seem to imply that
- this can break things, but it clears up a warning for me.
- What do others think?
-
-Sat Mar 7 1998
-* tried some cool graphs ... the current one produced by rrd_demo.pl
- looks really freaky ... not that anyone would want to use
- such a graph, (I guess) but it can be done ...
-* finally rrd_graph does work as described in the manpage
-* many cosmetic changes to the graph
-* use Open2 and select in rrd_demo.pl
-* added OK response to rrd tool
-* integrated simons opt patch ...
-
-Fri Mar 6 1998 -- jeff.allen at acm.org
-* docs in configure.in
-* HP cc and GCC flags discovery (not tested on HP -- Wrolf,
- please give it a try)
-* improvements to makefile
-* one-line changes to rrd_graph.c and getopt.c to keep Purify and
- Gcc happy.
-
-Thu Mar 5 1998
-* some more HPUX portability stuff by Wrolf
-* rrd_tool.h cleanup
-* added project files for MS VC++ by Philippe
-* aesthetic tuning on the graph ...
-* text labels below the graph area
-* VRULE and HRULE implemented
-* Debugged argument parsing ... no more segfaults when you give the wrong
- number of arguments.
-
-Wed Mar 4 1998
-* now rrdgraph is working ... not all methods are implemented yet, but it
- does produce graphs ... see rrd_demo.pl
-
-Tue Mar 3 1998
-* fixed some further minor problems .... bug fixing goes ahead, but not
- finished yet ... CODE DOES NOT WORK
-
-* found the 'memory problem' there is a difference between
- malloc(a-b * sizeof(c)) when I want to do malloc((a-b) * sizeof(c))
- I love braces ... :-)
-
-Tue Mar 3 1998 -- jeff.allen at acm.org
-* Added configure.in and friends, to simplify configuration.
-
-Sun Mar 1 1998
-* started to make rrd_graph work as advertised. Programming went well,
- unfortunately debugging is not yet done and not all the functionality
- is implemented. But I guess if it did not crash, the AREA, LINE and
- STACK functions should be OK ... I guess there is some memory problem.
-* enhanced Makefile to be able to do the man and html versions
-
-Thu Feb 26 1998
-* fixed pipe mode commandline parsing
-* made rrd_demo.pl work again ... no graphics at the moment
-* altered commandline options for update ... negative numbers were a problem
-* Integrated some patches from Wrolf
-* filename and pod patches from Jeff added
-* changed Makefile structure to make it ready for autoconf/configure ... (jeff)
-* added rrd_getopt for good now it will work the same on all systems.
- Maybe we should go to gnu_getopt once jeff integrates configure ?
-* made rrd_update work as advertised in the manpage
-
-Wed Feb 25 1998
-* some 'make the compiler happy' patches from Jeff
-* CFLAGS for HP cc from Wrolf
-* included source for getopt in case your system does not have it
- edit Makefile ...
-
-Sun Feb 22 1998
-* improved/spell-checked pod documentation (Russ)
-* rrd_fetch and rrd_dump work as advertised in the docs
-
-Sat Feb 21 1998
-* stared bringing code in line with documentation. rrd_create.c done
-
-Sun Feb 15 1998
-* created full documentation for rrdtool in pod format
-
-Sun Feb 1 1998
-* fixed seek bug in rrd_update
-* rewrote rrd_tool argument scanner now it does quoting as it should be.
-* rrd_graph ... scaling bug fixes
-* horizontal grid fixed
-* added copyright notice
-* vertical grpd fixed
-* wrote demo app in perl
-* updated TODO and README
-
-Thu Jan 22 1998
-* Russ has debugged my rrd_graph code.
-* Fixed one remaining malloc error
-* improved visual appearance of the graph
-* updated TODO list
-
-Sun Jan 18 1998
-* added Dan and Russ rrd_tool.c ... rrd_main.c is gone
-* current setup assumes gd1.2 to exist in the compile directory
-* things compile again ...
-* rrd_graph is done, but not yet debugged ... so while it compiles,
- it will not do what it should (I guess )
-* this release is for dan dunn to integrate the new rrd_main.c
-* created TODO and CONTRIBUTORS files
-
-Thu Jan 08 1998
-
-* mrtg DOES NOT COMPILE ... you can leave out rrd_graph and the
- relevant parts of rrd_main to get it to compile ...
-
-* releasing the code because there were some changes in other modules as
- well
-* rrd_graph is about 50 percent done ... remaining twist clever
- horizontal grid ...
-
-Sat Nov 29 1997
-
-* debugged rrd_fetch
-
-Fri Nov 28 1997
-
-* rrd_update a ; after a if prevented CF MAX from working
-
-* rrd_dump fied time in output
-
-* rrd_perf fixed mrhb in demo db
-
-* rrd_fetch created. This function will get the data
- for the graphs
-
-Thu Nov 27 1997
-
-* rrd_update debugged ... I guess (!) it works now correctly
-
- note: we always assume that a input value represents the average
- from the last to the current run
-
-* rrd_fupd created. This is like rrd_update, but it accepts input
- from a file or stdin ... (this saves us from restarting
- rrd_update for each file)
+= 1.0.6 1999/08/14 -- Tobi
-* rrd_perf.pl created. It helps to assess the performance you
- can achieve with an rrd on your system.
+- 1999/08/14 -- Tobi
+ Fixed install location of html pages ... they go to ../html now ...
+- 1999/08/14 -- Tobi
+ Fixed CDEF parser ... it should now be fine with a,-1,*
-Sun Nov 23 1997
+- 1999/08/14 -- Tobi
+ Updated rrdgraph manpage to be in line with the changes I made to alexs
+ INF patch when integrating it ... sorry alex
-* rrd_update created ... does not yet work ... but it should !
-* some problem s with the format removed in the process ...
+= 1.0.5 1999/08/13 -- Tobi
+
+- 1999/08/13 -- Tobi
+ Tested portability of 1.0.5 release on Solaris, Linux and FreeBSD
+
++ 1999/08/13 -- Tobi
+ changed IEEE tests ... now they tell you what fails and they are less picky
++ 1999/08/12 -- Alex + Tobi
+ added INF and NEGINF operator to CDEF rpn functions. This pushes an
+ positive or negative infinite number onto the stack respectively ... when
+ graphing, they get replaced by a value equivalent to the upper or lower
+ boundery of the graphing area ...
+
++ 1999/08/10 -- Tobi
+ Integrated Blairs autoconf ... added dist and install support
+
++ 1999/08/09 -- Blair
+ Added automake/libtool support ... with --enable-shared you can
+ now get a shared library version of rrdtool ...
+
+= 1.0.4 1999/08/06 -- tobi oetiker <tobi at caida.org>
+
+- 1999/08/06 -- Tobi
+ made rrdcgi parser more robust to invalid inputfiles.
+
+- 1999/08/04 -- Tobi + Philippe
+ in rrd_cgi I was freeing cgi arguments. Fixed ...
+
++ 1999/08/03 -- Tobi Oetiker <tobi at caida.org>
+ added % operator to CDEF rpn functions ...
+ this should allow for some funky operations in connection with TIME
+
++ 1999/08/03 -- Tobi Oetiker <tobi at caida.org>
+ added --enable-site-perl option to configure
+ for people who want the RRD{s,p} perl modules installed
+ in their site-perl directories
+
++ 1999/08/03 -- Tobi Oetiker <tobi at caida.org>
+ do not try to compile perl modules if no perl is found
+
+- 1999/08/02 -- Hermann Hueni <hueni at glue.ch>
+ drop "rb" open mode for non win32 architectures
+
+- 1999/07/30 -- Tobias Weingartner <weingart at cs.ualberta.ca>
+ spell fixes for documentation
+
+= 1.0.3 1999/07/30 -- tobi oetiker <tobi at caida.org>
+
+- 1999/07/30 -- Tobi
+ Fixed default start time in rrd_create.
+ Start time of new rrds was set to 1970.01.01 causing VERY long update times
+ for the initial update ...
+
+= 1.0.2 1999/07/28 -- tobi oetiker <tobi at caida.org>
+
+- 1999/07/28 -- Tobi
+ Added configure checks for reallocs ability to deal with NULL pointers
+ this helps compiling on SunOS
+
+- 1999/07/28 -- Tobi
+ Added check for memmove availablility. Replace with bcopy if necessary.
+
++ 1999/07/28 -- Tobi
+ Added better IEEE tests ...
+
++ 1999/07/28 -- Tobi
+ Added Dynamic stack allocation to RPN in CDEF
+
++ 1999/07/27 -- Tobi & Tobias Weingartner <weingart at cs.ualberta.ca>
+ Added DUP, POP and EXC operator for CDEF.
+
++ 1999/07/27 -- Sasha Mikheev <sasha at aldan.netvision.net.il>
+ alternate grid and scaling functions for rrdgraph. Use --alt-y-grid and
+ --alt-autoscale to activate.
+
+- 1999/07/27 -- Tobi
+ fixed about 1000 memmory leaks in rrdcg. Wonder it was working before ...
+
+- 1999/07/26 -- Tamas Kovacshazy <khazy at mit.bme.hu>
+ improved vc++ project files for rrdtool
+
+- 1999/07/26 -- Tobi
+ added ranlib to cgi png z and gd library ...
+
+= 1.0.1 1999/07/23 -- tobi oetiker <tobi at caida.org>
+
+- 1999/07/23 -- Tobi
+ plugged memory leek in parsetime.c
+- 1999/07/23 -- Tobi
+ fixed serious error in data_reduce function. This was causing the graph to
+ intermittently disappear. It was also displaying inaccurate values for
+ spiky data, if this data had to be reduced due to the width of the image
+ as compared to the resolution of the RRA data. (does this fix the errors
+ seen by cricket users ????)
+
++ 1999/07/22 -- Seth Lepzelter <slepzelt at cs.oberlin.edu>
+ DEC needs -mieee to do proper IEEE math ... added configure test
+
++ 1999/07/22 -- Philippe.Simonet at swisscom.com
+ vc++ project files for rrdtool
+
+* 1999/07/19 -- Alex van den Bogaerdt <alex at ergens.op.Het.Net>
+ rrd file icon contributed
+
+- 1999/07/19 -- tobi oetiker <tobi at caida.org>
+ added strcasecmp function into parsetime as this is not
+ available on all systems.
+
+= 1.0.0 1999/07/15 -- tobi oetiker <tobi at caida.org>
+ Released first 'stable' version of RRDtool after almost
+ 18 Month of 'development'
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/COPYING
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/COPYING (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/COPYING Sat Jul 13 19:23:13 2002
@@ -148,7 +148,7 @@
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
+ allowed only for non-commercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngerror.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngerror.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngerror.c Sat Jul 13 19:23:14 2002
@@ -0,0 +1,172 @@
+
+/* pngerror.c - stub functions for i/o and memory allocation
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file provides a location for all error handling. Users who
+ * need special error handling are expected to write replacement functions
+ * and use png_set_error_fn() to use those functions. See the instructions
+ * at each function.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+static void png_default_error PNGARG((png_structp png_ptr,
+ png_const_charp message));
+static void png_default_warning PNGARG((png_structp png_ptr,
+ png_const_charp message));
+
+/* This function is called whenever there is a fatal error. This function
+ * should not be changed. If there is a need to handle errors differently,
+ * you should supply a replacement error function and use png_set_error_fn()
+ * to replace the error function at run-time.
+ */
+void
+png_error(png_structp png_ptr, png_const_charp message)
+{
+ if (png_ptr->error_fn != NULL)
+ (*(png_ptr->error_fn))(png_ptr, message);
+
+ /* if the following returns or doesn't exist, use the default function,
+ which will not return */
+ png_default_error(png_ptr, message);
+}
+
+/* This function is called whenever there is a non-fatal error. This function
+ * should not be changed. If there is a need to handle warnings differently,
+ * you should supply a replacement warning function and use
+ * png_set_error_fn() to replace the warning function at run-time.
+ */
+void
+png_warning(png_structp png_ptr, png_const_charp message)
+{
+ if (png_ptr->warning_fn != NULL)
+ (*(png_ptr->warning_fn))(png_ptr, message);
+ else
+ png_default_warning(png_ptr, message);
+}
+
+/* These utilities are used internally to build an error message that relates
+ * to the current chunk. The chunk name comes from png_ptr->chunk_name,
+ * this is used to prefix the message. The message is limited in length
+ * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * if the character is invalid.
+ */
+#define isnonalpha(c) ((c) < 41 || (c) > 122 || ((c) > 90 && (c) < 97))
+static PNG_CONST char png_digit[16] = {
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+static void
+png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp message)
+{
+ int iout = 0, iin = 0;
+
+ while (iin < 4) {
+ int c = png_ptr->chunk_name[iin++];
+ if (isnonalpha(c)) {
+ buffer[iout++] = '[';
+ buffer[iout++] = png_digit[(c & 0xf0) >> 4];
+ buffer[iout++] = png_digit[c & 0xf];
+ buffer[iout++] = ']';
+ } else {
+ buffer[iout++] = c;
+ }
+ }
+
+ if (message == NULL)
+ buffer[iout] = 0;
+ else {
+ buffer[iout++] = ':';
+ buffer[iout++] = ' ';
+ png_memcpy(buffer+iout, message, 64);
+ buffer[iout+63] = 0;
+ }
+}
+
+void
+png_chunk_error(png_structp png_ptr, png_const_charp message)
+{
+ char msg[16+64];
+ png_format_buffer(png_ptr, msg, message);
+ png_error(png_ptr, msg);
+}
+
+void
+png_chunk_warning(png_structp png_ptr, png_const_charp message)
+{
+ char msg[16+64];
+ png_format_buffer(png_ptr, msg, message);
+ png_warning(png_ptr, msg);
+}
+
+/* This is the default error handling function. Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash. This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void
+png_default_error(png_structp png_ptr, png_const_charp message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+ fprintf(stderr, "libpng error: %s\n", message);
+#endif
+
+#ifdef USE_FAR_KEYWORD
+ {
+ jmp_buf jmpbuf;
+ png_memcpy(jmpbuf,png_ptr->jmpbuf,sizeof(jmp_buf));
+ longjmp(jmpbuf, 1);
+ }
+#else
+ longjmp(png_ptr->jmpbuf, 1);
+#endif
+}
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway. Replacement functions don't have to do anything
+ * here if you don't want them to. In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void
+png_default_warning(png_structp png_ptr, png_const_charp message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+ fprintf(stderr, "libpng warning: %s\n", message);
+#endif
+ if (png_ptr == NULL)
+ return;
+}
+
+/* This function is called when the application wants to use another method
+ * of handling errors and warnings. Note that the error function MUST NOT
+ * return to the calling routine or serious problems will occur. The return
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
+ */
+void
+png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warning_fn)
+{
+ png_ptr->error_ptr = error_ptr;
+ png_ptr->error_fn = error_fn;
+ png_ptr->warning_fn = warning_fn;
+}
+
+
+/* This function returns a pointer to the error_ptr associated with the user
+ * functions. The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp
+png_get_error_ptr(png_structp png_ptr)
+{
+ return ((png_voidp)png_ptr->error_ptr);
+}
+
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README.rrdtool
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README.rrdtool (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README.rrdtool Sat Jul 13 19:23:14 2002
@@ -0,0 +1,2 @@
+This version of libpng has been included with rrdtool. The scripts directory
+has been removed ...
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwtran.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwtran.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwtran.c Sat Jul 13 19:23:14 2002
@@ -0,0 +1,497 @@
+
+/* pngwtran.c - transforms the data in a row for PNG writers
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Transform the data according to the user's wishes. The order of
+ * transformations is significant.
+ */
+void
+png_do_write_transformations(png_structp png_ptr)
+{
+ png_debug(1, "in png_do_write_transformations\n");
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+ if (png_ptr->transformations & PNG_USER_TRANSFORM)
+ if(png_ptr->write_user_transform_fn != NULL)
+ (*(png_ptr->write_user_transform_fn)) /* user write transform function */
+ (png_ptr, /* png_ptr */
+ &(png_ptr->row_info), /* row_info: */
+ /* png_uint_32 width; width of row */
+ /* png_uint_32 rowbytes; number of bytes in row */
+ /* png_byte color_type; color type of pixels */
+ /* png_byte bit_depth; bit depth of samples */
+ /* png_byte channels; number of channels (1-4) */
+ /* png_byte pixel_depth; bits per pixel (depth*channels) */
+ png_ptr->row_buf + 1); /* start of pixel data for row */
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+ if (png_ptr->transformations & PNG_FILLER)
+ png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ png_ptr->flags);
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACK)
+ png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ (png_uint_32)png_ptr->bit_depth);
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_BYTES)
+ png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+ if (png_ptr->transformations & PNG_SHIFT)
+ png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ &(png_ptr->shift));
+#endif
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_ALPHA)
+ png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+ if (png_ptr->transformations & PNG_BGR)
+ png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_MONO)
+ png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+}
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+/* Pack pixels into bytes. Pass the true bit depth in bit_depth. The
+ * row_info bit depth should be 8 (one pixel per byte). The channels
+ * should be 1 (this only happens on grayscale and paletted images).
+ */
+void
+png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
+{
+ png_debug(1, "in png_do_pack\n");
+ if (row_info->bit_depth == 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->channels == 1)
+ {
+ switch ((int)bit_depth)
+ {
+ case 1:
+ {
+ png_bytep sp, dp;
+ int mask, v;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ sp = row;
+ dp = row;
+ mask = 0x80;
+ v = 0;
+
+ for (i = 0; i < row_width; i++)
+ {
+ if (*sp != 0)
+ v |= mask;
+ sp++;
+ if (mask > 1)
+ mask >>= 1;
+ else
+ {
+ mask = 0x80;
+ *dp = (png_byte)v;
+ dp++;
+ v = 0;
+ }
+ }
+ if (mask != 0x80)
+ *dp = (png_byte)v;
+ break;
+ }
+ case 2:
+ {
+ png_bytep sp, dp;
+ int shift, v;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ sp = row;
+ dp = row;
+ shift = 6;
+ v = 0;
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte value;
+
+ value = (png_byte)(*sp & 0x3);
+ v |= (value << shift);
+ if (shift == 0)
+ {
+ shift = 6;
+ *dp = (png_byte)v;
+ dp++;
+ v = 0;
+ }
+ else
+ shift -= 2;
+ sp++;
+ }
+ if (shift != 6)
+ *dp = (png_byte)v;
+ break;
+ }
+ case 4:
+ {
+ png_bytep sp, dp;
+ int shift, v;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ sp = row;
+ dp = row;
+ shift = 4;
+ v = 0;
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte value;
+
+ value = (png_byte)(*sp & 0xf);
+ v |= (value << shift);
+
+ if (shift == 0)
+ {
+ shift = 4;
+ *dp = (png_byte)v;
+ dp++;
+ v = 0;
+ }
+ else
+ shift -= 4;
+
+ sp++;
+ }
+ if (shift != 4)
+ *dp = (png_byte)v;
+ break;
+ }
+ }
+ row_info->bit_depth = (png_byte)bit_depth;
+ row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
+ row_info->rowbytes =
+ ((row_info->width * row_info->pixel_depth + 7) >> 3);
+ }
+}
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Shift pixel values to take advantage of whole range. Pass the
+ * true number of bits in bit_depth. The row should be packed
+ * according to row_info->bit_depth. Thus, if you had a row of
+ * bit depth 4, but the pixels only had values from 0 to 7, you
+ * would pass 3 as bit_depth, and this routine would translate the
+ * data to 0 to 15.
+ */
+void
+png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
+{
+ png_debug(1, "in png_do_shift\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL &&
+#else
+ if (
+#endif
+ row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+ {
+ int shift_start[4], shift_dec[4];
+ int channels = 0;
+
+ if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+ {
+ shift_start[channels] = row_info->bit_depth - bit_depth->red;
+ shift_dec[channels] = bit_depth->red;
+ channels++;
+ shift_start[channels] = row_info->bit_depth - bit_depth->green;
+ shift_dec[channels] = bit_depth->green;
+ channels++;
+ shift_start[channels] = row_info->bit_depth - bit_depth->blue;
+ shift_dec[channels] = bit_depth->blue;
+ channels++;
+ }
+ else
+ {
+ shift_start[channels] = row_info->bit_depth - bit_depth->gray;
+ shift_dec[channels] = bit_depth->gray;
+ channels++;
+ }
+ if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
+ shift_dec[channels] = bit_depth->alpha;
+ channels++;
+ }
+
+ /* with low row depths, could only be grayscale, so one channel */
+ if (row_info->bit_depth < 8)
+ {
+ png_bytep bp = row;
+ png_uint_32 i;
+ png_byte mask;
+ png_uint_32 row_bytes = row_info->rowbytes;
+
+ if (bit_depth->gray == 1 && row_info->bit_depth == 2)
+ mask = 0x55;
+ else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
+ mask = 0x11;
+ else
+ mask = 0xff;
+
+ for (i = 0; i < row_bytes; i++, bp++)
+ {
+ png_uint_16 v;
+ int j;
+
+ v = *bp;
+ *bp = 0;
+ for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
+ {
+ if (j > 0)
+ *bp |= (png_byte)((v << j) & 0xff);
+ else
+ *bp |= (png_byte)((v >> (-j)) & mask);
+ }
+ }
+ }
+ else if (row_info->bit_depth == 8)
+ {
+ png_bytep bp = row;
+ png_uint_32 i;
+ png_uint_32 istop = channels * row_info->width;
+
+ for (i = 0; i < istop; i++, bp++)
+ {
+
+ png_uint_16 v;
+ int j;
+ int c = (int)(i%channels);
+
+ v = *bp;
+ *bp = 0;
+ for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+ {
+ if (j > 0)
+ *bp |= (png_byte)((v << j) & 0xff);
+ else
+ *bp |= (png_byte)((v >> (-j)) & 0xff);
+ }
+ }
+ }
+ else
+ {
+ png_bytep bp;
+ png_uint_32 i;
+ png_uint_32 istop = channels * row_info->width;
+
+ for (bp = row, i = 0; i < istop; i++)
+ {
+ int c = (int)(i%channels);
+ png_uint_16 value, v;
+ int j;
+
+ v = ((png_uint_16)(*bp) << 8) + *(bp + 1);
+ value = 0;
+ for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+ {
+ if (j > 0)
+ value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+ else
+ value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+ }
+ *bp++ = (png_byte)(value >> 8);
+ *bp++ = (png_byte)(value & 0xff);
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void
+png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_write_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ /* This converts from ARGB to RGBA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ png_byte save = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = save;
+ }
+ }
+ /* This converts from AARRGGBB to RRGGBBAA */
+ else
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ png_byte save[2];
+ save[0] = *(sp++);
+ save[1] = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = save[0];
+ *(dp++) = save[1];
+ }
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ /* This converts from AG to GA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ png_byte save = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = save;
+ }
+ }
+ /* This converts from AAGG to GGAA */
+ else
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ png_byte save[2];
+ save[0] = *(sp++);
+ save[1] = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = save[0];
+ *(dp++) = save[1];
+ }
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void
+png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_write_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ /* This inverts the alpha channel in RGBA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = 255 - *(sp++);
+ }
+ }
+ /* This inverts the alpha channel in RRGGBBAA */
+ else
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = 255 - *(sp++);
+ *(dp++) = 255 - *(sp++);
+ }
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ /* This inverts the alpha channel in GA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ *(dp++) = *(sp++);
+ *(dp++) = 255 - *(sp++);
+ }
+ }
+ /* This inverts the alpha channel in GGAA */
+ else
+ {
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ for (i = 0, sp = dp = row; i < row_width; i++)
+ {
+ *(dp++) = *(sp++);
+ *(dp++) = *(sp++);
+ *(dp++) = 255 - *(sp++);
+ *(dp++) = 255 - *(sp++);
+ }
+ }
+ }
+ }
+}
+#endif
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.in Sat Jul 13 19:23:15 2002
@@ -0,0 +1,340 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+
+# where we keep local rules for automake
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+INCLUDES = -I$(top_srcdir)/$(ZLIB_LIB_DIR)
+
+EXTRA_DIST = ANNOUNCE CHANGES INSTALL KNOWNBUG README README.rrdtool TODO Y2KINFO example.c libpng.3 libpng.txt libpngpf.3 png.5 png.dsp png.dsw
+
+
+noinst_LTLIBRARIES = librrd_png.la
+
+librrd_png_la_SOURCES = png.c pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c png.h pngconf.h
+
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+librrd_png_la_LDFLAGS =
+librrd_png_la_LIBADD =
+librrd_png_la_OBJECTS = png.lo pngerror.lo pngget.lo pngmem.lo \
+pngpread.lo pngread.lo pngrio.lo pngrtran.lo pngrutil.lo pngset.lo \
+pngtrans.lo pngwio.lo pngwrite.lo pngwtran.lo pngwutil.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = README INSTALL Makefile.am Makefile.in TODO ansi2knr.1 \
+ansi2knr.c
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(librrd_png_la_SOURCES)
+OBJECTS = $(librrd_png_la_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libpng-1.0.3/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLTLIBRARIES:
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+
+distclean-noinstLTLIBRARIES:
+
+maintainer-clean-noinstLTLIBRARIES:
+
+.c.o:
+ $(COMPILE) -c $<
+
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
+mostlyclean-compile:
+ -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+ -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+librrd_png.la: $(librrd_png_la_OBJECTS) $(librrd_png_la_DEPENDENCIES)
+ $(LINK) $(librrd_png_la_LDFLAGS) $(librrd_png_la_OBJECTS) $(librrd_png_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = libpng-1.0.3
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+png.lo png.o : png.c png.h ../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
+ pngconf.h
+pngerror.lo pngerror.o : pngerror.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngget.lo pngget.o : pngget.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngmem.lo pngmem.o : pngmem.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngpread.lo pngpread.o : pngpread.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngread.lo pngread.o : pngread.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngrio.lo pngrio.o : pngrio.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngrtran.lo pngrtran.o : pngrtran.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngrutil.lo pngrutil.o : pngrutil.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngset.lo pngset.o : pngset.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngtrans.lo pngtrans.o : pngtrans.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngwio.lo pngwio.o : pngwio.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngwrite.lo pngwrite.o : pngwrite.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngwtran.lo pngwtran.o : pngwtran.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+pngwutil.lo pngwutil.o : pngwutil.c png.h ../zlib-1.1.3/zlib.h \
+ ../zlib-1.1.3/zconf.h pngconf.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LTLIBRARIES)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
+ clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
+ distclean-libtool distclean-tags distclean-generic \
+ clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.1
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.1 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.1 Sat Jul 13 19:23:15 2002
@@ -0,0 +1,36 @@
+.TH ANSI2KNR 1 "19 Jan 1996"
+.SH NAME
+ansi2knr \- convert ANSI C to Kernighan & Ritchie C
+.SH SYNOPSIS
+.I ansi2knr
+[--varargs] input_file [output_file]
+.SH DESCRIPTION
+If no output_file is supplied, output goes to stdout.
+.br
+There are no error messages.
+.sp
+.I ansi2knr
+recognizes function definitions by seeing a non-keyword identifier at the left
+margin, followed by a left parenthesis, with a right parenthesis as the last
+character on the line, and with a left brace as the first token on the
+following line (ignoring possible intervening comments). It will recognize a
+multi-line header provided that no intervening line ends with a left or right
+brace or a semicolon. These algorithms ignore whitespace and comments, except
+that the function name must be the first thing on the line.
+.sp
+The following constructs will confuse it:
+.br
+ - Any other construct that starts at the left margin and follows the
+above syntax (such as a macro or function call).
+.br
+ - Some macros that tinker with the syntax of the function header.
+.sp
+The --varargs switch is obsolete, and is recognized only for
+backwards compatibility. The present version of
+.I ansi2knr
+will always attempt to convert a ... argument to va_alist and va_dcl.
+.SH AUTHOR
+L. Peter Deutsch <ghost at aladdin.com> wrote the original ansi2knr and
+continues to maintain the current version; most of the code in the current
+version is his work. ansi2knr also includes contributions by Francois
+Pinard <pinard at iro.umontreal.ca> and Jim Avera <jima at netcom.com>.
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.txt Sat Jul 13 19:23:16 2002
@@ -0,0 +1,2067 @@
+libpng.txt - A description on how to use and modify libpng
+
+ libpng version 1.0.3 - January 14, 1999
+ Updated and distributed by Glenn Randers-Pehrson
+ <randeg at alumni.rpi.edu>
+ Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ For conditions of distribution and use, see copyright
+ notice in png.h.
+
+ based on:
+
+ libpng 1.0 beta 6 version 0.96 May 28, 1997
+ Updated and distributed by Andreas Dilger
+ Copyright (c) 1996, 1997 Andreas Dilger
+
+ libpng 1.0 beta 2 - version 0.88 January 26, 1996
+ For conditions of distribution and use, see copyright
+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric
+ Schalnat, Group 42, Inc.
+
+ Updated/rewritten per request in the libpng FAQ
+ Copyright (c) 1995 Frank J. T. Wojcik
+ December 18, 1995 && January 20, 1996
+
+I. Introduction
+
+This file describes how to use and modify the PNG reference library
+(known as libpng) for your own use. There are five sections to this
+file: introduction, structures, reading, writing, and modification and
+configuration notes for various special platforms. In addition to this
+file, example.c is a good starting point for using the library, as
+it is heavily commented and should include everything most people
+will need. We assume that libpng is already installed; see the
+INSTALL file for instructions on how to install libpng.
+
+Libpng was written as a companion to the PNG specification, as a way
+of reducing the amount of time and effort it takes to support the PNG
+file format in application programs. The PNG specification is available
+as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/> and as a
+W3C Recommendation <http://www.w3.org/TR/REC.png.html>. Some
+additional chunks are described in the special-purpose public chunks
+documents at <ftp://ftp.uu.net/graphics/png/documents/>. Other information
+about PNG, and the latest version of libpng, can be found at the PNG home
+page, <http://www.cdrom.com/pub/png/>.
+
+Most users will not have to modify the library significantly; advanced
+users may want to modify it more. All attempts were made to make it as
+complete as possible, while keeping the code easy to understand.
+Currently, this library only supports C. Support for other languages
+is being considered.
+
+Libpng has been designed to handle multiple sessions at one time,
+to be easily modifiable, to be portable to the vast majority of
+machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy
+to use. The ultimate goal of libpng is to promote the acceptance of
+the PNG file format in whatever way possible. While there is still
+work to be done (see the TODO file), libpng should cover the
+majority of the needs of its users.
+
+Libpng uses zlib for its compression and decompression of PNG files.
+Further information about zlib, and the latest version of zlib, can
+be found at the zlib home page, <http://www.cdrom.com/pub/infozip/zlib/>.
+The zlib compression utility is a general purpose utility that is
+useful for more than PNG files, and can be used without libpng.
+See the documentation delivered with zlib for more details.
+You can usually find the source files for the zlib utility wherever you
+find the libpng source files.
+
+Libpng is thread safe, provided the threads are using different
+instances of the structures. Each thread should have its own
+png_struct and png_info instances, and thus its own image.
+Libpng does not protect itself against two threads using the
+same instance of a structure.
+
+
+II. Structures
+
+There are two main structures that are important to libpng, png_struct
+and png_info. The first, png_struct, is an internal structure that
+will not, for the most part, be used by a user except as the first
+variable passed to every libpng function call.
+
+The png_info structure is designed to provide information about the
+PNG file. At one time, the fields of png_info were intended to be
+directly accessible to the user. However, this tended to cause problems
+with applications using dynamically loaded libraries, and as a result
+a set of interface functions for png_info was developed. The fields
+of png_info are still available for older applications, but it is
+suggested that applications use the new interfaces if at all possible.
+
+The png.h header file is an invaluable reference for programming with libpng.
+And while I'm on the topic, make sure you include the libpng header file:
+
+#include <png.h>
+
+III. Reading
+
+Reading PNG files:
+
+We'll now walk you through the possible functions to call when reading
+in a PNG file, briefly explaining the syntax and purpose of each one.
+See example.c and png.h for more detail. While Progressive reading
+is covered in the next section, you will still need some of the
+functions discussed in this section to read a PNG file.
+
+You will want to do the I/O initialization(*) before you get into libpng,
+so if it doesn't work, you don't have much to undo. Of course, you
+will also want to insure that you are, in fact, dealing with a PNG
+file. Libpng provides a simple check to see if a file is a PNG file.
+To use it, pass in the first 1 to 8 bytes of the file, and it will
+return true or false (1 or 0) depending on whether the bytes could be
+part of a PNG file. Of course, the more bytes you pass in, the
+greater the accuracy of the prediction.
+
+If you are intending to keep the file pointer open for use in libpng,
+you must ensure you don't read more than 8 bytes from the beginning
+of the file, and you also have to make a call to png_set_sig_bytes_read()
+with the number of bytes you read from the beginning. Libpng will
+then only check the bytes (if any) that your program didn't read.
+
+(*): If you are not using the standard I/O functions, you will need
+to replace them with custom functions. See the discussion under
+Customizing libpng.
+
+
+ FILE *fp = fopen(file_name, "rb");
+ if (!fp)
+ {
+ return;
+ }
+ fread(header, 1, number, fp);
+ is_png = !png_sig_cmp(header, 0, number);
+ if (!is_png)
+ {
+ return;
+ }
+
+
+Next, png_struct and png_info need to be allocated and initialized. In
+order to ensure that the size of these structures is correct even with a
+dynamically linked libpng, there are functions to initialize and
+allocate the structures. We also pass the library version, optional
+pointers to error handling functions, and a pointer to a data struct for
+use by the error functions, if necessary (the pointer and functions can
+be NULL if the default error handlers are to be used). See the section
+on Changes to Libpng below regarding the old initialization functions.
+
+ png_structp png_ptr = png_create_read_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return;
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_read_struct(&png_ptr,
+ (png_infopp)NULL, (png_infopp)NULL);
+ return;
+ }
+
+ png_infop end_info = png_create_info_struct(png_ptr);
+ if (!end_info)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return;
+ }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_read_struct_2() instead of png_create_read_struct():
+
+ png_structp png_ptr = png_create_read_struct_2
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn, (png_voidp)
+ user_mem_ptr, user_malloc_fn, user_free_fn);
+
+The error handling routines passed to png_create_read_struct()
+and the memory alloc/free routines passed to png_create_struct_2()
+are only necessary if you are not using the libpng supplied error
+handling and memory alloc/free functions.
+
+When libpng encounters an error, it expects to longjmp back
+to your routine. Therefore, you will need to call setjmp and pass
+your png_ptr->jmpbuf. If you read the file from different
+routines, you will need to update the jmpbuf field every time you enter
+a new routine that will call a png_ function.
+
+See your documentation of setjmp/longjmp for your compiler for more
+handling in the Customizing Libpng section below for more information on
+the libpng error handling. If an error occurs, and libpng longjmp's
+back to your setjmp, you will want to call png_destroy_read_struct() to
+free any memory.
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ &end_info);
+ fclose(fp);
+ return;
+ }
+
+Now you need to set up the input code. The default for libpng is to
+use the C function fread(). If you use this, you will need to pass a
+valid FILE * in the function png_init_io(). Be sure that the file is
+opened in binary mode. If you wish to handle reading data in another
+way, you need not call the png_init_io() function, but you must then
+implement the libpng I/O methods discussed in the Customizing Libpng
+section below.
+
+ png_init_io(png_ptr, fp);
+
+If you had previously opened the file and read any of the signature from
+the beginning in order to see if this was a PNG file, you need to let
+libpng know that there are some bytes missing from the start of the file.
+
+ png_set_sig_bytes(png_ptr, number);
+
+At this point, you can set up a callback function that will be
+called after each row has been read, which you can use to control
+a progress meter or the like. It's demonstrated in pngtest.c.
+You must supply a function
+
+ void read_row_callback(png_ptr, png_uint_32 row, int pass);
+ {
+ /* put your code here */
+ }
+
+(You can give it another name that you like instead of "read_row_callback")
+
+To inform libpng about your function, use
+
+ png_set_read_status_fn(png_ptr, read_row_callback);
+
+In PNG files, the alpha channel in an image is the level of opacity.
+If you need the alpha channel in an image to be the level of transparency
+instead of opacity, you can invert the alpha channel (or the tRNS chunk
+data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or
+paletted images) or 65535 (in 16-bit images) is fully transparent, with
+
+ png_set_invert_alpha(png_ptr);
+
+This has to appear here rather than later with the other transformations
+because the tRNS chunk data must be modified in the case of paletted images.
+If your image is not a paletted image, the tRNS data (which in such cases
+represents a single color to be rendered as transparent) won't be changed.
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs. This is done by setting a callback
+with
+
+ png_set_read_user_transform_fn(png_ptr,
+ read_transform_fn);
+
+You must supply the function
+
+ void read_transform_fn(png_ptr ptr, row_info_ptr
+ row_info, png_bytep data)
+
+See pngtest.c for a working example. Your function will be called
+after all of the other transformations have been processed.
+
+You are now ready to read all the file information up to the actual
+image data. You do this with a call to png_read_info().
+
+ png_read_info(png_ptr, info_ptr);
+
+Functions are used to get the information from the info_ptr:
+
+ png_get_IHDR(png_ptr, info_ptr, &width, &height,
+ &bit_depth, &color_type, &interlace_type,
+ &compression_type, &filter_type);
+
+ width - holds the width of the image
+ in pixels (up to 2^31).
+ height - holds the height of the image
+ in pixels (up to 2^31).
+ bit_depth - holds the bit depth of one of the
+ image channels. (valid values are
+ 1, 2, 4, 8, 16 and depend also on
+ the color_type. See also
+ significant bits (sBIT) below).
+ color_type - describes which color/alpha channels
+ are present.
+ PNG_COLOR_TYPE_GRAY
+ (bit depths 1, 2, 4, 8, 16)
+ PNG_COLOR_TYPE_GRAY_ALPHA
+ (bit depths 8, 16)
+ PNG_COLOR_TYPE_PALETTE
+ (bit depths 1, 2, 4, 8)
+ PNG_COLOR_TYPE_RGB
+ (bit_depths 8, 16)
+ PNG_COLOR_TYPE_RGB_ALPHA
+ (bit_depths 8, 16)
+
+ PNG_COLOR_MASK_PALETTE
+ PNG_COLOR_MASK_COLOR
+ PNG_COLOR_MASK_ALPHA
+
+ filter_type - (must be PNG_FILTER_TYPE_BASE
+ for PNG 1.0)
+ compression_type - (must be PNG_COMPRESSION_TYPE_BASE
+ for PNG 1.0)
+ interlace_type - (PNG_INTERLACE_NONE or
+ PNG_INTERLACE_ADAM7)
+ Any or all of interlace_type, compression_type, of
+ filter_type can be
+ NULL if you are not interested in their values.
+
+ channels = png_get_channels(png_ptr, info_ptr);
+ channels - number of channels of info for the
+ color type (valid values are 1 (GRAY,
+ PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+ 4 (RGB_ALPHA or RGB + filler byte))
+ rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+ rowbytes - number of bytes needed to hold a row
+
+ signature = png_get_signature(png_ptr, info_ptr);
+ signature - holds the signature read from the
+ file (if any). The data is kept in
+ the same offset it would be if the
+ whole signature were read (i.e. if an
+ application had already read in 4
+ bytes of signature before starting
+ libpng, the remaining 4 bytes would
+ be in signature[4] through signature[7]
+ (see png_set_sig_bytes())).
+
+
+ width = png_get_image_width(png_ptr,
+ info_ptr);
+ height = png_get_image_height(png_ptr,
+ info_ptr);
+ bit_depth = png_get_bit_depth(png_ptr,
+ info_ptr);
+ color_type = png_get_color_type(png_ptr,
+ info_ptr);
+ filter_type = png_get_filter_type(png_ptr,
+ info_ptr);
+ compression_type = png_get_compression_type(png_ptr,
+ info_ptr);
+ interlace_type = png_get_interlace_type(png_ptr,
+ info_ptr);
+
+
+These are also important, but their validity depends on whether the chunk
+has been read. The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
+png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
+data has been read, or zero if it is missing. The parameters to the
+png_get_<chunk> are set directly if they are simple data types, or a pointer
+into the info_ptr is returned for any complex types.
+
+ png_get_PLTE(png_ptr, info_ptr, &palette,
+ &num_palette);
+ palette - the palette for the file
+ (array of png_color)
+ num_palette - number of entries in the palette
+
+ png_get_gAMA(png_ptr, info_ptr, &gamma);
+ gamma - the gamma the file is written
+ at (PNG_INFO_gAMA)
+
+ png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
+ srgb_intent - the rendering intent (PNG_INFO_sRGB)
+ The presence of the sRGB chunk
+ means that the pixel data is in the
+ sRGB color space. This chunk also
+ implies specific values of gAMA and
+ cHRM.
+
+ png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+ sig_bit - the number of significant bits for
+ (PNG_INFO_sBIT) each of the gray,
+ red, green, and blue channels,
+ whichever are appropriate for the
+ given color type (png_color_16)
+
+ png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+ &trans_values);
+ trans - array of transparent entries for
+ palette (PNG_INFO_tRNS)
+ trans_values - transparent pixel for non-paletted
+ images (PNG_INFO_tRNS)
+ num_trans - number of transparent entries
+ (PNG_INFO_tRNS)
+
+ png_get_hIST(png_ptr, info_ptr, &hist);
+ (PNG_INFO_hIST)
+ hist - histogram of palette (array of
+ png_color_16)
+
+ png_get_tIME(png_ptr, info_ptr, &mod_time);
+ mod_time - time image was last modified
+ (PNG_VALID_tIME)
+
+ png_get_bKGD(png_ptr, info_ptr, &background);
+ background - background color (PNG_VALID_bKGD)
+
+ num_text = png_get_text(png_ptr, info_ptr, &text_ptr);
+ text_ptr - array of png_text holding image
+ comments
+ text_ptr[i]->key - keyword for comment.
+ text_ptr[i]->text - text comments for current
+ keyword.
+ text_ptr[i]->compression - type of compression used
+ on "text" PNG_TEXT_COMPRESSION_NONE
+ or PNG_TEXT_COMPRESSION_zTXt
+ num_text - number of comments
+
+ png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,
+ &unit_type);
+ offset_x - positive offset from the left edge
+ of the screen
+ offset_y - positive offset from the top edge
+ of the screen
+ unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+ png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,
+ &unit_type);
+ res_x - pixels/unit physical resolution in
+ x direction
+ res_y - pixels/unit physical resolution in
+ x direction
+ unit_type - PNG_RESOLUTION_UNKNOWN,
+ PNG_RESOLUTION_METER
+
+The data from the pHYs chunk can be retrieved in several convenient
+forms:
+
+ res_x = png_get_x_pixels_per_meter(png_ptr,
+ info_ptr)
+ res_y = png_get_y_pixels_per_meter(png_ptr,
+ info_ptr)
+ res_x_and_y = png_get_pixels_per_meter(png_ptr,
+ info_ptr)
+ aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,
+ info_ptr)
+
+ (Each of these returns 0 [signifying "unknown"] if
+ the data is not present or if res_x is 0;
+ res_x_and_y is 0 if res_x != res_y)
+
+For more information, see the png_info definition in png.h and the
+PNG specification for chunk contents. Be careful with trusting
+rowbytes, as some of the transformations could increase the space
+needed to hold a row (expand, filler, gray_to_rgb, etc.).
+See png_read_update_info(), below.
+
+A quick word about text_ptr and num_text. PNG stores comments in
+keyword/text pairs, one pair per chunk, with no limit on the number
+of text chunks, and a 2^31 byte limit on their size. While there are
+suggested keywords, there is no requirement to restrict the use to these
+strings. It is strongly suggested that keywords and text be sensible
+to humans (that's the point), so don't use abbreviations. Non-printing
+symbols are not allowed. See the PNG specification for more details.
+There is also no requirement to have text after the keyword.
+
+Keywords should be limited to 79 Latin-1 characters without leading or
+trailing spaces, but non-consecutive spaces are allowed within the
+keyword. It is possible to have the same keyword any number of times.
+The text_ptr is an array of png_text structures, each holding pointer
+to a keyword and a pointer to a text string. Only the text string may
+be null. The keyword/text pairs are put into the array in the order
+that they are received. However, some or all of the text chunks may be
+after the image, so, to make sure you have read all the text chunks,
+don't mess with these until after you read the stuff after the image.
+This will be mentioned again below in the discussion that goes with
+png_read_end().
+
+After you've read the header information, you can set up the library
+to handle any special transformations of the image data. The various
+ways to transform the data will be described in the order that they
+should occur. This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths. Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data. For example, don't swap red and blue on grayscale data.
+
+The colors used for the background and transparency values should be
+supplied in the same format/depth as the current image data. They
+are stored in the same format/depth as the image data in a bKGD or tRNS
+chunk, so this is what libpng expects for this data. The colors are
+transformed to keep in sync with the image data when an application
+calls the png_read_update_info() routine (see below).
+
+Data will be decoded into the supplied row buffers packed into bytes
+unless the library has been told to transform it into another format.
+For example, 4 bit/pixel paletted or grayscale data will be returned
+2 pixels/byte with the leftmost pixel in the high-order bits of the
+byte, unless png_set_packing() is called. 8-bit RGB data will be stored
+in RGB RGB RGB format unless png_set_filler() is called to insert filler
+bytes, either before or after each RGB triplet. 16-bit RGB data will
+be returned RRGGBB RRGGBB, with the most significant byte of the color
+value first, unless png_set_strip_16() is called to transform it to
+regular RGB RGB triplets, or png_set_filler() is called to insert
+filler bytes, either before or after each RRGGBB triplet. Similarly,
+8-bit or 16-bit grayscale data can be modified with png_set_filler()
+or png_set_strip_16().
+
+The following code transforms grayscale images of less than 8 to 8 bits,
+changes paletted images to RGB, and adds a full alpha channel if there is
+transparency information in a tRNS chunk. This is most useful on
+grayscale images with bit depths of 2 or 4 or if there is a multiple-image
+viewing application that wishes to treat all images in the same way.
+
+ if (color_type == PNG_COLOR_TYPE_PALETTE &&
+ bit_depth <= 8) png_set_expand(png_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_GRAY &&
+ bit_depth < 8) png_set_expand(png_ptr);
+
+ if (png_get_valid(png_ptr, info_ptr,
+ PNG_INFO_tRNS)) png_set_expand(png_ptr);
+
+PNG can have files with 16 bits per channel. If you only can handle
+8 bits per channel, this will strip the pixels down to 8 bit.
+
+ if (bit_depth == 16)
+ png_set_strip_16(png_ptr);
+
+The png_set_background() function tells libpng to composite images
+with alpha or simple transparency against the supplied background
+color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),
+you may use this color, or supply another color more suitable for
+the current display (e.g., the background color from a web page). You
+need to tell libpng whether the color is in the gamma space of the
+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file
+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one
+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't
+know why anyone would use this, but it's here).
+
+If, for some reason, you don't need the alpha channel on an image,
+and you want to remove it rather than combining it with the background
+(but the image author certainly had in mind that you *would* combine
+it with the background, so that's what you should probably do):
+
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ png_set_strip_alpha(png_ptr);
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit
+files. This code expands to 1 pixel per byte without changing the
+values of the pixels:
+
+ if (bit_depth < 8)
+ png_set_packing(png_ptr);
+
+PNG files have possible bit depths of 1, 2, 4, 8, and 16. All pixels
+stored in a PNG image have been "scaled" or "shifted" up to the next
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+8 bits/sample in the range [0, 255]). However, it is also possible to
+convert the PNG pixel data back to the original bit depth of the image.
+This call reduces the pixels back down to the original bit depth:
+
+ png_color_16p sig_bit;
+
+ if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
+ png_set_shift(png_ptr, sig_bit);
+
+PNG files store 3-color pixels in red, green, blue order. This code
+changes the storage of the pixels to blue, green, red:
+
+ if (color_type == PNG_COLOR_TYPE_RGB ||
+ color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_bgr(png_ptr);
+
+PNG files store RGB pixels packed into 3 bytes. This code expands them
+into 4 bytes for windowing systems that need them in this format:
+
+ if (bit_depth == 8 && color_type ==
+ PNG_COLOR_TYPE_RGB) png_set_filler(png_ptr,
+ filler, PNG_FILLER_BEFORE);
+
+where "filler" is the 8 or 16-bit number to fill with, and the location is
+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether
+you want the filler before the RGB or after. This transformation
+does not affect images that already have full alpha channels.
+
+If you are reading an image with an alpha channel, and you need the
+data as ARGB instead of the normal PNG format RGBA:
+
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_swap_alpha(png_ptr);
+
+For some uses, you may want a grayscale image to be represented as
+RGB. This code will do that conversion:
+
+ if (color_type == PNG_COLOR_TYPE_GRAY ||
+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ png_set_gray_to_rgb(png_ptr);
+
+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale
+with alpha. This is intended for conversion of images that really are
+gray (red == green == blue), so the function simply strips out the red
+and blue channels, leaving the green channel in the gray position.
+
+ if (color_type == PNG_COLOR_TYPE_RGB ||
+ color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_rgb_to_gray(png_ptr, error_action,
+ float red_weight, float green_weight);
+
+ error_action = 1: silently do the conversion
+ error_action = 2: issue a warning if the original
+ image has any pixel where
+ red != green or red != blue
+ error_action = 3: issue an error and abort the
+ conversion if the original
+ image has any pixel where
+ red != green or red != blue
+
+ red_weight: weight of red component
+ (NULL -> default 54/256)
+ green_weight: weight of green component
+ (NULL -> default 183/256)
+
+If you have set error_action = 1 or 2, you can
+later check whether the image really was gray, after processing
+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.
+It will return a png_byte that is zero if the image was gray or
+1 if there were any non-gray pixels. bKGD and sBIT data
+will be silently converted to grayscale, using the green channel
+data, regardless of the error_action setting.
+
+With 0.0<=red_weight+green_weight<=1.0,
+the normalized graylevel is computed:
+
+ int rw = red_weight * 256;
+ int gw = green_weight * 256;
+ int bw = 256 - (rw + gw);
+ gray = (rw*red + gw*green + bw*blue)/256;
+
+The default values approximate those recommended in the Charles
+Poynton's Color FAQ, <http://www.inforamp.net/~poynton/>
+Copyright (c) 1998-01-04 Charles Poynton poynton at inforamp.net
+
+ Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+
+Libpng approximates this with
+
+ Y = 0.211 * R + 0.715 * G + 0.074 * B
+
+which can be expressed with integers as
+
+ Y = (54 * R + 183 * G + 19 * B)/256
+
+The calculation is done in a linear colorspace, if the image gamma
+is known.
+
+If you have a grayscale and you are using png_set_expand() to change to
+a higher bit-depth, you must either supply the background color as a gray
+value at the original file bit-depth (need_expand = 1) or else supply the
+background color as an RGB triplet at the final, expanded bit depth
+(need_expand = 0). Similarly, if you are reading a paletted image, you
+must either supply the background color as a palette index (need_expand = 1)
+or as an RGB triplet that may or may not be in the palette (need_expand = 0).
+
+ png_color_16 my_background;
+ png_color_16p image_background;
+
+ if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+ png_set_background(png_ptr, image_background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ else
+ png_set_background(png_ptr, &my_background,
+ PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+To properly display PNG images on any kind of system, the application needs
+to know what the display gamma is. Ideally, the user will know this, and
+the application will allow them to set it. One method of allowing the user
+to set the display gamma separately for each system is to check for the
+DISPLAY_GAMMA and VIEWING_GAMMA environment variables or for a SCREEN_GAMMA
+environment variable, which will hopefully be correctly set.
+
+Note that display_gamma is the gamma of your display, while screen_gamma is
+the overall gamma correction required to produce pleasing results,
+which depends on the lighting conditions in the surrounding environment.
+Screen_gamma is display_gamma/viewing_gamma, where viewing_gamma is
+the amount of additional gamma correction needed to compensate for
+a (viewing_gamma=1.25) environment. In a dim or brightly lit room, no
+compensation other than the display_gamma is needed (viewing_gamma=1.0).
+
+ if (/* We have a user-defined screen
+ gamma value */)
+ {
+ screen_gamma = user_defined_screen_gamma;
+ }
+ /* One way that applications can share the same
+ screen gamma value */
+ else if ((gamma_str = getenv("SCREEN_GAMMA"))
+ != NULL)
+ {
+ screen_gamma = atof(gamma_str);
+ }
+ /* If we don't have another value */
+ else
+ {
+ screen_gamma = 2.2; /* A good guess for a
+ PC monitor in a bright office or a dim room */
+ screen_gamma = 2.0; /* A good guess for a
+ PC monitor in a dark room */
+ screen_gamma = 1.7 or 1.0; /* A good
+ guess for Mac systems */
+ }
+
+The png_set_gamma() function handles gamma transformations of the data.
+Pass both the file gamma and the current screen_gamma. If the file does
+not have a gamma value, you can pass one anyway if you have an idea what
+it is (usually 0.45455 is a good guess for GIF images on PCs). Note
+that file gammas are inverted from screen gammas. See the discussions
+on gamma in the PNG specification for an excellent description of what
+gamma is, and why all applications should support it. It is strongly
+recommended that PNG viewers support gamma correction.
+
+ if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+ png_set_gamma(png_ptr, screen_gamma, gamma);
+ else
+ png_set_gamma(png_ptr, screen_gamma, 0.45455);
+
+If you need to reduce an RGB file to a paletted file, or if a paletted
+file has more entries then will fit on your screen, png_set_dither()
+will do that. Note that this is a simple match dither that merely
+finds the closest color available. This should work fairly well with
+optimized palettes, and fairly badly with linear color cubes. If you
+pass a palette that is larger then maximum_colors, the file will
+reduce the number of colors in the palette so it will fit into
+maximum_colors. If there is a histogram, it will use it to make
+more intelligent choices when reducing the palette. If there is no
+histogram, it may not do as good a job.
+
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ if (png_get_valid(png_ptr, info_ptr,
+ PNG_INFO_PLTE))
+ {
+ png_color_16p histogram;
+
+ png_get_hIST(png_ptr, info_ptr,
+ &histogram);
+ png_set_dither(png_ptr, palette, num_palette,
+ max_screen_colors, histogram, 1);
+ }
+ else
+ {
+ png_color std_color_cube[MAX_SCREEN_COLORS] =
+ { ... colors ... };
+
+ png_set_dither(png_ptr, std_color_cube,
+ MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
+ NULL,0);
+ }
+ }
+
+PNG files describe monochrome as black being zero and white being one.
+The following code will reverse this (make black be one and white be
+zero):
+
+ if (bit_depth == 1 && color_type == PNG_COLOR_GRAY)
+ png_set_invert_mono(png_ptr);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first). This code changes the storage to the
+other way (little-endian, i.e. least significant bits first, the
+way PCs store them):
+
+ if (bit_depth == 16)
+ png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+ if (bit_depth < 8)
+ png_set_packswap(png_ptr);
+
+The last thing to handle is interlacing; this is covered in detail below,
+but you must call the function here if you want libpng to handle expansion
+of the interlaced image.
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+
+After setting the transformations, libpng can update your png_info
+structure to reflect any transformations you've requested with this
+call. This is most useful to update the info structure's rowbytes
+field so you can use it to allocate your image memory. This function
+will also update your palette with the correct screen_gamma and
+background if these have been given with the calls above.
+
+ png_read_update_info(png_ptr, info_ptr);
+
+After you call png_read_update_info(), you can allocate any
+memory you need to hold the image. The row data is simply
+raw byte data for all forms of images. As the actual allocation
+varies among applications, no example will be given. If you
+are allocating one large chunk, you will need to build an
+array of pointers to each row, as it will be needed for some
+of the functions below.
+
+After you've allocated memory, you can read the image data.
+The simplest way to do this is in one function call. If you are
+allocating enough memory to hold the whole image, you can just
+call png_read_image() and libpng will read in all the image data
+and put it in the memory area supplied. You will need to pass in
+an array of pointers to each row.
+
+This function automatically handles interlacing, so you don't need
+to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_read_rows().
+
+ png_read_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+ png_bytep row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to read in the whole image at once, you can
+use png_read_rows() instead. If there is no interlacing (check
+interlace_type == PNG_INTERLACE_NONE), this is simple:
+
+ png_read_rows(png_ptr, row_pointers, NULL,
+ number_of_rows);
+
+where row_pointers is the same as in the png_read_image() call.
+
+If you are doing this just one row at a time, you can do this with
+row_pointers:
+
+ png_bytep row_pointers = row;
+ png_read_row(png_ptr, &row_pointers, NULL);
+
+If the file is interlaced (info_ptr->interlace_type != 0), things get
+somewhat harder. The only current (PNG Specification version 1.0)
+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)
+is a somewhat complicated 2D interlace scheme, known as Adam7, that
+breaks down an image into seven smaller images of varying size, based
+on an 8x8 grid.
+
+libpng can fill out those images or it can give them to you "as is".
+If you want them filled out, there are two ways to do that. The one
+mentioned in the PNG specification is to expand each pixel to cover
+those pixels that have not been read yet (the "rectangle" method).
+This results in a blocky image for the first pass, which gradually
+smooths out as more pixels are read. The other method is the "sparkle"
+method, where pixels are drawn only in their final locations, with the
+rest of the image remaining whatever colors they were initialized to
+before the start of the read. The first method usually looks better,
+but tends to be slower, as there are more pixels to put in the rows.
+
+If you don't want libpng to handle the interlacing details, just call
+png_read_rows() seven times to read in all seven images. Each of the
+images is a valid image by itself, or they can all be combined on an
+8x8 grid to form a single image (although if you intend to combine them
+you would be far better off using the libpng interlace handling).
+
+The first pass will return an image 1/8 as wide as the entire image
+(every 8th column starting in column 0) and 1/8 as high as the original
+(every 8th row starting in row 0), the second will be 1/8 as wide
+(starting in column 4) and 1/8 as high (also starting in row 0). The
+third pass will be 1/4 as wide (every 4th pixel starting in column 0) and
+1/8 as high (every 8th row starting in row 4), and the fourth pass will
+be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,
+and every 4th row starting in row 0). The fifth pass will return an
+image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),
+while the sixth pass will be 1/2 as wide and 1/2 as high as the original
+(starting in column 1 and row 0). The seventh and final pass will be as
+wide as the original, and 1/2 as high, containing all of the odd
+numbered scanlines. Phew!
+
+If you want libpng to expand the images, call this before calling
+png_start_read_image() or png_read_update_info():
+
+ if (interlace_type == PNG_INTERLACE_ADAM7)
+ number_of_passes
+ = png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed. Currently, this
+is seven, but may change if another interlace type is added.
+This function can be called even if the file is not interlaced,
+where it will return one pass.
+
+If you are not going to display the image after each pass, but are
+going to wait until the entire image is read in, use the sparkle
+effect. This effect is faster and the end result of either method
+is exactly the same. If you are planning on displaying the image
+after each pass, the "rectangle" effect is generally considered the
+better looking one.
+
+If you only want the "sparkle" effect, just call png_read_rows() as
+normal, with the third parameter NULL. Make sure you make pass over
+the image number_of_passes times, and you don't change the data in the
+rows between calls. You can change the locations of the data, just
+not the data. Each pass only writes the pixels appropriate for that
+pass, and assumes the data from previous passes is still valid.
+
+ png_read_rows(png_ptr, row_pointers, NULL,
+ number_of_rows);
+
+If you only want the first effect (the rectangles), do the same as
+before except pass the row buffer in the third parameter, and leave
+the second parameter NULL.
+
+ png_read_rows(png_ptr, NULL, row_pointers,
+ number_of_rows);
+
+After you are finished reading the image, you can finish reading
+the file. If you are interested in comments or time, which may be
+stored either before or after the image data, you should pass the
+separate png_info struct if you want to keep the comments from
+before and after the image separate. If you are not interested, you
+can pass NULL.
+
+ png_read_end(png_ptr, end_info);
+
+When you are done, you can free all memory allocated by libpng like this:
+
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ &end_info);
+
+For a more compact example of reading a PNG image, see the file example.c.
+
+
+Reading PNG files progressively:
+
+The progressive reader is slightly different then the non-progressive
+reader. Instead of calling png_read_info(), png_read_rows(), and
+png_read_end(), you make one call to png_process_data(), which calls
+callbacks when it has the info, a row, or the end of the image. You
+set up these callbacks with png_set_progressive_read_fn(). You don't
+have to worry about the input/output functions of libpng, as you are
+giving the library the data directly in png_process_data(). I will
+assume that you have read the section on reading PNG files above,
+so I will only highlight the differences (although I will show
+all of the code).
+
+png_structp png_ptr;
+png_infop info_ptr;
+
+ /* An example code fragment of how you would
+ initialize the progressive reader in your
+ application. */
+ int
+ initialize_png_reader()
+ {
+ png_ptr = png_create_read_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return -1;
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ /* This one's new. You can provide functions
+ to be called when the header info is valid,
+ when each row is completed, and when the image
+ is finished. If you aren't using all functions,
+ you can specify NULL parameters. Even when all
+ three functions are NULL, you need to call
+ png_set_progressive_read_fn(). You can use
+ any struct as the user_ptr (cast to a void pointer
+ for the function call), and retrieve the pointer
+ from inside the callbacks using the function
+
+ png_get_progressive_ptr(png_ptr);
+
+ which will return a void pointer, which you have
+ to cast appropriately.
+ */
+ png_set_progressive_read_fn(png_ptr, (void *)user_ptr,
+ info_callback, row_callback, end_callback);
+
+ return 0;
+ }
+
+ /* A code fragment that you call as you receive blocks
+ of data */
+ int
+ process_data(png_bytep buffer, png_uint_32 length)
+ {
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ /* This one's new also. Simply give it a chunk
+ of data from the file stream (in order, of
+ course). On machines with segmented memory
+ models machines, don't give it any more than
+ 64K. The library seems to run fine with sizes
+ of 4K. Although you can give it much less if
+ necessary (I assume you can give it chunks of
+ 1 byte, I haven't tried less then 256 bytes
+ yet). When this function returns, you may
+ want to display any rows that were generated
+ in the row callback if you don't already do
+ so there.
+ */
+ png_process_data(png_ptr, info_ptr, buffer, length);
+ return 0;
+ }
+
+ /* This function is called (as set by
+ png_set_progressive_read_fn() above) when enough data
+ has been supplied so all of the header has been
+ read.
+ */
+ void
+ info_callback(png_structp png_ptr, png_infop info)
+ {
+ /* Do any setup here, including setting any of
+ the transformations mentioned in the Reading
+ PNG files section. For now, you _must_ call
+ either png_start_read_image() or
+ png_read_update_info() after all the
+ transformations are set (even if you don't set
+ any). You may start getting rows before
+ png_process_data() returns, so this is your
+ last chance to prepare for that.
+ */
+ }
+
+ /* This function is called when each row of image
+ data is complete */
+ void
+ row_callback(png_structp png_ptr, png_bytep new_row,
+ png_uint_32 row_num, int pass)
+ {
+ /* If the image is interlaced, and you turned
+ on the interlace handler, this function will
+ be called for every row in every pass. Some
+ of these rows will not be changed from the
+ previous pass. When the row is not changed,
+ the new_row variable will be NULL. The rows
+ and passes are called in order, so you don't
+ really need the row_num and pass, but I'm
+ supplying them because it may make your life
+ easier.
+
+ For the non-NULL rows of interlaced images,
+ you must call png_progressive_combine_row()
+ passing in the row and the old row. You can
+ call this function for NULL rows (it will just
+ return) and for non-interlaced images (it just
+ does the memcpy for you) if it will make the
+ code easier. Thus, you can just do this for
+ all cases:
+ */
+
+ png_progressive_combine_row(png_ptr, old_row,
+ new_row);
+
+ /* where old_row is what was displayed for
+ previously for the row. Note that the first
+ pass (pass == 0, really) will completely cover
+ the old row, so the rows do not have to be
+ initialized. After the first pass (and only
+ for interlaced images), you will have to pass
+ the current row, and the function will combine
+ the old row and the new row.
+ */
+ }
+
+ void
+ end_callback(png_structp png_ptr, png_infop info)
+ {
+ /* This function is called after the whole image
+ has been read, including any chunks after the
+ image (up to and including the IEND). You
+ will usually have the same info chunk as you
+ had in the header, although some data may have
+ been added to the comments and time fields.
+
+ Most people won't do much here, perhaps setting
+ a flag that marks the image as finished.
+ */
+ }
+
+
+
+IV. Writing
+
+Much of this is very similar to reading. However, everything of
+importance is repeated here, so you won't have to constantly look
+back up in the reading section to understand writing.
+
+You will want to do the I/O initialization before you get into libpng,
+so if it doesn't work, you don't have anything to undo. If you are not
+using the standard I/O functions, you will need to replace them with
+custom writing functions. See the discussion under Customizing libpng.
+
+ FILE *fp = fopen(file_name, "wb");
+ if (!fp)
+ {
+ return;
+ }
+
+Next, png_struct and png_info need to be allocated and initialized.
+As these can be both relatively large, you may not want to store these
+on the stack, unless you have stack space to spare. Of course, you
+will want to check if they return NULL. If you are also reading,
+you won't want to name your read structure and your write structure
+both "png_ptr"; you can call them anything you like, such as
+"read_ptr" and "write_ptr". Look at pngtest.c, for example.
+
+ png_structp png_ptr = png_create_write_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return;
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_write_struct(&png_ptr,
+ (png_infopp)NULL);
+ return;
+ }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_write_struct_2() instead of png_create_read_struct():
+
+ png_structp png_ptr = png_create_write_struct_2
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn, (png_voidp)
+ user_mem_ptr, user_malloc_fn, user_free_fn);
+
+After you have these structures, you will need to set up the
+error handling. When libpng encounters an error, it expects to
+longjmp() back to your routine. Therefore, you will need to call
+setjmp() and pass the png_ptr->jmpbuf. If you
+write the file from different routines, you will need to update
+the jmpbuf field every time you enter a new routine that will
+call a png_ function. See your documentation of setjmp/longjmp
+for your compiler for more information on setjmp/longjmp. See
+the discussion on libpng error handling in the Customizing Libpng
+section below for more information on the libpng error handling.
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return;
+ }
+ ...
+ return;
+
+Now you need to set up the output code. The default for libpng is to
+use the C function fwrite(). If you use this, you will need to pass a
+valid FILE * in the function png_init_io(). Be sure that the file is
+opened in binary mode. Again, if you wish to handle writing data in
+another way, see the discussion on libpng I/O handling in the Customizing
+Libpng section below.
+
+ png_init_io(png_ptr, fp);
+
+At this point, you can set up a callback function that will be
+called after each row has been written, which you can use to control
+a progress meter or the like. It's demonstrated in pngtest.c.
+You must supply a function
+
+ void write_row_callback(png_ptr, png_uint_32 row, int pass);
+ {
+ /* put your code here */
+ }
+
+(You can give it another name that you like instead of "write_row_callback")
+
+To inform libpng about your function, use
+
+ png_set_write_status_fn(png_ptr, write_row_callback);
+
+You now have the option of modifying how the compression library will
+run. The following functions are mainly for testing, but may be useful
+in some cases, like if you need to write PNG files extremely fast and
+are willing to give up some compression, or if you want to get the
+maximum possible compression at the expense of slower writing. If you
+have no special needs in this area, let the library do what it wants by
+not calling this function at all, as it has been tuned to deliver a good
+speed/compression ratio. The second parameter to png_set_filter() is
+the filter method, for which the only valid value is '0' (as of the
+October 1996 PNG specification, version 1.0). The third parameter is a
+flag that indicates which filter type(s) are to be tested for each
+scanline. See the Compression Library for details on the specific filter
+types.
+
+
+ /* turn on or off filtering, and/or choose
+ specific filters */
+ png_set_filter(png_ptr, 0,
+ PNG_FILTER_NONE | PNG_FILTER_SUB |
+ PNG_FILTER_PAETH);
+
+The png_set_compression_???() functions interface to the zlib compression
+library, and should mostly be ignored unless you really know what you are
+doing. The only generally useful call is png_set_compression_level()
+which changes how much time zlib spends on trying to compress the image
+data. See the Compression Library for details on the compression levels.
+
+ /* set the zlib compression level */
+ png_set_compression_level(png_ptr,
+ Z_BEST_COMPRESSION);
+
+ /* set other zlib parameters */
+ png_set_compression_mem_level(png_ptr, 8);
+ png_set_compression_strategy(png_ptr,
+ Z_DEFAULT_STRATEGY);
+ png_set_compression_window_bits(png_ptr, 15);
+ png_set_compression_method(png_ptr, 8);
+
+You now need to fill in the png_info structure with all the data you
+wish to write before the actual image. Note that the only thing you
+are allowed to write after the image is the text chunks and the time
+chunk (as of PNG Specification 1.0, anyway). See png_write_end() and
+the latest PNG specification for more information on that. If you
+wish to write them before the image, fill them in now, and flag that
+data as being valid. If you want to wait until after the data, don't
+fill them until png_write_end(). For all the fields in png_info and
+their data types, see png.h. For explanations of what the fields
+contain, see the PNG specification.
+
+Some of the more important parts of the png_info are:
+
+ png_set_IHDR(png_ptr, info_ptr, width, height,
+ bit_depth, color_type, interlace_type,
+ compression_type, filter_type)
+ width - holds the width of the image
+ in pixels (up to 2^31).
+ height - holds the height of the image
+ in pixels (up to 2^31).
+ bit_depth - holds the bit depth of one of the
+ image channels.
+ (valid values are 1, 2, 4, 8, 16
+ and depend also on the
+ color_type. See also significant
+ bits (sBIT) below).
+ color_type - describes which color/alpha
+ channels are present.
+ PNG_COLOR_TYPE_GRAY
+ (bit depths 1, 2, 4, 8, 16)
+ PNG_COLOR_TYPE_GRAY_ALPHA
+ (bit depths 8, 16)
+ PNG_COLOR_TYPE_PALETTE
+ (bit depths 1, 2, 4, 8)
+ PNG_COLOR_TYPE_RGB
+ (bit_depths 8, 16)
+ PNG_COLOR_TYPE_RGB_ALPHA
+ (bit_depths 8, 16)
+
+ PNG_COLOR_MASK_PALETTE
+ PNG_COLOR_MASK_COLOR
+ PNG_COLOR_MASK_ALPHA
+
+ interlace_type - PNG_INTERLACE_NONE or
+ PNG_INTERLACE_ADAM7
+ compression_type - (must be
+ PNG_COMPRESSION_TYPE_DEFAULT)
+ filter_type - (must be PNG_FILTER_TYPE_DEFAULT)
+
+ png_set_PLTE(png_ptr, info_ptr, palette,
+ num_palette);
+ palette - the palette for the file
+ (array of png_color)
+ num_palette - number of entries in the palette
+
+ png_set_gAMA(png_ptr, info_ptr, gamma);
+ gamma - the gamma the image was created
+ at (PNG_INFO_gAMA)
+
+ png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+ srgb_intent - the rendering intent
+ (PNG_INFO_sRGB) The presence of
+ the sRGB chunk means that the pixel
+ data is in the sRGB color space.
+ This chunk also implies specific
+ values of gAMA and cHRM. Rendering
+ intent is the CSS-1 property that
+ has been defined by the International
+ Color Consortium
+ (http://www.color.org).
+ It can be one of
+ PNG_SRGB_INTENT_SATURATION,
+ PNG_SRGB_INTENT_PERCEPTUAL,
+ PNG_SRGB_INTENT_ABSOLUTE, or
+ PNG_SRGB_INTENT_RELATIVE.
+
+
+ png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ srgb_intent);
+ srgb_intent - the rendering intent
+ (PNG_INFO_sRGB) The presence of the
+ sRGB chunk means that the pixel
+ data is in the sRGB color space.
+ This function also causes gAMA and
+ cHRM chunks with the specific values
+ that are consistent with sRGB to be
+ written.
+
+ png_set_sBIT(png_ptr, info_ptr, sig_bit);
+ sig_bit - the number of significant bits for
+ (PNG_INFO_sBIT) each of the gray, red,
+ green, and blue channels, whichever are
+ appropriate for the given color type
+ (png_color_16)
+
+ png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+ trans_values);
+ trans - array of transparent entries for
+ palette (PNG_INFO_tRNS)
+ trans_values - transparent pixel for non-paletted
+ images (PNG_INFO_tRNS)
+ num_trans - number of transparent entries
+ (PNG_INFO_tRNS)
+
+ png_set_hIST(png_ptr, info_ptr, hist);
+ (PNG_INFO_hIST)
+ hist - histogram of palette (array of
+ png_color_16)
+
+ png_set_tIME(png_ptr, info_ptr, mod_time);
+ mod_time - time image was last modified
+ (PNG_VALID_tIME)
+
+ png_set_bKGD(png_ptr, info_ptr, background);
+ background - background color (PNG_VALID_bKGD)
+
+ png_set_text(png_ptr, info_ptr, text_ptr, num_text);
+ text_ptr - array of png_text holding image
+ comments
+ text_ptr[i]->key - keyword for comment.
+ text_ptr[i]->text - text comments for current
+ keyword.
+ text_ptr[i]->compression - type of compression used
+ on "text" PNG_TEXT_COMPRESSION_NONE or
+ PNG_TEXT_COMPRESSION_zTXt
+ num_text - number of comments in text_ptr
+
+ png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,
+ unit_type);
+ offset_x - positive offset from the left
+ edge of the screen
+ offset_y - positive offset from the top
+ edge of the screen
+ unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+ png_set_pHYs(png_ptr, info_ptr, res_x, res_y,
+ unit_type);
+ res_x - pixels/unit physical resolution
+ in x direction
+ res_y - pixels/unit physical resolution
+ in y direction
+ unit_type - PNG_RESOLUTION_UNKNOWN,
+ PNG_RESOLUTION_METER
+
+In PNG files, the alpha channel in an image is the level of opacity.
+If your data is supplied as a level of transparency, you can invert the
+alpha channel before you write it, so that 0 is fully transparent and 255
+(in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque,
+with
+
+ png_set_invert_alpha(png_ptr);
+
+This must appear here instead of later with the other transformations
+because in the case of paletted images the tRNS chunk data has to
+be inverted before the tRNS chunk is written. If your image is not a
+paletted image, the tRNS data (which in such cases represents a single
+color to be rendered as transparent) won't be changed.
+
+A quick word about text and num_text. text is an array of png_text
+structures. num_text is the number of valid structures in the array.
+If you want, you can use max_text to hold the size of the array, but
+libpng ignores it for writing (it does use it for reading). Each
+png_text structure holds a keyword-text value, and a compression type.
+The compression types have the same valid numbers as the compression
+types of the image data. Currently, the only valid number is zero.
+However, you can store text either compressed or uncompressed, unlike
+images, which always have to be compressed. So if you don't want the
+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.
+Until text gets around 1000 bytes, it is not worth compressing it.
+After the text has been written out to the file, the compression type
+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,
+so that it isn't written out again at the end (in case you are calling
+png_write_end() with the same struct.
+
+The keywords that are given in the PNG Specification are:
+
+ Title Short (one line) title or
+ caption for image
+ Author Name of image's creator
+ Description Description of image (possibly long)
+ Copyright Copyright notice
+ Creation Time Time of original image creation
+ (usually RFC 1123 format, see below)
+ Software Software used to create the image
+ Disclaimer Legal disclaimer
+ Warning Warning of nature of content
+ Source Device used to create the image
+ Comment Miscellaneous comment; conversion
+ from other image format
+
+The keyword-text pairs work like this. Keywords should be short
+simple descriptions of what the comment is about. Some typical
+keywords are found in the PNG specification, as is some recommendations
+on keywords. You can repeat keywords in a file. You can even write
+some text before the image and some after. For example, you may want
+to put a description of the image before the image, but leave the
+disclaimer until after, so viewers working over modem connections
+don't have to wait for the disclaimer to go over the modem before
+they start seeing the image. Finally, keywords should be full
+words, not abbreviations. Keywords and text are in the ISO 8859-1
+(Latin-1) character set (a superset of regular ASCII) and can not
+contain NUL characters, and should not contain control or other
+unprintable characters. To make the comments widely readable, stick
+with basic ASCII, and avoid machine specific character set extensions
+like the IBM-PC character set. The keyword must be present, but
+you can leave off the text string on non-compressed pairs.
+Compressed pairs must have a text string, as only the text string
+is compressed anyway, so the compression would be meaningless.
+
+PNG supports modification time via the png_time structure. Two
+conversion routines are proved, png_convert_from_time_t() for
+time_t and png_convert_from_struct_tm() for struct tm. The
+time_t routine uses gmtime(). You don't have to use either of
+these, but if you wish to fill in the png_time structure directly,
+you should provide the time in universal time (GMT) if possible
+instead of your local time. Note that the year number is the full
+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and
+that months start with 1.
+
+If you want to store the time of the original image creation, you should
+use a plain tEXt chunk with the "Creation Time" keyword. This is
+necessary because the "creation time" of a PNG image is somewhat vague,
+depending on whether you mean the PNG file, the time the image was
+created in a non-PNG format, a still photo from which the image was
+scanned, or possibly the subject matter itself. In order to facilitate
+machine-readable dates, it is recommended that the "Creation Time"
+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
+although this isn't a requirement. Unlike the tIME chunk, the
+"Creation Time" tEXt chunk is not expected to be automatically changed
+by the software. To facilitate the use of RFC 1123 dates, a function
+png_convert_to_rfc1123(png_timep) is provided to convert from PNG
+time to an RFC 1123 format string.
+
+You are now ready to write all the file information up to the actual
+image data. You do this with a call to png_write_info().
+
+ png_write_info(png_ptr, info_ptr);
+
+After you've written the file information, you can set up the library
+to handle any special transformations of the image data. The various
+ways to transform the data will be described in the order that they
+should occur. This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths. Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data. For example, don't swap red and blue on grayscale data.
+
+PNG files store RGB pixels packed into 3 or 6 bytes. This code tells
+the library to expand the input data to 4 or 8 bytes per pixel
+(or expand 1 or 2-byte grayscale data to 2 or 4 bytes per pixel).
+
+ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+where the 0 is the value that will be put in the 4th byte, and the
+location is either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending
+upon whether the filler byte is stored XRGB or RGBX.
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit files.
+If the data is supplied at 1 pixel per byte, use this code, which will
+correctly pack the pixels into a single byte:
+
+ png_set_packing(png_ptr);
+
+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16. If your
+data is of another bit depth, you can write an sBIT chunk into the
+file so that decoders can get the original data if desired.
+
+ /* Set the true bit depth of the image data */
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ sig_bit.red = true_bit_depth;
+ sig_bit.green = true_bit_depth;
+ sig_bit.blue = true_bit_depth;
+ }
+ else
+ {
+ sig_bit.gray = true_bit_depth;
+ }
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ sig_bit.alpha = true_bit_depth;
+ }
+
+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+If the data is stored in the row buffer in a bit depth other than
+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),
+this will scale the values to appear to be the correct bit depth as
+is required by PNG.
+
+ png_set_shift(png_ptr, &sig_bit);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first). This code would be used if they are
+supplied the other way (little-endian, i.e. least significant bits
+first, the way PCs store them):
+
+ if (bit_depth > 8)
+ png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+ if (bit_depth < 8)
+ png_set_packswap(png_ptr);
+
+PNG files store 3 color pixels in red, green, blue order. This code
+would be used if they are supplied as blue, green, red:
+
+ png_set_bgr(png_ptr);
+
+PNG files describe monochrome as black being zero and white being
+one. This code would be used if the pixels are supplied with this reversed
+(black being one and white being zero):
+
+ png_set_invert_mono(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs. This is done by setting a callback
+with
+
+ png_set_write_user_transform_fn(png_ptr,
+ write_transform_fn);
+
+You must supply the function
+
+ void write_transform_fn(png_ptr ptr, row_info_ptr
+ row_info, png_bytep data)
+
+See pngtest.c for a working example. Your function will be called
+before any of the other transformations have been processed.
+
+It is possible to have libpng flush any pending output, either manually,
+or automatically after a certain number of lines have been written. To
+flush the output stream a single time call:
+
+ png_write_flush(png_ptr);
+
+and to have libpng flush the output stream periodically after a certain
+number of scanlines have been written, call:
+
+ png_set_flush(png_ptr, nrows);
+
+Note that the distance between rows is from the last time png_write_flush()
+was called, or the first row of the image if it has never been called.
+So if you write 50 lines, and then png_set_flush 25, it will flush the
+output on the next scanline, and every 25 lines thereafter, unless
+png_write_flush() is called before 25 more lines have been written.
+If nrows is too small (less than about 10 lines for a 640 pixel wide
+RGB image) the image compression may decrease noticeably (although this
+may be acceptable for real-time applications). Infrequent flushing will
+only degrade the compression performance by a few percent over images
+that do not use flushing.
+
+That's it for the transformations. Now you can write the image data.
+The simplest way to do this is in one function call. If have the
+whole image in memory, you can just call png_write_image() and libpng
+will write the image. You will need to pass in an array of pointers to
+each row. This function automatically handles interlacing, so you don't
+need to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_write_rows().
+
+ png_write_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+ png_byte *row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to write the whole image at once, you can
+use png_write_rows() instead. If the file is not interlaced,
+this is simple:
+
+ png_write_rows(png_ptr, row_pointers,
+ number_of_rows);
+
+row_pointers is the same as in the png_write_image() call.
+
+If you are just writing one row at a time, you can do this with
+row_pointers:
+
+ png_bytep row_pointer = row;
+
+ png_write_row(png_ptr, &row_pointer);
+
+When the file is interlaced, things can get a good deal more
+complicated. The only currently (as of February 1998 -- PNG Specification
+version 1.0, dated October 1996) defined interlacing scheme for PNG files
+is the "Adam7" interlace scheme, that breaks down an
+image into seven smaller images of varying size. libpng will build
+these images for you, or you can do them yourself. If you want to
+build them yourself, see the PNG specification for details of which
+pixels to write when.
+
+If you don't want libpng to handle the interlacing details, just
+use png_set_interlace_handling() and call png_write_rows() the
+correct number of times to write all seven sub-images.
+
+If you want libpng to build the sub-images, call this before you start
+writing any rows:
+
+ number_of_passes =
+ png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed. Currently, this
+is seven, but may change if another interlace type is added.
+
+Then write the complete image number_of_passes times.
+
+ png_write_rows(png_ptr, row_pointers,
+ number_of_rows);
+
+As some of these rows are not used, and thus return immediately,
+you may want to read about interlacing in the PNG specification,
+and only update the rows that are actually used.
+
+After you are finished writing the image, you should finish writing
+the file. If you are interested in writing comments or time, you should
+pass an appropriately filled png_info pointer. If you are not interested,
+you can pass NULL.
+
+ png_write_end(png_ptr, info_ptr);
+
+When you are done, you can free all memory used by libpng like this:
+
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+
+You must free any data you allocated for info_ptr, such as comments,
+palette, or histogram, before the call to png_destroy_write_struct();
+
+For a more compact example of writing a PNG image, see the file example.c.
+
+
+V. Modifying/Customizing libpng:
+
+There are two issues here. The first is changing how libpng does
+standard things like memory allocation, input/output, and error handling.
+The second deals with more complicated things like adding new chunks,
+adding new transformations, and generally changing how libpng works.
+
+All of the memory allocation, input/output, and error handling in libpng
+goes through callbacks that are user settable. The default routines are
+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c respectively. To change
+these functions, call the appropriate png_set_???_fn() function.
+
+Memory allocation is done through the functions png_large_malloc(),
+png_malloc(), png_realloc(), png_large_free(), and png_free(). These
+currently just call the standard C functions. The large functions must
+handle exactly 64K, but they don't have to handle more than that. If
+your pointers can't access more then 64K at a time, you will want to set
+MAXSEG_64K in zlib.h. Since it is unlikely that the method of handling
+memory allocation on a platform will change between applications, these
+functions must be modified in the library at compile time.
+
+Input/Output in libpng is done through png_read() and png_write(),
+which currently just call fread() and fwrite(). The FILE * is stored in
+png_struct and is initialized via png_init_io(). If you wish to change
+the method of I/O, the library supplies callbacks that you can set
+through the function png_set_read_fn() and png_set_write_fn() at run
+time, instead of calling the png_init_io() function. These functions
+also provide a void pointer that can be retrieved via the function
+png_get_io_ptr(). For example:
+
+ png_set_read_fn(png_structp read_ptr,
+ voidp read_io_ptr, png_rw_ptr read_data_fn)
+
+ png_set_write_fn(png_structp write_ptr,
+ voidp write_io_ptr, png_rw_ptr write_data_fn,
+ png_flush_ptr output_flush_fn);
+
+ voidp read_io_ptr = png_get_io_ptr(read_ptr);
+ voidp write_io_ptr = png_get_io_ptr(write_ptr);
+
+The replacement I/O functions should have prototypes as follows:
+
+ void user_read_data(png_structp png_ptr,
+ png_bytep data, png_uint_32 length);
+ void user_write_data(png_structp png_ptr,
+ png_bytep data, png_uint_32 length);
+ void user_flush_data(png_structp png_ptr);
+
+Supplying NULL for the read, write, or flush functions sets them back
+to using the default C stream functions. It is an error to read from
+a write stream, and vice versa.
+
+Error handling in libpng is done through png_error() and png_warning().
+Errors handled through png_error() are fatal, meaning that png_error()
+should never return to its caller. Currently, this is handled via
+setjmp() and longjmp(), but you could change this to do things like
+exit() if you should wish. On non-fatal errors, png_warning() is called
+to print a warning message, and then control returns to the calling code.
+By default png_error() and png_warning() print a message on stderr via
+fprintf() unless the library is compiled with PNG_NO_STDIO defined. If
+you wish to change the behavior of the error functions, you will need to
+set up your own message callbacks. These functions are normally supplied
+at the time that the png_struct is created. It is also possible to change
+these functions after png_create_???_struct() has been called by calling:
+
+ png_set_error_fn(png_structp png_ptr,
+ png_voidp error_ptr, png_error_ptr error_fn,
+ png_error_ptr warning_fn);
+
+ png_voidp error_ptr = png_get_error_ptr(png_ptr);
+
+If NULL is supplied for either error_fn or warning_fn, then the libpng
+default function will be used, calling fprintf() and/or longjmp() if a
+problem is encountered. The replacement error functions should have
+parameters as follows:
+
+ void user_error_fn(png_structp png_ptr,
+ png_const_charp error_msg);
+ void user_warning_fn(png_structp png_ptr,
+ png_const_charp warning_msg);
+
+The motivation behind using setjmp() and longjmp() is the C++ throw and
+catch exception handling methods. This makes the code much easier to write,
+as there is no need to check every return code of every function call.
+However, there are some uncertainties about the status of local variables
+after a longjmp, so the user may want to be careful about doing anything after
+setjmp returns non-zero besides returning itself. Consult your compiler
+documentation for more details.
+
+If you need to read or write custom chunks, you will need to get deeper
+into the libpng code, as a mechanism has not yet been supplied for user
+callbacks with custom chunks. First, read the PNG specification, and have
+a first level of understanding of how it works. Pay particular attention
+to the sections that describe chunk names, and look at how other chunks
+were designed, so you can do things similarly. Second, check out the
+sections of libpng that read and write chunks. Try to find a chunk that
+is similar to yours and copy off of it. More details can be found in the
+comments inside the code. A way of handling unknown chunks in a generic
+method, potentially via callback functions, would be best.
+
+If you wish to write your own transformation for the data, look through
+the part of the code that does the transformations, and check out some of
+the simpler ones to get an idea of how they work. Try to find a similar
+transformation to the one you want to add and copy off of it. More details
+can be found in the comments inside the code itself.
+
+Configuring for 16 bit platforms:
+
+You may need to change the png_large_malloc() and png_large_free()
+routines in pngmem.c, as these are required to allocate 64K, although
+there is already support for many of the common DOS compilers. Also,
+you will want to look into zconf.h to tell zlib (and thus libpng) that
+it cannot allocate more then 64K at a time. Even if you can, the memory
+won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K.
+
+Configuring for DOS:
+
+For DOS users who only have access to the lower 640K, you will
+have to limit zlib's memory usage via a png_set_compression_mem_level()
+call. See zlib.h or zconf.h in the zlib library for more information.
+
+Configuring for Medium Model:
+
+Libpng's support for medium model has been tested on most of the popular
+compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set. Everything in the library (except for zlib's structure) is
+expecting far data. You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful). Make
+note that the row's of data are defined as png_bytepp, which is an
+unsigned char far * far *.
+
+Configuring for gui/windowing platforms:
+
+You will need to write new error and warning functions that use the GUI
+interface, as described previously, and set them to be the error and
+warning functions at the time that png_create_???_struct() is called,
+in order to have them available during the structure initialization.
+They can be changed later via png_set_error_fn(). On some compilers,
+you may also have to change the memory allocators (png_malloc, etc.).
+
+Configuring for compiler xxx:
+
+All includes for libpng are in pngconf.h. If you need to add/change/delete
+an include, this is the place to do it. The includes that are not
+needed outside libpng are protected by the PNG_INTERNAL definition,
+which is only defined for those routines inside libpng itself. The
+files in libpng proper only include png.h, which includes pngconf.h.
+
+Configuring zlib:
+
+There are special functions to configure the compression. Perhaps the
+most useful one changes the compression level, which currently uses
+input compression values in the range 0 - 9. The library normally
+uses the default compression level (Z_DEFAULT_COMPRESSION = 6). Tests
+have shown that for a large majority of images, compression values in
+the range 3-6 compress nearly as well as higher levels, and do so much
+faster. For online applications it may be desirable to have maximum speed
+(Z_BEST_SPEED = 1). With versions of zlib after v0.99, you can also
+specify no compression (Z_NO_COMPRESSION = 0), but this would create
+files larger than just storing the raw bitmap. You can specify the
+compression level by calling:
+
+ png_set_compression_level(png_ptr, level);
+
+Another useful one is to reduce the memory level used by the library.
+The memory level defaults to 8, but it can be lowered if you are
+short on memory (running DOS, for example, where you only have 640K).
+
+ png_set_compression_mem_level(png_ptr, level);
+
+The other functions are for configuring zlib. They are not recommended
+for normal use and may result in writing an invalid PNG file. See
+zlib.h for more information on what these mean.
+
+ png_set_compression_strategy(png_ptr,
+ strategy);
+ png_set_compression_window_bits(png_ptr,
+ window_bits);
+ png_set_compression_method(png_ptr, method);
+
+Controlling row filtering:
+
+If you want to control whether libpng uses filtering or not, which
+filters are used, and how it goes about picking row filters, you
+can call one of these functions. The selection and configuration
+of row filters can have a significant impact on the size and
+encoding speed and a somewhat lesser impact on the decoding speed
+of an image. Filtering is enabled by default for RGB and grayscale
+images (with and without alpha), but not for paletted images nor
+for any images with bit depths less than 8 bits/pixel.
+
+The 'method' parameter sets the main filtering method, which is
+currently only '0' in the PNG 1.0 specification. The 'filters'
+parameter sets which filter(s), if any, should be used for each
+scanline. Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
+to turn filtering on and off, respectively.
+
+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
+ORed together '|' to specify one or more filters to use. These
+filters are described in more detail in the PNG specification. If
+you intend to change the filter type during the course of writing
+the image, you should start with flags set for all of the filters
+you intend to use so that libpng can initialize its internal
+structures appropriately for all of the filter types.
+
+ filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+ | PNG_FILTER_UP;
+ png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
+ filters);
+
+It is also possible to influence how libpng chooses from among the
+available filters. This is done in two ways - by telling it how
+important it is to keep the same filter for successive rows, and
+by telling it the relative computational costs of the filters.
+
+ double weights[3] = {1.5, 1.3, 1.1},
+ costs[PNG_FILTER_VALUE_LAST] =
+ {1.0, 1.3, 1.3, 1.5, 1.7};
+
+ png_set_filter_selection(png_ptr,
+ PNG_FILTER_SELECTION_WEIGHTED, 3,
+ weights, costs);
+
+The weights are multiplying factors that indicate to libpng that the
+row filter should be the same for successive rows unless another row filter
+is that many times better than the previous filter. In the above example,
+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a
+"sum of absolute differences" 1.5 x 1.3 times higher than other filters
+and still be chosen, while the NONE filter could have a sum 1.1 times
+higher than other filters and still be chosen. Unspecified weights are
+taken to be 1.0, and the specified weights should probably be declining
+like those above in order to emphasize recent filters over older filters.
+
+The filter costs specify for each filter type a relative decoding cost
+to be considered when selecting row filters. This means that filters
+with higher costs are less likely to be chosen over filters with lower
+costs, unless their "sum of absolute differences" is that much smaller.
+The costs do not necessarily reflect the exact computational speeds of
+the various filters, since this would unduly influence the final image
+size.
+
+Note that the numbers above were invented purely for this example and
+are given only to help explain the function usage. Little testing has
+been done to find optimum values for either the costs or the weights.
+
+Removing unwanted object code:
+
+There are a bunch of #define's in pngconf.h that control what parts of
+libpng are compiled. All the defines end in _SUPPORTED. If you are
+never going to use a capability, you can change the #define to #undef
+before recompiling libpng and save yourself code and data space, or
+you can turn off individual capabilities with defines that begin with
+PNG_NO_.
+
+You can also turn all of the transforms and ancillary chunk capabilities
+off en masse with compiler directives that define
+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
+or all four,
+along with directives to turn on any of the capabilities that you do
+want. The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+the extra transformations but still leave the library fully capable of reading
+and writing PNG files with all known public chunks [except for sPLT].
+Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+produces a library that is incapable of reading or writing ancillary chunks.
+If you are not using the progressive reading capability, you can
+turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+this with the INTERLACING capability, which you'll still have).
+
+All the reading and writing specific code are in separate files, so the
+linker should only grab the files it needs. However, if you want to
+make sure, or if you are building a stand alone library, all the
+reading files start with pngr and all the writing files start with
+pngw. The files that don't match either (like png.c, pngtrans.c, etc.)
+are used for both reading and writing, and always need to be included.
+The progressive reader is in pngpread.c
+
+If you are creating or distributing a dynamically linked library (a .so
+or DLL file), you should not remove or disable any parts of the library,
+as this will cause applications linked with different versions of the
+library to fail if they call functions not available in your library.
+The size of the library itself should not be an issue, because only
+those sections that are actually used will be loaded into memory.
+
+Requesting debug printout:
+
+The macro definition PNG_DEBUG can be used to request debugging
+printout. Set it to an integer value in the range 0 to 3. Higher
+numbers result in increasing amounts of debugging information. The
+information is printed to the "stderr" file, unless another file
+name is specified in the PNG_DEBUG_FILE macro definition.
+
+When PNG_DEBUG > 0, the following functions (macros) become available:
+
+ png_debug(level, message)
+ png_debug1(level, message, p1)
+ png_debug2(level, message, p1, p2)
+
+in which "level" is compared to PNG_DEBUG to decide whether to print
+the message, "message" is the formatted string to be printed,
+and p1 and p2 are parameters that are to be embedded in the string
+according to printf-style formatting directives. For example,
+
+ png_debug1(2, "foo=%d\n", foo);
+
+is expanded to
+
+ if(PNG_DEBUG > 2)
+ fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+
+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
+can still use PNG_DEBUG to control your own debugging:
+
+ #ifdef PNG_DEBUG
+ fprintf(stderr, ...
+ #endif
+
+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements
+having level = 0 will be printed. There aren't any such statements in
+this version of libpng, but if you insert some they will be printed.
+
+VI. Changes to Libpng from version 0.88
+
+It should be noted that versions of libpng later than 0.96 are not
+distributed by the original libpng author, Guy Schalnat, nor by
+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and
+distributed versions 0.89 through 0.96, but rather by another member
+of the original PNG Group, Glenn Randers-Pehrson. Guy and Andreas are
+still alive and well, but they have moved on to other things.
+
+The old libpng functions png_read_init(), png_write_init(),
+png_info_init(), png_read_destroy(), and png_write_destory() have been
+moved to PNG_INTERNAL in version 0.95 to discourage their use. The
+preferred method of creating and initializing the libpng structures is
+via the png_create_read_struct(), png_create_write_struct(), and
+png_create_info_struct() because they isolate the size of the structures
+from the application, allow version error checking, and also allow the
+use of custom error handling routines during the initialization, which
+the old functions do not. The functions png_read_destroy() and
+png_write_destroy() do not actually free the memory that libpng
+allocated for these structs, but just reset the data structures, so they
+can be used instead of png_destroy_read_struct() and
+png_destroy_write_struct() if you feel there is too much system overhead
+allocating and freeing the png_struct for each image read.
+
+Setting the error callbacks via png_set_message_fn() before
+png_read_init() as was suggested in libpng-0.88 is no longer supported
+because this caused applications that do not use custom error functions
+to fail if the png_ptr was not initialized to zero. It is still possible
+to set the error callbacks AFTER png_read_init(), or to change them with
+png_set_error_fn(), which is essentially the same function, but with a
+new name to force compilation errors with applications that try to use
+the old method.
+
+VII. Y2K Compliance in libpng
+
+January 13, 1999
+
+Since the PNG Development group is an ad-hoc body, we can't make
+an official declaration.
+
+This is your unofficial assurance that libpng from version 0.81 and
+upward are Y2K compliant. It is my belief that earlier versions were
+also Y2K compliant.
+
+Libpng only has three year fields. One is a 2-byte unsigned integer that
+will hold years up to 65535. The other two hold the date in text
+format, and will hold years up to 9999.
+
+The integer is
+ "png_uint_16 year" in png_time_struct.
+
+The strings are
+ "png_charp time_buffer" in png_struct and
+ "near_time_buffer", which is a local character string in png.c.
+
+There are seven time-related functions:
+
+ png_convert_to_rfc_1123() in png.c
+ (formerly png_convert_to_rfc_1152() in error)
+ png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ png_convert_from_time_t() in pngwrite.c
+ png_get_tIME() in pngget.c
+ png_handle_tIME() in pngrutil.c, called in pngread.c
+ png_set_tIME() in pngset.c
+ png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+All appear to handle dates properly in a Y2K environment. The
+png_convert_from_time_t() function calls gmtime() to convert from system
+clock time, which returns (year - 1900), which we properly convert to
+the full 4-digit year. There is a possibility that applications using
+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+function, or incorrectly passing only a 2-digit year instead of
+"year - 1900" into the png_convert_from_struct_tm() function, but this
+is not under our control. The libpng documentation has always stated
+that it works with 4-digit years, and the APIs have been documented as
+such.
+
+The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned
+integer to hold the year, and can hold years as large as 65535.
+
+
+ Glenn Randers-Pehrson
+ libpng maintainer
+ PNG Development Group
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/KNOWNBUG
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/KNOWNBUG (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/KNOWNBUG Sat Jul 13 19:23:16 2002
@@ -0,0 +1,32 @@
+
+Known bugs and suggested enhancements in libpng-1.0.3
+
+
+1. March 15, 1998 -- OPTIMIZATION -- Kevin Bracey
+
+ Loops need to be optimized everywhere
+
+ Make them count down instead of up -- Kevin Bracey
+
+ Optimizing compilers don't need this, and making
+ the change would be error prone -- Tom Lane, Glenn R-P
+
+ Question whether i-- or --i is better.
+
+ STATUS: Under investigation, postponed until after
+ libpng-1.0.3. About 160 loops will be turned around
+ in libpng-1.0.Nn, for testing.
+
+2. July 4, 1998 -- ENHANCEMENT -- Glenn R-P
+
+ libpng-1.0.2 and earlier transform colors to gamma=1.0 space for
+ merging with background, and then back to the image's gamma. The
+ bit_depth of the intermediate (gamma=1.0) representation is probably
+ not sufficient. In the typical gamma=1/2.2 situation, the linear
+ pixels need about 4 more bits than the gamma-encoded ones, to avoid
+ loss of precision. A similar situation exists with the rgb_to_gray
+ operation.
+
+ STATUS: under development.
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngread.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngread.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngread.c Sat Jul 13 19:23:16 2002
@@ -0,0 +1,885 @@
+
+/* pngread.c - read a PNG file
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file contains routines that an application calls directly to
+ * read a PNG file or stream.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Create a PNG structure for reading, and allocate any memory needed. */
+png_structp
+png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+ warn_fn, NULL, NULL, NULL));
+}
+
+/* Alternate create PNG structure for reading, and allocate any memory needed. */
+png_structp
+png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+ png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+ png_structp png_ptr;
+#ifdef USE_FAR_KEYWORD
+ jmp_buf jmpbuf;
+#endif
+ png_debug(1, "in png_create_read_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+ if ((png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+ (png_malloc_ptr)malloc_fn)) == NULL)
+#else
+ if ((png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG)) == NULL)
+#endif
+ {
+ return (png_structp)NULL;
+ }
+#ifdef USE_FAR_KEYWORD
+ if (setjmp(jmpbuf))
+#else
+ if (setjmp(png_ptr->jmpbuf))
+#endif
+ {
+ png_free(png_ptr, png_ptr->zbuf);
+ png_destroy_struct(png_ptr);
+ return (png_structp)NULL;
+ }
+#ifdef USE_FAR_KEYWORD
+ png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+ png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+ /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+ * we must recompile any applications that use any older library version.
+ * For versions after libpng 1.0, we will be compatible, so we need
+ * only check the first digit.
+ */
+ if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+ (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+ {
+ png_error(png_ptr,
+ "Incompatible libpng version in application and library");
+ }
+
+ /* initialize zbuf - compression buffer */
+ png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+ png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+ png_ptr->zstream.zalloc = png_zalloc;
+ png_ptr->zstream.zfree = png_zfree;
+ png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+ switch (inflateInit(&png_ptr->zstream))
+ {
+ case Z_OK: /* Do nothing */ break;
+ case Z_MEM_ERROR:
+ case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
+ case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error"); break;
+ default: png_error(png_ptr, "Unknown zlib error");
+ }
+
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+ png_set_read_fn(png_ptr, NULL, NULL);
+
+ return (png_ptr);
+}
+
+/* Initialize PNG structure for reading, and allocate any memory needed.
+ This interface is deprecated in favour of the png_create_read_struct(),
+ and it will eventually disappear. */
+void
+png_read_init(png_structp png_ptr)
+{
+ jmp_buf tmp_jmp; /* to save current jump buffer */
+
+ png_debug(1, "in png_read_init\n");
+ /* save jump buffer and error functions */
+ png_memcpy(tmp_jmp, png_ptr->jmpbuf, sizeof (jmp_buf));
+
+ /* reset all variables to 0 */
+ png_memset(png_ptr, 0, sizeof (png_struct));
+
+ /* restore jump buffer */
+ png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
+
+ /* initialize zbuf - compression buffer */
+ png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+ png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+ png_ptr->zstream.zalloc = png_zalloc;
+ png_ptr->zstream.zfree = png_zfree;
+ png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+ switch (inflateInit(&png_ptr->zstream))
+ {
+ case Z_OK: /* Do nothing */ break;
+ case Z_MEM_ERROR:
+ case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory"); break;
+ case Z_VERSION_ERROR: png_error(png_ptr, "zlib version"); break;
+ default: png_error(png_ptr, "Unknown zlib error");
+ }
+
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+ png_set_read_fn(png_ptr, NULL, NULL);
+}
+
+/* Read the information before the actual image data. This has been
+ * changed in v0.90 to allow reading a file that already has the magic
+ * bytes read from the stream. You can tell libpng how many bytes have
+ * been read from the beginning of the stream (up to the maximum of 8)
+ * via png_set_sig_bytes(), and we will only check the remaining bytes
+ * here. The application can then have access to the signature bytes we
+ * read if it is determined that this isn't a valid PNG file.
+ */
+void
+png_read_info(png_structp png_ptr, png_infop info_ptr)
+{
+ png_debug(1, "in png_read_info\n");
+ /* save jump buffer and error functions */
+ /* If we haven't checked all of the PNG signature bytes, do so now. */
+ if (png_ptr->sig_bytes < 8)
+ {
+ png_size_t num_checked = png_ptr->sig_bytes,
+ num_to_check = 8 - num_checked;
+
+ png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+ png_ptr->sig_bytes = 8;
+
+ if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+ {
+ if (num_checked < 4 &&
+ png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+ png_error(png_ptr, "Not a PNG file");
+ else
+ png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+ }
+ }
+
+ for(;;)
+ {
+ png_byte chunk_length[4];
+ png_uint_32 length;
+
+ png_read_data(png_ptr, chunk_length, 4);
+ length = png_get_uint_32(chunk_length);
+
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+ png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
+
+ /* This should be a binary subdivision search or a hash for
+ * matching the chunk name rather than a linear search.
+ */
+ if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+ png_handle_IHDR(png_ptr, info_ptr, length);
+ else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+ png_handle_PLTE(png_ptr, info_ptr, length);
+ else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+ png_handle_IEND(png_ptr, info_ptr, length);
+ else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ {
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before IDAT");
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+ !(png_ptr->mode & PNG_HAVE_PLTE))
+ png_error(png_ptr, "Missing PLTE before IDAT");
+
+ png_ptr->idat_size = length;
+ png_ptr->mode |= PNG_HAVE_IDAT;
+ break;
+ }
+#if defined(PNG_READ_bKGD_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+ png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+ png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+ png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+ png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+ png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+ png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+ png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+ png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+ png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+ png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+ png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+ png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+ png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+ else
+ png_handle_unknown(png_ptr, info_ptr, length);
+ }
+}
+
+/* optional call to update the users info_ptr structure */
+void
+png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+{
+ png_debug(1, "in png_read_update_info\n");
+ /* save jump buffer and error functions */
+ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ png_read_start_row(png_ptr);
+ png_read_transform_info(png_ptr, info_ptr);
+}
+
+/* Initialize palette, background, etc, after transformations
+ * are set, but before any reading takes place. This allows
+ * the user to obtain a gamma-corrected palette, for example.
+ * If the user doesn't call this, we will do it ourselves.
+ */
+void
+png_start_read_image(png_structp png_ptr)
+{
+ png_debug(1, "in png_start_read_image\n");
+ /* save jump buffer and error functions */
+ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ png_read_start_row(png_ptr);
+}
+
+void
+png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+{
+ int ret;
+ png_debug2(1, "in png_read_row (row %d, pass %d)\n",
+ png_ptr->row_number, png_ptr->pass);
+ /* save jump buffer and error functions */
+ if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ png_read_start_row(png_ptr);
+ if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+ {
+ /* check for transforms that have been set but were defined out */
+#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_MONO)
+ png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
+ if (png_ptr->transformations & PNG_FILLER)
+ png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && !defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACK)
+ png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
+ if (png_ptr->transformations & PNG_SHIFT)
+ png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
+ if (png_ptr->transformations & PNG_BGR)
+ png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_BYTES)
+ png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+#endif
+ }
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+ /* if interlaced and we do not need a new row, combine row and return */
+ if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ {
+ switch (png_ptr->pass)
+ {
+ case 0:
+ if (png_ptr->row_number & 7)
+ {
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 1:
+ if ((png_ptr->row_number & 7) || png_ptr->width < 5)
+ {
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 2:
+ if ((png_ptr->row_number & 7) != 4)
+ {
+ if (dsp_row != NULL && (png_ptr->row_number & 4))
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 3:
+ if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+ {
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 4:
+ if ((png_ptr->row_number & 3) != 2)
+ {
+ if (dsp_row != NULL && (png_ptr->row_number & 2))
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 5:
+ if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+ {
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 6:
+ if (!(png_ptr->row_number & 1))
+ {
+ png_read_finish_row(png_ptr);
+ return;
+ }
+ break;
+ }
+ }
+#endif
+
+ if (!(png_ptr->mode & PNG_HAVE_IDAT))
+ png_error(png_ptr, "Invalid attempt to read row data");
+
+ png_ptr->zstream.next_out = png_ptr->row_buf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+ do
+ {
+ if (!(png_ptr->zstream.avail_in))
+ {
+ while (!png_ptr->idat_size)
+ {
+ png_byte chunk_length[4];
+
+ png_crc_finish(png_ptr, 0);
+
+ png_read_data(png_ptr, chunk_length, 4);
+ png_ptr->idat_size = png_get_uint_32(chunk_length);
+
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ png_error(png_ptr, "Not enough image data");
+ }
+ png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_in = png_ptr->zbuf;
+ if (png_ptr->zbuf_size > png_ptr->idat_size)
+ png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+ png_crc_read(png_ptr, png_ptr->zbuf,
+ (png_size_t)png_ptr->zstream.avail_in);
+ png_ptr->idat_size -= png_ptr->zstream.avail_in;
+ }
+ ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+ if (ret == Z_STREAM_END)
+ {
+ if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
+ png_ptr->idat_size)
+ png_error(png_ptr, "Extra compressed data");
+ png_ptr->mode |= PNG_AFTER_IDAT;
+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+ break;
+ }
+ if (ret != Z_OK)
+ png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+ "Decompression error");
+
+ } while (png_ptr->zstream.avail_out);
+
+ png_ptr->row_info.color_type = png_ptr->color_type;
+ png_ptr->row_info.width = png_ptr->iwidth;
+ png_ptr->row_info.channels = png_ptr->channels;
+ png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+ png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+ {
+ png_ptr->row_info.rowbytes = ((png_ptr->row_info.width *
+ (png_uint_32)png_ptr->row_info.pixel_depth + 7) >> 3);
+ }
+
+ png_read_filter_row(png_ptr, &(png_ptr->row_info),
+ png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+ (int)(png_ptr->row_buf[0]));
+
+ png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+ png_ptr->rowbytes + 1);
+
+ if (png_ptr->transformations)
+ png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+ /* blow up interlaced rows to full size */
+ if (png_ptr->interlaced &&
+ (png_ptr->transformations & PNG_INTERLACE))
+ {
+ if (png_ptr->pass < 6)
+ png_do_read_interlace(&(png_ptr->row_info),
+ png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row,
+ png_pass_dsp_mask[png_ptr->pass]);
+ if (row != NULL)
+ png_combine_row(png_ptr, row,
+ png_pass_mask[png_ptr->pass]);
+ }
+ else
+#endif
+ {
+ if (row != NULL)
+ png_combine_row(png_ptr, row, 0xff);
+ if (dsp_row != NULL)
+ png_combine_row(png_ptr, dsp_row, 0xff);
+ }
+ png_read_finish_row(png_ptr);
+
+ if (png_ptr->read_row_fn != NULL)
+ (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+/* Read one or more rows of image data. If the image is interlaced,
+ * and png_set_interlace_handling() has been called, the rows need to
+ * contain the contents of the rows from the previous pass. If the
+ * image has alpha or transparency, and png_handle_alpha()[*] has been
+ * called, the rows contents must be initialized to the contents of the
+ * screen.
+ *
+ * "row" holds the actual image, and pixels are placed in it
+ * as they arrive. If the image is displayed after each pass, it will
+ * appear to "sparkle" in. "display_row" can be used to display a
+ * "chunky" progressive image, with finer detail added as it becomes
+ * available. If you do not want this "chunky" display, you may pass
+ * NULL for display_row. If you do not want the sparkle display, and
+ * you have not called png_handle_alpha(), you may pass NULL for rows.
+ * If you have called png_handle_alpha(), and the image has either an
+ * alpha channel or a transparency chunk, you must provide a buffer for
+ * rows. In this case, you do not have to provide a display_row buffer
+ * also, but you may. If the image is not interlaced, or if you have
+ * not called png_set_interlace_handling(), the display_row buffer will
+ * be ignored, so pass NULL to it.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.3.
+ */
+
+void
+png_read_rows(png_structp png_ptr, png_bytepp row,
+ png_bytepp display_row, png_uint_32 num_rows)
+{
+ png_uint_32 i;
+ png_bytepp rp;
+ png_bytepp dp;
+
+ png_debug(1, "in png_read_rows\n");
+ /* save jump buffer and error functions */
+ rp = row;
+ dp = display_row;
+ if (rp != NULL && dp != NULL)
+ for (i = 0; i < num_rows; i++)
+ {
+ png_bytep rptr = *rp++;
+ png_bytep dptr = *dp++;
+
+ png_read_row(png_ptr, rptr, dptr);
+ }
+ else if(rp != NULL)
+ for (i = 0; i < num_rows; i++)
+ {
+ png_bytep rptr = *rp;
+ png_read_row(png_ptr, rptr, NULL);
+ rp++;
+ }
+ else if(dp != NULL)
+ for (i = 0; i < num_rows; i++)
+ {
+ png_bytep dptr = *dp;
+ png_read_row(png_ptr, NULL, dptr);
+ dp++;
+ }
+}
+
+/* Read the entire image. If the image has an alpha channel or a tRNS
+ * chunk, and you have called png_handle_alpha()[*], you will need to
+ * initialize the image to the current image that PNG will be overlaying.
+ * We set the num_rows again here, in case it was incorrectly set in
+ * png_read_start_row() by a call to png_read_update_info() or
+ * png_start_read_image() if png_set_interlace_handling() wasn't called
+ * prior to either of these functions like it should have been. You can
+ * only call this function once. If you desire to have an image for
+ * each pass of a interlaced image, use png_read_rows() instead.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.3.
+ */
+void
+png_read_image(png_structp png_ptr, png_bytepp image)
+{
+ png_uint_32 i,image_height;
+ int pass, j;
+ png_bytepp rp;
+
+ png_debug(1, "in png_read_image\n");
+ /* save jump buffer and error functions */
+ pass = png_set_interlace_handling(png_ptr);
+
+ image_height=png_ptr->height;
+ png_ptr->num_rows = image_height; /* Make sure this is set correctly */
+
+ for (j = 0; j < pass; j++)
+ {
+ rp = image;
+ for (i = 0; i < image_height; i++)
+ {
+ png_read_row(png_ptr, *rp, NULL);
+ rp++;
+ }
+ }
+}
+
+/* Read the end of the PNG file. Will not read past the end of the
+ * file, will verify the end is accurate, and will read any comments
+ * or time information at the end of the file, if info is not NULL.
+ */
+void
+png_read_end(png_structp png_ptr, png_infop info_ptr)
+{
+ png_byte chunk_length[4];
+ png_uint_32 length;
+
+ png_debug(1, "in png_read_end\n");
+ /* save jump buffer and error functions */
+ png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+
+ do
+ {
+ png_read_data(png_ptr, chunk_length, 4);
+ length = png_get_uint_32(chunk_length);
+
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+ png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
+
+ if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+ png_handle_IHDR(png_ptr, info_ptr, length);
+ else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ {
+ /* Zero length IDATs are legal after the last IDAT has been
+ * read, but not after other chunks have been read.
+ */
+ if (length > 0 || png_ptr->mode & PNG_AFTER_IDAT)
+ png_error(png_ptr, "Too many IDAT's found");
+ else
+ png_crc_finish(png_ptr, 0);
+ }
+ else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+ png_handle_PLTE(png_ptr, info_ptr, length);
+ else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+ png_handle_IEND(png_ptr, info_ptr, length);
+#if defined(PNG_READ_bKGD_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+ png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+ png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+ png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+ png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+ png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+ png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+ png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+ png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+ png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+ png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+ png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+ png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+ png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+ else
+ png_handle_unknown(png_ptr, info_ptr, length);
+ } while (!(png_ptr->mode & PNG_HAVE_IEND));
+}
+
+/* free all memory used by the read */
+void
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+ png_infopp end_info_ptr_ptr)
+{
+ png_structp png_ptr = NULL;
+ png_infop info_ptr = NULL, end_info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_free_ptr free_fn = NULL;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+ png_debug(1, "in png_destroy_read_struct\n");
+ /* save jump buffer and error functions */
+ if (png_ptr_ptr != NULL)
+ png_ptr = *png_ptr_ptr;
+
+ if (info_ptr_ptr != NULL)
+ info_ptr = *info_ptr_ptr;
+
+ if (end_info_ptr_ptr != NULL)
+ end_info_ptr = *end_info_ptr_ptr;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ free_fn = png_ptr->free_fn;
+#endif
+
+ png_read_destroy(png_ptr, info_ptr, end_info_ptr);
+
+ if (info_ptr != NULL)
+ {
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+ png_free(png_ptr, info_ptr->text);
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)info_ptr, free_fn);
+#else
+ png_destroy_struct((png_voidp)info_ptr);
+#endif
+ *info_ptr_ptr = (png_infop)NULL;
+ }
+
+ if (end_info_ptr != NULL)
+ {
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+ png_free(png_ptr, end_info_ptr->text);
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)end_info_ptr, free_fn);
+#else
+ png_destroy_struct((png_voidp)end_info_ptr);
+#endif
+ *end_info_ptr_ptr = (png_infop)NULL;
+ }
+
+ if (png_ptr != NULL)
+ {
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)png_ptr, free_fn);
+#else
+ png_destroy_struct((png_voidp)png_ptr);
+#endif
+ *png_ptr_ptr = (png_structp)NULL;
+ }
+}
+
+/* free all memory used by the read (old method) */
+void
+png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)
+{
+ jmp_buf tmp_jmp;
+ png_error_ptr error_fn;
+ png_error_ptr warning_fn;
+ png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_free_ptr free_fn;
+#endif
+
+ png_debug(1, "in png_read_destroy\n");
+ /* save jump buffer and error functions */
+ if (info_ptr != NULL)
+ png_info_destroy(png_ptr, info_ptr);
+
+ if (end_info_ptr != NULL)
+ png_info_destroy(png_ptr, end_info_ptr);
+
+ png_free(png_ptr, png_ptr->zbuf);
+ png_free(png_ptr, png_ptr->row_buf);
+ png_free(png_ptr, png_ptr->prev_row);
+#if defined(PNG_READ_DITHER_SUPPORTED)
+ png_free(png_ptr, png_ptr->palette_lookup);
+ png_free(png_ptr, png_ptr->dither_index);
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ png_free(png_ptr, png_ptr->gamma_table);
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ png_free(png_ptr, png_ptr->gamma_from_1);
+ png_free(png_ptr, png_ptr->gamma_to_1);
+#endif
+ if (png_ptr->flags & PNG_FLAG_FREE_PALETTE)
+ png_zfree(png_ptr, png_ptr->palette);
+ if (png_ptr->flags & PNG_FLAG_FREE_TRANS)
+ png_free(png_ptr, png_ptr->trans);
+#if defined(PNG_READ_hIST_SUPPORTED)
+ if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+ png_free(png_ptr, png_ptr->hist);
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (png_ptr->gamma_16_table != NULL)
+ {
+ int i;
+ int istop = (1 << (8 - png_ptr->gamma_shift));
+ for (i = 0; i < istop; i++)
+ {
+ png_free(png_ptr, png_ptr->gamma_16_table[i]);
+ }
+ png_free(png_ptr, png_ptr->gamma_16_table);
+ }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->gamma_16_from_1 != NULL)
+ {
+ int i;
+ int istop = (1 << (8 - png_ptr->gamma_shift));
+ for (i = 0; i < istop; i++)
+ {
+ png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
+ }
+ png_free(png_ptr, png_ptr->gamma_16_from_1);
+ }
+ if (png_ptr->gamma_16_to_1 != NULL)
+ {
+ int i;
+ int istop = (1 << (8 - png_ptr->gamma_shift));
+ for (i = 0; i < istop; i++)
+ {
+ png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
+ }
+ png_free(png_ptr, png_ptr->gamma_16_to_1);
+ }
+#endif
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+ png_free(png_ptr, png_ptr->time_buffer);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+ inflateEnd(&png_ptr->zstream);
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+ png_free(png_ptr, png_ptr->save_buffer);
+#endif
+
+ /* Save the important info out of the png_struct, in case it is
+ * being used again.
+ */
+ png_memcpy(tmp_jmp, png_ptr->jmpbuf, sizeof (jmp_buf));
+
+ error_fn = png_ptr->error_fn;
+ warning_fn = png_ptr->warning_fn;
+ error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ free_fn = png_ptr->free_fn;
+#endif
+
+ png_memset(png_ptr, 0, sizeof (png_struct));
+
+ png_ptr->error_fn = error_fn;
+ png_ptr->warning_fn = warning_fn;
+ png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_ptr->free_fn = free_fn;
+#endif
+
+ png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
+}
+
+void
+png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+{
+ png_ptr->read_row_fn = read_row_fn;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngmem.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngmem.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngmem.c Sat Jul 13 19:23:17 2002
@@ -0,0 +1,511 @@
+
+/* pngmem.c - stub functions for memory allocation
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file provides a location for all memory allocation. Users who
+ * need special memory handling are expected to supply replacement
+ * functions for png_malloc() and png_free(), and to use
+ * png_create_read_struct_2() and png_create_write_struct_2() to
+ * identify the replacement functions.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Borland DOS special memory handler */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* if you change this, be sure to change the one in png.h also */
+
+/* Allocate memory for a png_struct. The malloc and memset can be replaced
+ by a single call to calloc() if this is thought to improve performance. */
+png_voidp
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+ return (png_create_struct_2(type, NULL));
+}
+
+/* Alternate version of png_create_struct, for use with user-defined malloc. */
+png_voidp
+png_create_struct_2(int type, png_malloc_ptr malloc_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+ png_size_t size;
+ png_voidp struct_ptr;
+
+ if (type == PNG_STRUCT_INFO)
+ size = sizeof(png_info);
+ else if (type == PNG_STRUCT_PNG)
+ size = sizeof(png_struct);
+ else
+ return ((png_voidp)NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(malloc_fn != NULL)
+ {
+ if ((struct_ptr = (*(malloc_fn))(NULL, size)) != NULL)
+ png_memset(struct_ptr, 0, size);
+ return (struct_ptr);
+ }
+#endif /* PNG_USER_MEM_SUPPORTED */
+ if ((struct_ptr = (png_voidp)farmalloc(size)) != NULL)
+ {
+ png_memset(struct_ptr, 0, size);
+ }
+ return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2(struct_ptr, (png_free_ptr)NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn)
+{
+#endif
+ if (struct_ptr != NULL)
+ {
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(free_fn != NULL)
+ {
+ png_struct dummy_struct;
+ png_structp png_ptr = &dummy_struct;
+ (*(free_fn))(png_ptr, struct_ptr);
+ struct_ptr = NULL;
+ return;
+ }
+#endif /* PNG_USER_MEM_SUPPORTED */
+ farfree (struct_ptr);
+ struct_ptr = NULL;
+ }
+}
+
+/* Allocate memory. For reasonable files, size should never exceed
+ * 64K. However, zlib may allocate more then 64K if you don't tell
+ * it not to. See zconf.h and png.h for more information. zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * Borland seems to have a problem in DOS mode for exactly 64K.
+ * It gives you a segment with an offset of 8 (perhaps to store its
+ * memory stuff). zlib doesn't like this at all, so we have to
+ * detect and deal with it. This code should not be needed in
+ * Windows or OS/2 modes, and only in 16 bit mode. This code has
+ * been updated by Alexander Lehmann for version 0.89 to waste less
+ * memory.
+ *
+ * Note that we can't use png_size_t for the "size" declaration,
+ * since on some systems a png_size_t is a 16-bit quantity, and as a
+ * result, we would be truncating potentially larger memory requests
+ * (which should cause a fatal error) and introducing major problems.
+ */
+png_voidp
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+#ifndef PNG_USER_MEM_SUPPORTED
+ png_voidp ret;
+#endif
+ if (png_ptr == NULL || size == 0)
+ return ((png_voidp)NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(png_ptr->malloc_fn != NULL)
+ return ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, size));
+ else
+ return png_malloc_default(png_ptr, size);
+}
+
+png_voidp
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+ png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_MAX_MALLOC_64K
+ if (size > (png_uint_32)65536L)
+ png_error(png_ptr, "Cannot Allocate > 64K");
+#endif
+
+ if (size == (png_uint_32)65536L)
+ {
+ if (png_ptr->offset_table == NULL)
+ {
+ /* try to see if we need to do any of this fancy stuff */
+ ret = farmalloc(size);
+ if (ret == NULL || ((png_size_t)ret & 0xffff))
+ {
+ int num_blocks;
+ png_uint_32 total_size;
+ png_bytep table;
+ int i;
+ png_byte huge * hptr;
+
+ if (ret != NULL)
+ {
+ farfree(ret);
+ ret = NULL;
+ }
+
+ num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
+ if (num_blocks < 1)
+ num_blocks = 1;
+ if (png_ptr->zlib_mem_level >= 7)
+ num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
+ else
+ num_blocks++;
+
+ total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
+
+ table = farmalloc(total_size);
+
+ if (table == NULL)
+ {
+ png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
+ }
+
+ if ((png_size_t)table & 0xfff0)
+ {
+ png_error(png_ptr, "Farmalloc didn't return normalized pointer");
+ }
+
+ png_ptr->offset_table = table;
+ png_ptr->offset_table_ptr = farmalloc(num_blocks *
+ sizeof (png_bytep));
+
+ if (png_ptr->offset_table_ptr == NULL)
+ {
+ png_error(png_ptr, "Out Of memory.");
+ }
+
+ hptr = (png_byte huge *)table;
+ if ((png_size_t)hptr & 0xf)
+ {
+ hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
+ hptr += 16L;
+ }
+ for (i = 0; i < num_blocks; i++)
+ {
+ png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
+ hptr += (png_uint_32)65536L;
+ }
+
+ png_ptr->offset_table_number = num_blocks;
+ png_ptr->offset_table_count = 0;
+ png_ptr->offset_table_count_free = 0;
+ }
+ }
+
+ if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
+ png_error(png_ptr, "Out of Memory.");
+
+ ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
+ }
+ else
+ ret = farmalloc(size);
+
+ if (ret == NULL)
+ {
+ png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+ }
+
+ return (ret);
+}
+
+/* free a pointer allocated by png_malloc(). In the default
+ configuration, png_ptr is not used, but is passed in case it
+ is needed. If ptr is NULL, return without taking any action. */
+void
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+ if (png_ptr == NULL || ptr == NULL)
+ return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if (png_ptr->free_fn != NULL)
+ {
+ (*(png_ptr->free_fn))(png_ptr, ptr);
+ ptr = NULL;
+ return;
+ }
+ else png_free_default(png_ptr, ptr);
+}
+
+void
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+ if (png_ptr->offset_table != NULL)
+ {
+ int i;
+
+ for (i = 0; i < png_ptr->offset_table_count; i++)
+ {
+ if (ptr == png_ptr->offset_table_ptr[i])
+ {
+ ptr = NULL;
+ png_ptr->offset_table_count_free++;
+ break;
+ }
+ }
+ if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
+ {
+ farfree(png_ptr->offset_table);
+ farfree(png_ptr->offset_table_ptr);
+ png_ptr->offset_table = NULL;
+ png_ptr->offset_table_ptr = NULL;
+ }
+ }
+
+ if (ptr != NULL)
+ {
+ farfree(ptr);
+ ptr = NULL;
+ }
+}
+
+#else /* Not the Borland DOS special memory handler */
+
+/* Allocate memory for a png_struct or a png_info. The malloc and
+ memset can be replaced by a single call to calloc() if this is thought
+ to improve performance noticably.*/
+png_voidp
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+ return (png_create_struct_2(type, NULL));
+}
+
+/* Allocate memory for a png_struct or a png_info. The malloc and
+ memset can be replaced by a single call to calloc() if this is thought
+ to improve performance noticably.*/
+png_voidp
+png_create_struct_2(int type, png_malloc_ptr malloc_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+ png_size_t size;
+ png_voidp struct_ptr;
+
+ if (type == PNG_STRUCT_INFO)
+ size = sizeof(png_info);
+ else if (type == PNG_STRUCT_PNG)
+ size = sizeof(png_struct);
+ else
+ return ((png_voidp)NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(malloc_fn != NULL)
+ {
+ if ((struct_ptr = (*(malloc_fn))(NULL, size)) != NULL)
+ png_memset(struct_ptr, 0, size);
+ return (struct_ptr);
+ }
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ if ((struct_ptr = (png_voidp)farmalloc(size)) != NULL)
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ if ((struct_ptr = (png_voidp)halloc(size,1)) != NULL)
+# else
+ if ((struct_ptr = (png_voidp)malloc(size)) != NULL)
+# endif
+#endif
+ {
+ png_memset(struct_ptr, 0, size);
+ }
+
+ return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2(struct_ptr, (png_free_ptr)NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+ if (struct_ptr != NULL)
+ {
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(free_fn != NULL)
+ {
+ png_struct dummy_struct;
+ png_structp png_ptr = &dummy_struct;
+ (*(free_fn))(png_ptr, struct_ptr);
+ struct_ptr = NULL;
+ return;
+ }
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ farfree(struct_ptr);
+ struct_ptr = NULL;
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ hfree(struct_ptr);
+ struct_ptr = NULL;
+# else
+ free(struct_ptr);
+ struct_ptr = NULL;
+# endif
+#endif
+ }
+}
+
+
+/* Allocate memory. For reasonable files, size should never exceed
+ 64K. However, zlib may allocate more then 64K if you don't tell
+ it not to. See zconf.h and png.h for more information. zlib does
+ need to allocate exactly 64K, so whatever you call here must
+ have the ability to do that. */
+
+png_voidp
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+#ifndef PNG_USER_MEM_SUPPORTED
+ png_voidp ret;
+#endif
+ if (png_ptr == NULL || size == 0)
+ return ((png_voidp)NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if(png_ptr->malloc_fn != NULL)
+ return ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, size));
+ else
+ return (png_malloc_default(png_ptr, size));
+}
+png_voidp
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+ png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_MAX_MALLOC_64K
+ if (size > (png_uint_32)65536L)
+ png_error(png_ptr, "Cannot Allocate > 64K");
+#endif
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ ret = farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ ret = halloc(size, 1);
+# else
+ ret = malloc((size_t)size);
+# endif
+#endif
+
+ if (ret == NULL)
+ {
+ png_error(png_ptr, "Out of Memory");
+ }
+
+ return (ret);
+}
+
+/* Free a pointer allocated by png_malloc(). If ptr is NULL, return
+ without taking any action. */
+void
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+ if (png_ptr == NULL || ptr == NULL)
+ return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ if (png_ptr->free_fn != NULL)
+ {
+ (*(png_ptr->free_fn))(png_ptr, ptr);
+ ptr = NULL;
+ return;
+ }
+ else png_free_default(png_ptr, ptr);
+}
+void
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ farfree(ptr);
+ ptr = NULL;
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ hfree(ptr);
+ ptr = NULL;
+# else
+ free(ptr);
+ ptr = NULL;
+# endif
+#endif
+}
+
+#endif /* Not Borland DOS special memory handler */
+
+png_voidp
+png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
+ png_uint_32 length)
+{
+ png_size_t size;
+
+ size = (png_size_t)length;
+ if ((png_uint_32)size != length)
+ png_error(png_ptr,"Overflow in png_memcpy_check.");
+
+ return(png_memcpy (s1, s2, size));
+}
+
+png_voidp
+png_memset_check (png_structp png_ptr, png_voidp s1, int value,
+ png_uint_32 length)
+{
+ png_size_t size;
+
+ size = (png_size_t)length;
+ if ((png_uint_32)size != length)
+ png_error(png_ptr,"Overflow in png_memset_check.");
+
+ return (png_memset (s1, value, size));
+
+}
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* This function is called when the application wants to use another method
+ * of allocating and freeing memory.
+ */
+void
+png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+ malloc_fn, png_free_ptr free_fn)
+{
+ png_ptr->mem_ptr = mem_ptr;
+ png_ptr->malloc_fn = malloc_fn;
+ png_ptr->free_fn = free_fn;
+}
+
+/* This function returns a pointer to the mem_ptr associated with the user
+ * functions. The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp
+png_get_mem_ptr(png_structp png_ptr)
+{
+ return ((png_voidp)png_ptr->mem_ptr);
+}
+#endif /* PNG_USER_MEM_SUPPORTED */
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.c Sat Jul 13 19:23:17 2002
@@ -0,0 +1,359 @@
+
+/* png.c - location for general purpose libpng functions
+ *
+ * libpng version 1.0.3 - January 14, 1999
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_EXTERN
+#include "png.h"
+
+/* Version information for C files. This had better match the version
+ * string defined in png.h.
+ */
+
+char png_libpng_ver[12] = "1.0.3";
+
+/* Place to hold the signature string for a PNG file. */
+png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+
+/* Constant strings for known chunk types. If you need to add a chunk,
+ * add a string holding the name here. If you want to make the code
+ * portable to EBCDIC machines, use ASCII numbers, not characters.
+ */
+png_byte FARDATA png_IHDR[5] = { 73, 72, 68, 82, '\0'};
+png_byte FARDATA png_IDAT[5] = { 73, 68, 65, 84, '\0'};
+png_byte FARDATA png_IEND[5] = { 73, 69, 78, 68, '\0'};
+png_byte FARDATA png_PLTE[5] = { 80, 76, 84, 69, '\0'};
+png_byte FARDATA png_bKGD[5] = { 98, 75, 71, 68, '\0'};
+png_byte FARDATA png_cHRM[5] = { 99, 72, 82, 77, '\0'};
+png_byte FARDATA png_gAMA[5] = {103, 65, 77, 65, '\0'};
+png_byte FARDATA png_hIST[5] = {104, 73, 83, 84, '\0'};
+png_byte FARDATA png_oFFs[5] = {111, 70, 70, 115, '\0'};
+png_byte FARDATA png_pCAL[5] = {112, 67, 65, 76, '\0'};
+png_byte FARDATA png_pHYs[5] = {112, 72, 89, 115, '\0'};
+png_byte FARDATA png_sBIT[5] = {115, 66, 73, 84, '\0'};
+png_byte FARDATA png_sRGB[5] = {115, 82, 71, 66, '\0'};
+png_byte FARDATA png_tEXt[5] = {116, 69, 88, 116, '\0'};
+png_byte FARDATA png_tIME[5] = {116, 73, 77, 69, '\0'};
+png_byte FARDATA png_tRNS[5] = {116, 82, 78, 83, '\0'};
+png_byte FARDATA png_zTXt[5] = {122, 84, 88, 116, '\0'};
+
+/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+/* start of interlace block */
+int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+/* offset to next interlace block */
+int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+/* start of interlace block in the y direction */
+int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+/* offset to next interlace block in the y direction */
+int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+/* Width of interlace block. This is not currently used - if you need
+ * it, uncomment it here and in png.h
+int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1};
+*/
+
+/* Height of interlace block. This is not currently used - if you need
+ * it, uncomment it here and in png.h
+int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+*/
+
+/* Mask to determine which pixels are valid in a pass */
+int FARDATA png_pass_mask[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+
+/* Mask to determine which pixels to overwrite while displaying */
+int FARDATA png_pass_dsp_mask[] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+
+
+/* Tells libpng that we have already handled the first "num_bytes" bytes
+ * of the PNG file signature. If the PNG data is embedded into another
+ * stream we can set num_bytes = 8 so that libpng will not attempt to read
+ * or write any of the magic bytes before it starts on the IHDR.
+ */
+void
+png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+{
+ png_debug(1, "in png_set_sig_bytes\n");
+ if (num_bytes > 8)
+ png_error(png_ptr, "Too many bytes for PNG signature.");
+
+ png_ptr->sig_bytes = num_bytes < 0 ? 0 : num_bytes;
+}
+
+/* Checks whether the supplied bytes match the PNG signature. We allow
+ * checking less than the full 8-byte signature so that those apps that
+ * already read the first few bytes of a file to determine the file type
+ * can simply check the remaining bytes for extra assurance. Returns
+ * an integer less than, equal to, or greater than zero if sig is found,
+ * respectively, to be less than, to match, or be greater than the correct
+ * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
+ */
+int
+png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
+{
+ if (num_to_check > 8)
+ num_to_check = 8;
+ else if (num_to_check < 1)
+ return (0);
+
+ if (start > 7)
+ return (0);
+
+ if (start + num_to_check > 8)
+ num_to_check = 8 - start;
+
+ return ((int)(png_memcmp(&sig[start], &png_sig[start], num_to_check)));
+}
+
+/* (Obsolete) function to check signature bytes. It does not allow one
+ * to check a partial signature. This function might be removed in the
+ * future - use png_sig_cmp(). Returns true (nonzero) if the file is a PNG.
+ */
+int
+png_check_sig(png_bytep sig, int num)
+{
+ return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
+}
+
+/* Function to allocate memory for zlib. */
+voidpf
+png_zalloc(voidpf png_ptr, uInt items, uInt size)
+{
+ png_uint_32 num_bytes = (png_uint_32)items * size;
+ png_voidp ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
+
+ if (num_bytes > (png_uint_32)0x8000L)
+ {
+ png_memset(ptr, 0, (png_size_t)0x8000L);
+ png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
+ (png_size_t)(num_bytes - (png_uint_32)0x8000L));
+ }
+ else
+ {
+ png_memset(ptr, 0, (png_size_t)num_bytes);
+ }
+ return ((voidpf)ptr);
+}
+
+/* function to free memory for zlib */
+void
+png_zfree(voidpf png_ptr, voidpf ptr)
+{
+ png_free((png_structp)png_ptr, (png_voidp)ptr);
+}
+
+/* Reset the CRC variable to 32 bits of 1's. Care must be taken
+ * in case CRC is > 32 bits to leave the top bits 0.
+ */
+void
+png_reset_crc(png_structp png_ptr)
+{
+ png_ptr->crc = crc32(0, Z_NULL, 0);
+}
+
+/* Calculate the CRC over a section of data. We can only pass as
+ * much data to this routine as the largest single buffer size. We
+ * also check that this data will actually be used before going to the
+ * trouble of calculating it.
+ */
+void
+png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
+{
+ int need_crc = 1;
+
+ if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
+ {
+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+ (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+ need_crc = 0;
+ }
+ else /* critical */
+ {
+ if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+ need_crc = 0;
+ }
+
+ if (need_crc)
+ png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
+}
+
+/* Allocate the memory for an info_struct for the application. We don't
+ * really need the png_ptr, but it could potentially be useful in the
+ * future. This should be used in favour of malloc(sizeof(png_info))
+ * and png_info_init() so that applications that want to use a shared
+ * libpng don't have to be recompiled if png_info changes size.
+ */
+png_infop
+png_create_info_struct(png_structp png_ptr)
+{
+ png_infop info_ptr;
+
+ png_debug(1, "in png_create_info_struct\n");
+ if(png_ptr == NULL) return (NULL);
+#ifdef PNG_USER_MEM_SUPPORTED
+ if ((info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
+ png_ptr->malloc_fn)) != NULL)
+#else
+ if ((info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO)) != NULL)
+#endif
+ {
+ png_info_init(info_ptr);
+ }
+
+ return (info_ptr);
+}
+
+/* This function frees the memory associated with a single info struct.
+ * Normally, one would use either png_destroy_read_struct() or
+ * png_destroy_write_struct() to free an info struct, but this may be
+ * useful for some applications.
+ */
+void
+png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+{
+ png_infop info_ptr = NULL;
+
+ png_debug(1, "in png_destroy_info_struct\n");
+ if (info_ptr_ptr != NULL)
+ info_ptr = *info_ptr_ptr;
+
+ if (info_ptr != NULL)
+ {
+ png_info_destroy(png_ptr, info_ptr);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn);
+#else
+ png_destroy_struct((png_voidp)info_ptr);
+#endif
+ *info_ptr_ptr = (png_infop)NULL;
+ }
+}
+
+/* Initialize the info structure. This is now an internal function (0.89)
+ * and applications using it are urged to use png_create_info_struct()
+ * instead.
+ */
+void
+png_info_init(png_infop info_ptr)
+{
+ png_debug(1, "in png_info_init\n");
+ /* set everything to 0 */
+ png_memset(info_ptr, 0, sizeof (png_info));
+}
+
+/* This is an internal routine to free any memory that the info struct is
+ * pointing to before re-using it or freeing the struct itself. Recall
+ * that png_free() checks for NULL pointers for us.
+ */
+void
+png_info_destroy(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+ png_debug(1, "in png_info_destroy\n");
+ if (info_ptr->text != NULL)
+ {
+ int i;
+ for (i = 0; i < info_ptr->num_text; i++)
+ {
+ png_free(png_ptr, info_ptr->text[i].key);
+ }
+ png_free(png_ptr, info_ptr->text);
+ }
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+ png_free(png_ptr, info_ptr->pcal_purpose);
+ png_free(png_ptr, info_ptr->pcal_units);
+ if (info_ptr->pcal_params != NULL)
+ {
+ int i;
+ for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+ {
+ png_free(png_ptr, info_ptr->pcal_params[i]);
+ }
+ png_free(png_ptr, info_ptr->pcal_params);
+ }
+#endif
+
+ png_info_init(info_ptr);
+}
+
+/* This function returns a pointer to the io_ptr associated with the user
+ * functions. The application should free any memory associated with this
+ * pointer before png_write_destroy() or png_read_destroy() are called.
+ */
+png_voidp
+png_get_io_ptr(png_structp png_ptr)
+{
+ return (png_ptr->io_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the default input/output functions for the PNG file. If you
+ * use your own read or write routines, you can call either png_set_read_fn()
+ * or png_set_write_fn() instead of png_init_io().
+ */
+void
+png_init_io(png_structp png_ptr, FILE *fp)
+{
+ png_debug(1, "in png_init_io\n");
+ png_ptr->io_ptr = (png_voidp)fp;
+}
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+/* Convert the supplied time into an RFC 1123 string suitable for use in
+ * a "Creation Time" or other text-based time string.
+ */
+png_charp
+png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
+{
+ static PNG_CONST char short_months[12][4] =
+ {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+ if (png_ptr->time_buffer == NULL)
+ {
+ png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
+ sizeof(char)));
+ }
+
+#ifdef USE_FAR_KEYWORD
+ {
+ char near_time_buf[29];
+ sprintf(near_time_buf, "%d %s %d %02d:%02d:%02d +0000",
+ ptime->day % 32, short_months[(ptime->month - 1) % 12],
+ ptime->year, ptime->hour % 24, ptime->minute % 60,
+ ptime->second % 61);
+ png_memcpy(png_ptr->time_buffer, near_time_buf,
+ 29*sizeof(char));
+ }
+#else
+ sprintf(png_ptr->time_buffer, "%d %s %d %02d:%02d:%02d +0000",
+ ptime->day % 32, short_months[(ptime->month - 1) % 12],
+ ptime->year, ptime->hour % 24, ptime->minute % 60,
+ ptime->second % 61);
+#endif
+ return ((png_charp)png_ptr->time_buffer);
+}
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+png_charp
+png_get_copyright(png_structp png_ptr)
+{
+ if(png_ptr == NULL)
+ /* silence compiler warning about unused png_ptr */ ;
+ return("\n libpng version 1.0.3 - January 14, 1999\n\
+ Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n\
+ Copyright (c) 1996, 1997 Andreas Dilger\n\
+ Copyright (c) 1998, 1999, Glenn Randers-Pehrson\n");
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngget.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngget.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngget.c Sat Jul 13 19:23:17 2002
@@ -0,0 +1,650 @@
+
+/* pngget.c - retrieval of values from info struct
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+png_uint_32
+png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ return(info_ptr->valid & flag);
+ else
+ return(0);
+}
+
+png_uint_32
+png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ return(info_ptr->rowbytes);
+ else
+ return(0);
+}
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* easy access to info, added in libpng-0.99 */
+png_uint_32
+png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->width;
+ }
+ return (0);
+}
+
+png_uint_32
+png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->height;
+ }
+ return (0);
+}
+
+png_byte
+png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->bit_depth;
+ }
+ return (0);
+}
+
+png_byte
+png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->color_type;
+ }
+ return (0);
+}
+
+png_byte
+png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->filter_type;
+ }
+ return (0);
+}
+
+png_byte
+png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->interlace_type;
+ }
+ return (0);
+}
+
+png_byte
+png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ {
+ return info_ptr->compression_type;
+ }
+ return (0);
+}
+
+png_uint_32
+png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_x_pixels_per_meter");
+ if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+ return (0);
+ else return (info_ptr->x_pixels_per_unit);
+ }
+ else
+#endif
+ return (0);
+}
+
+png_uint_32
+png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_y_pixels_per_meter");
+ if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+ return (0);
+ else return (info_ptr->y_pixels_per_unit);
+ }
+ else
+#endif
+ return (0);
+}
+
+png_uint_32
+png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_pixels_per_meter");
+ if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
+ info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
+ return (0);
+ else return (info_ptr->x_pixels_per_unit);
+ }
+ else
+#endif
+ return (0);
+}
+
+float
+png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+ {
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_aspect_ratio");
+ if (info_ptr->x_pixels_per_unit == 0)
+ return ((float)0.0);
+ else
+ return ((float)info_ptr->y_pixels_per_unit
+ /(float)info_ptr->x_pixels_per_unit);
+ }
+ else
+#endif
+ return ((float)0.0);
+}
+
+png_uint_32
+png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+ if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+ return (0);
+ else return (info_ptr->x_offset);
+ }
+ else
+#endif
+ return (0);
+}
+
+png_uint_32
+png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+ if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+ return (0);
+ else return (info_ptr->y_offset);
+ }
+ else
+#endif
+ return (0);
+}
+
+png_uint_32
+png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+ if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+ return (0);
+ else return (info_ptr->x_offset);
+ }
+ else
+#endif
+ return (0);
+}
+
+png_uint_32
+png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ {
+ png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+ if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+ return (0);
+ else return (info_ptr->y_offset);
+ }
+ else
+#endif
+ return (0);
+}
+
+#ifdef PNG_INCH_CONVERSIONS
+png_uint_32
+png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+ return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
+ *.03937 +.5)
+}
+
+png_uint_32
+png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+ return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
+ *.03937 +.5)
+}
+
+png_uint_32
+png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+ return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
+ *.03937 +.5)
+}
+
+float
+png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+ return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
+ *.03937/1000000. +.5)
+}
+
+float
+png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+ return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
+ *.03937/1000000. +.5)
+}
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+png_uint_32
+png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+ png_uint_32 retval = 0;
+
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_pHYs)
+ {
+ png_debug1(1, "in %s retrieval function\n", "pHYs");
+ if (res_x != NULL)
+ {
+ *res_x = info_ptr->x_pixels_per_unit;
+ retval |= PNG_INFO_pHYs;
+ }
+ if (res_y != NULL)
+ {
+ *res_y = info_ptr->y_pixels_per_unit;
+ retval |= PNG_INFO_pHYs;
+ }
+ if (unit_type != NULL)
+ {
+ *unit_type = (int)info_ptr->phys_unit_type;
+ retval |= PNG_INFO_pHYs;
+ if(unit_type == 1)
+ {
+ if (res_x != NULL) *res_x = (png_uint_32)(*res_x * 39.37 + .50);
+ if (res_y != NULL) *res_y = (png_uint_32)(*res_y * 39.37 + .50);
+ }
+ }
+ }
+ return (retval);
+}
+#endif /* PNG_READ_pHYs_SUPPORTED */
+#endif /* PNG_INCH_CONVERSIONS */
+
+/* png_get_channels really belongs in here, too, but it's been around longer */
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+png_byte
+png_get_channels(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ return(info_ptr->channels);
+ else
+ return (0);
+}
+
+png_bytep
+png_get_signature(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ return(info_ptr->signature);
+ else
+ return (NULL);
+}
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+png_uint_32
+png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+ png_color_16p *background)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
+ && background != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "bKGD");
+ *background = &(info_ptr->background);
+ return (PNG_INFO_bKGD);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+png_uint_32
+png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+ double *white_x, double *white_y, double *red_x, double *red_y,
+ double *green_x, double *green_y, double *blue_x, double *blue_y)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+ {
+ png_debug1(1, "in %s retrieval function\n", "cHRM");
+ if (white_x != NULL)
+ *white_x = (double)info_ptr->x_white;
+ if (white_y != NULL)
+ *white_y = (double)info_ptr->y_white;
+ if (red_x != NULL)
+ *red_x = (double)info_ptr->x_red;
+ if (red_y != NULL)
+ *red_y = (double)info_ptr->y_red;
+ if (green_x != NULL)
+ *green_x = (double)info_ptr->x_green;
+ if (green_y != NULL)
+ *green_y = (double)info_ptr->y_green;
+ if (blue_x != NULL)
+ *blue_x = (double)info_ptr->x_blue;
+ if (blue_y != NULL)
+ *blue_y = (double)info_ptr->y_blue;
+ return (PNG_INFO_cHRM);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+png_uint_32
+png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+ && file_gamma != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "gAMA");
+ *file_gamma = (double)info_ptr->gamma;
+ return (PNG_INFO_gAMA);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+png_uint_32
+png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
+ && file_srgb_intent != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "sRGB");
+ *file_srgb_intent = (int)info_ptr->srgb_intent;
+ return (PNG_INFO_sRGB);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+png_uint_32
+png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
+ && hist != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "hIST");
+ *hist = info_ptr->hist;
+ return (PNG_INFO_hIST);
+ }
+ return (0);
+}
+#endif
+
+png_uint_32
+png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 *width, png_uint_32 *height, int *bit_depth,
+ int *color_type, int *interlace_type, int *compression_type,
+ int *filter_type)
+
+{
+ if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
+ bit_depth != NULL && color_type != NULL)
+ {
+ int pixel_depth, channels;
+ png_uint_32 rowbytes_per_pixel;
+
+ png_debug1(1, "in %s retrieval function\n", "IHDR");
+ *width = info_ptr->width;
+ *height = info_ptr->height;
+ *bit_depth = info_ptr->bit_depth;
+ *color_type = info_ptr->color_type;
+ if (compression_type != NULL)
+ *compression_type = info_ptr->compression_type;
+ if (filter_type != NULL)
+ *filter_type = info_ptr->filter_type;
+ if (interlace_type != NULL)
+ *interlace_type = info_ptr->interlace_type;
+
+ /* check for potential overflow of rowbytes */
+ if (*color_type == PNG_COLOR_TYPE_PALETTE)
+ channels = 1;
+ else if (*color_type & PNG_COLOR_MASK_COLOR)
+ channels = 3;
+ else
+ channels = 1;
+ if (*color_type & PNG_COLOR_MASK_ALPHA)
+ channels++;
+ pixel_depth = *bit_depth * channels;
+ rowbytes_per_pixel = (pixel_depth + 7) >> 3;
+ if ((*width > (png_uint_32)2147483647L/rowbytes_per_pixel))
+ {
+ png_warning(png_ptr,
+ "Width too large for libpng to process image data.");
+ }
+ return (1);
+ }
+ return (0);
+}
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+png_uint_32
+png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 *offset_x, png_uint_32 *offset_y, int *unit_type)
+{
+ if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
+ && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "oFFs");
+ *offset_x = info_ptr->x_offset;
+ *offset_y = info_ptr->y_offset;
+ *unit_type = (int)info_ptr->offset_unit_type;
+ return (PNG_INFO_oFFs);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+png_uint_32
+png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+ png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
+ png_charp *units, png_charpp *params)
+{
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_pCAL &&
+ purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+ nparams != NULL && units != NULL && params != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "pCAL");
+ *purpose = info_ptr->pcal_purpose;
+ *X0 = info_ptr->pcal_X0;
+ *X1 = info_ptr->pcal_X1;
+ *type = (int)info_ptr->pcal_type;
+ *nparams = (int)info_ptr->pcal_nparams;
+ *units = info_ptr->pcal_units;
+ *params = info_ptr->pcal_params;
+ return (PNG_INFO_pCAL);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+png_uint_32
+png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+ png_uint_32 retval = 0;
+
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_pHYs)
+ {
+ png_debug1(1, "in %s retrieval function\n", "pHYs");
+ if (res_x != NULL)
+ {
+ *res_x = info_ptr->x_pixels_per_unit;
+ retval |= PNG_INFO_pHYs;
+ }
+ if (res_y != NULL)
+ {
+ *res_y = info_ptr->y_pixels_per_unit;
+ retval |= PNG_INFO_pHYs;
+ }
+ if (unit_type != NULL)
+ {
+ *unit_type = (int)info_ptr->phys_unit_type;
+ retval |= PNG_INFO_pHYs;
+ }
+ }
+ return (retval);
+}
+#endif
+
+png_uint_32
+png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+ int *num_palette)
+{
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_PLTE &&
+ palette != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "PLTE");
+ *palette = info_ptr->palette;
+ *num_palette = info_ptr->num_palette;
+ png_debug1(3, "num_palette = %d\n", *num_palette);
+ return (PNG_INFO_PLTE);
+ }
+ return (0);
+}
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+png_uint_32
+png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+{
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_sBIT &&
+ sig_bit != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "sBIT");
+ *sig_bit = &(info_ptr->sig_bit);
+ return (PNG_INFO_sBIT);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+png_uint_32
+png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
+ int *num_text)
+{
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
+ {
+ png_debug1(1, "in %s retrieval function\n",
+ (png_ptr->chunk_name[0] == '\0' ? "text"
+ : (png_const_charp)png_ptr->chunk_name));
+ if (text_ptr != NULL)
+ *text_ptr = info_ptr->text;
+ if (num_text != NULL)
+ *num_text = info_ptr->num_text;
+ return ((png_uint_32)info_ptr->num_text);
+ }
+ return(0);
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+png_uint_32
+png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+{
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_tIME &&
+ mod_time != NULL)
+ {
+ png_debug1(1, "in %s retrieval function\n", "tIME");
+ *mod_time = &(info_ptr->mod_time);
+ return (PNG_INFO_tIME);
+ }
+ return (0);
+}
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+png_uint_32
+png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+ png_bytep *trans, int *num_trans, png_color_16p *trans_values)
+{
+ png_uint_32 retval = 0;
+ if (png_ptr != NULL && info_ptr != NULL && info_ptr->valid & PNG_INFO_tRNS)
+ {
+ png_debug1(1, "in %s retrieval function\n", "tRNS");
+ if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (trans != NULL)
+ {
+ *trans = info_ptr->trans;
+ retval |= PNG_INFO_tRNS;
+ }
+ if (trans_values != NULL)
+ *trans_values = &(info_ptr->trans_values);
+ }
+ else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
+ {
+ if (trans_values != NULL)
+ {
+ *trans_values = &(info_ptr->trans_values);
+ retval |= PNG_INFO_tRNS;
+ }
+ if(trans != NULL)
+ *trans = NULL;
+ }
+ if(num_trans != NULL)
+ {
+ *num_trans = info_ptr->num_trans;
+ retval |= PNG_INFO_tRNS;
+ }
+ }
+ return (retval);
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+png_byte
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+ return png_ptr->rgb_to_gray_status;
+}
+#endif
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/INSTALL
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/INSTALL (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/INSTALL Sat Jul 13 19:23:18 2002
@@ -0,0 +1,91 @@
+
+Installing libpng version 1.0.3 - January 14, 1999
+
+Before installing libpng, you must first install zlib. zlib
+can usually be found wherever you got libpng. zlib can be
+placed in another directory, at the same level as libpng.
+Note that your system might already have a preinstalled
+zlib, but you will still need to have access to the
+zlib.h and zconf.h include files that correspond to the
+version of zlib that's installed.
+
+You can rename the directories that you downloaded (they
+might be called "libpng-1.0.3" or "lpng103" and "zlib-1.1.3"
+or "zlib113") so that you have directories called "zlib" and "libpng".
+
+Your directory structure should look like this:
+
+ .. (the parent directory)
+ libpng (this directory)
+ INSTALL (this file)
+ README
+ *.h
+ *.c
+ scripts
+ makefile.*
+ pngtest.png
+ etc.
+ zlib
+ README
+ *.h
+ *.c
+ contrib
+ etc.
+
+First enter the zlib directory and follow the instructions
+in zlib/README. Then come back here and choose the
+appropriate makefile.sys in the scripts directory.
+The files that are presently available in the scripts directory
+include
+
+ descrip.mms => VMS makefile for MMS or MMK
+ makefile.std => Generic UNIX makefile
+ makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr
+ makefile.dec => DEC Alpha UNIX makefile
+ makefile.hux => HPUX (10.20 and 11.00) makefile
+ makefile.sgi => Silicon Graphics IRIX makefile
+ makefile.sun => Sun makefile
+ makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0)
+ makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0)
+ makefile.mip => MIPS makefile
+ makefile.aco => Acorn makefile
+ makefile.ama => Amiga makefile
+ smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
+ (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
+ makefile.atr => Atari makefile
+ makefile.bor => Borland makefile
+ build.bat => MS-DOS batch file for Borland compiler
+ makefile.dj2 => DJGPP 2 makefile
+ makefile.msc => Microsoft C makefile
+ makefile.w32 => makefile for Microsoft Visual C++ 4.0 and later
+ makefile.tc3 => Turbo C 3.0 makefile
+ makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
+ pngos2.def => OS/2 module definition file used by makefile.os2
+ makefile.wat => Watcom 10a+ Makefile, 32-bit flat memory model
+ makevms.com => VMS build script
+ pngdll.mak => To make a png32bd.dll with Borland C++ 4.5
+ pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5
+
+Copy the file (or files) that you need from the
+scripts directory into this directory, for example
+
+ MSDOS example: copy scripts\makefile.msd makefile
+ UNIX example: cp scripts/makefile.std makefile
+
+Read the makefile to see if you need to change any source or
+target directories to match your preferences.
+
+Then read pngconf.h to see if you want to make any configuration
+changes.
+
+Then just run "make test" which will create the libpng library in
+this directory and run a quick test that reads the "pngtest.png"
+file and writes a "pngout.png" file that should be identical to it.
+
+Most of the makefiles will allow you to run "make install" to
+put the library in its final resting place (if you want to
+do that, run "make install" in the zlib directory first if necessary).
+
+Further information can be found in the README and libpng.txt
+files, in the individual makefiles, and in png.h, and the manual
+pages libpng.3 and png.5.
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/CHANGES
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/CHANGES (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/CHANGES Sat Jul 13 19:23:18 2002
@@ -0,0 +1,389 @@
+CHANGES - changes for libpng
+
+version 0.2
+ added reader into png.h
+ fixed small problems in stub file
+version 0.3
+ added pull reader
+ split up pngwrite.c to several files
+ added pnglib.txt
+ added example.c
+ cleaned up writer, adding a few new tranformations
+ fixed some bugs in writer
+ interfaced with zlib 0.5
+ added K&R support
+ added check for 64 KB blocks for 16 bit machines
+version 0.4
+ cleaned up code and commented code
+ simplified time handling into png_time
+ created png_color_16 and png_color_8 to handle color needs
+ cleaned up color type defines
+ fixed various bugs
+ made various names more consistant
+ interfaced with zlib 0.71
+ cleaned up zTXt reader and writer (using zlib's Reset functions)
+ split transformations into pngrtran.c and pngwtran.c
+version 0.5
+ interfaced with zlib 0.8
+ fixed many reading and writing bugs
+ saved using 3 spaces instead of tabs
+version 0.6
+ added png_large_malloc() and png_large_free()
+ added png_size_t
+ cleaned up some compiler warnings
+ added png_start_read_image()
+version 0.7
+ cleaned up lots of bugs
+ finished dithering and other stuff
+ added test program
+ changed name from pnglib to libpng
+version 0.71 [June, 1995]
+ changed pngtest.png for zlib 0.93
+ fixed error in libpng.txt and example.c
+version 0.8
+ cleaned up some bugs
+ added png_set_filler()
+ split up pngstub.c into pngmem.c, pngio.c, and pngerror.c
+ added #define's to remove unwanted code
+ moved png_info_init() to png.c
+ added old_size into png_realloc()
+ added functions to manually set filtering and compression info
+ changed compression parameters based on image type
+ optimized filter selection code
+ added version info
+ changed external functions passing floats to doubles (k&r problems?)
+ put all the configurable stuff in pngconf.h
+ enabled png_set_shift to work with paletted images on read
+ added png_read_update_info() - updates info structure with
+ transformations
+version 0.81 [August, 1995]
+ incorporated Tim Wegner's medium model code (thanks, Tim)
+version 0.82 [September, 1995]
+ [unspecified changes]
+version 0.85 [December, 1995]
+ added more medium model code (almost everything's a far)
+ added i/o, error, and memory callback functions
+ fixed some bugs (16 bit, 4 bit interlaced, etc.)
+ added first run progressive reader (barely tested)
+version 0.86 [January, 1996]
+ fixed bugs
+ improved documentation
+version 0.87 [January, 1996]
+ fixed medium model bugs
+ fixed other bugs introduced in 0.85 and 0.86
+ added some minor documentation
+version 0.88 [January, 1996]
+ fixed progressive bugs
+ replaced tabs with spaces
+ cleaned up documentation
+ added callbacks for read/write and warning/error functions
+version 0.89 [July, 1996]
+ added new initialization API to make libpng work better with shared libs
+ we now have png_create_read_struct(), png_create_write_struct(),
+ png_create_info_struct(), png_destroy_read_struct(), and
+ png_destroy_write_struct() instead of the separate calls to
+ malloc and png_read_init(), png_info_init(), and png_write_init()
+ changed warning/error callback functions to fix bug - this means you
+ should use the new initialization API if you were using the old
+ png_set_message_fn() calls, and that the old API no longer exists
+ so that people are aware that they need to change their code
+ changed filter selection API to allow selection of multiple filters
+ since it didn't work in previous versions of libpng anyways
+ optimized filter selection code
+ fixed png_set_background() to allow using an arbitrary RGB color for
+ paletted images
+ fixed gamma and background correction for paletted images, so
+ png_correct_palette is not needed unless you are correcting an
+ external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED
+ in pngconf.h) - if nobody uses this, it may disappear in the future.
+ fixed bug with Borland 64K memory allocation (Alexander Lehmann)
+ fixed bug in interlace handling (Smarasderagd, I think)
+ added more error checking for writing and image to reduce invalid files
+ separated read and write functions so that they won't both be linked
+ into a binary when only reading or writing functionality is used
+ new pngtest image also has interlacing and zTXt
+ updated documentation to reflect new API
+version 0.90 [January, 1997]
+ made CRC errors/warnings on critical and ancillary chunks configurable
+ libpng will use the zlib CRC routines by (compile-time) default
+ changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)
+ added external C++ wrapper statements to png.h (Gilles Dauphin)
+ allow PNG file to be read when some or all of file signature has already
+ been read from the beginning of the stream. ****This affects the size
+ of info_struct and invalidates all programs that use a shared libpng****
+ fixed png_filler() declarations
+ fixed? background color conversions
+ fixed order of error function pointers to match documentation
+ current chunk name is now available in png_struct to reduce the number
+ of nearly identical error messages (will simplify multi-lingual
+ support when available)
+ try to get ready for unknown-chunk callback functions:
+ - previously read critical chunks are flagged, so the chunk handling
+ routines can determine if the chunk is in the right place
+ - all chunk handling routines have the same prototypes, so we will
+ be able to handle all chunks via a callback mechanism
+ try to fix Linux "setjmp" buffer size problems
+version 0.95 [March, 1997]
+ fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never
+ fixed bug in PNG file signature compares when start != 0
+ changed parameter type of png_set_filler(...filler...) from png_byte
+ to png_uint_32
+ added test for MACOS to ensure that both math.h and fp.h are not #included
+ added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)
+ added "packswap" transformation, which changes the endianness of
+ packed-pixel bytes (Kevin Bracey)
+ added "strip_alpha" transformation, which removes the alpha channel of
+ input images without using it (not neccesarily a good idea)
+ added "swap_alpha" transformation, which puts the alpha channel in front
+ of the color bytes instead of after
+ removed all implicit variable tests which assume NULL == 0 (I think)
+ changed several variables to "png_size_t" to show 16/32-bit limitations
+ added new pCAL chunk read/write support
+ added experimental filter selection weighting (Greg Roelofs)
+ removed old png_set_rgbx() and png_set_xrgb() functions that have been
+ obsolete for about 2 years now (use png_set_filler() instead)
+ added macros to read 16- and 32-bit ints directly from buffer, to be
+ used only on those systems that support it (namely PowerPC and 680x0)
+ With some testing, this may become the default for MACOS/PPC systems.
+ only calculate CRC on data if we are going to use it
+ added macros for zTXt compression type PNG_zTXt_COMPRESSION_???
+ added macros for simple libpng debugging output selectable at compile time
+ removed PNG_READ_END_MODE in progressive reader (Smarasderagd)
+ more description of info_struct in libpng.txt and png.h
+ more instructions in example.c
+ more chunk types tested in pngtest.c
+ renamed pngrcb.c to pngset.c, and all png_read_<chunk> functions to be
+ png_set_<chunk>. We now have corresponding png_get_<chunk>
+ functions in pngget.c to get infomation in info_ptr. This isolates
+ the application from the internal organization of png_info_struct
+ (good for shared library implementations).
+version 0.96 [May, 1997]
+ fixed serious bug with < 8bpp images introduced in 0.95
+ fixed 256-color transparency bug (Greg Roelofs)
+ fixed up documentation (Greg Roelofs, Laszlo Nyul)
+ fixed "error" in pngconf.h for Linux setjmp() behaviour
+ fixed DOS medium model support (Tim Wegner)
+ fixed png_check_keyword() for case with error in static string text
+ added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
+ added typecasts to quiet compiler errors
+ added more debugging info
+version 0.97 [January, 1998]
+ removed PNG_USE_OWN_CRC capability
+ relocated png_set_crc_action from pngrutil.c to pngrtran.c
+ fixed typecasts of "new_key", etc. (Andreas Dilger)
+ added RFC 1152 [sic] date support
+ fixed bug in gamma handling of 4-bit grayscale
+ added 2-bit grayscale gamma handling (Glenn R-P)
+ added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)
+ minor corrections in libpng.txt
+ added simple sRGB support (Glenn R-P)
+ easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
+ all configurable options can be selected from command-line instead
+ of having to edit pngconf.h (Glenn R-P)
+ fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
+ added more conditions for png_do_background, to avoid changing
+ black pixels to background when a background is supplied and
+ no pixels are transparent
+ repaired PNG_NO_STDIO behaviour
+ tested NODIV support and made it default behaviour (Greg Roelofs)
+ added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)
+ regularized version numbering scheme and bumped shared-library major
+ version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)
+version 0.98 [January, 1998]
+ cleaned up some typos in libpng.txt and in code documentation
+ fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)
+ cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c
+ changed recommendation about file_gamma for PC images to .51 from .45,
+ in example.c and libpng.txt, added comments to distinguish between
+ screen_gamma, viewing_gamma, and display_gamma.
+ changed all references to RFC1152 to read RFC1123 and changed the
+ PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED
+ added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)
+ changed srgb_intent from png_byte to int to avoid compiler bugs
+version 0.99 [January 30, 1998]
+ free info_ptr->text instead of end_info_ptr->text in pngread.c (John Bowler)
+ fixed a longstanding "packswap" bug in pngtrans.c
+ fixed some inconsistencies in pngconf.h that prevented compiling with
+ PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined
+ fixed some typos and made other minor rearrangement of libpng.txt (Andreas)
+ changed recommendation about file_gamma for PC images to .50 from .51 in
+ example.c and libpng.txt, and changed file_gamma for sRGB images to .45
+ added a number of functions to access information from the png structure
+ png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)
+ added TARGET_MACOS similar to zlib-1.0.8
+ define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined
+ added type casting to all png_malloc() function calls
+version 0.99a [January 31, 1998]
+ Added type casts and parentheses to all returns that return a value.(Tim W.)
+version 0.99b [February 4, 1998]
+ Added type cast png_uint_32 on malloc function calls where needed.
+ Changed type of num_hist from png_uint_32 to int (same as num_palette).
+ Added checks for rowbytes overflow, in case png_size_t is less than 32 bits.
+ Renamed makefile.elf to makefile.lnx.
+version 0.99c [February 7, 1998]
+ More type casting. Removed erroneous overflow test in pngmem.c.
+ Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes.
+ Added UNIX manual pages libpng.3 (incorporating libpng.txt) and png.5.
+version 0.99d [February 11, 1998]
+ Renamed "far_to_near()" "png_far_to_near()"
+ Revised libpng.3
+ Version 99c "buffered" operations didn't work as intended. Replaced them
+ with png_memcpy_check() and png_memset_check().
+ Added many "if (png_ptr == NULL) return" to quell compiler warnings about
+ unused png_ptr, mostly in pngget.c and pngset.c.
+ Check for overlength tRNS chunk present when indexed-color PLTE is read.
+ Cleaned up spelling errors in libpng.3/libpng.txt
+ Corrected a problem with png_get_tRNS() which returned undefined trans array
+version 0.99e [February 28, 1998]
+ Corrected png_get_tRNS() again.
+ Add parentheses for easier reading of pngget.c, fixed "||" should be "&&".
+ Touched up example.c to make more of it compileable, although the entire
+ file still can't be compiled (Willem van Schaik)
+ Fixed a bug in png_do_shift() (Bryan Tsai)
+ Added a space in png.h prototype for png_write_chunk_start()
+ Replaced pngtest.png with one created with zlib 1.1.1
+ Changed pngtest to report PASS even when file size is different (Jean-loup G.)
+ Corrected some logic errors in png_do_invert_alpha() (Chris Patterson)
+version 0.99f [March 5, 1998]
+ Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey)
+ Moved makefiles into a "scripts" directory, and added INSTALL instruction file
+ Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok)
+ Added pointers to "note on libpng versions" in makefile.lnx and README
+ Added row callback feature when reading and writing nonprogressive rows
+ and added a test of this feature in pngtest.c
+ Added user transform callbacks, with test of the feature in pngtest.c
+version 0.99g [March 6, 1998, morning]
+ Minor changes to pngtest.c to suppress compiler warnings.
+ Removed "beta" language from documentation.
+version 0.99h [March 6, 1998, evening]
+ Minor changes to previous minor changes to pngtest.c
+ Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED
+ and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro
+version 1.00 [March 7, 1998]
+ Changed several typedefs in pngrutil.c
+ Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)
+ replaced "while(1)" with "for(;;)"
+ added PNGARG() to prototypes in pngtest.c and removed some prototypes
+ updated some of the makefiles (Tom Lane)
+ changed some typedefs (s_start, etc.) in pngrutil.c
+ fixed dimensions of "short_months" array in pngwrite.c
+ Replaced ansi2knr.c with the one from jpeg-v6
+version 1.0.0 [March 8, 1998]
+ Changed name from 1.00 to 1.0.0 (Adam Costello)
+ Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert)
+version 1.0.0a [March 9, 1998]
+ Fixed three bugs in pngrtran.c to make gamma+background handling consistent
+ (Greg Roelofs)
+ Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz
+ for major, minor, and bugfix releases. This is 10001. (Adam Costello,
+ Tom Lane)
+ Make months range from 1-12 in png_convert_to_rfc1123
+version 1.0.0b [March 13, 1998]
+ Quieted compiler complaints about two empty "for" loops in pngrutil.c
+ Minor changes to makefile.s2x
+ Removed #ifdef/#endif around a png_free() in pngread.c
+version 1.0.1 [March 14, 1998]
+ Changed makefile.s2x to reduce security risk of using a relative pathname
+ Fixed some typos in the documentation (Greg).
+ Fixed a problem with value of "channels" returned by png_read_update_info()
+version 1.0.1a [April 21, 1998]
+ Optimized Paeth calculations by replacing abs() function calls with intrinsics
+ plus other loop optimizations. Improves avg decoding speed by about 20%.
+ Commented out i386istic "align" compiler flags in makefile.lnx.
+ Reduced the default warning level in some makefiles, to make them consistent.
+ Removed references to IJG and JPEG in the ansi2knr.c copyright statement.
+ Fixed a bug in png_do_strip_filler with XXRRGGBB => RRGGBB transformation.
+ Added grayscale and 16-bit capability to png_do_read_filler().
+ Fixed a bug in pngset.c, introduced in version 0.99c, that sets rowbytes
+ too large when writing an image with bit_depth < 8 (Bob Dellaca).
+ Corrected some bugs in the experimental weighted filtering heuristics.
+ Moved a misplaced pngrutil code block that truncates tRNS if it has more
+ than num_palette entries -- test was done before num_palette was defined.
+ Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins).
+ Changed compiler flags in makefile.wat for better optimization (Pawel Mrochen).
+version 1.0.1b [May 2, 1998]
+ Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg).
+ Relocated the png_composite macros from pngrtran.c to png.h (Greg).
+ Added makefile.sco (contributed by Mike Hopkirk).
+ Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a.
+ Fixed a bug in pngrtran.c that would set channels=5 under some circumstances.
+ More work on the Paeth-filtering, achieving imperceptible speedup (A Kleinert).
+ More work on loop optimization which may help when compiled with C++ compilers.
+ Added warnings when people try to use transforms they've defined out.
+ Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran.
+ Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg)
+version 1.0.1c [May 11, 1998]
+ Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for
+ filler bytes should have been 0xff instead of 0xf.
+ Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images.
+ Moved PNG_WRITE_WEIGHTED_FILTER_SUPPORTED and PNG_WRITE_FLUSH_SUPPORTED
+ out of the PNG_WRITE_TRANSFORMS_NOT_SUPPORTED block of pngconf.h
+ Added "PNG_NO_WRITE_TRANSFORMS" etc., as alternatives for *_NOT_SUPPORTED,
+ for consistency, in pngconf.h
+ Added individual "ifndef PNG_NO_[CAPABILITY]" in pngconf.h to make it easier
+ to remove unwanted capabilities via the compile line
+ Made some corrections to grammar (which, it's) in documentation (Greg).
+ Corrected example.c, use of row_pointers in png_write_image().
+version 1.0.1d [May 24, 1998]
+ Corrected several statements that used side effects illegally in pngrutil.c
+ and pngtrans.c, that were introduced in version 1.0.1b
+ Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert)
+ More corrections to example.c, use of row_pointers in png_write_image()
+ and png_read_rows().
+ Added pngdll.mak and pngdef.pas to scripts directory, contributed by
+ Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5
+ Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.)
+ Changed several loops from count-down to count-up, for consistency.
+version 1.0.1e [June 6, 1998]
+ Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and
+ added warnings when people try to set png_read_fn and png_write_fn in
+ the same structure.
+ Added a test such that png_do_gamma will be done when num_trans==0
+ for truecolor images that have defined a background. This corrects an
+ error that was introduced in libpng-0.90 that can cause gamma processing
+ to be skipped.
+ Added tests in png.h to include "trans" and "trans_values" in structures
+ when PNG_READ_BACKGROUND_SUPPORTED or PNG_READ_EXPAND_SUPPORTED is defined.
+ Add png_free(png_ptr->time_buffer) in png_destroy_read_struct()
+ Moved png_convert_to_rfc_1123() from pngwrite.c to png.c
+ Added capability for user-provided malloc_fn() and free_fn() functions,
+ and revised pngtest.c to demonstrate their use, replacing the
+ PNGTEST_DEBUG_MEM feature.
+ Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner).
+version 1.0.2 [June 14, 1998]
+ Fixed two bugs in makefile.bor .
+version 1.0.2a [December 30, 1998]
+ Replaced and extended code that was removed from png_set_filler() in 1.0.1a.
+ Fixed a bug in png_do_filler() that made it fail to write filler bytes in
+ the left-most pixel of each row (Kevin Bracey).
+ Changed "static pngcharp tIME_string" to "static char tIME_string[30]"
+ in pngtest.c (Duncan Simpson).
+ Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk
+ even when no tIME chunk was present in the source file.
+ Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit.
+ Fixed a problem in png_read_push_finish_row(), which would not skip some
+ passes that it should skip, for images that are less than 3 pixels high.
+ Interchanged the order of calls to png_do_swap() and png_do_shift()
+ in pngwtran.c (John Cromer).
+ Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h .
+ Changed "bad adaptive filter type" from error to warning in pngrutil.c .
+ Fixed a documentation error about default filtering with 8-bit indexed-color.
+ Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO
+ (L. Peter Deutsch).
+ Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions.
+ Added png_get_copyright() and png_get_header_version() functions.
+ Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c
+ Added information about debugging in libpng.txt and libpng.3 .
+ Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and makefile.sco.
+ Removed lines after Dynamic Dependencies" in makefile.aco .
+ Revised makefile.dec to make a shared library (Jeremie Petit).
+ Removed trailing blanks from all files.
+version 1.0.2a [January 6, 1999]
+ Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h
+ Added "if" tests to silence complaints about unused png_ptr in png.h and png.c
+ Changed "check_if_png" function in example.c to return true (nonzero) if PNG.
+ Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()
+ which is obsolete.
+version 1.0.3 [January 14, 1999]
+ Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)
+ Added a statement of Y2K compliance in png.h, libpng.1, and Y2KINFO.
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsp Sat Jul 13 19:23:18 2002
@@ -0,0 +1,156 @@
+# Microsoft Developer Studio Project File - Name="png" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=png - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "png.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "png.mak" CFG="png - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "png - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "png - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "png - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "png - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir "!
"
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "png - Win32 Release"
+# Name "png - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\png.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngget.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngpread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngrutil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngset.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngtest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngtrans.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwio.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwtran.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\pngwutil.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.h Sat Jul 13 19:23:19 2002
@@ -0,0 +1,2227 @@
+
+/* png.h - header file for PNG reference library
+ *
+ * libpng version 1.0.3 - January 14, 1999
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * Y2K compliance in libpng:
+ * =========================
+ *
+ * January 13, 1999
+ *
+ * Since the PNG Development group is an ad-hoc body, we can't make
+ * an official declaration.
+ *
+ * This is your unofficial assurance that libpng from version 0.81 and
+ * upward are Y2K compliant. It is my belief that earlier versions were
+ * also Y2K compliant.
+ *
+ * Libpng only has three year fields. One is a 2-byte unsigned integer
+ * that will hold years up to 65535. The other two hold the date in text
+ * format, and will hold years up to 9999.
+ *
+ * The integer is
+ * "png_uint_16 year" in png_time_struct.
+ *
+ * The strings are
+ * "png_charp time_buffer" in png_struct and
+ * "near_time_buffer", which is a local character string in png.c.
+ *
+ * There are seven time-related functions:
+ * png.c: png_convert_to_rfc_1123() in png.c
+ * (formerly png_convert_to_rfc_1152() in error)
+ * png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ * png_convert_from_time_t() in pngwrite.c
+ * png_get_tIME() in pngget.c
+ * png_handle_tIME() in pngrutil.c, called in pngread.c
+ * png_set_tIME() in pngset.c
+ * png_write_tIME() in pngwutil.c, called in pngwrite.c
+ *
+ * All handle dates properly in a Y2K environment. The
+ * png_convert_from_time_t() function calls gmtime() to convert from system
+ * clock time, which returns (year - 1900), which we properly convert to
+ * the full 4-digit year. There is a possibility that applications using
+ * libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ * function, or incorrectly passing only a 2-digit year instead of
+ * "year - 1900" into the png_convert_from_struct_tm() function, but this
+ * is not under our control. The libpng documentation has always stated
+ * that it works with 4-digit years, and the APIs have been documented as
+ * such.
+ *
+ * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned
+ * integer to hold the year, and can hold years as large as 65535.
+ *
+ *
+ * Glenn Randers-Pehrson
+ * libpng maintainer
+ * PNG Development Group
+ *
+ * Note about libpng version numbers:
+ *
+ * Due to various miscommunications, unforeseen code incompatibilities
+ * and occasional factors outside the authors' control, version numbering
+ * on the library has not always been consistent and straightforward.
+ * The following table summarizes matters since version 0.89c, which was
+ * the first widely used release:
+ *
+ * source png.h png.h shared-lib
+ * version string int version
+ * ------- ------ ----- ----------
+ * 0.89c ("1.0 beta 3") 0.89 89 1.0.89
+ * 0.90 ("1.0 beta 4") 0.90 90 0.90 [should have been 2.0.90]
+ * 0.95 ("1.0 beta 5") 0.95 95 0.95 [should have been 2.0.95]
+ * 0.96 ("1.0 beta 6") 0.96 96 0.96 [should have been 2.0.96]
+ * 0.97b ("1.00.97 beta 7") 1.00.97 97 1.0.1 [should have been 2.0.97]
+ * 0.97c 0.97 97 2.0.97
+ * 0.98 0.98 98 2.0.98
+ * 0.99 0.99 98 2.0.99
+ * 0.99a-m 0.99 99 2.0.99
+ * 1.00 1.00 100 2.1.0 [int should be 10000]
+ * 1.0.0 1.0.0 100 2.1.0 [int should be 10000]
+ * 1.0.1 1.0.1 10001 2.1.0
+ * 1.0.1a-e 1.0.1a-e 10002 2.1.0.1a-e
+ * 1.0.2 1.0.2 10002 2.1.0.2
+ * 1.0.2a-c 1.0.2a 10003 2.1.0.2a-c
+ * 1.0.3 1.0.3 10003 2.1.0.3
+ *
+ * Henceforth the source version will match the shared-library minor
+ * and patch numbers; the shared-library major version number will be
+ * used for changes in backward compatibility, as it is intended. The
+ * PNG_PNGLIB_VER macro, which is not used within libpng but is available
+ * for applications, is an unsigned integer of the form xyyzz corresponding
+ * to the source version x.y.z (leading zeros in y and z).
+ *
+ * See libpng.txt or libpng.3 for more information. The PNG specification
+ * is available as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/>
+ * and as a W3C Recommendation <http://www.w3.org/TR/REC.png.html>
+ *
+ * Contributing Authors:
+ * John Bowler
+ * Kevin Bracey
+ * Sam Bushell
+ * Andreas Dilger
+ * Magnus Holmgren
+ * Tom Lane
+ * Dave Martindale
+ * Glenn Randers-Pehrson
+ * Greg Roelofs
+ * Guy Eric Schalnat
+ * Paul Schmidt
+ * Tom Tanner
+ * Willem van Schaik
+ * Tim Wegner
+ *
+ * The contributing authors would like to thank all those who helped
+ * with testing, bug fixes, and patience. This wouldn't have been
+ * possible without all of you.
+ *
+ * Thanks to Frank J. T. Wojcik for helping with the documentation.
+ *
+ * COPYRIGHT NOTICE:
+ *
+ * The PNG Reference Library is supplied "AS IS". The Contributing Authors
+ * and Group 42, Inc. disclaim all warranties, expressed or implied,
+ * including, without limitation, the warranties of merchantability and of
+ * fitness for any purpose. The Contributing Authors and Group 42, Inc.
+ * assume no liability for direct, indirect, incidental, special, exemplary,
+ * or consequential damages, which may result from the use of the PNG
+ * Reference Library, even if advised of the possibility of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * source code, or portions hereof, for any purpose, without fee, subject
+ * to the following restrictions:
+ * 1. The origin of this source code must not be misrepresented.
+ * 2. Altered versions must be plainly marked as such and must not be
+ * misrepresented as being the original source.
+ * 3. This Copyright notice may not be removed or altered from any source or
+ * altered source distribution.
+ *
+ * The Contributing Authors and Group 42, Inc. specifically permit, without
+ * fee, and encourage the use of this source code as a component to
+ * supporting the PNG file format in commercial products. If you use this
+ * source code in a product, acknowledgment is not required but would be
+ * appreciated.
+ */
+
+
+#ifndef _PNG_H
+#define _PNG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* This is not the place to learn how to use libpng. The file libpng.txt
+ * describes how to use libpng, and the file example.c summarizes it
+ * with some code on which to build. This file is useful for looking
+ * at the actual function definitions and structure components.
+ */
+
+/* include the compression library's header */
+#include "zlib.h"
+
+/* include all user configurable info */
+#include "pngconf.h"
+
+/* This file is arranged in several sections. The first section contains
+ * structure and type definitions. The second section contains the external
+ * library functions, while the third has the internal library functions,
+ * which applications aren't expected to use directly.
+ */
+
+/* Version information for png.h - this should match the version in png.c */
+#define PNG_LIBPNG_VER_STRING "1.0.3"
+
+/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
+ * We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
+ * version 1.0.0 was mis-numbered 100 instead of 10000). From
+ * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=bugfix */
+#define PNG_LIBPNG_VER 10003 /* 1.0.3 */
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Version information for C files, stored in png.c. This had better match
+ * the version above.
+ */
+extern char png_libpng_ver[12]; /* need room for 99.99.99aa */
+
+/* Structures to facilitate easy interlacing. See png.c for more details */
+extern int FARDATA png_pass_start[7];
+extern int FARDATA png_pass_inc[7];
+extern int FARDATA png_pass_ystart[7];
+extern int FARDATA png_pass_yinc[7];
+extern int FARDATA png_pass_mask[7];
+extern int FARDATA png_pass_dsp_mask[7];
+/* These aren't currently used. If you need them, see png.c for more details
+extern int FARDATA png_pass_width[7];
+extern int FARDATA png_pass_height[7];
+*/
+
+#endif /* PNG_NO_EXTERN */
+
+/* Three color definitions. The order of the red, green, and blue, (and the
+ * exact size) is not important, although the size of the fields need to
+ * be png_byte or png_uint_16 (as defined below).
+ */
+typedef struct png_color_struct
+{
+ png_byte red;
+ png_byte green;
+ png_byte blue;
+} png_color;
+typedef png_color FAR * png_colorp;
+typedef png_color FAR * FAR * png_colorpp;
+
+typedef struct png_color_16_struct
+{
+ png_byte index; /* used for palette files */
+ png_uint_16 red; /* for use in red green blue files */
+ png_uint_16 green;
+ png_uint_16 blue;
+ png_uint_16 gray; /* for use in grayscale files */
+} png_color_16;
+typedef png_color_16 FAR * png_color_16p;
+typedef png_color_16 FAR * FAR * png_color_16pp;
+
+typedef struct png_color_8_struct
+{
+ png_byte red; /* for use in red green blue files */
+ png_byte green;
+ png_byte blue;
+ png_byte gray; /* for use in grayscale files */
+ png_byte alpha; /* for alpha channel files */
+} png_color_8;
+typedef png_color_8 FAR * png_color_8p;
+typedef png_color_8 FAR * FAR * png_color_8pp;
+
+/* png_text holds the text in a PNG file, and whether they are compressed
+ in the PNG file or not. The "text" field points to a regular C string. */
+typedef struct png_text_struct
+{
+ int compression; /* compression value, see PNG_TEXT_COMPRESSION_ */
+ png_charp key; /* keyword, 1-79 character description of "text" */
+ png_charp text; /* comment, may be an empty string (ie "") */
+ png_size_t text_length; /* length of "text" field */
+} png_text;
+typedef png_text FAR * png_textp;
+typedef png_text FAR * FAR * png_textpp;
+
+/* Supported compression types for text in PNG files (tEXt, and zTXt).
+ * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
+#define PNG_TEXT_COMPRESSION_NONE_WR -3
+#define PNG_TEXT_COMPRESSION_zTXt_WR -2
+#define PNG_TEXT_COMPRESSION_NONE -1
+#define PNG_TEXT_COMPRESSION_zTXt 0
+#define PNG_TEXT_COMPRESSION_LAST 1 /* Not a valid value */
+
+/* png_time is a way to hold the time in an machine independent way.
+ * Two conversions are provided, both from time_t and struct tm. There
+ * is no portable way to convert to either of these structures, as far
+ * as I know. If you know of a portable way, send it to me. As a side
+ * note - PNG is Year 2000 compliant!
+ */
+typedef struct png_time_struct
+{
+ png_uint_16 year; /* full year, as in, 1995 */
+ png_byte month; /* month of year, 1 - 12 */
+ png_byte day; /* day of month, 1 - 31 */
+ png_byte hour; /* hour of day, 0 - 23 */
+ png_byte minute; /* minute of hour, 0 - 59 */
+ png_byte second; /* second of minute, 0 - 60 (for leap seconds) */
+} png_time;
+typedef png_time FAR * png_timep;
+typedef png_time FAR * FAR * png_timepp;
+
+/* png_info is a structure that holds the information in a PNG file so
+ * that the application can find out the characteristics of the image.
+ * If you are reading the file, this structure will tell you what is
+ * in the PNG file. If you are writing the file, fill in the information
+ * you want to put into the PNG file, then call png_write_info().
+ * The names chosen should be very close to the PNG specification, so
+ * consult that document for information about the meaning of each field.
+ *
+ * With libpng < 0.95, it was only possible to directly set and read the
+ * the values in the png_info_struct, which meant that the contents and
+ * order of the values had to remain fixed. With libpng 0.95 and later,
+ * however, there are now functions that abstract the contents of
+ * png_info_struct from the application, so this makes it easier to use
+ * libpng with dynamic libraries, and even makes it possible to use
+ * libraries that don't have all of the libpng ancillary chunk-handing
+ * functionality.
+ *
+ * In any case, the order of the parameters in png_info_struct should NOT
+ * be changed for as long as possible to keep compatibility with applications
+ * that use the old direct-access method with png_info_struct.
+ */
+typedef struct png_info_struct
+{
+ /* the following are necessary for every PNG file */
+ png_uint_32 width; /* width of image in pixels (from IHDR) */
+ png_uint_32 height; /* height of image in pixels (from IHDR) */
+ png_uint_32 valid; /* valid chunk data (see PNG_INFO_ below) */
+ png_uint_32 rowbytes; /* bytes needed to hold an untransformed row */
+ png_colorp palette; /* array of color values (valid & PNG_INFO_PLTE) */
+ png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
+ png_uint_16 num_trans; /* number of transparent palette color (tRNS) */
+ png_byte bit_depth; /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
+ png_byte color_type; /* see PNG_COLOR_TYPE_ below (from IHDR) */
+ png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
+ png_byte filter_type; /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
+ png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+
+ /* The following is informational only on read, and not used on writes. */
+ png_byte channels; /* number of data channels per pixel (1, 3, 4)*/
+ png_byte pixel_depth; /* number of bits per pixel */
+ png_byte spare_byte; /* to align the data, and for future use */
+ png_byte signature[8]; /* magic bytes read by libpng from start of file */
+
+ /* The rest of the data is optional. If you are reading, check the
+ * valid field to see if the information in these are valid. If you
+ * are writing, set the valid field to those chunks you want written,
+ * and initialize the appropriate fields below.
+ */
+
+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_WRITE_gAMA_SUPPORTED) || \
+ defined(PNG_READ_GAMMA_SUPPORTED)
+ /* The gAMA chunk describes the gamma characteristics of the system
+ * on which the image was created, normally in the range [1.0, 2.5].
+ * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+ */
+ float gamma; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
+#endif /* PNG_READ_gAMA_SUPPORTED || PNG_WRITE_gAMA_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED)
+ /* GR-P, 0.96a */
+ /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
+ png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
+#endif /* PNG_READ_sRGB_SUPPORTED || PNG_WRITE_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+ defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+ /* The tEXt and zTXt chunks contain human-readable textual data in
+ * uncompressed and compressed forms, respectively. The data in "text"
+ * is an array of pointers to uncompressed, null-terminated C strings.
+ * Each chunk has a keyword that describes the textual data contained
+ * in that chunk. Keywords are not required to be unique, and the text
+ * string may be empty. Any number of text chunks may be in an image.
+ */
+ int num_text; /* number of comments read/to write */
+ int max_text; /* current size of text array */
+ png_textp text; /* array of comments read/to write */
+#endif /* PNG_READ_OR_WRITE_tEXt_OR_zTXt_SUPPORTED */
+#if defined(PNG_READ_tIME_SUPPORTED) || defined(PNG_WRITE_tIME_SUPPORTED)
+ /* The tIME chunk holds the last time the displayed image data was
+ * modified. See the png_time struct for the contents of this struct.
+ */
+ png_time mod_time;
+#endif /* PNG_READ_tIME_SUPPORTED || PNG_WRITE_tIME_SUPPORTED */
+#if defined(PNG_READ_sBIT_SUPPORTED) || defined(PNG_WRITE_sBIT_SUPPORTED)
+ /* The sBIT chunk specifies the number of significant high-order bits
+ * in the pixel data. Values are in the range [1, bit_depth], and are
+ * only specified for the channels in the pixel data. The contents of
+ * the low-order bits is not specified. Data is valid if
+ * (valid & PNG_INFO_sBIT) is non-zero.
+ */
+ png_color_8 sig_bit; /* significant bits in color channels */
+#endif /* PNG_READ_sBIT_SUPPORTED || PNG_WRITE_sBIT_SUPPORTED */
+#if defined(PNG_READ_tRNS_SUPPORTED) || defined(PNG_WRITE_tRNS_SUPPORTED) || \
+ defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ /* The tRNS chunk supplies transparency data for paletted images and
+ * other image types that don't need a full alpha channel. There are
+ * "num_trans" transparency values for a paletted image, stored in the
+ * same order as the palette colors, starting from index 0. Values
+ * for the data are in the range [0, 255], ranging from fully transparent
+ * to fully opaque, respectively. For non-paletted images, there is a
+ * single color specified that should be treated as fully transparent.
+ * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
+ */
+ png_bytep trans; /* transparent values for paletted image */
+ png_color_16 trans_values; /* transparent color for non-palette image */
+#endif /* PNG_READ_tRNS_SUPPORTED || PNG_WRITE_tRNS_SUPPORTED */
+#if defined(PNG_READ_bKGD_SUPPORTED) || defined(PNG_WRITE_bKGD_SUPPORTED) || \
+ defined(PNG_READ_BACKGROUND_SUPPORTED)
+ /* The bKGD chunk gives the suggested image background color if the
+ * display program does not have its own background color and the image
+ * is needs to composited onto a background before display. The colors
+ * in "background" are normally in the same color space/depth as the
+ * pixel data. Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
+ */
+ png_color_16 background;
+#endif /* PNG_READ_bKGD_SUPPORTED || PNG_WRITE_bKGD_SUPPORTED */
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+ /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
+ * and downwards from the top-left corner of the display, page, or other
+ * application-specific co-ordinate space. See the PNG_OFFSET_ defines
+ * below for the unit types. Valid if (valid & PNG_INFO_oFFs) non-zero.
+ */
+ png_uint_32 x_offset; /* x offset on page */
+ png_uint_32 y_offset; /* y offset on page */
+ png_byte offset_unit_type; /* offset units type */
+#endif /* PNG_READ_oFFs_SUPPORTED || PNG_WRITE_oFFs_SUPPORTED */
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+ /* The pHYs chunk gives the physical pixel density of the image for
+ * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
+ * defines below). Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
+ */
+ png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
+ png_uint_32 y_pixels_per_unit; /* vertical pixel density */
+ png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
+#endif /* PNG_READ_pHYs_SUPPORTED || PNG_WRITE_pHYs_SUPPORTED */
+#if defined(PNG_READ_hIST_SUPPORTED) || defined(PNG_WRITE_hIST_SUPPORTED)
+ /* The hIST chunk contains the relative frequency or importance of the
+ * various palette entries, so that a viewer can intelligently select a
+ * reduced-color palette, if required. Data is an array of "num_palette"
+ * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
+ * is non-zero.
+ */
+ png_uint_16p hist;
+#endif /* PNG_READ_hIST_SUPPORTED || PNG_WRITE_hIST_SUPPORTED */
+#if defined(PNG_READ_cHRM_SUPPORTED) || defined(PNG_WRITE_cHRM_SUPPORTED)
+ /* The cHRM chunk describes the CIE color characteristics of the monitor
+ * on which the PNG was created. This data allows the viewer to do gamut
+ * mapping of the input image to ensure that the viewer sees the same
+ * colors in the image as the creator. Values are in the range
+ * [0.0, 0.8]. Data valid if (valid & PNG_INFO_cHRM) non-zero.
+ */
+ float x_white;
+ float y_white;
+ float x_red;
+ float y_red;
+ float x_green;
+ float y_green;
+ float x_blue;
+ float y_blue;
+#endif /* PNG_READ_cHRM_SUPPORTED || PNG_WRITE_cHRM_SUPPORTED */
+#if defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED)
+ /* The pCAL chunk describes a transformation between the stored pixel
+ * values and original physcical data values used to create the image.
+ * The integer range [0, 2^bit_depth - 1] maps to the floating-point
+ * range given by [pcal_X0, pcal_X1], and are further transformed by a
+ * (possibly non-linear) transformation function given by "pcal_type"
+ * and "pcal_params" into "pcal_units". Please see the PNG_EQUATION_
+ * defines below, and the PNG-Group's Scientific Visualization extension
+ * chunks document png-scivis-19970203 for a complete description of the
+ * transformations and how they should be implemented, as well as the
+ * png-extensions document for a description of the ASCII parameter
+ * strings. Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+ */
+ png_charp pcal_purpose; /* pCAL chunk description string */
+ png_int_32 pcal_X0; /* minimum value */
+ png_int_32 pcal_X1; /* maximum value */
+ png_charp pcal_units; /* Latin-1 string giving physical units */
+ png_charpp pcal_params; /* ASCII strings containing parameter values */
+ png_byte pcal_type; /* equation type (see PNG_EQUATION_ below) */
+ png_byte pcal_nparams; /* number of parameters given in pcal_params */
+#endif /* PNG_READ_pCAL_SUPPORTED || PNG_WRITE_pCAL_SUPPORTED */
+} png_info;
+typedef png_info FAR * png_infop;
+typedef png_info FAR * FAR * png_infopp;
+
+/* These describe the color_type field in png_info. */
+/* color type masks */
+#define PNG_COLOR_MASK_PALETTE 1
+#define PNG_COLOR_MASK_COLOR 2
+#define PNG_COLOR_MASK_ALPHA 4
+
+/* color types. Note that not all combinations are legal */
+#define PNG_COLOR_TYPE_GRAY 0
+#define PNG_COLOR_TYPE_PALETTE (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
+#define PNG_COLOR_TYPE_RGB (PNG_COLOR_MASK_COLOR)
+#define PNG_COLOR_TYPE_RGB_ALPHA (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
+#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
+
+/* This is for compression type. PNG 1.0 only defines the single type. */
+#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
+#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
+
+/* This is for filter type. PNG 1.0 only defines the single type. */
+#define PNG_FILTER_TYPE_BASE 0 /* Single row per-byte filtering */
+#define PNG_FILTER_TYPE_DEFAULT PNG_FILTER_TYPE_BASE
+
+/* These are for the interlacing type. These values should NOT be changed. */
+#define PNG_INTERLACE_NONE 0 /* Non-interlaced image */
+#define PNG_INTERLACE_ADAM7 1 /* Adam7 interlacing */
+#define PNG_INTERLACE_LAST 2 /* Not a valid value */
+
+/* These are for the oFFs chunk. These values should NOT be changed. */
+#define PNG_OFFSET_PIXEL 0 /* Offset in pixels */
+#define PNG_OFFSET_MICROMETER 1 /* Offset in micrometers (1/10^6 meter) */
+#define PNG_OFFSET_LAST 2 /* Not a valid value */
+
+/* These are for the pCAL chunk. These values should NOT be changed. */
+#define PNG_EQUATION_LINEAR 0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E 1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST 4 /* Not a valid value */
+
+/* These are for the pHYs chunk. These values should NOT be changed. */
+#define PNG_RESOLUTION_UNKNOWN 0 /* pixels/unknown unit (aspect ratio) */
+#define PNG_RESOLUTION_METER 1 /* pixels/meter */
+#define PNG_RESOLUTION_LAST 2 /* Not a valid value */
+
+/* These are for the sRGB chunk. These values should NOT be changed. */
+#define PNG_sRGB_INTENT_SATURATION 0
+#define PNG_sRGB_INTENT_PERCEPTUAL 1
+#define PNG_sRGB_INTENT_ABSOLUTE 2
+#define PNG_sRGB_INTENT_RELATIVE 3
+#define PNG_sRGB_INTENT_LAST 4 /* Not a valid value */
+
+
+
+/* These determine if an ancillary chunk's data has been successfully read
+ * from the PNG header, or if the application has filled in the corresponding
+ * data in the info_struct to be written into the output file. The values
+ * of the PNG_INFO_<chunk> defines should NOT be changed.
+ */
+#define PNG_INFO_gAMA 0x0001
+#define PNG_INFO_sBIT 0x0002
+#define PNG_INFO_cHRM 0x0004
+#define PNG_INFO_PLTE 0x0008
+#define PNG_INFO_tRNS 0x0010
+#define PNG_INFO_bKGD 0x0020
+#define PNG_INFO_hIST 0x0040
+#define PNG_INFO_pHYs 0x0080
+#define PNG_INFO_oFFs 0x0100
+#define PNG_INFO_tIME 0x0200
+#define PNG_INFO_pCAL 0x0400
+#define PNG_INFO_sRGB 0x0800 /* GR-P, 0.96a */
+
+/* This is used for the transformation routines, as some of them
+ * change these values for the row. It also should enable using
+ * the routines for other purposes.
+ */
+typedef struct png_row_info_struct
+{
+ png_uint_32 width; /* width of row */
+ png_uint_32 rowbytes; /* number of bytes in row */
+ png_byte color_type; /* color type of row */
+ png_byte bit_depth; /* bit depth of row */
+ png_byte channels; /* number of channels (1, 2, 3, or 4) */
+ png_byte pixel_depth; /* bits per pixel (depth * channels) */
+} png_row_info;
+
+typedef png_row_info FAR * png_row_infop;
+typedef png_row_info FAR * FAR * png_row_infopp;
+
+/* These are the function types for the I/O functions and for the functions
+ * that allow the user to override the default I/O functions with his or her
+ * own. The png_error_ptr type should match that of user-supplied warning
+ * and error functions, while the png_rw_ptr type should match that of the
+ * user read/write data functions.
+ */
+typedef struct png_struct_def png_struct;
+typedef png_struct FAR * png_structp;
+
+typedef void (*png_error_ptr) PNGARG((png_structp, png_const_charp));
+typedef void (*png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
+typedef void (*png_flush_ptr) PNGARG((png_structp));
+typedef void (*png_read_status_ptr) PNGARG((png_structp, png_uint_32, int));
+typedef void (*png_write_status_ptr) PNGARG((png_structp, png_uint_32, int));
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+typedef void (*png_progressive_info_ptr) PNGARG((png_structp, png_infop));
+typedef void (*png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+typedef void (*png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+ png_uint_32, int));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+typedef void (*png_user_transform_ptr) PNGARG((png_structp,
+ png_row_infop, png_bytep));
+#endif /* PNG_READ|WRITE_USER_TRANSFORM_SUPPORTED */
+
+typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
+typedef void (*png_free_ptr) PNGARG((png_structp, png_structp));
+
+/* The structure that holds the information to read and write PNG files.
+ * The only people who need to care about what is inside of this are the
+ * people who will be modifying the library for their own special needs.
+ * It should NOT be accessed directly by an application, except to store
+ * the jmp_buf.
+ */
+
+struct png_struct_def
+{
+ jmp_buf jmpbuf; /* used in png_error */
+
+ png_error_ptr error_fn; /* function for printing errors and aborting */
+ png_error_ptr warning_fn; /* function for printing warnings */
+ png_voidp error_ptr; /* user supplied struct for error functions */
+ png_rw_ptr write_data_fn; /* function for writing output data */
+ png_rw_ptr read_data_fn; /* function for reading input data */
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+ png_user_transform_ptr read_user_transform_fn; /* user read transform */
+ png_user_transform_ptr write_user_transform_fn; /* user write transform */
+#endif
+ png_voidp io_ptr; /* ptr to application struct for I/O functions*/
+
+ png_uint_32 mode; /* tells us where we are in the PNG file */
+ png_uint_32 flags; /* flags indicating various things to libpng */
+ png_uint_32 transformations; /* which transformations to perform */
+
+ z_stream zstream; /* pointer to decompression structure (below) */
+ png_bytep zbuf; /* buffer for zlib */
+ png_size_t zbuf_size; /* size of zbuf */
+ int zlib_level; /* holds zlib compression level */
+ int zlib_method; /* holds zlib compression method */
+ int zlib_window_bits; /* holds zlib compression window bits */
+ int zlib_mem_level; /* holds zlib compression memory level */
+ int zlib_strategy; /* holds zlib compression strategy */
+
+ png_uint_32 width; /* width of image in pixels */
+ png_uint_32 height; /* height of image in pixels */
+ png_uint_32 num_rows; /* number of rows in current pass */
+ png_uint_32 usr_width; /* width of row at start of write */
+ png_uint_32 rowbytes; /* size of row in bytes */
+ png_uint_32 irowbytes; /* size of current interlaced row in bytes */
+ png_uint_32 iwidth; /* width of current interlaced row in pixels */
+ png_uint_32 row_number; /* current row in interlace pass */
+ png_bytep prev_row; /* buffer to save previous (unfiltered) row */
+ png_bytep row_buf; /* buffer to save current (unfiltered) row */
+ png_bytep sub_row; /* buffer to save "sub" row when filtering */
+ png_bytep up_row; /* buffer to save "up" row when filtering */
+ png_bytep avg_row; /* buffer to save "avg" row when filtering */
+ png_bytep paeth_row; /* buffer to save "Paeth" row when filtering */
+ png_row_info row_info; /* used for transformation routines */
+
+ png_uint_32 idat_size; /* current IDAT size for read */
+ png_uint_32 crc; /* current chunk CRC value */
+ png_colorp palette; /* palette from the input file */
+ png_uint_16 num_palette; /* number of color entries in palette */
+ png_uint_16 num_trans; /* number of transparency values */
+ png_byte chunk_name[5]; /* null-terminated name of current chunk */
+ png_byte compression; /* file compression type (always 0) */
+ png_byte filter; /* file filter type (always 0) */
+ png_byte interlaced; /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+ png_byte pass; /* current interlace pass (0 - 6) */
+ png_byte do_filter; /* row filter flags (see PNG_FILTER_ below ) */
+ png_byte color_type; /* color type of file */
+ png_byte bit_depth; /* bit depth of file */
+ png_byte usr_bit_depth; /* bit depth of users row */
+ png_byte pixel_depth; /* number of bits per pixel */
+ png_byte channels; /* number of channels in file */
+ png_byte usr_channels; /* channels at start of write */
+ png_byte sig_bytes; /* magic bytes read/written from start of file */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+ png_uint_16 filler; /* filler bytes for pixel expansion */
+#endif /* PNG_READ_FILLER_SUPPORTED */
+#if defined(PNG_READ_bKGD_SUPPORTED)
+ png_byte background_gamma_type;
+ float background_gamma;
+ png_color_16 background; /* background color in screen gamma space */
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ png_color_16 background_1; /* background normalized to gamma 1.0 */
+#endif /* PNG_READ_GAMMA && PNG_READ_bKGD_SUPPORTED */
+#endif /* PNG_READ_bKGD_SUPPORTED */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+ png_flush_ptr output_flush_fn;/* Function for flushing output */
+ png_uint_32 flush_dist; /* how many rows apart to flush, 0 - no flush */
+ png_uint_32 flush_rows; /* number of rows written since last flush */
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ int gamma_shift; /* number of "insignificant" bits 16-bit gamma */
+ float gamma; /* file gamma value */
+ float screen_gamma; /* screen gamma value (display_gamma/viewing_gamma */
+#endif /* PNG_READ_GAMMA_SUPPORTED */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ png_bytep gamma_table; /* gamma table for 8 bit depth files */
+ png_bytep gamma_from_1; /* converts from 1.0 to screen */
+ png_bytep gamma_to_1; /* converts from file to 1.0 */
+ png_uint_16pp gamma_16_table; /* gamma table for 16 bit depth files */
+ png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
+ png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
+#endif /* PNG_READ_GAMMA_SUPPORTED || PNG_WRITE_GAMMA_SUPPORTED */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined (PNG_READ_sBIT_SUPPORTED)
+ png_color_8 sig_bit; /* significant bits in each available channel */
+#endif /* PNG_READ_GAMMA_SUPPORTED || PNG_READ_sBIT_SUPPORTED */
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+ png_color_8 shift; /* shift for significant bit tranformation */
+#endif /* PNG_READ_SHIFT_SUPPORTED || PNG_WRITE_SHIFT_SUPPORTED */
+#if defined(PNG_READ_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ png_bytep trans; /* transparency values for paletted files */
+ png_color_16 trans_values; /* transparency values for non-paletted files */
+#endif /* PNG_READ|WRITE_tRNS_SUPPORTED||PNG_READ_EXPAND|BACKGROUND_SUPPORTED */
+ png_read_status_ptr read_row_fn; /* called after each row is decoded */
+ png_write_status_ptr write_row_fn; /* called after each row is encoded */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+ png_progressive_info_ptr info_fn; /* called after header data fully read */
+ png_progressive_row_ptr row_fn; /* called after each prog. row is decoded */
+ png_progressive_end_ptr end_fn; /* called after image is complete */
+ png_bytep save_buffer_ptr; /* current location in save_buffer */
+ png_bytep save_buffer; /* buffer for previously read data */
+ png_bytep current_buffer_ptr; /* current location in current_buffer */
+ png_bytep current_buffer; /* buffer for recently used data */
+ png_uint_32 push_length; /* size of current input chunk */
+ png_uint_32 skip_length; /* bytes to skip in input data */
+ png_size_t save_buffer_size; /* amount of data now in save_buffer */
+ png_size_t save_buffer_max; /* total size of save_buffer */
+ png_size_t buffer_size; /* total amount of available input data */
+ png_size_t current_buffer_size; /* amount of data now in current_buffer */
+ int process_mode; /* what push library is currently doing */
+ int cur_palette; /* current push library palette index */
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+ png_size_t current_text_size; /* current size of text input data */
+ png_size_t current_text_left; /* how much text left to read in input */
+ png_charp current_text; /* current text chunk buffer */
+ png_charp current_text_ptr; /* current location in current_text */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_READ_tEXt/zTXt_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* for the Borland special 64K segment handler */
+ png_bytepp offset_table_ptr;
+ png_bytep offset_table;
+ png_uint_16 offset_table_number;
+ png_uint_16 offset_table_count;
+ png_uint_16 offset_table_count_free;
+#endif /* __TURBOC__&&!_Windows&&!__FLAT__ */
+#if defined(PNG_READ_DITHER_SUPPORTED)
+ png_bytep palette_lookup; /* lookup table for dithering */
+ png_bytep dither_index; /* index translation for palette files */
+#endif /* PNG_READ_DITHER_SUPPORTED */
+#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_READ_hIST_SUPPORTED)
+ png_uint_16p hist; /* histogram */
+#endif
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ png_byte heuristic_method; /* heuristic for row filter selection */
+ png_byte num_prev_filters; /* number of weights for previous rows */
+ png_bytep prev_filters; /* filter type(s) of previous row(s) */
+ png_uint_16p filter_weights; /* weight(s) for previous line(s) */
+ png_uint_16p inv_filter_weights; /* 1/weight(s) for previous line(s) */
+ png_uint_16p filter_costs; /* relative filter calculation cost */
+ png_uint_16p inv_filter_costs; /* 1/relative filter calculation cost */
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+ png_charp time_buffer; /* String to hold RFC 1123 time text */
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_voidp mem_ptr; /* user supplied struct for mem functions */
+ png_malloc_ptr malloc_fn; /* function for allocating memory */
+ png_free_ptr free_fn; /* function for freeing memory */
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+ png_byte rgb_to_gray_status;
+ png_byte rgb_to_gray_red_coeff;
+ png_byte rgb_to_gray_green_coeff;
+ png_byte rgb_to_gray_blue_coeff;
+#endif
+};
+
+typedef png_struct FAR * FAR * png_structpp;
+
+/* Here are the function definitions most commonly used. This is not
+ * the place to find out how to use libpng. See libpng.txt for the
+ * full explanation, see example.c for the summary. This just provides
+ * a simple one line of the use of each function.
+ */
+
+/* Tell lib we have already handled the first <num_bytes> magic bytes.
+ * Handling more than 8 bytes from the beginning of the file is an error.
+ */
+extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+ int num_bytes));
+
+/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
+ * PNG file. Returns zero if the supplied bytes match the 8-byte PNG
+ * signature, and non-zero otherwise. Having num_to_check == 0 or
+ * start > 7 will always fail (ie return non-zero).
+ */
+extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+ png_size_t num_to_check));
+
+/* Simple signature checking function. This is the same as calling
+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ */
+extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num));
+
+/* Allocate and initialize png_ptr struct for reading, and any other memory. */
+extern PNG_EXPORT(png_structp,png_create_read_struct)
+ PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn));
+
+/* Allocate and initialize png_ptr struct for writing, and any other memory */
+extern PNG_EXPORT(png_structp,png_create_write_struct)
+ PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+ PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+ png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+ PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+ png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+#endif
+
+/* Write a PNG chunk - size, type, (optional) data, CRC. */
+extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+ png_bytep chunk_name, png_bytep data, png_size_t length));
+
+/* Write the start of a PNG chunk - length and chunk name. */
+extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+ png_bytep chunk_name, png_uint_32 length));
+
+/* Write the data of a PNG chunk started with png_write_chunk_start(). */
+extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+ png_bytep data, png_size_t length));
+
+/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
+extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+
+/* Allocate and initialize the info structure */
+extern PNG_EXPORT(png_infop,png_create_info_struct)
+ PNGARG((png_structp png_ptr));
+
+/* Initialize the info structure (old interface - NOT DLL EXPORTED) */
+extern void png_info_init PNGARG((png_infop info_ptr));
+
+/* Writes all the PNG information before the image. */
+extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* read the information before the actual image data. */
+extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+ PNGARG((png_structp png_ptr, png_timep ptime));
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* convert from a struct tm to png_time */
+extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+ struct tm FAR * ttime));
+
+/* convert from time_t to png_time. Uses gmtime() */
+extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+ time_t ttime));
+#endif /* PNG_WRITE_tIME_SUPPORTED */
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand data to 24 bit RGB, or 8 bit grayscale, with alpha if available. */
+extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_EXPAND_SUPPORTED */
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Use blue, green, red order for pixels. */
+extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_BGR_SUPPORTED || PNG_WRITE_BGR_SUPPORTED */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* Expand the grayscale to 24 bit RGB if necessary. */
+extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED */
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* Reduce RGB to grayscale. */
+extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+ int error_action, float red, float green ));
+extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+ png_ptr));
+#endif /* PNG_READ_RGB_TO_GRAY_SUPPORTED */
+
+extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+ png_colorp palette));
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_STRIP_ALPHA_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+ defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_SWAP_ALPHA_SUPPORTED || PNG_WRITE_SWAP_ALPHA_SUPPORTED */
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+ defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED || PNG_WRITE_INVERT_ALPHA_SUPPORTED */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte to 24-bit RGB images. */
+extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+ png_uint_32 filler, int flags));
+
+/* The values of the PNG_FILLER_ defines should NOT be changed */
+#define PNG_FILLER_BEFORE 0
+#define PNG_FILLER_AFTER 1
+#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swap bytes in 16 bit depth files. */
+extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_SWAP_SUPPORTED || PNG_WRITE_SWAP_SUPPORTED */
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Use 1 byte per pixel in 1, 2, or 4 bit depth files. */
+extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_PACK_SUPPORTED || PNG_WRITE_PACK_SUPPORTED */
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Swap packing order of pixels in bytes. */
+extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_PACKSWAP_SUPPORTED || PNG_WRITE_PACKSWAP_SUPPOR */
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Converts files to legal bit depths. */
+extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+ png_color_8p true_bits));
+#endif /* PNG_READ_SHIFT_SUPPORTED || PNG_WRITE_SHIFT_SUPPORTED */
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+ defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Have the code handle the interlacing. Returns the number of passes. */
+extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_INTERLACING_SUPPORTED || PNG_WRITE_INTERLACING_SUPPORTED */
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+/* Invert monocrome files */
+extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_INVERT_SUPPORTED || PNG_WRITE_INVERT_SUPPORTED */
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Handle alpha and tRNS by replacing with a background color. */
+extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+ png_color_16p background_color, int background_gamma_code,
+ int need_expand, double background_gamma));
+#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
+#define PNG_BACKGROUND_GAMMA_SCREEN 1
+#define PNG_BACKGROUND_GAMMA_FILE 2
+#define PNG_BACKGROUND_GAMMA_UNIQUE 3
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip the second byte of information from a 16 bit depth file. */
+extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+#endif /* PNG_READ_16_TO_8_SUPPORTED */
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Turn on dithering, and reduce the palette to the number of colors available. */
+extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
+ png_colorp palette, int num_palette, int maximum_colors,
+ png_uint_16p histogram, int full_dither));
+#endif /* PNG_READ_DITHER_SUPPORTED */
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Handle gamma correction. Screen_gamma=(display_gamma/viewing_gamma) */
+extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+ double screen_gamma, double default_file_gamma));
+#endif /* PNG_READ_GAMMA_SUPPORTED */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set how many lines between output flushes - 0 for no flushing */
+extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+
+/* Flush the current PNG output buffer */
+extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* optional update palette with requested transformations */
+extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+
+/* optional call to update the users info structure */
+extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* read a one or more rows of image data.*/
+extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+ png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
+
+/* read a row of data.*/
+extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+ png_bytep row,
+ png_bytep display_row));
+
+/* read the whole image into memory at once. */
+extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+ png_bytepp image));
+
+/* write a row of image data */
+extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+ png_bytep row));
+
+/* write a few rows of image data */
+extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+ png_bytepp row, png_uint_32 num_rows));
+
+/* write the image data */
+extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+ png_bytepp image));
+
+/* writes the end of the PNG file. */
+extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* read the end of the PNG file. */
+extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* free any memory associated with the png_info_struct */
+extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+ png_infopp info_ptr_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+ png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
+
+/* free all memory used by the read (old method - NOT DLL EXPORTED) */
+extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_infop end_info_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_write_struct)
+ PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
+
+/* free any memory used in info_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy_info PNGARG((png_infop info_ptr));
+
+/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy PNGARG((png_structp png_ptr));
+
+/* set the libpng method of handling chunk CRC errors */
+extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+ int crit_action, int ancil_action));
+
+/* Values for png_set_crc_action() to say how to handle CRC errors in
+ * ancillary and critical chunks, and whether to use the data contained
+ * therein. Note that it is impossible to "discard" data in a critical
+ * chunk. For versions prior to 0.90, the action was always error/quit,
+ * whereas in version 0.90 and later, the action for CRC errors in ancillary
+ * chunks is warn/discard. These values should NOT be changed.
+ *
+ * value action:critical action:ancillary
+ */
+#define PNG_CRC_DEFAULT 0 /* error/quit warn/discard data */
+#define PNG_CRC_ERROR_QUIT 1 /* error/quit error/quit */
+#define PNG_CRC_WARN_DISCARD 2 /* (INVALID) warn/discard data */
+#define PNG_CRC_WARN_USE 3 /* warn/use data warn/use data */
+#define PNG_CRC_QUIET_USE 4 /* quiet/use data quiet/use data */
+#define PNG_CRC_NO_CHANGE 5 /* use current value use current value */
+
+/* These functions give the user control over the scan-line filtering in
+ * libpng and the compression methods used by zlib. These functions are
+ * mainly useful for testing, as the defaults should work with most users.
+ * Those users who are tight on memory or want faster performance at the
+ * expense of compression can modify them. See the compression library
+ * header file (zlib.h) for an explination of the compression functions.
+ */
+
+/* set the filtering method(s) used by libpng. Currently, the only valid
+ * value for "method" is 0.
+ */
+extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+ int filters));
+
+/* Flags for png_set_filter() to say which filters to use. The flags
+ * are chosen so that they don't conflict with real filter types
+ * below, in case they are supplied instead of the #defined constants.
+ * These values should NOT be changed.
+ */
+#define PNG_NO_FILTERS 0x00
+#define PNG_FILTER_NONE 0x08
+#define PNG_FILTER_SUB 0x10
+#define PNG_FILTER_UP 0x20
+#define PNG_FILTER_AVG 0x40
+#define PNG_FILTER_PAETH 0x80
+#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
+ PNG_FILTER_AVG | PNG_FILTER_PAETH)
+
+/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
+ * These defines should NOT be changed.
+ */
+#define PNG_FILTER_VALUE_NONE 0
+#define PNG_FILTER_VALUE_SUB 1
+#define PNG_FILTER_VALUE_UP 2
+#define PNG_FILTER_VALUE_AVG 3
+#define PNG_FILTER_VALUE_PAETH 4
+#define PNG_FILTER_VALUE_LAST 5
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
+/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
+ * defines, either the default (minimum-sum-of-absolute-differences), or
+ * the experimental method (weighted-minimum-sum-of-absolute-differences).
+ *
+ * Weights are factors >= 1.0, indicating how important it is to keep the
+ * filter type consistent between rows. Larger numbers mean the current
+ * filter is that many times as likely to be the same as the "num_weights"
+ * previous filters. This is cumulative for each previous row with a weight.
+ * There needs to be "num_weights" values in "filter_weights", or it can be
+ * NULL if the weights aren't being specified. Weights have no influence on
+ * the selection of the first row filter. Well chosen weights can (in theory)
+ * improve the compression for a given image.
+ *
+ * Costs are factors >= 1.0 indicating the relative decoding costs of a
+ * filter type. Higher costs indicate more decoding expense, and are
+ * therefore less likely to be selected over a filter with lower computational
+ * costs. There needs to be a value in "filter_costs" for each valid filter
+ * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
+ * setting the costs. Costs try to improve the speed of decompression without
+ * unduly increasing the compressed image size.
+ *
+ * A negative weight or cost indicates the default value is to be used, and
+ * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
+ * The default values for both weights and costs are currently 1.0, but may
+ * change if good general weighting/cost heuristics can be found. If both
+ * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
+ * to the UNWEIGHTED method, but with added encoding time/computation.
+ */
+extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+ int heuristic_method, int num_weights, png_doublep filter_weights,
+ png_doublep filter_costs));
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+/* Heuristic used for row filter selection. These defines should NOT be
+ * changed.
+ */
+#define PNG_FILTER_HEURISTIC_DEFAULT 0 /* Currently "UNWEIGHTED" */
+#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1 /* Used by libpng < 0.95 */
+#define PNG_FILTER_HEURISTIC_WEIGHTED 2 /* Experimental feature */
+#define PNG_FILTER_HEURISTIC_LAST 3 /* Not a valid value */
+
+/* Set the library compression level. Currently, valid values range from
+ * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
+ * (0 - no compression, 9 - "maximal" compression). Note that tests have
+ * shown that zlib compression levels 3-6 usually perform as well as level 9
+ * for PNG images, and do considerably fewer caclulations. In the future,
+ * these values may not correspond directly to the zlib compression levels.
+ */
+extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+ int level));
+
+extern PNG_EXPORT(void,png_set_compression_mem_level)
+ PNGARG((png_structp png_ptr, int mem_level));
+
+extern PNG_EXPORT(void,png_set_compression_strategy)
+ PNGARG((png_structp png_ptr, int strategy));
+
+extern PNG_EXPORT(void,png_set_compression_window_bits)
+ PNGARG((png_structp png_ptr, int window_bits));
+
+extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+ int method));
+
+/* These next functions are called for input/output, memory, and error
+ * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
+ * and call standard C I/O routines such as fread(), fwrite(), and
+ * fprintf(). These functions can be made to use other I/O routines
+ * at run time for those applications that need to handle I/O in a
+ * different manner by calling png_set_???_fn(). See libpng.txt for
+ * more information.
+ */
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the input/output for the PNG file to the default functions. */
+extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, FILE *fp));
+#endif
+
+/* Replace the (error and abort), and warning functions with user
+ * supplied functions. If no messages are to be printed you must still
+ * write and use replacement functions. The replacement error_fn should
+ * still do a longjmp to the last setjmp location if you are using this
+ * method of error handling. If error_fn or warning_fn is NULL, the
+ * default function will be used.
+ */
+
+extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+ png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
+
+/* Return the user pointer associated with the error functions */
+extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+
+/* Replace the default data output functions with a user supplied one(s).
+ * If buffered output is not used, then output_flush_fn can be set to NULL.
+ * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
+ * output_flush_fn will be ignored (and thus can be NULL).
+ */
+extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+ png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
+
+/* Replace the default data input function with a user supplied one. */
+extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+ png_voidp io_ptr, png_rw_ptr read_data_fn));
+
+/* Return the user pointer associated with the I/O functions */
+extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+
+extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+ png_read_status_ptr read_row_fn));
+
+extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+ png_write_status_ptr write_row_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* Replace the default memory allocation functions with user supplied one(s). */
+extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+ png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+
+/* Return the user pointer associated with the memory functions */
+extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+ png_ptr, png_user_transform_ptr read_user_transform_fn));
+#endif
+
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+ png_ptr, png_user_transform_ptr write_user_transform_fn));
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+/* Sets the function callbacks for the push reader, and a pointer to a
+ * user-defined structure available to the callback functions.
+ */
+extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+ png_voidp progressive_ptr,
+ png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+ png_progressive_end_ptr end_fn));
+
+/* returns the user pointer associated with the push read functions */
+extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+ PNGARG((png_structp png_ptr));
+
+/* function to be called when data becomes available */
+extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
+
+/* function that combines rows. Not very much different than the
+ * png_combine_row() call. Is this even used?????
+ */
+extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+ png_bytep old_row, png_bytep new_row));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+ png_uint_32 size));
+
+/* frees a pointer allocated by png_malloc() */
+extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+ png_uint_32 size));
+extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+ png_voidp ptr));
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
+ png_voidp s1, png_voidp s2, png_uint_32 size));
+
+extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
+ png_voidp s1, int value, png_uint_32 size));
+
+#if defined(USE_FAR_KEYWORD) /* memory model conversion function */
+extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+ int check));
+#endif /* USE_FAR_KEYWORD */
+
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+ png_const_charp error));
+
+/* The same, but the chunk name is prepended to the error string. */
+extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+ png_const_charp error));
+
+/* Non-fatal error in libpng. Can continue, but may have a problem. */
+extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+ png_const_charp message));
+
+/* Non-fatal error in libpng, chunk name is prepended to message. */
+extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+ png_const_charp message));
+
+/* The png_set_<chunk> functions are for storing values in the png_info_struct.
+ * Similarly, the png_get_<chunk> calls are used to read values from the
+ * png_info_struct, either storing the parameters in the passed variables, or
+ * setting pointers into the png_info_struct where the data is stored. The
+ * png_get_<chunk> functions return a non-zero value if the data was available
+ * in info_ptr, or return zero and do not change any of the parameters if the
+ * data was not available.
+ *
+ * These functions should be used instead of directly accessing png_info
+ * to avoid problems with future changes in the size and internal layout of
+ * png_info_struct.
+ */
+/* Returns "flag" if chunk data is valid in info_ptr. */
+extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 flag));
+
+/* Returns number of bytes needed to hold a transformed row. */
+extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+/* Returns number of color channels in image. */
+extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Returns image width in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image height in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image bit_depth. */
+extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image color_type. */
+extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image filter_type. */
+extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image interlace_type. */
+extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image compression_type. */
+extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image resolution in pixels per meter, from pHYs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns pixel aspect ratio, computed from pHYs chunk data. */
+extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_x_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+/* Returns pointer to signature string read from PNG header */
+extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_color_16p *background));
+#endif /* PNG_READ_bKGD_SUPPORTED */
+
+#if defined(PNG_READ_bKGD_SUPPORTED) || defined(PNG_WRITE_bKGD_SUPPORTED)
+extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_color_16p background));
+#endif /* PNG_READ_bKGD_SUPPORTED || PNG_WRITE_bKGD_SUPPORTED */
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+ double *red_y, double *green_x, double *green_y, double *blue_x,
+ double *blue_y));
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+#if defined(PNG_READ_cHRM_SUPPORTED) || defined(PNG_WRITE_cHRM_SUPPORTED)
+extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, double white_x, double white_y, double red_x,
+ double red_y, double green_x, double green_y, double blue_x, double blue_y));
+#endif /* PNG_READ_cHRM_SUPPORTED || PNG_WRITE_cHRM_SUPPORTED */
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, double *file_gamma));
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_WRITE_gAMA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, double file_gamma));
+#endif /* PNG_READ_gAMA_SUPPORTED || PNG_WRITE_gAMA_SUPPORTED */
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_16p *hist));
+#endif /* PNG_READ_hIST_SUPPORTED */
+
+#if defined(PNG_READ_hIST_SUPPORTED) || defined(PNG_WRITE_hIST_SUPPORTED)
+extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_16p hist));
+#endif /* PNG_READ_hIST_SUPPORTED || PNG_WRITE_hIST_SUPPORTED */
+
+extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
+ int *bit_depth, int *color_type, int *interlace_type,
+ int *compression_type, int *filter_type));
+
+extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+ int color_type, int interlace_type, int compression_type, int filter_type));
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 *offset_x, png_uint_32 *offset_y,
+ int *unit_type));
+#endif /* PNG_READ_oFFs_SUPPORTED */
+
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 offset_x, png_uint_32 offset_y,
+ int unit_type));
+#endif /* PNG_READ_oFFs_SUPPORTED || PNG_WRITE_oFFs_SUPPORTED */
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+ int *type, int *nparams, png_charp *units, png_charpp *params));
+#endif /* PNG_READ_pCAL_SUPPORTED */
+
+#if defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
+ int type, int nparams, png_charp units, png_charpp params));
+#endif /* PNG_READ_pCAL_SUPPORTED || PNG_WRITE_pCAL_SUPPORTED */
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif /* PNG_READ_pHYs_SUPPORTED */
+
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+#endif /* PNG_READ_pHYs_SUPPORTED || PNG_WRITE_pHYs_SUPPORTED */
+
+extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_colorp *palette, int *num_palette));
+
+extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_colorp palette, int num_palette));
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_color_8p *sig_bit));
+#endif /* PNG_READ_sBIT_SUPPORTED */
+
+#if defined(PNG_READ_sBIT_SUPPORTED) || defined(PNG_WRITE_sBIT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_color_8p sig_bit));
+#endif /* PNG_READ_sBIT_SUPPORTED || PNG_WRITE_sBIT_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, int *intent));
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, int intent));
+extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, int intent));
+#endif /* PNG_READ_sRGB_SUPPORTED || PNG_WRITE_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_READ_zTXt_SUPPORTED)
+/* png_get_text also returns the number of text chunks in text_ptr */
+extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_textp *text_ptr, int *num_text));
+#endif /* PNG_READ_tEXt_SUPPORTED || PNG_READ_zTXt_SUPPORTED */
+
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+ defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif /* PNG_READ_OR_WRITE_tEXt_OR_zTXt_SUPPORTED */
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_timep *mod_time));
+#endif /* PNG_READ_tIME_SUPPORTED */
+
+#if defined(PNG_READ_tIME_SUPPORTED) || defined(PNG_WRITE_tIME_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_timep mod_time));
+#endif /* PNG_READ_tIME_SUPPORTED || PNG_WRITE_tIME_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_bytep *trans, int *num_trans,
+ png_color_16p *trans_values));
+#endif /* PNG_READ_tRNS_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED) || defined(PNG_WRITE_tRNS_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_bytep trans, int num_trans,
+ png_color_16p trans_values));
+#endif /* PNG_READ_tRNS_SUPPORTED || PNG_WRITE_tRNS_SUPPORTED */
+
+/* Define PNG_DEBUG at compile time for debugging information. Higher
+ * numbers for PNG_DEBUG mean more debugging information. This has
+ * only been added since version 0.95 so it is not implemented throughout
+ * libpng yet, but more support will be added as needed.
+ */
+#ifdef PNG_DEBUG
+#if (PNG_DEBUG > 0)
+#ifndef PNG_DEBUG_FILE
+#define PNG_DEBUG_FILE stderr
+#endif /* PNG_DEBUG_FILE */
+
+#define png_debug(l,m) if (PNG_DEBUG > l) \
+ fprintf(PNG_DEBUG_FILE,"%s"m,(l==1 ? "\t" : \
+ (l==2 ? "\t\t":(l>2 ? "\t\t\t":""))))
+#define png_debug1(l,m,p1) if (PNG_DEBUG > l) \
+ fprintf(PNG_DEBUG_FILE,"%s"m,(l==1 ? "\t" : \
+ (l==2 ? "\t\t":(l>2 ? "\t\t\t":""))),p1)
+#define png_debug2(l,m,p1,p2) if (PNG_DEBUG > l) \
+ fprintf(PNG_DEBUG_FILE,"%s"m,(l==1 ? "\t" : \
+ (l==2 ? "\t\t":(l>2 ? "\t\t\t":""))),p1,p2)
+#endif /* (PNG_DEBUG > 0) */
+#endif /* PNG_DEBUG */
+#ifndef png_debug
+#define png_debug(l, m)
+#endif
+#ifndef png_debug1
+#define png_debug1(l, m, p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l, m, p1, p2)
+#endif
+
+extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
+
+#ifdef PNG_NO_EXTERN
+/* this only gets included in png.c */
+png_charp
+png_get_header_version(png_structp png_ptr)
+{
+ if(png_ptr == NULL)
+ /* silence compiler warning about unused png_ptr */ ;
+ return("\n libpng version 1.0.3 - January 14, 1999 (header)\n");
+}
+#endif
+
+#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
+/* With these routines we avoid an integer divide, which will be slower on
+ * most machines. However, it does take more operations than the corresponding
+ * divide method, so it may be slower on a few RISC systems. There are two
+ * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
+ *
+ * Note that the rounding factors are NOT supposed to be the same! 128 and
+ * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
+ * standard method.
+ *
+ * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
+ */
+
+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
+
+# define png_composite(composite, fg, alpha, bg) \
+ { png_uint_16 temp = ((png_uint_16)(fg) * (png_uint_16)(alpha) + \
+ (png_uint_16)(bg)*(png_uint_16)(255 - \
+ (png_uint_16)(alpha)) + (png_uint_16)128); \
+ (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+
+# define png_composite_16(composite, fg, alpha, bg) \
+ { png_uint_32 temp = ((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+ (png_uint_32)(bg)*(png_uint_32)(65535L - \
+ (png_uint_32)(alpha)) + (png_uint_32)32768L); \
+ (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+
+#else /* standard method using integer division */
+
+# define png_composite(composite, fg, alpha, bg) \
+ (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) + \
+ (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
+ (png_uint_16)127) / 255)
+
+# define png_composite_16(composite, fg, alpha, bg) \
+ (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+ (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) + \
+ (png_uint_32)32767) / (png_uint_32)65535L)
+
+#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+
+/* These next functions are used internally in the code. They generally
+ * shouldn't be used unless you are writing code to add or replace some
+ * functionality in libpng. More information about most functions can
+ * be found in the files where the functions are located.
+ */
+
+#if defined(PNG_INTERNAL)
+
+/* Various modes of operation. Note that after an init, mode is set to
+ * zero automatically when the structure is created.
+ */
+#define PNG_BEFORE_IHDR 0x00
+#define PNG_HAVE_IHDR 0x01
+#define PNG_HAVE_PLTE 0x02
+#define PNG_HAVE_IDAT 0x04
+#define PNG_AFTER_IDAT 0x08
+#define PNG_HAVE_IEND 0x10
+#define PNG_HAVE_gAMA 0x20
+#define PNG_HAVE_cHRM 0x40
+#define PNG_HAVE_sRGB 0x80
+
+/* push model modes */
+#define PNG_READ_SIG_MODE 0
+#define PNG_READ_CHUNK_MODE 1
+#define PNG_READ_IDAT_MODE 2
+#define PNG_SKIP_MODE 3
+#define PNG_READ_tEXt_MODE 4
+#define PNG_READ_zTXt_MODE 5
+#define PNG_READ_DONE_MODE 6
+#define PNG_ERROR_MODE 7
+
+/* flags for the transformations the PNG library does on the image data */
+#define PNG_BGR 0x0001
+#define PNG_INTERLACE 0x0002
+#define PNG_PACK 0x0004
+#define PNG_SHIFT 0x0008
+#define PNG_SWAP_BYTES 0x0010
+#define PNG_INVERT_MONO 0x0020
+#define PNG_DITHER 0x0040
+#define PNG_BACKGROUND 0x0080
+#define PNG_BACKGROUND_EXPAND 0x0100
+ /* 0x0200 unused */
+#define PNG_16_TO_8 0x0400
+#define PNG_RGBA 0x0800
+#define PNG_EXPAND 0x1000
+#define PNG_GAMMA 0x2000
+#define PNG_GRAY_TO_RGB 0x4000
+#define PNG_FILLER 0x8000
+#define PNG_PACKSWAP 0x10000L
+#define PNG_SWAP_ALPHA 0x20000L
+#define PNG_STRIP_ALPHA 0x40000L
+#define PNG_INVERT_ALPHA 0x80000L
+#define PNG_USER_TRANSFORM 0x100000L
+#define PNG_RGB_TO_GRAY_ERR 0x200000L
+#define PNG_RGB_TO_GRAY_WARN 0x400000L
+#define PNG_RGB_TO_GRAY 0x600000L /* two bits, RGB_TO_GRAY_ERR|WARN */
+
+/* flags for png_create_struct */
+#define PNG_STRUCT_PNG 0x0001
+#define PNG_STRUCT_INFO 0x0002
+
+/* Scaling factor for filter heuristic weighting calculations */
+#define PNG_WEIGHT_SHIFT 8
+#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
+#define PNG_COST_SHIFT 3
+#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
+
+/* flags for the png_ptr->flags rather than declaring a byte for each one */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY 0x0001
+#define PNG_FLAG_ZLIB_CUSTOM_LEVEL 0x0002
+#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL 0x0004
+#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS 0x0008
+#define PNG_FLAG_ZLIB_CUSTOM_METHOD 0x0010
+#define PNG_FLAG_ZLIB_FINISHED 0x0020
+#define PNG_FLAG_ROW_INIT 0x0040
+#define PNG_FLAG_FILLER_AFTER 0x0080
+#define PNG_FLAG_CRC_ANCILLARY_USE 0x0100
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN 0x0200
+#define PNG_FLAG_CRC_CRITICAL_USE 0x0400
+#define PNG_FLAG_CRC_CRITICAL_IGNORE 0x0800
+#define PNG_FLAG_FREE_PALETTE 0x1000
+#define PNG_FLAG_FREE_TRANS 0x2000
+#define PNG_FLAG_FREE_HIST 0x4000
+#define PNG_FLAG_HAVE_CHUNK_HEADER 0x8000L
+#define PNG_FLAG_WROTE_tIME 0x10000L
+#define PNG_FLAG_BACKGROUND_IS_GRAY 0x20000L
+
+#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
+ PNG_FLAG_CRC_ANCILLARY_NOWARN)
+
+#define PNG_FLAG_CRC_CRITICAL_MASK (PNG_FLAG_CRC_CRITICAL_USE | \
+ PNG_FLAG_CRC_CRITICAL_IGNORE)
+
+#define PNG_FLAG_CRC_MASK (PNG_FLAG_CRC_ANCILLARY_MASK | \
+ PNG_FLAG_CRC_CRITICAL_MASK)
+
+/* save typing and make code easier to understand */
+#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
+ abs((int)((c1).green) - (int)((c2).green)) + \
+ abs((int)((c1).blue) - (int)((c2).blue)))
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* place to hold the signature string for a PNG file. */
+extern png_byte FARDATA png_sig[8];
+
+/* Constant strings for known chunk types. If you need to add a chunk,
+ * add a string holding the name here. See png.c for more details. We
+ * can't selectively include these, since we still check for chunk in the
+ * wrong locations with these labels.
+ */
+extern png_byte FARDATA png_IHDR[5];
+extern png_byte FARDATA png_IDAT[5];
+extern png_byte FARDATA png_IEND[5];
+extern png_byte FARDATA png_PLTE[5];
+extern png_byte FARDATA png_bKGD[5];
+extern png_byte FARDATA png_cHRM[5];
+extern png_byte FARDATA png_gAMA[5];
+extern png_byte FARDATA png_hIST[5];
+extern png_byte FARDATA png_oFFs[5];
+extern png_byte FARDATA png_pCAL[5];
+extern png_byte FARDATA png_pHYs[5];
+extern png_byte FARDATA png_sBIT[5];
+extern png_byte FARDATA png_sRGB[5];
+extern png_byte FARDATA png_tEXt[5];
+extern png_byte FARDATA png_tIME[5];
+extern png_byte FARDATA png_tRNS[5];
+extern png_byte FARDATA png_zTXt[5];
+
+#endif /* PNG_NO_EXTERN */
+
+/* Inline macros to do direct reads of bytes from the input buffer. These
+ * require that you are using an architecture that uses PNG byte ordering
+ * (MSB first) and supports unaligned data storage. I think that PowerPC
+ * in big-endian mode and 680x0 are the only ones that will support this.
+ * The x86 line of processors definitely do not. The png_get_int_32()
+ * routine also assumes we are using two's complement format for negative
+ * values, which is almost certainly true.
+ */
+#if defined(PNG_READ_BIG_ENDIAN_SUPPORTED)
+#if defined(PNG_READ_pCAL_SUPPORTED)
+#define png_get_int_32(buf) ( *((png_int_32p) (buf)))
+#endif /* PNG_READ_pCAL_SUPPORTED */
+#define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
+#define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
+#else
+#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_EXTERN png_int_32 png_get_int_32 PNGARG((png_bytep buf));
+#endif /* PNG_READ_pCAL_SUPPORTED */
+PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
+PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Initialize png_ptr struct for reading, and allocate any other memory.
+ * (old interface - NOT DLL EXPORTED).
+ */
+extern void png_read_init PNGARG((png_structp png_ptr));
+
+/* Initialize png_ptr struct for writing, and allocate any other memory.
+ * (old interface - NOT DLL EXPORTED).
+ */
+extern void png_write_init PNGARG((png_structp png_ptr));
+
+/* allocate memory for an internal libpng struct */
+PNG_EXTERN png_voidp png_create_struct PNGARG((int type));
+
+/* free memory from internal libpng struct */
+PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
+
+PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
+ malloc_fn));
+PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
+ png_free_ptr free_fn));
+
+/* free any memory that info_ptr points to and reset struct. */
+PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* Function to allocate memory for zlib. */
+PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
+
+/* function to free memory for zlib */
+PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
+
+/* reset the CRC variable */
+PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
+
+/* Write the "data" buffer to whatever output you are using. */
+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
+ png_size_t length));
+
+/* Read data from whatever input you are using into the "data" buffer */
+PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
+ png_size_t length));
+
+/* read bytes into buf, and update png_ptr->crc */
+PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
+ png_size_t length));
+
+/* read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
+PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
+
+/* read the CRC from the file and compare it to the libpng calculated CRC */
+PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
+
+/* Calculate the CRC over a section of data. Note that we are only
+ * passing a maximum of 64K on systems that have this as a memory limit,
+ * since this is the maximum buffer size we can specify.
+ */
+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
+ png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
+#endif
+
+/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
+ * The only currently known PNG chunks that use signed numbers are
+ * the ancillary extension chunks, oFFs and pCAL.
+ */
+PNG_EXTERN void png_save_uint_32 PNGARG((png_bytep buf, png_uint_32 i));
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN void png_save_int_32 PNGARG((png_bytep buf, png_int_32 i));
+#endif
+
+/* Place a 16 bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+PNG_EXTERN void png_save_uint_16 PNGARG((png_bytep buf, unsigned int i));
+
+/* simple function to write the signature */
+PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr));
+
+/* write various chunks */
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.
+ */
+PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
+ png_uint_32 height,
+ int bit_depth, int color_type, int compression_type, int filter_type,
+ int interlace_type));
+
+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
+ png_uint_32 num_pal));
+
+PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
+ png_size_t length));
+
+PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
+ int color_type));
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
+ double white_x, double white_y,
+ double red_x, double red_y, double green_x, double green_y,
+ double blue_x, double blue_y));
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
+ int intent));
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
+ png_color_16p values, int number, int color_type));
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
+ png_color_16p values, int color_type));
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
+ int num_hist));
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED) || \
+ defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
+ png_charp key, png_charpp new_key));
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
+ png_charp text, png_size_t text_len));
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
+ png_charp text, png_size_t text_len, int compression));
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
+ png_uint_32 x_offset, png_uint_32 y_offset, int unit_type));
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
+ png_int_32 X0, png_int_32 X1, int type, int nparams,
+ png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+ png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
+ int unit_type));
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
+ png_timep mod_time));
+#endif
+
+/* Called when finished processing a row of data */
+PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
+
+/* Internal use only. Called before first row of data */
+PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
+#endif
+
+/* combine a row of data, dealing with alpha, etc. if requested */
+PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
+ int mask));
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+/* expand an interlaced row */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
+ png_bytep row, int pass, png_uint_32 transformations));
+#endif
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* grab pixels out of a row for an interlaced pass */
+PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
+ png_bytep row, int pass));
+#endif
+
+/* unfilter a row */
+PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
+ png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));
+
+/* Choose the best filter to use and filter the row data */
+PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
+ png_row_infop row_info));
+
+/* Write out the filtered row. */
+PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
+ png_bytep filtered_row));
+/* finish a row while reading, dealing with interlacing passes, etc. */
+PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+
+/* initialize the row buffers, etc. */
+PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
+/* optional call to update the users info structure */
+PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+
+/* these are the functions that do the transformations */
+#if defined(PNG_READ_FILLER_SUPPORTED)
+PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+ png_bytep row, png_uint_32 filler, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
+ png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
+ png_bytep row));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
+ png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
+ png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+ defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
+ png_bytep row, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
+ row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
+ png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
+ png_color_8p sig_bits));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
+ png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));
+
+# if defined(PNG_CORRECT_PALETTE_SUPPORTED)
+PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
+ png_colorp palette, int num_palette));
+# endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
+ png_bytep row, png_uint_32 bit_depth));
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
+ png_color_8p bit_depth));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+ png_color_16p trans_values, png_color_16p background,
+ png_color_16p background_1,
+ png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+ png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+ png_uint_16pp gamma_16_to_1, int gamma_shift));
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
+ png_bytep gamma_table, png_uint_16pp gamma_16_table,
+ int gamma_shift));
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
+ png_bytep row, png_colorp palette, png_bytep trans, int num_trans));
+PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
+ png_bytep row, png_color_16p trans_value));
+#endif
+
+/* The following decodes the appropriate chunks, and does error correction,
+ * then calls the appropriate callback for the chunk if it is valid.
+ */
+
+/* decode the IHDR chunk */
+PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 length));
+#endif
+
+PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 length));
+
+PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
+ png_bytep chunk_name));
+
+/* handle the transformations for reading and writing */
+PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
+
+PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
+ png_uint_32 length));
+PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+ png_bytep buffer, png_size_t length));
+PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
+ png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
+ png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
+PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
+ png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
+ png_infop info_ptr));
+#endif
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#endif /* PNG_INTERNAL */
+
+#ifdef __cplusplus
+}
+#endif
+
+/* do not put anything past this line */
+#endif /* _PNG_H */
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpng.3 Sat Jul 13 19:23:20 2002
@@ -0,0 +1,2621 @@
+.TH LIBPNG 3 "January 14, 1999"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.3 - January 14, 1999
+.SH SYNOPSIS
+
+#include <png.h>
+
+int png_check_sig (png_bytep sig, int num);
+
+void png_chunk_error (png_structp png_ptr, png_const_charp
+error);
+
+void png_chunk_warning (png_structp png_ptr, png_const_charp
+message);
+
+void png_convert_from_struct_tm (png_timep ptime, struct tm FAR
+* ttime);
+
+void png_convert_from_time_t (png_timep ptime, time_t ttime);
+
+png_charp png_convert_to_rfc1123 (png_structp png_ptr,
+png_timep ptime);
+
+png_infop png_create_info_struct (png_structp png_ptr);
+
+png_structp png_create_read_struct (png_const_charp
+user_png_ver, voidp error_ptr, png_error_ptr error_fn,
+png_error_ptr warn_fn);
+
+png_structp png_create_read_struct_2(png_const_charp user_png_ver,
+png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr
+warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,
+png_free_ptr free_fn)
+
+png_structp png_create_write_struct (png_const_charp
+user_png_ver, voidp error_ptr, png_error_ptr error_fn,
+png_error_ptr warn_fn);
+
+png_structp png_create_write_struct_2(png_const_charp
+user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
+png_error_ptr warn_fn, png_voidp mem_ptr,
+png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+
+int png_debug(int level, png_const_charp message)
+
+int png_debug1(int level, png_const_charp message, p1)
+
+int png_debug2(int level, png_const_charp message, p1, p2)
+
+void png_destroy_info_struct (png_structp png_ptr, png_infopp
+info_ptr_ptr);
+
+void png_destroy_read_struct (png_structpp png_ptr_ptr,
+png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr);
+
+void png_destroy_write_struct (png_structpp png_ptr_ptr,
+png_infopp info_ptr_ptr);
+
+void png_error (png_structp png_ptr, png_const_charp error);
+
+void png_free (png_structp png_ptr, png_voidp ptr);
+
+void png_free_default(png_structp png_ptr, png_voidp ptr)
+
+png_byte png_get_bit_depth (png_structp png_ptr, png_infop
+info_ptr);
+
+png_uint_32 png_get_bKGD (png_structp png_ptr, png_infop
+info_ptr, png_color_16p *background);
+
+png_byte png_get_channels (png_structp png_ptr, png_infop
+info_ptr);
+
+png_uint_32 png_get_cHRM (png_structp png_ptr, png_infop
+info_ptr, double *white_x, double *white_y, double *red_x,
+double *red_y, double *green_x, double *green_y, double
+*blue_x, double *blue_y);
+
+png_byte png_get_color_type (png_structp png_ptr, png_infop
+info_ptr);
+
+png_byte png_get_compression_type (png_structp png_ptr,
+png_infop info_ptr);
+
+png_byte png_get_copyright (png_structp png_ptr);
+
+png_voidp png_get_error_ptr (png_structp png_ptr);
+
+png_byte png_get_filter_type (png_structp png_ptr, png_infop
+info_ptr);
+
+png_uint_32 png_get_gAMA (png_structp png_ptr, png_infop
+info_ptr, double *file_gamma);
+
+png_byte png_get_header_version (png_structp png_ptr);
+
+png_uint_32 png_get_hIST (png_structp png_ptr, png_infop
+info_ptr, png_uint_16p *hist);
+
+png_uint_32 png_get_IHDR (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 *width, png_uint_32 *height, int
+*bit_depth, int *color_type, int *interlace_type, int
+*compression_type, int *filter_type);
+
+png_uint_32 png_get_image_height (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_image_width (png_structp png_ptr, png_infop
+info_ptr);
+
+png_byte png_get_interlace_type (png_structp png_ptr, png_infop
+info_ptr);
+
+png_voidp png_get_io_ptr (png_structp png_ptr);
+
+png_voidp png_get_mem_ptr(png_structp png_ptr)
+
+png_uint_32 png_get_oFFs (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 *offset_x, png_uint_32 *offset_y, int
+*unit_type);
+
+png_uint_32 png_get_pCAL (png_structp png_ptr, png_infop
+info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+int *type, int *nparams, png_charp *units, png_charpp *params);
+
+png_uint_32 png_get_pHYs (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int
+*unit_type);
+
+float png_get_pixel_aspect_ratio (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_pixels_per_meter (png_structp png_ptr,
+png_infop info_ptr);
+
+png_voidp png_get_progressive_ptr (png_structp png_ptr);
+
+png_uint_32 png_get_PLTE (png_structp png_ptr, png_infop
+info_ptr, png_colorp *palette, int *num_palette);
+
+png_byte png_get_rgb_to_gray_status (png_structp png_ptr)
+
+png_uint_32 png_get_rowbytes (png_structp png_ptr, png_infop
+info_ptr);
+
+png_uint_32 png_get_sBIT (png_structp png_ptr, png_infop
+info_ptr, png_color_8p *sig_bit);
+
+png_bytep png_get_signature (png_structp png_ptr, png_infop
+info_ptr);
+
+png_uint_32 png_get_sRGB (png_structp png_ptr, png_infop
+info_ptr, int *intent);
+
+png_uint_32 png_get_text (png_structp png_ptr, png_infop
+info_ptr, png_textp *text_ptr, int *num_text);
+
+png_uint_32 png_get_tIME (png_structp png_ptr, png_infop
+info_ptr, png_timep *mod_time);
+
+png_uint_32 png_get_tRNS (png_structp png_ptr, png_infop
+info_ptr, png_bytep *trans, int *num_trans, png_color_16p
+*trans_values);
+
+png_uint_32 png_get_valid (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 flag);
+
+png_uint_32 png_get_x_offset_microns (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_x_offset_pixels (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_x_pixels_per_meter (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_y_offset_microns (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_y_offset_pixels (png_structp png_ptr,
+png_infop info_ptr);
+
+png_uint_32 png_get_y_pixels_per_meter (png_structp png_ptr,
+png_infop info_ptr);
+
+void png_info_init (png_infop info_ptr);
+
+void png_init_io (png_structp png_ptr, FILE *fp);
+
+png_voidp png_malloc (png_structp png_ptr, png_uint_32 size);
+
+png_voidp png_malloc_default(png_structp png_ptr,
+png_uint_32 size)
+
+voidp png_memcpy (png_voidp s1, png_voidp s2, png_size_t size);
+
+png_voidp png_memcpy_check (png_structp png_ptr, png_voidp s1,
+png_voidp s2, png_uint_32 size);
+
+voidp png_memset (png_voidp s1, int value, png_size_t size);
+
+png_voidp png_memset_check (png_structp png_ptr, png_voidp
+s1, int value, png_uint_32 size);
+
+void png_process_data (png_structp png_ptr, png_infop info_ptr,
+png_bytep buffer, png_size_t buffer_size);
+
+void png_progressive_combine_row (png_structp png_ptr,
+png_bytep old_row, png_bytep new_row);
+
+void png_read_destroy (png_structp png_ptr, png_infop info_ptr,
+png_infop end_info_ptr);
+
+void png_read_end (png_structp png_ptr, png_infop info_ptr);
+
+void png_read_image (png_structp png_ptr, png_bytepp image);
+
+void png_read_info (png_structp png_ptr, png_infop info_ptr);
+
+void png_read_row (png_structp png_ptr, png_bytep row,
+png_bytep display_row);
+
+void png_read_rows (png_structp png_ptr, png_bytepp row,
+png_bytepp display_row, png_uint_32 num_rows);
+
+void png_read_update_info (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_set_background (png_structp png_ptr, png_color_16p
+background_color, int background_gamma_code, int need_expand,
+double background_gamma);
+
+void png_set_bgr (png_structp png_ptr);
+
+void png_set_bKGD (png_structp png_ptr, png_infop info_ptr,
+png_color_16p background);
+
+void png_set_cHRM (png_structp png_ptr, png_infop info_ptr,
+double white_x, double white_y, double red_x, double red_y,
+double green_x, double green_y, double blue_x, double blue_y);
+
+void png_set_compression_level (png_structp png_ptr, int
+level);
+
+void png_set_compression_mem_level (png_structp png_ptr, int
+mem_level);
+
+void png_set_compression_method (png_structp png_ptr, int
+method);
+
+void png_set_compression_strategy (png_structp png_ptr, int
+strategy);
+
+void png_set_compression_window_bits (png_structp png_ptr, int
+window_bits);
+
+void png_set_crc_action (png_structp png_ptr, int crit_action,
+int ancil_action);
+
+void png_set_dither (png_structp png_ptr, png_colorp palette,
+int num_palette, int maximum_colors, png_uint_16p histogram,
+int full_dither);
+
+void png_set_error_fn (png_structp png_ptr, png_voidp
+error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn);
+
+void png_set_expand (png_structp png_ptr);
+
+void png_set_filler (png_structp png_ptr, png_uint_32 filler,
+int flags);
+
+void png_set_filter (png_structp png_ptr, int method, int
+filters);
+
+void png_set_filter_heuristics (png_structp png_ptr, int
+heuristic_method, int num_weights, png_doublep filter_weights,
+png_doublep filter_costs);
+
+void png_set_flush (png_structp png_ptr, int nrows);
+
+void png_set_gamma (png_structp png_ptr, double screen_gamma,
+double default_file_gamma);
+
+void png_set_gAMA (png_structp png_ptr, png_infop info_ptr,
+double file_gamma);
+
+void png_set_gray_to_rgb (png_structp png_ptr);
+
+void png_set_hIST (png_structp png_ptr, png_infop info_ptr,
+png_uint_16p hist);
+
+int png_set_interlace_handling (png_structp png_ptr);
+
+void png_set_invert_alpha (png_structp png_ptr);
+
+void png_set_invert_mono (png_structp png_ptr);
+
+void png_set_IHDR (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 width, png_uint_32 height, int bit_depth, int
+color_type, int interlace_type, int compression_type, int
+filter_type);
+
+void png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr,
+png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+
+void png_set_oFFs (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 offset_x, png_uint_32 offset_y, int unit_type);
+
+void png_set_packing (png_structp png_ptr);
+
+void png_set_packswap (png_structp png_ptr);
+
+void png_set_pCAL (png_structp png_ptr, png_infop info_ptr,
+png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int
+nparams, png_charp units, png_charpp params);
+
+void png_set_pHYs (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 res_x, png_uint_32 res_y, int unit_type);
+
+void png_set_progressive_read_fn (png_structp png_ptr,
+png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
+png_progressive_row_ptr row_fn, png_progressive_end_ptr
+end_fn);
+
+void png_set_PLTE (png_structp png_ptr, png_infop info_ptr,
+png_colorp palette, int num_palette);
+
+void png_set_read_fn (png_structp png_ptr, png_voidp io_ptr,
+png_rw_ptr read_data_fn);
+
+void png_set_read_status_fn (png_structp png_ptr, png_read_status_ptr
+read_row_fn);
+
+void png_set_read_user_transform_fn (png_structp png_ptr,
+png_user_transform_ptr read_user_transform_fn);
+
+void png_set_rgb_to_gray (png_structp png_ptr, int error_action);
+
+void png_set_sBIT (png_structp png_ptr, png_infop info_ptr,
+png_color_8p sig_bit);
+
+void png_set_shift (png_structp png_ptr, png_color_8p
+true_bits);
+
+void png_set_sig_bytes (png_structp png_ptr, int num_bytes);
+
+void png_set_sRGB (png_structp png_ptr, png_infop info_ptr, int
+intent);
+
+void png_set_sRGB_gAMA_and_cHRM (png_structp png_ptr, png_infop
+info_ptr, int intent);
+
+void png_set_strip_16 (png_structp png_ptr);
+
+void png_set_strip_alpha (png_structp png_ptr);
+
+void png_set_swap (png_structp png_ptr);
+
+void png_set_swap_alpha (png_structp png_ptr);
+
+void png_set_text (png_structp png_ptr, png_infop info_ptr,
+png_textp text_ptr, int num_text);
+
+void png_set_tIME (png_structp png_ptr, png_infop info_ptr,
+png_timep mod_time);
+
+void png_set_tRNS (png_structp png_ptr, png_infop info_ptr,
+png_bytep trans, int num_trans, png_color_16p trans_values);
+
+void png_set_write_fn (png_structp png_ptr, png_voidp io_ptr,
+png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn);
+
+void png_set_write_status_fn (png_structp png_ptr, png_write_status_ptr
+write_row_fn);
+
+void png_set_write_user_transform_fn (png_structp png_ptr,
+png_user_transform_ptr write_user_transform_fn);
+
+int png_sig_cmp (png_bytep sig, png_size_t start, png_size_t
+num_to_check);
+
+void png_start_read_image (png_structp png_ptr);
+
+void png_warning (png_structp png_ptr, png_const_charp
+message);
+
+void png_write_chunk (png_structp png_ptr, png_bytep
+chunk_name, png_bytep data, png_size_t length);
+
+void png_write_chunk_data (png_structp png_ptr, png_bytep data,
+png_size_t length);
+
+void png_write_chunk_end (png_structp png_ptr);
+
+void png_write_chunk_start (png_structp png_ptr, png_bytep
+chunk_name, png_uint_32 length);
+
+void png_write_destroy (png_structp png_ptr);
+
+void png_write_destroy_info (png_infop info_ptr);
+
+void png_write_end (png_structp png_ptr, png_infop info_ptr);
+
+void png_write_flush (png_structp png_ptr);
+
+void png_write_image (png_structp png_ptr, png_bytepp image);
+
+void png_write_info (png_structp png_ptr, png_infop info_ptr);
+
+void png_write_row (png_structp png_ptr, png_bytep row);
+
+void png_write_rows (png_structp png_ptr, png_bytepp row,
+png_uint_32 num_rows);
+
+.SH DESCRIPTION
+The
+.I libpng
+library supports encoding, decoding, and various manipulations of
+the Portable Network Graphics (PNG) format image files. It uses the
+.IR zlib(3)
+compression library.
+Following is a copy of the libpng.txt file that accompanies libpng.
+.SH LIBPNG.TXT
+libpng.txt - A description on how to use and modify libpng
+
+ libpng version 1.0.3 - January 14, 1999
+ Updated and distributed by Glenn Randers-Pehrson
+ <randeg at alumni.rpi.edu>
+ Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ For conditions of distribution and use, see copyright
+ notice in png.h.
+
+ based on:
+
+ libpng 1.0 beta 6 version 0.96 May 28, 1997
+ Updated and distributed by Andreas Dilger
+ Copyright (c) 1996, 1997 Andreas Dilger
+
+ libpng 1.0 beta 2 - version 0.88 January 26, 1996
+ For conditions of distribution and use, see copyright
+ notice in png.h. Copyright (c) 1995, 1996 Guy Eric
+ Schalnat, Group 42, Inc.
+
+ Updated/rewritten per request in the libpng FAQ
+ Copyright (c) 1995 Frank J. T. Wojcik
+ December 18, 1995 && January 20, 1996
+
+.SH I. Introduction
+
+This file describes how to use and modify the PNG reference library
+(known as libpng) for your own use. There are five sections to this
+file: introduction, structures, reading, writing, and modification and
+configuration notes for various special platforms. In addition to this
+file, example.c is a good starting point for using the library, as
+it is heavily commented and should include everything most people
+will need. We assume that libpng is already installed; see the
+INSTALL file for instructions on how to install libpng.
+
+Libpng was written as a companion to the PNG specification, as a way
+of reducing the amount of time and effort it takes to support the PNG
+file format in application programs. The PNG specification is available
+as RFC 2083 <ftp://ftp.uu.net/graphics/png/documents/> and as a
+W3C Recommendation <http://www.w3.org/TR/REC.png.html>. Some
+additional chunks are described in the special-purpose public chunks
+documents at <ftp://ftp.uu.net/graphics/png/documents/>. Other information
+about PNG, and the latest version of libpng, can be found at the PNG home
+page, <http://www.cdrom.com/pub/png/>.
+
+Most users will not have to modify the library significantly; advanced
+users may want to modify it more. All attempts were made to make it as
+complete as possible, while keeping the code easy to understand.
+Currently, this library only supports C. Support for other languages
+is being considered.
+
+Libpng has been designed to handle multiple sessions at one time,
+to be easily modifiable, to be portable to the vast majority of
+machines (ANSI, K&R, 16-, 32-, and 64-bit) available, and to be easy
+to use. The ultimate goal of libpng is to promote the acceptance of
+the PNG file format in whatever way possible. While there is still
+work to be done (see the TODO file), libpng should cover the
+majority of the needs of its users.
+
+Libpng uses zlib for its compression and decompression of PNG files.
+Further information about zlib, and the latest version of zlib, can
+be found at the zlib home page, <http://www.cdrom.com/pub/infozip/zlib/>.
+The zlib compression utility is a general purpose utility that is
+useful for more than PNG files, and can be used without libpng.
+See the documentation delivered with zlib for more details.
+You can usually find the source files for the zlib utility wherever you
+find the libpng source files.
+
+Libpng is thread safe, provided the threads are using different
+instances of the structures. Each thread should have its own
+png_struct and png_info instances, and thus its own image.
+Libpng does not protect itself against two threads using the
+same instance of a structure.
+
+
+.SH II. Structures
+
+There are two main structures that are important to libpng, png_struct
+and png_info. The first, png_struct, is an internal structure that
+will not, for the most part, be used by a user except as the first
+variable passed to every libpng function call.
+
+The png_info structure is designed to provide information about the
+PNG file. At one time, the fields of png_info were intended to be
+directly accessible to the user. However, this tended to cause problems
+with applications using dynamically loaded libraries, and as a result
+a set of interface functions for png_info was developed. The fields
+of png_info are still available for older applications, but it is
+suggested that applications use the new interfaces if at all possible.
+
+The png.h header file is an invaluable reference for programming with libpng.
+And while I'm on the topic, make sure you include the libpng header file:
+
+#include <png.h>
+
+.SH III. Reading
+
+Reading PNG files:
+
+We'll now walk you through the possible functions to call when reading
+in a PNG file, briefly explaining the syntax and purpose of each one.
+See example.c and png.h for more detail. While Progressive reading
+is covered in the next section, you will still need some of the
+functions discussed in this section to read a PNG file.
+
+You will want to do the I/O initialization(*) before you get into libpng,
+so if it doesn't work, you don't have much to undo. Of course, you
+will also want to insure that you are, in fact, dealing with a PNG
+file. Libpng provides a simple check to see if a file is a PNG file.
+To use it, pass in the first 1 to 8 bytes of the file, and it will
+return true or false (1 or 0) depending on whether the bytes could be
+part of a PNG file. Of course, the more bytes you pass in, the
+greater the accuracy of the prediction.
+
+If you are intending to keep the file pointer open for use in libpng,
+you must ensure you don't read more than 8 bytes from the beginning
+of the file, and you also have to make a call to png_set_sig_bytes_read()
+with the number of bytes you read from the beginning. Libpng will
+then only check the bytes (if any) that your program didn't read.
+
+(*): If you are not using the standard I/O functions, you will need
+to replace them with custom functions. See the discussion under
+Customizing libpng.
+
+
+ FILE *fp = fopen(file_name, "rb");
+ if (!fp)
+ {
+ return;
+ }
+ fread(header, 1, number, fp);
+ is_png = !png_sig_cmp(header, 0, number);
+ if (!is_png)
+ {
+ return;
+ }
+
+
+Next, png_struct and png_info need to be allocated and initialized. In
+order to ensure that the size of these structures is correct even with a
+dynamically linked libpng, there are functions to initialize and
+allocate the structures. We also pass the library version, optional
+pointers to error handling functions, and a pointer to a data struct for
+use by the error functions, if necessary (the pointer and functions can
+be NULL if the default error handlers are to be used). See the section
+on Changes to Libpng below regarding the old initialization functions.
+
+ png_structp png_ptr = png_create_read_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return;
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_read_struct(&png_ptr,
+ (png_infopp)NULL, (png_infopp)NULL);
+ return;
+ }
+
+ png_infop end_info = png_create_info_struct(png_ptr);
+ if (!end_info)
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return;
+ }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_read_struct_2() instead of png_create_read_struct():
+
+ png_structp png_ptr = png_create_read_struct_2
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn, (png_voidp)
+ user_mem_ptr, user_malloc_fn, user_free_fn);
+
+The error handling routines passed to png_create_read_struct()
+and the memory alloc/free routines passed to png_create_struct_2()
+are only necessary if you are not using the libpng supplied error
+handling and memory alloc/free functions.
+
+When libpng encounters an error, it expects to longjmp back
+to your routine. Therefore, you will need to call setjmp and pass
+your png_ptr->jmpbuf. If you read the file from different
+routines, you will need to update the jmpbuf field every time you enter
+a new routine that will call a png_ function.
+
+See your documentation of setjmp/longjmp for your compiler for more
+handling in the Customizing Libpng section below for more information on
+the libpng error handling. If an error occurs, and libpng longjmp's
+back to your setjmp, you will want to call png_destroy_read_struct() to
+free any memory.
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ &end_info);
+ fclose(fp);
+ return;
+ }
+
+Now you need to set up the input code. The default for libpng is to
+use the C function fread(). If you use this, you will need to pass a
+valid FILE * in the function png_init_io(). Be sure that the file is
+opened in binary mode. If you wish to handle reading data in another
+way, you need not call the png_init_io() function, but you must then
+implement the libpng I/O methods discussed in the Customizing Libpng
+section below.
+
+ png_init_io(png_ptr, fp);
+
+If you had previously opened the file and read any of the signature from
+the beginning in order to see if this was a PNG file, you need to let
+libpng know that there are some bytes missing from the start of the file.
+
+ png_set_sig_bytes(png_ptr, number);
+
+At this point, you can set up a callback function that will be
+called after each row has been read, which you can use to control
+a progress meter or the like. It's demonstrated in pngtest.c.
+You must supply a function
+
+ void read_row_callback(png_ptr, png_uint_32 row, int pass);
+ {
+ /* put your code here */
+ }
+
+(You can give it another name that you like instead of "read_row_callback")
+
+To inform libpng about your function, use
+
+ png_set_read_status_fn(png_ptr, read_row_callback);
+
+In PNG files, the alpha channel in an image is the level of opacity.
+If you need the alpha channel in an image to be the level of transparency
+instead of opacity, you can invert the alpha channel (or the tRNS chunk
+data) after it's read, so that 0 is fully opaque and 255 (in 8-bit or
+paletted images) or 65535 (in 16-bit images) is fully transparent, with
+
+ png_set_invert_alpha(png_ptr);
+
+This has to appear here rather than later with the other transformations
+because the tRNS chunk data must be modified in the case of paletted images.
+If your image is not a paletted image, the tRNS data (which in such cases
+represents a single color to be rendered as transparent) won't be changed.
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs. This is done by setting a callback
+with
+
+ png_set_read_user_transform_fn(png_ptr,
+ read_transform_fn);
+
+You must supply the function
+
+ void read_transform_fn(png_ptr ptr, row_info_ptr
+ row_info, png_bytep data)
+
+See pngtest.c for a working example. Your function will be called
+after all of the other transformations have been processed.
+
+You are now ready to read all the file information up to the actual
+image data. You do this with a call to png_read_info().
+
+ png_read_info(png_ptr, info_ptr);
+
+Functions are used to get the information from the info_ptr:
+
+ png_get_IHDR(png_ptr, info_ptr, &width, &height,
+ &bit_depth, &color_type, &interlace_type,
+ &compression_type, &filter_type);
+
+ width - holds the width of the image
+ in pixels (up to 2^31).
+ height - holds the height of the image
+ in pixels (up to 2^31).
+ bit_depth - holds the bit depth of one of the
+ image channels. (valid values are
+ 1, 2, 4, 8, 16 and depend also on
+ the color_type. See also
+ significant bits (sBIT) below).
+ color_type - describes which color/alpha channels
+ are present.
+ PNG_COLOR_TYPE_GRAY
+ (bit depths 1, 2, 4, 8, 16)
+ PNG_COLOR_TYPE_GRAY_ALPHA
+ (bit depths 8, 16)
+ PNG_COLOR_TYPE_PALETTE
+ (bit depths 1, 2, 4, 8)
+ PNG_COLOR_TYPE_RGB
+ (bit_depths 8, 16)
+ PNG_COLOR_TYPE_RGB_ALPHA
+ (bit_depths 8, 16)
+
+ PNG_COLOR_MASK_PALETTE
+ PNG_COLOR_MASK_COLOR
+ PNG_COLOR_MASK_ALPHA
+
+ filter_type - (must be PNG_FILTER_TYPE_BASE
+ for PNG 1.0)
+ compression_type - (must be PNG_COMPRESSION_TYPE_BASE
+ for PNG 1.0)
+ interlace_type - (PNG_INTERLACE_NONE or
+ PNG_INTERLACE_ADAM7)
+ Any or all of interlace_type, compression_type, of
+ filter_type can be
+ NULL if you are not interested in their values.
+
+ channels = png_get_channels(png_ptr, info_ptr);
+ channels - number of channels of info for the
+ color type (valid values are 1 (GRAY,
+ PALETTE), 2 (GRAY_ALPHA), 3 (RGB),
+ 4 (RGB_ALPHA or RGB + filler byte))
+ rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+ rowbytes - number of bytes needed to hold a row
+
+ signature = png_get_signature(png_ptr, info_ptr);
+ signature - holds the signature read from the
+ file (if any). The data is kept in
+ the same offset it would be if the
+ whole signature were read (i.e. if an
+ application had already read in 4
+ bytes of signature before starting
+ libpng, the remaining 4 bytes would
+ be in signature[4] through signature[7]
+ (see png_set_sig_bytes())).
+
+
+ width = png_get_image_width(png_ptr,
+ info_ptr);
+ height = png_get_image_height(png_ptr,
+ info_ptr);
+ bit_depth = png_get_bit_depth(png_ptr,
+ info_ptr);
+ color_type = png_get_color_type(png_ptr,
+ info_ptr);
+ filter_type = png_get_filter_type(png_ptr,
+ info_ptr);
+ compression_type = png_get_compression_type(png_ptr,
+ info_ptr);
+ interlace_type = png_get_interlace_type(png_ptr,
+ info_ptr);
+
+
+These are also important, but their validity depends on whether the chunk
+has been read. The png_get_valid(png_ptr, info_ptr, PNG_INFO_<chunk>) and
+png_get_<chunk>(png_ptr, info_ptr, ...) functions return non-zero if the
+data has been read, or zero if it is missing. The parameters to the
+png_get_<chunk> are set directly if they are simple data types, or a pointer
+into the info_ptr is returned for any complex types.
+
+ png_get_PLTE(png_ptr, info_ptr, &palette,
+ &num_palette);
+ palette - the palette for the file
+ (array of png_color)
+ num_palette - number of entries in the palette
+
+ png_get_gAMA(png_ptr, info_ptr, &gamma);
+ gamma - the gamma the file is written
+ at (PNG_INFO_gAMA)
+
+ png_get_sRGB(png_ptr, info_ptr, &srgb_intent);
+ srgb_intent - the rendering intent (PNG_INFO_sRGB)
+ The presence of the sRGB chunk
+ means that the pixel data is in the
+ sRGB color space. This chunk also
+ implies specific values of gAMA and
+ cHRM.
+
+ png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+ sig_bit - the number of significant bits for
+ (PNG_INFO_sBIT) each of the gray,
+ red, green, and blue channels,
+ whichever are appropriate for the
+ given color type (png_color_16)
+
+ png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans,
+ &trans_values);
+ trans - array of transparent entries for
+ palette (PNG_INFO_tRNS)
+ trans_values - transparent pixel for non-paletted
+ images (PNG_INFO_tRNS)
+ num_trans - number of transparent entries
+ (PNG_INFO_tRNS)
+
+ png_get_hIST(png_ptr, info_ptr, &hist);
+ (PNG_INFO_hIST)
+ hist - histogram of palette (array of
+ png_color_16)
+
+ png_get_tIME(png_ptr, info_ptr, &mod_time);
+ mod_time - time image was last modified
+ (PNG_VALID_tIME)
+
+ png_get_bKGD(png_ptr, info_ptr, &background);
+ background - background color (PNG_VALID_bKGD)
+
+ num_text = png_get_text(png_ptr, info_ptr, &text_ptr);
+ text_ptr - array of png_text holding image
+ comments
+ text_ptr[i]->key - keyword for comment.
+ text_ptr[i]->text - text comments for current
+ keyword.
+ text_ptr[i]->compression - type of compression used
+ on "text" PNG_TEXT_COMPRESSION_NONE
+ or PNG_TEXT_COMPRESSION_zTXt
+ num_text - number of comments
+
+ png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y,
+ &unit_type);
+ offset_x - positive offset from the left edge
+ of the screen
+ offset_y - positive offset from the top edge
+ of the screen
+ unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+ png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y,
+ &unit_type);
+ res_x - pixels/unit physical resolution in
+ x direction
+ res_y - pixels/unit physical resolution in
+ x direction
+ unit_type - PNG_RESOLUTION_UNKNOWN,
+ PNG_RESOLUTION_METER
+
+The data from the pHYs chunk can be retrieved in several convenient
+forms:
+
+ res_x = png_get_x_pixels_per_meter(png_ptr,
+ info_ptr)
+ res_y = png_get_y_pixels_per_meter(png_ptr,
+ info_ptr)
+ res_x_and_y = png_get_pixels_per_meter(png_ptr,
+ info_ptr)
+ aspect_ratio = png_get_pixel_aspect_ratio(png_ptr,
+ info_ptr)
+
+ (Each of these returns 0 [signifying "unknown"] if
+ the data is not present or if res_x is 0;
+ res_x_and_y is 0 if res_x != res_y)
+
+For more information, see the png_info definition in png.h and the
+PNG specification for chunk contents. Be careful with trusting
+rowbytes, as some of the transformations could increase the space
+needed to hold a row (expand, filler, gray_to_rgb, etc.).
+See png_read_update_info(), below.
+
+A quick word about text_ptr and num_text. PNG stores comments in
+keyword/text pairs, one pair per chunk, with no limit on the number
+of text chunks, and a 2^31 byte limit on their size. While there are
+suggested keywords, there is no requirement to restrict the use to these
+strings. It is strongly suggested that keywords and text be sensible
+to humans (that's the point), so don't use abbreviations. Non-printing
+symbols are not allowed. See the PNG specification for more details.
+There is also no requirement to have text after the keyword.
+
+Keywords should be limited to 79 Latin-1 characters without leading or
+trailing spaces, but non-consecutive spaces are allowed within the
+keyword. It is possible to have the same keyword any number of times.
+The text_ptr is an array of png_text structures, each holding pointer
+to a keyword and a pointer to a text string. Only the text string may
+be null. The keyword/text pairs are put into the array in the order
+that they are received. However, some or all of the text chunks may be
+after the image, so, to make sure you have read all the text chunks,
+don't mess with these until after you read the stuff after the image.
+This will be mentioned again below in the discussion that goes with
+png_read_end().
+
+After you've read the header information, you can set up the library
+to handle any special transformations of the image data. The various
+ways to transform the data will be described in the order that they
+should occur. This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths. Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data. For example, don't swap red and blue on grayscale data.
+
+The colors used for the background and transparency values should be
+supplied in the same format/depth as the current image data. They
+are stored in the same format/depth as the image data in a bKGD or tRNS
+chunk, so this is what libpng expects for this data. The colors are
+transformed to keep in sync with the image data when an application
+calls the png_read_update_info() routine (see below).
+
+Data will be decoded into the supplied row buffers packed into bytes
+unless the library has been told to transform it into another format.
+For example, 4 bit/pixel paletted or grayscale data will be returned
+2 pixels/byte with the leftmost pixel in the high-order bits of the
+byte, unless png_set_packing() is called. 8-bit RGB data will be stored
+in RGB RGB RGB format unless png_set_filler() is called to insert filler
+bytes, either before or after each RGB triplet. 16-bit RGB data will
+be returned RRGGBB RRGGBB, with the most significant byte of the color
+value first, unless png_set_strip_16() is called to transform it to
+regular RGB RGB triplets, or png_set_filler() is called to insert
+filler bytes, either before or after each RRGGBB triplet. Similarly,
+8-bit or 16-bit grayscale data can be modified with png_set_filler()
+or png_set_strip_16().
+
+The following code transforms grayscale images of less than 8 to 8 bits,
+changes paletted images to RGB, and adds a full alpha channel if there is
+transparency information in a tRNS chunk. This is most useful on
+grayscale images with bit depths of 2 or 4 or if there is a multiple-image
+viewing application that wishes to treat all images in the same way.
+
+ if (color_type == PNG_COLOR_TYPE_PALETTE &&
+ bit_depth <= 8) png_set_expand(png_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_GRAY &&
+ bit_depth < 8) png_set_expand(png_ptr);
+
+ if (png_get_valid(png_ptr, info_ptr,
+ PNG_INFO_tRNS)) png_set_expand(png_ptr);
+
+PNG can have files with 16 bits per channel. If you only can handle
+8 bits per channel, this will strip the pixels down to 8 bit.
+
+ if (bit_depth == 16)
+ png_set_strip_16(png_ptr);
+
+The png_set_background() function tells libpng to composite images
+with alpha or simple transparency against the supplied background
+color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid),
+you may use this color, or supply another color more suitable for
+the current display (e.g., the background color from a web page). You
+need to tell libpng whether the color is in the gamma space of the
+display (PNG_BACKGROUND_GAMMA_SCREEN for colors you supply), the file
+(PNG_BACKGROUND_GAMMA_FILE for colors from the bKGD chunk), or one
+that is neither of these gammas (PNG_BACKGROUND_GAMMA_UNIQUE - I don't
+know why anyone would use this, but it's here).
+
+If, for some reason, you don't need the alpha channel on an image,
+and you want to remove it rather than combining it with the background
+(but the image author certainly had in mind that you *would* combine
+it with the background, so that's what you should probably do):
+
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ png_set_strip_alpha(png_ptr);
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit
+files. This code expands to 1 pixel per byte without changing the
+values of the pixels:
+
+ if (bit_depth < 8)
+ png_set_packing(png_ptr);
+
+PNG files have possible bit depths of 1, 2, 4, 8, and 16. All pixels
+stored in a PNG image have been "scaled" or "shifted" up to the next
+higher possible bit depth (e.g. from 5 bits/sample in the range [0,31] to
+8 bits/sample in the range [0, 255]). However, it is also possible to
+convert the PNG pixel data back to the original bit depth of the image.
+This call reduces the pixels back down to the original bit depth:
+
+ png_color_16p sig_bit;
+
+ if (png_get_sBIT(png_ptr, info_ptr, &sig_bit))
+ png_set_shift(png_ptr, sig_bit);
+
+PNG files store 3-color pixels in red, green, blue order. This code
+changes the storage of the pixels to blue, green, red:
+
+ if (color_type == PNG_COLOR_TYPE_RGB ||
+ color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_bgr(png_ptr);
+
+PNG files store RGB pixels packed into 3 bytes. This code expands them
+into 4 bytes for windowing systems that need them in this format:
+
+ if (bit_depth == 8 && color_type ==
+ PNG_COLOR_TYPE_RGB) png_set_filler(png_ptr,
+ filler, PNG_FILLER_BEFORE);
+
+where "filler" is the 8 or 16-bit number to fill with, and the location is
+either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending upon whether
+you want the filler before the RGB or after. This transformation
+does not affect images that already have full alpha channels.
+
+If you are reading an image with an alpha channel, and you need the
+data as ARGB instead of the normal PNG format RGBA:
+
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_swap_alpha(png_ptr);
+
+For some uses, you may want a grayscale image to be represented as
+RGB. This code will do that conversion:
+
+ if (color_type == PNG_COLOR_TYPE_GRAY ||
+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ png_set_gray_to_rgb(png_ptr);
+
+Conversely, you can convert an RGB or RGBA image to grayscale or grayscale
+with alpha. This is intended for conversion of images that really are
+gray (red == green == blue), so the function simply strips out the red
+and blue channels, leaving the green channel in the gray position.
+
+ if (color_type == PNG_COLOR_TYPE_RGB ||
+ color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ png_set_rgb_to_gray(png_ptr, error_action,
+ float red_weight, float green_weight);
+
+ error_action = 1: silently do the conversion
+ error_action = 2: issue a warning if the original
+ image has any pixel where
+ red != green or red != blue
+ error_action = 3: issue an error and abort the
+ conversion if the original
+ image has any pixel where
+ red != green or red != blue
+
+ red_weight: weight of red component
+ (NULL -> default 54/256)
+ green_weight: weight of green component
+ (NULL -> default 183/256)
+
+If you have set error_action = 1 or 2, you can
+later check whether the image really was gray, after processing
+the image rows, with the png_get_rgb_to_gray_status(png_ptr) function.
+It will return a png_byte that is zero if the image was gray or
+1 if there were any non-gray pixels. bKGD and sBIT data
+will be silently converted to grayscale, using the green channel
+data, regardless of the error_action setting.
+
+With 0.0<=red_weight+green_weight<=1.0,
+the normalized graylevel is computed:
+
+ int rw = red_weight * 256;
+ int gw = green_weight * 256;
+ int bw = 256 - (rw + gw);
+ gray = (rw*red + gw*green + bw*blue)/256;
+
+The default values approximate those recommended in the Charles
+Poynton's Color FAQ, <http://www.inforamp.net/~poynton/>
+Copyright (c) 1998-01-04 Charles Poynton poynton at inforamp.net
+
+ Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+
+Libpng approximates this with
+
+ Y = 0.211 * R + 0.715 * G + 0.074 * B
+
+which can be expressed with integers as
+
+ Y = (54 * R + 183 * G + 19 * B)/256
+
+The calculation is done in a linear colorspace, if the image gamma
+is known.
+
+If you have a grayscale and you are using png_set_expand() to change to
+a higher bit-depth, you must either supply the background color as a gray
+value at the original file bit-depth (need_expand = 1) or else supply the
+background color as an RGB triplet at the final, expanded bit depth
+(need_expand = 0). Similarly, if you are reading a paletted image, you
+must either supply the background color as a palette index (need_expand = 1)
+or as an RGB triplet that may or may not be in the palette (need_expand = 0).
+
+ png_color_16 my_background;
+ png_color_16p image_background;
+
+ if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+ png_set_background(png_ptr, image_background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ else
+ png_set_background(png_ptr, &my_background,
+ PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+To properly display PNG images on any kind of system, the application needs
+to know what the display gamma is. Ideally, the user will know this, and
+the application will allow them to set it. One method of allowing the user
+to set the display gamma separately for each system is to check for the
+DISPLAY_GAMMA and VIEWING_GAMMA environment variables or for a SCREEN_GAMMA
+environment variable, which will hopefully be correctly set.
+
+Note that display_gamma is the gamma of your display, while screen_gamma is
+the overall gamma correction required to produce pleasing results,
+which depends on the lighting conditions in the surrounding environment.
+Screen_gamma is display_gamma/viewing_gamma, where viewing_gamma is
+the amount of additional gamma correction needed to compensate for
+a (viewing_gamma=1.25) environment. In a dim or brightly lit room, no
+compensation other than the display_gamma is needed (viewing_gamma=1.0).
+
+ if (/* We have a user-defined screen
+ gamma value */)
+ {
+ screen_gamma = user_defined_screen_gamma;
+ }
+ /* One way that applications can share the same
+ screen gamma value */
+ else if ((gamma_str = getenv("SCREEN_GAMMA"))
+ != NULL)
+ {
+ screen_gamma = atof(gamma_str);
+ }
+ /* If we don't have another value */
+ else
+ {
+ screen_gamma = 2.2; /* A good guess for a
+ PC monitor in a bright office or a dim room */
+ screen_gamma = 2.0; /* A good guess for a
+ PC monitor in a dark room */
+ screen_gamma = 1.7 or 1.0; /* A good
+ guess for Mac systems */
+ }
+
+The png_set_gamma() function handles gamma transformations of the data.
+Pass both the file gamma and the current screen_gamma. If the file does
+not have a gamma value, you can pass one anyway if you have an idea what
+it is (usually 0.45455 is a good guess for GIF images on PCs). Note
+that file gammas are inverted from screen gammas. See the discussions
+on gamma in the PNG specification for an excellent description of what
+gamma is, and why all applications should support it. It is strongly
+recommended that PNG viewers support gamma correction.
+
+ if (png_get_gAMA(png_ptr, info_ptr, &gamma))
+ png_set_gamma(png_ptr, screen_gamma, gamma);
+ else
+ png_set_gamma(png_ptr, screen_gamma, 0.45455);
+
+If you need to reduce an RGB file to a paletted file, or if a paletted
+file has more entries then will fit on your screen, png_set_dither()
+will do that. Note that this is a simple match dither that merely
+finds the closest color available. This should work fairly well with
+optimized palettes, and fairly badly with linear color cubes. If you
+pass a palette that is larger then maximum_colors, the file will
+reduce the number of colors in the palette so it will fit into
+maximum_colors. If there is a histogram, it will use it to make
+more intelligent choices when reducing the palette. If there is no
+histogram, it may not do as good a job.
+
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ if (png_get_valid(png_ptr, info_ptr,
+ PNG_INFO_PLTE))
+ {
+ png_color_16p histogram;
+
+ png_get_hIST(png_ptr, info_ptr,
+ &histogram);
+ png_set_dither(png_ptr, palette, num_palette,
+ max_screen_colors, histogram, 1);
+ }
+ else
+ {
+ png_color std_color_cube[MAX_SCREEN_COLORS] =
+ { ... colors ... };
+
+ png_set_dither(png_ptr, std_color_cube,
+ MAX_SCREEN_COLORS, MAX_SCREEN_COLORS,
+ NULL,0);
+ }
+ }
+
+PNG files describe monochrome as black being zero and white being one.
+The following code will reverse this (make black be one and white be
+zero):
+
+ if (bit_depth == 1 && color_type == PNG_COLOR_GRAY)
+ png_set_invert_mono(png_ptr);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first). This code changes the storage to the
+other way (little-endian, i.e. least significant bits first, the
+way PCs store them):
+
+ if (bit_depth == 16)
+ png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+ if (bit_depth < 8)
+ png_set_packswap(png_ptr);
+
+The last thing to handle is interlacing; this is covered in detail below,
+but you must call the function here if you want libpng to handle expansion
+of the interlaced image.
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+
+After setting the transformations, libpng can update your png_info
+structure to reflect any transformations you've requested with this
+call. This is most useful to update the info structure's rowbytes
+field so you can use it to allocate your image memory. This function
+will also update your palette with the correct screen_gamma and
+background if these have been given with the calls above.
+
+ png_read_update_info(png_ptr, info_ptr);
+
+After you call png_read_update_info(), you can allocate any
+memory you need to hold the image. The row data is simply
+raw byte data for all forms of images. As the actual allocation
+varies among applications, no example will be given. If you
+are allocating one large chunk, you will need to build an
+array of pointers to each row, as it will be needed for some
+of the functions below.
+
+After you've allocated memory, you can read the image data.
+The simplest way to do this is in one function call. If you are
+allocating enough memory to hold the whole image, you can just
+call png_read_image() and libpng will read in all the image data
+and put it in the memory area supplied. You will need to pass in
+an array of pointers to each row.
+
+This function automatically handles interlacing, so you don't need
+to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_read_rows().
+
+ png_read_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+ png_bytep row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to read in the whole image at once, you can
+use png_read_rows() instead. If there is no interlacing (check
+interlace_type == PNG_INTERLACE_NONE), this is simple:
+
+ png_read_rows(png_ptr, row_pointers, NULL,
+ number_of_rows);
+
+where row_pointers is the same as in the png_read_image() call.
+
+If you are doing this just one row at a time, you can do this with
+row_pointers:
+
+ png_bytep row_pointers = row;
+ png_read_row(png_ptr, &row_pointers, NULL);
+
+If the file is interlaced (info_ptr->interlace_type != 0), things get
+somewhat harder. The only current (PNG Specification version 1.0)
+interlacing type for PNG is (interlace_type == PNG_INTERLACE_ADAM7)
+is a somewhat complicated 2D interlace scheme, known as Adam7, that
+breaks down an image into seven smaller images of varying size, based
+on an 8x8 grid.
+
+libpng can fill out those images or it can give them to you "as is".
+If you want them filled out, there are two ways to do that. The one
+mentioned in the PNG specification is to expand each pixel to cover
+those pixels that have not been read yet (the "rectangle" method).
+This results in a blocky image for the first pass, which gradually
+smooths out as more pixels are read. The other method is the "sparkle"
+method, where pixels are drawn only in their final locations, with the
+rest of the image remaining whatever colors they were initialized to
+before the start of the read. The first method usually looks better,
+but tends to be slower, as there are more pixels to put in the rows.
+
+If you don't want libpng to handle the interlacing details, just call
+png_read_rows() seven times to read in all seven images. Each of the
+images is a valid image by itself, or they can all be combined on an
+8x8 grid to form a single image (although if you intend to combine them
+you would be far better off using the libpng interlace handling).
+
+The first pass will return an image 1/8 as wide as the entire image
+(every 8th column starting in column 0) and 1/8 as high as the original
+(every 8th row starting in row 0), the second will be 1/8 as wide
+(starting in column 4) and 1/8 as high (also starting in row 0). The
+third pass will be 1/4 as wide (every 4th pixel starting in column 0) and
+1/8 as high (every 8th row starting in row 4), and the fourth pass will
+be 1/4 as wide and 1/4 as high (every 4th column starting in column 2,
+and every 4th row starting in row 0). The fifth pass will return an
+image 1/2 as wide, and 1/4 as high (starting at column 0 and row 2),
+while the sixth pass will be 1/2 as wide and 1/2 as high as the original
+(starting in column 1 and row 0). The seventh and final pass will be as
+wide as the original, and 1/2 as high, containing all of the odd
+numbered scanlines. Phew!
+
+If you want libpng to expand the images, call this before calling
+png_start_read_image() or png_read_update_info():
+
+ if (interlace_type == PNG_INTERLACE_ADAM7)
+ number_of_passes
+ = png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed. Currently, this
+is seven, but may change if another interlace type is added.
+This function can be called even if the file is not interlaced,
+where it will return one pass.
+
+If you are not going to display the image after each pass, but are
+going to wait until the entire image is read in, use the sparkle
+effect. This effect is faster and the end result of either method
+is exactly the same. If you are planning on displaying the image
+after each pass, the "rectangle" effect is generally considered the
+better looking one.
+
+If you only want the "sparkle" effect, just call png_read_rows() as
+normal, with the third parameter NULL. Make sure you make pass over
+the image number_of_passes times, and you don't change the data in the
+rows between calls. You can change the locations of the data, just
+not the data. Each pass only writes the pixels appropriate for that
+pass, and assumes the data from previous passes is still valid.
+
+ png_read_rows(png_ptr, row_pointers, NULL,
+ number_of_rows);
+
+If you only want the first effect (the rectangles), do the same as
+before except pass the row buffer in the third parameter, and leave
+the second parameter NULL.
+
+ png_read_rows(png_ptr, NULL, row_pointers,
+ number_of_rows);
+
+After you are finished reading the image, you can finish reading
+the file. If you are interested in comments or time, which may be
+stored either before or after the image data, you should pass the
+separate png_info struct if you want to keep the comments from
+before and after the image separate. If you are not interested, you
+can pass NULL.
+
+ png_read_end(png_ptr, end_info);
+
+When you are done, you can free all memory allocated by libpng like this:
+
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ &end_info);
+
+For a more compact example of reading a PNG image, see the file example.c.
+
+
+Reading PNG files progressively:
+
+The progressive reader is slightly different then the non-progressive
+reader. Instead of calling png_read_info(), png_read_rows(), and
+png_read_end(), you make one call to png_process_data(), which calls
+callbacks when it has the info, a row, or the end of the image. You
+set up these callbacks with png_set_progressive_read_fn(). You don't
+have to worry about the input/output functions of libpng, as you are
+giving the library the data directly in png_process_data(). I will
+assume that you have read the section on reading PNG files above,
+so I will only highlight the differences (although I will show
+all of the code).
+
+png_structp png_ptr;
+png_infop info_ptr;
+
+ /* An example code fragment of how you would
+ initialize the progressive reader in your
+ application. */
+ int
+ initialize_png_reader()
+ {
+ png_ptr = png_create_read_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return -1;
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ /* This one's new. You can provide functions
+ to be called when the header info is valid,
+ when each row is completed, and when the image
+ is finished. If you aren't using all functions,
+ you can specify NULL parameters. Even when all
+ three functions are NULL, you need to call
+ png_set_progressive_read_fn(). You can use
+ any struct as the user_ptr (cast to a void pointer
+ for the function call), and retrieve the pointer
+ from inside the callbacks using the function
+
+ png_get_progressive_ptr(png_ptr);
+
+ which will return a void pointer, which you have
+ to cast appropriately.
+ */
+ png_set_progressive_read_fn(png_ptr, (void *)user_ptr,
+ info_callback, row_callback, end_callback);
+
+ return 0;
+ }
+
+ /* A code fragment that you call as you receive blocks
+ of data */
+ int
+ process_data(png_bytep buffer, png_uint_32 length)
+ {
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp)NULL);
+ return -1;
+ }
+
+ /* This one's new also. Simply give it a chunk
+ of data from the file stream (in order, of
+ course). On machines with segmented memory
+ models machines, don't give it any more than
+ 64K. The library seems to run fine with sizes
+ of 4K. Although you can give it much less if
+ necessary (I assume you can give it chunks of
+ 1 byte, I haven't tried less then 256 bytes
+ yet). When this function returns, you may
+ want to display any rows that were generated
+ in the row callback if you don't already do
+ so there.
+ */
+ png_process_data(png_ptr, info_ptr, buffer, length);
+ return 0;
+ }
+
+ /* This function is called (as set by
+ png_set_progressive_read_fn() above) when enough data
+ has been supplied so all of the header has been
+ read.
+ */
+ void
+ info_callback(png_structp png_ptr, png_infop info)
+ {
+ /* Do any setup here, including setting any of
+ the transformations mentioned in the Reading
+ PNG files section. For now, you _must_ call
+ either png_start_read_image() or
+ png_read_update_info() after all the
+ transformations are set (even if you don't set
+ any). You may start getting rows before
+ png_process_data() returns, so this is your
+ last chance to prepare for that.
+ */
+ }
+
+ /* This function is called when each row of image
+ data is complete */
+ void
+ row_callback(png_structp png_ptr, png_bytep new_row,
+ png_uint_32 row_num, int pass)
+ {
+ /* If the image is interlaced, and you turned
+ on the interlace handler, this function will
+ be called for every row in every pass. Some
+ of these rows will not be changed from the
+ previous pass. When the row is not changed,
+ the new_row variable will be NULL. The rows
+ and passes are called in order, so you don't
+ really need the row_num and pass, but I'm
+ supplying them because it may make your life
+ easier.
+
+ For the non-NULL rows of interlaced images,
+ you must call png_progressive_combine_row()
+ passing in the row and the old row. You can
+ call this function for NULL rows (it will just
+ return) and for non-interlaced images (it just
+ does the memcpy for you) if it will make the
+ code easier. Thus, you can just do this for
+ all cases:
+ */
+
+ png_progressive_combine_row(png_ptr, old_row,
+ new_row);
+
+ /* where old_row is what was displayed for
+ previously for the row. Note that the first
+ pass (pass == 0, really) will completely cover
+ the old row, so the rows do not have to be
+ initialized. After the first pass (and only
+ for interlaced images), you will have to pass
+ the current row, and the function will combine
+ the old row and the new row.
+ */
+ }
+
+ void
+ end_callback(png_structp png_ptr, png_infop info)
+ {
+ /* This function is called after the whole image
+ has been read, including any chunks after the
+ image (up to and including the IEND). You
+ will usually have the same info chunk as you
+ had in the header, although some data may have
+ been added to the comments and time fields.
+
+ Most people won't do much here, perhaps setting
+ a flag that marks the image as finished.
+ */
+ }
+
+
+
+.SH IV. Writing
+
+Much of this is very similar to reading. However, everything of
+importance is repeated here, so you won't have to constantly look
+back up in the reading section to understand writing.
+
+You will want to do the I/O initialization before you get into libpng,
+so if it doesn't work, you don't have anything to undo. If you are not
+using the standard I/O functions, you will need to replace them with
+custom writing functions. See the discussion under Customizing libpng.
+
+ FILE *fp = fopen(file_name, "wb");
+ if (!fp)
+ {
+ return;
+ }
+
+Next, png_struct and png_info need to be allocated and initialized.
+As these can be both relatively large, you may not want to store these
+on the stack, unless you have stack space to spare. Of course, you
+will want to check if they return NULL. If you are also reading,
+you won't want to name your read structure and your write structure
+both "png_ptr"; you can call them anything you like, such as
+"read_ptr" and "write_ptr". Look at pngtest.c, for example.
+
+ png_structp png_ptr = png_create_write_struct
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn);
+ if (!png_ptr)
+ return;
+
+ png_infop info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+ png_destroy_write_struct(&png_ptr,
+ (png_infopp)NULL);
+ return;
+ }
+
+If you want to use your own memory allocation routines,
+define PNG_USER_MEM_SUPPORTED and use
+png_create_write_struct_2() instead of png_create_read_struct():
+
+ png_structp png_ptr = png_create_write_struct_2
+ (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+ user_error_fn, user_warning_fn, (png_voidp)
+ user_mem_ptr, user_malloc_fn, user_free_fn);
+
+After you have these structures, you will need to set up the
+error handling. When libpng encounters an error, it expects to
+longjmp() back to your routine. Therefore, you will need to call
+setjmp() and pass the png_ptr->jmpbuf. If you
+write the file from different routines, you will need to update
+the jmpbuf field every time you enter a new routine that will
+call a png_ function. See your documentation of setjmp/longjmp
+for your compiler for more information on setjmp/longjmp. See
+the discussion on libpng error handling in the Customizing Libpng
+section below for more information on the libpng error handling.
+
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ fclose(fp);
+ return;
+ }
+ ...
+ return;
+
+Now you need to set up the output code. The default for libpng is to
+use the C function fwrite(). If you use this, you will need to pass a
+valid FILE * in the function png_init_io(). Be sure that the file is
+opened in binary mode. Again, if you wish to handle writing data in
+another way, see the discussion on libpng I/O handling in the Customizing
+Libpng section below.
+
+ png_init_io(png_ptr, fp);
+
+At this point, you can set up a callback function that will be
+called after each row has been written, which you can use to control
+a progress meter or the like. It's demonstrated in pngtest.c.
+You must supply a function
+
+ void write_row_callback(png_ptr, png_uint_32 row, int pass);
+ {
+ /* put your code here */
+ }
+
+(You can give it another name that you like instead of "write_row_callback")
+
+To inform libpng about your function, use
+
+ png_set_write_status_fn(png_ptr, write_row_callback);
+
+You now have the option of modifying how the compression library will
+run. The following functions are mainly for testing, but may be useful
+in some cases, like if you need to write PNG files extremely fast and
+are willing to give up some compression, or if you want to get the
+maximum possible compression at the expense of slower writing. If you
+have no special needs in this area, let the library do what it wants by
+not calling this function at all, as it has been tuned to deliver a good
+speed/compression ratio. The second parameter to png_set_filter() is
+the filter method, for which the only valid value is '0' (as of the
+October 1996 PNG specification, version 1.0). The third parameter is a
+flag that indicates which filter type(s) are to be tested for each
+scanline. See the Compression Library for details on the specific filter
+types.
+
+
+ /* turn on or off filtering, and/or choose
+ specific filters */
+ png_set_filter(png_ptr, 0,
+ PNG_FILTER_NONE | PNG_FILTER_SUB |
+ PNG_FILTER_PAETH);
+
+The png_set_compression_???() functions interface to the zlib compression
+library, and should mostly be ignored unless you really know what you are
+doing. The only generally useful call is png_set_compression_level()
+which changes how much time zlib spends on trying to compress the image
+data. See the Compression Library for details on the compression levels.
+
+ /* set the zlib compression level */
+ png_set_compression_level(png_ptr,
+ Z_BEST_COMPRESSION);
+
+ /* set other zlib parameters */
+ png_set_compression_mem_level(png_ptr, 8);
+ png_set_compression_strategy(png_ptr,
+ Z_DEFAULT_STRATEGY);
+ png_set_compression_window_bits(png_ptr, 15);
+ png_set_compression_method(png_ptr, 8);
+
+You now need to fill in the png_info structure with all the data you
+wish to write before the actual image. Note that the only thing you
+are allowed to write after the image is the text chunks and the time
+chunk (as of PNG Specification 1.0, anyway). See png_write_end() and
+the latest PNG specification for more information on that. If you
+wish to write them before the image, fill them in now, and flag that
+data as being valid. If you want to wait until after the data, don't
+fill them until png_write_end(). For all the fields in png_info and
+their data types, see png.h. For explanations of what the fields
+contain, see the PNG specification.
+
+Some of the more important parts of the png_info are:
+
+ png_set_IHDR(png_ptr, info_ptr, width, height,
+ bit_depth, color_type, interlace_type,
+ compression_type, filter_type)
+ width - holds the width of the image
+ in pixels (up to 2^31).
+ height - holds the height of the image
+ in pixels (up to 2^31).
+ bit_depth - holds the bit depth of one of the
+ image channels.
+ (valid values are 1, 2, 4, 8, 16
+ and depend also on the
+ color_type. See also significant
+ bits (sBIT) below).
+ color_type - describes which color/alpha
+ channels are present.
+ PNG_COLOR_TYPE_GRAY
+ (bit depths 1, 2, 4, 8, 16)
+ PNG_COLOR_TYPE_GRAY_ALPHA
+ (bit depths 8, 16)
+ PNG_COLOR_TYPE_PALETTE
+ (bit depths 1, 2, 4, 8)
+ PNG_COLOR_TYPE_RGB
+ (bit_depths 8, 16)
+ PNG_COLOR_TYPE_RGB_ALPHA
+ (bit_depths 8, 16)
+
+ PNG_COLOR_MASK_PALETTE
+ PNG_COLOR_MASK_COLOR
+ PNG_COLOR_MASK_ALPHA
+
+ interlace_type - PNG_INTERLACE_NONE or
+ PNG_INTERLACE_ADAM7
+ compression_type - (must be
+ PNG_COMPRESSION_TYPE_DEFAULT)
+ filter_type - (must be PNG_FILTER_TYPE_DEFAULT)
+
+ png_set_PLTE(png_ptr, info_ptr, palette,
+ num_palette);
+ palette - the palette for the file
+ (array of png_color)
+ num_palette - number of entries in the palette
+
+ png_set_gAMA(png_ptr, info_ptr, gamma);
+ gamma - the gamma the image was created
+ at (PNG_INFO_gAMA)
+
+ png_set_sRGB(png_ptr, info_ptr, srgb_intent);
+ srgb_intent - the rendering intent
+ (PNG_INFO_sRGB) The presence of
+ the sRGB chunk means that the pixel
+ data is in the sRGB color space.
+ This chunk also implies specific
+ values of gAMA and cHRM. Rendering
+ intent is the CSS-1 property that
+ has been defined by the International
+ Color Consortium
+ (http://www.color.org).
+ It can be one of
+ PNG_SRGB_INTENT_SATURATION,
+ PNG_SRGB_INTENT_PERCEPTUAL,
+ PNG_SRGB_INTENT_ABSOLUTE, or
+ PNG_SRGB_INTENT_RELATIVE.
+
+
+ png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ srgb_intent);
+ srgb_intent - the rendering intent
+ (PNG_INFO_sRGB) The presence of the
+ sRGB chunk means that the pixel
+ data is in the sRGB color space.
+ This function also causes gAMA and
+ cHRM chunks with the specific values
+ that are consistent with sRGB to be
+ written.
+
+ png_set_sBIT(png_ptr, info_ptr, sig_bit);
+ sig_bit - the number of significant bits for
+ (PNG_INFO_sBIT) each of the gray, red,
+ green, and blue channels, whichever are
+ appropriate for the given color type
+ (png_color_16)
+
+ png_set_tRNS(png_ptr, info_ptr, trans, num_trans,
+ trans_values);
+ trans - array of transparent entries for
+ palette (PNG_INFO_tRNS)
+ trans_values - transparent pixel for non-paletted
+ images (PNG_INFO_tRNS)
+ num_trans - number of transparent entries
+ (PNG_INFO_tRNS)
+
+ png_set_hIST(png_ptr, info_ptr, hist);
+ (PNG_INFO_hIST)
+ hist - histogram of palette (array of
+ png_color_16)
+
+ png_set_tIME(png_ptr, info_ptr, mod_time);
+ mod_time - time image was last modified
+ (PNG_VALID_tIME)
+
+ png_set_bKGD(png_ptr, info_ptr, background);
+ background - background color (PNG_VALID_bKGD)
+
+ png_set_text(png_ptr, info_ptr, text_ptr, num_text);
+ text_ptr - array of png_text holding image
+ comments
+ text_ptr[i]->key - keyword for comment.
+ text_ptr[i]->text - text comments for current
+ keyword.
+ text_ptr[i]->compression - type of compression used
+ on "text" PNG_TEXT_COMPRESSION_NONE or
+ PNG_TEXT_COMPRESSION_zTXt
+ num_text - number of comments in text_ptr
+
+ png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y,
+ unit_type);
+ offset_x - positive offset from the left
+ edge of the screen
+ offset_y - positive offset from the top
+ edge of the screen
+ unit_type - PNG_OFFSET_PIXEL, PNG_OFFSET_MICROMETER
+
+ png_set_pHYs(png_ptr, info_ptr, res_x, res_y,
+ unit_type);
+ res_x - pixels/unit physical resolution
+ in x direction
+ res_y - pixels/unit physical resolution
+ in y direction
+ unit_type - PNG_RESOLUTION_UNKNOWN,
+ PNG_RESOLUTION_METER
+
+In PNG files, the alpha channel in an image is the level of opacity.
+If your data is supplied as a level of transparency, you can invert the
+alpha channel before you write it, so that 0 is fully transparent and 255
+(in 8-bit or paletted images) or 65535 (in 16-bit images) is fully opaque,
+with
+
+ png_set_invert_alpha(png_ptr);
+
+This must appear here instead of later with the other transformations
+because in the case of paletted images the tRNS chunk data has to
+be inverted before the tRNS chunk is written. If your image is not a
+paletted image, the tRNS data (which in such cases represents a single
+color to be rendered as transparent) won't be changed.
+
+A quick word about text and num_text. text is an array of png_text
+structures. num_text is the number of valid structures in the array.
+If you want, you can use max_text to hold the size of the array, but
+libpng ignores it for writing (it does use it for reading). Each
+png_text structure holds a keyword-text value, and a compression type.
+The compression types have the same valid numbers as the compression
+types of the image data. Currently, the only valid number is zero.
+However, you can store text either compressed or uncompressed, unlike
+images, which always have to be compressed. So if you don't want the
+text compressed, set the compression type to PNG_TEXT_COMPRESSION_NONE.
+Until text gets around 1000 bytes, it is not worth compressing it.
+After the text has been written out to the file, the compression type
+is set to PNG_TEXT_COMPRESSION_NONE_WR or PNG_TEXT_COMPRESSION_zTXt_WR,
+so that it isn't written out again at the end (in case you are calling
+png_write_end() with the same struct.
+
+The keywords that are given in the PNG Specification are:
+
+ Title Short (one line) title or
+ caption for image
+ Author Name of image's creator
+ Description Description of image (possibly long)
+ Copyright Copyright notice
+ Creation Time Time of original image creation
+ (usually RFC 1123 format, see below)
+ Software Software used to create the image
+ Disclaimer Legal disclaimer
+ Warning Warning of nature of content
+ Source Device used to create the image
+ Comment Miscellaneous comment; conversion
+ from other image format
+
+The keyword-text pairs work like this. Keywords should be short
+simple descriptions of what the comment is about. Some typical
+keywords are found in the PNG specification, as is some recommendations
+on keywords. You can repeat keywords in a file. You can even write
+some text before the image and some after. For example, you may want
+to put a description of the image before the image, but leave the
+disclaimer until after, so viewers working over modem connections
+don't have to wait for the disclaimer to go over the modem before
+they start seeing the image. Finally, keywords should be full
+words, not abbreviations. Keywords and text are in the ISO 8859-1
+(Latin-1) character set (a superset of regular ASCII) and can not
+contain NUL characters, and should not contain control or other
+unprintable characters. To make the comments widely readable, stick
+with basic ASCII, and avoid machine specific character set extensions
+like the IBM-PC character set. The keyword must be present, but
+you can leave off the text string on non-compressed pairs.
+Compressed pairs must have a text string, as only the text string
+is compressed anyway, so the compression would be meaningless.
+
+PNG supports modification time via the png_time structure. Two
+conversion routines are proved, png_convert_from_time_t() for
+time_t and png_convert_from_struct_tm() for struct tm. The
+time_t routine uses gmtime(). You don't have to use either of
+these, but if you wish to fill in the png_time structure directly,
+you should provide the time in universal time (GMT) if possible
+instead of your local time. Note that the year number is the full
+year (e.g. 1998, rather than 98 - PNG is year 2000 compliant!), and
+that months start with 1.
+
+If you want to store the time of the original image creation, you should
+use a plain tEXt chunk with the "Creation Time" keyword. This is
+necessary because the "creation time" of a PNG image is somewhat vague,
+depending on whether you mean the PNG file, the time the image was
+created in a non-PNG format, a still photo from which the image was
+scanned, or possibly the subject matter itself. In order to facilitate
+machine-readable dates, it is recommended that the "Creation Time"
+tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"),
+although this isn't a requirement. Unlike the tIME chunk, the
+"Creation Time" tEXt chunk is not expected to be automatically changed
+by the software. To facilitate the use of RFC 1123 dates, a function
+png_convert_to_rfc1123(png_timep) is provided to convert from PNG
+time to an RFC 1123 format string.
+
+You are now ready to write all the file information up to the actual
+image data. You do this with a call to png_write_info().
+
+ png_write_info(png_ptr, info_ptr);
+
+After you've written the file information, you can set up the library
+to handle any special transformations of the image data. The various
+ways to transform the data will be described in the order that they
+should occur. This is important, as some of these change the color
+type and/or bit depth of the data, and some others only work on
+certain color types and bit depths. Even though each transformation
+checks to see if it has data that it can do something with, you should
+make sure to only enable a transformation if it will be valid for the
+data. For example, don't swap red and blue on grayscale data.
+
+PNG files store RGB pixels packed into 3 or 6 bytes. This code tells
+the library to expand the input data to 4 or 8 bytes per pixel
+(or expand 1 or 2-byte grayscale data to 2 or 4 bytes per pixel).
+
+ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+where the 0 is the value that will be put in the 4th byte, and the
+location is either PNG_FILLER_BEFORE or PNG_FILLER_AFTER, depending
+upon whether the filler byte is stored XRGB or RGBX.
+
+PNG files pack pixels of bit depths 1, 2, and 4 into bytes as small as
+they can, resulting in, for example, 8 pixels per byte for 1 bit files.
+If the data is supplied at 1 pixel per byte, use this code, which will
+correctly pack the pixels into a single byte:
+
+ png_set_packing(png_ptr);
+
+PNG files reduce possible bit depths to 1, 2, 4, 8, and 16. If your
+data is of another bit depth, you can write an sBIT chunk into the
+file so that decoders can get the original data if desired.
+
+ /* Set the true bit depth of the image data */
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ sig_bit.red = true_bit_depth;
+ sig_bit.green = true_bit_depth;
+ sig_bit.blue = true_bit_depth;
+ }
+ else
+ {
+ sig_bit.gray = true_bit_depth;
+ }
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ sig_bit.alpha = true_bit_depth;
+ }
+
+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+If the data is stored in the row buffer in a bit depth other than
+one supported by PNG (e.g. 3 bit data in the range 0-7 for a 4-bit PNG),
+this will scale the values to appear to be the correct bit depth as
+is required by PNG.
+
+ png_set_shift(png_ptr, &sig_bit);
+
+PNG files store 16 bit pixels in network byte order (big-endian,
+ie. most significant bits first). This code would be used if they are
+supplied the other way (little-endian, i.e. least significant bits
+first, the way PCs store them):
+
+ if (bit_depth > 8)
+ png_set_swap(png_ptr);
+
+If you are using packed-pixel images (1, 2, or 4 bits/pixel), and you
+need to change the order the pixels are packed into bytes, you can use:
+
+ if (bit_depth < 8)
+ png_set_packswap(png_ptr);
+
+PNG files store 3 color pixels in red, green, blue order. This code
+would be used if they are supplied as blue, green, red:
+
+ png_set_bgr(png_ptr);
+
+PNG files describe monochrome as black being zero and white being
+one. This code would be used if the pixels are supplied with this reversed
+(black being one and white being zero):
+
+ png_set_invert_mono(png_ptr);
+
+Finally, you can write your own transformation function if none of
+the existing ones meets your needs. This is done by setting a callback
+with
+
+ png_set_write_user_transform_fn(png_ptr,
+ write_transform_fn);
+
+You must supply the function
+
+ void write_transform_fn(png_ptr ptr, row_info_ptr
+ row_info, png_bytep data)
+
+See pngtest.c for a working example. Your function will be called
+before any of the other transformations have been processed.
+
+It is possible to have libpng flush any pending output, either manually,
+or automatically after a certain number of lines have been written. To
+flush the output stream a single time call:
+
+ png_write_flush(png_ptr);
+
+and to have libpng flush the output stream periodically after a certain
+number of scanlines have been written, call:
+
+ png_set_flush(png_ptr, nrows);
+
+Note that the distance between rows is from the last time png_write_flush()
+was called, or the first row of the image if it has never been called.
+So if you write 50 lines, and then png_set_flush 25, it will flush the
+output on the next scanline, and every 25 lines thereafter, unless
+png_write_flush() is called before 25 more lines have been written.
+If nrows is too small (less than about 10 lines for a 640 pixel wide
+RGB image) the image compression may decrease noticeably (although this
+may be acceptable for real-time applications). Infrequent flushing will
+only degrade the compression performance by a few percent over images
+that do not use flushing.
+
+That's it for the transformations. Now you can write the image data.
+The simplest way to do this is in one function call. If have the
+whole image in memory, you can just call png_write_image() and libpng
+will write the image. You will need to pass in an array of pointers to
+each row. This function automatically handles interlacing, so you don't
+need to call png_set_interlace_handling() or call this function multiple
+times, or any of that other stuff necessary with png_write_rows().
+
+ png_write_image(png_ptr, row_pointers);
+
+where row_pointers is:
+
+ png_byte *row_pointers[height];
+
+You can point to void or char or whatever you use for pixels.
+
+If you don't want to write the whole image at once, you can
+use png_write_rows() instead. If the file is not interlaced,
+this is simple:
+
+ png_write_rows(png_ptr, row_pointers,
+ number_of_rows);
+
+row_pointers is the same as in the png_write_image() call.
+
+If you are just writing one row at a time, you can do this with
+row_pointers:
+
+ png_bytep row_pointer = row;
+
+ png_write_row(png_ptr, &row_pointer);
+
+When the file is interlaced, things can get a good deal more
+complicated. The only currently (as of February 1998 -- PNG Specification
+version 1.0, dated October 1996) defined interlacing scheme for PNG files
+is the "Adam7" interlace scheme, that breaks down an
+image into seven smaller images of varying size. libpng will build
+these images for you, or you can do them yourself. If you want to
+build them yourself, see the PNG specification for details of which
+pixels to write when.
+
+If you don't want libpng to handle the interlacing details, just
+use png_set_interlace_handling() and call png_write_rows() the
+correct number of times to write all seven sub-images.
+
+If you want libpng to build the sub-images, call this before you start
+writing any rows:
+
+ number_of_passes =
+ png_set_interlace_handling(png_ptr);
+
+This will return the number of passes needed. Currently, this
+is seven, but may change if another interlace type is added.
+
+Then write the complete image number_of_passes times.
+
+ png_write_rows(png_ptr, row_pointers,
+ number_of_rows);
+
+As some of these rows are not used, and thus return immediately,
+you may want to read about interlacing in the PNG specification,
+and only update the rows that are actually used.
+
+After you are finished writing the image, you should finish writing
+the file. If you are interested in writing comments or time, you should
+pass an appropriately filled png_info pointer. If you are not interested,
+you can pass NULL.
+
+ png_write_end(png_ptr, info_ptr);
+
+When you are done, you can free all memory used by libpng like this:
+
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+
+You must free any data you allocated for info_ptr, such as comments,
+palette, or histogram, before the call to png_destroy_write_struct();
+
+For a more compact example of writing a PNG image, see the file example.c.
+
+
+.SH V. Modifying/Customizing libpng:
+
+There are two issues here. The first is changing how libpng does
+standard things like memory allocation, input/output, and error handling.
+The second deals with more complicated things like adding new chunks,
+adding new transformations, and generally changing how libpng works.
+
+All of the memory allocation, input/output, and error handling in libpng
+goes through callbacks that are user settable. The default routines are
+in pngmem.c, pngrio.c, pngwio.c, and pngerror.c respectively. To change
+these functions, call the appropriate png_set_???_fn() function.
+
+Memory allocation is done through the functions png_large_malloc(),
+png_malloc(), png_realloc(), png_large_free(), and png_free(). These
+currently just call the standard C functions. The large functions must
+handle exactly 64K, but they don't have to handle more than that. If
+your pointers can't access more then 64K at a time, you will want to set
+MAXSEG_64K in zlib.h. Since it is unlikely that the method of handling
+memory allocation on a platform will change between applications, these
+functions must be modified in the library at compile time.
+
+Input/Output in libpng is done through png_read() and png_write(),
+which currently just call fread() and fwrite(). The FILE * is stored in
+png_struct and is initialized via png_init_io(). If you wish to change
+the method of I/O, the library supplies callbacks that you can set
+through the function png_set_read_fn() and png_set_write_fn() at run
+time, instead of calling the png_init_io() function. These functions
+also provide a void pointer that can be retrieved via the function
+png_get_io_ptr(). For example:
+
+ png_set_read_fn(png_structp read_ptr,
+ voidp read_io_ptr, png_rw_ptr read_data_fn)
+
+ png_set_write_fn(png_structp write_ptr,
+ voidp write_io_ptr, png_rw_ptr write_data_fn,
+ png_flush_ptr output_flush_fn);
+
+ voidp read_io_ptr = png_get_io_ptr(read_ptr);
+ voidp write_io_ptr = png_get_io_ptr(write_ptr);
+
+The replacement I/O functions should have prototypes as follows:
+
+ void user_read_data(png_structp png_ptr,
+ png_bytep data, png_uint_32 length);
+ void user_write_data(png_structp png_ptr,
+ png_bytep data, png_uint_32 length);
+ void user_flush_data(png_structp png_ptr);
+
+Supplying NULL for the read, write, or flush functions sets them back
+to using the default C stream functions. It is an error to read from
+a write stream, and vice versa.
+
+Error handling in libpng is done through png_error() and png_warning().
+Errors handled through png_error() are fatal, meaning that png_error()
+should never return to its caller. Currently, this is handled via
+setjmp() and longjmp(), but you could change this to do things like
+exit() if you should wish. On non-fatal errors, png_warning() is called
+to print a warning message, and then control returns to the calling code.
+By default png_error() and png_warning() print a message on stderr via
+fprintf() unless the library is compiled with PNG_NO_STDIO defined. If
+you wish to change the behavior of the error functions, you will need to
+set up your own message callbacks. These functions are normally supplied
+at the time that the png_struct is created. It is also possible to change
+these functions after png_create_???_struct() has been called by calling:
+
+ png_set_error_fn(png_structp png_ptr,
+ png_voidp error_ptr, png_error_ptr error_fn,
+ png_error_ptr warning_fn);
+
+ png_voidp error_ptr = png_get_error_ptr(png_ptr);
+
+If NULL is supplied for either error_fn or warning_fn, then the libpng
+default function will be used, calling fprintf() and/or longjmp() if a
+problem is encountered. The replacement error functions should have
+parameters as follows:
+
+ void user_error_fn(png_structp png_ptr,
+ png_const_charp error_msg);
+ void user_warning_fn(png_structp png_ptr,
+ png_const_charp warning_msg);
+
+The motivation behind using setjmp() and longjmp() is the C++ throw and
+catch exception handling methods. This makes the code much easier to write,
+as there is no need to check every return code of every function call.
+However, there are some uncertainties about the status of local variables
+after a longjmp, so the user may want to be careful about doing anything after
+setjmp returns non-zero besides returning itself. Consult your compiler
+documentation for more details.
+
+If you need to read or write custom chunks, you will need to get deeper
+into the libpng code, as a mechanism has not yet been supplied for user
+callbacks with custom chunks. First, read the PNG specification, and have
+a first level of understanding of how it works. Pay particular attention
+to the sections that describe chunk names, and look at how other chunks
+were designed, so you can do things similarly. Second, check out the
+sections of libpng that read and write chunks. Try to find a chunk that
+is similar to yours and copy off of it. More details can be found in the
+comments inside the code. A way of handling unknown chunks in a generic
+method, potentially via callback functions, would be best.
+
+If you wish to write your own transformation for the data, look through
+the part of the code that does the transformations, and check out some of
+the simpler ones to get an idea of how they work. Try to find a similar
+transformation to the one you want to add and copy off of it. More details
+can be found in the comments inside the code itself.
+
+Configuring for 16 bit platforms:
+
+You may need to change the png_large_malloc() and png_large_free()
+routines in pngmem.c, as these are required to allocate 64K, although
+there is already support for many of the common DOS compilers. Also,
+you will want to look into zconf.h to tell zlib (and thus libpng) that
+it cannot allocate more then 64K at a time. Even if you can, the memory
+won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K.
+
+Configuring for DOS:
+
+For DOS users who only have access to the lower 640K, you will
+have to limit zlib's memory usage via a png_set_compression_mem_level()
+call. See zlib.h or zconf.h in the zlib library for more information.
+
+Configuring for Medium Model:
+
+Libpng's support for medium model has been tested on most of the popular
+compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
+defined, and FAR gets defined to far in pngconf.h, and you should be
+all set. Everything in the library (except for zlib's structure) is
+expecting far data. You must use the typedefs with the p or pp on
+the end for pointers (or at least look at them and be careful). Make
+note that the row's of data are defined as png_bytepp, which is an
+unsigned char far * far *.
+
+Configuring for gui/windowing platforms:
+
+You will need to write new error and warning functions that use the GUI
+interface, as described previously, and set them to be the error and
+warning functions at the time that png_create_???_struct() is called,
+in order to have them available during the structure initialization.
+They can be changed later via png_set_error_fn(). On some compilers,
+you may also have to change the memory allocators (png_malloc, etc.).
+
+Configuring for compiler xxx:
+
+All includes for libpng are in pngconf.h. If you need to add/change/delete
+an include, this is the place to do it. The includes that are not
+needed outside libpng are protected by the PNG_INTERNAL definition,
+which is only defined for those routines inside libpng itself. The
+files in libpng proper only include png.h, which includes pngconf.h.
+
+Configuring zlib:
+
+There are special functions to configure the compression. Perhaps the
+most useful one changes the compression level, which currently uses
+input compression values in the range 0 - 9. The library normally
+uses the default compression level (Z_DEFAULT_COMPRESSION = 6). Tests
+have shown that for a large majority of images, compression values in
+the range 3-6 compress nearly as well as higher levels, and do so much
+faster. For online applications it may be desirable to have maximum speed
+(Z_BEST_SPEED = 1). With versions of zlib after v0.99, you can also
+specify no compression (Z_NO_COMPRESSION = 0), but this would create
+files larger than just storing the raw bitmap. You can specify the
+compression level by calling:
+
+ png_set_compression_level(png_ptr, level);
+
+Another useful one is to reduce the memory level used by the library.
+The memory level defaults to 8, but it can be lowered if you are
+short on memory (running DOS, for example, where you only have 640K).
+
+ png_set_compression_mem_level(png_ptr, level);
+
+The other functions are for configuring zlib. They are not recommended
+for normal use and may result in writing an invalid PNG file. See
+zlib.h for more information on what these mean.
+
+ png_set_compression_strategy(png_ptr,
+ strategy);
+ png_set_compression_window_bits(png_ptr,
+ window_bits);
+ png_set_compression_method(png_ptr, method);
+
+Controlling row filtering:
+
+If you want to control whether libpng uses filtering or not, which
+filters are used, and how it goes about picking row filters, you
+can call one of these functions. The selection and configuration
+of row filters can have a significant impact on the size and
+encoding speed and a somewhat lesser impact on the decoding speed
+of an image. Filtering is enabled by default for RGB and grayscale
+images (with and without alpha), but not for paletted images nor
+for any images with bit depths less than 8 bits/pixel.
+
+The 'method' parameter sets the main filtering method, which is
+currently only '0' in the PNG 1.0 specification. The 'filters'
+parameter sets which filter(s), if any, should be used for each
+scanline. Possible values are PNG_ALL_FILTERS and PNG_NO_FILTERS
+to turn filtering on and off, respectively.
+
+Individual filter types are PNG_FILTER_NONE, PNG_FILTER_SUB,
+PNG_FILTER_UP, PNG_FILTER_AVG, PNG_FILTER_PAETH, which can be bitwise
+ORed together '|' to specify one or more filters to use. These
+filters are described in more detail in the PNG specification. If
+you intend to change the filter type during the course of writing
+the image, you should start with flags set for all of the filters
+you intend to use so that libpng can initialize its internal
+structures appropriately for all of the filter types.
+
+ filters = PNG_FILTER_NONE | PNG_FILTER_SUB
+ | PNG_FILTER_UP;
+ png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE,
+ filters);
+
+It is also possible to influence how libpng chooses from among the
+available filters. This is done in two ways - by telling it how
+important it is to keep the same filter for successive rows, and
+by telling it the relative computational costs of the filters.
+
+ double weights[3] = {1.5, 1.3, 1.1},
+ costs[PNG_FILTER_VALUE_LAST] =
+ {1.0, 1.3, 1.3, 1.5, 1.7};
+
+ png_set_filter_selection(png_ptr,
+ PNG_FILTER_SELECTION_WEIGHTED, 3,
+ weights, costs);
+
+The weights are multiplying factors that indicate to libpng that the
+row filter should be the same for successive rows unless another row filter
+is that many times better than the previous filter. In the above example,
+if the previous 3 filters were SUB, SUB, NONE, the SUB filter could have a
+"sum of absolute differences" 1.5 x 1.3 times higher than other filters
+and still be chosen, while the NONE filter could have a sum 1.1 times
+higher than other filters and still be chosen. Unspecified weights are
+taken to be 1.0, and the specified weights should probably be declining
+like those above in order to emphasize recent filters over older filters.
+
+The filter costs specify for each filter type a relative decoding cost
+to be considered when selecting row filters. This means that filters
+with higher costs are less likely to be chosen over filters with lower
+costs, unless their "sum of absolute differences" is that much smaller.
+The costs do not necessarily reflect the exact computational speeds of
+the various filters, since this would unduly influence the final image
+size.
+
+Note that the numbers above were invented purely for this example and
+are given only to help explain the function usage. Little testing has
+been done to find optimum values for either the costs or the weights.
+
+Removing unwanted object code:
+
+There are a bunch of #define's in pngconf.h that control what parts of
+libpng are compiled. All the defines end in _SUPPORTED. If you are
+never going to use a capability, you can change the #define to #undef
+before recompiling libpng and save yourself code and data space, or
+you can turn off individual capabilities with defines that begin with
+PNG_NO_.
+
+You can also turn all of the transforms and ancillary chunk capabilities
+off en masse with compiler directives that define
+PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS,
+or all four,
+along with directives to turn on any of the capabilities that you do
+want. The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable
+the extra transformations but still leave the library fully capable of reading
+and writing PNG files with all known public chunks [except for sPLT].
+Use of the PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive
+produces a library that is incapable of reading or writing ancillary chunks.
+If you are not using the progressive reading capability, you can
+turn that off with PNG_NO_PROGRESSIVE_READ (don't confuse
+this with the INTERLACING capability, which you'll still have).
+
+All the reading and writing specific code are in separate files, so the
+linker should only grab the files it needs. However, if you want to
+make sure, or if you are building a stand alone library, all the
+reading files start with pngr and all the writing files start with
+pngw. The files that don't match either (like png.c, pngtrans.c, etc.)
+are used for both reading and writing, and always need to be included.
+The progressive reader is in pngpread.c
+
+If you are creating or distributing a dynamically linked library (a .so
+or DLL file), you should not remove or disable any parts of the library,
+as this will cause applications linked with different versions of the
+library to fail if they call functions not available in your library.
+The size of the library itself should not be an issue, because only
+those sections that are actually used will be loaded into memory.
+
+Requesting debug printout:
+
+The macro definition PNG_DEBUG can be used to request debugging
+printout. Set it to an integer value in the range 0 to 3. Higher
+numbers result in increasing amounts of debugging information. The
+information is printed to the "stderr" file, unless another file
+name is specified in the PNG_DEBUG_FILE macro definition.
+
+When PNG_DEBUG > 0, the following functions (macros) become available:
+
+ png_debug(level, message)
+ png_debug1(level, message, p1)
+ png_debug2(level, message, p1, p2)
+
+in which "level" is compared to PNG_DEBUG to decide whether to print
+the message, "message" is the formatted string to be printed,
+and p1 and p2 are parameters that are to be embedded in the string
+according to printf-style formatting directives. For example,
+
+ png_debug1(2, "foo=%d\n", foo);
+
+is expanded to
+
+ if(PNG_DEBUG > 2)
+ fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo);
+
+When PNG_DEBUG is defined but is zero, the macros aren't defined, but you
+can still use PNG_DEBUG to control your own debugging:
+
+ #ifdef PNG_DEBUG
+ fprintf(stderr, ...
+ #endif
+
+When PNG_DEBUG = 1, the macros are defined, but only png_debug statements
+having level = 0 will be printed. There aren't any such statements in
+this version of libpng, but if you insert some they will be printed.
+
+.SH VI. Changes to Libpng from version 0.88
+
+It should be noted that versions of libpng later than 0.96 are not
+distributed by the original libpng author, Guy Schalnat, nor by
+Andreas Dilger, who had taken over from Guy during 1996 and 1997, and
+distributed versions 0.89 through 0.96, but rather by another member
+of the original PNG Group, Glenn Randers-Pehrson. Guy and Andreas are
+still alive and well, but they have moved on to other things.
+
+The old libpng functions png_read_init(), png_write_init(),
+png_info_init(), png_read_destroy(), and png_write_destory() have been
+moved to PNG_INTERNAL in version 0.95 to discourage their use. The
+preferred method of creating and initializing the libpng structures is
+via the png_create_read_struct(), png_create_write_struct(), and
+png_create_info_struct() because they isolate the size of the structures
+from the application, allow version error checking, and also allow the
+use of custom error handling routines during the initialization, which
+the old functions do not. The functions png_read_destroy() and
+png_write_destroy() do not actually free the memory that libpng
+allocated for these structs, but just reset the data structures, so they
+can be used instead of png_destroy_read_struct() and
+png_destroy_write_struct() if you feel there is too much system overhead
+allocating and freeing the png_struct for each image read.
+
+Setting the error callbacks via png_set_message_fn() before
+png_read_init() as was suggested in libpng-0.88 is no longer supported
+because this caused applications that do not use custom error functions
+to fail if the png_ptr was not initialized to zero. It is still possible
+to set the error callbacks AFTER png_read_init(), or to change them with
+png_set_error_fn(), which is essentially the same function, but with a
+new name to force compilation errors with applications that try to use
+the old method.
+
+.SH VII. Y2K Compliance in libpng
+
+January 13, 1999
+
+Since the PNG Development group is an ad-hoc body, we can't make
+an official declaration.
+
+This is your unofficial assurance that libpng from version 0.81 and
+upward are Y2K compliant. It is my belief that earlier versions were
+also Y2K compliant.
+
+Libpng only has three year fields. One is a 2-byte unsigned integer that
+will hold years up to 65535. The other two hold the date in text
+format, and will hold years up to 9999.
+
+The integer is
+ "png_uint_16 year" in png_time_struct.
+
+The strings are
+ "png_charp time_buffer" in png_struct and
+ "near_time_buffer", which is a local character string in png.c.
+
+There are seven time-related functions:
+
+ png_convert_to_rfc_1123() in png.c
+ (formerly png_convert_to_rfc_1152() in error)
+ png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ png_convert_from_time_t() in pngwrite.c
+ png_get_tIME() in pngget.c
+ png_handle_tIME() in pngrutil.c, called in pngread.c
+ png_set_tIME() in pngset.c
+ png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+All appear to handle dates properly in a Y2K environment. The
+png_convert_from_time_t() function calls gmtime() to convert from system
+clock time, which returns (year - 1900), which we properly convert to
+the full 4-digit year. There is a possibility that applications using
+libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+function, or incorrectly passing only a 2-digit year instead of
+"year - 1900" into the png_convert_from_struct_tm() function, but this
+is not under our control. The libpng documentation has always stated
+that it works with 4-digit years, and the APIs have been documented as
+such.
+
+The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned
+integer to hold the year, and can hold years as large as 65535.
+
+
+ Glenn Randers-Pehrson
+ libpng maintainer
+ PNG Development Group
+
+.SH NOTE
+
+Note about libpng version numbers:
+
+Due to various miscommunications, unforeseen code incompatibilities
+and occasional factors outside the authors' control, version numbering
+on the library has not always been consistent and straightforward.
+The following table summarizes matters since version 0.89c, which was
+the first widely used release:
+
+ source png.h png.h shared-lib
+ version string int version
+ ------- ------ ------ ----------
+ 0.89c 0.89 89 1.0.89
+ 0.90 0.90 90 0.90 [should be 2.0.90]
+ 0.95 0.95 95 0.95 [should be 2.0.95]
+ 0.96 0.96 96 0.96 [should be 2.0.96]
+ 0.97b 1.00.97 97 1.0.1 [should be 2.0.97]
+ 0.97c 0.97 97 2.0.97
+ 0.98 0.98 98 2.0.98
+ 0.99 0.99 98 2.0.99
+ 0.99a-m 0.99 99 2.0.99
+ 1.00 1.00 100 2.1.0 [int should be 10000]
+ 1.0.0 1.0.0 100 2.1.0 [int should be 10000]
+ 1.0.1 1.0.1 10001 2.1.0
+
+Henceforth the source version will match the shared-library
+minor and patch numbers; the shared-library major version number will be
+used for changes in backward compatibility, as it is intended.
+The PNG_PNGLIB_VER macro, which is not used within libpng but
+is available for applications, is an unsigned integer of the form
+xyyzz corresponding to the source version x.y.z (leading zeros in y and z).
+
+.SH "SEE ALSO"
+libpngpf(3), png(5)
+.LP
+.IR libpng :
+.IP
+ftp://ftp.uu.net/graphics/png
+http://www.cdrom.com/pub/png
+
+.LP
+.IR zlib :
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ftp.uu.net/pub/archiving/zip/zlib
+.br
+http://www.cdrom.com/pub/infozip/zlib
+
+.LP
+.IR PNG specification: RFC 2083
+.IP
+(generally) at the same location as
+.I libpng
+or at
+.br
+ftp://ds.internic.net/rfc/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+
+.LP
+In the case of any inconsistency between the PNG specification
+and this library, the specification takes precedence.
+
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+<randeg at alumni.rpi.edu>
+
+Contributing Authors: John Bowler, Kevin Bracey, Sam Bushell, Andreas Dilger,
+Magnus Holmgren, Tom Lane, Dave Martindale, Glenn Randers-Pehrson,
+Greg Roelofs, Guy Eric Schalnat, Paul Schmidt, Tom Tanner, Willem van
+Schaik, Tim Wegner.
+<png-implement at dworkin.wustl.edu>
+
+The contributing authors would like to thank all those who helped
+with testing, bug fixes, and patience. This wouldn't have been
+possible without all of you.
+
+Thanks to Frank J. T. Wojcik for helping with the documentation.
+
+Libpng version 1.0.3 - January 14, 1999:
+Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
+Currently maintained by Glenn Randers-Pehrson (randeg at alumni.rpi.edu).
+
+Supported by the PNG development group
+.br
+(png-implement at dworkin.wustl.edu).
+
+.SH COPYRIGHT NOTICE:
+
+Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+Copyright (c) 1996, 1997 Andreas Dilger
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+
+The PNG Reference Library (libpng) is supplied "AS IS". The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose. The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
+Reference Library, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be
+ misrepresented.
+
+ 2. Altered versions must be plainly marked as such
+ and must not be misrepresented as being the
+ original source.
+
+ 3. This Copyright notice may not be removed or
+ altered from any source or altered source
+ distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products. If you use this
+source code in a product, acknowledgment is not required but would be
+appreciated.
+
+.\" end of man page
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/example.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/example.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/example.c Sat Jul 13 19:23:20 2002
@@ -0,0 +1,702 @@
+
+/* example.c - an example of using libpng */
+
+/* This is an example of how to use libpng to read and write PNG files.
+ * The file libpng.txt is much more verbose then this. If you have not
+ * read it, do so first. This was designed to be a starting point of an
+ * implementation. This is not officially part of libpng, and therefore
+ * does not require a copyright notice.
+ *
+ * This file does not currently compile, because it is missing certain
+ * parts, like allocating memory to hold an image. You will have to
+ * supply these parts to get it to compile. For an example of a minimal
+ * working PNG reader/writer, see pngtest.c, included in this distribution.
+ */
+
+#include "png.h"
+
+/* Check to see if a file is a PNG file using png_sig_cmp(). png_sig_cmp()
+ * returns zero if the image is a PNG and nonzero if it isn't a PNG.
+ *
+ * The function check_if_png() shown here, but not used, returns nonzero (true)
+ * if the file can be opened and is a PNG, 0 (false) otherwise.
+ *
+ * If this call is successful, and you are going to keep the file open,
+ * you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once
+ * you have created the png_ptr, so that libpng knows your application
+ * has read that many bytes from the start of the file. Make sure you
+ * don't call png_set_sig_bytes() with more than 8 bytes read or give it
+ * an incorrect number of bytes read, or you will either have read too
+ * many bytes (your fault), or you are telling libpng to read the wrong
+ * number of magic bytes (also your fault).
+ *
+ * Many applications already read the first 2 or 4 bytes from the start
+ * of the image to determine the file type, so it would be easiest just
+ * to pass the bytes to png_sig_cmp() or even skip that if you know
+ * you have a PNG file, and call png_set_sig_bytes().
+ */
+#define PNG_BYTES_TO_CHECK 4
+int check_if_png(char *file_name, FILE **fp)
+{
+ char buf[PNG_BYTES_TO_CHECK];
+
+ /* Open the prospective PNG file. */
+ if ((*fp = fopen(file_name, "rb")) != NULL);
+ return 0;
+
+ /* Read in some of the signature bytes */
+ if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK)
+ return 0;
+
+ /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature.
+ Return nonzero (true) if they match */
+
+ return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK));
+}
+
+/* Read a PNG file. You may want to return an error code if the read
+ * fails (depending upon the failure). There are two "prototypes" given
+ * here - one where we are given the filename, and we need to open the
+ * file, and the other where we are given an open file (possibly with
+ * some or all of the magic bytes read - see comments above).
+ */
+#ifdef open_file /* prototype 1 */
+void read_png(char *file_name) /* We need to open the file */
+{
+ png_structp png_ptr;
+ png_infop info_ptr;
+ unsigned int sig_read = 0;
+ png_uint_32 width, height;
+ int bit_depth, color_type, interlace_type;
+ FILE *fp;
+
+ if ((fp = fopen(file_name, "rb")) == NULL)
+ return;
+#else no_open_file /* prototype 2 */
+void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
+{
+ png_structp png_ptr;
+ png_infop info_ptr;
+ png_uint_32 width, height;
+ int bit_depth, color_type, interlace_type;
+#endif no_open_file /* only use one prototype! */
+
+ /* Create and initialize the png_struct with the desired error handler
+ * functions. If you want to use the default stderr and longjump method,
+ * you can supply NULL for the last three parameters. We also supply the
+ * the compiler header file version, so that we know if the application
+ * was compiled with a compatible version of the library. REQUIRED
+ */
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+ if (png_ptr == NULL)
+ {
+ fclose(fp);
+ return;
+ }
+
+ /* Allocate/initialize the memory for image information. REQUIRED. */
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+ fclose(fp);
+ png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ return;
+ }
+
+ /* Set error handling if you are using the setjmp/longjmp method (this is
+ * the normal method of doing things with libpng). REQUIRED unless you
+ * set up your own error handlers in the png_create_read_struct() earlier.
+ */
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
+ /* If we get here, we had a problem reading the file */
+ return;
+ }
+
+ /* One of the following I/O initialization methods is REQUIRED */
+#ifdef streams /* PNG file I/O method 1 */
+ /* Set up the input control if you are using standard C streams */
+ png_init_io(png_ptr, fp);
+
+#else no_streams /* PNG file I/O method 2 */
+ /* If you are using replacement read functions, instead of calling
+ * png_init_io() here you would call:
+ */
+ png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn);
+ /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* Use only one I/O method! */
+
+ /* If we have already read some of the signature */
+ png_set_sig_bytes(png_ptr, sig_read);
+
+ /* The call to png_read_info() gives us all of the information from the
+ * PNG file before the first IDAT (image data chunk). REQUIRED
+ */
+ png_read_info(png_ptr, info_ptr);
+
+ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+ &interlace_type, NULL, NULL);
+
+/**** Set up the data transformations you want. Note that these are all
+ **** optional. Only call them if you want/need them. Many of the
+ **** transformations only work on specific types of images, and many
+ **** are mutually exclusive.
+ ****/
+
+ /* tell libpng to strip 16 bit/color files down to 8 bits/color */
+ png_set_strip_16(png_ptr);
+
+ /* Strip alpha bytes from the input data without combining with th
+ * background (not recommended).
+ */
+ png_set_strip_alpha(png_ptr);
+
+ /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
+ * byte into separate bytes (useful for paletted and grayscale images).
+ */
+ png_set_packing(png_ptr);
+
+ /* Change the order of packed pixels to least significant bit first
+ * (not useful if you are using png_set_packing). */
+ png_set_packswap(png_ptr);
+
+ /* Expand paletted colors into true RGB triplets */
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ png_set_expand(png_ptr);
+
+ /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ png_set_expand(png_ptr);
+
+ /* Expand paletted or RGB images with transparency to full alpha channels
+ * so the data will be available as RGBA quartets.
+ */
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ png_set_expand(png_ptr);
+
+ /* Set the background color to draw transparent and alpha images over.
+ * It is possible to set the red, green, and blue components directly
+ * for paletted images instead of supplying a palette index. Note that
+ * even if the PNG file supplies a background, you are not required to
+ * use it - you should use the (solid) application background if it has one.
+ */
+
+ png_color_16 my_background, *image_background;
+
+ if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+ png_set_background(png_ptr, image_background,
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ else
+ png_set_background(png_ptr, &my_background,
+ PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+
+ /* Some suggestions as to how to get a screen gamma value */
+
+ /* Note that screen gamma is (display_gamma/viewing_gamma) */
+ if (/* We have a user-defined screen gamma value */)
+ {
+ screen_gamma = user-defined screen_gamma;
+ }
+ /* This is one way that applications share the same screen gamma value */
+ else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL)
+ {
+ screen_gamma = atof(gamma_str);
+ }
+ /* If we don't have another value */
+ else
+ {
+ screen_gamma = 2.2; /* A good guess for a PC monitors in a dimly
+ lit room */
+ screen_gamma = 1.7 or 1.0; /* A good guess for Mac systems */
+ }
+
+ /* Tell libpng to handle the gamma conversion for you. The second call
+ * is a good guess for PC generated images, but it should be configurable
+ * by the user at run time by the user. It is strongly suggested that
+ * your application support gamma correction.
+ */
+
+ int intent;
+
+ if (png_get_sRGB(png_ptr, info_ptr, &intent))
+ png_set_sRGB(png_ptr, intent, 0);
+ else
+ {
+ double image_gamma;
+ if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+ png_set_gamma(png_ptr, screen_gamma, image_gamma);
+ else
+ png_set_gamma(png_ptr, screen_gamma, 0.45455);
+ }
+
+ /* Dither RGB files down to 8 bit palette or reduce palettes
+ * to the number of colors available on your screen.
+ */
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ png_uint_32 num_palette;
+ png_colorp palette;
+
+ /* This reduces the image to the application supplied palette */
+ if (/* we have our own palette */)
+ {
+ /* An array of colors to which the image should be dithered */
+ png_color std_color_cube[MAX_SCREEN_COLORS];
+
+ png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
+ MAX_SCREEN_COLORS, NULL, 0);
+ }
+ /* This reduces the image to the palette supplied in the file */
+ else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
+ {
+ png_color16p histogram;
+
+ png_get_hIST(png_ptr, info_ptr, &histogram);
+
+ png_set_dither(png_ptr, palette, num_palette,
+ max_screen_colors, histogram, 0);
+ }
+ }
+
+ /* invert monocrome files to have 0 as white and 1 as black */
+ png_set_invert_mono(png_ptr);
+
+ /* If you want to shift the pixel values from the range [0,255] or
+ * [0,65535] to the original [0,7] or [0,31], or whatever range the
+ * colors were originally in:
+ */
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+ {
+ png_color8p sig_bit;
+
+ png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+ png_set_shift(png_ptr, sig_bit);
+ }
+
+ /* flip the RGB pixels to BGR (or RGBA to BGRA) */
+ png_set_bgr(png_ptr);
+
+ /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
+ png_set_swap_alpha(png_ptr);
+
+ /* swap bytes of 16 bit files to least significant byte first */
+ png_set_swap(png_ptr);
+
+ /* Add filler (or alpha) byte (before/after each RGB triplet) */
+ png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+
+ /* Turn on interlace handling. REQUIRED if you are not using
+ * png_read_image(). To see how to handle interlacing passes,
+ * see the png_read_row() method below:
+ */
+ number_passes = png_set_interlace_handling(png_ptr);
+
+ /* Optional call to gamma correct and add the background to the palette
+ * and update info structure. REQUIRED if you are expecting libpng to
+ * update the palette for you (ie you selected such a transform above).
+ */
+ png_read_update_info(png_ptr, info_ptr);
+
+ /* Allocate the memory to hold the image using the fields of info_ptr. */
+
+ /* The easiest way to read the image: */
+ png_bytep row_pointers[height];
+
+ for (row = 0; row < height; row++)
+ {
+ row_pointers[row] = malloc(png_get_rowbytes(png_ptr, info_ptr));
+ }
+
+ /* Now it's time to read the image. One of these methods is REQUIRED */
+#ifdef entire /* Read the entire image in one go */
+ png_read_image(png_ptr, row_pointers);
+
+#else no_entire /* Read the image one or more scanlines at a time */
+ /* The other way to read images - deal with interlacing: */
+
+ for (pass = 0; pass < number_passes; pass++)
+ {
+#ifdef single /* Read the image a single row at a time */
+ for (y = 0; y < height; y++)
+ {
+ png_read_rows(png_ptr, &row_pointers[y], NULL, 1);
+ }
+
+#else no_single /* Read the image several rows at a time */
+ for (y = 0; y < height; y += number_of_rows)
+ {
+#ifdef sparkle /* Read the image using the "sparkle" effect. */
+ png_read_rows(png_ptr, &row_pointers[y], NULL, number_of_rows);
+
+ png_read_rows(png_ptr, NULL, row_pointers[y], number_of_rows);
+#else no_sparkle /* Read the image using the "rectangle" effect */
+ png_read_rows(png_ptr, NULL, &row_pointers[y], number_of_rows);
+#endif no_sparkle /* use only one of these two methods */
+ }
+
+ /* if you want to display the image after every pass, do
+ so here */
+#endif no_single /* use only one of these two methods */
+ }
+#endif no_entire /* use only one of these two methods */
+
+ /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+ png_read_end(png_ptr, info_ptr);
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+
+ /* close the file */
+ fclose(fp);
+
+ /* that's it */
+ return;
+}
+
+/* progressively read a file */
+
+int
+initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
+{
+ /* Create and initialize the png_struct with the desired error handler
+ * functions. If you want to use the default stderr and longjump method,
+ * you can supply NULL for the last three parameters. We also check that
+ * the library version is compatible in case we are using dynamically
+ * linked libraries.
+ */
+ *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+ if (*png_ptr == NULL)
+ {
+ *info_ptr = NULL;
+ return ERROR;
+ }
+
+ *info_ptr = png_create_info_struct(png_ptr);
+
+ if (*info_ptr == NULL)
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ return ERROR;
+ }
+
+ if (setjmp((*png_ptr)->jmpbuf))
+ {
+ png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ return ERROR;
+ }
+
+ /* This one's new. You will need to provide all three
+ * function callbacks, even if you aren't using them all.
+ * If you aren't using all functions, you can specify NULL
+ * parameters. Even when all three functions are NULL,
+ * you need to call png_set_progressive_read_fn().
+ * These functions shouldn't be dependent on global or
+ * static variables if you are decoding several images
+ * simultaneously. You should store stream specific data
+ * in a separate struct, given as the second parameter,
+ * and retrieve the pointer from inside the callbacks using
+ * the function png_get_progressive_ptr(png_ptr).
+ */
+ png_set_progressive_read_fn(*png_ptr, (void *)stream_data,
+ info_callback, row_callback, end_callback);
+
+ return OK;
+}
+
+int
+process_data(png_structp *png_ptr, png_infop *info_ptr,
+ png_bytep buffer, png_uint_32 length)
+{
+ if (setjmp((*png_ptr)->jmpbuf))
+ {
+ /* Free the png_ptr and info_ptr memory on error */
+ png_destroy_read_struct(png_ptr, info_ptr, (png_infopp)NULL);
+ return ERROR;
+ }
+
+ /* This one's new also. Simply give it chunks of data as
+ * they arrive from the data stream (in order, of course).
+ * On Segmented machines, don't give it any more than 64K.
+ * The library seems to run fine with sizes of 4K, although
+ * you can give it much less if necessary (I assume you can
+ * give it chunks of 1 byte, but I haven't tried with less
+ * than 256 bytes yet). When this function returns, you may
+ * want to display any rows that were generated in the row
+ * callback, if you aren't already displaying them there.
+ */
+ png_process_data(*png_ptr, *info_ptr, buffer, length);
+ return OK;
+}
+
+info_callback(png_structp png_ptr, png_infop info)
+{
+/* do any setup here, including setting any of the transformations
+ * mentioned in the Reading PNG files section. For now, you _must_
+ * call either png_start_read_image() or png_read_update_info()
+ * after all the transformations are set (even if you don't set
+ * any). You may start getting rows before png_process_data()
+ * returns, so this is your last chance to prepare for that.
+ */
+}
+
+row_callback(png_structp png_ptr, png_bytep new_row,
+ png_uint_32 row_num, int pass)
+{
+/* this function is called for every row in the image. If the
+ * image is interlacing, and you turned on the interlace handler,
+ * this function will be called for every row in every pass.
+ * Some of these rows will not be changed from the previous pass.
+ * When the row is not changed, the new_row variable will be NULL.
+ * The rows and passes are called in order, so you don't really
+ * need the row_num and pass, but I'm supplying them because it
+ * may make your life easier.
+ *
+ * For the non-NULL rows of interlaced images, you must call
+ * png_progressive_combine_row() passing in the row and the
+ * old row. You can call this function for NULL rows (it will
+ * just return) and for non-interlaced images (it just does the
+ * memcpy for you) if it will make the code easier. Thus, you
+ * can just do this for all cases:
+ */
+
+ png_progressive_combine_row(png_ptr, old_row, new_row);
+
+/* where old_row is what was displayed for previous rows. Note
+ * that the first pass (pass == 0 really) will completely cover
+ * the old row, so the rows do not have to be initialized. After
+ * the first pass (and only for interlaced images), you will have
+ * to pass the current row, and the function will combine the
+ * old row and the new row.
+ */
+}
+
+end_callback(png_structp png_ptr, png_infop info)
+{
+/* this function is called when the whole image has been read,
+ * including any chunks after the image (up to and including
+ * the IEND). You will usually have the same info chunk as you
+ * had in the header, although some data may have been added
+ * to the comments and time fields.
+ *
+ * Most people won't do much here, perhaps setting a flag that
+ * marks the image as finished.
+ */
+}
+
+/* write a png file */
+void write_png(char *file_name /* , ... other image information ... */)
+{
+ FILE *fp;
+ png_structp png_ptr;
+ png_infop info_ptr;
+
+ /* open the file */
+ fp = fopen(file_name, "wb");
+ if (fp == NULL)
+ return;
+
+ /* Create and initialize the png_struct with the desired error handler
+ * functions. If you want to use the default stderr and longjump method,
+ * you can supply NULL for the last three parameters. We also check that
+ * the library version is compatible with the one used at compile time,
+ * in case we are using dynamically linked libraries. REQUIRED.
+ */
+ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+ png_voidp user_error_ptr, user_error_fn, user_warning_fn);
+
+ if (png_ptr == NULL)
+ {
+ fclose(fp);
+ return;
+ }
+
+ /* Allocate/initialize the image information data. REQUIRED */
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return;
+ }
+
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+ if (setjmp(png_ptr->jmpbuf))
+ {
+ /* If we get here, we had a problem reading the file */
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ return;
+ }
+
+ /* One of the following I/O initialization functions is REQUIRED */
+#ifdef streams /* I/O initialization method 1 */
+ /* set up the output control if you are using standard C streams */
+ png_init_io(png_ptr, fp);
+#else no_streams /* I/O initialization method 2 */
+ /* If you are using replacement read functions, instead of calling
+ * png_init_io() here you would call */
+ png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn,
+ user_IO_flush_function);
+ /* where user_io_ptr is a structure you want available to the callbacks */
+#endif no_streams /* only use one initialization method */
+
+ /* Set the image information here. Width and height are up to 2^31,
+ * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
+ * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
+ * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
+ * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or
+ * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
+ * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED
+ */
+ png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???,
+ PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+ /* set the palette if there is one. REQUIRED for indexed-color images */
+ palette = (png_colorp)png_malloc(png_ptr, 256 * sizeof (png_color));
+ /* ... set palette colors ... */
+ png_set_PLTE(png_ptr, info_ptr, palette, 256);
+
+ /* optional significant bit chunk */
+ /* if we are dealing with a grayscale image then */
+ sig_bit.gray = true_bit_depth;
+ /* otherwise, if we are dealing with a color image then */
+ sig_bit.red = true_red_bit_depth;
+ sig_bit.green = true_green_bit_depth;
+ sig_bit.blue = true_blue_bit_depth;
+ /* if the image has an alpha channel then */
+ sig_bit.alpha = true_alpha_bit_depth;
+ png_set_sBIT(png_ptr, info_ptr, sig_bit);
+
+
+ /* Optional gamma chunk is strongly suggested if you have any guess
+ * as to the correct gamma of the image.
+ */
+ png_set_gAMA(png_ptr, info_ptr, gamma);
+
+ /* Optionally write comments into the image */
+ text_ptr[0].key = "Title";
+ text_ptr[0].text = "Mona Lisa";
+ text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr[1].key = "Author";
+ text_ptr[1].text = "Leonardo DaVinci";
+ text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr[2].key = "Description";
+ text_ptr[2].text = "<long text>";
+ text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
+ png_set_text(png_ptr, info_ptr, text_ptr, 3);
+
+ /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */
+ /* note that if sRGB is present the cHRM chunk must be ignored
+ * on read and must be written in accordance with the sRGB profile */
+
+ /* Write the file header information. REQUIRED */
+ png_write_info(png_ptr, info_ptr);
+
+ /* Once we write out the header, the compression type on the text
+ * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or
+ * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again
+ * at the end.
+ */
+
+ /* set up the transformations you want. Note that these are
+ * all optional. Only call them if you want them.
+ */
+
+ /* invert monocrome pixels */
+ png_set_invert_mono(png_ptr);
+
+ /* Shift the pixels up to a legal bit depth and fill in
+ * as appropriate to correctly scale the image.
+ */
+ png_set_shift(png_ptr, &sig_bit);
+
+ /* pack pixels into bytes */
+ png_set_packing(png_ptr);
+
+ /* swap location of alpha bytes from ARGB to RGBA */
+ png_set_swap_alpha(png_ptr);
+
+ /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
+ * RGB (4 channels -> 3 channels). The second parameter is not used.
+ */
+ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+
+ /* flip BGR pixels to RGB */
+ png_set_bgr(png_ptr);
+
+ /* swap bytes of 16-bit files to most significant byte first */
+ png_set_swap(png_ptr);
+
+ /* swap bits of 1, 2, 4 bit packed pixel formats */
+ png_set_packswap(png_ptr);
+
+ /* turn on interlace handling if you are not using png_write_image() */
+ if (interlacing)
+ number_passes = png_set_interlace_handling(png_ptr);
+ else
+ number_passes = 1;
+
+ /* The easiest way to write the image (you may have a different memory
+ * layout, however, so choose what fits your needs best). You need to
+ * use the first method if you aren't handling interlacing yourself.
+ */
+ png_uint_32 k, height, width;
+ png_byte image[height][width];
+ png_bytep row_pointers[height];
+ for (k = 0; k < height; k++)
+ row_pointers[k] = image + k*width;
+
+ /* One of the following output methods is REQUIRED */
+#ifdef entire /* write out the entire image data in one call */
+ png_write_image(png_ptr, row_pointers);
+
+ /* the other way to write the image - deal with interlacing */
+
+#else no_entire /* write out the image data by one or more scanlines */
+ /* The number of passes is either 1 for non-interlaced images,
+ * or 7 for interlaced images.
+ */
+ for (pass = 0; pass < number_passes; pass++)
+ {
+ /* Write a few rows at a time. */
+ png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows);
+
+ /* If you are only writing one row at a time, this works */
+ for (y = 0; y < height; y++)
+ {
+ png_write_rows(png_ptr, &row_pointers[y], 1);
+ }
+ }
+#endif no_entire /* use only one output method */
+
+ /* You can write optional chunks like tEXt, zTXt, and tIME at the end
+ * as well.
+ */
+
+ /* It is REQUIRED to call this to finish writing the rest of the file */
+ png_write_end(png_ptr, info_ptr);
+
+ /* if you malloced the palette, free it here */
+ free(info_ptr->palette);
+
+ /* if you allocated any text comments, free them here */
+
+ /* clean up after the write, and free any memory allocated */
+ png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+
+ /* close the file */
+ fclose(fp);
+
+ /* that's it */
+ return;
+}
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngtrans.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngtrans.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngtrans.c Sat Jul 13 19:23:20 2002
@@ -0,0 +1,572 @@
+
+/* pngtrans.c - transforms the data in a row (used by both readers and writers)
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* turn on bgr to rgb mapping */
+void
+png_set_bgr(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_bgr\n");
+ png_ptr->transformations |= PNG_BGR;
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* turn on 16 bit byte swapping */
+void
+png_set_swap(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_swap\n");
+ if (png_ptr->bit_depth == 16)
+ png_ptr->transformations |= PNG_SWAP_BYTES;
+}
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* turn on pixel packing */
+void
+png_set_packing(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_packing\n");
+ if (png_ptr->bit_depth < 8)
+ {
+ png_ptr->transformations |= PNG_PACK;
+ png_ptr->usr_bit_depth = 8;
+ }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* turn on packed pixel swapping */
+void
+png_set_packswap(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_packswap\n");
+ if (png_ptr->bit_depth < 8)
+ png_ptr->transformations |= PNG_PACKSWAP;
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+void
+png_set_shift(png_structp png_ptr, png_color_8p true_bits)
+{
+ png_debug(1, "in png_set_shift\n");
+ png_ptr->transformations |= PNG_SHIFT;
+ png_ptr->shift = *true_bits;
+}
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+ defined(PNG_WRITE_INTERLACING_SUPPORTED)
+int
+png_set_interlace_handling(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_interlace handling\n");
+ if (png_ptr->interlaced)
+ {
+ png_ptr->transformations |= PNG_INTERLACE;
+ return (7);
+ }
+
+ return (1);
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte on read, or remove a filler or alpha byte on write.
+ * The filler type has changed in v0.95 to allow future 2-byte fillers
+ * for 48-bit input data, as well as to avoid problems with some compilers
+ * that don't like bytes as parameters.
+ */
+void
+png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+ png_debug(1, "in png_set_filler\n");
+ png_ptr->transformations |= PNG_FILLER;
+ png_ptr->filler = (png_byte)filler;
+ if (filler_loc == PNG_FILLER_AFTER)
+ png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
+ else
+ png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
+
+ /* This should probably go in the "do_filler" routine.
+ * I attempted to do that in libpng-1.0.1a but that caused problems
+ * so I restored it in libpng-1.0.2a
+ */
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ png_ptr->usr_channels = 4;
+ }
+
+ /* Also I added this in libpng-1.0.2a (what happens when we expand
+ * a less-than-8-bit grayscale to GA? */
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
+ {
+ png_ptr->usr_channels = 2;
+ }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+ defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void
+png_set_swap_alpha(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_swap_alpha\n");
+ png_ptr->transformations |= PNG_SWAP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+ defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void
+png_set_invert_alpha(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_invert_alpha\n");
+ png_ptr->transformations |= PNG_INVERT_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+void
+png_set_invert_mono(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_invert_mono\n");
+ png_ptr->transformations |= PNG_INVERT_MONO;
+}
+
+/* invert monochrome grayscale data */
+void
+png_do_invert(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_invert\n");
+ if (row_info->bit_depth == 1 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ png_bytep rp = row;
+ png_uint_32 i;
+ png_uint_32 istop = row_info->rowbytes;
+
+ for (i = 0; i < istop; i++)
+ {
+ *rp = (png_byte)(~(*rp));
+ rp++;
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* swaps byte order on 16 bit depth images */
+void
+png_do_swap(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_swap\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->bit_depth == 16)
+ {
+ png_bytep rp = row;
+ png_uint_32 i;
+ png_uint_32 istop= row_info->width * row_info->channels;
+
+ for (i = 0; i < istop; i++, rp += 2)
+ {
+ png_byte t = *rp;
+ *rp = *(rp + 1);
+ *(rp + 1) = t;
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+static png_byte onebppswaptable[256] = {
+ 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+ 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+ 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+ 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+ 0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+ 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+ 0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+ 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+ 0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+ 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+ 0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+ 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+ 0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+ 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+ 0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+ 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+ 0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+ 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+ 0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+ 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+ 0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+ 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+ 0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+ 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+ 0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+ 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+ 0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+ 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+ 0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+ 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+ 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+ 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+static png_byte twobppswaptable[256] = {
+ 0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
+ 0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
+ 0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
+ 0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
+ 0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
+ 0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
+ 0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
+ 0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+ 0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
+ 0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
+ 0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
+ 0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
+ 0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
+ 0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
+ 0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
+ 0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
+ 0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
+ 0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
+ 0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
+ 0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
+ 0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
+ 0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
+ 0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
+ 0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
+ 0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
+ 0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
+ 0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
+ 0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
+ 0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
+ 0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
+ 0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
+ 0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
+};
+
+static png_byte fourbppswaptable[256] = {
+ 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+ 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
+ 0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
+ 0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+ 0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
+ 0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
+ 0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
+ 0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
+ 0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
+ 0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
+ 0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
+ 0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
+ 0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
+ 0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
+ 0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
+ 0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
+ 0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
+ 0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
+ 0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
+ 0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
+ 0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
+ 0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+ 0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
+ 0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
+ 0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
+ 0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
+ 0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
+ 0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
+ 0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+ 0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+ 0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+ 0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
+};
+
+/* swaps pixel packing order within bytes */
+void
+png_do_packswap(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_packswap\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->bit_depth < 8)
+ {
+ png_bytep rp, end, table;
+
+ end = row + row_info->rowbytes;
+
+ if (row_info->bit_depth == 1)
+ table = onebppswaptable;
+ else if (row_info->bit_depth == 2)
+ table = twobppswaptable;
+ else if (row_info->bit_depth == 4)
+ table = fourbppswaptable;
+ else
+ return;
+
+ for (rp = row; rp < end; rp++)
+ *rp = table[*rp];
+ }
+}
+#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+ defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+/* remove filler or alpha byte(s) */
+void
+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
+{
+ png_debug(1, "in png_do_strip_filler\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+/*
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB ||
+ row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+*/
+ png_bytep sp=row;
+ png_bytep dp=row;
+ png_uint_32 row_width=row_info->width;
+ png_uint_32 i;
+
+ if (row_info->channels == 4)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ /* This converts from RGBX or RGBA to RGB */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ dp+=3; sp+=4;
+ for (i = 1; i < row_width; i++)
+ {
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ sp++;
+ }
+ }
+ /* This converts from XRGB or ARGB to RGB */
+ else
+ {
+ for (i = 0; i < row_width; i++)
+ {
+ sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ }
+ }
+ row_info->pixel_depth = 24;
+ row_info->rowbytes = row_width * 3;
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
+ sp += 8; dp += 6;
+ for (i = 1; i < row_width; i++)
+ {
+ /* This could be (although memcpy is probably slower):
+ png_memcpy(dp, sp, 6);
+ sp += 8;
+ dp += 6;
+ */
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ sp += 2;
+ }
+ }
+ else
+ {
+ /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
+ for (i = 0; i < row_width; i++)
+ {
+ /* This could be (although memcpy is probably slower):
+ png_memcpy(dp, sp, 6);
+ sp += 8;
+ dp += 6;
+ */
+ sp+=2;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ }
+ }
+ row_info->pixel_depth = 48;
+ row_info->rowbytes = row_width * 6;
+ }
+ row_info->channels = 3;
+ row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+ }
+/*
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY ||
+ row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+*/
+ else if (row_info->channels == 2)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ /* This converts from GX or GA to G */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ for (i = 0; i < row_width; i++)
+ {
+ *dp++ = *sp++;
+ sp++;
+ }
+ }
+ /* This converts from XG or AG to G */
+ else
+ {
+ for (i = 0; i < row_width; i++)
+ {
+ sp++;
+ *dp++ = *sp++;
+ }
+ }
+ row_info->pixel_depth = 8;
+ row_info->rowbytes = row_width;
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ /* This converts from GGXX or GGAA to GG */
+ sp += 4; dp += 2;
+ for (i = 1; i < row_width; i++)
+ {
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ sp += 2;
+ }
+ }
+ else
+ {
+ /* This converts from XXGG or AAGG to GG */
+ for (i = 0; i < row_width; i++)
+ {
+ sp += 2;
+ *dp++ = *sp++;
+ *dp++ = *sp++;
+ }
+ }
+ row_info->pixel_depth = 16;
+ row_info->rowbytes = row_width * 2;
+ }
+ row_info->channels = 1;
+ row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* swaps red and blue bytes within a pixel */
+void
+png_do_bgr(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_bgr\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ (row_info->color_type & PNG_COLOR_MASK_COLOR))
+ {
+ png_uint_32 row_width = row_info->width;
+ if (row_info->bit_depth == 8)
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ png_bytep rp;
+ png_uint_32 i;
+
+ for (i = 0, rp = row; i < row_width; i++, rp += 3)
+ {
+ png_byte save = *rp;
+ *rp = *(rp + 2);
+ *(rp + 2) = save;
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_bytep rp;
+ png_uint_32 i;
+
+ for (i = 0, rp = row; i < row_width; i++, rp += 4)
+ {
+ png_byte save = *rp;
+ *rp = *(rp + 2);
+ *(rp + 2) = save;
+ }
+ }
+ }
+ else if (row_info->bit_depth == 16)
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ png_bytep rp;
+ png_uint_32 i;
+
+ for (i = 0, rp = row; i < row_width; i++, rp += 6)
+ {
+ png_byte save = *rp;
+ *rp = *(rp + 4);
+ *(rp + 4) = save;
+ save = *(rp + 1);
+ *(rp + 1) = *(rp + 5);
+ *(rp + 5) = save;
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ png_bytep rp;
+ png_uint_32 i;
+
+ for (i = 0, rp = row; i < row_width; i++, rp += 8)
+ {
+ png_byte save = *rp;
+ *rp = *(rp + 4);
+ *(rp + 4) = save;
+ save = *(rp + 1);
+ *(rp + 1) = *(rp + 5);
+ *(rp + 5) = save;
+ }
+ }
+ }
+ }
+}
+#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrio.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrio.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrio.c Sat Jul 13 19:23:21 2002
@@ -0,0 +1,151 @@
+
+/* pngrio.c - functions for data input
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file provides a location for all input. Users who need
+ * special handling are expected to write a function that has the same
+ * arguments as this and performs a similar function, but that possibly
+ * has a different input method. Note that you shouldn't change this
+ * function, but rather write a replacement function and then make
+ * libpng use it at run time with png_set_read_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Read the data from whatever input you are using. The default routine
+ reads from a file pointer. Note that this routine sometimes gets called
+ with very small lengths, so you should implement some kind of simple
+ buffering if you are using unbuffered reads. This should never be asked
+ to read more then 64K on a 16 bit machine. */
+void
+png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_debug1(4,"reading %d bytes\n", length);
+ if (png_ptr->read_data_fn != NULL)
+ (*(png_ptr->read_data_fn))(png_ptr, data, length);
+ else
+ png_error(png_ptr, "Call to NULL read function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual reading of data. If you are
+ not reading from a standard C stream, you should create a replacement
+ read_data function and use it at run time with png_set_read_fn(), rather
+ than changing the library. */
+#ifndef USE_FAR_KEYWORD
+static void
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_size_t check;
+
+ /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+ * instead of an int, which is what fread() actually returns.
+ */
+ check = (png_size_t)fread(data, (png_size_t)1, length,
+ (FILE *)png_ptr->io_ptr);
+
+ if (check != length)
+ {
+ png_error(png_ptr, "Read Error");
+ }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+ can't handle far buffers in the medium and small models, we have to copy
+ the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ int check;
+ png_byte *n_data;
+ FILE *io_ptr;
+
+ /* Check if data really is near. If so, use usual code. */
+ n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+ io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
+ if ((png_bytep)n_data == data)
+ {
+ check = fread(n_data, 1, length, io_ptr);
+ }
+ else
+ {
+ png_byte buf[NEAR_BUF_SIZE];
+ png_size_t read, remaining, err;
+ check = 0;
+ remaining = length;
+ do
+ {
+ read = MIN(NEAR_BUF_SIZE, remaining);
+ err = fread(buf, (png_size_t)1, read, io_ptr);
+ png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+ if(err != read)
+ break;
+ else
+ check += err;
+ data += read;
+ remaining -= read;
+ }
+ while (remaining != 0);
+ }
+ if ((png_uint_32)check != (png_uint_32)length)
+ {
+ png_error(png_ptr, "read Error");
+ }
+}
+#endif
+#endif
+
+/* This function allows the application to supply a new input function
+ for libpng if standard C streams aren't being used.
+
+ This function takes as its arguments:
+ png_ptr - pointer to a png input data structure
+ io_ptr - pointer to user supplied structure containing info about
+ the input functions. May be NULL.
+ read_data_fn - pointer to a new input function that takes as its
+ arguments a pointer to a png_struct, a pointer to
+ a location where input data can be stored, and a 32-bit
+ unsigned int that is the number of bytes to be read.
+ To exit and output any fatal error messages the new write
+ function should call png_error(png_ptr, "Error msg"). */
+void
+png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+ png_rw_ptr read_data_fn)
+{
+ png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+ if (read_data_fn != NULL)
+ png_ptr->read_data_fn = read_data_fn;
+ else
+ png_ptr->read_data_fn = png_default_read_data;
+#else
+ png_ptr->read_data_fn = read_data_fn;
+#endif
+
+ /* It is an error to write to a read device */
+ if (png_ptr->write_data_fn != NULL)
+ {
+ png_ptr->write_data_fn = NULL;
+ png_warning(png_ptr,
+ "It's an error to set both read_data_fn and write_data_fn in the ");
+ png_warning(png_ptr,
+ "same structure. Resetting write_data_fn to NULL.");
+ }
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+ png_ptr->output_flush_fn = NULL;
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+}
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsw
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsw (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.dsw Sat Jul 13 19:23:21 2002
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "png"=".\png.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwrite.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwrite.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwrite.c Sat Jul 13 19:23:21 2002
@@ -0,0 +1,1004 @@
+
+/* pngwrite.c - general routines to write a PNG file
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+/* get internal access to png.h */
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Writes all the PNG information. This is the suggested way to use the
+ * library. If you have a new chunk to add, make a function to write it,
+ * and put it in the correct location here. If you want the chunk written
+ * after the image data, put it in png_write_end(). I strongly encourage
+ * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
+ * the chunk, as that will keep the code from breaking if you want to just
+ * write a plain PNG file. If you have long comments, I suggest writing
+ * them in png_write_end(), and compressing them.
+ */
+void
+png_write_info(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+ int i;
+#endif
+
+ png_debug(1, "in png_write_info\n");
+ png_write_sig(png_ptr); /* write PNG signature */
+ /* write IHDR information. */
+ png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
+ info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+ info_ptr->filter_type,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+ info_ptr->interlace_type);
+#else
+ 0);
+#endif
+ /* the rest of these check to see if the valid field has the appropriate
+ flag set, and if it does, writes the chunk. */
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_gAMA)
+ png_write_gAMA(png_ptr, info_ptr->gamma);
+#endif
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_sRGB)
+ png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#endif
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_sBIT)
+ png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_cHRM)
+ png_write_cHRM(png_ptr,
+ info_ptr->x_white, info_ptr->y_white,
+ info_ptr->x_red, info_ptr->y_red,
+ info_ptr->x_green, info_ptr->y_green,
+ info_ptr->x_blue, info_ptr->y_blue);
+#endif
+ if (info_ptr->valid & PNG_INFO_PLTE)
+ png_write_PLTE(png_ptr, info_ptr->palette,
+ (png_uint_32)info_ptr->num_palette);
+ else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ png_error(png_ptr, "Valid palette required for paletted images\n");
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_tRNS)
+ {
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+ /* invert the alpha channel (in tRNS) */
+ if (png_ptr->transformations & PNG_INVERT_ALPHA &&
+ info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ int j;
+ for (j=0; j<(int)info_ptr->num_trans; j++)
+ info_ptr->trans[j] = 255 - info_ptr->trans[j];
+ }
+#endif
+ png_write_tRNS(png_ptr, info_ptr->trans, &(info_ptr->trans_values),
+ info_ptr->num_trans, info_ptr->color_type);
+ }
+#endif
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_bKGD)
+ png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_hIST)
+ png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
+#endif
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_oFFs)
+ png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
+ info_ptr->offset_unit_type);
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_pCAL)
+ png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
+ info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
+ info_ptr->pcal_units, info_ptr->pcal_params);
+#endif
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_pHYs)
+ png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
+ info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_tIME)
+ {
+ png_write_tIME(png_ptr, &(info_ptr->mod_time));
+ png_ptr->flags |= PNG_FLAG_WROTE_tIME;
+ }
+#endif
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+ /* Check to see if we need to write text chunks */
+ for (i = 0; i < info_ptr->num_text; i++)
+ {
+ png_debug2(2, "Writing header text chunk %d, type %d\n", i,
+ info_ptr->text[i].compression);
+ /* If we want a compressed text chunk */
+ if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+ {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+ /* write compressed chunk */
+ png_write_zTXt(png_ptr, info_ptr->text[i].key,
+ info_ptr->text[i].text, info_ptr->text[i].text_length,
+ info_ptr->text[i].compression);
+#else
+ png_warning(png_ptr, "Unable to write compressed text\n");
+#endif
+ /* Mark this chunk as written */
+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+ }
+ else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+ {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+ /* write uncompressed chunk */
+ png_write_tEXt(png_ptr, info_ptr->text[i].key,
+ info_ptr->text[i].text, info_ptr->text[i].text_length);
+#else
+ png_warning(png_ptr, "Unable to write uncompressed text\n");
+#endif
+ /* Mark this chunk as written */
+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+ }
+ }
+#endif
+}
+
+/* Writes the end of the PNG file. If you don't want to write comments or
+ * time information, you can pass NULL for info. If you already wrote these
+ * in png_write_info(), do not write them again here. If you have long
+ * comments, I suggest writing them here, and compressing them.
+ */
+void
+png_write_end(png_structp png_ptr, png_infop info_ptr)
+{
+ png_debug(1, "in png_write_end\n");
+ if (!(png_ptr->mode & PNG_HAVE_IDAT))
+ png_error(png_ptr, "No IDATs written into file");
+
+ /* see if user wants us to write information chunks */
+ if (info_ptr != NULL)
+ {
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+ int i; /* local index variable */
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+ /* check to see if user has supplied a time chunk */
+ if (info_ptr->valid & PNG_INFO_tIME &&
+ !(png_ptr->flags & PNG_FLAG_WROTE_tIME))
+ png_write_tIME(png_ptr, &(info_ptr->mod_time));
+#endif
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+ /* loop through comment chunks */
+ for (i = 0; i < info_ptr->num_text; i++)
+ {
+ png_debug2(2, "Writing trailer text chunk %d, type %d\n", i,
+ info_ptr->text[i].compression);
+ if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+ {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+ /* write compressed chunk */
+ png_write_zTXt(png_ptr, info_ptr->text[i].key,
+ info_ptr->text[i].text, info_ptr->text[i].text_length,
+ info_ptr->text[i].compression);
+#else
+ png_warning(png_ptr, "Unable to write compressed text\n");
+#endif
+ /* Mark this chunk as written */
+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+ }
+ else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+ {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+ /* write uncompressed chunk */
+ png_write_tEXt(png_ptr, info_ptr->text[i].key,
+ info_ptr->text[i].text, info_ptr->text[i].text_length);
+#else
+ png_warning(png_ptr, "Unable to write uncompressed text\n");
+#endif
+
+ /* Mark this chunk as written */
+ info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+ }
+ }
+#endif
+ }
+
+ png_ptr->mode |= PNG_AFTER_IDAT;
+
+ /* write end of PNG file */
+ png_write_IEND(png_ptr);
+}
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+void
+png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
+{
+ png_debug(1, "in png_convert_from_struct_tm\n");
+ ptime->year = (png_uint_16)(1900 + ttime->tm_year);
+ ptime->month = (png_byte)(ttime->tm_mon + 1);
+ ptime->day = (png_byte)ttime->tm_mday;
+ ptime->hour = (png_byte)ttime->tm_hour;
+ ptime->minute = (png_byte)ttime->tm_min;
+ ptime->second = (png_byte)ttime->tm_sec;
+}
+
+void
+png_convert_from_time_t(png_timep ptime, time_t ttime)
+{
+ struct tm *tbuf;
+
+ png_debug(1, "in png_convert_from_time_t\n");
+ tbuf = gmtime(&ttime);
+ png_convert_from_struct_tm(ptime, tbuf);
+}
+#endif
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+png_structp
+png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+ return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+ warn_fn, NULL, NULL, NULL));
+}
+
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
+png_structp
+png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+ png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+ png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+ png_structp png_ptr;
+#ifdef USE_FAR_KEYWORD
+ jmp_buf jmpbuf;
+#endif
+ png_debug(1, "in png_create_write_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+ if ((png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+ (png_malloc_ptr)malloc_fn)) == NULL)
+#else
+ if ((png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG)) == NULL)
+#endif /* PNG_USER_MEM_SUPPORTED */
+ {
+ return ((png_structp)NULL);
+ }
+#ifdef USE_FAR_KEYWORD
+ if (setjmp(jmpbuf))
+#else
+ if (setjmp(png_ptr->jmpbuf))
+#endif
+ {
+ png_free(png_ptr, png_ptr->zbuf);
+ png_destroy_struct(png_ptr);
+ return ((png_structp)NULL);
+ }
+#ifdef USE_FAR_KEYWORD
+ png_memcpy(png_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+ png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+ /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+ * we must recompile any applications that use any older library version.
+ * For versions after libpng 1.0, we will be compatible, so we need
+ * only check the first digit.
+ */
+ if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+ (png_libpng_ver[0] == '0' && user_png_ver[2] < '9'))
+ {
+ png_error(png_ptr,
+ "Incompatible libpng version in application and library");
+ }
+
+ /* initialize zbuf - compression buffer */
+ png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+ png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+
+ png_set_write_fn(png_ptr, NULL, NULL, NULL);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+ 1, NULL, NULL);
+#endif
+
+ return ((png_structp)png_ptr);
+}
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+void
+png_write_init(png_structp png_ptr)
+{
+ jmp_buf tmp_jmp; /* to save current jump buffer */
+
+ png_debug(1, "in png_write_init\n");
+ /* save jump buffer and error functions */
+ png_memcpy(tmp_jmp, png_ptr->jmpbuf, sizeof (jmp_buf));
+
+ /* reset all variables to 0 */
+ png_memset(png_ptr, 0, sizeof (png_struct));
+
+ /* restore jump buffer */
+ png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
+
+ /* initialize zbuf - compression buffer */
+ png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+ png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+ png_set_write_fn(png_ptr, NULL, NULL, NULL);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+ 1, NULL, NULL);
+#endif
+}
+
+/* Write a few rows of image data. If the image is interlaced,
+ * either you will have to write the 7 sub images, or, if you
+ * have called png_set_interlace_handling(), you will have to
+ * "write" the image seven times.
+ */
+void
+png_write_rows(png_structp png_ptr, png_bytepp row,
+ png_uint_32 num_rows)
+{
+ png_uint_32 i; /* row counter */
+ png_bytepp rp; /* row pointer */
+
+ png_debug(1, "in png_write_rows\n");
+ /* loop through the rows */
+ for (i = 0, rp = row; i < num_rows; i++, rp++)
+ {
+ png_write_row(png_ptr, *rp);
+ }
+}
+
+/* Write the image. You only need to call this function once, even
+ * if you are writing an interlaced image.
+ */
+void
+png_write_image(png_structp png_ptr, png_bytepp image)
+{
+ png_uint_32 i; /* row index */
+ int pass, num_pass; /* pass variables */
+ png_bytepp rp; /* points to current row */
+
+ png_debug(1, "in png_write_image\n");
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+ /* intialize interlace handling. If image is not interlaced,
+ this will set pass to 1 */
+ num_pass = png_set_interlace_handling(png_ptr);
+#else
+ num_pass = 1;
+#endif
+ /* loop through passes */
+ for (pass = 0; pass < num_pass; pass++)
+ {
+ /* loop through image */
+ for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
+ {
+ png_write_row(png_ptr, *rp);
+ }
+ }
+}
+
+/* called by user to write a row of image data */
+void
+png_write_row(png_structp png_ptr, png_bytep row)
+{
+ png_debug2(1, "in png_write_row (row %ld, pass %d)\n",
+ png_ptr->row_number, png_ptr->pass);
+ /* initialize transformations and other stuff if first time */
+ if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+ {
+ /* check for transforms that have been set but were defined out */
+#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_MONO)
+ png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
+ if (png_ptr->transformations & PNG_FILLER)
+ png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACK)
+ png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
+ if (png_ptr->transformations & PNG_SHIFT)
+ png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
+ if (png_ptr->transformations & PNG_BGR)
+ png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_BYTES)
+ png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined.");
+#endif
+
+ png_write_start_row(png_ptr);
+ }
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+ /* if interlaced and not interested in row, return */
+ if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ {
+ switch (png_ptr->pass)
+ {
+ case 0:
+ if (png_ptr->row_number & 7)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 1:
+ if ((png_ptr->row_number & 7) || png_ptr->width < 5)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 2:
+ if ((png_ptr->row_number & 7) != 4)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 3:
+ if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 4:
+ if ((png_ptr->row_number & 3) != 2)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 5:
+ if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ case 6:
+ if (!(png_ptr->row_number & 1))
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ break;
+ }
+ }
+#endif
+
+ /* set up row info for transformations */
+ png_ptr->row_info.color_type = png_ptr->color_type;
+ png_ptr->row_info.width = png_ptr->usr_width;
+ png_ptr->row_info.channels = png_ptr->usr_channels;
+ png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
+ png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+ png_ptr->row_info.channels);
+
+ png_ptr->row_info.rowbytes = ((png_ptr->row_info.width *
+ (png_uint_32)png_ptr->row_info.pixel_depth + 7) >> 3);
+
+ png_debug1(3, "row_info->color_type = %d\n", png_ptr->row_info.color_type);
+ png_debug1(3, "row_info->width = %d\n", png_ptr->row_info.width);
+ png_debug1(3, "row_info->channels = %d\n", png_ptr->row_info.channels);
+ png_debug1(3, "row_info->bit_depth = %d\n", png_ptr->row_info.bit_depth);
+ png_debug1(3, "row_info->pixel_depth = %d\n", png_ptr->row_info.pixel_depth);
+ png_debug1(3, "row_info->rowbytes = %d\n", png_ptr->row_info.rowbytes);
+
+ /* Copy user's row into buffer, leaving room for filter byte. */
+ png_memcpy_check(png_ptr, png_ptr->row_buf + 1, row,
+ png_ptr->row_info.rowbytes);
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+ /* handle interlacing */
+ if (png_ptr->interlaced && png_ptr->pass < 6 &&
+ (png_ptr->transformations & PNG_INTERLACE))
+ {
+ png_do_write_interlace(&(png_ptr->row_info),
+ png_ptr->row_buf + 1, png_ptr->pass);
+ /* this should always get caught above, but still ... */
+ if (!(png_ptr->row_info.width))
+ {
+ png_write_finish_row(png_ptr);
+ return;
+ }
+ }
+#endif
+
+ /* handle other transformations */
+ if (png_ptr->transformations)
+ png_do_write_transformations(png_ptr);
+
+ /* Find a filter if necessary, filter the row and write it out. */
+ png_write_find_filter(png_ptr, &(png_ptr->row_info));
+
+ if (png_ptr->write_row_fn != NULL)
+ (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set the automatic flush interval or 0 to turn flushing off */
+void
+png_set_flush(png_structp png_ptr, int nrows)
+{
+ png_debug(1, "in png_set_flush\n");
+ png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+}
+
+/* flush the current output buffers now */
+void
+png_write_flush(png_structp png_ptr)
+{
+ int wrote_IDAT;
+
+ png_debug(1, "in png_write_flush\n");
+ /* We have already written out all of the data */
+ if (png_ptr->row_number >= png_ptr->num_rows)
+ return;
+
+ do
+ {
+ int ret;
+
+ /* compress the data */
+ ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+ wrote_IDAT = 0;
+
+ /* check for compression errors */
+ if (ret != Z_OK)
+ {
+ if (png_ptr->zstream.msg != NULL)
+ png_error(png_ptr, png_ptr->zstream.msg);
+ else
+ png_error(png_ptr, "zlib error");
+ }
+
+ if (!(png_ptr->zstream.avail_out))
+ {
+ /* write the IDAT and reset the zlib output buffer */
+ png_write_IDAT(png_ptr, png_ptr->zbuf,
+ png_ptr->zbuf_size);
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ wrote_IDAT = 1;
+ }
+ } while(wrote_IDAT == 1);
+
+ /* If there is any data left to be output, write it into a new IDAT */
+ if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
+ {
+ /* write the IDAT and reset the zlib output buffer */
+ png_write_IDAT(png_ptr, png_ptr->zbuf,
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ }
+ png_ptr->flush_rows = 0;
+ png_flush(png_ptr);
+}
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* free all memory used by the write */
+void
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+ png_structp png_ptr = NULL;
+ png_infop info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_free_ptr free_fn = NULL;
+#endif
+
+ png_debug(1, "in png_destroy_write_struct\n");
+ if (png_ptr_ptr != NULL)
+ {
+ png_ptr = *png_ptr_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ free_fn = png_ptr->free_fn;
+#endif
+ }
+
+ if (info_ptr_ptr != NULL)
+ info_ptr = *info_ptr_ptr;
+
+ if (info_ptr != NULL)
+ {
+#ifdef PNG_WRITE_tEXt_SUPPORTED
+ png_free(png_ptr, info_ptr->text);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+ png_free(png_ptr, info_ptr->pcal_purpose);
+ png_free(png_ptr, info_ptr->pcal_units);
+ if (info_ptr->pcal_params != NULL)
+ {
+ int i;
+ for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+ {
+ png_free(png_ptr, info_ptr->pcal_params[i]);
+ }
+ png_free(png_ptr, info_ptr->pcal_params);
+ }
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)info_ptr, free_fn);
+#else
+ png_destroy_struct((png_voidp)info_ptr);
+#endif
+ *info_ptr_ptr = (png_infop)NULL;
+ }
+
+ if (png_ptr != NULL)
+ {
+ png_write_destroy(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_destroy_struct_2((png_voidp)png_ptr, free_fn);
+#else
+ png_destroy_struct((png_voidp)png_ptr);
+#endif
+ *png_ptr_ptr = (png_structp)NULL;
+ }
+}
+
+
+/* Free any memory used in png_ptr struct (old method) */
+void
+png_write_destroy(png_structp png_ptr)
+{
+ jmp_buf tmp_jmp; /* save jump buffer */
+ png_error_ptr error_fn;
+ png_error_ptr warning_fn;
+ png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_free_ptr free_fn;
+#endif
+
+ png_debug(1, "in png_write_destroy\n");
+ /* free any memory zlib uses */
+ deflateEnd(&png_ptr->zstream);
+
+ /* free our memory. png_free checks NULL for us. */
+ png_free(png_ptr, png_ptr->zbuf);
+ png_free(png_ptr, png_ptr->row_buf);
+ png_free(png_ptr, png_ptr->prev_row);
+ png_free(png_ptr, png_ptr->sub_row);
+ png_free(png_ptr, png_ptr->up_row);
+ png_free(png_ptr, png_ptr->avg_row);
+ png_free(png_ptr, png_ptr->paeth_row);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+ png_free(png_ptr, png_ptr->time_buffer);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ png_free(png_ptr, png_ptr->prev_filters);
+ png_free(png_ptr, png_ptr->filter_weights);
+ png_free(png_ptr, png_ptr->inv_filter_weights);
+ png_free(png_ptr, png_ptr->filter_costs);
+ png_free(png_ptr, png_ptr->inv_filter_costs);
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+ /* reset structure */
+ png_memcpy(tmp_jmp, png_ptr->jmpbuf, sizeof (jmp_buf));
+
+ error_fn = png_ptr->error_fn;
+ warning_fn = png_ptr->warning_fn;
+ error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ free_fn = png_ptr->free_fn;
+#endif
+
+ png_memset(png_ptr, 0, sizeof (png_struct));
+
+ png_ptr->error_fn = error_fn;
+ png_ptr->warning_fn = warning_fn;
+ png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+ png_ptr->free_fn = free_fn;
+#endif
+
+ png_memcpy(png_ptr->jmpbuf, tmp_jmp, sizeof (jmp_buf));
+}
+
+/* Allow the application to select one or more row filters to use. */
+void
+png_set_filter(png_structp png_ptr, int method, int filters)
+{
+ png_debug(1, "in png_set_filter\n");
+ /* We allow 'method' only for future expansion of the base filter method. */
+ if (method == PNG_FILTER_TYPE_BASE)
+ {
+ switch (filters & (PNG_ALL_FILTERS | 0x07))
+ {
+ case 5:
+ case 6:
+ case 7: png_warning(png_ptr, "Unknown row filter for method 0");
+ case PNG_FILTER_VALUE_NONE: png_ptr->do_filter=PNG_FILTER_NONE; break;
+ case PNG_FILTER_VALUE_SUB: png_ptr->do_filter=PNG_FILTER_SUB; break;
+ case PNG_FILTER_VALUE_UP: png_ptr->do_filter=PNG_FILTER_UP; break;
+ case PNG_FILTER_VALUE_AVG: png_ptr->do_filter=PNG_FILTER_AVG; break;
+ case PNG_FILTER_VALUE_PAETH: png_ptr->do_filter=PNG_FILTER_PAETH;break;
+ default: png_ptr->do_filter = (png_byte)filters; break;
+ }
+
+ /* If we have allocated the row_buf, this means we have already started
+ * with the image and we should have allocated all of the filter buffers
+ * that have been selected. If prev_row isn't already allocated, then
+ * it is too late to start using the filters that need it, since we
+ * will be missing the data in the previous row. If an application
+ * wants to start and stop using particular filters during compression,
+ * it should start out with all of the filters, and then add and
+ * remove them after the start of compression.
+ */
+ if (png_ptr->row_buf != NULL)
+ {
+ if (png_ptr->do_filter & PNG_FILTER_SUB && png_ptr->sub_row == NULL)
+ {
+ png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+ }
+
+ if (png_ptr->do_filter & PNG_FILTER_UP && png_ptr->up_row == NULL)
+ {
+ if (png_ptr->prev_row == NULL)
+ {
+ png_warning(png_ptr, "Can't add Up filter after starting");
+ png_ptr->do_filter &= ~PNG_FILTER_UP;
+ }
+ else
+ {
+ png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+ }
+ }
+
+ if (png_ptr->do_filter & PNG_FILTER_AVG && png_ptr->avg_row == NULL)
+ {
+ if (png_ptr->prev_row == NULL)
+ {
+ png_warning(png_ptr, "Can't add Average filter after starting");
+ png_ptr->do_filter &= ~PNG_FILTER_AVG;
+ }
+ else
+ {
+ png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+ }
+ }
+
+ if (png_ptr->do_filter & PNG_FILTER_PAETH &&
+ png_ptr->paeth_row == NULL)
+ {
+ if (png_ptr->prev_row == NULL)
+ {
+ png_warning(png_ptr, "Can't add Paeth filter after starting");
+ png_ptr->do_filter &= ~PNG_FILTER_PAETH;
+ }
+ else
+ {
+ png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+ }
+ }
+
+ if (png_ptr->do_filter == PNG_NO_FILTERS)
+ png_ptr->do_filter = PNG_FILTER_NONE;
+ }
+ }
+ else
+ png_error(png_ptr, "Unknown custom filter method");
+}
+
+/* This allows us to influence the way in which libpng chooses the "best"
+ * filter for the current scanline. While the "minimum-sum-of-absolute-
+ * differences metric is relatively fast and effective, there is some
+ * question as to whether it can be improved upon by trying to keep the
+ * filtered data going to zlib more consistent, hopefully resulting in
+ * better compression.
+ */
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* GRR 970116 */
+void
+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+ int num_weights, png_doublep filter_weights,
+ png_doublep filter_costs)
+{
+ int i;
+
+ png_debug(1, "in png_set_filter_heuristics\n");
+ if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
+ {
+ png_warning(png_ptr, "Unknown filter heuristic method");
+ return;
+ }
+
+ if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)
+ {
+ heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
+ }
+
+ if (num_weights < 0 || filter_weights == NULL ||
+ heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
+ {
+ num_weights = 0;
+ }
+
+ png_ptr->num_prev_filters = num_weights;
+ png_ptr->heuristic_method = heuristic_method;
+
+ if (num_weights > 0)
+ {
+ if (png_ptr->prev_filters == NULL)
+ {
+ png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)(sizeof(png_byte) * num_weights));
+
+ /* To make sure that the weighting starts out fairly */
+ for (i = 0; i < num_weights; i++)
+ {
+ png_ptr->prev_filters[i] = 255;
+ }
+ }
+
+ if (png_ptr->filter_weights == NULL)
+ {
+ png_ptr->filter_weights = (png_uint_16p) png_malloc(png_ptr,
+ (png_uint_32)(sizeof(png_uint_16) * num_weights));
+
+ png_ptr->inv_filter_weights = (png_uint_16p) png_malloc(png_ptr,
+ (png_uint_32)(sizeof(png_uint_16) * num_weights));
+
+ for (i = 0; i < num_weights; i++)
+ {
+ png_ptr->inv_filter_weights[i] =
+ png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+ }
+ }
+
+ for (i = 0; i < num_weights; i++)
+ {
+ if (filter_weights[i] < 0.0)
+ {
+ png_ptr->inv_filter_weights[i] =
+ png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+ }
+ else
+ {
+ png_ptr->inv_filter_weights[i] =
+ (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);
+ png_ptr->filter_weights[i] =
+ (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);
+ }
+ }
+ }
+
+ /* If, in the future, there are other filter methods, this would
+ * need to be based on png_ptr->filter.
+ */
+ if (png_ptr->filter_costs == NULL)
+ {
+ png_ptr->filter_costs = (png_uint_16p) png_malloc(png_ptr,
+ (png_uint_32)(sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+ png_ptr->inv_filter_costs = (png_uint_16p) png_malloc(png_ptr,
+ (png_uint_32)(sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+ for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+ {
+ png_ptr->inv_filter_costs[i] =
+ png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+ }
+ }
+
+ /* Here is where we set the relative costs of the different filters. We
+ * should take the desired compression level into account when setting
+ * the costs, so that Paeth, for instance, has a high relative cost at low
+ * compression levels, while it has a lower relative cost at higher
+ * compression settings. The filter types are in order of increasing
+ * relative cost, so it would be possible to do this with an algorithm.
+ */
+ for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+ {
+ if (filter_costs == NULL || filter_costs[i] < 0.0)
+ {
+ png_ptr->inv_filter_costs[i] =
+ png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+ }
+ else if (filter_costs[i] >= 1.0)
+ {
+ png_ptr->inv_filter_costs[i] =
+ (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);
+ png_ptr->filter_costs[i] =
+ (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);
+ }
+ }
+}
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+void
+png_set_compression_level(png_structp png_ptr, int level)
+{
+ png_debug(1, "in png_set_compression_level\n");
+ png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
+ png_ptr->zlib_level = level;
+}
+
+void
+png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+{
+ png_debug(1, "in png_set_compression_mem_level\n");
+ png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
+ png_ptr->zlib_mem_level = mem_level;
+}
+
+void
+png_set_compression_strategy(png_structp png_ptr, int strategy)
+{
+ png_debug(1, "in png_set_compression_strategy\n");
+ png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
+ png_ptr->zlib_strategy = strategy;
+}
+
+void
+png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+{
+ if (window_bits > 15)
+ png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+ png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
+ png_ptr->zlib_window_bits = window_bits;
+}
+
+void
+png_set_compression_method(png_structp png_ptr, int method)
+{
+ png_debug(1, "in png_set_compression_method\n");
+ if (method != 8)
+ png_warning(png_ptr, "Only compression method 8 is supported by PNG");
+ png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
+ png_ptr->zlib_method = method;
+}
+
+void
+png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+{
+ png_ptr->write_row_fn = write_row_fn;
+}
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void
+png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+ write_user_transform_fn)
+{
+ png_debug(1, "in png_set_write_user_transform_fn\n");
+ png_ptr->transformations |= PNG_USER_TRANSFORM;
+ png_ptr->write_user_transform_fn = write_user_transform_fn;
+}
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngconf.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngconf.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngconf.h Sat Jul 13 19:23:22 2002
@@ -0,0 +1,705 @@
+
+/* pngconf.h - machine configurable file for libpng
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+/* Any machine specific code is near the front of this file, so if you
+ * are configuring libpng for a machine, you may want to read the section
+ * starting here down to where it starts to typedef png_color, png_text,
+ * and png_info.
+ */
+
+#ifndef PNGCONF_H
+#define PNGCONF_H
+
+
+/* This is the size of the compression buffer, and thus the size of
+ * an IDAT chunk. Make this whatever size you feel is best for your
+ * machine. One of these will be allocated per png_struct. When this
+ * is full, it writes the data to the disk, and does some other
+ * calculations. Making this an extremely small size will slow
+ * the library down, but you may want to experiment to determine
+ * where it becomes significant, if you are concerned with memory
+ * usage. Note that zlib allocates at least 32Kb also. For readers,
+ * this describes the size of the buffer available to read the data in.
+ * Unless this gets smaller than the size of a row (compressed),
+ * it should not make much difference how big this is.
+ */
+
+#ifndef PNG_ZBUF_SIZE
+#define PNG_ZBUF_SIZE 8192
+#endif
+
+/* If you are running on a machine where you cannot allocate more
+ * than 64K of memory at once, uncomment this. While libpng will not
+ * normally need that much memory in a chunk (unless you load up a very
+ * large file), zlib needs to know how big of a chunk it can use, and
+ * libpng thus makes sure to check any memory allocation to verify it
+ * will fit into memory.
+#define PNG_MAX_MALLOC_64K
+ */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+#define PNG_MAX_MALLOC_64K
+#endif
+
+/* This protects us against compilers that run on a windowing system
+ * and thus don't have or would rather us not use the stdio types:
+ * stdin, stdout, and stderr. The only one currently used is stderr
+ * in png_error() and png_warning(). #defining PNG_NO_CONSOLE_IO will
+ * prevent these from being compiled and used. #defining PNG_NO_STDIO
+ * will also prevent these, plus will prevent the entire set of stdio
+ * macros and functions (FILE *, printf, etc.) from being compiled and used,
+ * unless PNG_DEBUG has been #defined.
+ *
+ * #define PNG_NO_CONSOLE_IO
+ * #define PNG_NO_STDIO
+ */
+
+#ifdef PNG_DEBUG
+# if (PNG_DEBUG > 0)
+# include <stdio.h>
+# endif
+#else
+# ifdef PNG_NO_STDIO
+# ifndef PNG_NO_CONSOLE_IO
+# define PNG_NO_CONSOLE_IO
+# endif
+# else
+# include <stdio.h>
+# endif
+#endif
+
+/* This macro protects us against machines that don't have function
+ * prototypes (ie K&R style headers). If your compiler does not handle
+ * function prototypes, define this macro and use the included ansi2knr.
+ * I've always been able to use _NO_PROTO as the indicator, but you may
+ * need to drag the empty declaration out in front of here, or change the
+ * ifdef to suit your own needs.
+ */
+#ifndef PNGARG
+
+#ifdef OF /* zlib prototype munger */
+#define PNGARG(arglist) OF(arglist)
+#else
+
+#ifdef _NO_PROTO
+#define PNGARG(arglist) ()
+#else
+#define PNGARG(arglist) arglist
+#endif /* _NO_PROTO */
+
+#endif /* OF */
+
+#endif /* PNGARG */
+
+/* Try to determine if we are compiling on a Mac. Note that testing for
+ * just __MWERKS__ is not good enough, because the Codewarrior is now used
+ * on non-Mac platforms.
+ */
+#ifndef MACOS
+#if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+ defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
+#define MACOS
+#endif
+#endif
+
+/* enough people need this for various reasons to include it here */
+#if !defined(MACOS) && !defined(RISCOS)
+#include <sys/types.h>
+#endif
+
+/* This is an attempt to force a single setjmp behaviour on Linux. If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ */
+#ifdef __linux__
+#ifdef _BSD_SOURCE
+#define _PNG_SAVE_BSD_SOURCE
+#undef _BSD_SOURCE
+#endif
+#ifdef _SETJMP_H
+__png.h__ already includes setjmp.h
+__dont__ include it again
+#endif
+#endif /* __linux__ */
+
+/* include setjmp.h for error handling */
+#include <setjmp.h>
+
+#ifdef __linux__
+#ifdef _PNG_SAVE_BSD_SOURCE
+#define _BSD_SOURCE
+#undef _PNG_SAVE_BSD_SOURCE
+#endif
+#endif /* __linux__ */
+
+#ifdef BSD
+#include <strings.h>
+#else
+#include <string.h>
+#endif
+
+/* Other defines for things like memory and the like can go here. */
+#ifdef PNG_INTERNAL
+#include <stdlib.h>
+
+/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
+ * aren't usually used outside the library (as far as I know), so it is
+ * debatable if they should be exported at all. In the future, when it is
+ * possible to have run-time registry of chunk-handling functions, some of
+ * these will be made available again.
+#define PNG_EXTERN extern
+ */
+#define PNG_EXTERN
+
+/* Other defines specific to compilers can go here. Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
+#if defined(MACOS)
+/* We need to check that <math.h> hasn't already been included earlier
+ * as it seems it doesn't agree with <fp.h>, yet we should really use
+ * <fp.h> if possible.
+ */
+#if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
+#include <fp.h>
+#endif
+#else
+#include <math.h>
+#endif
+
+/* Codewarrior on NT has linking problems without this. */
+#if defined(__MWERKS__) && defined(WIN32)
+#define PNG_ALWAYS_EXTERN
+#endif
+
+/* For some reason, Borland C++ defines memcmp, etc. in mem.h, not
+ * stdlib.h like it should (I think). Or perhaps this is a C++
+ * "feature"?
+ */
+#ifdef __TURBOC__
+#include <mem.h>
+#include "alloc.h"
+#endif
+
+#ifdef _MSC_VER
+#include <malloc.h>
+#endif
+
+/* This controls how fine the dithering gets. As this allocates
+ * a largish chunk of memory (32K), those who are not as concerned
+ * with dithering quality can decrease some or all of these.
+ */
+#ifndef PNG_DITHER_RED_BITS
+#define PNG_DITHER_RED_BITS 5
+#endif
+#ifndef PNG_DITHER_GREEN_BITS
+#define PNG_DITHER_GREEN_BITS 5
+#endif
+#ifndef PNG_DITHER_BLUE_BITS
+#define PNG_DITHER_BLUE_BITS 5
+#endif
+
+/* This controls how fine the gamma correction becomes when you
+ * are only interested in 8 bits anyway. Increasing this value
+ * results in more memory being used, and more pow() functions
+ * being called to fill in the gamma tables. Don't set this value
+ * less then 8, and even that may not work (I haven't tested it).
+ */
+
+#ifndef PNG_MAX_GAMMA_8
+#define PNG_MAX_GAMMA_8 11
+#endif
+
+/* This controls how much a difference in gamma we can tolerate before
+ * we actually start doing gamma conversion.
+ */
+#ifndef PNG_GAMMA_THRESHOLD
+#define PNG_GAMMA_THRESHOLD 0.05
+#endif
+
+#endif /* PNG_INTERNAL */
+
+/* The following uses const char * instead of char * for error
+ * and warning message functions, so some compilers won't complain.
+ * If you do not want to use const, define PNG_NO_CONST here.
+ */
+
+#ifndef PNG_NO_CONST
+# define PNG_CONST const
+#else
+# define PNG_CONST
+#endif
+
+/* The following defines give you the ability to remove code from the
+ * library that you will not be using. I wish I could figure out how to
+ * automate this, but I can't do that without making it seriously hard
+ * on the users. So if you are not using an ability, change the #define
+ * to and #undef, and that part of the library will not be compiled. If
+ * your linker can't find a function, you may want to make sure the
+ * ability is defined here. Some of these depend upon some others being
+ * defined. I haven't figured out all the interactions here, so you may
+ * have to experiment awhile to get everything to compile. If you are
+ * creating or using a shared library, you probably shouldn't touch this,
+ * as it will affect the size of the structures, and this will cause bad
+ * things to happen if the library and/or application ever change.
+ */
+
+/* Any transformations you will not be using can be undef'ed here */
+
+/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
+ to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+ on the compile line, then pick and choose which ones to define without
+ having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+ if you only want to have a png-compliant reader/writer but don't need
+ any of the extra transformations. This saves about 80 kbytes in a
+ typical installation of the library. (PNG_NO_* form added in version
+ 1.0.1c, for consistency)
+ */
+
+
+#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
+ !defined(PNG_NO_READ_TRANSFORMS)
+#define PNG_READ_TRANSFORMS_SUPPORTED
+#endif
+#if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+ !defined(PNG_NO_WRITE_TRANSFORMS)
+#define PNG_WRITE_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+#ifndef PNG_NO_READ_EXPAND
+#define PNG_READ_EXPAND_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_SHIFT
+#define PNG_READ_SHIFT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_PACK
+#define PNG_READ_PACK_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_BGR
+#define PNG_READ_BGR_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_SWAP
+#define PNG_READ_SWAP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_PACKSWAP
+#define PNG_READ_PACKSWAP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_INVERT
+#define PNG_READ_INVERT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_DITHER
+#define PNG_READ_DITHER_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_BACKGROUND
+#define PNG_READ_BACKGROUND_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_16_TO_8
+#define PNG_READ_16_TO_8_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_FILLER
+#define PNG_READ_FILLER_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_GAMMA
+#define PNG_READ_GAMMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_GRAY_TO_RGB
+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_SWAP_ALPHA
+#define PNG_READ_SWAP_ALPHA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_INVERT_ALPHA
+#define PNG_READ_INVERT_ALPHA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_STRIP_ALPHA
+#define PNG_READ_STRIP_ALPHA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_USER_TRANSFORM
+#define PNG_READ_USER_TRANSFORM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_RGB_TO_GRAY
+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
+#endif
+#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_PROGRESSIVE_READ) && \
+ !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED) /* if you don't do progressive */
+#define PNG_PROGRESSIVE_READ_SUPPORTED /* reading. This is not talking */
+#endif /* about interlacing capability! You'll */
+ /* still have interlacing unless you change the following line: */
+#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
+
+#ifndef PNG_NO_READ_COMPOSITED_NODIV
+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED /* well tested on Intel and SGI */
+#endif
+
+#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
+#ifndef PNG_NO_WRITE_SHIFT
+#define PNG_WRITE_SHIFT_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_PACK
+#define PNG_WRITE_PACK_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_BGR
+#define PNG_WRITE_BGR_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_SWAP
+#define PNG_WRITE_SWAP_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_PACKSWAP
+#define PNG_WRITE_PACKSWAP_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_INVERT
+#define PNG_WRITE_INVERT_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_FILLER
+#define PNG_WRITE_FILLER_SUPPORTED /* This is the same as WRITE_STRIP_ALPHA */
+#endif
+#ifndef PNG_NO_WRITE_SWAP_ALPHA
+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_INVERT_ALPHA
+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_USER_TRANSFORM
+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
+#endif
+#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
+
+#define PNG_WRITE_INTERLACING_SUPPORTED /* not required for PNG-compliant
+ encoders, but can cause trouble
+ if left undefined */
+
+#ifndef PNG_NO_WRITE_WEIGHTED_FILTER
+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_FLUSH
+#define PNG_WRITE_FLUSH_SUPPORTED
+#endif
+
+#ifndef PNG_NO_STDIO
+#define PNG_TIME_RFC1123_SUPPORTED
+#endif
+
+/* This adds extra functions in pngget.c for accessing data from the
+ * info pointer (added in version 0.99)
+ * png_get_image_width()
+ * png_get_image_height()
+ * png_get_bit_depth()
+ * png_get_color_type()
+ * png_get_compression_type()
+ * png_get_filter_type()
+ * png_get_interlace_type()
+ * png_get_pixel_aspect_ratio()
+ * png_get_pixels_per_meter()
+ * png_get_x_offset_pixels()
+ * png_get_y_offset_pixels()
+ * png_get_x_offset_microns()
+ * png_get_y_offset_microns()
+ */
+#ifndef PNG_NO_EASY_ACCESS
+#define PNG_EASY_ACCESS_SUPPORTED
+#endif
+
+/* These are currently experimental features, define them if you want */
+
+/* very little testing */
+/*
+#define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#define PNG_USER_MEM_SUPPORTED
+*/
+
+/* This is only for PowerPC big-endian and 680x0 systems */
+/* some testing */
+/*
+#define PNG_READ_BIG_ENDIAN_SUPPORTED
+*/
+
+/* These functions are turned off by default, as they will be phased out. */
+/*
+#define PNG_USELESS_TESTS_SUPPORTED
+#define PNG_CORRECT_PALETTE_SUPPORTED
+*/
+
+/* Any chunks you are not interested in, you can undef here. The
+ * ones that allocate memory may be expecially important (hIST,
+ * tEXt, zTXt, tRNS, pCAL). Others will just save time and make png_info
+ * a bit smaller.
+ */
+
+#if !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+ !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+#if !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+ !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#ifndef PNG_NO_READ_bKGD
+#define PNG_READ_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_cHRM
+#define PNG_READ_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_gAMA
+#define PNG_READ_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_hIST
+#define PNG_READ_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_oFFs
+#define PNG_READ_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pCAL
+#define PNG_READ_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pHYs
+#define PNG_READ_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sBIT
+#define PNG_READ_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sRGB
+#define PNG_READ_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tEXt
+#define PNG_READ_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tIME
+#define PNG_READ_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tRNS
+#define PNG_READ_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_zTXt
+#define PNG_READ_zTXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_OPT_PLTE
+#define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the optional */
+#endif /* PLTE chunk in RGB and RGBA images */
+#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
+
+#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#ifndef PNG_NO_WRITE_bKGD
+#define PNG_WRITE_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_cHRM
+#define PNG_WRITE_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_gAMA
+#define PNG_WRITE_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_hIST
+#define PNG_WRITE_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_oFFs
+#define PNG_WRITE_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_pCAL
+#define PNG_WRITE_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_pHYs
+#define PNG_WRITE_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_sBIT
+#define PNG_WRITE_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_sRGB
+#define PNG_WRITE_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_tEXt
+#define PNG_WRITE_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_tIME
+#define PNG_WRITE_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_tRNS
+#define PNG_WRITE_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_WRITE_zTXt
+#define PNG_WRITE_zTXt_SUPPORTED
+#endif
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
+/* need the time information for reading tIME chunks */
+#if defined(PNG_READ_tIME_SUPPORTED) || defined(PNG_WRITE_tIME_SUPPORTED)
+#include <time.h>
+#endif
+
+/* Some typedefs to get us started. These should be safe on most of the
+ * common platforms. The typedefs should be at least as large as the
+ * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
+ * don't have to be exactly that size. Some compilers dislike passing
+ * unsigned shorts as function parameters, so you may be better off using
+ * unsigned int for png_uint_16. Likewise, for 64-bit systems, you may
+ * want to have unsigned int for png_uint_32 instead of unsigned long.
+ */
+
+typedef unsigned long png_uint_32;
+typedef long png_int_32;
+typedef unsigned short png_uint_16;
+typedef short png_int_16;
+typedef unsigned char png_byte;
+
+/* This is usually size_t. It is typedef'ed just in case you need it to
+ change (I'm not sure if you will or not, so I thought I'd be safe) */
+typedef size_t png_size_t;
+
+/* The following is needed for medium model support. It cannot be in the
+ * PNG_INTERNAL section. Needs modification for other compilers besides
+ * MSC. Model independent support declares all arrays and pointers to be
+ * large using the far keyword. The zlib version used must also support
+ * model independent data. As of version zlib 1.0.4, the necessary changes
+ * have been made in zlib. The USE_FAR_KEYWORD define triggers other
+ * changes that are needed. (Tim Wegner)
+ */
+
+/* Separate compiler dependencies (problem here is that zlib.h always
+ defines FAR. (SJT) */
+#ifdef __BORLANDC__
+#if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
+#define LDATA 1
+#else
+#define LDATA 0
+#endif
+
+#if !defined(__WIN32__) && !defined(__FLAT__)
+#define PNG_MAX_MALLOC_64K
+#if (LDATA != 1)
+#ifndef FAR
+#define FAR __far
+#endif
+#define USE_FAR_KEYWORD
+#endif /* LDATA != 1 */
+
+/* Possibly useful for moving data out of default segment.
+ * Uncomment it if you want. Could also define FARDATA as
+ * const if your compiler supports it. (SJT)
+# define FARDATA FAR
+ */
+#endif /* __WIN32__, __FLAT__ */
+
+#endif /* __BORLANDC__ */
+
+
+/* Suggest testing for specific compiler first before testing for
+ * FAR. The Watcom compiler defines both __MEDIUM__ and M_I86MM,
+ * making reliance oncertain keywords suspect. (SJT)
+ */
+
+/* MSC Medium model */
+#if defined(FAR)
+# if defined(M_I86MM)
+# define USE_FAR_KEYWORD
+# define FARDATA FAR
+# include <dos.h>
+# endif
+#endif
+
+/* SJT: default case */
+#ifndef FAR
+# define FAR
+#endif
+
+/* At this point FAR is always defined */
+#ifndef FARDATA
+#define FARDATA
+#endif
+
+/* Add typedefs for pointers */
+typedef void FAR * png_voidp;
+typedef png_byte FAR * png_bytep;
+typedef png_uint_32 FAR * png_uint_32p;
+typedef png_int_32 FAR * png_int_32p;
+typedef png_uint_16 FAR * png_uint_16p;
+typedef png_int_16 FAR * png_int_16p;
+typedef PNG_CONST char FAR * png_const_charp;
+typedef char FAR * png_charp;
+typedef double FAR * png_doublep;
+
+/* Pointers to pointers; i.e. arrays */
+typedef png_byte FAR * FAR * png_bytepp;
+typedef png_uint_32 FAR * FAR * png_uint_32pp;
+typedef png_int_32 FAR * FAR * png_int_32pp;
+typedef png_uint_16 FAR * FAR * png_uint_16pp;
+typedef png_int_16 FAR * FAR * png_int_16pp;
+typedef PNG_CONST char FAR * FAR * png_const_charpp;
+typedef char FAR * FAR * png_charpp;
+typedef double FAR * FAR * png_doublepp;
+
+/* Pointers to pointers to pointers; i.e. pointer to array */
+typedef char FAR * FAR * FAR * png_charppp;
+
+/* libpng typedefs for types in zlib. If zlib changes
+ * or another compression library is used, then change these.
+ * Eliminates need to change all the source files.
+ */
+typedef charf * png_zcharp;
+typedef charf * FAR * png_zcharpp;
+typedef z_stream FAR * png_zstreamp;
+
+/* allow for compilation as dll under MS Windows */
+#ifdef __WIN32DLL__
+#define PNG_EXPORT(type,symbol) __declspec(dllexport) type symbol
+#endif
+
+/* allow for compilation as dll with BORLAND C++ 5.0 */
+#if defined(__BORLANDC__) && defined(_Windows) && defined(__DLL__)
+# define PNG_EXPORT(type,symbol) type _export symbol
+#endif
+
+/* allow for compilation as shared lib under BeOS */
+#ifdef __BEOSDLL__
+#define PNG_EXPORT(type,symbol) __declspec(export) type symbol
+#endif
+
+#ifndef PNG_EXPORT
+#define PNG_EXPORT(type,symbol) type symbol
+#endif
+
+
+/* User may want to use these so not in PNG_INTERNAL. Any library functions
+ * that are passed far data must be model independent.
+ */
+
+#if defined(USE_FAR_KEYWORD) /* memory model independent fns */
+/* use this to make far-to-near assignments */
+# define CHECK 1
+# define NOCHECK 0
+# define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
+# define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+# define png_strcpy _fstrcpy
+# define png_strlen _fstrlen
+# define png_memcmp _fmemcmp /* SJT: added */
+# define png_memcpy _fmemcpy
+# define png_memset _fmemset
+#else /* use the usual functions */
+# define CVT_PTR(ptr) (ptr)
+# define CVT_PTR_NOCHECK(ptr) (ptr)
+# define png_strcpy strcpy
+# define png_strlen strlen
+# define png_memcmp memcmp /* SJT: added */
+# define png_memcpy memcpy
+# define png_memset memset
+#endif
+/* End of memory model independent support */
+
+/* Just a double check that someone hasn't tried to define something
+ * contradictory.
+ */
+#if (PNG_ZBUF_SIZE > 65536) && defined(PNG_MAX_MALLOC_64K)
+#undef PNG_ZBUF_SIZE
+#define PNG_ZBUF_SIZE 65536
+#endif
+
+#endif /* PNGCONF_H */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Y2KINFO
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Y2KINFO (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Y2KINFO Sat Jul 13 19:23:22 2002
@@ -0,0 +1,52 @@
+ Y2K compliance in libpng:
+ =========================
+
+ January 13, 1999
+
+ Since the PNG Development group is an ad-hoc body, we can't make
+ an official declaration.
+
+ This is your unofficial assurance that libpng from version 0.81 and
+ upward are Y2K compliant. It is my belief that earlier versions were
+ also Y2K compliant.
+
+ Libpng only has three year fields. One is a 2-byte unsigned integer
+ that will hold years up to 65535. The other two hold the date in text
+ format, and will hold years up to 9999.
+
+ The integer is
+ "png_uint_16 year" in png_time_struct.
+
+ The strings are
+ "png_charp time_buffer" in png_struct and
+ "near_time_buffer", which is a local character string in png.c.
+
+ There are seven time-related functions:
+
+ png_convert_to_rfc_1123() in png.c
+ (formerly png_convert_to_rfc_1152() in error)
+ png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ png_convert_from_time_t() in pngwrite.c
+ png_get_tIME() in pngget.c
+ png_handle_tIME() in pngrutil.c, called in pngread.c
+ png_set_tIME() in pngset.c
+ png_write_tIME() in pngwutil.c, called in pngwrite.c
+
+ All appear to handle dates properly in a Y2K environment. The
+ png_convert_from_time_t() function calls gmtime() to convert from system
+ clock time, which returns (year - 1900), which we properly convert to
+ the full 4-digit year. There is a possibility that applications using
+ libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ function, or incorrectly passing only a 2-digit year instead of
+ "year - 1900" into the png_convert_from_struct_tm() function, but this
+ is not under our control. The libpng documentation has always stated
+ that it works with 4-digit years, and the APIs have been documented as
+ such.
+
+ The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned
+ integer to hold the year, and can hold years as large as 65535.
+
+
+ Glenn Randers-Pehrson
+ libpng maintainer
+ PNG Development Group
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngpread.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngpread.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngpread.c Sat Jul 13 19:23:23 2002
@@ -0,0 +1,1141 @@
+
+/* pngpread.c - read a png file in push mode
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+
+void
+png_process_data(png_structp png_ptr, png_infop info_ptr,
+ png_bytep buffer, png_size_t buffer_size)
+{
+ png_push_restore_buffer(png_ptr, buffer, buffer_size);
+
+ while (png_ptr->buffer_size)
+ {
+ png_process_some_data(png_ptr, info_ptr);
+ }
+}
+
+/* What we do with the incoming data depends on what we were previously
+ * doing before we ran out of data...
+ */
+void
+png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+{
+ switch (png_ptr->process_mode)
+ {
+ case PNG_READ_SIG_MODE:
+ {
+ png_push_read_sig(png_ptr, info_ptr);
+ break;
+ }
+ case PNG_READ_CHUNK_MODE:
+ {
+ png_push_read_chunk(png_ptr, info_ptr);
+ break;
+ }
+ case PNG_READ_IDAT_MODE:
+ {
+ png_push_read_IDAT(png_ptr);
+ break;
+ }
+#if defined(PNG_READ_tEXt_SUPPORTED)
+ case PNG_READ_tEXt_MODE:
+ {
+ png_push_read_tEXt(png_ptr, info_ptr);
+ break;
+ }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+ case PNG_READ_zTXt_MODE:
+ {
+ png_push_read_zTXt(png_ptr, info_ptr);
+ break;
+ }
+#endif
+ case PNG_SKIP_MODE:
+ {
+ png_push_crc_finish(png_ptr);
+ break;
+ }
+ default:
+ {
+ png_ptr->buffer_size = 0;
+ break;
+ }
+ }
+}
+
+/* Read any remaining signature bytes from the stream and compare them with
+ * the correct PNG signature. It is possible that this routine is called
+ * with bytes already read from the signature, either because they have been
+ * checked by the calling application, or because of multiple calls to this
+ * routine.
+ */
+void
+png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+ png_size_t num_checked = png_ptr->sig_bytes,
+ num_to_check = 8 - num_checked;
+
+ if (png_ptr->buffer_size < num_to_check)
+ {
+ num_to_check = png_ptr->buffer_size;
+ }
+
+ png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
+ num_to_check);
+ png_ptr->sig_bytes += num_to_check;
+
+ if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+ {
+ if (num_checked < 4 &&
+ png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+ png_error(png_ptr, "Not a PNG file");
+ else
+ png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+ }
+ else
+ {
+ if (png_ptr->sig_bytes >= 8)
+ {
+ png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+ }
+ }
+}
+
+void
+png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+{
+ /* First we make sure we have enough data for the 4 byte chunk name
+ * and the 4 byte chunk length before proceeding with decoding the
+ * chunk data. To fully decode each of these chunks, we also make
+ * sure we have enough data in the buffer for the 4 byte CRC at the
+ * end of every chunk (except IDAT, which is handled separately).
+ */
+ if (!(png_ptr->flags & PNG_FLAG_HAVE_CHUNK_HEADER))
+ {
+ png_byte chunk_length[4];
+
+ if (png_ptr->buffer_size < 8)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_push_fill_buffer(png_ptr, chunk_length, 4);
+ png_ptr->push_length = png_get_uint_32(chunk_length);
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+ png_ptr->flags |= PNG_FLAG_HAVE_CHUNK_HEADER;
+ }
+
+ if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+ }
+ else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
+ }
+ else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ {
+ /* If we reach an IDAT chunk, this means we have read all of the
+ * header chunks, and we can start reading the image (or if this
+ * is called after the image has been read - we have an error).
+ */
+ if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ if (png_ptr->push_length == 0)
+ return;
+
+ if (png_ptr->mode & PNG_AFTER_IDAT)
+ png_error(png_ptr, "Too many IDAT's found");
+ }
+
+ png_ptr->idat_size = png_ptr->push_length;
+ png_ptr->mode |= PNG_HAVE_IDAT;
+ png_ptr->process_mode = PNG_READ_IDAT_MODE;
+ png_push_have_info(png_ptr, info_ptr);
+ png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+ png_ptr->zstream.next_out = png_ptr->row_buf;
+ return;
+ }
+ else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+ png_ptr->process_mode = PNG_READ_DONE_MODE;
+ png_push_have_end(png_ptr, info_ptr);
+ }
+#if defined(PNG_READ_gAMA_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_bKGD_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+ {
+ if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+ {
+ png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+ else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+ {
+ png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+ }
+#endif
+ else
+ {
+ png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+ }
+
+ png_ptr->flags &= ~PNG_FLAG_HAVE_CHUNK_HEADER;
+}
+
+void
+png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
+{
+ png_ptr->process_mode = PNG_SKIP_MODE;
+ png_ptr->skip_length = skip;
+}
+
+void
+png_push_crc_finish(png_structp png_ptr)
+{
+ if (png_ptr->skip_length && png_ptr->save_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
+ save_size = (png_size_t)png_ptr->skip_length;
+ else
+ save_size = png_ptr->save_buffer_size;
+
+ png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+ png_ptr->skip_length -= save_size;
+ png_ptr->buffer_size -= save_size;
+ png_ptr->save_buffer_size -= save_size;
+ png_ptr->save_buffer_ptr += save_size;
+ }
+ if (png_ptr->skip_length && png_ptr->current_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
+ save_size = (png_size_t)png_ptr->skip_length;
+ else
+ save_size = png_ptr->current_buffer_size;
+
+ png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+ png_ptr->skip_length -= save_size;
+ png_ptr->buffer_size -= save_size;
+ png_ptr->current_buffer_size -= save_size;
+ png_ptr->current_buffer_ptr += save_size;
+ }
+ if (!png_ptr->skip_length)
+ {
+ if (png_ptr->buffer_size < 4)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_crc_finish(png_ptr, 0);
+ png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+ }
+}
+
+void
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+ png_bytep ptr;
+
+ ptr = buffer;
+ if (png_ptr->save_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (length < png_ptr->save_buffer_size)
+ save_size = length;
+ else
+ save_size = png_ptr->save_buffer_size;
+
+ png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+ length -= save_size;
+ ptr += save_size;
+ png_ptr->buffer_size -= save_size;
+ png_ptr->save_buffer_size -= save_size;
+ png_ptr->save_buffer_ptr += save_size;
+ }
+ if (length && png_ptr->current_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (length < png_ptr->current_buffer_size)
+ save_size = length;
+ else
+ save_size = png_ptr->current_buffer_size;
+
+ png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+ png_ptr->buffer_size -= save_size;
+ png_ptr->current_buffer_size -= save_size;
+ png_ptr->current_buffer_ptr += save_size;
+ }
+}
+
+void
+png_push_save_buffer(png_structp png_ptr)
+{
+ if (png_ptr->save_buffer_size)
+ {
+ if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
+ {
+ png_size_t i,istop;
+ png_bytep sp;
+ png_bytep dp;
+
+ istop = png_ptr->save_buffer_size;
+ for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
+ i < istop; i++, sp++, dp++)
+ {
+ *dp = *sp;
+ }
+ }
+ }
+ if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
+ png_ptr->save_buffer_max)
+ {
+ png_size_t new_max;
+ png_bytep old_buffer;
+
+ new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
+ old_buffer = png_ptr->save_buffer;
+ png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)new_max);
+ png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+ png_free(png_ptr, old_buffer);
+ png_ptr->save_buffer_max = new_max;
+ }
+ if (png_ptr->current_buffer_size)
+ {
+ png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+ png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
+ png_ptr->save_buffer_size += png_ptr->current_buffer_size;
+ png_ptr->current_buffer_size = 0;
+ }
+ png_ptr->save_buffer_ptr = png_ptr->save_buffer;
+ png_ptr->buffer_size = 0;
+}
+
+void
+png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+ png_size_t buffer_length)
+{
+ png_ptr->current_buffer = buffer;
+ png_ptr->current_buffer_size = buffer_length;
+ png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
+ png_ptr->current_buffer_ptr = png_ptr->current_buffer;
+}
+
+void
+png_push_read_IDAT(png_structp png_ptr)
+{
+ if (!(png_ptr->flags & PNG_FLAG_HAVE_CHUNK_HEADER))
+ {
+ png_byte chunk_length[4];
+
+ if (png_ptr->buffer_size < 8)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_push_fill_buffer(png_ptr, chunk_length, 4);
+ png_ptr->push_length = png_get_uint_32(chunk_length);
+
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+ png_ptr->flags |= PNG_FLAG_HAVE_CHUNK_HEADER;
+
+ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ {
+ png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+ png_error(png_ptr, "Not enough compressed data");
+ return;
+ }
+
+ png_ptr->idat_size = png_ptr->push_length;
+ }
+ if (png_ptr->idat_size && png_ptr->save_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
+ {
+ save_size = (png_size_t)png_ptr->idat_size;
+ /* check for overflow */
+ if((png_uint_32)save_size != png_ptr->idat_size)
+ png_error(png_ptr, "save_size overflowed in pngpread");
+ }
+ else
+ save_size = png_ptr->save_buffer_size;
+
+ png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+ png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+ png_ptr->idat_size -= save_size;
+ png_ptr->buffer_size -= save_size;
+ png_ptr->save_buffer_size -= save_size;
+ png_ptr->save_buffer_ptr += save_size;
+ }
+ if (png_ptr->idat_size && png_ptr->current_buffer_size)
+ {
+ png_size_t save_size;
+
+ if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
+ {
+ save_size = (png_size_t)png_ptr->idat_size;
+ /* check for overflow */
+ if((png_uint_32)save_size != png_ptr->idat_size)
+ png_error(png_ptr, "save_size overflowed in pngpread");
+ }
+ else
+ save_size = png_ptr->current_buffer_size;
+
+ png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+ png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+ png_ptr->idat_size -= save_size;
+ png_ptr->buffer_size -= save_size;
+ png_ptr->current_buffer_size -= save_size;
+ png_ptr->current_buffer_ptr += save_size;
+ }
+ if (!png_ptr->idat_size)
+ {
+ if (png_ptr->buffer_size < 4)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_crc_finish(png_ptr, 0);
+ png_ptr->flags &= ~PNG_FLAG_HAVE_CHUNK_HEADER;
+ }
+}
+
+void
+png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+ png_size_t buffer_length)
+{
+ int ret;
+
+ if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
+ png_error(png_ptr, "Extra compression data");
+
+ png_ptr->zstream.next_in = buffer;
+ png_ptr->zstream.avail_in = (uInt)buffer_length;
+ for(;;)
+ {
+ ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+ if (ret == Z_STREAM_END)
+ {
+ if (png_ptr->zstream.avail_in)
+ png_error(png_ptr, "Extra compressed data");
+ if (!(png_ptr->zstream.avail_out))
+ {
+ png_push_process_row(png_ptr);
+ }
+
+ png_ptr->mode |= PNG_AFTER_IDAT;
+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+ break;
+ }
+ else if (ret == Z_BUF_ERROR)
+ break;
+ else if (ret != Z_OK)
+ png_error(png_ptr, "Decompression Error");
+ if (!(png_ptr->zstream.avail_out))
+ {
+ png_push_process_row(png_ptr);
+ png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+ png_ptr->zstream.next_out = png_ptr->row_buf;
+ }
+ else
+ break;
+ }
+}
+
+void
+png_push_process_row(png_structp png_ptr)
+{
+ png_ptr->row_info.color_type = png_ptr->color_type;
+ png_ptr->row_info.width = png_ptr->iwidth;
+ png_ptr->row_info.channels = png_ptr->channels;
+ png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+ png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+
+ png_ptr->row_info.rowbytes = ((png_ptr->row_info.width *
+ (png_uint_32)png_ptr->row_info.pixel_depth + 7) >> 3);
+
+ png_read_filter_row(png_ptr, &(png_ptr->row_info),
+ png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+ (int)(png_ptr->row_buf[0]));
+
+ png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+ png_ptr->rowbytes + 1);
+
+ if (png_ptr->transformations)
+ png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+ /* blow up interlaced rows to full size */
+ if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ {
+ if (png_ptr->pass < 6)
+ png_do_read_interlace(&(png_ptr->row_info),
+ png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+
+ switch (png_ptr->pass)
+ {
+ case 0:
+ {
+ int i;
+ for (i = 0; i < 8 && png_ptr->pass == 0; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ break;
+ }
+ case 1:
+ {
+ int i;
+ for (i = 0; i < 8 && png_ptr->pass == 1; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ if (png_ptr->pass == 2)
+ {
+ for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+ {
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ }
+ break;
+ }
+ case 2:
+ {
+ int i;
+ for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+ {
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ break;
+ }
+ case 3:
+ {
+ int i;
+ for (i = 0; i < 4 && png_ptr->pass == 3; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ if (png_ptr->pass == 4)
+ {
+ for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+ {
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ }
+ break;
+ }
+ case 4:
+ {
+ int i;
+ for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+ {
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ break;
+ }
+ case 5:
+ {
+ int i;
+ for (i = 0; i < 2 && png_ptr->pass == 5; i++)
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+ if (png_ptr->pass == 6)
+ {
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ break;
+ }
+ case 6:
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ if (png_ptr->pass != 6)
+ break;
+ png_push_have_row(png_ptr, NULL);
+ png_read_push_finish_row(png_ptr);
+ }
+ }
+ }
+ else
+#endif
+ {
+ png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+ png_read_push_finish_row(png_ptr);
+ }
+}
+
+void
+png_read_push_finish_row(png_structp png_ptr)
+{
+ png_ptr->row_number++;
+ if (png_ptr->row_number < png_ptr->num_rows)
+ return;
+
+ if (png_ptr->interlaced)
+ {
+ png_ptr->row_number = 0;
+ png_memset_check(png_ptr, png_ptr->prev_row, 0,
+ png_ptr->rowbytes + 1);
+ do
+ {
+ png_ptr->pass++;
+ if (png_ptr->pass >= 7)
+ break;
+
+ png_ptr->iwidth = (png_ptr->width +
+ png_pass_inc[png_ptr->pass] - 1 -
+ png_pass_start[png_ptr->pass]) /
+ png_pass_inc[png_ptr->pass];
+
+ png_ptr->irowbytes = ((png_ptr->iwidth *
+ png_ptr->pixel_depth + 7) >> 3) + 1;
+
+ if (png_ptr->transformations & PNG_INTERLACE)
+ break;
+
+ png_ptr->num_rows = (png_ptr->height +
+ png_pass_yinc[png_ptr->pass] - 1 -
+ png_pass_ystart[png_ptr->pass]) /
+ png_pass_yinc[png_ptr->pass];
+
+ } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
+ }
+}
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+void
+png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ if (png_ptr->mode == PNG_BEFORE_IHDR || png_ptr->mode & PNG_HAVE_IEND)
+ {
+ png_error(png_ptr, "Out of place tEXt");
+ /* to quiet some compiler warnings */
+ if(info_ptr == NULL) return;
+ }
+
+#ifdef PNG_MAX_MALLOC_64K
+ png_ptr->skip_length = 0; /* This may not be necessary */
+
+ if (length > (png_uint_32)65535L) /* Can't hold the entire string in memory */
+ {
+ png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+ png_ptr->skip_length = length - (png_uint_32)65535L;
+ length = (png_uint_32)65535L;
+ }
+#endif
+
+ png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)(length+1));
+ png_ptr->current_text[length] = '\0';
+ png_ptr->current_text_ptr = png_ptr->current_text;
+ png_ptr->current_text_size = (png_size_t)length;
+ png_ptr->current_text_left = (png_size_t)length;
+ png_ptr->process_mode = PNG_READ_tEXt_MODE;
+}
+
+void
+png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr->buffer_size && png_ptr->current_text_left)
+ {
+ png_size_t text_size;
+
+ if (png_ptr->buffer_size < png_ptr->current_text_left)
+ text_size = png_ptr->buffer_size;
+ else
+ text_size = png_ptr->current_text_left;
+ png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+ png_ptr->current_text_left -= text_size;
+ png_ptr->current_text_ptr += text_size;
+ }
+ if (!(png_ptr->current_text_left))
+ {
+ png_textp text_ptr;
+ png_charp text;
+ png_charp key;
+
+ if (png_ptr->buffer_size < 4)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+ if (png_ptr->skip_length)
+ return;
+#endif
+
+ key = png_ptr->current_text;
+ png_ptr->current_text = 0;
+
+ for (text = key; *text; text++)
+ /* empty loop */ ;
+
+ if (text != key + png_ptr->current_text_size)
+ text++;
+
+ text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
+ text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr->key = key;
+ text_ptr->text = text;
+
+ png_set_text(png_ptr, info_ptr, text_ptr, 1);
+
+ png_free(png_ptr, text_ptr);
+ }
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+void
+png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ if (png_ptr->mode == PNG_BEFORE_IHDR || png_ptr->mode & PNG_HAVE_IEND)
+ {
+ png_error(png_ptr, "Out of place zTXt");
+ /* to quiet some compiler warnings */
+ if(info_ptr == NULL) return;
+ }
+
+#ifdef PNG_MAX_MALLOC_64K
+ /* We can't handle zTXt chunks > 64K, since we don't have enough space
+ * to be able to store the uncompressed data. Actually, the threshold
+ * is probably around 32K, but it isn't as definite as 64K is.
+ */
+ if (length > (png_uint_32)65535L)
+ {
+ png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+ png_push_crc_skip(png_ptr, length);
+ return;
+ }
+#endif
+
+ png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)(length+1));
+ png_ptr->current_text[length] = '\0';
+ png_ptr->current_text_ptr = png_ptr->current_text;
+ png_ptr->current_text_size = (png_size_t)length;
+ png_ptr->current_text_left = (png_size_t)length;
+ png_ptr->process_mode = PNG_READ_zTXt_MODE;
+}
+
+void
+png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr->buffer_size && png_ptr->current_text_left)
+ {
+ png_size_t text_size;
+
+ if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
+ text_size = png_ptr->buffer_size;
+ else
+ text_size = png_ptr->current_text_left;
+ png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+ png_ptr->current_text_left -= text_size;
+ png_ptr->current_text_ptr += text_size;
+ }
+ if (!(png_ptr->current_text_left))
+ {
+ png_textp text_ptr;
+ png_charp text;
+ png_charp key;
+ int ret;
+ png_size_t text_size, key_size;
+
+ if (png_ptr->buffer_size < 4)
+ {
+ png_push_save_buffer(png_ptr);
+ return;
+ }
+
+ png_push_crc_finish(png_ptr);
+
+ key = png_ptr->current_text;
+ png_ptr->current_text = 0;
+
+ for (text = key; *text; text++)
+ /* empty loop */ ;
+
+ /* zTXt can't have zero text */
+ if (text == key + png_ptr->current_text_size)
+ {
+ png_free(png_ptr, key);
+ return;
+ }
+
+ text++;
+
+ if (*text != PNG_TEXT_COMPRESSION_zTXt) /* check compression byte */
+ {
+ png_free(png_ptr, key);
+ return;
+ }
+
+ text++;
+
+ png_ptr->zstream.next_in = (png_bytep )text;
+ png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
+ (text - key));
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+ key_size = text - key;
+ text_size = 0;
+ text = NULL;
+ ret = Z_STREAM_END;
+
+ while (png_ptr->zstream.avail_in)
+ {
+ ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+ if (ret != Z_OK && ret != Z_STREAM_END)
+ {
+ inflateReset(&png_ptr->zstream);
+ png_ptr->zstream.avail_in = 0;
+ png_free(png_ptr, key);
+ png_free(png_ptr, text);
+ return;
+ }
+ if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
+ {
+ if (text == NULL)
+ {
+ text = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out +
+ key_size + 1));
+ png_memcpy(text + key_size, png_ptr->zbuf,
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+ png_memcpy(text, key, key_size);
+ text_size = key_size + png_ptr->zbuf_size -
+ png_ptr->zstream.avail_out;
+ *(text + text_size) = '\0';
+ }
+ else
+ {
+ png_charp tmp;
+
+ tmp = text;
+ text = (png_charp)png_malloc(png_ptr, text_size +
+ (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+ + 1));
+ png_memcpy(text, tmp, text_size);
+ png_free(png_ptr, tmp);
+ png_memcpy(text + text_size, png_ptr->zbuf,
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+ text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+ *(text + text_size) = '\0';
+ }
+ if (ret != Z_STREAM_END)
+ {
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ }
+ }
+ else
+ {
+ break;
+ }
+
+ if (ret == Z_STREAM_END)
+ break;
+ }
+
+ inflateReset(&png_ptr->zstream);
+ png_ptr->zstream.avail_in = 0;
+
+ if (ret != Z_STREAM_END)
+ {
+ png_free(png_ptr, key);
+ png_free(png_ptr, text);
+ return;
+ }
+
+ png_free(png_ptr, key);
+ key = text;
+ text += key_size;
+
+ text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
+ text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
+ text_ptr->key = key;
+ text_ptr->text = text;
+
+ png_set_text(png_ptr, info_ptr, text_ptr, 1);
+
+ png_free(png_ptr, text_ptr);
+ }
+}
+#endif
+
+/* This function is called when we haven't found a handler for this
+ * chunk. In the future we will have code here that can handle
+ * user-defined callback functions for unknown chunks before they are
+ * ignored or cause an error. If there isn't a problem with the
+ * chunk itself (ie a bad chunk name or a critical chunk), the chunk
+ * is (currently) silently ignored.
+ */
+void
+png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+ if (!(png_ptr->chunk_name[0] & 0x20))
+ {
+ png_chunk_error(png_ptr, "unknown critical chunk");
+ /* to quiet some compiler warnings */
+ if(info_ptr == NULL) return;
+ }
+
+ png_push_crc_skip(png_ptr, length);
+}
+
+void
+png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr->info_fn != NULL)
+ (*(png_ptr->info_fn))(png_ptr, info_ptr);
+}
+
+void
+png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+{
+ if (png_ptr->end_fn != NULL)
+ (*(png_ptr->end_fn))(png_ptr, info_ptr);
+}
+
+void
+png_push_have_row(png_structp png_ptr, png_bytep row)
+{
+ if (png_ptr->row_fn != NULL)
+ (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
+ (int)png_ptr->pass);
+}
+
+void
+png_progressive_combine_row (png_structp png_ptr,
+ png_bytep old_row, png_bytep new_row)
+{
+ if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */
+ png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
+}
+
+void
+png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+ png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+ png_progressive_end_ptr end_fn)
+{
+ png_ptr->info_fn = info_fn;
+ png_ptr->row_fn = row_fn;
+ png_ptr->end_fn = end_fn;
+
+ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+}
+
+png_voidp
+png_get_progressive_ptr(png_structp png_ptr)
+{
+ return png_ptr->io_ptr;
+}
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngset.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngset.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngset.c Sat Jul 13 19:23:23 2002
@@ -0,0 +1,380 @@
+
+/* pngset.c - storage of image information into info struct
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * The functions here are used during reads to store data from the file
+ * into the info struct, and during writes to store application data
+ * into the info struct for writing into the file. This abstracts the
+ * info struct and allows us to change the structure in the future.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_bKGD_SUPPORTED) || defined(PNG_WRITE_bKGD_SUPPORTED)
+void
+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)
+{
+ png_debug1(1, "in %s storage function\n", "bKGD");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ png_memcpy(&(info_ptr->background), background, sizeof(png_color_16));
+ info_ptr->valid |= PNG_INFO_bKGD;
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED) || defined(PNG_WRITE_cHRM_SUPPORTED)
+void
+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+ double white_x, double white_y, double red_x, double red_y,
+ double green_x, double green_y, double blue_x, double blue_y)
+{
+ png_debug1(1, "in %s storage function\n", "cHRM");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->x_white = (float)white_x;
+ info_ptr->y_white = (float)white_y;
+ info_ptr->x_red = (float)red_x;
+ info_ptr->y_red = (float)red_y;
+ info_ptr->x_green = (float)green_x;
+ info_ptr->y_green = (float)green_y;
+ info_ptr->x_blue = (float)blue_x;
+ info_ptr->y_blue = (float)blue_y;
+ info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif
+
+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_WRITE_gAMA_SUPPORTED)
+void
+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+{
+ png_debug1(1, "in %s storage function\n", "gAMA");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->gamma = (float)file_gamma;
+ info_ptr->valid |= PNG_INFO_gAMA;
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED) || defined(PNG_WRITE_hIST_SUPPORTED)
+void
+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)
+{
+ png_debug1(1, "in %s storage function\n", "hIST");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->hist = hist;
+ info_ptr->valid |= PNG_INFO_hIST;
+}
+#endif
+
+void
+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 width, png_uint_32 height, int bit_depth,
+ int color_type, int interlace_type, int compression_type,
+ int filter_type)
+{
+ int rowbytes_per_pixel;
+ png_debug1(1, "in %s storage function\n", "IHDR");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->width = width;
+ info_ptr->height = height;
+ info_ptr->bit_depth = (png_byte)bit_depth;
+ info_ptr->color_type =(png_byte) color_type;
+ info_ptr->compression_type = (png_byte)compression_type;
+ info_ptr->filter_type = (png_byte)filter_type;
+ info_ptr->interlace_type = (png_byte)interlace_type;
+ if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ info_ptr->channels = 1;
+ else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ info_ptr->channels = 3;
+ else
+ info_ptr->channels = 1;
+ if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ info_ptr->channels++;
+ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
+
+ /* check for overflow */
+ rowbytes_per_pixel = (info_ptr->pixel_depth + 7) >> 3;
+ if (( width > (png_uint_32)2147483647L/rowbytes_per_pixel))
+ {
+ png_warning(png_ptr,
+ "Width too large to process image data; rowbytes will overflow.");
+ info_ptr->rowbytes = (png_size_t)0;
+ }
+ else
+ info_ptr->rowbytes = (info_ptr->width * info_ptr->pixel_depth + 7) >> 3;
+}
+
+#if defined(PNG_READ_oFFs_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+void
+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 offset_x, png_uint_32 offset_y, int unit_type)
+{
+ png_debug1(1, "in %s storage function\n", "oFFs");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->x_offset = offset_x;
+ info_ptr->y_offset = offset_y;
+ info_ptr->offset_unit_type = (png_byte)unit_type;
+ info_ptr->valid |= PNG_INFO_oFFs;
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED)
+void
+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+ png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+ png_charp units, png_charpp params)
+{
+ png_uint_32 length;
+ int i;
+
+ png_debug1(1, "in %s storage function\n", "pCAL");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ length = png_strlen(purpose) + 1;
+ png_debug1(3, "allocating purpose for info (%d bytes)\n", length);
+ info_ptr->pcal_purpose = (png_charp)png_malloc(png_ptr, length);
+ png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);
+
+ png_debug(3, "storing X0, X1, type, and nparams in info\n");
+ info_ptr->pcal_X0 = X0;
+ info_ptr->pcal_X1 = X1;
+ info_ptr->pcal_type = (png_byte)type;
+ info_ptr->pcal_nparams = (png_byte)nparams;
+
+ length = png_strlen(units) + 1;
+ png_debug1(3, "allocating units for info (%d bytes)\n", length);
+ info_ptr->pcal_units = (png_charp)png_malloc(png_ptr, length);
+ png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);
+
+ info_ptr->pcal_params = (png_charpp)png_malloc(png_ptr,
+ (png_uint_32)((nparams + 1) * sizeof(png_charp)));
+ info_ptr->pcal_params[nparams] = NULL;
+
+ for (i = 0; i < nparams; i++)
+ {
+ length = png_strlen(params[i]) + 1;
+ png_debug2(3, "allocating parameter %d for info (%d bytes)\n", i, length);
+ info_ptr->pcal_params[i] = (png_charp)png_malloc(png_ptr, length);
+ png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);
+ }
+
+ info_ptr->valid |= PNG_INFO_pCAL;
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED) || defined(PNG_WRITE_pHYs_SUPPORTED)
+void
+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+ png_uint_32 res_x, png_uint_32 res_y, int unit_type)
+{
+ png_debug1(1, "in %s storage function\n", "pHYs");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->x_pixels_per_unit = res_x;
+ info_ptr->y_pixels_per_unit = res_y;
+ info_ptr->phys_unit_type = (png_byte)unit_type;
+ info_ptr->valid |= PNG_INFO_pHYs;
+}
+#endif
+
+void
+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+ png_colorp palette, int num_palette)
+{
+ png_debug1(1, "in %s storage function\n", "PLTE");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->palette = palette;
+ info_ptr->num_palette = (png_uint_16)num_palette;
+ info_ptr->valid |= PNG_INFO_PLTE;
+}
+
+#if defined(PNG_READ_sBIT_SUPPORTED) || defined(PNG_WRITE_sBIT_SUPPORTED)
+void
+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+ png_color_8p sig_bit)
+{
+ png_debug1(1, "in %s storage function\n", "sBIT");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ png_memcpy(&(info_ptr->sig_bit), sig_bit, sizeof (png_color_8));
+ info_ptr->valid |= PNG_INFO_sBIT;
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED)
+void
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+{
+ png_debug1(1, "in %s storage function\n", "sRGB");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ info_ptr->srgb_intent = (png_byte)intent;
+ info_ptr->valid |= PNG_INFO_sRGB;
+}
+void
+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+ int intent)
+{
+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_WRITE_gAMA_SUPPORTED)
+ float file_gamma;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED) || defined(PNG_WRITE_cHRM_SUPPORTED)
+ float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+ png_debug1(1, "in %s storage function\n", "sRGB_gAMA_and_cHRM");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ png_set_sRGB(png_ptr, info_ptr, intent);
+
+#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_WRITE_gAMA_SUPPORTED)
+ file_gamma = (float).45;
+ png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED) || defined(PNG_WRITE_cHRM_SUPPORTED)
+ white_x = (float).3127;
+ white_y = (float).3290;
+ red_x = (float).64;
+ red_y = (float).33;
+ green_x = (float).30;
+ green_y = (float).60;
+ blue_x = (float).15;
+ blue_y = (float).06;
+
+ png_set_cHRM(png_ptr, info_ptr,
+ white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+
+#endif
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+ defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED)
+void
+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+ int num_text)
+{
+ int i;
+
+ png_debug1(1, "in %s storage function\n", (png_ptr->chunk_name[0] == '\0' ?
+ "text" : (png_const_charp)png_ptr->chunk_name));
+
+ if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+ return;
+
+ /* Make sure we have enough space in the "text" array in info_struct
+ * to hold all of the incoming text_ptr objects.
+ */
+ if (info_ptr->num_text + num_text > info_ptr->max_text)
+ {
+ if (info_ptr->text != NULL)
+ {
+ png_textp old_text;
+ int old_max;
+
+ old_max = info_ptr->max_text;
+ info_ptr->max_text = info_ptr->num_text + num_text + 8;
+ old_text = info_ptr->text;
+ info_ptr->text = (png_textp)png_malloc(png_ptr,
+ (png_uint_32)(info_ptr->max_text * sizeof (png_text)));
+ png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+ sizeof(png_text)));
+ png_free(png_ptr, old_text);
+ }
+ else
+ {
+ info_ptr->max_text = num_text + 8;
+ info_ptr->num_text = 0;
+ info_ptr->text = (png_textp)png_malloc(png_ptr,
+ (png_uint_32)(info_ptr->max_text * sizeof (png_text)));
+ }
+ png_debug1(3, "allocated %d entries for info_ptr->text\n",
+ info_ptr->max_text);
+ }
+
+ for (i = 0; i < num_text; i++)
+ {
+ png_textp textp = &(info_ptr->text[info_ptr->num_text]);
+
+ if (text_ptr[i].text == NULL)
+ text_ptr[i].text = (png_charp)"";
+
+ if (text_ptr[i].text[0] == '\0')
+ {
+ textp->text_length = 0;
+ textp->compression = PNG_TEXT_COMPRESSION_NONE;
+ }
+ else
+ {
+ textp->text_length = png_strlen(text_ptr[i].text);
+ textp->compression = text_ptr[i].compression;
+ }
+ textp->text = text_ptr[i].text;
+ textp->key = text_ptr[i].key;
+ info_ptr->num_text++;
+ png_debug1(3, "transferred text chunk %d\n", info_ptr->num_text);
+ }
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED) || defined(PNG_WRITE_tIME_SUPPORTED)
+void
+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)
+{
+ png_debug1(1, "in %s storage function\n", "tIME");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ png_memcpy(&(info_ptr->mod_time), mod_time, sizeof (png_time));
+ info_ptr->valid |= PNG_INFO_tIME;
+}
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED) || defined(PNG_WRITE_tRNS_SUPPORTED)
+void
+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+ png_bytep trans, int num_trans, png_color_16p trans_values)
+{
+ png_debug1(1, "in %s storage function\n", "tRNS");
+ if (png_ptr == NULL || info_ptr == NULL)
+ return;
+
+ if (trans != NULL)
+ {
+ info_ptr->trans = trans;
+ }
+
+ if (trans_values != NULL)
+ {
+ png_memcpy(&(info_ptr->trans_values), trans_values,
+ sizeof(png_color_16));
+ if (num_trans == 0)
+ num_trans = 1;
+ }
+ info_ptr->num_trans = (png_uint_16)num_trans;
+ info_ptr->valid |= PNG_INFO_tRNS;
+}
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwio.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwio.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwio.c Sat Jul 13 19:23:23 2002
@@ -0,0 +1,213 @@
+
+/* pngwio.c - functions for data output
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file provides a location for all output. Users who need
+ * special handling are expected to write functions that have the same
+ * arguments as these and perform similar functions, but that possibly
+ * use different output methods. Note that you shouldn't change these
+ * functions, but rather write replacement functions and then change
+ * them at run time with png_set_write_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Write the data to whatever output you are using. The default routine
+ writes to a file pointer. Note that this routine sometimes gets called
+ with very small lengths, so you should implement some kind of simple
+ buffering if you are using unbuffered writes. This should never be asked
+ to write more than 64K on a 16 bit machine. */
+
+void
+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ if (png_ptr->write_data_fn != NULL )
+ (*(png_ptr->write_data_fn))(png_ptr, data, length);
+ else
+ png_error(png_ptr, "Call to NULL write function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual writing of data. If you are
+ not writing to a standard C stream, you should create a replacement
+ write_data function and use it at run time with png_set_write_fn(), rather
+ than changing the library. */
+#ifndef USE_FAR_KEYWORD
+static void
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_uint_32 check;
+
+ check = fwrite(data, 1, length, (FILE *)(png_ptr->io_ptr));
+ if (check != length)
+ {
+ png_error(png_ptr, "Write Error");
+ }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+ can't handle far buffers in the medium and small models, we have to copy
+ the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_uint_32 check;
+ png_byte *near_data; /* Needs to be "png_byte *" instead of "png_bytep" */
+ FILE *io_ptr;
+
+ /* Check if data really is near. If so, use usual code. */
+ near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+ io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
+ if ((png_bytep)near_data == data)
+ {
+ check = fwrite(near_data, 1, length, io_ptr);
+ }
+ else
+ {
+ png_byte buf[NEAR_BUF_SIZE];
+ png_size_t written, remaining, err;
+ check = 0;
+ remaining = length;
+ do
+ {
+ written = MIN(NEAR_BUF_SIZE, remaining);
+ png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+ err = fwrite(buf, 1, written, io_ptr);
+ if (err != written)
+ break;
+ else
+ check += err;
+ data += written;
+ remaining -= written;
+ }
+ while (remaining != 0);
+ }
+ if (check != length)
+ {
+ png_error(png_ptr, "Write Error");
+ }
+}
+
+#endif
+#endif
+
+/* This function is called to output any data pending writing (normally
+ to disk). After png_flush is called, there should be no data pending
+ writing in any buffers. */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+void
+png_flush(png_structp png_ptr)
+{
+ if (png_ptr->output_flush_fn != NULL)
+ (*(png_ptr->output_flush_fn))(png_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+static void
+png_default_flush(png_structp png_ptr)
+{
+ FILE *io_ptr;
+ io_ptr = (FILE *)CVT_PTR((png_ptr->io_ptr));
+ if (io_ptr != NULL)
+ fflush(io_ptr);
+}
+#endif
+#endif
+
+/* This function allows the application to supply new output functions for
+ libpng if standard C streams aren't being used.
+
+ This function takes as its arguments:
+ png_ptr - pointer to a png output data structure
+ io_ptr - pointer to user supplied structure containing info about
+ the output functions. May be NULL.
+ write_data_fn - pointer to a new output function that takes as its
+ arguments a pointer to a png_struct, a pointer to
+ data to be written, and a 32-bit unsigned int that is
+ the number of bytes to be written. The new write
+ function should call png_error(png_ptr, "Error msg")
+ to exit and output any fatal error messages.
+ flush_data_fn - pointer to a new flush function that takes as its
+ arguments a pointer to a png_struct. After a call to
+ the flush function, there should be no data in any buffers
+ or pending transmission. If the output method doesn't do
+ any buffering of ouput, a function prototype must still be
+ supplied although it doesn't have to do anything. If
+ PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
+ time, output_flush_fn will be ignored, although it must be
+ supplied for compatibility. */
+void
+png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+ png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
+{
+ png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+ if (write_data_fn != NULL)
+ png_ptr->write_data_fn = write_data_fn;
+ else
+ png_ptr->write_data_fn = png_default_write_data;
+#else
+ png_ptr->write_data_fn = write_data_fn;
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+ if (output_flush_fn != NULL)
+ png_ptr->output_flush_fn = output_flush_fn;
+ else
+ png_ptr->output_flush_fn = png_default_flush;
+#else
+ png_ptr->output_flush_fn = output_flush_fn;
+#endif
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+ /* It is an error to read while writing a png file */
+ if (png_ptr->read_data_fn != NULL)
+ {
+ png_ptr->read_data_fn = NULL;
+ png_warning(png_ptr,
+ "Attempted to set both read_data_fn and write_data_fn in");
+ png_warning(png_ptr,
+ "the same structure. Resetting read_data_fn to NULL.");
+ }
+}
+
+#if defined(USE_FAR_KEYWORD)
+#if defined(_MSC_VER)
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+ void *near_ptr;
+ void FAR *far_ptr;
+ FP_OFF(near_ptr) = FP_OFF(ptr);
+ far_ptr = (void FAR *)near_ptr;
+ if(check != 0)
+ if(FP_SEG(ptr) != FP_SEG(far_ptr))
+ png_error(png_ptr,"segment lost in conversion");
+ return(near_ptr);
+}
+# else
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+ void *near_ptr;
+ void FAR *far_ptr;
+ near_ptr = (void FAR *)ptr;
+ far_ptr = (void FAR *)near_ptr;
+ if(check != 0)
+ if(far_ptr != ptr)
+ png_error(png_ptr,"segment lost in conversion");
+ return(near_ptr);
+}
+# endif
+# endif
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrutil.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrutil.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrutil.c Sat Jul 13 19:23:24 2002
@@ -0,0 +1,2272 @@
+
+/* pngrutil.c - utilities to read a PNG file
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file contains routines that are only called from within
+ * libpng itself during the course of reading an image.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32
+png_get_uint_32(png_bytep buf)
+{
+ png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+ ((png_uint_32)(*(buf + 1)) << 16) +
+ ((png_uint_32)(*(buf + 2)) << 8) +
+ (png_uint_32)(*(buf + 3));
+
+ return (i);
+}
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+/* Grab a signed 32-bit integer from a buffer in big-endian format. The
+ * data is stored in the PNG file in two's complement format, and it is
+ * assumed that the machine format for signed integers is the same. */
+png_int_32
+png_get_int_32(png_bytep buf)
+{
+ png_int_32 i = ((png_int_32)(*buf) << 24) +
+ ((png_int_32)(*(buf + 1)) << 16) +
+ ((png_int_32)(*(buf + 2)) << 8) +
+ (png_int_32)(*(buf + 3));
+
+ return (i);
+}
+#endif /* PNG_READ_pCAL_SUPPORTED */
+
+/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
+png_uint_16
+png_get_uint_16(png_bytep buf)
+{
+ png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
+ (png_uint_16)(*(buf + 1)));
+
+ return (i);
+}
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Read data, and (optionally) run it through the CRC. */
+void
+png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+{
+ png_read_data(png_ptr, buf, length);
+ png_calculate_crc(png_ptr, buf, length);
+}
+
+/* Optionally skip data and then check the CRC. Depending on whether we
+ are reading a ancillary or critical chunk, and how the program has set
+ things up, we may calculate the CRC on the data and print a message.
+ Returns '1' if there was a CRC error, '0' otherwise. */
+int
+png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+{
+ png_size_t i;
+ png_size_t istop = png_ptr->zbuf_size;
+
+ for (i = (png_size_t)skip; i > istop; i -= istop)
+ {
+ png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+ }
+ if (i)
+ {
+ png_crc_read(png_ptr, png_ptr->zbuf, i);
+ }
+
+ if (png_crc_error(png_ptr))
+ {
+ if ((png_ptr->chunk_name[0] & 0x20 && /* Ancillary */
+ !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
+ (!(png_ptr->chunk_name[0] & 0x20) && /* Critical */
+ png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
+ {
+ png_chunk_warning(png_ptr, "CRC error");
+ }
+ else
+ {
+ png_chunk_error(png_ptr, "CRC error");
+ }
+ return (1);
+ }
+
+ return (0);
+}
+
+/* Compare the CRC stored in the PNG file with that calculated by libpng from
+ the data it has read thus far. */
+int
+png_crc_error(png_structp png_ptr)
+{
+ png_byte crc_bytes[4];
+ png_uint_32 crc;
+ int need_crc = 1;
+
+ if (png_ptr->chunk_name[0] & 0x20) /* ancillary */
+ {
+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+ (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+ need_crc = 0;
+ }
+ else /* critical */
+ {
+ if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+ need_crc = 0;
+ }
+
+ png_read_data(png_ptr, crc_bytes, 4);
+
+ if (need_crc)
+ {
+ crc = png_get_uint_32(crc_bytes);
+ return ((int)(crc != png_ptr->crc));
+ }
+ else
+ return (0);
+}
+
+
+/* read and check the IDHR chunk */
+void
+png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_byte buf[13];
+ png_uint_32 width, height;
+ int bit_depth, color_type, compression_type, filter_type;
+ int interlace_type;
+
+ png_debug(1, "in png_handle_IHDR\n");
+
+ if (png_ptr->mode != PNG_BEFORE_IHDR)
+ png_error(png_ptr, "Out of place IHDR");
+
+ /* check the length */
+ if (length != 13)
+ png_error(png_ptr, "Invalid IHDR chunk");
+
+ png_ptr->mode |= PNG_HAVE_IHDR;
+
+ png_crc_read(png_ptr, buf, 13);
+ png_crc_finish(png_ptr, 0);
+
+ width = png_get_uint_32(buf);
+ height = png_get_uint_32(buf + 4);
+ bit_depth = buf[8];
+ color_type = buf[9];
+ compression_type = buf[10];
+ filter_type = buf[11];
+ interlace_type = buf[12];
+
+ /* check for width and height valid values */
+ if (width == 0 || width > (png_uint_32)2147483647L || height == 0 ||
+ height > (png_uint_32)2147483647L)
+ png_error(png_ptr, "Invalid image size in IHDR");
+
+ /* check other values */
+ if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
+ bit_depth != 8 && bit_depth != 16)
+ png_error(png_ptr, "Invalid bit depth in IHDR");
+
+ if (color_type < 0 || color_type == 1 ||
+ color_type == 5 || color_type > 6)
+ png_error(png_ptr, "Invalid color type in IHDR");
+
+ if ((color_type == PNG_COLOR_TYPE_PALETTE && bit_depth) > 8 ||
+ ((color_type == PNG_COLOR_TYPE_RGB ||
+ color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+ color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
+ png_error(png_ptr, "Invalid color type/bit depth combination in IHDR");
+
+ if (interlace_type >= PNG_INTERLACE_LAST)
+ png_error(png_ptr, "Unknown interlace method in IHDR");
+
+ if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+ png_error(png_ptr, "Unknown compression method in IHDR");
+
+ if (filter_type != PNG_FILTER_TYPE_BASE)
+ png_error(png_ptr, "Unknown filter method in IHDR");
+
+ /* set internal variables */
+ png_ptr->width = width;
+ png_ptr->height = height;
+ png_ptr->bit_depth = (png_byte)bit_depth;
+ png_ptr->interlaced = (png_byte)interlace_type;
+ png_ptr->color_type = (png_byte)color_type;
+
+ /* find number of channels */
+ switch (png_ptr->color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
+ case PNG_COLOR_TYPE_PALETTE:
+ png_ptr->channels = 1;
+ break;
+ case PNG_COLOR_TYPE_RGB:
+ png_ptr->channels = 3;
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ png_ptr->channels = 2;
+ break;
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+ png_ptr->channels = 4;
+ break;
+ }
+
+ /* set up other useful info */
+ png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
+ png_ptr->channels);
+ png_ptr->rowbytes = ((png_ptr->width *
+ (png_uint_32)png_ptr->pixel_depth + 7) >> 3);
+ png_debug1(3,"bit_depth = %d\n", png_ptr->bit_depth);
+ png_debug1(3,"channels = %d\n", png_ptr->channels);
+ png_debug1(3,"rowbytes = %d\n", png_ptr->rowbytes);
+ png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
+ color_type, interlace_type, compression_type, filter_type);
+}
+
+/* read and check the palette */
+void
+png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_colorp palette;
+ int num, i;
+
+ png_debug(1, "in png_handle_PLTE\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before PLTE");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid PLTE after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->mode & PNG_HAVE_PLTE)
+ png_error(png_ptr, "Duplicate PLTE chunk");
+
+ png_ptr->mode |= PNG_HAVE_PLTE;
+
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+ if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+ {
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+#endif
+
+ if (length % 3)
+ {
+ if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+ {
+ png_warning(png_ptr, "Invalid palette chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else
+ {
+ png_error(png_ptr, "Invalid palette chunk");
+ }
+ }
+
+ num = (int)length / 3;
+ palette = (png_colorp)png_zalloc(png_ptr, (uInt)num, sizeof (png_color));
+ png_ptr->flags |= PNG_FLAG_FREE_PALETTE;
+ for (i = 0; i < num; i++)
+ {
+ png_byte buf[3];
+
+ png_crc_read(png_ptr, buf, 3);
+ /* don't depend upon png_color being any order */
+ palette[i].red = buf[0];
+ palette[i].green = buf[1];
+ palette[i].blue = buf[2];
+ }
+
+ /* If we actually NEED the PLTE chunk (ie for a paletted image), we do
+ whatever the normal CRC configuration tells us. However, if we
+ have an RGB image, the PLTE can be considered ancillary, so
+ we will act as though it is. */
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#endif
+ {
+ png_crc_finish(png_ptr, 0);
+ }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+ else if (png_crc_error(png_ptr)) /* Only if we have a CRC error */
+ {
+ /* If we don't want to use the data from an ancillary chunk,
+ we have two options: an error abort, or a warning and we
+ ignore the data in this chunk (which should be OK, since
+ it's considered ancillary for a RGB or RGBA image). */
+ if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+ {
+ if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+ {
+ png_chunk_error(png_ptr, "CRC error");
+ }
+ else
+ {
+ png_chunk_warning(png_ptr, "CRC error");
+ png_ptr->flags &= ~PNG_FLAG_FREE_PALETTE;
+ png_zfree(png_ptr, palette);
+ return;
+ }
+ }
+ /* Otherwise, we (optionally) emit a warning and use the chunk. */
+ else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+ {
+ png_chunk_warning(png_ptr, "CRC error");
+ }
+ }
+#endif
+ png_ptr->palette = palette;
+ png_ptr->num_palette = (png_uint_16)num;
+ png_set_PLTE(png_ptr, info_ptr, palette, num);
+
+#if defined (PNG_READ_tRNS_SUPPORTED)
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (info_ptr != NULL && info_ptr->valid & PNG_INFO_tRNS)
+ {
+ if (png_ptr->num_trans > png_ptr->num_palette)
+ {
+ png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
+ png_ptr->num_trans = png_ptr->num_palette;
+ }
+ }
+ }
+#endif
+
+}
+
+void
+png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_debug(1, "in png_handle_IEND\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+ {
+ png_error(png_ptr, "No image in file");
+
+ /* to quiet compiler warnings about unused info_ptr */
+ if (info_ptr == NULL)
+ return;
+ }
+
+ png_ptr->mode |= PNG_AFTER_IDAT | PNG_HAVE_IEND;
+
+ if (length != 0)
+ {
+ png_warning(png_ptr, "Incorrect IEND chunk length");
+ }
+ png_crc_finish(png_ptr, length);
+}
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+void
+png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_uint_32 igamma;
+ float file_gamma;
+ png_byte buf[4];
+
+ png_debug(1, "in png_handle_gAMA\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before gAMA");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid gAMA after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->mode & PNG_HAVE_PLTE)
+ /* Should be an error, but we can cope with it */
+ png_warning(png_ptr, "Out of place gAMA chunk");
+
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_gAMA
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+ )
+ {
+ png_warning(png_ptr, "Duplicate gAMA chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != 4)
+ {
+ png_warning(png_ptr, "Incorrect gAMA chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 4);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ igamma = png_get_uint_32(buf);
+ /* check for zero gamma */
+ if (igamma == 0)
+ return;
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_sRGB)
+ if(igamma != (png_uint_32)45000L)
+ {
+ png_warning(png_ptr,
+ "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+ fprintf(stderr, "igamma = %lu\n", igamma);
+#endif
+ return;
+ }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+ file_gamma = (float)igamma / (float)100000.0;
+#ifdef PNG_READ_GAMMA_SUPPORTED
+ png_ptr->gamma = file_gamma;
+#endif
+ png_set_gAMA(png_ptr, info_ptr, file_gamma);
+}
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+void
+png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_size_t truelen;
+ png_byte buf[4];
+
+ png_debug(1, "in png_handle_sBIT\n");
+
+ buf[0] = buf[1] = buf[2] = buf[3] = 0;
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before sBIT");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid sBIT after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->mode & PNG_HAVE_PLTE)
+ {
+ /* Should be an error, but we can cope with it */
+ png_warning(png_ptr, "Out of place sBIT chunk");
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_sBIT)
+ {
+ png_warning(png_ptr, "Duplicate sBIT chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ truelen = 3;
+ else
+ truelen = (png_size_t)png_ptr->channels;
+
+ if (length != truelen)
+ {
+ png_warning(png_ptr, "Incorrect sBIT chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, truelen);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ {
+ png_ptr->sig_bit.red = buf[0];
+ png_ptr->sig_bit.green = buf[1];
+ png_ptr->sig_bit.blue = buf[2];
+ png_ptr->sig_bit.alpha = buf[3];
+ }
+ else
+ {
+ png_ptr->sig_bit.gray = buf[0];
+ png_ptr->sig_bit.red = buf[0];
+ png_ptr->sig_bit.green = buf[0];
+ png_ptr->sig_bit.blue = buf[0];
+ png_ptr->sig_bit.alpha = buf[1];
+ }
+ png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+void
+png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_byte buf[4];
+ png_uint_32 val;
+ float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+
+ png_debug(1, "in png_handle_cHRM\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before sBIT");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid cHRM after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->mode & PNG_HAVE_PLTE)
+ /* Should be an error, but we can cope with it */
+ png_warning(png_ptr, "Missing PLTE before cHRM");
+
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_cHRM
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+ )
+ {
+ png_warning(png_ptr, "Duplicate cHRM chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != 32)
+ {
+ png_warning(png_ptr, "Incorrect cHRM chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ white_x = (float)val / (float)100000.0;
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ white_y = (float)val / (float)100000.0;
+
+ if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 ||
+ white_x + white_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM white point");
+ png_crc_finish(png_ptr, 24);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ red_x = (float)val / (float)100000.0;
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ red_y = (float)val / (float)100000.0;
+
+ if (red_x < 0 || red_x > 0.8 || red_y < 0 || red_y > 0.8 ||
+ red_x + red_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM red point");
+ png_crc_finish(png_ptr, 16);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ green_x = (float)val / (float)100000.0;
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ green_y = (float)val / (float)100000.0;
+
+ if (green_x < 0 || green_x > 0.8 || green_y < 0 || green_y > 0.8 ||
+ green_x + green_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM green point");
+ png_crc_finish(png_ptr, 8);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ blue_x = (float)val / (float)100000.0;
+
+ png_crc_read(png_ptr, buf, 4);
+ val = png_get_uint_32(buf);
+ blue_y = (float)val / (float)100000.0;
+
+ if (blue_x < (float)0 || blue_x > (float)0.8 || blue_y < (float)0 ||
+ blue_y > (float)0.8 || blue_x + blue_y > (float)1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM blue point");
+ png_crc_finish(png_ptr, 0);
+ return;
+ }
+
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+ if (info_ptr->valid & PNG_INFO_sRGB)
+ {
+ if (fabs(white_x - (float).3127) > (float).001 ||
+ fabs(white_y - (float).3290) > (float).001 ||
+ fabs( red_x - (float).6400) > (float).001 ||
+ fabs( red_y - (float).3300) > (float).001 ||
+ fabs(green_x - (float).3000) > (float).001 ||
+ fabs(green_y - (float).6000) > (float).001 ||
+ fabs( blue_x - (float).1500) > (float).001 ||
+ fabs( blue_y - (float).0600) > (float).001)
+ {
+
+ png_warning(png_ptr,
+ "Ignoring incorrect cHRM value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+ fprintf(stderr,"wx=%f, wy=%f, rx=%f, ry=%f\n",
+ white_x, white_y, red_x, red_y);
+ fprintf(stderr,"gx=%f, gy=%f, bx=%f, by=%f\n",
+ green_x, green_y, blue_x, blue_y);
+#endif
+ }
+ return;
+ }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+ png_set_cHRM(png_ptr, info_ptr,
+ white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+void
+png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ int intent;
+ png_byte buf[1];
+
+ png_debug(1, "in png_handle_sRGB\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before sRGB");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid sRGB after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->mode & PNG_HAVE_PLTE)
+ /* Should be an error, but we can cope with it */
+ png_warning(png_ptr, "Out of place sRGB chunk");
+
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_sRGB)
+ {
+ png_warning(png_ptr, "Duplicate sRGB chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != 1)
+ {
+ png_warning(png_ptr, "Incorrect sRGB chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 1);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ intent = buf[0];
+ /* check for bad intent */
+ if (intent >= PNG_sRGB_INTENT_LAST)
+ {
+ png_warning(png_ptr, "Unknown sRGB intent");
+ return;
+ }
+
+#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+ if ((info_ptr->valid & PNG_INFO_gAMA))
+ if((png_uint_32)(png_ptr->gamma*(float)100000.+.5) != (png_uint_32)45000L)
+ {
+ png_warning(png_ptr,
+ "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+ fprintf(stderr,"gamma=%f\n",png_ptr->gamma);
+#endif
+ }
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+ if (info_ptr->valid & PNG_INFO_cHRM)
+ if (fabs(info_ptr->x_white - (float).3127) > (float).001 ||
+ fabs(info_ptr->y_white - (float).3290) > (float).001 ||
+ fabs( info_ptr->x_red - (float).6400) > (float).001 ||
+ fabs( info_ptr->y_red - (float).3300) > (float).001 ||
+ fabs(info_ptr->x_green - (float).3000) > (float).001 ||
+ fabs(info_ptr->y_green - (float).6000) > (float).001 ||
+ fabs( info_ptr->x_blue - (float).1500) > (float).001 ||
+ fabs( info_ptr->y_blue - (float).0600) > (float).001)
+ {
+ png_warning(png_ptr,
+ "Ignoring incorrect cHRM value when sRGB is also present");
+ }
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+ png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+}
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+void
+png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_debug(1, "in png_handle_tRNS\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before tRNS");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid tRNS after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_tRNS)
+ {
+ png_warning(png_ptr, "Duplicate tRNS chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (!(png_ptr->mode & PNG_HAVE_PLTE))
+ {
+ /* Should be an error, but we can cope with it */
+ png_warning(png_ptr, "Missing PLTE before tRNS");
+ }
+ else if (length > png_ptr->num_palette)
+ {
+ png_warning(png_ptr, "Incorrect tRNS chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ if (length == 0)
+ {
+ png_warning(png_ptr, "Zero length tRNS chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_ptr->trans = (png_bytep)png_malloc(png_ptr, length);
+ png_ptr->flags |= PNG_FLAG_FREE_TRANS;
+ png_crc_read(png_ptr, png_ptr->trans, (png_size_t)length);
+ png_ptr->num_trans = (png_uint_16)length;
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ png_byte buf[6];
+
+ if (length != 6)
+ {
+ png_warning(png_ptr, "Incorrect tRNS chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, (png_size_t)length);
+ png_ptr->num_trans = 1;
+ png_ptr->trans_values.red = png_get_uint_16(buf);
+ png_ptr->trans_values.green = png_get_uint_16(buf + 2);
+ png_ptr->trans_values.blue = png_get_uint_16(buf + 4);
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ png_byte buf[6];
+
+ if (length != 2)
+ {
+ png_warning(png_ptr, "Incorrect tRNS chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 2);
+ png_ptr->num_trans = 1;
+ png_ptr->trans_values.gray = png_get_uint_16(buf);
+ }
+ else
+ {
+ png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ png_set_tRNS(png_ptr, info_ptr, png_ptr->trans, png_ptr->num_trans,
+ &(png_ptr->trans_values));
+}
+#endif
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+void
+png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_size_t truelen;
+ png_byte buf[6];
+
+ png_debug(1, "in png_handle_bKGD\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before bKGD");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid bKGD after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+ !(png_ptr->mode & PNG_HAVE_PLTE))
+ {
+ png_warning(png_ptr, "Missing PLTE before bKGD");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_bKGD)
+ {
+ png_warning(png_ptr, "Duplicate bKGD chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ truelen = 1;
+ else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ truelen = 6;
+ else
+ truelen = 2;
+
+ if (length != truelen)
+ {
+ png_warning(png_ptr, "Incorrect bKGD chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, truelen);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ /* We convert the index value into RGB components so that we can allow
+ * arbitrary RGB values for background when we have transparency, and
+ * so it is easy to determine the RGB values of the background color
+ * from the info_ptr struct. */
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_ptr->background.index = buf[0];
+ png_ptr->background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
+ png_ptr->background.green = (png_uint_16)png_ptr->palette[buf[0]].green;
+ png_ptr->background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;
+ }
+ else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+ {
+ png_ptr->background.red =
+ png_ptr->background.green =
+ png_ptr->background.blue =
+ png_ptr->background.gray = png_get_uint_16(buf);
+ }
+ else
+ {
+ png_ptr->background.red = png_get_uint_16(buf);
+ png_ptr->background.green = png_get_uint_16(buf + 2);
+ png_ptr->background.blue = png_get_uint_16(buf + 4);
+ }
+
+ png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+void
+png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ int num, i;
+
+ png_debug(1, "in png_handle_hIST\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before hIST");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid hIST after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+ {
+ png_warning(png_ptr, "Missing PLTE before hIST");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_hIST)
+ {
+ png_warning(png_ptr, "Duplicate hIST chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != (png_uint_32)(2 * png_ptr->num_palette))
+ {
+ png_warning(png_ptr, "Incorrect hIST chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ num = (int)length / 2;
+ png_ptr->hist = (png_uint_16p)png_malloc(png_ptr,
+ (png_uint_32)(num * sizeof (png_uint_16)));
+ png_ptr->flags |= PNG_FLAG_FREE_HIST;
+ for (i = 0; i < num; i++)
+ {
+ png_byte buf[2];
+
+ png_crc_read(png_ptr, buf, 2);
+ png_ptr->hist[i] = png_get_uint_16(buf);
+ }
+
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ png_set_hIST(png_ptr, info_ptr, png_ptr->hist);
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+void
+png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_byte buf[9];
+ png_uint_32 res_x, res_y;
+ int unit_type;
+
+ png_debug(1, "in png_handle_pHYs\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before pHYS");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid pHYS after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_pHYs)
+ {
+ png_warning(png_ptr, "Duplicate pHYS chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != 9)
+ {
+ png_warning(png_ptr, "Incorrect pHYs chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 9);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ res_x = png_get_uint_32(buf);
+ res_y = png_get_uint_32(buf + 4);
+ unit_type = buf[8];
+ png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+void
+png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_byte buf[9];
+ png_uint_32 offset_x, offset_y;
+ int unit_type;
+
+ png_debug(1, "in png_handle_oFFs\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before oFFs");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid oFFs after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_oFFs)
+ {
+ png_warning(png_ptr, "Duplicate oFFs chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (length != 9)
+ {
+ png_warning(png_ptr, "Incorrect oFFs chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 9);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ offset_x = png_get_uint_32(buf);
+ offset_y = png_get_uint_32(buf + 4);
+ unit_type = buf[8];
+ png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+/* read the pCAL chunk (png-scivis-19970203) */
+void
+png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_charp purpose;
+ png_int_32 X0, X1;
+ png_byte type, nparams;
+ png_charp buf, units, endptr;
+ png_charpp params;
+ png_size_t slength;
+ int i;
+
+ png_debug(1, "in png_handle_pCAL\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before pCAL");
+ else if (png_ptr->mode & PNG_HAVE_IDAT)
+ {
+ png_warning(png_ptr, "Invalid pCAL after IDAT");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_pCAL)
+ {
+ png_warning(png_ptr, "Duplicate pCAL chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_debug1(2, "Allocating and reading pCAL chunk data (%d bytes)\n",
+ length + 1);
+ purpose = (png_charp)png_malloc(png_ptr, length + 1);
+ slength = (png_size_t)length;
+ png_crc_read(png_ptr, (png_bytep)purpose, slength);
+
+ if (png_crc_finish(png_ptr, 0))
+ {
+ png_free(png_ptr, purpose);
+ return;
+ }
+
+ purpose[slength] = 0x00; /* null terminate the last string */
+
+ png_debug(3, "Finding end of pCAL purpose string\n");
+ for (buf = purpose; *buf; buf++)
+ /* empty loop */ ;
+
+ endptr = purpose + slength;
+
+ /* We need to have at least 12 bytes after the purpose string
+ in order to get the parameter information. */
+ if (endptr <= buf + 12)
+ {
+ png_warning(png_ptr, "Invalid pCAL data");
+ png_free(png_ptr, purpose);
+ return;
+ }
+
+ png_debug(3, "Reading pCAL X0, X1, type, nparams, and units\n");
+ X0 = png_get_int_32((png_bytep)buf+1);
+ X1 = png_get_int_32((png_bytep)buf+5);
+ type = buf[9];
+ nparams = buf[10];
+ units = buf + 11;
+
+ png_debug(3, "Checking pCAL equation type and number of parameters\n");
+ /* Check that we have the right number of parameters for known
+ equation types. */
+ if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+ (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+ (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+ (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
+ {
+ png_warning(png_ptr, "Invalid pCAL parameters for equation type");
+ png_free(png_ptr, purpose);
+ return;
+ }
+ else if (type >= PNG_EQUATION_LAST)
+ {
+ png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+ }
+
+ for (buf = units; *buf; buf++)
+ /* Empty loop to move past the units string. */ ;
+
+ png_debug(3, "Allocating pCAL parameters array\n");
+ params = (png_charpp)png_malloc(png_ptr, (png_uint_32)(nparams
+ *sizeof(png_charp))) ;
+
+ /* Get pointers to the start of each parameter string. */
+ for (i = 0; i < (int)nparams; i++)
+ {
+ buf++; /* Skip the null string terminator from previous parameter. */
+
+ png_debug1(3, "Reading pCAL parameter %d\n", i);
+ for (params[i] = buf; *buf != 0x00 && buf <= endptr; buf++)
+ /* Empty loop to move past each parameter string */ ;
+
+ /* Make sure we haven't run out of data yet */
+ if (buf > endptr)
+ {
+ png_warning(png_ptr, "Invalid pCAL data");
+ png_free(png_ptr, purpose);
+ png_free(png_ptr, params);
+ return;
+ }
+ }
+
+ png_set_pCAL(png_ptr, info_ptr, purpose, X0, X1, type, nparams,
+ units, params);
+
+ png_free(png_ptr, purpose);
+ png_free(png_ptr, params);
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+void
+png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_byte buf[7];
+ png_time mod_time;
+
+ png_debug(1, "in png_handle_tIME\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Out of place tIME chunk");
+ else if (info_ptr != NULL && info_ptr->valid & PNG_INFO_tIME)
+ {
+ png_warning(png_ptr, "Duplicate tIME chunk");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ if (png_ptr->mode & PNG_HAVE_IDAT)
+ png_ptr->mode |= PNG_AFTER_IDAT;
+
+ if (length != 7)
+ {
+ png_warning(png_ptr, "Incorrect tIME chunk length");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+
+ png_crc_read(png_ptr, buf, 7);
+ if (png_crc_finish(png_ptr, 0))
+ return;
+
+ mod_time.second = buf[6];
+ mod_time.minute = buf[5];
+ mod_time.hour = buf[4];
+ mod_time.day = buf[3];
+ mod_time.month = buf[2];
+ mod_time.year = png_get_uint_16(buf);
+
+ png_set_tIME(png_ptr, info_ptr, &mod_time);
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+void
+png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_textp text_ptr;
+ png_charp key;
+ png_charp text;
+ png_uint_32 skip = 0;
+ png_size_t slength;
+
+ png_debug(1, "in png_handle_tEXt\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before tEXt");
+
+ if (png_ptr->mode & PNG_HAVE_IDAT)
+ png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+ if (length > (png_uint_32)65535L)
+ {
+ png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+ skip = length - (png_uint_32)65535L;
+ length = (png_uint_32)65535L;
+ }
+#endif
+
+ key = (png_charp)png_malloc(png_ptr, length + 1);
+ slength = (png_size_t)length;
+ png_crc_read(png_ptr, (png_bytep)key, slength);
+
+ if (png_crc_finish(png_ptr, skip))
+ {
+ png_free(png_ptr, key);
+ return;
+ }
+
+ key[slength] = 0x00;
+
+ for (text = key; *text; text++)
+ /* empty loop to find end of key */ ;
+
+ if (text != key + slength)
+ text++;
+
+ text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
+ text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr->key = key;
+ text_ptr->text = text;
+
+ png_set_text(png_ptr, info_ptr, text_ptr, 1);
+
+ png_free(png_ptr, text_ptr);
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void
+png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ static char msg[] = "Error decoding zTXt chunk";
+ png_textp text_ptr;
+ png_charp key;
+ png_charp text;
+ int comp_type = PNG_TEXT_COMPRESSION_NONE;
+ png_size_t slength;
+
+ png_debug(1, "in png_handle_zTXt\n");
+
+ if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ png_error(png_ptr, "Missing IHDR before zTXt");
+
+ if (png_ptr->mode & PNG_HAVE_IDAT)
+ png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+ /* We will no doubt have problems with chunks even half this size, but
+ there is no hard and fast rule to tell us where to stop. */
+ if (length > (png_uint_32)65535L)
+ {
+ png_warning(png_ptr,"zTXt chunk too large to fit in memory");
+ png_crc_finish(png_ptr, length);
+ return;
+ }
+#endif
+
+ key = (png_charp)png_malloc(png_ptr, length + 1);
+ slength = (png_size_t)length;
+ png_crc_read(png_ptr, (png_bytep)key, slength);
+ if (png_crc_finish(png_ptr, 0))
+ {
+ png_free(png_ptr, key);
+ return;
+ }
+
+ key[slength] = 0x00;
+
+ for (text = key; *text; text++)
+ /* empty loop */ ;
+
+ /* zTXt must have some text after the keyword */
+ if (text == key + slength)
+ {
+ png_warning(png_ptr, "Zero length zTXt chunk");
+ }
+ else if ((comp_type = *(++text)) == PNG_TEXT_COMPRESSION_zTXt)
+ {
+ png_size_t text_size, key_size;
+ text++;
+
+ png_ptr->zstream.next_in = (png_bytep)text;
+ png_ptr->zstream.avail_in = (uInt)(length - (text - key));
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+ key_size = (png_size_t)(text - key);
+ text_size = 0;
+ text = NULL;
+
+ while (png_ptr->zstream.avail_in)
+ {
+ int ret;
+
+ ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+ if (ret != Z_OK && ret != Z_STREAM_END)
+ {
+ if (png_ptr->zstream.msg != NULL)
+ png_warning(png_ptr, png_ptr->zstream.msg);
+ else
+ png_warning(png_ptr, msg);
+ inflateReset(&png_ptr->zstream);
+ png_ptr->zstream.avail_in = 0;
+
+ if (text == NULL)
+ {
+ text_size = key_size + sizeof(msg) + 1;
+ text = (png_charp)png_malloc(png_ptr, (png_uint_32)text_size);
+ png_memcpy(text, key, key_size);
+ }
+
+ text[text_size - 1] = 0x00;
+
+ /* Copy what we can of the error message into the text chunk */
+ text_size = (png_size_t)(slength - (text - key) - 1);
+ text_size = sizeof(msg) > text_size ? text_size : sizeof(msg);
+ png_memcpy(text + key_size, msg, text_size + 1);
+ break;
+ }
+ if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
+ {
+ if (text == NULL)
+ {
+ text = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+ + key_size + 1));
+ png_memcpy(text + key_size, png_ptr->zbuf,
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+ png_memcpy(text, key, key_size);
+ text_size = key_size + png_ptr->zbuf_size -
+ png_ptr->zstream.avail_out;
+ *(text + text_size) = 0x00;
+ }
+ else
+ {
+ png_charp tmp;
+
+ tmp = text;
+ text = (png_charp)png_malloc(png_ptr, (png_uint_32)(text_size +
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
+ png_memcpy(text, tmp, text_size);
+ png_free(png_ptr, tmp);
+ png_memcpy(text + text_size, png_ptr->zbuf,
+ (png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+ text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+ *(text + text_size) = 0x00;
+ }
+ if (ret != Z_STREAM_END)
+ {
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ inflateReset(&png_ptr->zstream);
+ png_ptr->zstream.avail_in = 0;
+
+ png_free(png_ptr, key);
+ key = text;
+ text += key_size;
+ }
+ else /* if (comp_type >= PNG_TEXT_COMPRESSION_LAST) */
+ {
+ png_size_t text_size;
+#if !defined(PNG_NO_STDIO)
+ char umsg[50];
+
+ sprintf(umsg, "Unknown zTXt compression type %d", comp_type);
+ png_warning(png_ptr, umsg);
+#else
+ png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+
+ /* Copy what we can of the error message into the text chunk */
+ text_size = (png_size_t)(slength - (text - key) - 1);
+ text_size = sizeof(msg) > text_size ? text_size : sizeof(msg);
+ png_memcpy(text, msg, text_size + 1);
+ }
+
+ text_ptr = (png_textp)png_malloc(png_ptr, (png_uint_32)sizeof(png_text));
+ text_ptr->compression = comp_type;
+ text_ptr->key = key;
+ text_ptr->text = text;
+
+ png_set_text(png_ptr, info_ptr, text_ptr, 1);
+
+ png_free(png_ptr, text_ptr);
+}
+#endif
+
+/* This function is called when we haven't found a handler for a
+ chunk. If there isn't a problem with the chunk itself (ie bad
+ chunk name, CRC, or a critical chunk), the chunk is silently ignored. */
+void
+png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+ png_debug(1, "in png_handle_unknown\n");
+
+ /* In the future we can have code here that calls user-supplied
+ * callback functions for unknown chunks before they are ignored or
+ * cause an error.
+ */
+ png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+ if (!(png_ptr->chunk_name[0] & 0x20))
+ {
+ png_chunk_error(png_ptr, "unknown critical chunk");
+
+ /* to quiet compiler warnings about unused info_ptr */
+ if (info_ptr == NULL)
+ return;
+ }
+
+ if (png_ptr->mode & PNG_HAVE_IDAT)
+ png_ptr->mode |= PNG_AFTER_IDAT;
+
+ png_crc_finish(png_ptr, length);
+
+}
+
+/* This function is called to verify that a chunk name is valid.
+ This function can't have the "critical chunk check" incorporated
+ into it, since in the future we will need to be able to call user
+ functions to handle unknown critical chunks after we check that
+ the chunk name itself is valid. */
+
+#define isnonalpha(c) ((c) < 41 || (c) > 122 || ((c) > 90 && (c) < 97))
+
+void
+png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
+{
+ png_debug(1, "in png_check_chunk_name\n");
+ if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
+ isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
+ {
+ png_chunk_error(png_ptr, "invalid chunk type");
+ }
+}
+
+/* Combines the row recently read in with the existing pixels in the
+ row. This routine takes care of alpha and transparency if requested.
+ This routine also handles the two methods of progressive display
+ of interlaced images, depending on the mask value.
+ The mask value describes which pixels are to be combined with
+ the row. The pattern always repeats every 8 pixels, so just 8
+ bits are needed. A one indicates the pixel is to be combined,
+ a zero indicates the pixel is to be skipped. This is in addition
+ to any alpha or transparency value associated with the pixel. If
+ you want all pixels to be combined, pass 0xff (255) in mask. */
+void
+png_combine_row(png_structp png_ptr, png_bytep row,
+ int mask)
+{
+ png_debug(1,"in png_combine_row\n");
+ if (mask == 0xff)
+ {
+ png_memcpy(row, png_ptr->row_buf + 1,
+ (png_size_t)((png_ptr->width *
+ png_ptr->row_info.pixel_depth + 7) >> 3));
+ }
+ else
+ {
+ switch (png_ptr->row_info.pixel_depth)
+ {
+ case 1:
+ {
+ png_bytep sp = png_ptr->row_buf + 1;
+ png_bytep dp = row;
+ int s_inc, s_start, s_end;
+ int m = 0x80;
+ int shift;
+ png_uint_32 i;
+ png_uint_32 row_width = png_ptr->width;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ {
+ s_start = 0;
+ s_end = 7;
+ s_inc = 1;
+ }
+ else
+#endif
+ {
+ s_start = 7;
+ s_end = 0;
+ s_inc = -1;
+ }
+
+ shift = s_start;
+
+ for (i = 0; i < row_width; i++)
+ {
+ if (m & mask)
+ {
+ int value;
+
+ value = (*sp >> shift) & 0x1;
+ *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+ *dp |= (png_byte)(value << shift);
+ }
+
+ if (shift == s_end)
+ {
+ shift = s_start;
+ sp++;
+ dp++;
+ }
+ else
+ shift += s_inc;
+
+ if (m == 1)
+ m = 0x80;
+ else
+ m >>= 1;
+ }
+ break;
+ }
+ case 2:
+ {
+ png_bytep sp = png_ptr->row_buf + 1;
+ png_bytep dp = row;
+ int s_start, s_end, s_inc;
+ int m = 0x80;
+ int shift;
+ png_uint_32 i;
+ png_uint_32 row_width = png_ptr->width;
+ int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ {
+ s_start = 0;
+ s_end = 6;
+ s_inc = 2;
+ }
+ else
+#endif
+ {
+ s_start = 6;
+ s_end = 0;
+ s_inc = -2;
+ }
+
+ shift = s_start;
+
+ for (i = 0; i < row_width; i++)
+ {
+ if (m & mask)
+ {
+ value = (*sp >> shift) & 0x3;
+ *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+ *dp |= (png_byte)(value << shift);
+ }
+
+ if (shift == s_end)
+ {
+ shift = s_start;
+ sp++;
+ dp++;
+ }
+ else
+ shift += s_inc;
+ if (m == 1)
+ m = 0x80;
+ else
+ m >>= 1;
+ }
+ break;
+ }
+ case 4:
+ {
+ png_bytep sp = png_ptr->row_buf + 1;
+ png_bytep dp = row;
+ int s_start, s_end, s_inc;
+ int m = 0x80;
+ int shift;
+ png_uint_32 i;
+ png_uint_32 row_width = png_ptr->width;
+ int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ {
+ s_start = 0;
+ s_end = 4;
+ s_inc = 4;
+ }
+ else
+#endif
+ {
+ s_start = 4;
+ s_end = 0;
+ s_inc = -4;
+ }
+ shift = s_start;
+
+ for (i = 0; i < row_width; i++)
+ {
+ if (m & mask)
+ {
+ value = (*sp >> shift) & 0xf;
+ *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+ *dp |= (png_byte)(value << shift);
+ }
+
+ if (shift == s_end)
+ {
+ shift = s_start;
+ sp++;
+ dp++;
+ }
+ else
+ shift += s_inc;
+ if (m == 1)
+ m = 0x80;
+ else
+ m >>= 1;
+ }
+ break;
+ }
+ default:
+ {
+ png_bytep sp = png_ptr->row_buf + 1;
+ png_bytep dp = row;
+ png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+ png_uint_32 i;
+ png_uint_32 row_width = png_ptr->width;
+ png_byte m = 0x80;
+
+
+ for (i = 0; i < row_width; i++)
+ {
+ if (m & mask)
+ {
+ png_memcpy(dp, sp, pixel_bytes);
+ }
+
+ sp += pixel_bytes;
+ dp += pixel_bytes;
+
+ if (m == 1)
+ m = 0x80;
+ else
+ m >>= 1;
+ }
+ break;
+ }
+ }
+ }
+}
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+void
+png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
+ png_uint_32 transformations)
+{
+ png_debug(1,"in png_do_read_interlace\n");
+ if (row != NULL && row_info != NULL)
+ {
+ png_uint_32 final_width;
+
+ final_width = row_info->width * png_pass_inc[pass];
+
+ switch (row_info->pixel_depth)
+ {
+ case 1:
+ {
+ png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
+ png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+ int sshift, dshift;
+ int s_start, s_end, s_inc;
+ int jstop = png_pass_inc[pass];
+ png_byte v;
+ png_uint_32 i;
+ int j;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (transformations & PNG_PACKSWAP)
+ {
+ sshift = (int)((row_info->width + 7) & 7);
+ dshift = (int)((final_width + 7) & 7);
+ s_start = 7;
+ s_end = 0;
+ s_inc = -1;
+ }
+ else
+#endif
+ {
+ sshift = 7 - (int)((row_info->width + 7) & 7);
+ dshift = 7 - (int)((final_width + 7) & 7);
+ s_start = 0;
+ s_end = 7;
+ s_inc = 1;
+ }
+
+ for (i = 0; i < row_info->width; i++)
+ {
+ v = (png_byte)((*sp >> sshift) & 0x1);
+ for (j = 0; j < jstop; j++)
+ {
+ *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+ *dp |= (png_byte)(v << dshift);
+ if (dshift == s_end)
+ {
+ dshift = s_start;
+ dp--;
+ }
+ else
+ dshift += s_inc;
+ }
+ if (sshift == s_end)
+ {
+ sshift = s_start;
+ sp--;
+ }
+ else
+ sshift += s_inc;
+ }
+ break;
+ }
+ case 2:
+ {
+ png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
+ png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
+ int sshift, dshift;
+ int s_start, s_end, s_inc;
+ int jstop = png_pass_inc[pass];
+ png_uint_32 i;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (transformations & PNG_PACKSWAP)
+ {
+ sshift = (int)(((row_info->width + 3) & 3) << 1);
+ dshift = (int)(((final_width + 3) & 3) << 1);
+ s_start = 6;
+ s_end = 0;
+ s_inc = -2;
+ }
+ else
+#endif
+ {
+ sshift = (int)((3 - ((row_info->width + 3) & 3)) << 1);
+ dshift = (int)((3 - ((final_width + 3) & 3)) << 1);
+ s_start = 0;
+ s_end = 6;
+ s_inc = 2;
+ }
+
+ for (i = 0; i < row_info->width; i++)
+ {
+ png_byte v;
+ int j;
+
+ v = (png_byte)((*sp >> sshift) & 0x3);
+ for (j = 0; j < jstop; j++)
+ {
+ *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+ *dp |= (png_byte)(v << dshift);
+ if (dshift == s_end)
+ {
+ dshift = s_start;
+ dp--;
+ }
+ else
+ dshift += s_inc;
+ }
+ if (sshift == s_end)
+ {
+ sshift = s_start;
+ sp--;
+ }
+ else
+ sshift += s_inc;
+ }
+ break;
+ }
+ case 4:
+ {
+ png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
+ png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+ int sshift, dshift;
+ int s_start, s_end, s_inc;
+ png_uint_32 i;
+ int jstop = png_pass_inc[pass];
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (transformations & PNG_PACKSWAP)
+ {
+ sshift = (int)(((row_info->width + 1) & 1) << 2);
+ dshift = (int)(((final_width + 1) & 1) << 2);
+ s_start = 4;
+ s_end = 0;
+ s_inc = -4;
+ }
+ else
+#endif
+ {
+ sshift = (int)((1 - ((row_info->width + 1) & 1)) << 2);
+ dshift = (int)((1 - ((final_width + 1) & 1)) << 2);
+ s_start = 0;
+ s_end = 4;
+ s_inc = 4;
+ }
+
+ for (i = 0; i < row_info->width; i++)
+ {
+ png_byte v = (png_byte)((*sp >> sshift) & 0xf);
+ int j;
+
+ for (j = 0; j < jstop; j++)
+ {
+ *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+ *dp |= (png_byte)(v << dshift);
+ if (dshift == s_end)
+ {
+ dshift = s_start;
+ dp--;
+ }
+ else
+ dshift += s_inc;
+ }
+ if (sshift == s_end)
+ {
+ sshift = s_start;
+ sp--;
+ }
+ else
+ sshift += s_inc;
+ }
+ break;
+ }
+ default:
+ {
+ png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+ png_bytep sp = row + (png_size_t)(row_info->width - 1) * pixel_bytes;
+ png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+ int jstop = png_pass_inc[pass];
+ png_uint_32 i;
+
+ for (i = 0; i < row_info->width; i++)
+ {
+ png_byte v[8];
+ int j;
+
+ png_memcpy(v, sp, pixel_bytes);
+ for (j = 0; j < jstop; j++)
+ {
+ png_memcpy(dp, v, pixel_bytes);
+ dp -= pixel_bytes;
+ }
+ sp -= pixel_bytes;
+ }
+ break;
+ }
+ }
+ row_info->width = final_width;
+ row_info->rowbytes = ((final_width *
+ (png_uint_32)row_info->pixel_depth + 7) >> 3);
+ }
+}
+#endif
+
+void
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
+ png_bytep prev_row, int filter)
+{
+ png_debug(1, "in png_read_filter_row\n");
+ png_debug2(2,"row = %d, filter = %d\n", png_ptr->row_number, filter);
+
+
+ switch (filter)
+ {
+ case PNG_FILTER_VALUE_NONE:
+ break;
+ case PNG_FILTER_VALUE_SUB:
+ {
+ png_uint_32 i;
+ png_uint_32 istop = row_info->rowbytes;
+ png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
+ png_bytep rp = row + bpp;
+ png_bytep lp = row;
+
+ for (i = bpp; i < istop; i++)
+ {
+ *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+ rp++;
+ }
+ break;
+ }
+ case PNG_FILTER_VALUE_UP:
+ {
+ png_uint_32 i;
+ png_uint_32 istop = row_info->rowbytes;
+ png_bytep rp = row;
+ png_bytep pp = prev_row;
+
+ for (i = 0; i < istop; i++)
+ {
+ *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+ rp++;
+ }
+ break;
+ }
+ case PNG_FILTER_VALUE_AVG:
+ {
+ png_uint_32 i;
+ png_bytep rp = row;
+ png_bytep pp = prev_row;
+ png_bytep lp = row;
+ png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
+ png_uint_32 istop = row_info->rowbytes - bpp;
+
+ for (i = 0; i < bpp; i++)
+ {
+ *rp = (png_byte)(((int)(*rp) +
+ ((int)(*pp++) / 2)) & 0xff);
+ rp++;
+ }
+
+ for (i = 0; i < istop; i++)
+ {
+ *rp = (png_byte)(((int)(*rp) +
+ (int)(*pp++ + *lp++) / 2) & 0xff);
+ rp++;
+ }
+ break;
+ }
+ case PNG_FILTER_VALUE_PAETH:
+ {
+ png_uint_32 i;
+ png_bytep rp = row;
+ png_bytep pp = prev_row;
+ png_bytep lp = row;
+ png_bytep cp = prev_row;
+ png_uint_32 bpp = (row_info->pixel_depth + 7) / 8;
+ png_uint_32 istop=row_info->rowbytes - bpp;
+
+ for (i = 0; i < bpp; i++)
+ {
+ *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+ rp++;
+ }
+
+ for (i = 0; i < istop; i++) /* use leftover rp,pp */
+ {
+ int a, b, c, pa, pb, pc, p;
+
+ a = *lp++;
+ b = *pp++;
+ c = *cp++;
+
+ p = b - c;
+ pc = a - c;
+
+#ifdef PNG_USE_ABS
+ pa = abs(p);
+ pb = abs(pc);
+ pc = abs(p + pc);
+#else
+ pa = p < 0 ? -p : p;
+ pb = pc < 0 ? -pc : pc;
+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+ /*
+ if (pa <= pb && pa <= pc)
+ p = a;
+ else if (pb <= pc)
+ p = b;
+ else
+ p = c;
+ */
+
+ p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+ *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+ rp++;
+ }
+ break;
+ }
+ default:
+ png_warning(png_ptr, "Ignoring bad adaptive filter type");
+ *row=0;
+ break;
+ }
+}
+
+void
+png_read_finish_row(png_structp png_ptr)
+{
+ png_debug(1, "in png_read_finish_row\n");
+ png_ptr->row_number++;
+ if (png_ptr->row_number < png_ptr->num_rows)
+ return;
+
+ if (png_ptr->interlaced)
+ {
+ png_ptr->row_number = 0;
+ png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+ do
+ {
+ png_ptr->pass++;
+ if (png_ptr->pass >= 7)
+ break;
+ png_ptr->iwidth = (png_ptr->width +
+ png_pass_inc[png_ptr->pass] - 1 -
+ png_pass_start[png_ptr->pass]) /
+ png_pass_inc[png_ptr->pass];
+ png_ptr->irowbytes = ((png_ptr->iwidth *
+ (png_uint_32)png_ptr->pixel_depth + 7) >> 3) +1;
+
+ if (!(png_ptr->transformations & PNG_INTERLACE))
+ {
+ png_ptr->num_rows = (png_ptr->height +
+ png_pass_yinc[png_ptr->pass] - 1 -
+ png_pass_ystart[png_ptr->pass]) /
+ png_pass_yinc[png_ptr->pass];
+ if (!(png_ptr->num_rows))
+ continue;
+ }
+ else /* if (png_ptr->transformations & PNG_INTERLACE) */
+ break;
+ } while (png_ptr->iwidth == 0);
+
+ if (png_ptr->pass < 7)
+ return;
+ }
+
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+ {
+ char extra;
+ int ret;
+
+ png_ptr->zstream.next_out = (Byte *)&extra;
+ png_ptr->zstream.avail_out = (uInt)1;
+ for(;;)
+ {
+ if (!(png_ptr->zstream.avail_in))
+ {
+ while (!png_ptr->idat_size)
+ {
+ png_byte chunk_length[4];
+
+ png_crc_finish(png_ptr, 0);
+
+ png_read_data(png_ptr, chunk_length, 4);
+ png_ptr->idat_size = png_get_uint_32(chunk_length);
+
+ png_reset_crc(png_ptr);
+ png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ png_error(png_ptr, "Not enough image data");
+
+ }
+ png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_in = png_ptr->zbuf;
+ if (png_ptr->zbuf_size > png_ptr->idat_size)
+ png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+ png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
+ png_ptr->idat_size -= png_ptr->zstream.avail_in;
+ }
+ ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+ if (ret == Z_STREAM_END)
+ {
+ if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
+ png_ptr->idat_size)
+ png_error(png_ptr, "Extra compressed data");
+ png_ptr->mode |= PNG_AFTER_IDAT;
+ png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+ break;
+ }
+ if (ret != Z_OK)
+ png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+ "Decompression Error");
+
+ if (!(png_ptr->zstream.avail_out))
+ png_error(png_ptr, "Extra compressed data");
+
+ }
+ png_ptr->zstream.avail_out = 0;
+ }
+
+ if (png_ptr->idat_size || png_ptr->zstream.avail_in)
+ png_error(png_ptr, "Extra compression data");
+
+ inflateReset(&png_ptr->zstream);
+
+ png_ptr->mode |= PNG_AFTER_IDAT;
+}
+
+void
+png_read_start_row(png_structp png_ptr)
+{
+ int max_pixel_depth;
+ png_uint_32 row_bytes;
+
+ png_debug(1, "in png_read_start_row\n");
+ png_ptr->zstream.avail_in = 0;
+ png_init_read_transformations(png_ptr);
+ if (png_ptr->interlaced)
+ {
+ if (!(png_ptr->transformations & PNG_INTERLACE))
+ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+ png_pass_ystart[0]) / png_pass_yinc[0];
+ else
+ png_ptr->num_rows = png_ptr->height;
+
+ png_ptr->iwidth = (png_ptr->width +
+ png_pass_inc[png_ptr->pass] - 1 -
+ png_pass_start[png_ptr->pass]) /
+ png_pass_inc[png_ptr->pass];
+
+ row_bytes = ((png_ptr->iwidth *
+ (png_uint_32)png_ptr->pixel_depth + 7) >> 3) +1;
+ png_ptr->irowbytes = (png_size_t)row_bytes;
+ if((png_uint_32)png_ptr->irowbytes != row_bytes)
+ png_error(png_ptr, "Rowbytes overflow in png_read_start_row");
+ }
+ else
+ {
+ png_ptr->num_rows = png_ptr->height;
+ png_ptr->iwidth = png_ptr->width;
+ png_ptr->irowbytes = png_ptr->rowbytes + 1;
+ }
+ max_pixel_depth = png_ptr->pixel_depth;
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+ if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+ max_pixel_depth = 8;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ if (png_ptr->transformations & PNG_EXPAND)
+ {
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (png_ptr->num_trans)
+ max_pixel_depth = 32;
+ else
+ max_pixel_depth = 24;
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ if (max_pixel_depth < 8)
+ max_pixel_depth = 8;
+ if (png_ptr->num_trans)
+ max_pixel_depth *= 2;
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ if (png_ptr->num_trans)
+ {
+ max_pixel_depth *= 4;
+ max_pixel_depth /= 3;
+ }
+ }
+ }
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+ if (png_ptr->transformations & (PNG_FILLER))
+ {
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ max_pixel_depth = 32;
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ if (max_pixel_depth <= 8)
+ max_pixel_depth = 16;
+ else
+ max_pixel_depth = 32;
+ }
+ else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ if (max_pixel_depth <= 32)
+ max_pixel_depth = 32;
+ else
+ max_pixel_depth = 64;
+ }
+ }
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+ if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+ {
+ if (
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+#endif
+#if defined(PNG_READ_FILLER_SUPPORTED)
+ (png_ptr->transformations & (PNG_FILLER)) ||
+#endif
+ png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ if (max_pixel_depth <= 16)
+ max_pixel_depth = 32;
+ else
+ max_pixel_depth = 64;
+ }
+ else
+ {
+ if (max_pixel_depth <= 8)
+ max_pixel_depth = 24;
+ else
+ max_pixel_depth = 48;
+ }
+ }
+#endif
+
+ /* align the width on the next larger 8 pixels. Mainly used
+ for interlacing */
+ row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
+ /* calculate the maximum bytes needed, adding a byte and a pixel
+ for safety's sake */
+ row_bytes = ((row_bytes * (png_uint_32)max_pixel_depth + 7) >> 3) +
+ 1 + ((max_pixel_depth + 7) >> 3);
+#ifdef PNG_MAX_MALLOC_64K
+ if (row_bytes > (png_uint_32)65536L)
+ png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+ png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, row_bytes);
+
+#ifdef PNG_MAX_MALLOC_64K
+ if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
+ png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+ png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+ png_ptr->rowbytes + 1));
+
+ png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+
+ png_debug1(3, "width = %d,\n", png_ptr->width);
+ png_debug1(3, "height = %d,\n", png_ptr->height);
+ png_debug1(3, "iwidth = %d,\n", png_ptr->iwidth);
+ png_debug1(3, "num_rows = %d\n", png_ptr->num_rows);
+ png_debug1(3, "rowbytes = %d,\n", png_ptr->rowbytes);
+ png_debug1(3, "irowbytes = %d,\n", png_ptr->irowbytes);
+
+ png_ptr->flags |= PNG_FLAG_ROW_INIT;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.5
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.5 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/png.5 Sat Jul 13 19:23:24 2002
@@ -0,0 +1,44 @@
+.TH PNG 5 "January 14, 1999"
+.SH NAME
+png \- Portable Network Graphics (PNG) format
+.SH DESCRIPTION
+PNG (Portable Network Graphics) is an extensible file format for the
+lossless, portable, well-compressed storage of raster images. PNG provides
+a patent-free replacement for GIF and can also replace many
+common uses of TIFF. Indexed-color, grayscale, and truecolor images are
+supported, plus an optional alpha channel. Sample depths range from
+1 to 16 bits.
+.br
+
+PNG is designed to work well in online viewing applications, such as the
+World Wide Web, so it is fully streamable with a progressive display
+option. PNG is robust, providing both full file integrity checking and
+fast, simple detection of common transmission errors. Also, PNG can store
+gamma and chromaticity data for improved color matching on heterogeneous
+platforms.
+
+.SH "SEE ALSO"
+.IR libpng(3), zlib(3), deflate(5), and zlib(5)
+.LP
+PNG specification:
+RFC 2083
+.IP
+.br
+ftp://ds.internic.net/rfc/rfc2083.txt
+.br
+or (as a W3C Recommendation) at
+.br
+http://www.w3.org/TR/REC-png.html
+.SH AUTHORS
+This man page: Glenn Randers-Pehrson
+.LP
+Portable Network Graphics (PNG) Specification Version 1.0 (October 1, 1996):
+Thomas Boutell and others (png-list at dworkin.wustl.edu).
+.LP
+
+.SH COPYRIGHT NOTICE
+The PNG specification is copyright (c) 1996 Massachussets Institute of
+Technology. See the specification for conditions of use and distribution.
+.LP
+.\" end of man page
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwutil.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwutil.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngwutil.c Sat Jul 13 19:23:25 2002
@@ -0,0 +1,2063 @@
+
+/* pngwutil.c - utilities to write a PNG file
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Place a 32-bit number into a buffer in PNG byte order. We work
+ * with unsigned numbers for convenience, although one supported
+ * ancillary chunk uses signed (two's complement) numbers.
+ */
+void
+png_save_uint_32(png_bytep buf, png_uint_32 i)
+{
+ buf[0] = (png_byte)((i >> 24) & 0xff);
+ buf[1] = (png_byte)((i >> 16) & 0xff);
+ buf[2] = (png_byte)((i >> 8) & 0xff);
+ buf[3] = (png_byte)(i & 0xff);
+}
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+/* The png_save_int_32 function assumes integers are stored in two's
+ * complement format. If this isn't the case, then this routine needs to
+ * be modified to write data in two's complement format.
+ */
+void
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+ buf[0] = (png_byte)((i >> 24) & 0xff);
+ buf[1] = (png_byte)((i >> 16) & 0xff);
+ buf[2] = (png_byte)((i >> 8) & 0xff);
+ buf[3] = (png_byte)(i & 0xff);
+}
+#endif
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+void
+png_save_uint_16(png_bytep buf, unsigned int i)
+{
+ buf[0] = (png_byte)((i >> 8) & 0xff);
+ buf[1] = (png_byte)(i & 0xff);
+}
+
+/* Write a PNG chunk all at once. The type is an array of ASCII characters
+ * representing the chunk name. The array must be at least 4 bytes in
+ * length, and does not need to be null terminated. To be safe, pass the
+ * pre-defined chunk names here, and if you need a new one, define it
+ * where the others are defined. The length is the length of the data.
+ * All the data must be present. If that is not possible, use the
+ * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
+ * functions instead.
+ */
+void
+png_write_chunk(png_structp png_ptr, png_bytep chunk_name,
+ png_bytep data, png_size_t length)
+{
+ png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
+ png_write_chunk_data(png_ptr, data, length);
+ png_write_chunk_end(png_ptr);
+}
+
+/* Write the start of a PNG chunk. The type is the chunk type.
+ * The total_length is the sum of the lengths of all the data you will be
+ * passing in png_write_chunk_data().
+ */
+void
+png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,
+ png_uint_32 length)
+{
+ png_byte buf[4];
+ png_debug2(0, "Writing %s chunk (%d bytes)\n", chunk_name, length);
+
+ /* write the length */
+ png_save_uint_32(buf, length);
+ png_write_data(png_ptr, buf, (png_size_t)4);
+
+ /* write the chunk name */
+ png_write_data(png_ptr, chunk_name, (png_size_t)4);
+ /* reset the crc and run it over the chunk name */
+ png_reset_crc(png_ptr);
+ png_calculate_crc(png_ptr, chunk_name, (png_size_t)4);
+}
+
+/* Write the data of a PNG chunk started with png_write_chunk_start().
+ * Note that multiple calls to this function are allowed, and that the
+ * sum of the lengths from these calls *must* add up to the total_length
+ * given to png_write_chunk_start().
+ */
+void
+png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ /* write the data, and run the CRC over it */
+ if (data != NULL && length > 0)
+ {
+ png_calculate_crc(png_ptr, data, length);
+ png_write_data(png_ptr, data, length);
+ }
+}
+
+/* Finish a chunk started with png_write_chunk_start(). */
+void
+png_write_chunk_end(png_structp png_ptr)
+{
+ png_byte buf[4];
+
+ /* write the crc */
+ png_save_uint_32(buf, png_ptr->crc);
+
+ png_write_data(png_ptr, buf, (png_size_t)4);
+}
+
+/* Simple function to write the signature. If we have already written
+ * the magic bytes of the signature, or more likely, the PNG stream is
+ * being embedded into another stream and doesn't need its own signature,
+ * we should call png_set_sig_bytes() to tell libpng how many of the
+ * bytes have already been written.
+ */
+void
+png_write_sig(png_structp png_ptr)
+{
+ /* write the rest of the 8 byte signature */
+ png_write_data(png_ptr, &png_sig[png_ptr->sig_bytes],
+ (png_size_t)8 - png_ptr->sig_bytes);
+}
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information. Note that the rest of this code depends upon this
+ * information being correct.
+ */
+void
+png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+ int bit_depth, int color_type, int compression_type, int filter_type,
+ int interlace_type)
+{
+ png_byte buf[13]; /* buffer to store the IHDR info */
+
+ png_debug(1, "in png_write_IHDR\n");
+ /* Check that we have valid input data from the application info */
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
+ switch (bit_depth)
+ {
+ case 1:
+ case 2:
+ case 4:
+ case 8:
+ case 16: png_ptr->channels = 1; break;
+ default: png_error(png_ptr,"Invalid bit depth for grayscale image");
+ }
+ break;
+ case PNG_COLOR_TYPE_RGB:
+ if (bit_depth != 8 && bit_depth != 16)
+ png_error(png_ptr, "Invalid bit depth for RGB image");
+ png_ptr->channels = 3;
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+ switch (bit_depth)
+ {
+ case 1:
+ case 2:
+ case 4:
+ case 8: png_ptr->channels = 1; break;
+ default: png_error(png_ptr, "Invalid bit depth for paletted image");
+ }
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ if (bit_depth != 8 && bit_depth != 16)
+ png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
+ png_ptr->channels = 2;
+ break;
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+ if (bit_depth != 8 && bit_depth != 16)
+ png_error(png_ptr, "Invalid bit depth for RGBA image");
+ png_ptr->channels = 4;
+ break;
+ default:
+ png_error(png_ptr, "Invalid image color type specified");
+ }
+
+ if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+ {
+ png_warning(png_ptr, "Invalid compression type specified");
+ compression_type = PNG_COMPRESSION_TYPE_BASE;
+ }
+
+ if (filter_type != PNG_FILTER_TYPE_BASE)
+ {
+ png_warning(png_ptr, "Invalid filter type specified");
+ filter_type = PNG_FILTER_TYPE_BASE;
+ }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+ if (interlace_type != PNG_INTERLACE_NONE &&
+ interlace_type != PNG_INTERLACE_ADAM7)
+ {
+ png_warning(png_ptr, "Invalid interlace type specified");
+ interlace_type = PNG_INTERLACE_ADAM7;
+ }
+#else
+ interlace_type=PNG_INTERLACE_NONE;
+#endif
+
+ /* save off the relevent information */
+ png_ptr->bit_depth = (png_byte)bit_depth;
+ png_ptr->color_type = (png_byte)color_type;
+ png_ptr->interlaced = (png_byte)interlace_type;
+ png_ptr->width = width;
+ png_ptr->height = height;
+
+ png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
+ png_ptr->rowbytes = ((width * (png_size_t)png_ptr->pixel_depth + 7) >> 3);
+ /* set the usr info, so any transformations can modify it */
+ png_ptr->usr_width = png_ptr->width;
+ png_ptr->usr_bit_depth = png_ptr->bit_depth;
+ png_ptr->usr_channels = png_ptr->channels;
+
+ /* pack the header information into the buffer */
+ png_save_uint_32(buf, width);
+ png_save_uint_32(buf + 4, height);
+ buf[8] = (png_byte)bit_depth;
+ buf[9] = (png_byte)color_type;
+ buf[10] = (png_byte)compression_type;
+ buf[11] = (png_byte)filter_type;
+ buf[12] = (png_byte)interlace_type;
+
+ /* write the chunk */
+ png_write_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
+
+ /* initialize zlib with PNG info */
+ png_ptr->zstream.zalloc = png_zalloc;
+ png_ptr->zstream.zfree = png_zfree;
+ png_ptr->zstream.opaque = (voidpf)png_ptr;
+ if (!(png_ptr->do_filter))
+ {
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+ png_ptr->bit_depth < 8)
+ png_ptr->do_filter = PNG_FILTER_NONE;
+ else
+ png_ptr->do_filter = PNG_ALL_FILTERS;
+ }
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
+ {
+ if (png_ptr->do_filter != PNG_FILTER_NONE)
+ png_ptr->zlib_strategy = Z_FILTERED;
+ else
+ png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
+ }
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
+ png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
+ png_ptr->zlib_mem_level = 8;
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
+ png_ptr->zlib_window_bits = 15;
+ if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
+ png_ptr->zlib_method = 8;
+ deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+ png_ptr->zlib_method, png_ptr->zlib_window_bits,
+ png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+ png_ptr->mode = PNG_HAVE_IHDR;
+}
+
+/* write the palette. We are careful not to trust png_color to be in the
+ * correct order for PNG, so people can redefine it to any convenient
+ * structure.
+ */
+void
+png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)
+{
+ png_uint_32 i;
+ png_colorp pal_ptr;
+ png_byte buf[3];
+
+ png_debug(1, "in png_write_PLTE\n");
+ if (num_pal == 0 || num_pal > 256)
+ {
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_error(png_ptr, "Invalid number of colors in palette");
+ }
+ else
+ {
+ png_warning(png_ptr, "Invalid number of colors in palette");
+ return;
+ }
+ }
+
+ png_ptr->num_palette = (png_uint_16)num_pal;
+ png_debug1(3, "num_palette = %d\n", png_ptr->num_palette);
+
+ png_write_chunk_start(png_ptr, png_PLTE, num_pal * 3);
+ for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
+ {
+ buf[0] = pal_ptr->red;
+ buf[1] = pal_ptr->green;
+ buf[2] = pal_ptr->blue;
+ png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+ }
+ png_write_chunk_end(png_ptr);
+ png_ptr->mode |= PNG_HAVE_PLTE;
+}
+
+/* write an IDAT chunk */
+void
+png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_debug(1, "in png_write_IDAT\n");
+ png_write_chunk(png_ptr, png_IDAT, data, length);
+ png_ptr->mode |= PNG_HAVE_IDAT;
+}
+
+/* write an IEND chunk */
+void
+png_write_IEND(png_structp png_ptr)
+{
+ png_debug(1, "in png_write_IEND\n");
+ png_write_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
+ png_ptr->mode |= PNG_HAVE_IEND;
+}
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+/* write a gAMA chunk */
+void
+png_write_gAMA(png_structp png_ptr, double file_gamma)
+{
+ png_uint_32 igamma;
+ png_byte buf[4];
+
+ png_debug(1, "in png_write_gAMA\n");
+ /* file_gamma is saved in 1/1000000ths */
+ igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);
+ png_save_uint_32(buf, igamma);
+ png_write_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
+}
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+/* write a sRGB chunk */
+void
+png_write_sRGB(png_structp png_ptr, int srgb_intent)
+{
+ png_byte buf[1];
+
+ png_debug(1, "in png_write_sRGB\n");
+ if(srgb_intent >= PNG_sRGB_INTENT_LAST)
+ png_warning(png_ptr,
+ "Invalid sRGB rendering intent specified");
+ buf[0]=(png_byte)srgb_intent;
+ png_write_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
+}
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+/* write the sBIT chunk */
+void
+png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)
+{
+ png_byte buf[4];
+ png_size_t size;
+
+ png_debug(1, "in png_write_sBIT\n");
+ /* make sure we don't depend upon the order of PNG_COLOR_8 */
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ png_byte maxbits;
+
+ maxbits = color_type==PNG_COLOR_TYPE_PALETTE ? 8 : png_ptr->usr_bit_depth;
+ if (sbit->red == 0 || sbit->red > maxbits ||
+ sbit->green == 0 || sbit->green > maxbits ||
+ sbit->blue == 0 || sbit->blue > maxbits)
+ {
+ png_warning(png_ptr, "Invalid sBIT depth specified");
+ return;
+ }
+ buf[0] = sbit->red;
+ buf[1] = sbit->green;
+ buf[2] = sbit->blue;
+ size = 3;
+ }
+ else
+ {
+ if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
+ {
+ png_warning(png_ptr, "Invalid sBIT depth specified");
+ return;
+ }
+ buf[0] = sbit->gray;
+ size = 1;
+ }
+
+ if (color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
+ {
+ png_warning(png_ptr, "Invalid sBIT depth specified");
+ return;
+ }
+ buf[size++] = sbit->alpha;
+ }
+
+ png_write_chunk(png_ptr, png_sBIT, buf, size);
+}
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+/* write the cHRM chunk */
+void
+png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
+ double red_x, double red_y, double green_x, double green_y,
+ double blue_x, double blue_y)
+{
+ png_uint_32 itemp;
+ png_byte buf[32];
+
+ png_debug(1, "in png_write_cHRM\n");
+ /* each value is saved int 1/1000000ths */
+ if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 ||
+ white_x + white_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM white point specified");
+ return;
+ }
+ itemp = (png_uint_32)(white_x * 100000.0 + 0.5);
+ png_save_uint_32(buf, itemp);
+ itemp = (png_uint_32)(white_y * 100000.0 + 0.5);
+ png_save_uint_32(buf + 4, itemp);
+
+ if (red_x < 0 || red_x > 0.8 || red_y < 0 || red_y > 0.8 ||
+ red_x + red_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM red point specified");
+ return;
+ }
+ itemp = (png_uint_32)(red_x * 100000.0 + 0.5);
+ png_save_uint_32(buf + 8, itemp);
+ itemp = (png_uint_32)(red_y * 100000.0 + 0.5);
+ png_save_uint_32(buf + 12, itemp);
+
+ if (green_x < 0 || green_x > 0.8 || green_y < 0 || green_y > 0.8 ||
+ green_x + green_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM green point specified");
+ return;
+ }
+ itemp = (png_uint_32)(green_x * 100000.0 + 0.5);
+ png_save_uint_32(buf + 16, itemp);
+ itemp = (png_uint_32)(green_y * 100000.0 + 0.5);
+ png_save_uint_32(buf + 20, itemp);
+
+ if (blue_x < 0 || blue_x > 0.8 || blue_y < 0 || blue_y > 0.8 ||
+ blue_x + blue_y > 1.0)
+ {
+ png_warning(png_ptr, "Invalid cHRM blue point specified");
+ return;
+ }
+ itemp = (png_uint_32)(blue_x * 100000.0 + 0.5);
+ png_save_uint_32(buf + 24, itemp);
+ itemp = (png_uint_32)(blue_y * 100000.0 + 0.5);
+ png_save_uint_32(buf + 28, itemp);
+
+ png_write_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
+}
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+/* write the tRNS chunk */
+void
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
+ int num_trans, int color_type)
+{
+ png_byte buf[6];
+
+ png_debug(1, "in png_write_tRNS\n");
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
+ {
+ png_warning(png_ptr,"Invalid number of transparent colors specified");
+ return;
+ }
+ /* write the chunk out as it is */
+ png_write_chunk(png_ptr, png_tRNS, trans, (png_size_t)num_trans);
+ }
+ else if (color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ /* one 16 bit value */
+ png_save_uint_16(buf, tran->gray);
+ png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
+ }
+ else if (color_type == PNG_COLOR_TYPE_RGB)
+ {
+ /* three 16 bit values */
+ png_save_uint_16(buf, tran->red);
+ png_save_uint_16(buf + 2, tran->green);
+ png_save_uint_16(buf + 4, tran->blue);
+ png_write_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
+ }
+ else
+ {
+ png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+ }
+}
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+/* write the background chunk */
+void
+png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)
+{
+ png_byte buf[6];
+
+ png_debug(1, "in png_write_bKGD\n");
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (back->index > png_ptr->num_palette)
+ {
+ png_warning(png_ptr, "Invalid background palette index");
+ return;
+ }
+ buf[0] = back->index;
+ png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
+ }
+ else if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ png_save_uint_16(buf, back->red);
+ png_save_uint_16(buf + 2, back->green);
+ png_save_uint_16(buf + 4, back->blue);
+ png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
+ }
+ else
+ {
+ png_save_uint_16(buf, back->gray);
+ png_write_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
+ }
+}
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+/* write the histogram */
+void
+png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)
+{
+ int i;
+ png_byte buf[3];
+
+ png_debug(1, "in png_write_hIST\n");
+ if (num_hist > (int)png_ptr->num_palette)
+ {
+ png_debug2(3, "num_hist = %d, num_palette = %d\n", num_hist,
+ png_ptr->num_palette);
+ png_warning(png_ptr, "Invalid number of histogram entries specified");
+ return;
+ }
+
+ png_write_chunk_start(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
+ for (i = 0; i < num_hist; i++)
+ {
+ png_save_uint_16(buf, hist[i]);
+ png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+ }
+ png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED) || defined(PNG_WRITE_zTXt_SUPPORTED) || \
+ defined(PNG_WRITE_pCAL_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk. The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1. Returns keyword length.
+ *
+ * The new_key is allocated to hold the corrected keyword and must be freed
+ * by the calling routine. This avoids problems with trying to write to
+ * static keywords without having to have duplicate copies of the strings.
+ */
+png_size_t
+png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
+{
+ png_size_t key_len;
+ png_charp kp, dp;
+ int kflag;
+
+ png_debug(1, "in png_check_keyword\n");
+ *new_key = NULL;
+
+ if (key == NULL || (key_len = png_strlen(key)) == 0)
+ {
+ png_chunk_warning(png_ptr, "zero length keyword");
+ return ((png_size_t)0);
+ }
+
+ png_debug1(2, "Keyword to be checked is '%s'\n", key);
+
+ *new_key = (png_charp)png_malloc(png_ptr, (png_uint_32)(key_len + 1));
+
+ /* Replace non-printing characters with a blank and print a warning */
+ for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)
+ {
+ if (*kp < 0x20 || (*kp > 0x7E && (png_byte)*kp < 0xA1))
+ {
+#if !defined(PNG_NO_STDIO)
+ char msg[40];
+
+ sprintf(msg, "invalid keyword character 0x%02X", *kp);
+ png_chunk_warning(png_ptr, msg);
+#else
+ png_chunk_warning(png_ptr, "invalid character in keyword");
+#endif
+ *dp = ' ';
+ }
+ else
+ {
+ *dp = *kp;
+ }
+ }
+ *dp = '\0';
+
+ /* Remove any trailing white space. */
+ kp = *new_key + key_len - 1;
+ if (*kp == ' ')
+ {
+ png_chunk_warning(png_ptr, "trailing spaces removed from keyword");
+
+ while (*kp == ' ')
+ {
+ *(kp--) = '\0';
+ key_len--;
+ }
+ }
+
+ /* Remove any leading white space. */
+ kp = *new_key;
+ if (*kp == ' ')
+ {
+ png_chunk_warning(png_ptr, "leading spaces removed from keyword");
+
+ while (*kp == ' ')
+ {
+ kp++;
+ key_len--;
+ }
+ }
+
+ png_debug1(2, "Checking for multiple internal spaces in '%s'\n", kp);
+
+ /* Remove multiple internal spaces. */
+ for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
+ {
+ if (*kp == ' ' && kflag == 0)
+ {
+ *(dp++) = *kp;
+ kflag = 1;
+ }
+ else if (*kp == ' ')
+ {
+ key_len--;
+ }
+ else
+ {
+ *(dp++) = *kp;
+ kflag = 0;
+ }
+ }
+ *dp = '\0';
+
+ if (key_len == 0)
+ {
+ png_chunk_warning(png_ptr, "zero length keyword");
+ }
+
+ if (key_len > 79)
+ {
+ png_chunk_warning(png_ptr, "keyword length must be 1 - 79 characters");
+ new_key[79] = '\0';
+ key_len = 79;
+ }
+
+ return (key_len);
+}
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+/* write a tEXt chunk */
+void
+png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,
+ png_size_t text_len)
+{
+ png_size_t key_len;
+ png_charp new_key;
+
+ png_debug(1, "in png_write_tEXt\n");
+ if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+ {
+ png_warning(png_ptr, "Empty keyword in tEXt chunk");
+ return;
+ }
+
+ if (text == NULL || *text == '\0')
+ text_len = 0;
+
+ /* make sure we include the 0 after the key */
+ png_write_chunk_start(png_ptr, png_tEXt, (png_uint_32)key_len+text_len+1);
+ png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+ if (text_len)
+ png_write_chunk_data(png_ptr, (png_bytep)text, text_len);
+
+ png_write_chunk_end(png_ptr);
+ png_free(png_ptr, new_key);
+}
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+/* write a compressed text chunk */
+void
+png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,
+ png_size_t text_len, int compression)
+{
+ png_size_t key_len;
+ char buf[1];
+ png_charp new_key;
+ int i, ret;
+ png_charpp output_ptr = NULL; /* array of pointers to output */
+ int num_output_ptr = 0; /* number of output pointers used */
+ int max_output_ptr = 0; /* size of output_ptr */
+
+ png_debug(1, "in png_write_zTXt\n");
+
+ if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+ {
+ png_warning(png_ptr, "Empty keyword in zTXt chunk");
+ return;
+ }
+
+ if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+ {
+ png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
+ png_free(png_ptr, new_key);
+ return;
+ }
+
+ png_free(png_ptr, new_key);
+
+ if (compression >= PNG_TEXT_COMPRESSION_LAST)
+ {
+#if !defined(PNG_NO_STDIO)
+ char msg[50];
+ sprintf(msg, "Unknown zTXt compression type %d", compression);
+ png_warning(png_ptr, msg);
+#else
+ png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+ compression = PNG_TEXT_COMPRESSION_zTXt;
+ }
+
+ /* We can't write the chunk until we find out how much data we have,
+ * which means we need to run the compressor first and save the
+ * output. This shouldn't be a problem, as the vast majority of
+ * comments should be reasonable, but we will set up an array of
+ * malloc'd pointers to be sure.
+ *
+ * If we knew the application was well behaved, we could simplify this
+ * greatly by assuming we can always malloc an output buffer large
+ * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
+ * and malloc this directly. The only time this would be a bad idea is
+ * if we can't malloc more than 64K and we have 64K of random input
+ * data, or if the input string is incredibly large (although this
+ * wouldn't cause a failure, just a slowdown due to swapping).
+ */
+
+ /* set up the compression buffers */
+ png_ptr->zstream.avail_in = (uInt)text_len;
+ png_ptr->zstream.next_in = (Bytef *)text;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+
+ /* this is the same compression loop as in png_write_row() */
+ do
+ {
+ /* compress the data */
+ ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+ if (ret != Z_OK)
+ {
+ /* error */
+ if (png_ptr->zstream.msg != NULL)
+ png_error(png_ptr, png_ptr->zstream.msg);
+ else
+ png_error(png_ptr, "zlib error");
+ }
+ /* check to see if we need more room */
+ if (!png_ptr->zstream.avail_out && png_ptr->zstream.avail_in)
+ {
+ /* make sure the output array has room */
+ if (num_output_ptr >= max_output_ptr)
+ {
+ int old_max;
+
+ old_max = max_output_ptr;
+ max_output_ptr = num_output_ptr + 4;
+ if (output_ptr != NULL)
+ {
+ png_charpp old_ptr;
+
+ old_ptr = output_ptr;
+ output_ptr = (png_charpp)png_malloc(png_ptr,
+ (png_uint_32)(max_output_ptr * sizeof (png_charpp)));
+ png_memcpy(output_ptr, old_ptr, old_max * sizeof (png_charp));
+ png_free(png_ptr, old_ptr);
+ }
+ else
+ output_ptr = (png_charpp)png_malloc(png_ptr,
+ (png_uint_32)(max_output_ptr * sizeof (png_charp)));
+ }
+
+ /* save the data */
+ output_ptr[num_output_ptr] = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+ png_memcpy(output_ptr[num_output_ptr], png_ptr->zbuf,
+ png_ptr->zbuf_size);
+ num_output_ptr++;
+
+ /* and reset the buffer */
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ }
+ /* continue until we don't have any more to compress */
+ } while (png_ptr->zstream.avail_in);
+
+ /* finish the compression */
+ do
+ {
+ /* tell zlib we are finished */
+ ret = deflate(&png_ptr->zstream, Z_FINISH);
+ if (ret != Z_OK && ret != Z_STREAM_END)
+ {
+ /* we got an error */
+ if (png_ptr->zstream.msg != NULL)
+ png_error(png_ptr, png_ptr->zstream.msg);
+ else
+ png_error(png_ptr, "zlib error");
+ }
+
+ /* check to see if we need more room */
+ if (!(png_ptr->zstream.avail_out) && ret == Z_OK)
+ {
+ /* check to make sure our output array has room */
+ if (num_output_ptr >= max_output_ptr)
+ {
+ int old_max;
+
+ old_max = max_output_ptr;
+ max_output_ptr = num_output_ptr + 4;
+ if (output_ptr != NULL)
+ {
+ png_charpp old_ptr;
+
+ old_ptr = output_ptr;
+ /* This could be optimized to rrd_realloc() */
+ output_ptr = (png_charpp)png_malloc(png_ptr,
+ (png_uint_32)(max_output_ptr * sizeof (png_charpp)));
+ png_memcpy(output_ptr, old_ptr, old_max * sizeof (png_charp));
+ png_free(png_ptr, old_ptr);
+ }
+ else
+ output_ptr = (png_charpp)png_malloc(png_ptr,
+ (png_uint_32)(max_output_ptr * sizeof (png_charp)));
+ }
+
+ /* save off the data */
+ output_ptr[num_output_ptr] = (png_charp)png_malloc(png_ptr,
+ (png_uint_32)png_ptr->zbuf_size);
+ png_memcpy(output_ptr[num_output_ptr], png_ptr->zbuf,
+ png_ptr->zbuf_size);
+ num_output_ptr++;
+
+ /* and reset the buffer pointers */
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ }
+ } while (ret != Z_STREAM_END);
+
+ /* text length is number of buffers plus last buffer */
+ text_len = png_ptr->zbuf_size * num_output_ptr;
+ if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+ text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+
+ /* write start of chunk */
+ png_write_chunk_start(png_ptr, png_zTXt, (png_uint_32)(key_len+text_len+2));
+ /* write key */
+ png_write_chunk_data(png_ptr, (png_bytep)key, key_len + 1);
+ buf[0] = (png_byte)compression;
+ /* write compression */
+ png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);
+
+ /* write saved output buffers, if any */
+ for (i = 0; i < num_output_ptr; i++)
+ {
+ png_write_chunk_data(png_ptr,(png_bytep)output_ptr[i],png_ptr->zbuf_size);
+ png_free(png_ptr, output_ptr[i]);
+ }
+ if (max_output_ptr != 0)
+ png_free(png_ptr, output_ptr);
+ /* write anything left in zbuf */
+ if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
+ png_write_chunk_data(png_ptr, png_ptr->zbuf,
+ png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+ /* close the chunk */
+ png_write_chunk_end(png_ptr);
+
+ /* reset zlib for another zTXt or the image data */
+ deflateReset(&png_ptr->zstream);
+}
+#endif
+
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+/* write the oFFs chunk */
+void
+png_write_oFFs(png_structp png_ptr, png_uint_32 x_offset,
+ png_uint_32 y_offset,
+ int unit_type)
+{
+ png_byte buf[9];
+
+ png_debug(1, "in png_write_oFFs\n");
+ if (unit_type >= PNG_OFFSET_LAST)
+ png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
+
+ png_save_uint_32(buf, x_offset);
+ png_save_uint_32(buf + 4, y_offset);
+ buf[8] = (png_byte)unit_type;
+
+ png_write_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+/* write the pCAL chunk (png-scivis-19970203) */
+void
+png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+ png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
+{
+ png_size_t purpose_len, units_len, total_len;
+ png_uint_32p params_len;
+ png_byte buf[10];
+ png_charp new_purpose;
+ int i;
+
+ png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams);
+ if (type >= PNG_EQUATION_LAST)
+ png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+ purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
+ png_debug1(3, "pCAL purpose length = %d\n", purpose_len);
+ units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+ png_debug1(3, "pCAL units length = %d\n", units_len);
+ total_len = purpose_len + units_len + 10;
+
+ params_len = (png_uint_32p)png_malloc(png_ptr, (png_uint_32)(nparams
+ *sizeof(png_uint_32)));
+
+ /* Find the length of each parameter, making sure we don't count the
+ null terminator for the last parameter. */
+ for (i = 0; i < nparams; i++)
+ {
+ params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+ png_debug2(3, "pCAL parameter %d length = %d\n", i, params_len[i]);
+ total_len += (png_size_t)params_len[i];
+ }
+
+ png_debug1(3, "pCAL total length = %d\n", total_len);
+ png_write_chunk_start(png_ptr, png_pCAL, (png_uint_32)total_len);
+ png_write_chunk_data(png_ptr, (png_bytep)new_purpose, purpose_len);
+ png_save_int_32(buf, X0);
+ png_save_int_32(buf + 4, X1);
+ buf[8] = (png_byte)type;
+ buf[9] = (png_byte)nparams;
+ png_write_chunk_data(png_ptr, buf, (png_size_t)10);
+ png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);
+
+ png_free(png_ptr, new_purpose);
+
+ for (i = 0; i < nparams; i++)
+ {
+ png_write_chunk_data(png_ptr, (png_bytep)params[i],
+ (png_size_t)params_len[i]);
+ }
+
+ png_free(png_ptr, params_len);
+ png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+/* write the pHYs chunk */
+void
+png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+ png_uint_32 y_pixels_per_unit,
+ int unit_type)
+{
+ png_byte buf[9];
+
+ png_debug(1, "in png_write_pHYs\n");
+ if (unit_type >= PNG_RESOLUTION_LAST)
+ png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
+
+ png_save_uint_32(buf, x_pixels_per_unit);
+ png_save_uint_32(buf + 4, y_pixels_per_unit);
+ buf[8] = (png_byte)unit_type;
+
+ png_write_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* Write the tIME chunk. Use either png_convert_from_struct_tm()
+ * or png_convert_from_time_t(), or fill in the structure yourself.
+ */
+void
+png_write_tIME(png_structp png_ptr, png_timep mod_time)
+{
+ png_byte buf[7];
+
+ png_debug(1, "in png_write_tIME\n");
+ if (mod_time->month > 12 || mod_time->month < 1 ||
+ mod_time->day > 31 || mod_time->day < 1 ||
+ mod_time->hour > 23 || mod_time->second > 60)
+ {
+ png_warning(png_ptr, "Invalid time specified for tIME chunk");
+ return;
+ }
+
+ png_save_uint_16(buf, mod_time->year);
+ buf[2] = mod_time->month;
+ buf[3] = mod_time->day;
+ buf[4] = mod_time->hour;
+ buf[5] = mod_time->minute;
+ buf[6] = mod_time->second;
+
+ png_write_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
+}
+#endif
+
+/* initializes the row writing capability of libpng */
+void
+png_write_start_row(png_structp png_ptr)
+{
+ png_size_t buf_size;
+
+ png_debug(1, "in png_write_start_row\n");
+ buf_size = (png_size_t)(((png_ptr->width * png_ptr->usr_channels *
+ png_ptr->usr_bit_depth + 7) >> 3) + 1);
+
+ /* set up row buffer */
+ png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+ png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
+
+ /* set up filtering buffer, if using this filter */
+ if (png_ptr->do_filter & PNG_FILTER_SUB)
+ {
+ png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+ }
+
+ /* We only need to keep the previous row if we are using one of these. */
+ if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+ {
+ /* set up previous row buffer */
+ png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+ png_memset(png_ptr->prev_row, 0, buf_size);
+
+ if (png_ptr->do_filter & PNG_FILTER_UP)
+ {
+ png_ptr->up_row = (png_bytep )png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+ }
+
+ if (png_ptr->do_filter & PNG_FILTER_AVG)
+ {
+ png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+ }
+
+ if (png_ptr->do_filter & PNG_FILTER_PAETH)
+ {
+ png_ptr->paeth_row = (png_bytep )png_malloc(png_ptr,
+ (png_ptr->rowbytes + 1));
+ png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+ }
+ }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+ /* if interlaced, we need to set up width and height of pass */
+ if (png_ptr->interlaced)
+ {
+ if (!(png_ptr->transformations & PNG_INTERLACE))
+ {
+ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+ png_pass_ystart[0]) / png_pass_yinc[0];
+ png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
+ png_pass_start[0]) / png_pass_inc[0];
+ }
+ else
+ {
+ png_ptr->num_rows = png_ptr->height;
+ png_ptr->usr_width = png_ptr->width;
+ }
+ }
+ else
+#endif
+ {
+ png_ptr->num_rows = png_ptr->height;
+ png_ptr->usr_width = png_ptr->width;
+ }
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+}
+
+/* Internal use only. Called when finished processing a row of data. */
+void
+png_write_finish_row(png_structp png_ptr)
+{
+ int ret;
+
+ png_debug(1, "in png_write_finish_row\n");
+ /* next row */
+ png_ptr->row_number++;
+
+ /* see if we are done */
+ if (png_ptr->row_number < png_ptr->num_rows)
+ return;
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+ /* if interlaced, go to next pass */
+ if (png_ptr->interlaced)
+ {
+ png_ptr->row_number = 0;
+ if (png_ptr->transformations & PNG_INTERLACE)
+ {
+ png_ptr->pass++;
+ }
+ else
+ {
+ /* loop until we find a non-zero width or height pass */
+ do
+ {
+ png_ptr->pass++;
+ if (png_ptr->pass >= 7)
+ break;
+ png_ptr->usr_width = (png_ptr->width +
+ png_pass_inc[png_ptr->pass] - 1 -
+ png_pass_start[png_ptr->pass]) /
+ png_pass_inc[png_ptr->pass];
+ png_ptr->num_rows = (png_ptr->height +
+ png_pass_yinc[png_ptr->pass] - 1 -
+ png_pass_ystart[png_ptr->pass]) /
+ png_pass_yinc[png_ptr->pass];
+ if (png_ptr->transformations & PNG_INTERLACE)
+ break;
+ } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
+
+ }
+
+ /* reset the row above the image for the next pass */
+ if (png_ptr->pass < 7)
+ {
+ if (png_ptr->prev_row != NULL)
+ png_memset(png_ptr->prev_row, 0,
+ (png_size_t) (((png_uint_32)png_ptr->usr_channels *
+ (png_uint_32)png_ptr->usr_bit_depth *
+ png_ptr->width + 7) >> 3) + 1);
+ return;
+ }
+ }
+#endif
+
+ /* if we get here, we've just written the last row, so we need
+ to flush the compressor */
+ do
+ {
+ /* tell the compressor we are done */
+ ret = deflate(&png_ptr->zstream, Z_FINISH);
+ /* check for an error */
+ if (ret != Z_OK && ret != Z_STREAM_END)
+ {
+ if (png_ptr->zstream.msg != NULL)
+ png_error(png_ptr, png_ptr->zstream.msg);
+ else
+ png_error(png_ptr, "zlib error");
+ }
+ /* check to see if we need more room */
+ if (!(png_ptr->zstream.avail_out) && ret == Z_OK)
+ {
+ png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ }
+ } while (ret != Z_STREAM_END);
+
+ /* write any extra space */
+ if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+ {
+ png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
+ png_ptr->zstream.avail_out);
+ }
+
+ deflateReset(&png_ptr->zstream);
+}
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Pick out the correct pixels for the interlace pass.
+ * The basic idea here is to go through the row with a source
+ * pointer and a destination pointer (sp and dp), and copy the
+ * correct pixels for the pass. As the row gets compacted,
+ * sp will always be >= dp, so we should never overwrite anything.
+ * See the default: case for the easiest code to understand.
+ */
+void
+png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
+{
+ png_debug(1, "in png_do_write_interlace\n");
+ /* we don't have to do anything on the last pass (6) */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL && pass < 6)
+#else
+ if (pass < 6)
+#endif
+ {
+ /* each pixel depth is handled separately */
+ switch (row_info->pixel_depth)
+ {
+ case 1:
+ {
+ png_bytep sp;
+ png_bytep dp;
+ int shift;
+ int d;
+ int value;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ dp = row;
+ d = 0;
+ shift = 7;
+ for (i = png_pass_start[pass]; i < row_width;
+ i += png_pass_inc[pass])
+ {
+ sp = row + (png_size_t)(i >> 3);
+ value = (int)(*sp >> (7 - (int)(i & 7))) & 0x1;
+ d |= (value << shift);
+
+ if (shift == 0)
+ {
+ shift = 7;
+ *dp++ = (png_byte)d;
+ d = 0;
+ }
+ else
+ shift--;
+
+ }
+ if (shift != 7)
+ *dp = (png_byte)d;
+ break;
+ }
+ case 2:
+ {
+ png_bytep sp;
+ png_bytep dp;
+ int shift;
+ int d;
+ int value;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ dp = row;
+ shift = 6;
+ d = 0;
+ for (i = png_pass_start[pass]; i < row_width;
+ i += png_pass_inc[pass])
+ {
+ sp = row + (png_size_t)(i >> 2);
+ value = (*sp >> ((3 - (int)(i & 3)) << 1)) & 0x3;
+ d |= (value << shift);
+
+ if (shift == 0)
+ {
+ shift = 6;
+ *dp++ = (png_byte)d;
+ d = 0;
+ }
+ else
+ shift -= 2;
+ }
+ if (shift != 6)
+ *dp = (png_byte)d;
+ break;
+ }
+ case 4:
+ {
+ png_bytep sp;
+ png_bytep dp;
+ int shift;
+ int d;
+ int value;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ dp = row;
+ shift = 4;
+ d = 0;
+ for (i = png_pass_start[pass]; i < row_width;
+ i += png_pass_inc[pass])
+ {
+ sp = row + (png_size_t)(i >> 1);
+ value = (*sp >> ((1 - (int)(i & 1)) << 2)) & 0xf;
+ d |= (value << shift);
+
+ if (shift == 0)
+ {
+ shift = 4;
+ *dp++ = (png_byte)d;
+ d = 0;
+ }
+ else
+ shift -= 4;
+ }
+ if (shift != 4)
+ *dp = (png_byte)d;
+ break;
+ }
+ default:
+ {
+ png_bytep sp;
+ png_bytep dp;
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+ png_size_t pixel_bytes;
+
+ /* start at the beginning */
+ dp = row;
+ /* find out how many bytes each pixel takes up */
+ pixel_bytes = (row_info->pixel_depth >> 3);
+ /* loop through the row, only looking at the pixels that
+ matter */
+ for (i = png_pass_start[pass]; i < row_width;
+ i += png_pass_inc[pass])
+ {
+ /* find out where the original pixel is */
+ sp = row + (png_size_t)i * pixel_bytes;
+ /* move the pixel */
+ if (dp != sp)
+ png_memcpy(dp, sp, pixel_bytes);
+ /* next pixel */
+ dp += pixel_bytes;
+ }
+ break;
+ }
+ }
+ /* set new row width */
+ row_info->width = (row_info->width +
+ png_pass_inc[pass] - 1 -
+ png_pass_start[pass]) /
+ png_pass_inc[pass];
+ row_info->rowbytes = ((row_info->width *
+ row_info->pixel_depth + 7) >> 3);
+ }
+}
+#endif
+
+/* This filters the row, chooses which filter to use, if it has not already
+ * been specified by the application, and then writes the row out with the
+ * chosen filter.
+ */
+#define PNG_MAXSUM (~((png_uint_32)0) >> 1)
+#define PNG_HISHIFT 10
+#define PNG_LOMASK ((png_uint_32)0xffffL)
+#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+void
+png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+{
+ png_bytep prev_row, best_row, row_buf;
+ png_uint_32 mins, bpp;
+ png_byte filter_to_do = png_ptr->do_filter;
+ png_uint_32 row_bytes = row_info->rowbytes;
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ int num_p_filters = (int)png_ptr->num_prev_filters;
+#endif
+
+ png_debug(1, "in png_write_find_filter\n");
+ /* find out how many bytes offset each pixel is */
+ bpp = (row_info->pixel_depth + 7) / 8;
+
+ prev_row = png_ptr->prev_row;
+ best_row = row_buf = png_ptr->row_buf;
+ mins = PNG_MAXSUM;
+
+ /* The prediction method we use is to find which method provides the
+ * smallest value when summing the absolute values of the distances
+ * from zero, using anything >= 128 as negative numbers. This is known
+ * as the "minimum sum of absolute differences" heuristic. Other
+ * heuristics are the "weighted minimum sum of absolute differences"
+ * (experimental and can in theory improve compression), and the "zlib
+ * predictive" method (not implemented yet), which does test compressions
+ * of lines using different filter methods, and then chooses the
+ * (series of) filter(s) that give minimum compressed data size (VERY
+ * computationally expensive).
+ *
+ * GRR 980525: consider also
+ * (1) minimum sum of absolute differences from running average (i.e.,
+ * keep running sum of non-absolute differences & count of bytes)
+ * [track dispersion, too? restart average if dispersion too large?]
+ * (1b) minimum sum of absolute differences from sliding average, probably
+ * with window size <= deflate window (usually 32K)
+ * (2) minimum sum of squared differences from zero or running average
+ * (i.e., ~ root-mean-square approach)
+ */
+
+
+ /* We don't need to test the 'no filter' case if this is the only filter
+ * that has been chosen, as it doesn't actually do anything to the data.
+ */
+ if (filter_to_do & PNG_FILTER_NONE &&
+ filter_to_do != PNG_FILTER_NONE)
+ {
+ png_bytep rp;
+ png_uint_32 sum = 0;
+ png_uint_32 i;
+ int v;
+
+ for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+ {
+ v = *rp;
+ sum += (v < 128) ? v : 256 - v;
+ }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ png_uint_32 sumhi, sumlo;
+ int j;
+ sumlo = sum & PNG_LOMASK;
+ sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
+
+ /* Reduce the sum if we match any of the previous rows */
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+ {
+ sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ /* Factor in the cost of this filter (this is here for completeness,
+ * but it makes no sense to have a "cost" for the NONE filter, as
+ * it has the minimum possible computational cost - none).
+ */
+ sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+ PNG_COST_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+ PNG_COST_SHIFT;
+
+ if (sumhi > PNG_HIMASK)
+ sum = PNG_MAXSUM;
+ else
+ sum = (sumhi << PNG_HISHIFT) + sumlo;
+ }
+#endif
+ mins = sum;
+ }
+
+ /* sub filter */
+ if (filter_to_do == PNG_FILTER_SUB)
+ /* it's the only filter so no testing is needed */
+ {
+ png_bytep rp, lp, dp;
+ png_uint_32 i;
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+ i++, rp++, dp++)
+ {
+ *dp = *rp;
+ }
+ for (lp = row_buf + 1; i < row_bytes;
+ i++, rp++, lp++, dp++)
+ {
+ *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+ }
+ best_row = png_ptr->sub_row;
+ }
+
+ else if (filter_to_do & PNG_FILTER_SUB)
+ {
+ png_bytep rp, dp, lp;
+ png_uint_32 sum = 0, lmins = mins;
+ png_uint_32 i;
+ int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ /* We temporarily increase the "minimum sum" by the factor we
+ * would reduce the sum of this filter, so that we can do the
+ * early exit comparison without scaling the sum each time.
+ */
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 lmhi, lmlo;
+ lmlo = lmins & PNG_LOMASK;
+ lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+ {
+ lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+ PNG_COST_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+ PNG_COST_SHIFT;
+
+ if (lmhi > PNG_HIMASK)
+ lmins = PNG_MAXSUM;
+ else
+ lmins = (lmhi << PNG_HISHIFT) + lmlo;
+ }
+#endif
+
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+ i++, rp++, dp++)
+ {
+ v = *dp = *rp;
+
+ sum += (v < 128) ? v : 256 - v;
+ }
+ for (lp = row_buf + 1; i < row_info->rowbytes;
+ i++, rp++, lp++, dp++)
+ {
+ v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+
+ if (sum > lmins) /* We are already worse, don't continue. */
+ break;
+ }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 sumhi, sumlo;
+ sumlo = sum & PNG_LOMASK;
+ sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+ {
+ sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+ PNG_COST_SHIFT;
+ sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+ PNG_COST_SHIFT;
+
+ if (sumhi > PNG_HIMASK)
+ sum = PNG_MAXSUM;
+ else
+ sum = (sumhi << PNG_HISHIFT) + sumlo;
+ }
+#endif
+
+ if (sum < mins)
+ {
+ mins = sum;
+ best_row = png_ptr->sub_row;
+ }
+ }
+
+ /* up filter */
+ if (filter_to_do == PNG_FILTER_UP)
+ {
+ png_bytep rp, dp, pp;
+ png_uint_32 i;
+
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+ pp = prev_row + 1; i < row_bytes;
+ i++, rp++, pp++, dp++)
+ {
+ *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+ }
+ best_row = png_ptr->up_row;
+ }
+
+ else if (filter_to_do & PNG_FILTER_UP)
+ {
+ png_bytep rp, dp, pp;
+ png_uint_32 sum = 0, lmins = mins;
+ png_uint_32 i;
+ int v;
+
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 lmhi, lmlo;
+ lmlo = lmins & PNG_LOMASK;
+ lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+ {
+ lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+ PNG_COST_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+ PNG_COST_SHIFT;
+
+ if (lmhi > PNG_HIMASK)
+ lmins = PNG_MAXSUM;
+ else
+ lmins = (lmhi << PNG_HISHIFT) + lmlo;
+ }
+#endif
+
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+ pp = prev_row + 1; i < row_bytes; i++)
+ {
+ v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+
+ if (sum > lmins) /* We are already worse, don't continue. */
+ break;
+ }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 sumhi, sumlo;
+ sumlo = sum & PNG_LOMASK;
+ sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+ {
+ sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+ PNG_COST_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+ PNG_COST_SHIFT;
+
+ if (sumhi > PNG_HIMASK)
+ sum = PNG_MAXSUM;
+ else
+ sum = (sumhi << PNG_HISHIFT) + sumlo;
+ }
+#endif
+
+ if (sum < mins)
+ {
+ mins = sum;
+ best_row = png_ptr->up_row;
+ }
+ }
+
+ /* avg filter */
+ if (filter_to_do == PNG_FILTER_AVG)
+ {
+ png_bytep rp, dp, pp, lp;
+ png_uint_32 i;
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+ pp = prev_row + 1; i < bpp; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+ }
+ for (lp = row_buf + 1; i < row_bytes; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+ & 0xff);
+ }
+ best_row = png_ptr->avg_row;
+ }
+
+ else if (filter_to_do & PNG_FILTER_AVG)
+ {
+ png_bytep rp, dp, pp, lp;
+ png_uint_32 sum = 0, lmins = mins;
+ png_uint_32 i;
+ int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 lmhi, lmlo;
+ lmlo = lmins & PNG_LOMASK;
+ lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
+ {
+ lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+ PNG_COST_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+ PNG_COST_SHIFT;
+
+ if (lmhi > PNG_HIMASK)
+ lmins = PNG_MAXSUM;
+ else
+ lmins = (lmhi << PNG_HISHIFT) + lmlo;
+ }
+#endif
+
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+ pp = prev_row + 1; i < bpp; i++)
+ {
+ v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+ }
+ for (lp = row_buf + 1; i < row_bytes; i++)
+ {
+ v = *dp++ =
+ (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+
+ if (sum > lmins) /* We are already worse, don't continue. */
+ break;
+ }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 sumhi, sumlo;
+ sumlo = sum & PNG_LOMASK;
+ sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+ {
+ sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+ PNG_COST_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+ PNG_COST_SHIFT;
+
+ if (sumhi > PNG_HIMASK)
+ sum = PNG_MAXSUM;
+ else
+ sum = (sumhi << PNG_HISHIFT) + sumlo;
+ }
+#endif
+
+ if (sum < mins)
+ {
+ mins = sum;
+ best_row = png_ptr->avg_row;
+ }
+ }
+
+ /* Paeth filter */
+ if (filter_to_do == PNG_FILTER_PAETH)
+ {
+ png_bytep rp, dp, pp, cp, lp;
+ png_uint_32 i;
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+ pp = prev_row + 1; i < bpp; i++)
+ {
+ *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+ }
+
+ for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+ {
+ int a, b, c, pa, pb, pc, p;
+
+ b = *pp++;
+ c = *cp++;
+ a = *lp++;
+
+ p = b - c;
+ pc = a - c;
+
+#ifdef PNG_USE_ABS
+ pa = abs(p);
+ pb = abs(pc);
+ pc = abs(p + pc);
+#else
+ pa = p < 0 ? -p : p;
+ pb = pc < 0 ? -pc : pc;
+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+ p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+ *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+ }
+ best_row = png_ptr->paeth_row;
+ }
+
+ else if (filter_to_do & PNG_FILTER_PAETH)
+ {
+ png_bytep rp, dp, pp, cp, lp;
+ png_uint_32 sum = 0, lmins = mins;
+ png_uint_32 i;
+ int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 lmhi, lmlo;
+ lmlo = lmins & PNG_LOMASK;
+ lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+ {
+ lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+ PNG_COST_SHIFT;
+ lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+ PNG_COST_SHIFT;
+
+ if (lmhi > PNG_HIMASK)
+ lmins = PNG_MAXSUM;
+ else
+ lmins = (lmhi << PNG_HISHIFT) + lmlo;
+ }
+#endif
+
+ for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+ pp = prev_row + 1; i < bpp; i++)
+ {
+ v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+ }
+
+ for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+ {
+ int a, b, c, pa, pb, pc, p;
+
+ b = *pp++;
+ c = *cp++;
+ a = *lp++;
+
+#ifndef PNG_SLOW_PAETH
+ p = b - c;
+ pc = a - c;
+#ifdef PNG_USE_ABS
+ pa = abs(p);
+ pb = abs(pc);
+ pc = abs(p + pc);
+#else
+ pa = p < 0 ? -p : p;
+ pb = pc < 0 ? -pc : pc;
+ pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+ p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+#else /* PNG_SLOW_PAETH */
+ p = a + b - c;
+ pa = abs(p - a);
+ pb = abs(p - b);
+ pc = abs(p - c);
+ if (pa <= pb && pa <= pc)
+ p = a;
+ else if (pb <= pc)
+ p = b;
+ else
+ p = c;
+#endif /* PNG_SLOW_PAETH */
+
+ v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+ sum += (v < 128) ? v : 256 - v;
+
+ if (sum > lmins) /* We are already worse, don't continue. */
+ break;
+ }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+ {
+ int j;
+ png_uint_32 sumhi, sumlo;
+ sumlo = sum & PNG_LOMASK;
+ sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+ for (j = 0; j < num_p_filters; j++)
+ {
+ if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+ {
+ sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+ PNG_WEIGHT_SHIFT;
+ }
+ }
+
+ sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+ PNG_COST_SHIFT;
+ sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+ PNG_COST_SHIFT;
+
+ if (sumhi > PNG_HIMASK)
+ sum = PNG_MAXSUM;
+ else
+ sum = (sumhi << PNG_HISHIFT) + sumlo;
+ }
+#endif
+
+ if (sum < mins)
+ {
+ best_row = png_ptr->paeth_row;
+ }
+ }
+
+ /* Do the actual writing of the filtered row data from the chosen filter. */
+
+ png_write_filtered_row(png_ptr, best_row);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+ /* Save the type of filter we picked this time for future calculations */
+ if (png_ptr->num_prev_filters > 0)
+ {
+ int j;
+ for (j = 1; j < num_p_filters; j++)
+ {
+ png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
+ }
+ png_ptr->prev_filters[j] = best_row[0];
+ }
+#endif
+}
+
+
+/* Do the actual writing of a previously filtered row. */
+void
+png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
+{
+ png_debug(1, "in png_write_filtered_row\n");
+ png_debug1(2, "filter = %d\n", filtered_row[0]);
+ /* set up the zlib input buffer */
+ png_ptr->zstream.next_in = filtered_row;
+ png_ptr->zstream.avail_in = (uInt)png_ptr->row_info.rowbytes + 1;
+ /* repeat until we have compressed all the data */
+ do
+ {
+ int ret; /* return of zlib */
+
+ /* compress the data */
+ ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+ /* check for compression errors */
+ if (ret != Z_OK)
+ {
+ if (png_ptr->zstream.msg != NULL)
+ png_error(png_ptr, png_ptr->zstream.msg);
+ else
+ png_error(png_ptr, "zlib error");
+ }
+
+ /* see if it is time to write another IDAT */
+ if (!(png_ptr->zstream.avail_out))
+ {
+ /* write the IDAT and reset the zlib output buffer */
+ png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+ png_ptr->zstream.next_out = png_ptr->zbuf;
+ png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+ }
+ /* repeat until all data has been compressed */
+ } while (png_ptr->zstream.avail_in);
+
+ /* swap the current and previous rows */
+ if (png_ptr->prev_row != NULL)
+ {
+ png_bytep tptr;
+
+ tptr = png_ptr->prev_row;
+ png_ptr->prev_row = png_ptr->row_buf;
+ png_ptr->row_buf = tptr;
+ }
+
+ /* finish row - updates counters and flushes zlib if last row */
+ png_write_finish_row(png_ptr);
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+ png_ptr->flush_rows++;
+
+ if (png_ptr->flush_dist > 0 &&
+ png_ptr->flush_rows >= png_ptr->flush_dist)
+ {
+ png_write_flush(png_ptr);
+ }
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/README Sat Jul 13 19:23:25 2002
@@ -0,0 +1,198 @@
+README for libpng 1.0.3 - January 14, 1999 (shared library 2.1)
+See the note about version numbers near the top of png.h
+
+See INSTALL for instructions on how to install libpng.
+
+This is the first official release of libpng. Don't let the fact that
+it's the first release fool you. The libpng library has been in
+extensive use and testing for about two and a half years. However, it's
+finally gotten to the stage where there haven't been significant
+changes to the API in some time, and people have a bad feeling about
+libraries with versions < 1.0.
+
+****
+Note that some of the changes to the png_info structure render this
+version of the library binary incompatible with libpng-0.89 or
+earlier versions if you are using a shared library. The type of the
+"filler" parameter for png_set_filler() has changed from png_byte to
+png_uint_32, which will affect shared-library applications that use
+this function.
+
+To avoid problems with changes to the internals of png_info_struct,
+new APIs have been made available in 0.95 to avoid direct application
+access to info_ptr. These functions are the png_set_<chunk> and
+png_get_<chunk> functions. These functions should be used when
+accessing/storing the info_struct data, rather than manipulating it
+directly, to avoid such problems in the future.
+
+It is important to note that the APIs do not make current programs
+that access the info struct directly incompatible with the new
+library. However, it is strongly suggested that new programs use
+the new APIs (as shown in example.c), and older programs be converted
+to the new format, to facilitate upgrades in the future.
+****
+
+Additions since 0.90 include the ability to compile libpng as a
+Windows DLL, and new APIs for accessing data in the info struct.
+Experimental functions include the ability to set weighting and cost
+factors for row filter selection, direct reads of integers from buffers
+on big-endian processors that support misaligned data access, faster
+methods of doing alpha composition, and more accurate 16->8 bit color
+conversion.
+
+The additions since 0.89 include the ability to read from a PNG stream
+which has had some (or all) of the signature bytes read by the calling
+application. This also allows the reading of embedded PNG streams that
+do not have the PNG file signature. As well, it is now possible to set
+the library action on the detection of chunk CRC errors. It is possible
+to set different actions based on whether the CRC error occurred in a
+critical or an ancillary chunk.
+
+The changes made to the library, and bugs fixed are based on discussions
+on the PNG implementation mailing list <png-implement at dworking.wustl.edu>
+and not on material submitted to Guy.
+
+For a detailed description on using libpng, read libpng.txt. For
+examples of libpng in a program, see example.c and pngtest.c. For usage
+information and restrictions (what little they are) on libpng, see
+png.h. For a description on using zlib (the compression library used by
+libpng) and zlib's restrictions, see zlib.h
+
+I have included a general makefile, as well as several machine and
+compiler specific ones, but you may have to modify one for your own needs.
+
+You should use zlib 1.0.4 or later to run this, but it MAY work with
+versions as old as zlib 0.95. Even so, there are bugs in older zlib
+versions which can cause the output of invalid compression streams for
+some images. You will definitely need zlib 1.0.4 or later if you are
+taking advantage of the MS-DOS "far" structure allocation for the small
+and medium memory models. You should also note that zlib is a
+compression library that is useful for more things than just PNG files.
+You can use zlib as a drop-in replacement for fread() and fwrite() if
+you are so inclined.
+
+zlib should be available at the same place that libpng is.
+If not, it should be at ftp.uu.net in /graphics/png
+Eventually, it will be at ftp.uu.net in /pub/archiving/zip/zlib
+
+You may also want a copy of the PNG specification. It is available
+as an RFC and a W3C Recommendation. Failing
+these resources you can try ftp.uu.net in the /graphics/png directory.
+
+This code is currently being archived at ftp.uu.net in the
+/graphics/png directory, and on CompuServe, Lib 20 (PNG SUPPORT)
+at GO GRAPHSUP. If you can't find it in any of those places,
+e-mail me, and I'll help you find it.
+
+If you have any code changes, requests, problems, etc., please e-mail
+them to me. Also, I'd appreciate any make files or project files,
+and any modifications you needed to make to get libpng to compile,
+along with a #define variable to tell what compiler/system you are on.
+If you needed to add transformations to libpng, or wish libpng would
+provide the image in a different way, drop me a note (and code, if
+possible), so I can consider supporting the transformation.
+Finally, if you get any warning messages when compiling libpng
+(note: not zlib), and they are easy to fix, I'd appreciate the
+fix. Please mention "libpng" somewhere in the subject line. Thanks.
+
+This release was created and will be supported by myself (of course
+based in a large way on Guy's and Andreas' earlier work), and the PNG group.
+
+randeg at alumni.rpi.edu
+png-implement at dworkin.wustl.edu
+
+You can't reach Guy, the original libpng author, at the addresses
+given in previous versions of this document. He and Andreas will read mail
+addressed to the png-implement list, however.
+
+Please do not send general questions about PNG. Send them to
+the address in the specification (png-group at w3.org). At the same
+time, please do not send libpng questions to that address, send them to me
+or to png-implement at dworkin.wustl.edu. I'll
+get them in the end anyway. If you have a question about something
+in the PNG specification that is related to using libpng, send it
+to me. Send me any questions that start with "I was using libpng,
+and ...". If in doubt, send questions to me. I'll bounce them
+to others, if necessary.
+
+Please do not send suggestions on how to change PNG. We have
+been discussing PNG for three years now, and it is official and
+finished. If you have suggestions for libpng, however, I'll
+gladly listen. Even if your suggestion is not used for version
+1.0, it may be used later.
+
+Files in this distribution:
+
+ CHANGES => Description of changes between libpng versions
+ README => This file
+ TODO => Things not implemented in the current library
+ ansi2knr.1 => Manual page for ansi2knr
+ ansi2knr.c => Converts files to K&R style function declarations
+ build.bat => MS-DOS batch file for Borland compiler
+ descrip.mms => VMS project file
+ example.c => Example code for using libpng functions
+ libpng.3 => manual page for libpng
+ libpng.txt => Description of libpng and its functions
+ libpngpf.3 => manual page for libpng's private functions
+ png.5 => manual page for the PNG format
+ png.c => Basic interface functions common to library
+ png.h => Library function and interface declarations
+ pngconf.h => System specific library configuration
+ pngerror.c => Error/warning message I/O functions
+ pngget.c => Functions for retrieving info from struct
+ pngmem.c => Memory handling functions
+ pngpread.c => Progressive reading functions
+ pngread.c => Read data/helper high-level functions
+ pngrio.c => Lowest-level data read I/O functions
+ pngrtran.c => Read data transformation functions
+ pngrutil.c => Read data utility functions
+ pngset.c => Functions for storing data into the info_struct
+ pngtest.c => Library test program
+ pngtest.png => Library test sample image
+ pngtrans.c => Common data transformation functions
+ pngwio.c => Lowest-level write I/O functions
+ pngwrite.c => High-level write functions
+ pngwtran.c => Write data transformations
+ pngwutil.c => Write utility functions
+ scripts => Directory containing scripts for building libpng:
+ descrip.mms => VMS makefile for MMS or MMK
+ makefile.std => Generic UNIX makefile
+ makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr
+ makefile.dec => DEC Alpha UNIX makefile
+ makefile.hux => HPUX (10.20 and 11.00) makefile
+ makefile.sgi => Silicon Graphics IRIX makefile
+ makefile.sun => Sun makefile
+ makefile.s2x => Solaris 2.X makefile (gcc, creates libpng.so.2.1.0)
+ makefile.lnx => Linux/ELF makefile (gcc, creates libpng.so.2.1.0)
+ makefile.mip => MIPS makefile
+ makefile.aco => Acorn makefile
+ makefile.ama => Amiga makefile
+ smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
+ (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
+ makefile.atr => Atari makefile
+ makefile.bor => Borland makefile
+ build.bat => MS-DOS batch file for Borland compiler
+ makefile.dj2 => DJGPP 2 makefile
+ makefile.msc => Microsoft C makefile
+ makefile.w32 => makefile for Microsoft Visual C++ 4.0 and later
+ makefile.tc3 => Turbo C 3.0 makefile
+ makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def)
+ makefile.wat => Watcom 10a+ Makefile, 32-bit flat memory model
+ pngos2.def => OS/2 module definition file used by makefile.os2
+ makevms.com => VMS build script
+ pngdll.mak => To make a png32bd.dll with Borland C++ 4.5
+ pngdef.pas => Defines for a png32bd.dll with Borland C++ 4.5
+
+Good luck, and happy coding.
+
+-Glenn Randers-Pehrson
+ Internet: randeg at alumni.rpi.edu
+ Web: http://www.rpi.edu/~randeg/index.html
+
+-Andreas Eric Dilger
+ Internet: adilger at enel.ucalgary.ca
+ Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/
+
+-Guy Eric Schalnat
+ (formerly of Group 42, Inc)
+ Internet: gschal at infinet.com
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpngpf.3
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpngpf.3 (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/libpngpf.3 Sat Jul 13 19:23:25 2002
@@ -0,0 +1,347 @@
+.TH LIBPNGPF 3 "January 14, 1999"
+.SH NAME
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.3 - January 14, 1999
+(private functions)
+.SH SYNOPSIS
+#include <png.h>
+
+void png_build_gamma_table (png_structp png_ptr);
+
+void png_build_grayscale_palette (int bit_depth, png_colorp
+palette);
+
+void png_calculate_crc (png_structp png_ptr, png_bytep ptr,
+png_size_t length);
+void png_check_chunk_name (png_structp png_ptr, png_bytep
+chunk_name);
+
+png_size_t png_check_keyword (png_structp png_ptr, png_charp
+key, png_charpp new_key);
+
+void png_combine_row (png_structp png_ptr, png_bytep row, int
+mask);
+
+void png_correct_palette (png_structp png_ptr, png_colorp
+palette, int num_palette);
+
+int png_crc_error (png_structp png_ptr);
+
+int png_crc_finish (png_structp png_ptr, png_uint_32 skip);
+
+void png_crc_read (png_structp png_ptr, png_bytep buf,
+png_size_t length);
+
+png_voidp png_create_struct (int type, png_malloc_ptr malloc_fn);
+
+png_voidp png_create_struct_2 (int type);
+
+void png_destroy_struct (png_voidp struct_ptr);
+
+void png_destroy_struct_2 (png_voidp struct_ptr, png_free_ptr
+free_fn);
+
+void png_do_background (png_row_infop row_info, png_bytep row,
+png_color_16p trans_values, png_color_16p background,
+png_color_16p background_1, png_bytep gamma_table, png_bytep
+gamma_from_1, png_bytep gamma_to_1, png_uint_16pp gamma_16,
+png_uint_16pp gamma_16_from_1, png_uint_16pp gamma_16_to_1, int
+gamma_shift);
+
+void png_do_bgr (png_row_infop row_info, png_bytep row);
+
+void png_do_chop (png_row_infop row_info, png_bytep row);
+
+void png_do_dither (png_row_infop row_info, png_bytep row,
+png_bytep palette_lookup, png_bytep dither_lookup);
+
+void png_do_expand (png_row_infop row_info, png_bytep row,
+png_color_16p trans_value);
+
+void png_do_expand_palette (png_row_infop row_info, png_bytep
+row, png_colorp palette, png_bytep trans, int num_trans);
+
+void png_do_gamma (png_row_infop row_info, png_bytep row,
+png_bytep gamma_table, png_uint_16pp gamma_16_table, int
+gamma_shift);
+
+void png_do_gray_to_rgb (png_row_infop row_info, png_bytep
+row);
+
+void png_do_invert (png_row_infop row_info, png_bytep row);
+
+void png_do_pack (png_row_infop row_info, png_bytep row,
+png_uint_32 bit_depth);
+
+void png_do_packswap (png_row_infop row_info, png_bytep row);
+
+void png_do_read_filler (png_row_infop row_info, png_bytep row,
+png_uint_32 filler, png_uint_32 flags);
+
+void png_do_read_interlace (png_row_infop row_info, png_bytep
+row, int pass, png_uint_32 transformations);
+
+void png_do_read_invert_alpha (png_row_infop row_info,
+png_bytep row);
+
+void png_do_read_swap_alpha (png_row_infop row_info, png_bytep
+row);
+
+void png_do_read_transformations (png_structp png_ptr);
+
+int png_do_rgb_to_gray (png_row_infop row_info, png_bytep
+row);
+
+void png_do_shift (png_row_infop row_info, png_bytep row,
+png_color_8p bit_depth);
+
+void png_do_strip_filler (png_row_infop row_info, png_bytep
+row, png_uint_32 flags);
+
+void png_do_swap (png_row_infop row_info, png_bytep row);
+
+void png_do_unpack (png_row_infop row_info, png_bytep row);
+
+void png_do_unshift (png_row_infop row_info, png_bytep row,
+png_color_8p sig_bits);
+
+void png_do_write_interlace (png_row_infop row_info, png_bytep
+row, int pass);
+
+void png_do_write_invert_alpha (png_row_infop row_info,
+png_bytep row);
+
+void png_do_write_swap_alpha (png_row_infop row_info, png_bytep
+row);
+
+void png_do_write_transformations (png_structp png_ptr);
+
+void *png_far_to_near (png_structp png_ptr,png_voidp ptr,
+int check);
+
+void png_flush (png_structp png_ptr);
+
+png_int_32 png_get_int_32 (png_bytep buf);
+
+png_uint_16 png_get_uint_16 (png_bytep buf);
+
+png_uint_32 png_get_uint_32 (png_bytep buf);
+
+void png_handle_bKGD (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_cHRM (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_gAMA (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_hIST (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_IEND (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_IHDR (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_oFFs (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_pCAL (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_pHYs (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_PLTE (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_sBIT (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_sRGB (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_tEXt (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_tIME (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_tRNS (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_handle_unknown (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 length);
+
+void png_handle_zTXt (png_structp png_ptr, png_infop info_ptr,
+png_uint_32 length);
+
+void png_info_destroy (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_init_read_transformations (png_structp png_ptr);
+
+void png_process_IDAT_data (png_structp png_ptr, png_bytep
+buffer, png_size_t buffer_length);
+
+void png_process_some_data (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_check_crc (png_structp png_ptr);
+
+void png_push_crc_finish (png_structp png_ptr);
+
+void png_push_crc_skip (png_structp png_ptr, png_uint_32
+length);
+
+void png_push_fill_buffer (png_structp png_ptr, png_bytep
+buffer, png_size_t length);
+
+void png_push_handle_tEXt (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 length);
+
+void png_push_handle_unknown (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 length);
+
+void png_push_handle_zTXt (png_structp png_ptr, png_infop
+info_ptr, png_uint_32 length);
+
+void png_push_have_end (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_have_info (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_have_row (png_structp png_ptr, png_bytep row);
+
+void png_push_process_row (png_structp png_ptr);
+
+void png_push_read_chunk (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_read_end (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_read_IDAT (png_structp png_ptr);
+
+void png_push_read_sig (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_read_tEXt (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_read_zTXt (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_push_restore_buffer (png_structp png_ptr, png_bytep
+buffer, png_size_t buffer_length);
+
+void png_push_save_buffer (png_structp png_ptr);
+
+void png_read_data (png_structp png_ptr, png_bytep data,
+png_size_t length);
+
+void png_read_filter_row (png_structp png_ptr, png_row_infop
+row_info, png_bytep row, png_bytep prev_row, int filter);
+
+void png_read_finish_row (png_structp png_ptr);
+
+void png_read_init (png_structp png_ptr);
+
+void png_read_push_finish_row (png_structp png_ptr);
+
+void png_read_start_row (png_structp png_ptr);
+
+void png_read_transform_info (png_structp png_ptr, png_infop
+info_ptr);
+
+void png_reset_crc (png_structp png_ptr);
+
+void png_save_int_32 (png_bytep buf, png_int_32 i);
+
+void png_save_uint_16 (png_bytep buf, unsigned int i);
+
+void png_save_uint_32 (png_bytep buf, png_uint_32 i);
+
+void png_write_bKGD (png_structp png_ptr, png_color_16p values,
+int color_type);
+
+void png_write_cHRM (png_structp png_ptr, double white_x,
+double white_y, double red_x, double red_y, double green_x,
+double green_y, double blue_x, double blue_y);
+
+void png_write_data (png_structp png_ptr, png_bytep data,
+png_size_t length);
+void png_write_filtered_row (png_structp png_ptr, png_bytep
+filtered_row);
+
+void png_write_find_filter (png_structp png_ptr, png_row_infop
+row_info);
+
+void png_write_finish_row (png_structp png_ptr);
+
+void png_write_gAMA (png_structp png_ptr, double file_gamma);
+
+void png_write_hIST (png_structp png_ptr, png_uint_16p hist,
+int num_hist);
+
+void png_write_init (png_structp png_ptr);
+
+void png_write_IDAT (png_structp png_ptr, png_bytep data,
+png_size_t length);
+
+void png_write_IEND (png_structp png_ptr);
+
+void png_write_IHDR (png_structp png_ptr, png_uint_32 width,
+png_uint_32 height, int bit_depth, int color_type, int
+compression_type, int filter_type, int interlace_type);
+
+void png_write_oFFs (png_structp png_ptr, png_uint_32 x_offset,
+png_uint_32 y_offset, int unit_type);
+
+void png_write_pCAL (png_structp png_ptr, png_charp purpose,
+png_int_32 X0, png_int_32 X1, int type, int nparams, png_charp
+units, png_charpp params);
+
+void png_write_pHYs (png_structp png_ptr, png_uint_32
+x_pixels_per_unit, png_uint_32 y_pixels_per_unit, int
+unit_type);
+
+void png_write_PLTE (png_structp png_ptr, png_colorp palette,
+png_uint_32 num_pal);
+
+void png_write_sBIT (png_structp png_ptr, png_color_8p sbit,
+int color_type);
+
+void png_write_sig (png_structp png_ptr);
+
+void png_write_sRGB (png_structp png_ptr, int intent);
+
+void png_write_start_row (png_structp png_ptr);
+
+void png_write_tEXt (png_structp png_ptr, png_charp key,
+png_charp text, png_size_t text_len);
+
+void png_write_tIME (png_structp png_ptr, png_timep mod_time);
+
+void png_write_tRNS (png_structp png_ptr, png_bytep trans,
+png_color_16p values, int number, int color_type);
+
+void png_write_zTXt (png_structp png_ptr, png_charp key,
+png_charp text, png_size_t text_len, int compression);
+
+voidpf png_zalloc (voidpf png_ptr, uInt items, uInt size);
+
+void png_zfree (voidpf png_ptr, voidpf ptr);
+
+.SH DESCRIPTION
+The functions listed above are used privately by libpng
+and are not recommended for use by applications. They
+are listed alphabetically here as an aid to libpng maintainers.
+See png.h for more information on these functions.
+
+.SH SEE ALSO
+libpng(3), png(5)
+.SH AUTHOR
+Glenn Randers-Pehrson
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/TODO
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/TODO (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/TODO Sat Jul 13 19:23:26 2002
@@ -0,0 +1,24 @@
+TODO - list of things to do for libpng:
+
+Final bug fixes.
+Fix problem with C++ and EXTERN "C".
+Better C++ wrapper/full C++ implementation?
+Keep up with public chunks.
+sPLT chunk handling.
+cHRM transformation.
+Support for application-defined chunk handlers.
+Improve setjmp/longjmp usage or remove it in favor of returning error codes.
+High-level API for reading images.
+Add "grayscale->palette" transformation and "palette->grayscale" detection.
+Color to gray transformation.
+Improved dithering.
+Multi-lingual error and warning message support.
+Complete sRGB transformation (presently it simply uses gamma=0.45455).
+Man pages for function calls.
+Better documentation.
+Better filter selection
+ (counting huffman bits/precompression? filter inertia? filter costs?).
+Optional palette (sPLT) creation.
+Histogram creation.
+Text conversion between different code pages (Latin-1 -> Mac and DOS).
+Improve API by hiding the info_ptr.
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ANNOUNCE
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ANNOUNCE (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ANNOUNCE Sat Jul 13 19:23:26 2002
@@ -0,0 +1,53 @@
+
+Libpng 1.0.3 - January 14, 1999
+
+This is a public release of libpng, intended for use in production codes.
+
+Changes since the previous public release (1.0.2):
+
+libpng-1.0.3:
+
+ Replaced and extended code that was removed from png_set_filler() in 1.0.1a.
+ Fixed a bug in png_do_filler() that made it fail to write filler bytes in
+ the left-most pixel of each row (Kevin Bracey).
+ Changed "static pngcharp tIME_string" to "static char tIME_string[30]"
+ in pngtest.c (Duncan Simpson).
+ Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk
+ even when no tIME chunk was present in the source file.
+ Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit.
+ Fixed a problem in png_read_push_finish_row(), which would not skip some
+ passes that it should skip, for images that are less than 3 pixels high.
+ Interchanged the order of calls to png_do_swap() and png_do_shift()
+ in pngwtran.c (John Cromer).
+ Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h .
+ Changed "bad adaptive filter type" from error to warning in pngrutil.c .
+ Fixed a documentation error about default filtering with 8-bit indexed-color.
+ Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO
+ (L. Peter Deutsch).
+ Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions.
+ Added png_get_copyright() and png_get_header_version() functions.
+ Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c
+ Added information about debugging in libpng.txt and libpng.3 .
+ Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and makefile.sco.
+ Removed lines after Dynamic Dependencies" in makefile.aco .
+ Revised makefile.dec to make a shared library (Jeremie Petit).
+ Removed trailing blanks from all files.
+ Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h
+ Added "if" tests to silence complaints about unused png_ptr in png.h and png.c
+ Changed "check_if_png" function in example.c to return true (nonzero) if PNG.
+ Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()
+ which is obsolete.
+ Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)
+ Added a statement of Y2K compliance in png.h, libpng.1, and Y2KINFO.
+
+Send comments/corrections/commendations to
+png-implement at dworkin.wustl.edu or to randeg at alumni.rpi.edu
+
+Glenn R-P
+
+Send comments/corrections/commendations to
+png-implement at dworkin.wustl.edu or to randeg at alumni.rpi.edu
+
+Glenn Randers-Pehrson
+libpng maintainer
+PNG Development Group
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/ansi2knr.c Sat Jul 13 19:23:26 2002
@@ -0,0 +1,695 @@
+/* ansi2knr.c */
+
+/* Convert ANSI C function definitions to K&R ("traditional C") syntax
+Copyright (C) 1989 Aladdin Enterprises. All rights reserved.
+Copyright (C) 1988 Richard M. Stallman
+
+ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY. No author or distributor accepts responsibility to anyone for the
+consequences of using it or for whether it serves any particular purpose or
+works at all, unless he says so in writing. Refer to the GNU General Public
+License (the "GPL") for full details.
+
+Everyone is granted permission to copy, modify and redistribute ansi2knr,
+but only under the conditions described in the GPL. A copy of this license
+is supposed to have been given to you along with ansi2knr so you can know
+your rights and responsibilities. It should be in a file named COPYLEFT.
+[In the LIBPNG distribution, the GPL appears below, not in a separate file.]
+Among other things, the copyright notice and this notice must be preserved
+on all copies.
+
+We explicitly state here what we believe is already implied by the GPL: if
+the ansi2knr program is distributed as a separate source file and a
+separate executable file which are aggregated on a storage medium together
+with another program, this in itself does not bring the other program under
+the GPL, nor does the mere fact that such a program or the procedures for
+constructing it invoke the ansi2knr executable bring any other part of the
+program under the GPL.
+*/
+
+/*
+---------- Here is the GNU GPL file COPYLEFT, referred to above ----------
+----- These terms do NOT apply to the LIBPNG software itself; see README ------
+
+ GHOSTSCRIPT GENERAL PUBLIC LICENSE
+ (Clarified 11 Feb 1988)
+
+ Copyright (C) 1988 Richard M. Stallman
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed. You can also use this wording
+ to make the terms for other programs.
+
+ The license agreements of most software companies keep you at the
+mercy of those companies. By contrast, our general public license is
+intended to give everyone the right to share Ghostscript. To make sure
+that you get the rights we want you to have, we need to make
+restrictions that forbid anyone to deny you these rights or to ask you
+to surrender the rights. Hence this license agreement.
+
+ Specifically, we want to make sure that you have the right to give
+away copies of Ghostscript, that you receive source code or else can get
+it if you want it, that you can change Ghostscript or use pieces of it
+in new free programs, and that you know you can do these things.
+
+ To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights. For example, if you distribute
+copies of Ghostscript, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must tell them their rights.
+
+ Also, for our own protection, we must make certain that everyone finds
+out that there is no warranty for Ghostscript. If Ghostscript is
+modified by someone else and passed on, we want its recipients to know
+that what they have is not what we distributed, so that any problems
+introduced by others will not reflect on our reputation.
+
+ Therefore we (Richard M. Stallman and the Free Software Foundation,
+Inc.) make the following terms which say what you must do to be allowed
+to distribute or change Ghostscript.
+
+
+ COPYING POLICIES
+
+ 1. You may copy and distribute verbatim copies of Ghostscript source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy a valid copyright and license
+notice "Copyright (C) 1989 Aladdin Enterprises. All rights reserved.
+Distributed by Free Software Foundation, Inc." (or with whatever year is
+appropriate); keep intact the notices on all files that refer to this
+License Agreement and to the absence of any warranty; and give any other
+recipients of the Ghostscript program a copy of this License Agreement
+along with the program. You may charge a distribution fee for the
+physical act of transferring a copy.
+
+ 2. You may modify your copy or copies of Ghostscript or any portion of
+it, and copy and distribute such modifications under the terms of
+Paragraph 1 above, provided that you also do the following:
+
+ a) cause the modified files to carry prominent notices stating
+ that you changed the files and the date of any change; and
+
+ b) cause the whole of any work that you distribute or publish,
+ that in whole or in part contains or is a derivative of Ghostscript
+ or any part thereof, to be licensed at no charge to all third
+ parties on terms identical to those contained in this License
+ Agreement (except that you may choose to grant more extensive
+ warranty protection to some or all third parties, at your option).
+
+ c) You may charge a distribution fee for the physical act of
+ transferring a copy, and you may at your option offer warranty
+ protection in exchange for a fee.
+
+Mere aggregation of another unrelated program with this program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other program under the scope of these terms.
+
+ 3. You may copy and distribute Ghostscript (or a portion or derivative
+of it, under Paragraph 2) in object code or executable form under the
+terms of Paragraphs 1 and 2 above provided that you also do one of the
+following:
+
+ a) accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ b) accompany it with a written offer, valid for at least three
+ years, to give any third party free (except for a nominal
+ shipping charge) a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ c) accompany it with the information you received as to where the
+ corresponding source code may be obtained. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form alone.)
+
+For an executable file, complete source code means all the source code for
+all modules it contains; but, as a special exception, it need not include
+source code for modules which are standard libraries that accompany the
+operating system on which the executable file runs.
+
+ 4. You may not copy, sublicense, distribute or transfer Ghostscript
+except as expressly provided under this License Agreement. Any attempt
+otherwise to copy, sublicense, distribute or transfer Ghostscript is
+void and your rights to use the program under this License agreement
+shall be automatically terminated. However, parties who have received
+computer software programs from you with this License Agreement will not
+have their licenses terminated so long as such parties remain in full
+compliance.
+
+ 5. If you wish to incorporate parts of Ghostscript into other free
+programs whose distribution conditions are different, write to the Free
+Software Foundation at 675 Mass Ave, Cambridge, MA 02139. We have not
+yet worked out a simple rule that can be stated here, but we will often
+permit this. We will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the
+sharing and reuse of software.
+
+Your comments and suggestions about our licensing policies and our
+software are welcome! Please contact the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296.
+
+ NO WARRANTY
+
+ BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
+NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW. EXCEPT
+WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
+M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
+PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
+YOU. SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
+STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
+ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
+HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
+BY ANY OTHER PARTY.
+
+-------------------- End of file COPYLEFT ------------------------------
+*/
+
+/*
+ * Usage:
+ ansi2knr input_file [output_file]
+ * If no output_file is supplied, output goes to stdout.
+ * There are no error messages.
+ *
+ * ansi2knr recognizes function definitions by seeing a non-keyword
+ * identifier at the left margin, followed by a left parenthesis,
+ * with a right parenthesis as the last character on the line,
+ * and with a left brace as the first token on the following line
+ * (ignoring possible intervening comments).
+ * It will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.
+ * These algorithms ignore whitespace and comments, except that
+ * the function name must be the first thing on the line.
+ * The following constructs will confuse it:
+ * - Any other construct that starts at the left margin and
+ * follows the above syntax (such as a macro or function call).
+ * - Some macros that tinker with the syntax of the function header.
+ */
+
+/*
+ * The original and principal author of ansi2knr is L. Peter Deutsch
+ * <ghost at aladdin.com>. Other authors are noted in the change history
+ * that follows (in reverse chronological order):
+ lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with
+ compilers that don't understand void, as suggested by
+ Tom Lane
+ lpd 96-01-15 changed to require that the first non-comment token
+ on the line following a function header be a left brace,
+ to reduce sensitivity to macros, as suggested by Tom Lane
+ <tgl at sss.pgh.pa.us>
+ lpd 95-06-22 removed #ifndefs whose sole purpose was to define
+ undefined preprocessor symbols as 0; changed all #ifdefs
+ for configuration symbols to #ifs
+ lpd 95-04-05 changed copyright notice to make it clear that
+ including ansi2knr in a program does not bring the entire
+ program under the GPL
+ lpd 94-12-18 added conditionals for systems where ctype macros
+ don't handle 8-bit characters properly, suggested by
+ Francois Pinard <pinard at iro.umontreal.ca>;
+ removed --varargs switch (this is now the default)
+ lpd 94-10-10 removed CONFIG_BROKETS conditional
+ lpd 94-07-16 added some conditionals to help GNU `configure',
+ suggested by Francois Pinard <pinard at iro.umontreal.ca>;
+ properly erase prototype args in function parameters,
+ contributed by Jim Avera <jima at netcom.com>;
+ correct error in writeblanks (it shouldn't erase EOLs)
+ lpd 89-xx-xx original version
+ */
+
+/* Most of the conditionals here are to make ansi2knr work with */
+/* or without the GNU configure machinery. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+
+/*
+ For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
+ This will define HAVE_CONFIG_H and so, activate the following lines.
+ */
+
+# if STDC_HEADERS || HAVE_STRING_H
+# include <string.h>
+# else
+# include <strings.h>
+# endif
+
+#else /* not HAVE_CONFIG_H */
+
+/* Otherwise do it the hard way */
+
+# ifdef BSD
+# include <strings.h>
+# else
+# ifdef VMS
+ extern int strlen(), strncmp();
+# else
+# include <string.h>
+# endif
+# endif
+
+#endif /* not HAVE_CONFIG_H */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+/*
+ malloc and free should be declared in stdlib.h,
+ but if you've got a K&R compiler, they probably aren't.
+ */
+# ifdef MSDOS
+# include <malloc.h>
+# else
+# ifdef VMS
+ extern char *malloc();
+ extern void free();
+# else
+ extern char *malloc();
+ extern int free();
+# endif
+# endif
+
+#endif
+
+/*
+ * The ctype macros don't always handle 8-bit characters correctly.
+ * Compensate for this here.
+ */
+#ifdef isascii
+# undef HAVE_ISASCII /* just in case */
+# define HAVE_ISASCII 1
+#else
+#endif
+#if STDC_HEADERS || !HAVE_ISASCII
+# define is_ascii(c) 1
+#else
+# define is_ascii(c) isascii(c)
+#endif
+
+#define is_space(c) (is_ascii(c) && isspace(c))
+#define is_alpha(c) (is_ascii(c) && isalpha(c))
+#define is_alnum(c) (is_ascii(c) && isalnum(c))
+
+/* Scanning macros */
+#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
+#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
+
+/* Forward references */
+char *skipspace();
+int writeblanks();
+int test1();
+int convert1();
+
+/* The main program */
+int
+main(argc, argv)
+ int argc;
+ char *argv[];
+{ FILE *in, *out;
+#define bufsize 5000 /* arbitrary size */
+ char *buf;
+ char *line;
+ char *more;
+ /*
+ * In previous versions, ansi2knr recognized a --varargs switch.
+ * If this switch was supplied, ansi2knr would attempt to convert
+ * a ... argument to va_alist and va_dcl; if this switch was not
+ * supplied, ansi2knr would simply drop any such arguments.
+ * Now, ansi2knr always does this conversion, and we only
+ * check for this switch for backward compatibility.
+ */
+ int convert_varargs = 1;
+
+ if ( argc > 1 && argv[1][0] == '-' )
+ { if ( !strcmp(argv[1], "--varargs") )
+ { convert_varargs = 1;
+ argc--;
+ argv++;
+ }
+ else
+ { fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+ exit(1);
+ }
+ }
+ switch ( argc )
+ {
+ default:
+ printf("Usage: ansi2knr input_file [output_file]\n");
+ exit(0);
+ case 2:
+ out = stdout;
+ break;
+ case 3:
+ out = fopen(argv[2], "w");
+ if ( out == NULL )
+ { fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+ exit(1);
+ }
+ }
+ in = fopen(argv[1], "r");
+ if ( in == NULL )
+ { fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+ exit(1);
+ }
+ fprintf(out, "#line 1 \"%s\"\n", argv[1]);
+ buf = malloc(bufsize);
+ line = buf;
+ while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
+ {
+test: line += strlen(line);
+ switch ( test1(buf) )
+ {
+ case 2: /* a function header */
+ convert1(buf, out, 1, convert_varargs);
+ break;
+ case 1: /* a function */
+ /* Check for a { at the start of the next line. */
+ more = ++line;
+f: if ( line >= buf + (bufsize - 1) ) /* overflow check */
+ goto wl;
+ if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
+ goto wl;
+ switch ( *skipspace(more, 1) )
+ {
+ case '{':
+ /* Definitely a function header. */
+ convert1(buf, out, 0, convert_varargs);
+ fputs(more, out);
+ break;
+ case 0:
+ /* The next line was blank or a comment: */
+ /* keep scanning for a non-comment. */
+ line += strlen(line);
+ goto f;
+ default:
+ /* buf isn't a function header, but */
+ /* more might be. */
+ fputs(buf, out);
+ strcpy(buf, more);
+ line = buf;
+ goto test;
+ }
+ break;
+ case -1: /* maybe the start of a function */
+ if ( line != buf + (bufsize - 1) ) /* overflow check */
+ continue;
+ /* falls through */
+ default: /* not a function */
+wl: fputs(buf, out);
+ break;
+ }
+ line = buf;
+ }
+ if ( line != buf )
+ fputs(buf, out);
+ free(buf);
+ fclose(out);
+ fclose(in);
+ return 0;
+}
+
+/* Skip over space and comments, in either direction. */
+char *
+skipspace(p, dir)
+ register char *p;
+ register int dir; /* 1 for forward, -1 for backward */
+{ for ( ; ; )
+ { while ( is_space(*p) )
+ p += dir;
+ if ( !(*p == '/' && p[dir] == '*') )
+ break;
+ p += dir; p += dir;
+ while ( !(*p == '*' && p[dir] == '/') )
+ { if ( *p == 0 )
+ return p; /* multi-line comment?? */
+ p += dir;
+ }
+ p += dir; p += dir;
+ }
+ return p;
+}
+
+/*
+ * Write blanks over part of a string.
+ * Don't overwrite end-of-line characters.
+ */
+int
+writeblanks(start, end)
+ char *start;
+ char *end;
+{ char *p;
+ for ( p = start; p < end; p++ )
+ if ( *p != '\r' && *p != '\n' )
+ *p = ' ';
+ return 0;
+}
+
+/*
+ * Test whether the string in buf is a function definition.
+ * The string may contain and/or end with a newline.
+ * Return as follows:
+ * 0 - definitely not a function definition;
+ * 1 - definitely a function definition;
+ * 2 - definitely a function prototype (NOT USED);
+ * -1 - may be the beginning of a function definition,
+ * append another line and look again.
+ * The reason we don't attempt to convert function prototypes is that
+ * Ghostscript's declaration-generating macros look too much like
+ * prototypes, and confuse the algorithms.
+ */
+int
+test1(buf)
+ char *buf;
+{ register char *p = buf;
+ char *bend;
+ char *endfn;
+ int contin;
+
+ if ( !isidfirstchar(*p) )
+ return 0; /* no name at left margin */
+ bend = skipspace(buf + strlen(buf) - 1, -1);
+ switch ( *bend )
+ {
+ case ';': contin = 0 /*2*/; break;
+ case ')': contin = 1; break;
+ case '{': return 0; /* not a function */
+ case '}': return 0; /* not a function */
+ default: contin = -1;
+ }
+ while ( isidchar(*p) )
+ p++;
+ endfn = p;
+ p = skipspace(p, 1);
+ if ( *p++ != '(' )
+ return 0; /* not a function */
+ p = skipspace(p, 1);
+ if ( *p == ')' )
+ return 0; /* no parameters */
+ /* Check that the apparent function name isn't a keyword. */
+ /* We only need to check for keywords that could be followed */
+ /* by a left parenthesis (which, unfortunately, is most of them). */
+ { static char *words[] =
+ { "asm", "auto", "case", "char", "const", "double",
+ "extern", "float", "for", "if", "int", "long",
+ "register", "return", "short", "signed", "sizeof",
+ "static", "switch", "typedef", "unsigned",
+ "void", "volatile", "while", 0
+ };
+ char **key = words;
+ char *kp;
+ int len = endfn - buf;
+
+ while ( (kp = *key) != 0 )
+ { if ( strlen(kp) == len && !strncmp(kp, buf, len) )
+ return 0; /* name is a keyword */
+ key++;
+ }
+ }
+ return contin;
+}
+
+/* Convert a recognized function definition or header to K&R syntax. */
+int
+convert1(buf, out, header, convert_varargs)
+ char *buf;
+ FILE *out;
+ int header; /* Boolean */
+ int convert_varargs; /* Boolean */
+{ char *endfn;
+ register char *p;
+ char **breaks;
+ unsigned num_breaks = 2; /* for testing */
+ char **btop;
+ char **bp;
+ char **ap;
+ char *vararg = 0;
+
+ /* Pre-ANSI implementations don't agree on whether strchr */
+ /* is called strchr or index, so we open-code it here. */
+ for ( endfn = buf; *(endfn++) != '('; )
+ ;
+top: p = endfn;
+ breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
+ if ( breaks == 0 )
+ { /* Couldn't allocate break table, give up */
+ fprintf(stderr, "Unable to allocate break table!\n");
+ fputs(buf, out);
+ return -1;
+ }
+ btop = breaks + num_breaks * 2 - 2;
+ bp = breaks;
+ /* Parse the argument list */
+ do
+ { int level = 0;
+ char *lp = NULL;
+ char *rp;
+ char *end = NULL;
+
+ if ( bp >= btop )
+ { /* Filled up break table. */
+ /* Allocate a bigger one and start over. */
+ free((char *)breaks);
+ num_breaks <<= 1;
+ goto top;
+ }
+ *bp++ = p;
+ /* Find the end of the argument */
+ for ( ; end == NULL; p++ )
+ { switch(*p)
+ {
+ case ',':
+ if ( !level ) end = p;
+ break;
+ case '(':
+ if ( !level ) lp = p;
+ level++;
+ break;
+ case ')':
+ if ( --level < 0 ) end = p;
+ else rp = p;
+ break;
+ case '/':
+ p = skipspace(p, 1) - 1;
+ break;
+ default:
+ ;
+ }
+ }
+ /* Erase any embedded prototype parameters. */
+ if ( lp )
+ writeblanks(lp + 1, rp);
+ p--; /* back up over terminator */
+ /* Find the name being declared. */
+ /* This is complicated because of procedure and */
+ /* array modifiers. */
+ for ( ; ; )
+ { p = skipspace(p - 1, -1);
+ switch ( *p )
+ {
+ case ']': /* skip array dimension(s) */
+ case ')': /* skip procedure args OR name */
+ { int level = 1;
+ while ( level )
+ switch ( *--p )
+ {
+ case ']': case ')': level++; break;
+ case '[': case '(': level--; break;
+ case '/': p = skipspace(p, -1) + 1; break;
+ default: ;
+ }
+ }
+ if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
+ { /* We found the name being declared */
+ while ( !isidfirstchar(*p) )
+ p = skipspace(p, 1) + 1;
+ goto found;
+ }
+ break;
+ default:
+ goto found;
+ }
+ }
+found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
+ { if ( convert_varargs )
+ { *bp++ = "va_alist";
+ vararg = p-2;
+ }
+ else
+ { p++;
+ if ( bp == breaks + 1 ) /* sole argument */
+ writeblanks(breaks[0], p);
+ else
+ writeblanks(bp[-1] - 1, p);
+ bp--;
+ }
+ }
+ else
+ { while ( isidchar(*p) ) p--;
+ *bp++ = p+1;
+ }
+ p = end;
+ }
+ while ( *p++ == ',' );
+ *bp = p;
+ /* Make a special check for 'void' arglist */
+ if ( bp == breaks+2 )
+ { p = skipspace(breaks[0], 1);
+ if ( !strncmp(p, "void", 4) )
+ { p = skipspace(p+4, 1);
+ if ( p == breaks[2] - 1 )
+ { bp = breaks; /* yup, pretend arglist is empty */
+ writeblanks(breaks[0], p + 1);
+ }
+ }
+ }
+ /* Put out the function name and left parenthesis. */
+ p = buf;
+ while ( p != endfn ) putc(*p, out), p++;
+ /* Put out the declaration. */
+ if ( header )
+ { fputs(");", out);
+ for ( p = breaks[0]; *p; p++ )
+ if ( *p == '\r' || *p == '\n' )
+ putc(*p, out);
+ }
+ else
+ { for ( ap = breaks+1; ap < bp; ap += 2 )
+ { p = *ap;
+ while ( isidchar(*p) )
+ putc(*p, out), p++;
+ if ( ap < bp - 1 )
+ fputs(", ", out);
+ }
+ fputs(") ", out);
+ /* Put out the argument declarations */
+ for ( ap = breaks+2; ap <= bp; ap += 2 )
+ (*ap)[-1] = ';';
+ if ( vararg != 0 )
+ { *vararg = 0;
+ fputs(breaks[0], out); /* any prior args */
+ fputs("va_dcl", out); /* the final arg */
+ fputs(bp[0], out);
+ }
+ else
+ fputs(breaks[0], out);
+ }
+ free((char *)breaks);
+ return 0;
+}
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/Makefile.am Sat Jul 13 19:23:27 2002
@@ -0,0 +1,34 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+
+# where we keep local rules for automake
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+INCLUDES = -I$(top_srcdir)/$(ZLIB_LIB_DIR)
+
+EXTRA_DIST= ANNOUNCE CHANGES INSTALL KNOWNBUG README README.rrdtool TODO Y2KINFO example.c libpng.3\
+ libpng.txt libpngpf.3 png.5 png.dsp png.dsw
+
+noinst_LTLIBRARIES = librrd_png.la
+
+librrd_png_la_SOURCES = \
+ png.c \
+ pngerror.c \
+ pngget.c \
+ pngmem.c \
+ pngpread.c \
+ pngread.c \
+ pngrio.c \
+ pngrtran.c \
+ pngrutil.c \
+ pngset.c \
+ pngtrans.c \
+ pngwio.c \
+ pngwrite.c \
+ pngwtran.c \
+ pngwutil.c \
+ png.h pngconf.h
Added: trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrtran.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrtran.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/libpng-1.0.3/pngrtran.c Sat Jul 13 19:23:27 2002
@@ -0,0 +1,3931 @@
+
+/* pngrtran.c - transforms the data in a row for PNG readers
+ *
+ * libpng 1.0.3 - January 14, 1999
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+ *
+ * This file contains functions optionally called by an application
+ * in order to tell libpng how to handle data when reading a PNG.
+ * Transformations that are used in both reading and writing are
+ * in pngtrans.c.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Set the action on getting a CRC error for an ancillary or critical chunk. */
+void
+png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+{
+ png_debug(1, "in png_set_crc_action\n");
+ /* Tell libpng how we react to CRC errors in critical chunks */
+ switch (crit_action)
+ {
+ case PNG_CRC_NO_CHANGE: /* leave setting as is */
+ break;
+ case PNG_CRC_WARN_USE: /* warn/use data */
+ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+ png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
+ break;
+ case PNG_CRC_QUIET_USE: /* quiet/use data */
+ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+ png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
+ PNG_FLAG_CRC_CRITICAL_IGNORE;
+ break;
+ case PNG_CRC_WARN_DISCARD: /* not a valid action for critical data */
+ png_warning(png_ptr, "Can't discard critical data on CRC error.");
+ case PNG_CRC_ERROR_QUIT: /* error/quit */
+ case PNG_CRC_DEFAULT:
+ default:
+ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+ break;
+ }
+
+ switch (ancil_action)
+ {
+ case PNG_CRC_NO_CHANGE: /* leave setting as is */
+ break;
+ case PNG_CRC_WARN_USE: /* warn/use data */
+ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+ png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
+ break;
+ case PNG_CRC_QUIET_USE: /* quiet/use data */
+ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+ png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
+ PNG_FLAG_CRC_ANCILLARY_NOWARN;
+ break;
+ case PNG_CRC_ERROR_QUIT: /* error/quit */
+ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+ png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
+ break;
+ case PNG_CRC_WARN_DISCARD: /* warn/discard data */
+ case PNG_CRC_DEFAULT:
+ default:
+ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+ break;
+ }
+}
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* handle alpha and tRNS via a background color */
+void
+png_set_background(png_structp png_ptr,
+ png_color_16p background_color, int background_gamma_code,
+ int need_expand, double background_gamma)
+{
+ png_debug(1, "in png_set_background\n");
+ if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
+ {
+ png_warning(png_ptr, "Application must supply a known background gamma");
+ return;
+ }
+
+ png_ptr->transformations |= PNG_BACKGROUND;
+ png_memcpy(&(png_ptr->background), background_color, sizeof(png_color_16));
+ png_ptr->background_gamma = (float)background_gamma;
+ png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
+ png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
+
+ /* Note: if need_expand is set and color_type is either RGB or RGB_ALPHA
+ * (in which case need_expand is superfluous anyway), the background color
+ * might actually be gray yet not be flagged as such. This is not a problem
+ * for the current code, which uses PNG_FLAG_BACKGROUND_IS_GRAY only to
+ * decide when to do the png_do_gray_to_rgb() transformation.
+ */
+ if ((need_expand && !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) ||
+ (!need_expand && background_color->red == background_color->green &&
+ background_color->red == background_color->blue))
+ png_ptr->flags |= PNG_FLAG_BACKGROUND_IS_GRAY;
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip 16 bit depth files to 8 bit depth */
+void
+png_set_strip_16(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_strip_16\n");
+ png_ptr->transformations |= PNG_16_TO_8;
+}
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+void
+png_set_strip_alpha(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_strip_alpha\n");
+ png_ptr->transformations |= PNG_STRIP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Dither file to 8 bit. Supply a palette, the current number
+ * of elements in the palette, the maximum number of elements
+ * allowed, and a histogram if possible. If the current number
+ * of colors is greater then the maximum number, the palette will be
+ * modified to fit in the maximum number. "full_dither" indicates
+ * whether we need a dithering cube set up for RGB images, or if we
+ * simply are reducing the number of colors in a paletted image.
+ */
+
+typedef struct png_dsort_struct
+{
+ struct png_dsort_struct FAR * next;
+ png_byte left;
+ png_byte right;
+} png_dsort;
+typedef png_dsort FAR * png_dsortp;
+typedef png_dsort FAR * FAR * png_dsortpp;
+
+void
+png_set_dither(png_structp png_ptr, png_colorp palette,
+ int num_palette, int maximum_colors, png_uint_16p histogram,
+ int full_dither)
+{
+ png_debug(1, "in png_set_dither\n");
+ png_ptr->transformations |= PNG_DITHER;
+
+ if (!full_dither)
+ {
+ int i;
+
+ png_ptr->dither_index = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)(num_palette * sizeof (png_byte)));
+ for (i = 0; i < num_palette; i++)
+ png_ptr->dither_index[i] = (png_byte)i;
+ }
+
+ if (num_palette > maximum_colors)
+ {
+ if (histogram != NULL)
+ {
+ /* This is easy enough, just throw out the least used colors.
+ Perhaps not the best solution, but good enough. */
+
+ int i;
+ png_bytep sort;
+
+ /* initialize an array to sort colors */
+ sort = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_palette
+ * sizeof (png_byte)));
+
+ /* initialize the sort array */
+ for (i = 0; i < num_palette; i++)
+ sort[i] = (png_byte)i;
+
+ /* Find the least used palette entries by starting a
+ bubble sort, and running it until we have sorted
+ out enough colors. Note that we don't care about
+ sorting all the colors, just finding which are
+ least used. */
+
+ for (i = num_palette - 1; i >= maximum_colors; i--)
+ {
+ int done; /* to stop early if the list is pre-sorted */
+ int j;
+
+ done = 1;
+ for (j = 0; j < i; j++)
+ {
+ if (histogram[sort[j]] < histogram[sort[j + 1]])
+ {
+ png_byte t;
+
+ t = sort[j];
+ sort[j] = sort[j + 1];
+ sort[j + 1] = t;
+ done = 0;
+ }
+ }
+ if (done)
+ break;
+ }
+
+ /* swap the palette around, and set up a table, if necessary */
+ if (full_dither)
+ {
+ int j = num_palette;
+
+ /* put all the useful colors within the max, but don't
+ move the others */
+ for (i = 0; i < maximum_colors; i++)
+ {
+ if ((int)sort[i] >= maximum_colors)
+ {
+ do
+ j--;
+ while ((int)sort[j] >= maximum_colors);
+ palette[i] = palette[j];
+ }
+ }
+ }
+ else
+ {
+ int j = num_palette;
+
+ /* move all the used colors inside the max limit, and
+ develop a translation table */
+ for (i = 0; i < maximum_colors; i++)
+ {
+ /* only move the colors we need to */
+ if ((int)sort[i] >= maximum_colors)
+ {
+ png_color tmp_color;
+
+ do
+ j--;
+ while ((int)sort[j] >= maximum_colors);
+
+ tmp_color = palette[j];
+ palette[j] = palette[i];
+ palette[i] = tmp_color;
+ /* indicate where the color went */
+ png_ptr->dither_index[j] = (png_byte)i;
+ png_ptr->dither_index[i] = (png_byte)j;
+ }
+ }
+
+ /* find closest color for those colors we are not using */
+ for (i = 0; i < num_palette; i++)
+ {
+ if ((int)png_ptr->dither_index[i] >= maximum_colors)
+ {
+ int min_d, k, min_k, d_index;
+
+ /* find the closest color to one we threw out */
+ d_index = png_ptr->dither_index[i];
+ min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
+ for (k = 1, min_k = 0; k < maximum_colors; k++)
+ {
+ int d;
+
+ d = PNG_COLOR_DIST(palette[d_index], palette[k]);
+
+ if (d < min_d)
+ {
+ min_d = d;
+ min_k = k;
+ }
+ }
+ /* point to closest color */
+ png_ptr->dither_index[i] = (png_byte)min_k;
+ }
+ }
+ }
+ png_free(png_ptr, sort);
+ }
+ else
+ {
+ /* This is much harder to do simply (and quickly). Perhaps
+ we need to go through a median cut routine, but those
+ don't always behave themselves with only a few colors
+ as input. So we will just find the closest two colors,
+ and throw out one of them (chosen somewhat randomly).
+ [We don't understand this at all, so if someone wants to
+ work on improving it, be our guest - AED, GRP]
+ */
+ int i;
+ int max_d;
+ int num_new_palette;
+ png_dsortpp hash;
+ png_bytep index_to_palette;
+ /* where the original index currently is in the palette */
+ png_bytep palette_to_index;
+ /* which original index points to this palette color */
+
+ /* initialize palette index arrays */
+ index_to_palette = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)(num_palette * sizeof (png_byte)));
+ palette_to_index = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)(num_palette * sizeof (png_byte)));
+
+ /* initialize the sort array */
+ for (i = 0; i < num_palette; i++)
+ {
+ index_to_palette[i] = (png_byte)i;
+ palette_to_index[i] = (png_byte)i;
+ }
+
+ hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 *
+ sizeof (png_dsortp)));
+ for (i = 0; i < 769; i++)
+ hash[i] = NULL;
+/* png_memset(hash, 0, 769 * sizeof (png_dsortp)); */
+
+ num_new_palette = num_palette;
+
+ /* initial wild guess at how far apart the farthest pixel
+ pair we will be eliminating will be. Larger
+ numbers mean more areas will be allocated, Smaller
+ numbers run the risk of not saving enough data, and
+ having to do this all over again.
+
+ I have not done extensive checking on this number.
+ */
+ max_d = 96;
+
+ while (num_new_palette > maximum_colors)
+ {
+ for (i = 0; i < num_new_palette - 1; i++)
+ {
+ int j;
+
+ for (j = i + 1; j < num_new_palette; j++)
+ {
+ int d;
+
+ d = PNG_COLOR_DIST(palette[i], palette[j]);
+
+ if (d <= max_d)
+ {
+ png_dsortp t;
+
+ t = (png_dsortp)png_malloc(png_ptr, (png_uint_32)(sizeof
+ (png_dsort)));
+ t->next = hash[d];
+ t->left = (png_byte)i;
+ t->right = (png_byte)j;
+ hash[d] = t;
+ }
+ }
+ }
+
+ for (i = 0; i <= max_d; i++)
+ {
+ if (hash[i] != NULL)
+ {
+ png_dsortp p;
+
+ for (p = hash[i]; p; p = p->next)
+ {
+ if ((int)index_to_palette[p->left] < num_new_palette &&
+ (int)index_to_palette[p->right] < num_new_palette)
+ {
+ int j, next_j;
+
+ if (num_new_palette & 1)
+ {
+ j = p->left;
+ next_j = p->right;
+ }
+ else
+ {
+ j = p->right;
+ next_j = p->left;
+ }
+
+ num_new_palette--;
+ palette[index_to_palette[j]] = palette[num_new_palette];
+ if (!full_dither)
+ {
+ int k;
+
+ for (k = 0; k < num_palette; k++)
+ {
+ if (png_ptr->dither_index[k] ==
+ index_to_palette[j])
+ png_ptr->dither_index[k] =
+ index_to_palette[next_j];
+ if ((int)png_ptr->dither_index[k] ==
+ num_new_palette)
+ png_ptr->dither_index[k] =
+ index_to_palette[j];
+ }
+ }
+
+ index_to_palette[palette_to_index[num_new_palette]] =
+ index_to_palette[j];
+ palette_to_index[index_to_palette[j]] =
+ palette_to_index[num_new_palette];
+
+ index_to_palette[j] = (png_byte)num_new_palette;
+ palette_to_index[num_new_palette] = (png_byte)j;
+ }
+ if (num_new_palette <= maximum_colors)
+ break;
+ }
+ if (num_new_palette <= maximum_colors)
+ break;
+ }
+ }
+
+ for (i = 0; i < 769; i++)
+ {
+ if (hash[i] != NULL)
+ {
+ png_dsortp p = hash[i];
+ while (p)
+ {
+ png_dsortp t;
+
+ t = p->next;
+ png_free(png_ptr, p);
+ p = t;
+ }
+ }
+ hash[i] = 0;
+ }
+ max_d += 96;
+ }
+ png_free(png_ptr, hash);
+ png_free(png_ptr, palette_to_index);
+ png_free(png_ptr, index_to_palette);
+ }
+ num_palette = maximum_colors;
+ }
+ if (png_ptr->palette == NULL)
+ {
+ png_ptr->palette = palette;
+ }
+ png_ptr->num_palette = (png_uint_16)num_palette;
+
+ if (full_dither)
+ {
+ int i;
+ png_bytep distance;
+ int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +
+ PNG_DITHER_BLUE_BITS;
+ int num_red = (1 << PNG_DITHER_RED_BITS);
+ int num_green = (1 << PNG_DITHER_GREEN_BITS);
+ int num_blue = (1 << PNG_DITHER_BLUE_BITS);
+ png_size_t num_entries = ((png_size_t)1 << total_bits);
+
+ png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr,
+ (png_uint_32)(num_entries * sizeof (png_byte)));
+
+ png_memset(png_ptr->palette_lookup, 0, num_entries * sizeof (png_byte));
+
+ distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
+ sizeof(png_byte)));
+
+ png_memset(distance, 0xff, num_entries * sizeof(png_byte));
+
+ for (i = 0; i < num_palette; i++)
+ {
+ int ir, ig, ib;
+ int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS));
+ int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS));
+ int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS));
+
+ for (ir = 0; ir < num_red; ir++)
+ {
+ int dr = abs(ir - r);
+ int index_r = (ir << (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS));
+
+ for (ig = 0; ig < num_green; ig++)
+ {
+ int dg = abs(ig - g);
+ int dt = dr + dg;
+ int dm = ((dr > dg) ? dr : dg);
+ int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS);
+
+ for (ib = 0; ib < num_blue; ib++)
+ {
+ int d_index = index_g | ib;
+ int db = abs(ib - b);
+ int dmax = ((dm > db) ? dm : db);
+ int d = dmax + dt + db;
+
+ if (d < (int)distance[d_index])
+ {
+ distance[d_index] = (png_byte)d;
+ png_ptr->palette_lookup[d_index] = (png_byte)i;
+ }
+ }
+ }
+ }
+ }
+
+ png_free(png_ptr, distance);
+ }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Transform the image from the file_gamma to the screen_gamma. We
+ * only do transformations on images where the file_gamma and screen_gamma
+ * are not close reciprocals, otherwise it slows things down slightly, and
+ * also needlessly introduces small errors.
+ */
+void
+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+{
+ png_debug(1, "in png_set_gamma\n");
+ if (fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD)
+ png_ptr->transformations |= PNG_GAMMA;
+ png_ptr->gamma = (float)file_gamma;
+ png_ptr->screen_gamma = (float)scrn_gamma;
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand paletted images to rgb, expand grayscale images of
+ * less than 8 bit depth to 8 bit depth, and expand tRNS chunks
+ * to alpha channels.
+ */
+void
+png_set_expand(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_expand\n");
+ png_ptr->transformations |= PNG_EXPAND;
+}
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+void
+png_set_gray_to_rgb(png_structp png_ptr)
+{
+ png_debug(1, "in png_set_gray_to_rgb\n");
+ png_ptr->transformations |= PNG_GRAY_TO_RGB;
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* Convert a RGB image to a grayscale of the same width. This allows us,
+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
+ */
+void
+png_set_rgb_to_gray(png_structp png_ptr, int error_action, float red,
+ float green)
+{
+ png_debug(1, "in png_set_rgb_to_gray\n");
+ switch(error_action)
+ {
+ case 1: png_ptr->transformations |= PNG_RGB_TO_GRAY;
+ break;
+ case 2: png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
+ break;
+ case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+ }
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ png_ptr->transformations |= PNG_EXPAND;
+#else
+ {
+ png_warning(png_ptr, "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED.");
+ png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+ }
+#endif
+ {
+ png_byte red_byte = (png_byte)(red*255.0 + 0.5);
+ png_byte green_byte = (png_byte)(green*255.0 + 0.5);
+ if(red < 0.0 || green < 0.0)
+ {
+ red_byte = 54;
+ green_byte = 183;
+ }
+ else if(red_byte + green_byte > 255)
+ {
+ png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+ red_byte = 54;
+ green_byte = 183;
+ }
+ png_ptr->rgb_to_gray_red_coeff = red_byte;
+ png_ptr->rgb_to_gray_green_coeff = green_byte;
+ png_ptr->rgb_to_gray_blue_coeff = 255 - red_byte - green_byte;
+ }
+}
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+void
+png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+ read_user_transform_fn)
+{
+ png_debug(1, "in png_set_read_user_transform_fn\n");
+ png_ptr->transformations |= PNG_USER_TRANSFORM;
+ png_ptr->read_user_transform_fn = read_user_transform_fn;
+}
+#endif
+
+/* Initialize everything needed for the read. This includes modifying
+ * the palette.
+ */
+void
+png_init_read_transformations(png_structp png_ptr)
+{
+ png_debug(1, "in png_init_read_transformations\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if(png_ptr != NULL)
+#endif
+ {
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \
+ || defined(PNG_READ_GAMMA_SUPPORTED)
+ int color_type = png_ptr->color_type;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->transformations & PNG_BACKGROUND_EXPAND)
+ {
+ if (!(color_type & PNG_COLOR_MASK_COLOR)) /* i.e., GRAY or GRAY_ALPHA */
+ {
+ /* expand background chunk. */
+ switch (png_ptr->bit_depth)
+ {
+ case 1:
+ png_ptr->background.gray *= (png_uint_16)0xff;
+ png_ptr->background.red = png_ptr->background.green =
+ png_ptr->background.blue = png_ptr->background.gray;
+ break;
+ case 2:
+ png_ptr->background.gray *= (png_uint_16)0x55;
+ png_ptr->background.red = png_ptr->background.green =
+ png_ptr->background.blue = png_ptr->background.gray;
+ break;
+ case 4:
+ png_ptr->background.gray *= (png_uint_16)0x11;
+ png_ptr->background.red = png_ptr->background.green =
+ png_ptr->background.blue = png_ptr->background.gray;
+ break;
+ case 8:
+ case 16:
+ png_ptr->background.red = png_ptr->background.green =
+ png_ptr->background.blue = png_ptr->background.gray;
+ break;
+ }
+ }
+ else if (color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_ptr->background.red =
+ png_ptr->palette[png_ptr->background.index].red;
+ png_ptr->background.green =
+ png_ptr->palette[png_ptr->background.index].green;
+ png_ptr->background.blue =
+ png_ptr->palette[png_ptr->background.index].blue;
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ {
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ if (!(png_ptr->transformations & PNG_EXPAND))
+#endif
+ {
+ /* invert the alpha channel (in tRNS) unless the pixels are
+ going to be expanded, in which case leave it for later */
+ int i,istop;
+ istop=(int)png_ptr->num_trans;
+ for (i=0; i<istop; i++)
+ png_ptr->trans[i] = 255 - png_ptr->trans[i];
+ }
+ }
+#endif
+
+ }
+ }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ png_ptr->background_1 = png_ptr->background;
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY))
+ {
+ png_build_gamma_table(png_ptr);
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->transformations & PNG_BACKGROUND)
+ {
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_color back, back_1;
+ png_colorp palette = png_ptr->palette;
+ int num_palette = png_ptr->num_palette;
+ int i;
+
+ if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+ {
+ back.red = png_ptr->gamma_table[png_ptr->background.red];
+ back.green = png_ptr->gamma_table[png_ptr->background.green];
+ back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+ back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+ back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+ back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+ }
+ else
+ {
+ double g, gs;
+
+ switch (png_ptr->background_gamma_type)
+ {
+ case PNG_BACKGROUND_GAMMA_SCREEN:
+ g = (png_ptr->screen_gamma);
+ gs = 1.0;
+ break;
+ case PNG_BACKGROUND_GAMMA_FILE:
+ g = 1.0 / (png_ptr->gamma);
+ gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+ break;
+ case PNG_BACKGROUND_GAMMA_UNIQUE:
+ g = 1.0 / (png_ptr->background_gamma);
+ gs = 1.0 / (png_ptr->background_gamma *
+ png_ptr->screen_gamma);
+ break;
+ default:
+ g = 1.0; /* back_1 */
+ gs = 1.0; /* back */
+ }
+
+ if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD)
+ {
+ back.red = (png_byte)png_ptr->background.red;
+ back.green = (png_byte)png_ptr->background.green;
+ back.blue = (png_byte)png_ptr->background.blue;
+ }
+ else
+ {
+ back.red = (png_byte)(pow(
+ (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+ back.green = (png_byte)(pow(
+ (double)png_ptr->background.green/255, gs) * 255.0 + .5);
+ back.blue = (png_byte)(pow(
+ (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+ }
+
+ back_1.red = (png_byte)(pow(
+ (double)png_ptr->background.red/255, g) * 255.0 + .5);
+ back_1.green = (png_byte)(pow(
+ (double)png_ptr->background.green/255, g) * 255.0 + .5);
+ back_1.blue = (png_byte)(pow(
+ (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+ }
+
+ for (i = 0; i < num_palette; i++)
+ {
+ if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+ {
+ if (png_ptr->trans[i] == 0)
+ {
+ palette[i] = back;
+ }
+ else /* if (png_ptr->trans[i] != 0xff) */
+ {
+ png_byte v, w;
+
+ v = png_ptr->gamma_to_1[palette[i].red];
+ png_composite(w, v, png_ptr->trans[i], back_1.red);
+ palette[i].red = png_ptr->gamma_from_1[w];
+
+ v = png_ptr->gamma_to_1[palette[i].green];
+ png_composite(w, v, png_ptr->trans[i], back_1.green);
+ palette[i].green = png_ptr->gamma_from_1[w];
+
+ v = png_ptr->gamma_to_1[palette[i].blue];
+ png_composite(w, v, png_ptr->trans[i], back_1.blue);
+ palette[i].blue = png_ptr->gamma_from_1[w];
+ }
+ }
+ else
+ {
+ palette[i].red = png_ptr->gamma_table[palette[i].red];
+ palette[i].green = png_ptr->gamma_table[palette[i].green];
+ palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+ }
+ }
+ }
+ /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN)*/
+ else
+ /* color_type != PNG_COLOR_TYPE_PALETTE */
+ {
+ double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1);
+ double g = 1.0;
+ double gs = 1.0;
+
+ switch (png_ptr->background_gamma_type)
+ {
+ case PNG_BACKGROUND_GAMMA_SCREEN:
+ g = (png_ptr->screen_gamma);
+ gs = 1.0;
+ break;
+ case PNG_BACKGROUND_GAMMA_FILE:
+ g = 1.0 / (png_ptr->gamma);
+ gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+ break;
+ case PNG_BACKGROUND_GAMMA_UNIQUE:
+ g = 1.0 / (png_ptr->background_gamma);
+ gs = 1.0 / (png_ptr->background_gamma *
+ png_ptr->screen_gamma);
+ break;
+ }
+
+ if (color_type & PNG_COLOR_MASK_COLOR)
+ {
+ /* RGB or RGBA */
+ png_ptr->background_1.red = (png_uint_16)(pow(
+ (double)png_ptr->background.red / m, g) * m + .5);
+ png_ptr->background_1.green = (png_uint_16)(pow(
+ (double)png_ptr->background.green / m, g) * m + .5);
+ png_ptr->background_1.blue = (png_uint_16)(pow(
+ (double)png_ptr->background.blue / m, g) * m + .5);
+ png_ptr->background.red = (png_uint_16)(pow(
+ (double)png_ptr->background.red / m, gs) * m + .5);
+ png_ptr->background.green = (png_uint_16)(pow(
+ (double)png_ptr->background.green / m, gs) * m + .5);
+ png_ptr->background.blue = (png_uint_16)(pow(
+ (double)png_ptr->background.blue / m, gs) * m + .5);
+ }
+ else
+ {
+ /* GRAY or GRAY ALPHA */
+ png_ptr->background_1.gray = (png_uint_16)(pow(
+ (double)png_ptr->background.gray / m, g) * m + .5);
+ png_ptr->background.gray = (png_uint_16)(pow(
+ (double)png_ptr->background.gray / m, gs) * m + .5);
+ }
+ }
+ }
+ else
+ /* transformation does not include PNG_BACKGROUND */
+#endif
+ if (color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_colorp palette = png_ptr->palette;
+ int num_palette = png_ptr->num_palette;
+ int i;
+
+ for (i = 0; i < num_palette; i++)
+ {
+ palette[i].red = png_ptr->gamma_table[palette[i].red];
+ palette[i].green = png_ptr->gamma_table[palette[i].green];
+ palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+ }
+ }
+ }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ else
+#endif
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ /* No GAMMA transformation */
+ if (png_ptr->transformations & PNG_BACKGROUND &&
+ color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ int i;
+ int istop = (int)png_ptr->num_trans;
+ png_color back;
+ png_colorp palette = png_ptr->palette;
+
+ back.red = (png_byte)png_ptr->background.red;
+ back.green = (png_byte)png_ptr->background.green;
+ back.blue = (png_byte)png_ptr->background.blue;
+
+ for (i = 0; i < istop; i++)
+ {
+ if (png_ptr->trans[i] == 0)
+ {
+ palette[i] = back;
+ }
+ else if (png_ptr->trans[i] != 0xff)
+ {
+ /* The png_composite() macro is defined in png.h */
+ png_composite(palette[i].red, palette[i].red,
+ png_ptr->trans[i], back.red);
+ png_composite(palette[i].green, palette[i].green,
+ png_ptr->trans[i], back.green);
+ png_composite(palette[i].blue, palette[i].blue,
+ png_ptr->trans[i], back.blue);
+ }
+ }
+ }
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+ if ((png_ptr->transformations & PNG_SHIFT) &&
+ color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_uint_16 i;
+ png_uint_16 istop = png_ptr->num_palette;
+ int sr = 8 - png_ptr->sig_bit.red;
+ int sg = 8 - png_ptr->sig_bit.green;
+ int sb = 8 - png_ptr->sig_bit.blue;
+
+ if (sr < 0 || sr > 8)
+ sr = 0;
+ if (sg < 0 || sg > 8)
+ sg = 0;
+ if (sb < 0 || sb > 8)
+ sb = 0;
+ for (i = 0; i < istop; i++)
+ {
+ png_ptr->palette[i].red >>= sr;
+ png_ptr->palette[i].green >>= sg;
+ png_ptr->palette[i].blue >>= sb;
+ }
+ }
+#endif
+ }
+}
+
+/* Modify the info structure to reflect the transformations. The
+ * info should be updated so a PNG file could be written with it,
+ * assuming the transformations result in valid PNG data.
+ */
+void
+png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+{
+ png_debug(1, "in png_read_transform_info\n");
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ if (png_ptr->transformations & PNG_EXPAND)
+ {
+ if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (png_ptr->num_trans)
+ info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ else
+ info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+ info_ptr->bit_depth = 8;
+ info_ptr->num_trans = 0;
+ }
+ else
+ {
+ if (png_ptr->num_trans)
+ info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+ if (info_ptr->bit_depth < 8)
+ info_ptr->bit_depth = 8;
+ info_ptr->num_trans = 0;
+ }
+ }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->transformations & PNG_BACKGROUND)
+ {
+ info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+ info_ptr->num_trans = 0;
+ info_ptr->background = png_ptr->background;
+ }
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (png_ptr->transformations & PNG_GAMMA)
+ info_ptr->gamma = png_ptr->gamma;
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+ if ((png_ptr->transformations & PNG_16_TO_8) && info_ptr->bit_depth == 16)
+ info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+ if (png_ptr->transformations & PNG_DITHER)
+ {
+ if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+ (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
+ png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+ {
+ info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+ }
+ }
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+ if ((png_ptr->transformations & PNG_PACK) && info_ptr->bit_depth < 8)
+ info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+ if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+ info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+ if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
+#endif
+
+ if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ info_ptr->channels = 1;
+ else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ info_ptr->channels = 3;
+ else
+ info_ptr->channels = 1;
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_STRIP_ALPHA)
+ info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+#endif
+
+ if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ info_ptr->channels++;
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+ /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */
+ if (png_ptr->transformations & PNG_FILLER &&
+ (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
+ info_ptr->color_type == PNG_COLOR_TYPE_GRAY))
+ ++info_ptr->channels;
+#endif
+
+ info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
+ info_ptr->bit_depth);
+ info_ptr->rowbytes = ((info_ptr->width * info_ptr->pixel_depth + 7) >> 3);
+}
+
+/* Transform the row. The order of transformations is significant,
+ * and is very touchy. If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
+void
+png_do_read_transformations(png_structp png_ptr)
+{
+ png_debug(1, "in png_do_read_transformations\n");
+#if !defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (png_ptr->row_buf == NULL)
+ {
+#if !defined(PNG_NO_STDIO)
+ char msg[50];
+
+ sprintf(msg, "NULL row buffer for row %ld, pass %d", png_ptr->row_number,
+ png_ptr->pass);
+ png_error(png_ptr, msg);
+#else
+ png_error(png_ptr, "NULL row buffer");
+#endif
+ }
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+ if (png_ptr->transformations & PNG_EXPAND)
+ {
+ if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
+ }
+ else
+ {
+ if (png_ptr->num_trans)
+ png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ &(png_ptr->trans_values));
+ else
+ png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ NULL);
+ }
+ }
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_STRIP_ALPHA)
+ png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ PNG_FLAG_FILLER_AFTER);
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+ if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ {
+ int rgb_error =
+ png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info), png_ptr->row_buf + 1);
+ if(rgb_error)
+ {
+ png_ptr->rgb_to_gray_status=1;
+ if(png_ptr->transformations == PNG_RGB_TO_GRAY_WARN)
+ png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+ if(png_ptr->transformations == PNG_RGB_TO_GRAY_ERR)
+ png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+ }
+ }
+#endif
+
+/*
+From Andreas Dilger e-mail to png-implement, 26 March 1998:
+
+ In most cases, the "simple transparency" should be done prior to doing
+ gray-to-RGB, or you will have to test 3x as many bytes to check if a
+ pixel is transparent. You would also need to make sure that the
+ transparency information is upgraded to RGB.
+
+ To summarize, the current flow is:
+ - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+ with background "in place" if transparent,
+ convert to RGB if necessary
+ - Gray + alpha -> composite with gray background and remove alpha bytes,
+ convert to RGB if necessary
+
+ To support RGB backgrounds for gray images we need:
+ - Gray + simple transparency -> convert to RGB + simple transparency, compare
+ 3 or 6 bytes and composite with background
+ "in place" if transparent (3x compare/pixel
+ compared to doing composite with gray bkgrnd)
+ - Gray + alpha -> convert to RGB + alpha, composite with background and
+ remove alpha bytes (3x float operations/pixel
+ compared with composite on gray background)
+
+ Greg's change will do this. The reason it wasn't done before is for
+ performance, as this increases the per-pixel operations. If we would check
+ in advance if the background was gray or RGB, and position the gray-to-RGB
+ transform appropriately, then it would save a lot of work/time.
+ */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+ /* if gray -> RGB, do so now only if background is non-gray; else do later
+ * for performance reasons */
+ if (png_ptr->transformations & PNG_GRAY_TO_RGB &&
+ !(png_ptr->flags & PNG_FLAG_BACKGROUND_IS_GRAY))
+ png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if ((png_ptr->transformations & PNG_BACKGROUND) &&
+ ((png_ptr->num_trans != 0 ) ||
+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
+ png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ &(png_ptr->trans_values), &(png_ptr->background),
+ &(png_ptr->background_1),
+ png_ptr->gamma_table, png_ptr->gamma_from_1,
+ png_ptr->gamma_to_1, png_ptr->gamma_16_table,
+ png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
+ png_ptr->gamma_shift);
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if ((png_ptr->transformations & PNG_GAMMA) &&
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ !((png_ptr->transformations & PNG_BACKGROUND) &&
+ ((png_ptr->num_trans != 0) ||
+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+#endif
+ (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+ png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ png_ptr->gamma_table, png_ptr->gamma_16_table,
+ png_ptr->gamma_shift);
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+ if (png_ptr->transformations & PNG_16_TO_8)
+ png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+ if (png_ptr->transformations & PNG_DITHER)
+ {
+ png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
+ png_ptr->palette_lookup, png_ptr->dither_index);
+ if(png_ptr->row_info.rowbytes == (png_uint_32)0)
+ png_error(png_ptr, "png_do_dither returned rowbytes=0");
+ }
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_MONO)
+ png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+ if (png_ptr->transformations & PNG_SHIFT)
+ png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ &(png_ptr->shift));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACK)
+ png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+ if (png_ptr->transformations & PNG_BGR)
+ png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_PACKSWAP)
+ png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+ /* if gray -> RGB, do so now only if we did not do so above */
+ if (png_ptr->transformations & PNG_GRAY_TO_RGB &&
+ png_ptr->flags & PNG_FLAG_BACKGROUND_IS_GRAY)
+ png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+ if (png_ptr->transformations & PNG_FILLER)
+ png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+ (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_ALPHA)
+ png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+ if (png_ptr->transformations & PNG_SWAP_BYTES)
+ png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+ if (png_ptr->transformations & PNG_USER_TRANSFORM)
+ if(png_ptr->read_user_transform_fn != NULL)
+ (*(png_ptr->read_user_transform_fn)) /* user read transform function */
+ (png_ptr, /* png_ptr */
+ &(png_ptr->row_info), /* row_info: */
+ /* png_uint_32 width; width of row */
+ /* png_uint_32 rowbytes; number of bytes in row */
+ /* png_byte color_type; color type of pixels */
+ /* png_byte bit_depth; bit depth of samples */
+ /* png_byte channels; number of channels (1-4) */
+ /* png_byte pixel_depth; bits per pixel (depth*channels) */
+ png_ptr->row_buf + 1); /* start of pixel data for row */
+#endif
+
+}
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
+ * without changing the actual values. Thus, if you had a row with
+ * a bit depth of 1, you would end up with bytes that only contained
+ * the numbers 0 or 1. If you would rather they contain 0 and 255, use
+ * png_do_shift() after this.
+ */
+void
+png_do_unpack(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_unpack\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL && row_info->bit_depth < 8)
+#else
+ if (row_info->bit_depth < 8)
+#endif
+ {
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+
+ switch (row_info->bit_depth)
+ {
+ case 1:
+ {
+ png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
+ png_bytep dp = row + (png_size_t)row_width - 1;
+ png_uint_32 shift = 7 - (int)((row_width + 7) & 7);
+ for (i = 0; i < row_width; i++)
+ {
+ *dp = (png_byte)((*sp >> shift) & 0x1);
+ if (shift == 7)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift++;
+
+ dp--;
+ }
+ break;
+ }
+ case 2:
+ {
+
+ png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
+ png_bytep dp = row + (png_size_t)row_width - 1;
+ png_uint_32 shift = (int)((3 - ((row_width + 3) & 3)) << 1);
+ for (i = 0; i < row_width; i++)
+ {
+ *dp = (png_byte)((*sp >> shift) & 0x3);
+ if (shift == 6)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift += 2;
+
+ dp--;
+ }
+ break;
+ }
+ case 4:
+ {
+ png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
+ png_bytep dp = row + (png_size_t)row_width - 1;
+ png_uint_32 shift = (int)((1 - ((row_width + 1) & 1)) << 2);
+ for (i = 0; i < row_width; i++)
+ {
+ *dp = (png_byte)((*sp >> shift) & 0xf);
+ if (shift == 4)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift = 4;
+
+ dp--;
+ }
+ break;
+ }
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+ row_info->rowbytes = row_width * row_info->channels;
+ }
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+/* Reverse the effects of png_do_shift. This routine merely shifts the
+ * pixels back to their significant bits values. Thus, if you have
+ * a row of bit depth 8, but only 5 are significant, this will shift
+ * the values back to 0 through 31.
+ */
+void
+png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
+{
+ png_debug(1, "in png_do_unshift\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL && sig_bits != NULL &&
+#endif
+ row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+ {
+ int shift[4];
+ int channels = 0;
+ int c;
+ png_uint_16 value = 0;
+ png_uint_32 row_width = row_info->width;
+
+ if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+ {
+ shift[channels++] = row_info->bit_depth - sig_bits->red;
+ shift[channels++] = row_info->bit_depth - sig_bits->green;
+ shift[channels++] = row_info->bit_depth - sig_bits->blue;
+ }
+ else
+ {
+ shift[channels++] = row_info->bit_depth - sig_bits->gray;
+ }
+ if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ shift[channels++] = row_info->bit_depth - sig_bits->alpha;
+ }
+
+ for (c = 0; c < channels; c++)
+ {
+ if (shift[c] <= 0)
+ shift[c] = 0;
+ else
+ value = 1;
+ }
+
+ if (!value)
+ return;
+
+ switch (row_info->bit_depth)
+ {
+ case 2:
+ {
+ png_bytep bp;
+ png_uint_32 i;
+ png_uint_32 istop = row_info->rowbytes;
+
+ for (bp = row, i = 0; i < istop; i++)
+ {
+ *bp >>= 1;
+ *bp++ &= 0x55;
+ }
+ break;
+ }
+ case 4:
+ {
+ png_bytep bp = row;
+ png_uint_32 i;
+ png_uint_32 istop = row_info->rowbytes;
+ png_byte mask = (png_byte)(((int)0xf0 >> shift[0]) & (int)0xf0) |
+ (png_byte)((int)0xf >> shift[0]);
+
+ for (i = 0; i < istop; i++)
+ {
+ *bp >>= shift[0];
+ *bp++ &= mask;
+ }
+ break;
+ }
+ case 8:
+ {
+ png_bytep bp = row;
+ png_uint_32 i;
+ png_uint_32 istop = row_width * channels;
+
+ for (i = 0; i < istop; i++)
+ {
+ *bp++ >>= shift[i%channels];
+ }
+ break;
+ }
+ case 16:
+ {
+ png_bytep bp = row;
+ png_uint_32 i;
+ png_uint_32 istop = channels * row_width;
+
+ for (i = 0; i < istop; i++)
+ {
+ value = (png_uint_16)((*bp << 8) + *(bp + 1));
+ value >>= shift[i%channels];
+ *bp++ = (png_byte)(value >> 8);
+ *bp++ = (png_byte)(value & 0xff);
+ }
+ break;
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* chop rows of bit depth 16 down to 8 */
+void
+png_do_chop(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_chop\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL && row_info->bit_depth == 16)
+#else
+ if (row_info->bit_depth == 16)
+#endif
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ png_uint_32 i;
+ png_uint_32 istop = row_info->width * row_info->channels;
+
+ for (i = 0; i<istop; i++, sp += 2, dp++)
+ {
+#if defined(PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED)
+ /* This does a more accurate scaling of the 16-bit color
+ * value, rather than a simple low-byte truncation.
+ *
+ * What the ideal calculation should be:
+ * *dp = (((((png_uint_32)(*sp) << 8) |
+ * (png_uint_32)(*(sp + 1))) * 255 + 127) / (png_uint_32)65535L;
+ *
+ * GRR: no, I think this is what it really should be:
+ * *dp = (((((png_uint_32)(*sp) << 8) |
+ * (png_uint_32)(*(sp + 1))) + 128L) / (png_uint_32)257L;
+ *
+ * GRR: here's the exact calculation with shifts:
+ * temp = (((png_uint_32)(*sp) << 8) | (png_uint_32)(*(sp + 1))) + 128L;
+ * *dp = (temp - (temp >> 8)) >> 8;
+ *
+ * Approximate calculation with shift/add instead of multiply/divide:
+ * *dp = ((((png_uint_32)(*sp) << 8) |
+ * (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
+ *
+ * What we actually do to avoid extra shifting and conversion:
+ */
+
+ *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
+#else
+ /* Simply discard the low order byte */
+ *dp = *sp;
+#endif
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+ row_info->rowbytes = row_info->width * row_info->channels;
+ }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+void
+png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_read_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ png_uint_32 row_width = row_info->width;
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ /* This converts from RGBA to ARGB */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_byte save;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ save = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = save;
+ }
+ }
+ /* This converts from RRGGBBAA to AARRGGBB */
+ else
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_byte save[2];
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ save[0] = *(--sp);
+ save[1] = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = save[0];
+ *(--dp) = save[1];
+ }
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ /* This converts from GA to AG */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_byte save;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ save = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = save;
+ }
+ }
+ /* This converts from GGAA to AAGG */
+ else
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_byte save[2];
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ save[0] = *(--sp);
+ save[1] = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = save[0];
+ *(--dp) = save[1];
+ }
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+void
+png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+ png_debug(1, "in png_do_read_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ png_uint_32 row_width = row_info->width;
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ /* This inverts the alpha channel in RGBA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ }
+ /* This inverts the alpha channel in RRGGBBAA */
+ else
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ /* This inverts the alpha channel in GA */
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = *(--sp);
+ }
+ }
+ /* This inverts the alpha channel in GGAA */
+ else
+ {
+ png_bytep sp = row + row_info->rowbytes;
+ png_bytep dp = sp;
+ png_uint_32 i;
+
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = 255 - *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+/* Add filler channel if we have RGB color */
+void
+png_do_read_filler(png_row_infop row_info, png_bytep row,
+ png_uint_32 filler, png_uint_32 flags)
+{
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+ png_byte lo_filler = (png_byte)(filler & 0xff);
+
+ png_debug(1, "in png_do_read_filler\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ if(row_info->bit_depth == 8)
+ {
+ /* This changes the data from G to GX */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ png_bytep sp = row + (png_size_t)row_width;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 1; i < row_width; i++)
+ {
+ *(--dp) = lo_filler;
+ *(--dp) = *(--sp);
+ }
+ *(--dp) = lo_filler;
+ row_info->channels = 2;
+ row_info->pixel_depth = 16;
+ row_info->rowbytes = row_width * 2;
+ }
+ /* This changes the data from G to XG */
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = *(--sp);
+ *(--dp) = lo_filler;
+ }
+ row_info->channels = 2;
+ row_info->pixel_depth = 16;
+ row_info->rowbytes = row_width * 2;
+ }
+ }
+ else if(row_info->bit_depth == 16)
+ {
+ /* This changes the data from GG to GGXX */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ png_bytep sp = row + (png_size_t)row_width;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 1; i < row_width; i++)
+ {
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ row_info->channels = 2;
+ row_info->pixel_depth = 32;
+ row_info->rowbytes = row_width * 2;
+ }
+ /* This changes the data from GG to XXGG */
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ }
+ row_info->channels = 2;
+ row_info->pixel_depth = 16;
+ row_info->rowbytes = row_width * 2;
+ }
+ }
+ } /* COLOR_TYPE == GRAY */
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ if(row_info->bit_depth == 8)
+ {
+ /* This changes the data from RGB to RGBX */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ png_bytep sp = row + (png_size_t)row_width * 3;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 1; i < row_width; i++)
+ {
+ *(--dp) = lo_filler;
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ *(--dp) = lo_filler;
+ row_info->channels = 4;
+ row_info->pixel_depth = 32;
+ row_info->rowbytes = row_width * 4;
+ }
+ /* This changes the data from RGB to XRGB */
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width * 3;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = lo_filler;
+ }
+ row_info->channels = 4;
+ row_info->pixel_depth = 32;
+ row_info->rowbytes = row_width * 4;
+ }
+ }
+ else if(row_info->bit_depth == 16)
+ {
+ /* This changes the data from RRGGBB to RRGGBBXX */
+ if (flags & PNG_FLAG_FILLER_AFTER)
+ {
+ png_bytep sp = row + (png_size_t)row_width * 3;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 1; i < row_width; i++)
+ {
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ }
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ row_info->channels = 4;
+ row_info->pixel_depth = 64;
+ row_info->rowbytes = row_width * 4;
+ }
+ /* This changes the data from RRGGBB to XXRRGGBB */
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width * 3;
+ png_bytep dp = sp + (png_size_t)row_width;
+ for (i = 0; i < row_width; i++)
+ {
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = *(--sp);
+ *(--dp) = hi_filler;
+ *(--dp) = lo_filler;
+ }
+ row_info->channels = 4;
+ row_info->pixel_depth = 64;
+ row_info->rowbytes = row_width * 4;
+ }
+ }
+ } /* COLOR_TYPE == RGB */
+}
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* expand grayscale files to RGB, with or without alpha */
+void
+png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
+{
+ png_uint_32 i;
+ png_uint_32 row_width = row_info->width;
+
+ png_debug(1, "in png_do_gray_to_rgb\n");
+ if (row_info->bit_depth >= 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + (png_size_t)row_width - 1;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 0; i < row_width; i++)
+ {
+ *(dp--) = *sp;
+ *(dp--) = *sp;
+ *(dp--) = *sp;
+ sp--;
+ }
+ }
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+ png_bytep dp = sp + (png_size_t)row_width * 4;
+ for (i = 0; i < row_width; i++)
+ {
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ sp--;
+ sp--;
+ }
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+ png_bytep dp = sp + (png_size_t)row_width * 2;
+ for (i = 0; i < row_width; i++)
+ {
+ *(dp--) = *(sp--);
+ *(dp--) = *sp;
+ *(dp--) = *sp;
+ *(dp--) = *sp;
+ sp--;
+ }
+ }
+ else
+ {
+ png_bytep sp = row + (png_size_t)row_width * 4 - 1;
+ png_bytep dp = sp + (png_size_t)row_width * 4;
+ for (i = 0; i < row_width; i++)
+ {
+ *(dp--) = *(sp--);
+ *(dp--) = *(sp--);
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ *(dp--) = *sp;
+ *(dp--) = *(sp - 1);
+ sp--;
+ sp--;
+ }
+ }
+ }
+ row_info->channels += (png_byte)2;
+ row_info->color_type |= PNG_COLOR_MASK_COLOR;
+ row_info->pixel_depth = (png_byte)(row_info->channels *
+ row_info->bit_depth);
+ row_info->rowbytes = ((row_width *
+ row_info->pixel_depth + 7) >> 3);
+ }
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* reduce RGB files to grayscale, with or without alpha
+ * using the equation given in Poynton's ColorFAQ at
+ * <http://www.inforamp.net/~poynton/>
+ * Copyright (c) 1998-01-04 Charles Poynton poynton at inforamp.net
+ *
+ * Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+ *
+ * We approximate this with
+ *
+ * Y = 0.211 * R + 0.715 * G + 0.074 * B
+ *
+ * which can be expressed with integers as
+ *
+ * Y = (54 * R + 183 * G + 19 * B)/256
+ *
+ * The calculation is to be done in a linear colorspace.
+ *
+ * Other integer coefficents can be used via png_set_rgb_to_gray().
+ */
+int
+png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+
+{
+ png_uint_32 i;
+
+ png_uint_32 row_width = row_info->width;
+ int rgb_error = 0;
+
+ png_debug(1, "in png_do_rgb_to_gray\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ (row_info->color_type & PNG_COLOR_MASK_COLOR))
+ {
+ png_byte rc = png_ptr->rgb_to_gray_red_coeff;
+ png_byte gc = png_ptr->rgb_to_gray_green_coeff;
+ png_byte bc = png_ptr->rgb_to_gray_blue_coeff;
+
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+ {
+ if (row_info->bit_depth == 8)
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte red = png_ptr->gamma_to_1[*(sp++)];
+ png_byte green = png_ptr->gamma_to_1[*(sp++)];
+ png_byte blue = png_ptr->gamma_to_1[*(sp++)];
+ if(red != green || red != blue)
+ {
+ rgb_error |= 1;
+ *(dp++) = png_ptr->gamma_from_1[
+ (rc*red+gc*green+bc*blue)>>8];
+ }
+ else
+ *(dp++) = *(sp-1);
+ }
+ }
+ else
+#endif
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte red = *(sp++);
+ png_byte green = *(sp++);
+ png_byte blue = *(sp++);
+ if(red != green || red != blue)
+ {
+ rgb_error |= 1;
+ *(dp++) = (rc*red+gc*green+bc*blue)>>8;
+ }
+ else
+ *(dp++) = *(sp-1);
+ }
+ }
+ }
+
+ else /* RGB bit_depth == 16 */
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->gamma_16_to_1 != NULL &&
+ png_ptr->gamma_16_from_1 != NULL)
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 red, green, blue, w;
+
+ red = ((*(sp))<<8) | *(sp+1); sp+=2;
+ green = ((*(sp))<<8) | *(sp+1); sp+=2;
+ blue = ((*(sp))<<8) | *(sp+1); sp+=2;
+
+ if(red == green && red == blue)
+ w = red;
+ else
+ {
+ png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) >>
+ png_ptr->gamma_shift][red>>8];
+ png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+ png_ptr->gamma_shift][green>>8];
+ png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) >>
+ png_ptr->gamma_shift][blue>>8];
+ png_uint_16 gray16 = (rc * red_1 + gc * green_1
+ + bc * blue_1)>>8;
+ w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+ png_ptr->gamma_shift][gray16 >> 8];
+ rgb_error |= 1;
+ }
+
+ *(dp++) = (w>>8) & 0xff;
+ *(dp++) = w & 0xff;
+ }
+ }
+ else
+#endif
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 red, green, blue, gray16;
+
+ red = ((*(sp))<<8) | *(sp+1); sp+=2;
+ green = ((*(sp))<<8) | *(sp+1); sp+=2;
+ blue = ((*(sp))<<8) | *(sp+1); sp+=2;
+
+ if(red != green || red != blue)
+ rgb_error |= 1;
+ gray16 = (rc * red + gc * green + bc * blue)>>8;
+ *(dp++) = (gray16>>8) & 0xff;
+ *(dp++) = gray16 & 0xff;
+ }
+ }
+ }
+ }
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ {
+ if (row_info->bit_depth == 8)
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte red = png_ptr->gamma_to_1[*(sp++)];
+ png_byte green = png_ptr->gamma_to_1[*(sp++)];
+ png_byte blue = png_ptr->gamma_to_1[*(sp++)];
+ if(red != green || red != blue)
+ rgb_error |= 1;
+ *(dp++) = png_ptr->gamma_from_1
+ [(rc*red + gc*green + bc*blue)>>8];
+ *(dp++) = *(sp++); /* alpha */
+ }
+ }
+ else
+#endif
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_byte red = *(sp++);
+ png_byte green = *(sp++);
+ png_byte blue = *(sp++);
+ if(red != green || red != blue)
+ rgb_error |= 1;
+ *(dp++) = (gc*red + gc*green + bc*blue)>>8;
+ *(dp++) = *(sp++); /* alpha */
+ }
+ }
+ }
+ else /* RGBA bit_depth == 16 */
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->gamma_16_to_1 != NULL &&
+ png_ptr->gamma_16_from_1 != NULL)
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 red, green, blue, w;
+
+ red = ((*(sp))<<8) | *(sp+1); sp+=2;
+ green = ((*(sp))<<8) | *(sp+1); sp+=2;
+ blue = ((*(sp))<<8) | *(sp+1); sp+=2;
+
+ if(red == green && red == blue)
+ w = red;
+ else
+ {
+ png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) >>
+ png_ptr->gamma_shift][red>>8];
+ png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+ png_ptr->gamma_shift][green>>8];
+ png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) >>
+ png_ptr->gamma_shift][blue>>8];
+ png_uint_16 gray16 = (rc * red_1 + gc * green_1
+ + bc * blue_1)>>8;
+ w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+ png_ptr->gamma_shift][gray16 >> 8];
+ rgb_error |= 1;
+ }
+
+ *(dp++) = (w>>8) & 0xff;
+ *(dp++) = w & 0xff;
+ *(dp++) = *(sp++); /* alpha */
+ *(dp++) = *(sp++);
+ }
+ }
+ else
+#endif
+ {
+ png_bytep sp = row;
+ png_bytep dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 red, green, blue, gray16;
+ red = (*(sp)<<8) | *(sp+1); sp+=2;
+ green = (*(sp)<<8) | *(sp+1); sp+=2;
+ blue = (*(sp)<<8) | *(sp+1); sp+=2;
+ if(red != green || red != blue)
+ rgb_error |= 1;
+ gray16 = (rc * red + gc * green + bc * blue)>>8;
+ *(dp++) = (gray16>>8) & 0xff;
+ *(dp++) = gray16 & 0xff;
+ *(dp++) = *(sp++); /* alpha */
+ *(dp++) = *(sp++);
+ }
+ }
+ }
+ }
+ row_info->channels -= (png_byte)2;
+ row_info->color_type &= ~PNG_COLOR_MASK_COLOR;
+ row_info->pixel_depth = (png_byte)(row_info->channels *
+ row_info->bit_depth);
+ row_info->rowbytes = ((row_width *
+ row_info->pixel_depth + 7) >> 3);
+ }
+ return rgb_error;
+}
+#endif
+
+/* Build a grayscale palette. Palette is assumed to be 1 << bit_depth
+ * large of png_color. This lets grayscale images be treated as
+ * paletted. Most useful for gamma correction and simplification
+ * of code.
+ */
+void
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+ int num_palette;
+ int color_inc;
+ int i;
+ int v;
+
+ png_debug(1, "in png_do_build_grayscale_palette\n");
+ if (palette == NULL)
+ return;
+
+ switch (bit_depth)
+ {
+ case 1:
+ num_palette = 2;
+ color_inc = 0xff;
+ break;
+ case 2:
+ num_palette = 4;
+ color_inc = 0x55;
+ break;
+ case 4:
+ num_palette = 16;
+ color_inc = 0x11;
+ break;
+ case 8:
+ num_palette = 256;
+ color_inc = 1;
+ break;
+ default:
+ num_palette = 0;
+ color_inc = 0;
+ break;
+ }
+
+ for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+ {
+ palette[i].red = (png_byte)v;
+ palette[i].green = (png_byte)v;
+ palette[i].blue = (png_byte)v;
+ }
+}
+
+/* This function is currently unused. Do we really need it? */
+#if defined(PNG_READ_DITHER_SUPPORTED) && defined(PNG_CORRECT_PALETTE_SUPPORTED)
+void
+png_correct_palette(png_structp png_ptr, png_colorp palette,
+ int num_palette)
+{
+ png_debug(1, "in png_correct_palette\n");
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+ if (png_ptr->transformations & (PNG_GAMMA | PNG_BACKGROUND))
+ {
+ png_color back, back_1;
+
+ if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+ {
+ back.red = png_ptr->gamma_table[png_ptr->background.red];
+ back.green = png_ptr->gamma_table[png_ptr->background.green];
+ back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+ back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+ back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+ back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+ }
+ else
+ {
+ double g;
+
+ g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma);
+
+ if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN ||
+ fabs(g - 1.0) < PNG_GAMMA_THRESHOLD)
+ {
+ back.red = png_ptr->background.red;
+ back.green = png_ptr->background.green;
+ back.blue = png_ptr->background.blue;
+ }
+ else
+ {
+ back.red =
+ (png_byte)(pow((double)png_ptr->background.red/255, g) *
+ 255.0 + 0.5);
+ back.green =
+ (png_byte)(pow((double)png_ptr->background.green/255, g) *
+ 255.0 + 0.5);
+ back.blue =
+ (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+ 255.0 + 0.5);
+ }
+
+ g = 1.0 / png_ptr->background_gamma;
+
+ back_1.red =
+ (png_byte)(pow((double)png_ptr->background.red/255, g) *
+ 255.0 + 0.5);
+ back_1.green =
+ (png_byte)(pow((double)png_ptr->background.green/255, g) *
+ 255.0 + 0.5);
+ back_1.blue =
+ (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+ 255.0 + 0.5);
+ }
+
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_uint_32 i;
+
+ for (i = 0; i < (png_uint_32)num_palette; i++)
+ {
+ if (i < png_ptr->num_trans && png_ptr->trans[i] == 0)
+ {
+ palette[i] = back;
+ }
+ else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+ {
+ png_byte v, w;
+
+ v = png_ptr->gamma_to_1[png_ptr->palette[i].red];
+ png_composite(w, v, png_ptr->trans[i], back_1.red);
+ palette[i].red = png_ptr->gamma_from_1[w];
+
+ v = png_ptr->gamma_to_1[png_ptr->palette[i].green];
+ png_composite(w, v, png_ptr->trans[i], back_1.green);
+ palette[i].green = png_ptr->gamma_from_1[w];
+
+ v = png_ptr->gamma_to_1[png_ptr->palette[i].blue];
+ png_composite(w, v, png_ptr->trans[i], back_1.blue);
+ palette[i].blue = png_ptr->gamma_from_1[w];
+ }
+ else
+ {
+ palette[i].red = png_ptr->gamma_table[palette[i].red];
+ palette[i].green = png_ptr->gamma_table[palette[i].green];
+ palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+ }
+ }
+ }
+ else
+ {
+ int i;
+
+ for (i = 0; i < num_palette; i++)
+ {
+ if (palette[i].red == (png_byte)png_ptr->trans_values.gray)
+ {
+ palette[i] = back;
+ }
+ else
+ {
+ palette[i].red = png_ptr->gamma_table[palette[i].red];
+ palette[i].green = png_ptr->gamma_table[palette[i].green];
+ palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+ }
+ }
+ }
+ }
+ else
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (png_ptr->transformations & PNG_GAMMA)
+ {
+ int i;
+
+ for (i = 0; i < num_palette; i++)
+ {
+ palette[i].red = png_ptr->gamma_table[palette[i].red];
+ palette[i].green = png_ptr->gamma_table[palette[i].green];
+ palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+ }
+ }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ else
+#endif
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+ if (png_ptr->transformations & PNG_BACKGROUND)
+ {
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ png_color back;
+
+ back.red = (png_byte)png_ptr->background.red;
+ back.green = (png_byte)png_ptr->background.green;
+ back.blue = (png_byte)png_ptr->background.blue;
+
+ for (i = 0; i < (int)png_ptr->num_trans; i++)
+ {
+ if (png_ptr->trans[i] == 0)
+ {
+ palette[i].red = back.red;
+ palette[i].green = back.green;
+ palette[i].blue = back.blue;
+ }
+ else if (png_ptr->trans[i] != 0xff)
+ {
+ png_composite(palette[i].red, png_ptr->palette[i].red,
+ png_ptr->trans[i], back.red);
+ png_composite(palette[i].green, png_ptr->palette[i].green,
+ png_ptr->trans[i], back.green);
+ png_composite(palette[i].blue, png_ptr->palette[i].blue,
+ png_ptr->trans[i], back.blue);
+ }
+ }
+ }
+ else /* assume grayscale palette (what else could it be?) */
+ {
+ int i;
+
+ for (i = 0; i < num_palette; i++)
+ {
+ if (i == (png_byte)png_ptr->trans_values.gray)
+ {
+ palette[i].red = (png_byte)png_ptr->background.red;
+ palette[i].green = (png_byte)png_ptr->background.green;
+ palette[i].blue = (png_byte)png_ptr->background.blue;
+ }
+ }
+ }
+ }
+#endif
+}
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Replace any alpha or transparency with the supplied background color.
+ * "background" is already in the screen gamma, while "background_1" is
+ * at a gamma of 1.0. Paletted files have already been taken care of.
+ */
+void
+png_do_background(png_row_infop row_info, png_bytep row,
+ png_color_16p trans_values, png_color_16p background,
+ png_color_16p background_1,
+ png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+ png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+ png_uint_16pp gamma_16_to_1, int gamma_shift)
+{
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+ int shift;
+
+ png_debug(1, "in png_do_background\n");
+ if (background != NULL &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
+ (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values)))
+ {
+ switch (row_info->color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
+ {
+ switch (row_info->bit_depth)
+ {
+ case 1:
+ {
+ sp = row;
+ shift = 7;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((png_uint_16)((*sp >> shift) & 0x1)
+ == trans_values->gray)
+ {
+ *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+ *sp |= (png_byte)(background->gray << shift);
+ }
+ if (!shift)
+ {
+ shift = 7;
+ sp++;
+ }
+ else
+ shift--;
+ }
+ break;
+ }
+ case 2:
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_table != NULL)
+ {
+ sp = row;
+ shift = 6;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((png_uint_16)((*sp >> shift) & 0x3)
+ == trans_values->gray)
+ {
+ *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+ *sp |= (png_byte)(background->gray << shift);
+ }
+ else
+ {
+ png_byte p = (*sp >> shift) & 0x3;
+ png_byte g = (gamma_table [p | (p << 2) | (p << 4) |
+ (p << 6)] >> 6) & 0x3;
+ *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+ *sp |= (png_byte)(g << shift);
+ }
+ if (!shift)
+ {
+ shift = 6;
+ sp++;
+ }
+ else
+ shift -= 2;
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ shift = 6;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((png_uint_16)((*sp >> shift) & 0x3)
+ == trans_values->gray)
+ {
+ *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+ *sp |= (png_byte)(background->gray << shift);
+ }
+ if (!shift)
+ {
+ shift = 6;
+ sp++;
+ }
+ else
+ shift -= 2;
+ }
+ }
+ break;
+ }
+ case 4:
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_table != NULL)
+ {
+ sp = row;
+ shift = 4;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((png_uint_16)((*sp >> shift) & 0xf)
+ == trans_values->gray)
+ {
+ *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+ *sp |= (png_byte)(background->gray << shift);
+ }
+ else
+ {
+ png_byte p = (*sp >> shift) & 0xf;
+ png_byte g = (gamma_table[p | (p << 4)] >> 4) & 0xf;
+ *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+ *sp |= (png_byte)(g << shift);
+ }
+ if (!shift)
+ {
+ shift = 4;
+ sp++;
+ }
+ else
+ shift -= 4;
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ shift = 4;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((png_uint_16)((*sp >> shift) & 0xf)
+ == trans_values->gray)
+ {
+ *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+ *sp |= (png_byte)(background->gray << shift);
+ }
+ if (!shift)
+ {
+ shift = 4;
+ sp++;
+ }
+ else
+ shift -= 4;
+ }
+ }
+ break;
+ }
+ case 8:
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_table != NULL)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp++)
+ {
+ if (*sp == trans_values->gray)
+ {
+ *sp = (png_byte)background->gray;
+ }
+ else
+ {
+ *sp = gamma_table[*sp];
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp++)
+ {
+ if (*sp == trans_values->gray)
+ {
+ *sp = (png_byte)background->gray;
+ }
+ }
+ }
+ break;
+ }
+ case 16:
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_16 != NULL)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 2)
+ {
+ png_uint_16 v;
+
+ v = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ if (v == trans_values->gray)
+ {
+ /* background is already in screen gamma */
+ *sp = (png_byte)((background->gray >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(background->gray & 0xff);
+ }
+ else
+ {
+ v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 2)
+ {
+ png_uint_16 v;
+
+ v = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ if (v == trans_values->gray)
+ {
+ *sp = (png_byte)((background->gray >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(background->gray & 0xff);
+ }
+ }
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_RGB:
+ {
+ if (row_info->bit_depth == 8)
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_table != NULL)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 3)
+ {
+ if (*sp == trans_values->red &&
+ *(sp + 1) == trans_values->green &&
+ *(sp + 2) == trans_values->blue)
+ {
+ *sp = (png_byte)background->red;
+ *(sp + 1) = (png_byte)background->green;
+ *(sp + 2) = (png_byte)background->blue;
+ }
+ else
+ {
+ *sp = gamma_table[*sp];
+ *(sp + 1) = gamma_table[*(sp + 1)];
+ *(sp + 2) = gamma_table[*(sp + 2)];
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 3)
+ {
+ if (*sp == trans_values->red &&
+ *(sp + 1) == trans_values->green &&
+ *(sp + 2) == trans_values->blue)
+ {
+ *sp = (png_byte)background->red;
+ *(sp + 1) = (png_byte)background->green;
+ *(sp + 2) = (png_byte)background->blue;
+ }
+ }
+ }
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_16 != NULL)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 6)
+ {
+ png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3);
+ png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8) + *(sp + 5);
+ if (r == trans_values->red && g == trans_values->green &&
+ b == trans_values->blue)
+ {
+ /* background is already in screen gamma */
+ *sp = (png_byte)((background->red >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(background->red & 0xff);
+ *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+ *(sp + 3) = (png_byte)(background->green & 0xff);
+ *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+ *(sp + 5) = (png_byte)(background->blue & 0xff);
+ }
+ else
+ {
+ png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+ *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+ *(sp + 3) = (png_byte)(v & 0xff);
+ v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+ *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+ *(sp + 5) = (png_byte)(v & 0xff);
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp += 6)
+ {
+ png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3);
+ png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8) + *(sp + 5);
+
+ if (r == trans_values->red && g == trans_values->green &&
+ b == trans_values->blue)
+ {
+ *sp = (png_byte)((background->red >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(background->red & 0xff);
+ *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+ *(sp + 3) = (png_byte)(background->green & 0xff);
+ *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+ *(sp + 5) = (png_byte)(background->blue & 0xff);
+ }
+ }
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ {
+ if (row_info->bit_depth == 8)
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+ gamma_table != NULL)
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 2, dp++)
+ {
+ png_uint_16 a = *(sp + 1);
+
+ if (a == 0xff)
+ {
+ *dp = gamma_table[*sp];
+ }
+ else if (a == 0)
+ {
+ /* background is already in screen gamma */
+ *dp = (png_byte)background->gray;
+ }
+ else
+ {
+ png_byte v, w;
+
+ v = gamma_to_1[*sp];
+ png_composite(w, v, a, background_1->gray);
+ *dp = gamma_from_1[w];
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 2, dp++)
+ {
+ png_byte a = *(sp + 1);
+
+ if (a == 0xff)
+ {
+ *dp = *sp;
+ }
+ else if (a == 0)
+ {
+ *dp = (png_byte)background->gray;
+ }
+ else
+ {
+ png_composite(*dp, *sp, a, background_1->gray);
+ }
+ }
+ }
+ }
+ else /* if (png_ptr->bit_depth == 16) */
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+ gamma_16_to_1 != NULL)
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+ {
+ png_uint_16 a = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3);
+
+ if (a == (png_uint_16)0xffff)
+ {
+ png_uint_16 v;
+
+ v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+ *dp = (png_byte)((v >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(v & 0xff);
+ }
+ else if (a == 0)
+ {
+ /* background is already in screen gamma */
+ *dp = (png_byte)((background->gray >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(background->gray & 0xff);
+ }
+ else
+ {
+ png_uint_16 g, v, w;
+
+ g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+ png_composite_16(v, g, a, background_1->gray);
+ w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+ *dp = (png_byte)((w >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(w & 0xff);
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+ {
+ png_uint_16 a = ((png_uint_16)(*(sp + 2)) << 8) + *(sp + 3);
+ if (a == (png_uint_16)0xffff)
+ {
+ png_memcpy(dp, sp, 2);
+ }
+ else if (a == 0)
+ {
+ *dp = (png_byte)((background->gray >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(background->gray & 0xff);
+ }
+ else
+ {
+ png_uint_16 g, v;
+
+ g = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ png_composite_16(v, g, a, background_1->gray);
+ *dp = (png_byte)((v >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(v & 0xff);
+ }
+ }
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+ {
+ if (row_info->bit_depth == 8)
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+ gamma_table != NULL)
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+ {
+ png_byte a = *(sp + 3);
+
+ if (a == 0xff)
+ {
+ *dp = gamma_table[*sp];
+ *(dp + 1) = gamma_table[*(sp + 1)];
+ *(dp + 2) = gamma_table[*(sp + 2)];
+ }
+ else if (a == 0)
+ {
+ /* background is already in screen gamma */
+ *dp = (png_byte)background->red;
+ *(dp + 1) = (png_byte)background->green;
+ *(dp + 2) = (png_byte)background->blue;
+ }
+ else
+ {
+ png_byte v, w;
+
+ v = gamma_to_1[*sp];
+ png_composite(w, v, a, background_1->red);
+ *dp = gamma_from_1[w];
+ v = gamma_to_1[*(sp + 1)];
+ png_composite(w, v, a, background_1->green);
+ *(dp + 1) = gamma_from_1[w];
+ v = gamma_to_1[*(sp + 2)];
+ png_composite(w, v, a, background_1->blue);
+ *(dp + 2) = gamma_from_1[w];
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+ {
+ png_byte a = *(sp + 3);
+
+ if (a == 0xff)
+ {
+ *dp = *sp;
+ *(dp + 1) = *(sp + 1);
+ *(dp + 2) = *(sp + 2);
+ }
+ else if (a == 0)
+ {
+ *dp = (png_byte)background->red;
+ *(dp + 1) = (png_byte)background->green;
+ *(dp + 2) = (png_byte)background->blue;
+ }
+ else
+ {
+ png_composite(*dp, *sp, a, background->red);
+ png_composite(*(dp + 1), *(sp + 1), a,
+ background->green);
+ png_composite(*(dp + 2), *(sp + 2), a,
+ background->blue);
+ }
+ }
+ }
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+ if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+ gamma_16_to_1 != NULL)
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+ {
+ png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+ << 8) + (png_uint_16)(*(sp + 7)));
+ if (a == (png_uint_16)0xffff)
+ {
+ png_uint_16 v;
+
+ v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+ *dp = (png_byte)((v >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(v & 0xff);
+ v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+ *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+ *(dp + 3) = (png_byte)(v & 0xff);
+ v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+ *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+ *(dp + 5) = (png_byte)(v & 0xff);
+ }
+ else if (a == 0)
+ {
+ /* background is already in screen gamma */
+ *dp = (png_byte)((background->red >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(background->red & 0xff);
+ *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+ *(dp + 3) = (png_byte)(background->green & 0xff);
+ *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+ *(dp + 5) = (png_byte)(background->blue & 0xff);
+ }
+ else
+ {
+ png_uint_16 v, w, x;
+
+ v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+ png_composite_16(w, v, a, background->red);
+ x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+ *dp = (png_byte)((x >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(x & 0xff);
+ v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+ png_composite_16(w, v, a, background->green);
+ x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+ *(dp + 2) = (png_byte)((x >> 8) & 0xff);
+ *(dp + 3) = (png_byte)(x & 0xff);
+ v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+ png_composite_16(w, v, a, background->blue);
+ x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
+ *(dp + 4) = (png_byte)((x >> 8) & 0xff);
+ *(dp + 5) = (png_byte)(x & 0xff);
+ }
+ }
+ }
+ else
+#endif
+ {
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+ {
+ png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+ << 8) + (png_uint_16)(*(sp + 7)));
+ if (a == (png_uint_16)0xffff)
+ {
+ png_memcpy(dp, sp, 6);
+ }
+ else if (a == 0)
+ {
+ *dp = (png_byte)((background->red >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(background->red & 0xff);
+ *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+ *(dp + 3) = (png_byte)(background->green & 0xff);
+ *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+ *(dp + 5) = (png_byte)(background->blue & 0xff);
+ }
+ else
+ {
+ png_uint_16 v;
+
+ png_uint_16 r = ((png_uint_16)(*sp) << 8) + *(sp + 1);
+ png_uint_16 g = ((png_uint_16)(*(sp + 2)) << 8)
+ + *(sp + 3);
+ png_uint_16 b = ((png_uint_16)(*(sp + 4)) << 8)
+ + *(sp + 5);
+
+ png_composite_16(v, r, a, background->red);
+ *dp = (png_byte)((v >> 8) & 0xff);
+ *(dp + 1) = (png_byte)(v & 0xff);
+ png_composite_16(v, g, a, background->green);
+ *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+ *(dp + 3) = (png_byte)(v & 0xff);
+ png_composite_16(v, b, a, background->blue);
+ *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+ *(dp + 5) = (png_byte)(v & 0xff);
+ }
+ }
+ }
+ }
+ break;
+ }
+ }
+
+ if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+ {
+ row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+ row_info->channels--;
+ row_info->pixel_depth = (png_byte)(row_info->channels *
+ row_info->bit_depth);
+ row_info->rowbytes = ((row_width *
+ row_info->pixel_depth + 7) >> 3);
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Gamma correct the image, avoiding the alpha channel. Make sure
+ * you do this after you deal with the transparency issue on grayscale
+ * or rgb images. If your bit depth is 8, use gamma_table, if it
+ * is 16, use gamma_16_table and gamma_shift. Build these with
+ * build_gamma_table().
+ */
+void
+png_do_gamma(png_row_infop row_info, png_bytep row,
+ png_bytep gamma_table, png_uint_16pp gamma_16_table,
+ int gamma_shift)
+{
+ png_bytep sp;
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+
+ png_debug(1, "in png_do_gamma\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ ((row_info->bit_depth <= 8 && gamma_table != NULL) ||
+ (row_info->bit_depth == 16 && gamma_16_table != NULL)))
+ {
+ switch (row_info->color_type)
+ {
+ case PNG_COLOR_TYPE_RGB:
+ {
+ if (row_info->bit_depth == 8)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ *sp = gamma_table[*sp];
+ sp++;
+ *sp = gamma_table[*sp];
+ sp++;
+ *sp = gamma_table[*sp];
+ sp++;
+ }
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 v;
+
+ v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+ {
+ if (row_info->bit_depth == 8)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ *sp = gamma_table[*sp];
+ sp++;
+ *sp = gamma_table[*sp];
+ sp++;
+ *sp = gamma_table[*sp];
+ sp++;
+ sp++;
+ }
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 4;
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ {
+ if (row_info->bit_depth == 8)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ *sp = gamma_table[*sp];
+ sp += 2;
+ }
+ }
+ else /* if (row_info->bit_depth == 16) */
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 4;
+ }
+ }
+ break;
+ }
+ case PNG_COLOR_TYPE_GRAY:
+ {
+ if (row_info->bit_depth == 2)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i += 4)
+ {
+ int a = *sp & 0xc0;
+ int b = *sp & 0x30;
+ int c = *sp & 0x0c;
+ int d = *sp & 0x03;
+
+ *sp = ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)]) ) & 0xc0)|
+ ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
+ ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
+ ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) );
+ sp++;
+ }
+ }
+ if (row_info->bit_depth == 4)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i += 2)
+ {
+ int msb = *sp & 0xf0;
+ int lsb = *sp & 0x0f;
+
+ *sp = (((int)gamma_table[msb | (msb >> 4)]) & 0xf0) |
+ (((int)gamma_table[(lsb << 4) | lsb]) >> 4);
+ sp++;
+ }
+ }
+ else if (row_info->bit_depth == 8)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ *sp = gamma_table[*sp];
+ sp++;
+ }
+ }
+ else if (row_info->bit_depth == 16)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+ *sp = (png_byte)((v >> 8) & 0xff);
+ *(sp + 1) = (png_byte)(v & 0xff);
+ sp += 2;
+ }
+ }
+ break;
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expands a palette row to an rgb or rgba row depending
+ * upon whether you supply trans and num_trans.
+ */
+void
+png_do_expand_palette(png_row_infop row_info, png_bytep row,
+ png_colorp palette, png_bytep trans, int num_trans)
+{
+ int shift, value;
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+
+ png_debug(1, "in png_do_expand_palette\n");
+ if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ row != NULL && row_info != NULL &&
+#endif
+ row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+ {
+ if (row_info->bit_depth < 8)
+ {
+ switch (row_info->bit_depth)
+ {
+ case 1:
+ {
+ sp = row + (png_size_t)((row_width - 1) >> 3);
+ dp = row + (png_size_t)row_width - 1;
+ shift = 7 - (int)((row_width + 7) & 7);
+ for (i = 0; i < row_width; i++)
+ {
+ if ((*sp >> shift) & 0x1)
+ *dp = 1;
+ else
+ *dp = 0;
+ if (shift == 7)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift++;
+
+ dp--;
+ }
+ break;
+ }
+ case 2:
+ {
+ sp = row + (png_size_t)((row_width - 1) >> 2);
+ dp = row + (png_size_t)row_width - 1;
+ shift = (int)((3 - ((row_width + 3) & 3)) << 1);
+ for (i = 0; i < row_width; i++)
+ {
+ value = (*sp >> shift) & 0x3;
+ *dp = (png_byte)value;
+ if (shift == 6)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift += 2;
+
+ dp--;
+ }
+ break;
+ }
+ case 4:
+ {
+ sp = row + (png_size_t)((row_width - 1) >> 1);
+ dp = row + (png_size_t)row_width - 1;
+ shift = (int)((row_width & 1) << 2);
+ for (i = 0; i < row_width; i++)
+ {
+ value = (*sp >> shift) & 0xf;
+ *dp = (png_byte)value;
+ if (shift == 4)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift += 4;
+
+ dp--;
+ }
+ break;
+ }
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = 8;
+ row_info->rowbytes = row_width;
+ }
+ switch (row_info->bit_depth)
+ {
+ case 8:
+ {
+ if (trans != NULL)
+ {
+ sp = row + (png_size_t)row_width - 1;
+ dp = row + (png_size_t)(row_width << 2) - 1;
+
+ for (i = 0; i < row_width; i++)
+ {
+ if ((int)(*sp) >= num_trans)
+ *dp-- = 0xff;
+ else
+ *dp-- = trans[*sp];
+ *dp-- = palette[*sp].blue;
+ *dp-- = palette[*sp].green;
+ *dp-- = palette[*sp].red;
+ sp--;
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = 32;
+ row_info->rowbytes = row_width * 4;
+ row_info->color_type = 6;
+ row_info->channels = 4;
+ }
+ else
+ {
+ sp = row + (png_size_t)row_width - 1;
+ dp = row + (png_size_t)(row_width * 3) - 1;
+
+ for (i = 0; i < row_width; i++)
+ {
+ *dp-- = palette[*sp].blue;
+ *dp-- = palette[*sp].green;
+ *dp-- = palette[*sp].red;
+ sp--;
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = 24;
+ row_info->rowbytes = row_width * 3;
+ row_info->color_type = 2;
+ row_info->channels = 3;
+ }
+ break;
+ }
+ }
+ }
+}
+
+/* If the bit depth < 8, it is expanded to 8. Also, if the
+ * transparency value is supplied, an alpha channel is built.
+ */
+void
+png_do_expand(png_row_infop row_info, png_bytep row,
+ png_color_16p trans_value)
+{
+ int shift, value;
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+
+ png_debug(1, "in png_do_expand\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+ {
+ png_uint_16 gray = trans_value ? trans_value->gray : 0;
+
+ if (row_info->bit_depth < 8)
+ {
+ switch (row_info->bit_depth)
+ {
+ case 1:
+ {
+ gray *= 0xff;
+ sp = row + (png_size_t)((row_width - 1) >> 3);
+ dp = row + (png_size_t)row_width - 1;
+ shift = 7 - (int)((row_width + 7) & 7);
+ for (i = 0; i < row_width; i++)
+ {
+ if ((*sp >> shift) & 0x1)
+ *dp = 0xff;
+ else
+ *dp = 0;
+ if (shift == 7)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift++;
+
+ dp--;
+ }
+ break;
+ }
+ case 2:
+ {
+ gray *= 0x55;
+ sp = row + (png_size_t)((row_width - 1) >> 2);
+ dp = row + (png_size_t)row_width - 1;
+ shift = (int)((3 - ((row_width + 3) & 3)) << 1);
+ for (i = 0; i < row_width; i++)
+ {
+ value = (*sp >> shift) & 0x3;
+ *dp = (png_byte)(value | (value << 2) | (value << 4) |
+ (value << 6));
+ if (shift == 6)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift += 2;
+
+ dp--;
+ }
+ break;
+ }
+ case 4:
+ {
+ gray *= 0x11;
+ sp = row + (png_size_t)((row_width - 1) >> 1);
+ dp = row + (png_size_t)row_width - 1;
+ shift = (int)((1 - ((row_width + 1) & 1)) << 2);
+ for (i = 0; i < row_width; i++)
+ {
+ value = (*sp >> shift) & 0xf;
+ *dp = (png_byte)(value | (value << 4));
+ if (shift == 4)
+ {
+ shift = 0;
+ sp--;
+ }
+ else
+ shift = 4;
+
+ dp--;
+ }
+ break;
+ }
+ }
+ row_info->bit_depth = 8;
+ row_info->pixel_depth = 8;
+ row_info->rowbytes = row_width;
+ }
+
+ if (trans_value != NULL)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ sp = row + (png_size_t)row_width - 1;
+ dp = row + (png_size_t)(row_width << 1) - 1;
+ for (i = 0; i < row_width; i++)
+ {
+ if (*sp == gray)
+ *dp-- = 0;
+ else
+ *dp-- = 0xff;
+ *dp-- = *sp--;
+ }
+ }
+ else if (row_info->bit_depth == 16)
+ {
+ sp = row + row_info->rowbytes - 1;
+ dp = row + (row_info->rowbytes << 1) - 1;
+ for (i = 0; i < row_width; i++)
+ {
+ if (((png_uint_16)*(sp) |
+ ((png_uint_16)*(sp - 1) << 8)) == gray)
+ {
+ *dp-- = 0;
+ *dp-- = 0;
+ }
+ else
+ {
+ *dp-- = 0xff;
+ *dp-- = 0xff;
+ }
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ }
+ }
+ row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+ row_info->channels = 2;
+ row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+ row_info->rowbytes =
+ ((row_width * row_info->pixel_depth) >> 3);
+ }
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
+ {
+ if (row_info->bit_depth == 8)
+ {
+ sp = row + (png_size_t)row_info->rowbytes - 1;
+ dp = row + (png_size_t)(row_width << 2) - 1;
+ for (i = 0; i < row_width; i++)
+ {
+ if (*(sp - 2) == trans_value->red &&
+ *(sp - 1) == trans_value->green &&
+ *(sp - 0) == trans_value->blue)
+ *dp-- = 0;
+ else
+ *dp-- = 0xff;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ }
+ }
+ else if (row_info->bit_depth == 16)
+ {
+ sp = row + row_info->rowbytes - 1;
+ dp = row + (png_size_t)(row_width << 3) - 1;
+ for (i = 0; i < row_width; i++)
+ {
+ if ((((png_uint_16)*(sp - 4) |
+ ((png_uint_16)*(sp - 5) << 8)) == trans_value->red) &&
+ (((png_uint_16)*(sp - 2) |
+ ((png_uint_16)*(sp - 3) << 8)) == trans_value->green) &&
+ (((png_uint_16)*(sp - 0) |
+ ((png_uint_16)*(sp - 1) << 8)) == trans_value->blue))
+ {
+ *dp-- = 0;
+ *dp-- = 0;
+ }
+ else
+ {
+ *dp-- = 0xff;
+ *dp-- = 0xff;
+ }
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ *dp-- = *sp--;
+ }
+ }
+ row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ row_info->channels = 4;
+ row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+ row_info->rowbytes =
+ ((row_width * row_info->pixel_depth) >> 3);
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+void
+png_do_dither(png_row_infop row_info, png_bytep row,
+ png_bytep palette_lookup, png_bytep dither_lookup)
+{
+ png_bytep sp, dp;
+ png_uint_32 i;
+ png_uint_32 row_width=row_info->width;
+
+ png_debug(1, "in png_do_dither\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+ if (row != NULL && row_info != NULL)
+#endif
+ {
+ if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+ palette_lookup && row_info->bit_depth == 8)
+ {
+ int r, g, b, p;
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ r = *sp++;
+ g = *sp++;
+ b = *sp++;
+
+ /* this looks real messy, but the compiler will reduce
+ it down to a reasonable formula. For example, with
+ 5 bits per color, we get:
+ p = (((r >> 3) & 0x1f) << 10) |
+ (((g >> 3) & 0x1f) << 5) |
+ ((b >> 3) & 0x1f);
+ */
+ p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+ ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+ (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+ (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+ ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+ (PNG_DITHER_BLUE_BITS)) |
+ ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+ ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+ *dp++ = palette_lookup[p];
+ }
+ row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+ row_info->channels = 1;
+ row_info->pixel_depth = row_info->bit_depth;
+ row_info->rowbytes =
+ ((row_width * row_info->pixel_depth + 7) >> 3);
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+ palette_lookup != NULL && row_info->bit_depth == 8)
+ {
+ int r, g, b, p;
+ sp = row;
+ dp = row;
+ for (i = 0; i < row_width; i++)
+ {
+ r = *sp++;
+ g = *sp++;
+ b = *sp++;
+ sp++;
+
+ p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+ ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+ (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+ (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+ ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+ (PNG_DITHER_BLUE_BITS)) |
+ ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+ ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+ *dp++ = palette_lookup[p];
+ }
+ row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+ row_info->channels = 1;
+ row_info->pixel_depth = row_info->bit_depth;
+ row_info->rowbytes =
+ ((row_width * row_info->pixel_depth + 7) >> 3);
+ }
+ else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+ dither_lookup && row_info->bit_depth == 8)
+ {
+ sp = row;
+ for (i = 0; i < row_width; i++, sp++)
+ {
+ *sp = dither_lookup[*sp];
+ }
+ }
+ }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+static int png_gamma_shift[] =
+ {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0};
+
+/* We build the 8- or 16-bit gamma tables here. Note that for 16-bit
+ * tables, we don't make a full table if we are reducing to 8-bit in
+ * the future. Note also how the gamma_16 tables are segmented so that
+ * we don't need to allocate > 64K chunks for a full 16-bit table.
+ */
+void
+png_build_gamma_table(png_structp png_ptr)
+{
+ png_debug(1, "in png_build_gamma_table\n");
+ if(png_ptr->gamma != 0.0)
+ {
+ if (png_ptr->bit_depth <= 8)
+ {
+ int i;
+ double g;
+
+ if (png_ptr->screen_gamma > .000001)
+ g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+ else
+ g = 1.0;
+
+ png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)256);
+
+ for (i = 0; i < 256; i++)
+ {
+ png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0,
+ g) * 255.0 + .5);
+ }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+ if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+ {
+
+ g = 1.0 / (png_ptr->gamma);
+
+ png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)256);
+
+ for (i = 0; i < 256; i++)
+ {
+ png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,
+ g) * 255.0 + .5);
+ }
+
+
+ png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr,
+ (png_uint_32)256);
+
+ if(png_ptr->screen_gamma > 0.000001)
+ g = 1.0 / png_ptr->screen_gamma;
+ else
+ g = png_ptr->gamma; /* probably doing rgb_to_gray */
+
+ for (i = 0; i < 256; i++)
+ {
+ png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,
+ g) * 255.0 + .5);
+
+ }
+ }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+ }
+ else
+ {
+ double g;
+ int i, j, shift, num;
+ int sig_bit;
+ png_uint_32 ig;
+
+ if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ {
+ sig_bit = (int)png_ptr->sig_bit.red;
+ if ((int)png_ptr->sig_bit.green > sig_bit)
+ sig_bit = png_ptr->sig_bit.green;
+ if ((int)png_ptr->sig_bit.blue > sig_bit)
+ sig_bit = png_ptr->sig_bit.blue;
+ }
+ else
+ {
+ sig_bit = (int)png_ptr->sig_bit.gray;
+ }
+
+ if (sig_bit > 0)
+ shift = 16 - sig_bit;
+ else
+ shift = 0;
+
+ if (png_ptr->transformations & PNG_16_TO_8)
+ {
+ if (shift < (16 - PNG_MAX_GAMMA_8))
+ shift = (16 - PNG_MAX_GAMMA_8);
+ }
+
+ if (shift > 8)
+ shift = 8;
+ if (shift < 0)
+ shift = 0;
+
+ png_ptr->gamma_shift = (png_byte)shift;
+
+ num = (1 << (8 - shift));
+
+ if (png_ptr->screen_gamma > .000001)
+ g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+ else
+ g = 1.0;
+
+ png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr,
+ (png_uint_32)(num * sizeof (png_uint_16p)));
+
+ if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
+ {
+ double fin, fout;
+ png_uint_32 last, max;
+
+ for (i = 0; i < num; i++)
+ {
+ png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+ (png_uint_32)(256 * sizeof (png_uint_16)));
+ }
+
+ g = 1.0 / g;
+ last = 0;
+ for (i = 0; i < 256; i++)
+ {
+ fout = ((double)i + 0.5) / 256.0;
+ fin = pow(fout, g);
+ max = (png_uint_32)(fin * (double)((png_uint_32)num << 8));
+ while (last <= max)
+ {
+ png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+ [(int)(last >> (8 - shift))] = (png_uint_16)(
+ (png_uint_16)i | ((png_uint_16)i << 8));
+ last++;
+ }
+ }
+ while (last < ((png_uint_32)num << 8))
+ {
+ png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+ [(int)(last >> (8 - shift))] = (png_uint_16)65535L;
+ last++;
+ }
+ }
+ else
+ {
+ for (i = 0; i < num; i++)
+ {
+ png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+ (png_uint_32)(256 * sizeof (png_uint_16)));
+
+ ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4);
+ for (j = 0; j < 256; j++)
+ {
+ png_ptr->gamma_16_table[i][j] =
+ (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+ 65535.0, g) * 65535.0 + .5);
+ }
+ }
+ }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+ if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+ {
+
+ g = 1.0 / (png_ptr->gamma);
+
+ png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr,
+ (png_uint_32)(num * sizeof (png_uint_16p )));
+
+ for (i = 0; i < num; i++)
+ {
+ png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
+ (png_uint_32)(256 * sizeof (png_uint_16)));
+
+ ig = (((png_uint_32)i *
+ (png_uint_32)png_gamma_shift[shift]) >> 4);
+ for (j = 0; j < 256; j++)
+ {
+ png_ptr->gamma_16_to_1[i][j] =
+ (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+ 65535.0, g) * 65535.0 + .5);
+ }
+ }
+
+ if(png_ptr->screen_gamma > 0.000001)
+ g = 1.0 / png_ptr->screen_gamma;
+ else
+ g = png_ptr->gamma; /* probably doing rgb_to_gray */
+
+ png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr,
+ (png_uint_32)(num * sizeof (png_uint_16p)));
+
+ for (i = 0; i < num; i++)
+ {
+ png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,
+ (png_uint_32)(256 * sizeof (png_uint_16)));
+
+ ig = (((png_uint_32)i *
+ (png_uint_32)png_gamma_shift[shift]) >> 4);
+ for (j = 0; j < 256; j++)
+ {
+ png_ptr->gamma_16_from_1[i][j] =
+ (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+ 65535.0, g) * 65535.0 + .5);
+ }
+ }
+ }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+ }
+ }
+}
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/Makefile.am Sat Jul 13 19:23:28 2002
@@ -0,0 +1,82 @@
+## Process this file with automake to produce Makefile.in
+
+# build the following subdirectories
+SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.3 libpng-1.0.3 src doc examples contrib
+
+# the following files are not mentioned in any other Makefile
+EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS \
+ perl-piped/MANIFEST perl-piped/README perl-piped/rrdpl.ds? \
+ perl-piped/RRDp.pm perl-piped/Makefile.PL perl-piped/t/base.t \
+ perl-shared/MANIFEST perl-shared/README perl-shared/RRDs.xs \
+ perl-shared/ntmake.pl perl-shared/Makefile.PL perl-shared/t/base.t \
+ perl-shared/rrdpl.ds? perl-shared/RRDs.pm
+
+#
+
+CLEANFILES = config.cache
+
+# lets schedule the perl stuff for installation
+install-data-local:
+ $(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs
+ $(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl
+ $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs
+ $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs
+
+
+# use relaxed rules when building dists
+AUTOMAKE_OPTIONS= foreign
+
+# where we keep local rules for automake
+ACLOCAL_M4= $(top_srcdir)/config/aclocal.m4
+AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
+
+# rules for building the perl module
+perl_piped: perl-piped/Makefile
+ cd perl-piped && $(MAKE) OPTIMIZE="$(CFLAGS)"
+
+perl-piped/Makefile: perl-piped/Makefile.PL
+ cd perl-piped && $(PERL) Makefile.PL
+
+perl_shared: perl-shared/Makefile
+ cd perl-shared && $(MAKE) OPTIMIZE="$(CFLAGS)"
+
+perl-shared/Makefile: perl-shared/Makefile.PL
+ cd perl-shared && $(PERL) Makefile.PL
+
+# add the following to the all target
+all-local: @COMP_PERL@
+
+# add to install
+
+#to-autoconf:
+# aclocal -I config -I config/libtool --output=config/aclocal.m4
+# automake --foreign
+# autoconf --localdir=config
+# autoheader --localdir=config
+# ./configure
+
+to-docs: to-versync
+ (cd doc && $(MAKE) clean && $(MAKE))
+#to-autoconf
+to-versync:
+ perl -i -p -e '"$(VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/; $$v=sprintf("%1d.%02d0%02d1" ,$${1},$${2},$${3}); s|VERSION\s*=\s*[\d.]+|VERSION = $$v|' perl-*/RRD?.pm
+ perl -i -p -e 's|RRDtool\s+\d+\.\d+\.\d+|RRDtool $(VER)|' src/*.[ch]
+
+to-dist: to-docs dist
+ mv $(PACKAGE)-$(VERSION).tar.gz archive
+
+to-scp: to-dist
+ scp CHANGES oetiker at tardis.ee.ethz.ch:/home/oetiker/public_html/webtools/rrdtool/pub/
+ scp archive/$(PACKAGE)-$(VERSION).tar.gz oetiker at tardis.ee.ethz.ch:/home/oetiker/public_html/webtools/rrdtool/pub/$(ARCHIVE)
+ scp CHANGES tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+ scp archive/$(PACKAGE)-$(VERSION).tar.gz tobi at ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+
+site-perl-inst:
+ cd perl-piped && $(MAKE) install
+ cd perl-shared && $(MAKE) install
+
+clean-local:
+ cd perl-piped && $(MAKE) clean
+ cd perl-shared && $(MAKE) clean
Added: trunk/orca/packages/rrdtool-1.0.7.2/NT-BUILD-TIPS.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/NT-BUILD-TIPS.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/NT-BUILD-TIPS.txt Sat Jul 13 19:23:28 2002
@@ -0,0 +1,49 @@
+Compiling RRDtool on NT ... work in progress
+---------------------------------------------------------------
+ by Tamas Kovacshazy (khazy at mit.bme.hu)
+
+Persisting Problems with the current NT port:
+
+Unfortunately, the RRD perl modules does not work with Perl
+(ActivePerl) using the current distribution.
+
+The RRD shared perl module can be compiled after some
+modification...
+
+Follow these steps:
+
+0. Install perl if you do not have it!
+ Visit http://www.ActiveState.com/pw32/ for a complete distribution.
+
+1. Copy ..\gd1.2\release\gd.lib to ..\gd1.2\
+2. Copy ..\src\release\rrd.lib to ..\src
+3. perl Makefile.pl
+
+In this step the system complains about something I do not
+understand. The error message is the following:
+
+Note (probably harmless): No library found for '-lm'
+
+Is a library missing? But it does not stop with an error...
+
+4. nmake test (You must have Visual C++ on the machine!)
+
+After these steps it generates the test files (gifs and rrds),
+and they seem to be good.
+
+The real problem in the shared perl modul is the following:
+
+I do not know how this installation stuff works. The problem is
+that the installation stuff looks for the gd.lib and the
+rrd.lib in the ..\gd1.2 and ..\src directory. The UNIX compile
+puts the files into these directories, but the NT compile does
+not.
+
+It is all for today,
+
+khazy
+
+Tamas Kovacshazy E-mail: khazy at mit.bme.hu
+WWW: http://www.mit.bme.hu/~khazy
+Technical University of Budapest
+Department of Measurement and Information Systems
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.dsp
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.dsp (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.dsp Sat Jul 13 19:23:28 2002
@@ -41,7 +41,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x100c
# ADD RSC /l 0x100c
@@ -65,7 +65,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\libpng-1.0.3" /I "..\zlib-1.1.3" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x100c
# ADD RSC /l 0x100c
@@ -106,5 +106,29 @@
SOURCE=.\gdfontt.c
# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidab10.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidab12.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidab14.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidan10.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidan12.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\gdlucidan14.c
+# End Source File
# End Target
# End Project
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.h Sat Jul 13 19:23:29 2002
@@ -100,9 +100,11 @@
void gdImageFilledRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color);
int gdImageBoundsSafe(gdImagePtr im, int x, int y);
void gdImageChar(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color);
-void gdImageCharUp(gdImagePtr im, gdFontPtr f, int x, int y, char c, int color);
+void gdImageCharUp(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color);
void gdImageString(gdImagePtr im, gdFontPtr f, int x, int y, char *s, int color);
void gdImageStringUp(gdImagePtr im, gdFontPtr f, int x, int y, char *s, int color);
+void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
+void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
/* Point type for use in polygon drawing. */
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README.rrdtool
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README.rrdtool (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README.rrdtool Sat Jul 13 19:23:29 2002
@@ -0,0 +1,2 @@
+This version of gd has been included with rrdtool, the lucida fonts have been
+added for the benefit of rrdtool
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.in Sat Jul 13 19:23:29 2002
@@ -1,38 +1,317 @@
-# things that the GNU standards document suggests all makefiles
-# should have.
-SHELL = /bin/sh
-.SUFFIXES:
-.SUFFIXES: .c .o .pl .pm .pod .html .man
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS = foreign
+
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+noinst_LTLIBRARIES = librrd_gd.la
+
+librrd_gd_la_SOURCES = gd.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdlucidab10.c gdlucidab12.c gdlucidab14.c gdlucidan10.c gdlucidan12.c gdlucidan14.c gd.h gdfontmb.h gdlucidab10.h gdlucidan10.h gdfontg.h gdfonts.h gdlucidab12.h gdlucidan12.h gdfontl.h gdfontt.h gdlucidab14.h gdlucidan14.h
-CC=@CC@
-AR=ar
-CFLAGS_EXTRA = @CFLAGS_EXTRA@
-CFLAGS = @CFLAGS@ # -pg
-CFLAGS_ALL = $(CFLAGS) $(CFLAGS_EXTRA)
-LIBS = -L. -lgd -lm
-all: libgd.a gddemo giftogd webgif
+EXTRA_DIST = README.rrdtool demoin.gif gd.dsp gd.dsw index.html readme.txt webgif.c mtables.c mathmake.c giftogd.c
-gddemo: gddemo.o libgd.a gd.h gdfonts.h gdfontl.h
- $(CC) gddemo.o -o gddemo $(LIBS)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
-giftogd: giftogd.o libgd.a gd.h
- $(CC) giftogd.o -o giftogd $(LIBS)
-libgd.a: gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
- gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
- rm -f libgd.a
- $(AR) rc libgd.a gd.o gdfontt.o gdfonts.o gdfontmb.o \
- gdfontl.o gdfontg.o
+DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+librrd_gd_la_LDFLAGS =
+librrd_gd_la_LIBADD =
+librrd_gd_la_OBJECTS = gd.lo gdfontg.lo gdfontl.lo gdfontmb.lo \
+gdfonts.lo gdfontt.lo gdlucidab10.lo gdlucidab12.lo gdlucidab14.lo \
+gdlucidan10.lo gdlucidan12.lo gdlucidan14.lo
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON = Makefile.am Makefile.in
-webgif: webgif.o libgd.a gd.h
- $(CC) webgif.o -o webgif $(LIBS)
-clean:
- -rm -f *.o *.a gddemo giftogd
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
-realclean: clean
- -rm -f Makefile
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(librrd_gd_la_SOURCES)
+OBJECTS = $(librrd_gd_la_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gd1.3/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLTLIBRARIES:
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+
+distclean-noinstLTLIBRARIES:
+
+maintainer-clean-noinstLTLIBRARIES:
.c.o:
- $(CC) $(CFLAGS_ALL) -c $<
+ $(COMPILE) -c $<
+
+.s.o:
+ $(COMPILE) -c $<
+
+.S.o:
+ $(COMPILE) -c $<
+
+mostlyclean-compile:
+ -rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+ -rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.c.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+librrd_gd.la: $(librrd_gd_la_OBJECTS) $(librrd_gd_la_DEPENDENCIES)
+ $(LINK) $(librrd_gd_la_LDFLAGS) $(librrd_gd_la_OBJECTS) $(librrd_gd_la_LIBADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+ -rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = gd1.3
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+gd.lo gd.o : gd.c gd.h mtables.c
+gdfontg.lo gdfontg.o : gdfontg.c gdfontg.h gd.h
+gdfontl.lo gdfontl.o : gdfontl.c gdfontl.h gd.h
+gdfontmb.lo gdfontmb.o : gdfontmb.c gdfontmb.h gd.h
+gdfonts.lo gdfonts.o : gdfonts.c gdfonts.h gd.h
+gdfontt.lo gdfontt.o : gdfontt.c gdfontt.h gd.h
+gdlucidab10.lo gdlucidab10.o : gdlucidab10.c gdlucidab10.h gd.h
+gdlucidab12.lo gdlucidab12.o : gdlucidab12.c gdlucidab12.h gd.h
+gdlucidab14.lo gdlucidab14.o : gdlucidab14.c gdlucidab14.h gd.h
+gdlucidan10.lo gdlucidan10.o : gdlucidan10.c gdlucidan10.h gd.h
+gdlucidan12.lo gdlucidan12.o : gdlucidan12.c gdlucidan12.h gd.h
+gdlucidan14.lo gdlucidan14.o : gdlucidan14.c gdlucidan14.h gd.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LTLIBRARIES)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \
+ clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-noinstLTLIBRARIES distclean-compile \
+ distclean-libtool distclean-tags distclean-generic \
+ clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/webgif.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/webgif.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/webgif.c Sat Jul 13 19:23:30 2002
@@ -9,6 +9,9 @@
{
FILE *in;
FILE *out;
+ char outFn[20];
+ int useStdinStdout=0;
+
/* Declare our image pointer */
gdImagePtr im = 0;
int i;
@@ -20,15 +23,22 @@
int write = 0;
/* C programs always get at least one argument; we want at
least one more (the image), more in practice. */
- if (argc < 2) {
+ if (argc < 2 || !strcmp(argv[1], "--help")) {
no = 1;
goto usage;
}
+
/* The last argument should be the image. Open the file. */
- in = fopen(argv[argc-1], "rb");
+ if (strcmp("-", argv[argc-1])==0) { /* - is synonymous with STDIN */
+ useStdinStdout = 1;
+ in = stdin;
+ } else {
+ in = fopen(argv[argc-1], "rb");
+ }
if (!in) {
fprintf(stderr,
"Error: can't open file %s.\n", argv[argc-1]);
+ exit(1);
}
/* Now load the image. */
im = gdImageCreateFromGif(in);
@@ -36,13 +46,17 @@
/* If the load failed, it must not be a GIF file. */
if (!im) {
fprintf(stderr,
- "Error: %s is not a valid gif file.\n", argv[1]);
+ "Error: %s is not a valid gif file.\n", argv[argc-1]);
exit(1);
}
/* Consider each argument in turn. */
for (i=1; (i < (argc-1)); i++) {
/* -i turns on and off interlacing. */
- if (!strcmp(argv[i], "-i")) {
+ if (!strcmp(argv[i], "--help")) {
+ /* Every program should use this for help! :) */
+ no = 1;
+ goto usage;
+ } else if (!strcmp(argv[i], "-i")) {
if (i == (argc-2)) {
fprintf(stderr,
"Error: -i specified without y or n.\n");
@@ -126,33 +140,46 @@
if (no) {
/* If the command failed, output an explanation. */
fprintf(stderr,
- "Usage: webgif [-i y|n ] [-l] [-t index|off ] [-d] gifname.gif\n");
- fprintf(stderr,
- "Where -i controls interlace (specify y or n for yes or no),\n");
- fprintf(stderr,
- "-l outputs a table of color indexes, -t sets the specified\n");
- fprintf(stderr,
- "color index (0-255 or none) to be the transparent color, and\n");
- fprintf(stderr,
- "-d reports the dimensions and other characteristics of the image.\n");
- fprintf(stderr,
- "Note: you may wish to pipe to \"more\" when using the -l option.\n");
+"Usage: webgif [-i y|n ] [-l] [-t index|off ] [-d] gifname.gif\n"
+
+" -i [y|n] Turns on/off interlace\n"
+" -l Prints the table of color indexes\n"
+" -t [index] Set the transparent color to the specified index (0-255 or none)\n"
+" -d Reports the dimensions and other characteristics of the image.\n"
+"\n"
+"If you specify '-' as the input file, stdin/stdout will be used input/output.\n"
+);
}
if (write) {
- /* Open a temporary file. */
- out = fopen("temp.tmp", "wb");
- if (!out) {
- fprintf(stderr,
- "Unable to write to temp.tmp -- exiting\n");
- exit(1);
- }
- /* Write the new gif. */
- gdImageGif(im, out);
- fclose(out);
- /* Erase the old gif. */
- unlink(argv[argc-1]);
- /* Rename the new to the old. */
- rename("temp.tmp", argv[argc-1]);
+ if (useStdinStdout) {
+ out = stdout;
+ } else {
+ /* Open a temporary file. */
+
+ /* "temp.tmp" is not good temporary filename. */
+ sprintf(outFn, "webgif.tmp%d", getpid());
+ out = fopen(outFn, "wb");
+
+ if (!out) {
+ fprintf(stderr,
+ "Unable to write to %s -- exiting\n", outFn);
+ exit(1);
+ }
+ }
+
+ /* Write the new gif. */
+ gdImageGif(im, out);
+
+ if (!useStdinStdout) {
+ fclose(out);
+ /* Erase the old gif. */
+ unlink(argv[argc-1]);
+ /* Rename the new to the old. */
+ if (rename(outFn, argv[argc-1])!=0) {
+ perror("rename");
+ exit(1);
+ }
+ }
}
/* Delete the image from memory. */
if (im) {
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.c Sat Jul 13 19:23:30 2002
@@ -0,0 +1,3358 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-10-100-75-75-M-60-ISO8859-1
+ at Tue Jul 13 15:36:06 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidab10.h"
+
+char gdLucidaBold10Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+1,1,1,0,1,1,
+0,1,1,0,1,0,
+1,1,1,0,1,1,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,1,0,
+0,0,0,1,1,1,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+1,0,1,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,1,0,1,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,0,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,0,1,1,0,0,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,
+0,0,0,0,1,1,
+0,0,0,0,1,1,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+1,1,0,0,0,0,
+1,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,0,0,0,1,1,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,0,0,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,1,1,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+0,1,1,1,1,1,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,1,1,1,1,1,
+0,0,0,0,0,1,
+0,0,0,0,1,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,1,
+0,0,0,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,1,1,
+0,0,0,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,1,1,1,
+0,1,0,1,0,1,
+0,1,0,1,1,1,
+0,1,0,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,1,0,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,0,1,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+1,1,1,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,1,1,1,0,0,
+0,1,1,0,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,1,
+1,1,0,0,1,1,
+1,1,1,1,1,1,
+1,1,1,1,1,1,
+1,0,1,0,1,1,
+1,0,1,0,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,0,1,
+0,1,1,1,1,1,
+0,1,0,1,1,1,
+0,1,0,0,1,1,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,0,
+0,1,1,0,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,1,0,
+0,0,0,1,1,1,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+1,1,0,0,0,1,
+1,1,0,0,1,1,
+0,1,1,0,1,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+1,1,0,1,0,1,
+1,1,0,1,0,1,
+1,1,0,1,0,1,
+1,1,1,1,1,1,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,1,
+0,1,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+1,1,0,0,0,1,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,1,1,
+0,0,0,1,1,0,
+0,0,1,1,1,0,
+0,0,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+1,1,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,1,1,
+0,0,0,0,1,1,
+0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,0,0,0,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,
+0,0,0,0,1,1,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,
+0,0,0,1,1,1,
+0,0,1,1,0,0,
+0,1,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,1,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+
+/* Char 104 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,1,0,
+0,1,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,1,1,1,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,1,0,
+0,1,1,1,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,1,
+0,0,0,0,1,1,
+0,0,0,0,1,1,
+
+/* Char 114 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,1,1,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,1,1,
+1,1,0,0,1,1,
+0,1,1,0,1,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+1,1,0,1,0,1,
+1,1,0,1,0,1,
+1,1,0,1,0,1,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,0,1,1,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+1,1,0,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,0,1,0,1,0,
+0,0,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,1,1,1,
+0,0,1,1,1,0,
+0,1,1,1,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,
+0,0,0,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,0,0,
+0,0,0,0,1,1,
+0,0,0,1,0,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,1,
+1,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+
+/* Char 163 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,1,1,
+1,1,0,0,1,1,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+1,1,1,1,1,1,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,1,1,
+0,1,1,0,0,1,
+0,0,1,1,1,1,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+1,0,1,1,0,1,
+1,0,1,0,0,1,
+1,0,1,1,0,1,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+1,1,0,1,1,0,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+1,0,1,1,0,1,
+1,0,1,1,0,1,
+1,0,1,0,1,1,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,1,
+0,0,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,0,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,1,0,1,
+0,1,1,1,0,1,
+0,0,1,1,0,1,
+0,0,0,1,0,1,
+0,0,0,1,0,1,
+0,0,0,1,0,1,
+0,0,0,1,0,1,
+0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,1,1,0,
+0,1,1,0,1,1,
+1,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,1,1,0,
+0,0,1,0,0,0,
+1,1,0,1,1,0,
+0,0,1,1,1,0,
+0,1,1,1,1,1,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,1,1,1,
+1,0,0,0,1,1,
+0,0,0,1,1,0,
+0,0,0,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 190 */
+1,1,0,0,0,0,
+0,1,1,0,0,0,
+1,1,0,0,0,0,
+0,1,1,0,0,1,
+1,1,0,1,1,0,
+0,0,1,0,0,0,
+1,1,0,1,1,0,
+0,0,1,1,1,0,
+0,1,1,1,1,1,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 192 */
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 196 */
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+1,1,1,1,1,1,
+1,0,0,0,1,1,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,0,1,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,1,1,
+1,1,1,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,1,1,1,0,1,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,1,1,1,
+0,0,0,0,1,0,
+0,0,1,1,0,0,
+
+/* Char 200 */
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 204 */
+0,1,1,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 207 */
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,0,1,
+1,1,1,1,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,1,0,1,
+0,1,1,1,1,1,
+0,1,0,1,1,1,
+0,1,0,0,1,1,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+1,0,0,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,
+0,0,0,0,0,1,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,1,1,1,0,1,
+0,1,1,1,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,1,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,1,1,0,
+0,0,1,1,1,0,
+0,0,0,0,1,1,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,1,0,1,
+1,1,1,1,0,1,
+1,0,1,1,1,1,
+1,0,1,1,0,0,
+1,1,0,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 232 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,
+1,1,1,0,1,1,
+0,0,1,1,0,0,
+0,1,0,1,1,0,
+0,0,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,1,0,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,1,1,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,1,
+0,0,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,1,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,1,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,1,1,0,
+0,0,1,0,1,1,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,1,1,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,0,1,0,1,0,
+0,0,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+0,1,1,1,1,0,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,1,1,1,0,
+0,1,1,0,0,0,
+0,1,1,0,0,0,
+
+/* Char 255 */
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+0,1,1,0,0,1,
+0,1,1,0,1,1,
+0,0,1,0,1,0,
+0,0,1,1,1,0,
+0,0,0,1,1,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+
+
+};
+
+gdFont gdLucidaBold10Rep = {
+ 256,
+ 0,
+ 6,
+ 11,
+ gdLucidaBold10Data
+};
+
+gdFontPtr gdLucidaBold10 = &gdLucidaBold10Rep;
+
+/* This file has not been truncated. */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.c Sat Jul 13 19:23:31 2002
@@ -0,0 +1,3870 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-12-120-75-75-M-70-ISO8859-1
+ at Tue Jul 13 15:35:50 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidab12.h"
+
+char gdLucidaBold12Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,
+0,0,1,1,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+1,1,1,1,1,1,1,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+1,1,1,1,1,1,1,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,1,
+0,0,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+1,0,1,1,0,1,1,
+1,0,1,1,0,1,0,
+0,1,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,1,0,
+0,1,0,1,0,1,1,
+1,1,0,1,0,1,1,
+1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,0,0,
+0,0,1,1,0,0,1,
+0,1,1,1,1,0,1,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,1,0,1,0,1,0,
+0,0,1,1,1,0,0,
+0,1,0,1,0,1,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,1,
+0,0,0,1,1,1,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,0,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,1,1,1,1,1,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,1,1,1,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,1,1,1,1,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,0,1,1,
+0,0,1,1,1,1,0,
+0,1,1,0,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,0,
+0,0,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+1,1,0,0,0,1,1,
+1,0,0,1,1,1,1,
+1,0,1,1,0,1,1,
+1,0,1,1,0,1,1,
+1,0,1,1,0,1,1,
+1,0,0,1,1,0,1,
+1,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,1,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,0,0,1,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,1,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,1,
+0,0,0,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,1,1,0,1,0,0,
+0,1,1,1,0,0,0,
+0,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,1,1,1,1,
+0,1,0,1,0,1,1,
+0,1,0,1,0,1,1,
+0,1,0,1,0,1,1,
+0,1,0,1,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,1,0,0,1,
+0,1,1,1,1,0,1,
+0,1,0,1,1,0,1,
+0,1,0,1,1,1,1,
+0,1,0,0,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,1,
+0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,0,1,1,1,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,1,
+0,0,0,1,1,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,
+0,1,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,
+0,0,1,0,1,0,0,
+0,1,1,0,1,1,0,
+0,1,0,0,0,1,0,
+1,1,0,0,0,1,1,
+1,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,1,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+
+/* Char 104 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,0,
+0,1,1,0,1,0,0,
+0,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,
+
+/* Char 114 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,
+0,0,1,1,0,1,1,
+0,0,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,1,
+0,0,0,0,0,1,1,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,
+0,1,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,1,1,0,1,0,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,1,1,1,
+0,0,0,1,1,1,0,
+0,0,1,1,1,0,0,
+0,1,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,1,
+0,1,0,1,1,0,1,
+0,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,
+1,1,0,0,0,1,1,
+0,1,1,1,1,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,0,1,1,
+1,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,1,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,1,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+1,0,0,1,1,0,1,
+1,0,1,0,0,0,1,
+1,0,1,0,0,0,1,
+1,0,1,0,0,0,1,
+1,0,0,1,1,0,1,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,
+0,1,1,0,1,1,0,
+1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+1,0,1,1,1,0,1,
+1,0,1,1,0,0,1,
+1,0,1,0,1,0,1,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,1,1,1,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+1,1,1,1,0,1,0,
+1,1,1,1,0,1,0,
+1,1,1,1,0,1,0,
+0,1,1,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,
+0,1,1,0,1,1,0,
+1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,
+1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,1,1,0,
+0,0,0,1,0,0,0,
+0,1,1,0,1,1,0,
+1,0,0,1,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,1,1,1,1,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,
+1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,1,1,0,
+0,0,0,1,0,0,0,
+0,1,1,0,1,1,0,
+1,0,0,1,0,1,1,
+0,0,0,0,0,1,1,
+0,0,0,0,1,1,0,
+0,0,0,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,
+1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,1,0,
+0,1,1,0,1,0,0,
+1,1,1,1,0,0,0,
+0,0,1,0,1,1,0,
+0,1,0,1,1,1,0,
+1,0,1,0,1,1,0,
+0,0,1,1,1,1,1,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,1,0,
+0,0,1,1,1,0,0,
+
+/* Char 192 */
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,1,1,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,0,1,0,1,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,1,0,0,
+0,1,0,1,1,0,0,
+0,1,0,1,1,0,0,
+0,1,0,1,1,1,1,
+1,0,0,1,1,0,0,
+1,1,1,1,1,0,0,
+1,0,0,1,1,0,0,
+1,0,0,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,1,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,0,0,1,
+0,0,0,1,1,1,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 200 */
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,1,1,0,
+0,0,0,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,0,1,0,0,1,
+0,0,0,1,0,0,1,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+1,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,1,0,1,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,1,0,0,1,
+0,1,1,1,0,0,1,
+0,1,0,1,1,0,1,
+0,1,0,1,1,1,1,
+0,1,0,0,1,1,1,
+0,1,0,0,0,1,1,
+0,1,0,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,1,1,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,
+0,1,1,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,1,0,0,0,1,1,
+1,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,
+0,0,1,1,1,1,1,
+0,0,1,0,0,1,0,
+0,1,1,0,1,1,1,
+0,1,1,0,1,1,1,
+0,1,1,1,0,1,1,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,0,1,0,
+0,1,1,0,0,1,0,
+0,1,1,0,1,0,0,
+0,1,1,0,0,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,1,
+1,0,0,1,1,0,1,
+0,0,0,1,1,0,1,
+0,1,1,1,1,1,1,
+1,1,0,1,1,0,0,
+1,1,0,1,1,0,0,
+0,1,1,0,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,1,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,1,
+0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,
+0,0,1,1,1,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,1,1,1,
+0,0,1,1,0,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,1,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,1,1,1,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,0,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,
+
+
+};
+
+gdFont gdLucidaBold12Rep = {
+ 256,
+ 0,
+ 7,
+ 13,
+ gdLucidaBold12Data
+};
+
+gdFontPtr gdLucidaBold12 = &gdLucidaBold12Rep;
+
+/* This file has not been truncated. */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.c Sat Jul 13 19:23:31 2002
@@ -0,0 +1,4382 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-14-140-75-75-M-90-ISO8859-1
+ at Tue Jul 13 15:35:35 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidab14.h"
+
+char gdLucidaBold14Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,1,1,0,1,1,0,
+1,1,1,1,1,1,1,1,1,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+1,1,1,1,1,1,1,1,1,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,0,1,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,1,0,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,0,1,1,1,0,
+0,0,0,1,0,0,1,1,0,
+0,1,0,1,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,1,
+0,1,1,0,1,1,0,1,0,
+0,0,1,1,1,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,1,1,0,
+0,0,1,0,1,1,0,1,1,
+0,1,0,0,1,1,0,1,1,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,0,0,0,
+0,0,0,1,1,0,0,1,1,
+0,0,1,0,1,1,0,1,1,
+0,1,1,0,0,1,0,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,0,1,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,1,0,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,0,0,1,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,1,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+1,0,0,0,1,1,1,1,0,
+1,0,0,1,1,0,1,1,0,
+1,0,0,1,1,0,1,1,0,
+1,0,0,1,1,0,1,1,0,
+0,1,0,0,1,1,0,1,1,
+0,1,1,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,0,0,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,1,0,0,1,1,1,
+0,1,1,1,0,0,1,1,1,
+0,1,1,1,0,1,1,1,1,
+0,1,0,1,1,1,0,1,1,
+0,1,0,1,1,1,0,1,1,
+0,1,0,0,1,0,0,1,1,
+0,1,0,0,0,0,0,1,1,
+0,1,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,0,
+0,1,1,1,0,0,0,1,0,
+0,1,1,1,0,0,0,1,0,
+0,1,0,1,1,0,0,1,0,
+0,1,0,1,1,0,0,1,0,
+0,1,0,0,1,1,0,1,0,
+0,1,0,0,1,1,0,1,0,
+0,1,0,0,0,1,1,1,0,
+0,1,0,0,0,1,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,1,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,0,1,0,
+0,0,1,1,0,0,0,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,1,1,0,1,1,
+0,1,1,0,1,1,0,1,1,
+0,1,1,0,1,1,0,1,1,
+0,1,1,0,1,1,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,0,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,1,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,1,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,1,1,1,0,0,
+0,1,1,1,0,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,1,0,1,1,0,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,1,0,0,
+0,1,1,1,0,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,1,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,1,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,1,
+0,1,1,0,0,0,0,0,1,
+0,1,1,0,0,1,0,0,1,
+0,1,1,0,1,1,1,0,1,
+0,1,1,0,1,1,1,0,1,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,1,0,
+0,1,0,1,1,1,0,1,0,
+0,1,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,1,0,1,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,0,1,0,0,0,
+0,0,1,1,0,1,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,1,
+0,1,0,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,0,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,1,1,1,0,1,
+0,1,0,1,1,0,0,0,1,
+0,1,0,1,1,0,0,0,1,
+0,1,0,1,1,0,0,0,1,
+0,1,0,1,1,0,0,0,1,
+0,1,0,0,1,1,1,0,1,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,1,1,1,0,0,
+0,0,1,1,0,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,1,1,1,0,0,1,
+0,1,0,1,1,0,1,0,1,
+0,1,0,1,1,1,0,0,1,
+0,1,0,1,1,0,1,0,1,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,1,1,1,0,1,0,
+0,0,1,1,1,1,0,1,0,
+0,0,1,1,1,1,0,1,0,
+0,0,1,1,1,1,0,1,0,
+0,0,0,1,1,1,0,1,0,
+0,0,0,0,0,1,0,1,0,
+0,0,0,0,0,1,0,1,0,
+0,0,0,0,0,1,0,1,0,
+0,0,0,0,0,1,0,1,0,
+0,0,0,0,0,1,0,1,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,0,0,0,
+1,1,1,0,0,1,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,1,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,0,1,0,1,1,0,
+0,0,1,0,1,1,1,1,1,
+0,1,0,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,0,0,0,
+1,1,1,0,0,1,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,1,1,1,0,1,1,1,0,
+0,0,0,1,0,0,0,1,1,
+0,0,0,1,0,0,1,1,0,
+0,0,1,0,0,1,1,0,0,
+0,0,1,0,0,1,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,0,0,1,0,0,0,
+0,1,1,0,0,1,0,0,0,
+1,1,0,0,1,0,0,0,0,
+0,1,1,0,1,0,0,0,0,
+1,1,0,1,0,0,1,1,0,
+0,0,0,1,0,1,1,1,0,
+0,0,1,0,1,0,1,1,0,
+0,0,1,0,1,1,1,1,1,
+0,1,0,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+
+/* Char 192 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,0,0,1,1,0,1,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,1,0,1,1,0,0,0,
+0,1,1,0,1,1,1,1,0,
+0,1,0,0,1,1,0,0,0,
+0,1,1,1,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 200 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+1,1,1,1,1,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,0,
+0,1,1,1,0,0,0,1,0,
+0,1,1,1,0,0,0,1,0,
+0,1,0,1,1,0,0,1,0,
+0,1,0,1,1,0,0,1,0,
+0,1,0,0,1,1,0,1,0,
+0,1,0,0,1,1,0,1,0,
+0,1,0,0,0,1,1,1,0,
+0,1,0,0,0,1,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,0,0,1,1,0,1,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,1,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,1,
+0,1,1,0,0,1,0,1,1,
+0,1,1,0,0,1,0,1,1,
+0,1,1,0,1,0,0,1,1,
+0,1,1,0,1,0,0,1,1,
+0,1,1,1,0,0,0,1,1,
+0,0,1,1,0,0,1,1,0,
+0,1,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,1,
+0,1,1,0,0,0,0,1,1,
+0,0,1,1,0,0,0,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,1,1,0,1,1,
+0,0,0,0,1,1,0,1,1,
+0,0,1,1,1,1,1,1,1,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,1,0,1,
+0,0,1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,1,0,0,
+0,1,1,1,0,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,1,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,1,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,1,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+
+};
+
+gdFont gdLucidaBold14Rep = {
+ 256,
+ 0,
+ 9,
+ 15,
+ gdLucidaBold14Data
+};
+
+gdFontPtr gdLucidaBold14 = &gdLucidaBold14Rep;
+
+/* This file has not been truncated. */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab10.h Sat Jul 13 19:23:32 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAB10_H_
+#define _GDLUCIDAB10_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-10-100-75-75-M-60-ISO8859-1
+ at Tue Jul 13 15:36:06 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaBold10;
+
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab12.h Sat Jul 13 19:23:32 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAB12_H_
+#define _GDLUCIDAB12_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-12-120-75-75-M-70-ISO8859-1
+ at Tue Jul 13 15:35:50 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaBold12;
+
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidab14.h Sat Jul 13 19:23:32 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAB14_H_
+#define _GDLUCIDAB14_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Bold-R-Normal-Sans-14-140-75-75-M-90-ISO8859-1
+ at Tue Jul 13 15:35:35 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaBold14;
+
+#endif
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.c Sat Jul 13 19:23:33 2002
@@ -1,6 +1,19 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -Misc-Fixed-Bold-R-Normal-Sans-15-140-75-75-C-90-ISO8859-2
+ at Mon Jan 26 14:45:58 1998.
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
+
+
#include "gdfontg.h"
char gdFontGiantData[] = {
+/* Char 0 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -17,175 +30,186 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 1 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,1,1,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 2 */
0,0,0,0,0,0,0,0,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,0,
+0,1,0,1,0,1,0,1,0,
+
+/* Char 3 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,1,1,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,1,1,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,1,1,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,1,1,0,1,1,
-0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 4 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,1,1,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,1,1,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 5 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,1,1,1,1,1,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+/* Char 6 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,0,0,
-0,1,1,0,0,0,1,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,1,0,0,
-0,0,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,1,1,1,1,1,0,
-0,0,0,1,1,0,0,1,1,
-0,0,0,1,1,1,1,1,0,
-0,0,0,1,1,0,0,1,1,
-0,0,0,1,1,0,0,1,1,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 7 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+
+/* Char 8 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 9 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
+1,1,0,0,1,1,0,0,0,
+1,1,1,0,1,1,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+/* Char 10 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,1,0,1,1,0,0,
-0,1,1,1,1,1,1,0,0,
-0,1,1,0,1,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,0,1,1,1,1,0,0,0,
+/* Char 11 */
0,0,0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,1,1,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,0,0,0,0,
-
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-1,1,1,1,1,1,0,0,0,
-1,1,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -193,6 +217,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 12 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -200,15 +225,16 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,0,0,0,
-1,1,1,1,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+/* Char 13 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -216,24 +242,25 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,1,1,1,1,
+0,0,0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,1,1,1,
+/* Char 14 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,1,1,
+0,0,0,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -241,22 +268,24 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+/* Char 15 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+/* Char 16 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -273,6 +302,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 17 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -289,6 +319,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 18 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -305,6 +336,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 19 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -321,6 +353,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 20 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -337,45 +370,48 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-1,1,1,1,1,1,0,0,0,
-1,1,1,1,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+/* Char 21 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,1,1,1,1,
+0,0,0,1,1,1,1,1,1,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+/* Char 22 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 23 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
@@ -385,6 +421,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 24 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -394,109 +431,116 @@
0,0,0,0,0,0,0,0,0,
1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
+/* Char 25 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+/* Char 26 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,1,
-0,0,0,0,1,1,1,0,0,
-0,0,1,1,1,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,0,0,0,0,
-0,0,0,0,1,1,1,0,0,
-0,0,0,0,0,0,1,1,1,
+0,0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,1,1,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 27 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,0,0,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,0,0,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,1,1,1,0,
-0,0,0,1,1,1,0,0,0,
-0,1,1,1,0,0,0,0,0,
+1,1,1,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+1,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 28 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,0,1,0,0,1,1,0,
-0,0,0,1,0,0,1,1,0,
-0,0,0,1,0,0,1,1,0,
-0,1,1,1,0,0,1,1,0,
-0,1,1,1,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
+0,0,1,0,0,1,1,0,0,
+0,0,1,0,0,1,1,0,0,
+0,0,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,1,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 29 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,1,1,
0,0,0,0,0,0,1,1,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
0,1,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 30 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,1,1,0,0,1,1,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,1,1,1,1,1,0,0,0,
-0,1,0,1,1,1,1,1,1,
-0,1,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+1,1,1,1,1,0,0,0,0,
+1,0,1,1,1,1,1,1,0,
+1,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 31 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -504,15 +548,16 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 32 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -529,28 +574,30 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 33 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 34 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,0,1,1,0,
-0,0,0,1,1,0,1,1,0,
-0,0,0,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -561,76 +608,81 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 35 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,0,1,1,0,0,
-0,0,1,1,0,1,1,0,0,
-0,1,1,1,1,1,1,1,0,
-0,0,1,1,0,1,1,0,0,
-0,0,1,1,0,1,1,0,0,
-0,1,1,1,1,1,1,1,0,
-0,0,1,1,0,1,1,0,0,
-0,0,1,1,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 36 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,0,0,
-0,0,0,1,1,1,1,1,0,
-0,0,1,1,0,1,0,1,1,
-0,0,1,1,0,1,0,0,0,
-0,0,1,1,1,1,0,0,0,
-0,0,0,1,1,1,1,1,0,
-0,0,0,0,0,1,1,1,1,
-0,0,0,0,0,1,0,1,1,
-0,0,1,1,0,1,0,1,1,
-0,0,0,1,1,1,1,1,0,
-0,0,0,0,0,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,1,0,1,1,0,
+0,1,1,0,1,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,1,0,1,1,0,
+0,1,1,0,1,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 37 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,1,1,
-0,1,1,1,1,0,1,1,0,
-0,1,1,1,1,0,1,1,0,
-0,0,1,1,0,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,0,1,1,0,
-0,0,1,1,0,1,1,1,1,
-0,0,1,1,0,1,1,1,1,
-0,1,1,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,1,0,
+1,1,1,0,0,1,1,0,0,
+1,1,1,0,0,1,1,0,0,
+0,1,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,1,0,0,
+0,1,1,0,0,1,1,1,0,
+0,1,1,0,0,1,1,1,0,
+1,1,0,0,0,0,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 38 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,0,0,
-0,0,1,1,1,1,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,1,1,1,1,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,1,1,1,0,
-0,0,1,1,1,1,0,1,1,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,1,1,0,0,1,0,
+1,1,0,0,1,1,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,1,1,1,0,0,
+0,1,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 39 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,0,1,1,1,0,0,
-0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -641,6 +693,8 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 40 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
@@ -655,56 +709,59 @@
0,0,0,0,1,1,0,0,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+/* Char 41 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 42 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,
-0,1,1,0,1,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
-0,0,0,1,1,1,0,0,0,
-0,1,1,1,0,1,1,1,0,
-0,0,0,1,1,1,0,0,0,
-0,0,1,1,1,1,1,0,0,
-0,1,1,0,1,0,1,1,0,
-0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 43 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 44 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -715,12 +772,13 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 45 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -728,8 +786,8 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -737,6 +795,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 46 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -747,770 +806,818 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,1,1,0,
0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 48 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 49 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,1,1,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 50 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
-0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 51 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 52 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,1,1,1,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,1,1,0,1,1,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 53 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 54 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,1,0,
-0,0,1,1,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 55 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 56 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 57 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,1,1,1,
-0,0,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 58 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 59 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 60 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 61 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 62 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 63 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
0,0,0,0,0,0,1,1,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 64 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,1,1,1,1,1,
-0,1,1,1,1,0,0,1,1,
-0,1,1,1,1,0,1,1,1,
-0,1,1,0,1,1,1,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,1,1,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 65 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,1,1,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 66 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 67 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 68 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 69 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,1,1,1,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 70 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,1,1,1,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 71 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,1,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 72 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,1,1,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 73 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 74 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,1,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 75 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,1,1,0,0,0,
-0,1,1,1,1,0,0,0,0,
-0,1,1,1,1,0,0,0,0,
-0,1,1,0,1,1,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,1,1,0,0,0,0,
+1,1,1,1,0,0,0,0,0,
+1,1,1,1,0,0,0,0,0,
+1,1,0,1,1,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 76 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 77 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,0,0,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,1,1,1,1,1,1,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 78 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,0,0,0,1,1,
-0,1,1,1,1,0,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,0,1,1,1,1,
-0,1,1,0,0,0,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 79 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 80 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 81 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,0,1,1,1,1,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 82 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,1,1,0,0,0,
-0,1,1,0,0,1,1,0,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 83 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 84 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 85 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 86 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,1,1,0,0,1,1,0,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 87 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 88 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 89 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 90 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 91 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,1,1,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 92 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
0,0,1,1,0,0,0,0,0,
0,0,0,1,1,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 93 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,1,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 94 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -1521,6 +1628,7 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 95 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -1533,16 +1641,17 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+/* Char 96 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -1553,489 +1662,2697 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 97 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,1,1,1,
-0,0,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 98 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 99 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 100 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,1,
-0,1,1,0,0,0,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,1,1,1,
-0,0,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 101 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,1,1,1,1,1,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 102 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,1,1,0,0,1,1,
-0,0,0,1,1,0,0,1,1,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,1,1,1,1,1,1,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 103 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,1,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+/* Char 104 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 105 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 106 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+0,1,1,1,1,1,0,0,0,
+/* Char 107 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,1,1,1,0,
-0,1,1,1,1,1,0,0,0,
-0,1,1,1,0,0,0,0,0,
-0,1,1,1,1,1,0,0,0,
-0,1,1,0,0,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 108 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 109 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,0,1,1,0,1,1,0,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 110 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 111 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 112 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,1,1,1,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,1,0,0,0,1,1,
-0,1,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
-0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+/* Char 113 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,1,
-0,1,1,0,0,0,1,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,1,1,1,
-0,0,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
-0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+/* Char 114 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,1,1,1,1,0,
-0,0,1,1,1,0,0,1,1,
-0,0,1,1,0,0,0,1,1,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
-0,0,1,1,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,1,0,0,
+0,1,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 115 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,0,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 116 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,1,1,1,1,1,1,1,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,0,0,
-0,0,0,1,1,0,0,1,1,
-0,0,0,0,1,1,1,1,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 117 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,0,1,1,1,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 118 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 119 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,0,0,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,0,1,1,0,1,1,
-0,1,1,1,1,1,1,1,1,
-0,0,1,1,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+0,1,1,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 120 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,0,1,1,
-0,0,1,1,0,0,1,1,0,
-0,0,0,1,1,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,1,1,1,1,0,0,
-0,0,1,1,0,0,1,1,0,
-0,1,1,0,0,0,0,1,1,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 121 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,1,1,0,0,1,1,1,0,
-0,0,1,1,1,1,1,1,0,
-0,0,0,0,0,0,1,1,0,
-0,1,1,0,0,0,1,1,0,
-0,0,1,1,1,1,1,0,0,
+0,0,1,1,1,0,1,1,0,
+1,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+/* Char 122 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
0,0,1,1,0,0,0,0,0,
-0,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 123 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,1,1,1,1,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,1,1,1,0,0,0,
-0,0,0,0,0,1,1,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,0,1,1,1,1,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 124 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
-0,0,0,0,1,1,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 125 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,1,1,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+1,1,1,0,0,0,0,0,0,
+1,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+
+/* Char 171 */
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,1,1,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,1,1,
+
+/* Char 178 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,1,1,0,
+0,0,0,0,1,1,1,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,1,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,0,1,1,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+1,1,1,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 192 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 195 */
+1,1,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+
+/* Char 200 */
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,0,1,1,1,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,1,0,
+
+/* Char 203 */
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,1,1,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,0,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,1,1,0,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,1,1,0,1,1,0,
+1,1,0,0,1,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,0,0,
+1,1,1,1,1,0,0,0,0,
+1,1,0,0,1,1,0,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,1,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+1,1,1,0,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,1,0,0,1,1,0,
+1,1,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,1,0,0,
+0,1,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,1,1,1,0,
+0,1,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 229 */
0,0,0,0,1,1,1,0,0,
-0,0,0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,1,0,0,0,1,1,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,1,1,1,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
0,0,0,0,1,1,0,0,0,
-0,1,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,1,
+0,0,0,0,0,0,0,1,1,
+0,0,0,0,0,1,1,1,1,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+0,1,1,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+1,1,0,0,0,1,1,0,0,
+0,1,1,0,1,1,1,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,0,0,0,
+1,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,1,0,0,1,1,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,1,0,0,
+0,1,1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+/* Char 251 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,1,1,1,0,0,1,1,
-0,1,1,0,1,1,0,1,1,
+0,0,0,1,1,0,1,1,0,
+0,0,1,1,0,1,1,0,0,
+0,1,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,1,1,0,0,1,1,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+
+/* Char 253 */
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+1,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,1,1,0,
+0,0,1,1,1,0,1,1,0,
+1,0,0,0,0,0,1,1,0,
+0,1,1,1,1,1,1,0,0,
+/* Char 254 */
+0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,1,0,0,1,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
@@ -2047,11 +4364,12 @@
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0
+
+
};
gdFont gdFontGiantRep = {
- 128,
+ 256,
0,
9,
15,
@@ -2059,3 +4377,6 @@
};
gdFontPtr gdFontGiant = &gdFontGiantRep;
+
+/* This file has not been truncated. */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.c Sat Jul 13 19:23:33 2002
@@ -0,0 +1,3358 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-10-100-75-75-M-60-ISO8859-1
+ at Tue Jul 13 15:33:56 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidan10.h"
+
+char gdLucidaNormal10Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+1,1,0,1,1,0,
+0,1,0,1,0,0,
+1,1,0,1,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,1,0,
+1,0,1,0,0,0,
+1,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+1,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,1,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,
+0,0,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,1,1,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,1,1,0,
+0,0,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,1,1,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,1,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,1,
+0,0,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,1,1,1,0,
+1,0,1,0,1,0,
+1,0,1,1,1,1,
+1,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+1,1,1,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,1,1,0,0,0,
+0,1,0,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,1,0,1,1,
+0,1,1,0,1,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,1,1,0,
+0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,1,1,1,1,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,
+0,0,0,1,1,1,
+0,0,1,0,0,0,
+0,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+1,1,1,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,1,1,0,0,0,
+0,1,0,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,0,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,1,1,
+0,0,1,1,0,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,1,0,1,
+0,1,0,1,0,1,
+0,1,1,1,1,1,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,1,
+1,0,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,1,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+1,0,1,1,0,1,
+1,0,1,0,0,1,
+1,0,1,1,0,1,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,1,
+0,1,0,0,1,0,
+0,0,1,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,1,
+0,0,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+1,0,0,0,0,1,
+1,0,1,1,0,1,
+1,0,1,1,0,1,
+1,0,1,0,1,1,
+1,0,0,0,0,1,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,1,1,1,1,1,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,1,1,0,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+1,1,1,0,1,0,
+1,1,1,0,1,0,
+0,1,1,0,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,1,0,0,
+0,1,0,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,1,0,
+1,0,1,0,1,0,
+0,0,1,1,1,1,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,1,1,0,
+1,0,0,0,0,1,
+0,0,0,0,1,0,
+0,0,0,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,
+1,1,1,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,1,0,
+1,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,1,0,
+1,0,1,0,1,0,
+0,0,1,1,1,1,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 192 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,0,1,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,1,1,
+1,1,1,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 200 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,1,
+1,1,1,1,0,1,
+0,1,0,0,0,1,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,1,0,1,0,
+0,1,1,0,1,0,
+0,1,0,1,1,0,
+0,1,0,1,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+1,0,0,0,0,1,
+1,0,0,0,0,1,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,1,0,0,0,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,1,
+0,1,0,0,1,0,
+1,0,0,1,0,1,
+1,0,1,1,0,1,
+1,0,1,0,0,1,
+0,1,0,0,1,0,
+1,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,1,
+0,1,0,0,0,1,
+0,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,1,
+0,0,0,1,0,1,
+0,0,1,1,1,1,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 232 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,1,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,1,0,
+0,0,1,1,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,1,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+1,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,1,0,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,1,1,0,
+0,0,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,1,0,0,
+0,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+
+
+};
+
+gdFont gdLucidaNormal10Rep = {
+ 256,
+ 0,
+ 6,
+ 11,
+ gdLucidaNormal10Data
+};
+
+gdFontPtr gdLucidaNormal10 = &gdLucidaNormal10Rep;
+
+/* This file has not been truncated. */
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.c Sat Jul 13 19:23:34 2002
@@ -1,1645 +1,4639 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-medium-r-normal--16-140-75-75-c-80-iso8859-2
+ at Tue Jan 6 19:39:27 1998.
+
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
+
+
#include "gdfontl.h"
char gdFontLargeData[] = {
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
-
- 0,1,1,0,1,1,0,0,
- 0,1,1,0,1,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,1,0,0,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,1,0,
- 0,0,0,1,0,0,1,0,
- 0,0,0,1,0,0,1,0,
- 0,1,1,1,1,1,1,1,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 1,1,1,1,1,1,1,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,1,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,1,0,1,0,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,1,1,0,
- 1,0,0,1,0,0,0,0,
- 0,1,0,1,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,0,1,0,0,
- 0,0,0,1,0,0,1,0,
- 1,1,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
-
- 0,0,0,0,0,0,1,0,
- 0,1,1,0,0,0,1,0,
- 1,0,0,1,0,1,0,0,
- 1,0,0,1,0,1,0,0,
- 1,0,0,1,0,1,0,0,
- 1,0,0,1,1,0,0,0,
- 0,1,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,1,1,0,0,
- 0,0,1,1,0,0,1,0,
- 0,1,0,1,0,0,1,0,
- 0,1,0,1,0,0,1,0,
- 0,1,0,1,0,0,1,0,
- 1,0,0,0,1,1,0,0,
- 1,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,0,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,1,1,1,0,
- 0,1,0,1,0,1,0,0,
- 0,1,0,1,0,1,0,0,
- 1,0,0,1,0,1,0,0,
- 1,0,0,0,1,0,0,0,
- 1,0,0,0,1,1,0,0,
- 0,1,1,1,0,0,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 1,1,1,0,0,0,0,0,
- 1,1,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,0,1,0,
-
- 1,0,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 1,0,0,1,0,0,1,0,
- 1,1,0,1,0,1,1,0,
- 0,0,1,1,1,0,0,0,
- 1,1,0,1,0,1,1,0,
- 1,0,0,1,0,0,1,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,0,0,0,0,
- 1,1,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,1,1,0,0,0,0,0,
- 1,1,1,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,0,0,1,0,0,
- 0,0,1,0,0,1,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,1,1,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,1,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,1,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 1,0,0,0,1,0,0,0,
- 1,0,0,0,1,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,1,1,1,0,0,0,
- 1,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 1,1,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,1,1,1,0,0,0,
- 1,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,1,0,
- 0,0,1,1,1,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,1,0,0,0,0,
-
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,0,1,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 1,0,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,1,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,1,0,0,
- 0,1,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,1,1,0,1,0,
- 1,0,1,0,0,1,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,1,0,0,1,1,0,
- 1,0,0,1,1,0,1,0,
- 1,0,0,0,0,0,0,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,1,0,
- 0,1,0,0,0,1,1,0,
- 0,1,0,0,0,0,1,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 1,1,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,1,1,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,1,0,1,0,
- 0,0,1,0,0,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,1,1,1,1,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,1,0,0,1,1,0,
- 0,0,0,1,1,0,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,0,1,1,1,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,1,1,1,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,1,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,1,1,1,1,1,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,0,1,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,1,1,0,0,0,0,
- 0,1,0,1,0,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,0,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,1,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,0,0,0,0,1,1,1,
- 1,1,0,0,0,0,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,1,0,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,0,1,0,1,0,
- 1,0,0,0,1,0,1,0,
- 1,0,0,0,1,0,1,0,
- 1,0,0,0,0,1,1,0,
- 1,1,0,0,0,0,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,1,1,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,1,1,1,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,0,1,1,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,0,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,0,1,0,0,
- 0,1,0,0,1,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 0,1,1,0,0,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,1,0,0,
- 1,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,0,1,1,1,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,1,0,1,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,1,1,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,1,1,1,1,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,1,1,1,0,
-
- 0,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,0,0,
-
- 1,1,1,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 1,1,1,1,0,0,0,0,
-
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,0,
-
- 0,0,1,1,0,0,0,0,
- 0,0,1,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,1,1,1,1,1,0,
- 0,1,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,1,1,0,
- 0,1,1,1,1,0,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,1,0,
- 0,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,1,1,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,1,1,1,1,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,1,1,1,1,1,1,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,0,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,1,1,1,0,
- 0,0,0,1,0,0,0,1,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,1,1,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,1,1,1,0,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,1,1,1,1,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,1,1,1,0,0,
- 0,1,1,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,1,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,1,1,0,0,0,
- 0,0,0,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,1,1,1,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 1,1,1,1,1,1,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,1,1,0,
- 0,0,0,0,0,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,1,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 0,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,1,0,0,0,
- 0,1,0,1,1,0,0,0,
- 0,1,1,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,0,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,1,1,1,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 1,1,1,1,1,1,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,1,1,0,1,1,0,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,1,0,1,1,0,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,0,1,1,1,0,0,
- 0,1,1,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,0,0,1,1,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,1,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,1,1,1,0,0,0,
- 0,1,0,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
- 1,1,1,1,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,1,1,0,
- 0,1,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 1,0,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,0,0,1,0,0,
- 0,0,0,1,1,1,1,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,1,1,0,0,
- 0,0,1,1,0,0,1,0,
- 0,0,1,0,0,0,1,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 1,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,1,1,0,1,0,
- 0,1,0,0,0,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,0,0,
- 0,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 1,1,0,0,0,0,1,0,
- 1,0,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 1,1,1,1,1,1,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,1,0,
- 0,0,1,0,0,0,1,0,
- 0,0,0,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,1,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 0,1,0,0,0,1,1,0,
- 0,0,1,1,1,0,0,1,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,0,0,0,1,1,0,
- 1,0,0,0,0,0,1,0,
- 1,0,0,0,0,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,0,1,0,0,1,0,
- 1,0,1,0,1,0,1,0,
- 1,0,1,0,1,0,1,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,1,0,0,0,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,1,1,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,0,1,0,1,0,0,0,
- 0,1,0,0,0,1,0,0,
- 1,1,1,0,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 1,1,1,0,0,1,1,1,
- 0,1,0,0,0,0,1,0,
- 0,0,1,0,0,0,1,0,
- 0,0,1,0,0,1,0,0,
- 0,0,0,1,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 1,0,0,1,0,0,0,0,
- 1,0,1,0,0,0,0,0,
- 0,1,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,1,1,1,1,1,1,0,
- 0,1,0,0,0,1,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,1,0,
- 0,1,0,0,0,0,1,0,
- 1,1,1,1,1,1,1,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,1,1,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,0,0,1,1,0,
-
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,1,0,0,0,0,
-
- 1,1,0,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,0,0,1,0,0,0,
- 0,0,0,1,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 0,0,1,0,0,0,0,0,
- 1,1,0,0,0,0,0,0,
-
- 0,1,1,0,0,0,0,0,
- 1,0,0,1,0,0,1,0,
- 0,0,0,0,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0
+/* Char 0 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,1,1,0,0,
+1,1,1,1,1,1,1,0,
+1,1,1,1,1,1,1,0,
+0,1,1,1,1,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 2 */
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,
+
+/* Char 3 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,1,0,0,0,
+1,0,0,0,1,0,0,0,
+1,1,1,1,1,0,0,0,
+1,0,0,0,1,0,0,0,
+1,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,1,1,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,1,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,1,0,0,0,
+1,1,0,0,1,0,0,0,
+1,0,1,0,1,0,0,0,
+1,0,0,1,1,0,0,0,
+1,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,1,0,0,0,
+1,0,0,0,1,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 14 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,1,1,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 22 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 23 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 25 */
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+1,0,1,0,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,0,1,0,1,0,0,0,
+1,1,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+1,1,1,1,1,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+1,0,1,1,1,1,0,0,
+1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,1,0,0,1,0,
+0,0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+1,0,0,1,0,1,0,0,
+1,0,0,1,0,1,0,0,
+0,1,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,1,1,0,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+1,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,1,1,0,0,1,0,
+1,0,0,0,1,0,1,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,1,1,0,0,
+0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,0,0,1,0,0,1,0,
+0,1,0,1,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,1,0,1,0,0,
+1,0,0,1,0,0,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,1,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,0,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,1,0,1,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,0,1,1,1,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,1,0,0,0,1,1,0,
+1,1,0,0,0,1,1,0,
+1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,1,1,0,1,0,
+0,1,1,0,0,1,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 82 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,0,1,0,0,0,
+0,0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,1,0,1,0,1,0,
+1,0,1,0,1,0,1,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,1,1,1,0,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,
+0,0,1,0,0,0,1,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,
+0,0,1,1,1,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,
+0,1,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,0,1,1,0,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,1,0,1,0,1,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,0,
+1,0,0,1,0,0,1,0,
+1,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,1,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+1,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,1,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 171 */
+0,0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,1,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,1,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,1,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,1,1,0,0,1,0,
+0,0,0,1,0,0,1,0,
+0,0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,
+0,0,1,0,0,0,1,0,
+0,0,1,0,0,0,1,0,
+1,1,1,1,0,1,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 192 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 195 */
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+
+/* Char 200 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,1,0,
+
+/* Char 203 */
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+1,1,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,1,0,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,1,0,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,1,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,0,0,
+0,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,
+1,1,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,0,0,0,1,0,
+0,1,0,1,1,1,0,0,
+1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,1,0,0,
+0,0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,1,1,1,0,
+0,0,1,1,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,1,1,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,1,0,1,0,0,0,
+0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,
+0,0,0,0,0,0,0,1,
+0,0,0,0,0,1,0,1,
+0,0,0,0,0,1,1,0,
+0,0,0,0,0,1,0,0,
+0,1,1,1,0,1,0,0,
+1,0,0,0,1,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,1,1,0,0,
+0,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,1,1,1,1,0,
+0,0,0,0,0,1,0,0,
+0,1,1,1,0,1,0,0,
+1,0,0,0,1,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,0,1,0,0,
+1,0,0,0,1,1,0,0,
+0,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,1,
+0,0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,
+0,1,1,0,0,0,1,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,1,
+0,0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,0,
+0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,
+0,0,1,0,0,1,1,0,
+0,0,0,1,1,0,1,0,
+0,0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,1,0,
+0,0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+
+
};
gdFont gdFontLargeRep = {
- 96,
- 32,
+ 256,
+ 0,
8,
16,
gdFontLargeData
};
gdFontPtr gdFontLarge = &gdFontLargeRep;
+
+/* This file has not been truncated. */
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontg.h Sat Jul 13 19:23:34 2002
@@ -1,14 +1,21 @@
-#ifndef GDFONTG_H
-#define GDFONTG_H 1
-/* gdfontg.h: brings in the largest of the provided fonts.
- Also link with gdfontg.c. */
+#ifndef _GDFONTG_H_
+#define _GDFONTG_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -Misc-Fixed-Bold-R-Normal-Sans-15-140-75-75-C-90-ISO8859-2
+ at Mon Jan 26 14:45:58 1998.
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
-#include "gd.h"
-/* 9x15B font derived from a public domain font in the X
- distribution. Contains the 127 standard ascii characters. */
+#include "gd.h"
extern gdFontPtr gdFontGiant;
#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.c Sat Jul 13 19:23:35 2002
@@ -0,0 +1,3870 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-12-120-75-75-M-70-ISO8859-1
+ at Tue Jul 13 15:33:27 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidan12.h"
+
+char gdLucidaNormal12Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,1,0,1,0,
+0,1,0,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,1,0,1,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+1,0,0,1,0,0,1,
+1,0,0,1,0,1,0,
+0,1,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,1,0,
+0,1,0,1,0,0,1,
+1,0,0,1,0,0,1,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,1,
+0,1,0,0,1,0,1,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,1,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,1,0,1,0,1,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,1,0,0,0,
+0,1,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,1,0,0,
+0,1,0,0,1,0,0,
+1,0,0,0,1,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+1,0,0,1,1,1,0,
+1,0,1,0,0,1,0,
+1,0,1,0,0,1,0,
+1,0,1,0,1,1,0,
+1,0,0,1,0,0,1,
+0,1,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,
+0,1,0,1,0,0,0,
+0,1,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,
+0,1,1,0,0,1,1,
+0,1,1,0,0,1,1,
+0,1,0,1,1,0,1,
+0,1,0,1,1,0,1,
+0,1,0,1,1,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,1,0,0,1,0,
+0,1,1,0,0,1,0,
+0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,1,0,1,0,1,
+0,1,1,0,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,1,1,1,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,
+0,1,0,1,0,0,0,
+0,1,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,0,1,0,0,1,0,
+1,1,0,1,1,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,
+1,0,0,1,0,0,1,
+1,0,0,1,0,0,1,
+1,0,1,0,1,0,1,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,1,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,1,
+1,0,0,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,1,1,1,
+0,0,1,0,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,1,1,1,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,0,0,0,0,0,1,
+0,1,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+1,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,0,0,
+0,1,0,1,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+1,0,0,1,1,0,1,
+1,0,1,0,0,0,1,
+1,0,1,0,0,0,1,
+1,0,1,0,0,0,1,
+1,0,0,1,1,0,1,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,1,0,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,
+1,0,0,1,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+1,0,1,1,1,0,1,
+1,0,1,1,0,0,1,
+1,0,1,0,1,0,1,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,0,0,
+0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,0,1,1,0,
+0,1,0,1,0,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,
+0,1,1,1,0,1,0,
+0,1,1,1,0,1,0,
+0,1,1,1,0,1,0,
+0,0,1,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,1,0,1,0,
+0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,1,0,0,1,
+0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,1,0,0,0,
+0,1,0,1,0,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,1,1,0,
+0,1,0,1,0,1,0,
+1,0,0,1,1,1,1,
+1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,1,0,0,0,
+0,1,0,1,0,0,0,
+0,0,1,0,1,1,0,
+0,0,1,0,0,0,1,
+0,1,0,0,0,1,0,
+1,0,0,0,1,0,0,
+1,0,0,0,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,0,1,0,
+0,0,1,0,0,1,0,
+1,1,0,0,1,0,0,
+0,0,1,1,0,0,0,
+1,1,0,1,0,1,0,
+0,0,1,0,1,1,0,
+0,1,0,1,0,1,0,
+1,0,0,1,1,1,1,
+1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,1,1,1,0,
+
+/* Char 192 */
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,1,1,1,1,1,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,
+0,0,1,1,0,0,0,
+0,1,0,1,0,0,0,
+0,1,0,1,0,0,0,
+0,1,0,1,1,1,1,
+1,1,1,1,0,0,0,
+1,0,0,1,0,0,0,
+1,0,0,1,0,0,0,
+1,0,0,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 200 */
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+1,1,1,1,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,1,0,0,1,0,
+0,1,1,0,0,1,0,
+0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,1,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,1,0,0,1,0,
+0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,1,0,0,0,0,1,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,
+0,0,1,0,0,1,0,
+0,1,0,0,0,1,1,
+0,1,0,0,1,0,1,
+0,1,0,1,1,0,1,
+0,1,0,1,0,0,1,
+0,1,1,0,0,0,1,
+0,0,1,0,0,1,0,
+0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+0,1,0,1,0,0,0,
+0,1,0,1,0,0,0,
+0,1,0,0,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,0,0,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,0,1,0,0,1,
+0,0,0,1,0,0,1,
+0,1,1,1,1,1,1,
+1,0,0,1,0,0,0,
+1,0,0,1,0,0,0,
+0,1,1,0,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,1,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,1,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,0,1,0,0,0,
+0,1,1,0,1,0,0,
+0,0,0,0,0,1,0,
+0,0,1,1,1,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,1,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,1,0,1,0,1,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+1,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,1,1,0,
+0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+0,1,0,1,1,0,0,
+0,1,1,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,1,1,1,0,0,
+0,1,0,0,0,0,0,
+0,1,0,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,1,0,0,0,1,0,
+0,0,1,0,1,0,0,
+0,0,1,0,1,0,0,
+0,0,0,1,0,0,0,
+0,0,0,1,0,0,0,
+0,0,1,0,0,0,0,
+0,1,1,0,0,0,0,
+
+
+};
+
+gdFont gdLucidaNormal12Rep = {
+ 256,
+ 0,
+ 7,
+ 13,
+ gdLucidaNormal12Data
+};
+
+gdFontPtr gdLucidaNormal12 = &gdLucidaNormal12Rep;
+
+/* This file has not been truncated. */
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.c Sat Jul 13 19:23:35 2002
@@ -0,0 +1,4382 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-14-140-75-75-M-90-ISO8859-1
+ at Tue Jul 13 15:35:10 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gdlucidan14.h"
+
+char gdLucidaNormal14Data[] = {
+/* Char 0 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 3 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 14 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 22 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 23 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 25 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,1,0,0,0,
+1,1,1,1,1,1,1,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,0,1,0,0,1,0,
+0,0,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,1,0,0,
+0,0,1,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,1,0,0,
+0,0,1,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,1,1,0,0,1,1,
+0,0,1,0,0,1,0,1,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,0,1,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,1,0,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,1,1,1,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,1,1,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,0,1,0,0,1,1,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,1,1,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,1,1,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,0,1,0,0,1,1,0,1,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,0,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,1,1,0,
+0,1,1,0,0,0,1,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,1,1,
+
+/* Char 82 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,0,
+0,1,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,1,0,
+0,0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,1,0,
+0,0,0,1,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,1,1,1,0,0,
+0,1,0,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,1,1,0,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,0,1,0,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,1,0,0,1,0,0,
+0,1,1,0,1,1,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,1,1,1,0,0,
+0,1,0,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,1,1,0,0,0,
+0,1,0,1,0,0,1,0,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,1,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,1,0,0,1,0,1,0,
+0,0,0,1,1,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,1,1,0,
+0,0,1,0,1,1,0,1,0,
+0,0,1,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,1,0,1,0,1,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,1,0,0,1,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,0,1,0,1,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,0,0,
+0,0,0,1,0,0,0,1,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,1,
+0,1,0,0,0,0,0,1,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,0,1,0,
+1,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,1,1,1,0,1,
+0,1,0,1,0,0,0,0,1,
+0,1,0,1,0,0,0,0,1,
+0,1,0,1,0,0,0,0,1,
+0,1,0,1,0,0,0,0,1,
+0,1,0,0,1,1,1,0,1,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,0,
+0,1,0,0,1,1,0,0,0,
+0,0,1,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 171 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,1,1,1,0,0,1,
+0,1,0,1,0,0,1,0,1,
+0,1,0,1,1,1,0,0,1,
+0,1,0,1,0,0,1,0,1,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,1,0,1,1,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,1,0,1,0,0,
+0,1,0,0,1,0,1,0,0,
+0,1,0,0,1,0,1,0,0,
+0,0,1,1,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,0,
+1,1,0,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,1,0,0,1,1,0,
+0,1,0,1,0,1,0,1,0,
+0,0,1,0,1,0,0,1,0,
+0,0,1,0,1,1,1,1,1,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,1,0,0,0,
+1,1,0,0,0,1,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,1,0,0,0,0,0,
+0,1,0,1,0,1,1,1,0,
+0,0,0,1,0,0,0,0,1,
+0,0,0,1,0,0,1,1,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,1,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+1,1,1,0,0,1,0,0,0,
+0,0,1,0,0,1,0,0,0,
+1,1,0,0,1,0,0,0,0,
+0,0,1,0,1,0,0,0,0,
+1,1,0,1,0,0,1,1,0,
+0,0,0,1,0,1,0,1,0,
+0,0,1,0,1,0,0,1,0,
+0,0,1,0,1,1,1,1,1,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+
+/* Char 192 */
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 195 */
+0,0,0,0,1,1,0,1,0,
+0,0,0,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,1,1,1,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,1,0,0,1,1,1,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,1,0,0,0,1,0,0,0,
+0,1,0,0,0,1,0,0,0,
+0,1,0,0,0,1,1,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 200 */
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 203 */
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+1,1,1,1,1,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,1,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,0,0,0,0,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,1,0,0,0,0,
+0,0,1,0,0,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,0,0,0,1,0,
+0,0,1,0,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,1,1,1,1,0,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,1,0,0,
+0,0,1,1,1,1,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,0,1,0,0,
+0,1,0,0,0,1,1,0,0,
+0,0,1,1,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,1,1,0,0,
+0,0,0,0,1,0,0,1,0,
+0,0,0,0,1,0,0,1,0,
+0,0,1,1,1,1,1,1,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,0,0,
+0,1,0,0,1,0,0,1,0,
+0,0,1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,1,0,0,0,
+0,0,0,1,1,0,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,1,1,1,1,1,1,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,0,
+0,0,0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,1,0,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,1,1,0,1,0,0,0,0,
+0,0,0,1,1,1,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,1,1,1,0,0,
+0,1,0,1,0,0,1,1,0,
+0,1,1,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,0,1,0,0,
+0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,0,0,1,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,0,1,0,0,1,0,
+0,1,0,1,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,1,0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,0,0,
+0,0,0,1,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,1,0,
+0,1,1,0,0,1,0,1,0,
+0,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,0,0,
+0,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,1,1,1,0,0,0,
+0,1,1,0,0,0,1,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,1,0,0,
+0,1,1,1,1,1,0,0,0,
+0,1,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,1,0,
+0,1,0,0,0,0,0,1,0,
+0,0,1,0,0,0,1,0,0,
+0,0,1,0,0,0,1,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,1,0,1,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,0,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,
+0,0,1,1,0,0,0,0,0,
+
+
+};
+
+gdFont gdLucidaNormal14Rep = {
+ 256,
+ 0,
+ 9,
+ 15,
+ gdLucidaNormal14Data
+};
+
+gdFontPtr gdLucidaNormal14 = &gdLucidaNormal14Rep;
+
+/* This file has not been truncated. */
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.c Sat Jul 13 19:23:36 2002
@@ -1,7 +1,18 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-bold-r-normal-sans-13-94-100-100-c-70-iso8859-2
+ at Thu Jan 8 13:54:57 1998.
+ No copyright info was found in the original bdf.
+ */
+
+
#include "gdfontmb.h"
char gdFontMediumBoldData[] = {
-
+/* Char 0 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -16,6 +27,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 1 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -30,20 +42,22 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+/* Char 2 */
0,0,0,0,0,0,0,
1,1,0,0,1,1,0,
+0,0,1,1,0,0,0,
1,1,0,0,1,1,0,
0,0,1,1,0,0,0,
1,1,0,0,1,1,0,
+0,0,1,1,0,0,0,
1,1,0,0,1,1,0,
0,0,1,1,0,0,0,
1,1,0,0,1,1,0,
+0,0,1,1,0,0,0,
1,1,0,0,1,1,0,
0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,
+/* Char 3 */
0,0,0,0,0,0,0,
1,1,0,1,1,0,0,
1,1,0,1,1,0,0,
@@ -58,6 +72,7 @@
0,0,0,1,1,0,0,
0,0,0,0,0,0,0,
+/* Char 4 */
0,0,0,0,0,0,0,
1,1,1,1,0,0,0,
1,1,0,0,0,0,0,
@@ -72,6 +87,7 @@
0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
+/* Char 5 */
0,0,0,0,0,0,0,
0,1,1,1,0,0,0,
1,1,0,0,0,0,0,
@@ -86,6 +102,7 @@
0,0,1,1,0,1,0,
0,0,0,0,0,0,0,
+/* Char 6 */
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -100,6 +117,7 @@
0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
+/* Char 7 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -114,6 +132,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 8 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -128,6 +147,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 9 */
0,0,0,0,0,0,0,
1,1,0,0,1,1,0,
1,1,1,0,1,1,0,
@@ -142,6 +162,7 @@
0,0,1,1,1,1,0,
0,0,0,0,0,0,0,
+/* Char 10 */
0,0,0,0,0,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -156,6 +177,7 @@
0,0,0,1,1,0,0,
0,0,0,0,0,0,0,
+/* Char 11 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -170,6 +192,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 12 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -184,6 +207,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 13 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -198,6 +222,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 14 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -212,6 +237,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 15 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -226,6 +252,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 16 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,1,
@@ -240,6 +267,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 17 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -254,6 +282,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 18 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -268,6 +297,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 19 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -282,6 +312,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 20 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -296,6 +327,7 @@
1,1,1,1,1,1,1,
0,0,0,0,0,0,0,
+/* Char 21 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -310,6 +342,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 22 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -324,6 +357,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 23 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -338,6 +372,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 24 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -352,6 +387,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 25 */
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -366,6 +402,7 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
+/* Char 26 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -380,6 +417,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 27 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -394,6 +432,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 28 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -408,6 +447,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 29 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,1,0,
@@ -422,13 +462,14 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 30 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,1,0,0,
0,1,1,0,1,1,0,
0,1,1,0,0,0,0,
0,1,1,0,0,0,0,
-1,1,1,1,0,0,0,
+1,1,1,1,1,0,0,
0,1,1,0,0,0,0,
0,1,1,0,0,0,0,
0,1,1,0,1,1,0,
@@ -436,6 +477,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 31 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -450,6 +492,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 32 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -464,9 +507,10 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 33 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
@@ -478,6 +522,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 34 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,0,1,1,0,
@@ -492,6 +537,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 35 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,0,1,0,0,
@@ -506,6 +552,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 36 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -520,6 +567,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 37 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,0,0,1,0,
@@ -534,12 +582,13 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 38 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,0,0,0,
1,1,0,1,1,0,0,
1,1,0,1,1,0,0,
-1,1,0,1,1,0,0,
0,1,1,1,0,0,0,
1,1,0,1,0,1,0,
1,1,0,1,1,1,0,
@@ -548,6 +597,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 39 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,1,0,0,
@@ -562,6 +612,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 40 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,1,1,0,0,
@@ -576,6 +627,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 41 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,0,0,0,0,
@@ -590,6 +642,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 42 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -604,6 +657,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 43 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -618,6 +672,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 44 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -632,6 +687,7 @@
0,1,1,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 45 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -646,6 +702,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 46 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -660,6 +717,7 @@
0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
+/* Char 47 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -674,20 +732,23 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 48 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-0,0,1,1,0,0,0,
-0,1,0,0,1,0,0,
-1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
+1,1,0,1,1,1,0,
+1,1,1,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-0,1,0,0,1,0,0,
-0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 49 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -697,11 +758,12 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
1,1,1,1,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 50 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -711,18 +773,18 @@
0,0,1,1,1,0,0,
0,1,1,0,0,0,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,1,1,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 51 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
0,0,0,0,1,1,0,
-0,0,0,0,1,1,0,
-0,0,1,1,1,0,0,
+0,1,1,1,1,0,0,
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -730,6 +792,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 52 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -737,18 +801,18 @@
0,0,1,1,1,1,0,
0,1,1,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,1,1,1,0,
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 53 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
0,0,0,0,1,1,0,
@@ -758,12 +822,13 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 54 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -772,11 +837,12 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 55 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
0,0,0,0,1,1,0,
-0,0,0,0,1,1,0,
0,0,0,1,1,0,0,
0,0,0,1,1,0,0,
0,0,1,1,0,0,0,
@@ -786,12 +852,13 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 56 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -800,6 +867,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 57 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -808,12 +877,12 @@
1,1,0,0,1,1,0,
0,1,1,1,1,1,0,
0,0,0,0,1,1,0,
-0,0,0,0,1,1,0,
1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 58 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -828,6 +897,7 @@
0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
+/* Char 59 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -842,6 +912,7 @@
0,1,1,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 60 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -856,6 +927,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 61 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -870,6 +942,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 62 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -884,11 +957,12 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 63 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,0,0,0,1,1,0,
0,0,1,1,1,0,0,
0,0,1,1,0,0,0,
@@ -898,11 +972,12 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 64 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,0,0,0,1,1,0,
-1,0,0,0,1,1,0,
1,0,1,1,1,1,0,
1,0,1,0,1,1,0,
1,0,1,1,1,1,0,
@@ -912,6 +987,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 65 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -922,16 +999,16 @@
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 66 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -940,6 +1017,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 67 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -948,12 +1027,13 @@
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 68 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,0,0,
@@ -963,17 +1043,17 @@
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 69 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -982,12 +1062,13 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 70 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -996,6 +1077,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 71 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -1005,14 +1088,14 @@
1,1,0,1,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,1,1,1,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 72 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -1024,6 +1107,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 73 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
@@ -1033,14 +1118,14 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
1,1,1,1,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 74 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
@@ -1052,23 +1137,25 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 75 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,0,1,0,
1,1,0,0,1,1,0,
1,1,0,1,1,0,0,
1,1,1,1,0,0,0,
1,1,1,0,0,0,0,
+1,1,1,0,0,0,0,
1,1,1,1,0,0,0,
1,1,0,1,1,0,0,
1,1,0,0,1,1,0,
-1,1,0,0,0,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 76 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1080,6 +1167,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 77 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,0,0,0,0,1,0,
@@ -1090,13 +1179,13 @@
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 78 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,1,0,1,1,0,
1,1,1,0,1,1,0,
@@ -1108,6 +1197,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 79 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -1117,17 +1208,17 @@
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 80 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,1,1,0,0,
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1136,6 +1227,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 81 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -1143,33 +1236,34 @@
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,0,1,1,0,
1,1,0,1,1,1,0,
0,1,1,1,1,0,0,
0,0,0,0,1,1,0,
0,0,0,0,0,0,0,
+/* Char 82 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
-1,1,0,0,1,1,0,
1,1,1,1,1,0,0,
1,1,1,1,0,0,0,
1,1,0,1,1,0,0,
1,1,0,0,1,1,0,
-1,1,0,0,0,1,0,
+1,1,0,0,1,1,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 83 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
1,1,0,0,1,1,0,
1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
0,1,1,1,1,0,0,
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
@@ -1178,6 +1272,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 84 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
@@ -1188,13 +1284,13 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 85 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -1206,6 +1302,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 86 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,1,1,0,
@@ -1216,13 +1314,13 @@
0,1,1,1,1,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 87 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
1,1,0,0,1,1,0,
@@ -1234,12 +1332,13 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 88 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,0,0,0,0,1,0,
1,1,0,0,1,1,0,
0,1,0,0,1,0,0,
-0,1,1,1,1,0,0,
0,0,1,1,0,0,0,
0,1,1,1,1,0,0,
0,1,0,0,1,0,0,
@@ -1248,6 +1347,8 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 89 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,1,1,0,
@@ -1258,15 +1359,15 @@
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
0,0,1,1,0,0,0,
-0,0,1,1,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 90 */
+0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,1,1,1,1,0,
0,0,0,0,1,1,0,
-0,0,0,0,1,1,0,
0,0,0,1,1,0,0,
0,0,1,1,0,0,0,
0,1,1,0,0,0,0,
@@ -1276,6 +1377,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 91 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -1290,6 +1392,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 92 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1304,6 +1407,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 93 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,1,0,0,
@@ -1318,6 +1422,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 94 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -1332,6 +1437,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 95 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1346,6 +1452,7 @@
1,1,1,1,1,1,0,
0,0,0,0,0,0,0,
+/* Char 96 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,0,0,0,
@@ -1360,6 +1467,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 97 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1374,6 +1482,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 98 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1388,6 +1497,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 99 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1402,6 +1512,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 100 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -1416,6 +1527,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 101 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1430,6 +1542,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 102 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,1,0,0,
@@ -1444,6 +1557,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 103 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1458,6 +1572,7 @@
1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
+/* Char 104 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1472,6 +1587,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 105 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -1486,6 +1602,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 106 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,1,1,0,
@@ -1500,6 +1617,7 @@
1,1,0,0,1,1,0,
0,1,1,1,1,0,0,
+/* Char 107 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
1,1,0,0,0,0,0,
@@ -1514,6 +1632,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 108 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,0,0,0,
@@ -1528,6 +1647,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 109 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1542,6 +1662,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 110 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1556,6 +1677,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 111 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1570,6 +1692,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 112 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1584,6 +1707,7 @@
1,1,0,0,0,0,0,
1,1,0,0,0,0,0,
+/* Char 113 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1598,6 +1722,7 @@
0,0,0,0,1,1,0,
0,0,0,0,1,1,0,
+/* Char 114 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1612,6 +1737,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 115 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1626,20 +1752,22 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 116 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
-1,1,1,1,0,0,0,
-1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
-1,1,0,0,0,0,0,
-1,1,0,0,1,1,0,
-0,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 117 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1654,6 +1782,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 118 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1668,6 +1797,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 119 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1682,6 +1812,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 120 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1696,6 +1827,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 121 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1707,9 +1839,10 @@
1,1,0,0,1,1,0,
0,1,1,1,1,1,0,
0,0,0,0,1,1,0,
-1,1,0,0,1,1,0,
+0,0,0,0,1,1,0,
0,1,1,1,1,0,0,
+/* Char 122 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
@@ -1724,6 +1857,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 123 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,1,0,0,
@@ -1738,6 +1872,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 124 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,0,1,1,0,0,0,
@@ -1752,6 +1887,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 125 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,1,0,0,0,
@@ -1766,6 +1902,7 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
+/* Char 126 */
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
0,1,1,0,0,1,0,
@@ -1780,27 +1917,1953 @@
0,0,0,0,0,0,0,
0,0,0,0,0,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0,
-0,0,1,0,1,0,0,
-0,1,0,1,0,1,0
-};
+/* Char 127 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
-gdFont gdFontMediumBoldRep = {
- 128,
- 0,
- 7,
- 13,
- gdFontMediumBoldData
-};
+/* Char 128 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+
+/* Char 162 */
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,0,0,
+0,1,1,1,1,0,0,
+0,1,1,1,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,0,0,0,0,
+1,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+0,1,0,0,1,0,0,
+0,1,0,0,1,0,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,1,1,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 169 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 171 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 174 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+
+/* Char 178 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,1,0,
+
+/* Char 179 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,0,1,0,
+0,0,1,1,1,1,0,
+0,0,1,1,1,0,0,
+0,1,1,1,0,0,0,
+1,1,1,1,0,0,0,
+1,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+1,1,1,0,1,1,0,
+0,1,1,0,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,0,0,
+0,1,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,0,0,0,0,
+0,0,0,1,1,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,0,0,0,1,1,0,
+0,1,1,0,1,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,0,0,
+0,1,1,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 192 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,0,0,
+1,1,1,1,0,0,0,
+1,1,0,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 195 */
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 196 */
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 200 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,1,1,0,0,
+0,0,0,0,1,1,0,
+
+/* Char 203 */
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 204 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 206 */
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 207 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+1,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+0,1,1,0,1,1,0,
+1,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,1,0,1,1,0,
+1,1,1,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,1,1,1,0,
+1,1,0,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 210 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,1,0,1,1,0,
+1,1,1,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,1,1,1,0,
+1,1,0,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 212 */
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 213 */
+0,1,1,0,0,1,1,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 214 */
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 216 */
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,0,0,
+1,1,1,1,0,0,0,
+1,1,0,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,1,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 219 */
+0,1,1,0,0,1,1,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 220 */
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+0,0,1,1,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,1,0,1,1,0,
+1,1,0,1,1,0,0,
+1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,1,1,0,0,
+
+/* Char 235 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,1,1,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+1,1,0,1,1,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,1,1,
+0,0,0,1,1,0,1,
+0,0,0,1,1,1,0,
+0,0,0,1,1,0,0,
+0,1,1,1,1,0,0,
+1,1,0,1,1,0,0,
+1,1,0,1,1,0,0,
+1,1,0,1,1,0,0,
+1,1,0,1,1,0,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,1,1,0,
+0,0,0,1,1,1,1,
+0,0,0,0,1,1,0,
+0,1,1,1,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,1,0,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,0,0,0,0,0,
+1,1,1,1,1,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+1,1,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,1,0,0,1,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,1,1,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,1,1,1,0,
+0,1,1,1,0,0,0,
+0,0,0,0,0,0,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+1,1,0,0,1,1,0,
+0,1,1,1,1,1,0,
+0,0,0,0,1,1,0,
+0,0,0,0,1,1,0,
+0,1,1,1,1,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+1,1,1,1,1,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,0,0,0,
+0,1,1,0,1,1,0,
+0,0,1,1,1,0,0,
+0,0,1,1,0,0,0,
+0,1,1,0,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,1,1,0,0,0,
+0,0,1,1,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,
+
+
+};
+
+gdFont gdFontMediumBoldRep = {
+ 256,
+ 0,
+ 7,
+ 13,
+ gdFontMediumBoldData
+};
+
+gdFontPtr gdFontMediumBold = &gdFontMediumBoldRep;
+
+/* This file has not been truncated. */
-gdFontPtr gdFontMediumBold = &gdFontMediumBoldRep;
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan10.h Sat Jul 13 19:23:36 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAN10_H_
+#define _GDLUCIDAN10_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-10-100-75-75-M-60-ISO8859-1
+ at Tue Jul 13 15:33:56 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaNormal10;
+
+#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan12.h Sat Jul 13 19:23:37 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAN12_H_
+#define _GDLUCIDAN12_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-12-120-75-75-M-70-ISO8859-1
+ at Tue Jul 13 15:33:27 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaNormal12;
+
+#endif
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontl.h Sat Jul 13 19:23:37 2002
@@ -1,15 +1,22 @@
-#ifndef GDFONTL_H
-#define GDFONTL_H 1
-/* gdfontl.h: brings in the larger of the two provided fonts.
- Also link with gdfontl.c. */
+#ifndef _GDFONTL_H_
+#define _GDFONTL_H_ 1
-#include "gd.h"
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-medium-r-normal--16-140-75-75-c-80-iso8859-2
+ at Tue Jan 6 19:39:27 1998.
+
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
-/* 8x16 font derived from a public domain font in the X
- distribution. Only contains the 96 standard ascii characters,
- sorry. Feel free to improve on this. */
+
+#include "gd.h"
extern gdFontPtr gdFontLarge;
#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdlucidan14.h Sat Jul 13 19:23:37 2002
@@ -0,0 +1,21 @@
+
+#ifndef _GDLUCIDAN14_H_
+#define _GDLUCIDAN14_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.51 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -B&H-LucidaTypewriter-Medium-R-Normal-Sans-14-140-75-75-M-90-ISO8859-1
+ at Tue Jul 13 15:35:10 1999.
+ The original bdf was holding following copyright:
+ "Copyright Bigelow & Holmes 1986, 1985."
+ */
+
+
+#include "gd.h"
+
+extern gdFontPtr gdLucidaNormal14;
+
+#endif
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.c Sat Jul 13 19:23:38 2002
@@ -1,1261 +1,3869 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-medium-r-semicondensed-sans-12-116-75-75-c-60-iso8859-2
+ at Thu Jan 8 14:13:20 1998.
+ No copyright info was found in the original bdf.
+ */
+
+
#include "gdfonts.h"
char gdFontSmallData[] = {
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,1,0,1,0,0,
- 0,1,0,1,0,0,
- 0,1,0,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,0,1,0,0,
- 1,1,1,1,1,0,
- 0,1,0,1,0,0,
- 0,1,0,1,0,0,
- 1,1,1,1,1,0,
- 0,1,0,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,1,1,1,0,0,
- 1,0,1,0,1,0,
- 1,0,1,0,0,0,
- 0,1,1,1,0,0,
- 0,0,1,0,1,0,
- 1,0,1,0,1,0,
- 0,1,1,1,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 1,1,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,0,0,1,1,0,
- 1,0,0,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,0,0,0,0,
- 1,0,1,0,0,0,
- 1,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,0,1,0,1,0,
- 1,0,0,1,0,0,
- 0,1,1,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 1,1,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,1,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 1,0,1,0,1,0,
- 0,1,1,1,0,0,
- 0,0,1,0,0,0,
- 0,1,1,1,0,0,
- 1,0,1,0,1,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 1,1,1,1,1,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 1,1,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,1,1,0,
- 1,0,1,0,1,0,
- 1,1,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,1,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,1,1,0,0,
- 0,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,1,0,0,
- 0,0,1,1,0,0,
- 0,1,0,1,0,0,
- 1,0,0,1,0,0,
- 1,1,1,1,1,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,1,0,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,1,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,0,0,0,
- 0,1,1,0,0,0,
- 1,1,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,1,1,1,0,
- 1,0,1,0,1,0,
- 1,0,1,1,1,0,
- 1,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,0,0,
- 0,1,0,0,1,0,
- 0,1,0,0,1,0,
- 0,1,0,0,1,0,
- 0,1,0,0,1,0,
- 0,1,0,0,1,0,
- 1,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,1,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,1,0,0,
- 1,0,1,0,0,0,
- 1,1,0,0,0,0,
- 1,0,1,0,0,0,
- 1,0,0,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,1,0,1,1,0,
- 1,0,1,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,0,0,1,0,
- 1,0,1,0,1,0,
- 1,0,0,1,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,1,0,1,0,
- 1,0,0,1,0,0,
- 0,1,1,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 1,0,1,0,0,0,
- 1,0,0,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,1,0,1,0,
- 1,1,0,1,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 1,1,1,1,1,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,1,1,1,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,1,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 1,1,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 1,1,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,1,0,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,1,1,0,0,
- 0,0,1,1,0,0,
- 0,0,0,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,1,0,
- 0,1,1,1,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,1,1,1,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 1,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,1,0,0,
- 0,1,0,0,1,0,
- 0,1,0,0,0,0,
- 1,1,1,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,1,0,
- 0,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,1,0,0,
- 1,1,1,0,0,0,
- 1,0,0,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,0,1,0,0,
- 1,0,1,0,1,0,
- 1,0,1,0,1,0,
- 1,0,1,0,1,0,
- 1,0,1,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,1,1,0,0,
- 1,1,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,1,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,1,1,0,0,
- 1,1,0,0,1,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,1,1,1,1,0,
- 1,0,0,0,0,0,
- 0,1,1,1,0,0,
- 0,0,0,0,1,0,
- 1,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 1,1,1,1,1,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,1,0,1,0,
- 1,0,1,0,1,0,
- 0,1,0,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,1,0,0,
- 1,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 0,1,0,1,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,1,0,0,
- 0,1,1,1,0,0,
- 0,1,0,0,0,0,
- 1,1,1,1,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,1,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,1,0,0,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,0,1,0,0,
- 0,0,0,0,1,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,1,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 0,0,1,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 0,1,0,0,0,0,
- 1,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,1,1,0,1,0,
- 1,0,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
-
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,0,0,0,0,0,
- 1,1,1,1,0,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,0,0,0,1,0,
- 1,1,1,1,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0,
- 0,0,0,0,0,0
+/* Char 0 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 1 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+1,1,1,1,1,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 2 */
+0,0,0,0,0,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+0,1,0,1,0,1,
+1,0,1,0,1,0,
+
+/* Char 3 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,1,0,0,0,
+1,0,1,0,0,0,
+1,1,1,0,0,0,
+1,0,1,0,0,0,
+1,0,1,0,0,0,
+0,0,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 4 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,0,0,0,
+1,0,0,0,0,0,
+1,1,0,0,0,0,
+1,0,0,0,0,0,
+1,0,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 5 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,1,0,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 6 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,0,0,0,
+0,0,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 7 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,1,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 8 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 9 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+
+/* Char 10 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 11 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 12 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 13 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 14 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 15 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,1,1,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 16 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 17 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 18 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 19 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 20 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 21 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,1,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 22 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 23 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,1,1,1,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 24 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,1,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 25 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+
+/* Char 26 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 27 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 28 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 29 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 30 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,0,
+1,1,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+1,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 31 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 32 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 33 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 34 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 35 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+1,1,1,1,1,0,
+0,1,0,1,0,0,
+1,1,1,1,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 36 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,1,0,
+1,0,1,0,0,0,
+1,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,1,0,
+0,0,1,0,1,0,
+1,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 37 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+1,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,1,0,0,
+1,0,1,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 38 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+1,0,1,0,0,0,
+1,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,1,0,0,0,
+1,0,0,1,1,0,
+1,0,0,1,0,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 39 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 40 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 41 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 42 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+1,0,1,0,1,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+1,0,1,0,1,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 43 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 44 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 45 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 46 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 47 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 48 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 49 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,1,0,0,0,
+1,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 50 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 51 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 52 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,1,0,0,
+0,1,0,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,0,0,
+1,1,1,1,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 53 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 54 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,1,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 55 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 56 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 57 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+1,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 58 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 59 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 60 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 61 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 62 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 63 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 64 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,1,0,0,
+1,0,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 65 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 66 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 67 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 68 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 69 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 70 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 71 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 72 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 73 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 74 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+1,0,0,1,0,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 75 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,0,0,
+1,0,1,0,0,0,
+1,1,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 76 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 77 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,1,0,1,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 78 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 79 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 80 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 81 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,1,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 82 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 83 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 84 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 85 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 86 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 87 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,1,0,1,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 88 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 89 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 90 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 91 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 92 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,0,0,
+
+/* Char 93 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 94 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 95 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 96 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 97 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 98 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 99 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 100 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+0,1,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 101 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 102 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+1,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 103 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+
+/* Char 104 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 105 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 106 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+0,0,0,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 107 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,1,0,0,
+1,0,1,0,0,0,
+1,1,0,0,0,0,
+1,0,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 108 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 109 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,1,0,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 110 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 111 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 112 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+
+/* Char 113 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,1,0,
+0,0,0,0,1,0,
+
+/* Char 114 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 115 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 116 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+1,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 117 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 118 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 119 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 120 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 121 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+1,1,1,0,0,0,
+
+/* Char 122 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 123 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,0,0,
+
+/* Char 124 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 125 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+1,1,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 126 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+1,0,1,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 127 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 128 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 129 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,0,0,1,1,
+
+/* Char 162 */
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,0,0,0,
+0,1,0,0,0,0,
+1,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 165 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+1,0,0,1,0,0,
+1,0,1,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+
+/* Char 168 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,0,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 169 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+0,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 171 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 174 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 175 */
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 176 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,1,0,0,
+0,0,0,0,1,1,
+
+/* Char 178 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+
+/* Char 179 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,1,0,0,
+0,0,1,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,1,
+0,1,1,0,0,1,
+0,0,1,0,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 183 */
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 185 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+0,1,1,0,0,0,
+0,0,0,1,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+
+/* Char 187 */
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,0,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,0,0,0,
+1,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 189 */
+0,0,0,0,0,0,
+0,0,1,0,0,1,
+0,1,0,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 190 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 192 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 194 */
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 195 */
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 196 */
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 200 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+
+/* Char 203 */
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 204 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 206 */
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 207 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+1,1,1,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+1,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 210 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,0,1,0,
+1,0,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 212 */
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 213 */
+0,0,1,0,0,1,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 214 */
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 216 */
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,1,0,0,0,
+1,0,0,1,0,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 217 */
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 219 */
+0,0,1,0,0,1,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 220 */
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,1,0,0,1,0,
+1,0,1,1,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 224 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 226 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 227 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 228 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+0,1,0,0,1,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,1,0,
+0,1,1,1,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,1,0,0,
+0,1,1,0,0,0,
+
+/* Char 232 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,1,0,0,0,
+0,0,0,1,1,0,
+
+/* Char 235 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 236 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,1,1,1,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 238 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,0,0,0,
+0,0,0,0,1,1,
+0,0,0,0,0,1,
+0,0,0,1,1,0,
+0,0,0,1,0,0,
+0,1,0,1,0,0,
+1,0,1,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,0,0,
+1,0,0,1,0,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,1,0,
+0,0,0,1,1,1,
+0,0,0,0,1,0,
+0,1,1,0,1,0,
+1,0,0,1,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 242 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 244 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 245 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 246 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+0,1,1,1,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+0,1,1,1,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,1,1,1,1,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 248 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+1,0,1,1,0,0,
+1,1,0,0,1,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+1,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 249 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,1,0,1,0,0,
+0,0,1,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 251 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,1,0,
+1,0,0,1,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 252 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,1,0,0,
+0,1,0,1,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,1,1,0,
+0,1,1,0,0,0,
+0,0,0,0,0,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,0,1,0,
+1,0,0,1,1,0,
+0,1,1,0,1,0,
+0,0,0,0,1,0,
+0,0,0,1,0,0,
+1,1,1,0,0,0,
+
+/* Char 254 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+1,1,1,1,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,0,0,
+0,1,0,0,1,0,
+0,0,1,1,0,0,
+0,0,0,1,0,0,
+0,0,1,0,0,0,
+
+/* Char 255 */
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,1,0,0,0,
+0,0,1,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+0,0,0,0,0,0,
+
+
};
gdFont gdFontSmallRep = {
- 96,
- 32,
+ 256,
+ 0,
6,
- 12,
+ 13,
gdFontSmallData
};
gdFontPtr gdFontSmall = &gdFontSmallRep;
+
+/* This file has not been truncated. */
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontmb.h Sat Jul 13 19:23:38 2002
@@ -1,14 +1,20 @@
-#ifndef GDFONTMB_H
-#define GDFONTMB_H 1
-/* gdfontmb.h: brings in the middle of the provided fonts.
- Also link with gdfonth.c. */
+#ifndef _GDFONTMB_H_
+#define _GDFONTMB_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-bold-r-normal-sans-13-94-100-100-c-70-iso8859-2
+ at Thu Jan 8 13:54:57 1998.
+ No copyright info was found in the original bdf.
+ */
-#include "gd.h"
-/* 7x13B font derived from a public domain font in the X
- distribution. Contains the 127 standard ascii characters. */
+#include "gd.h"
extern gdFontPtr gdFontMediumBold;
#endif
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.c Sat Jul 13 19:23:39 2002
@@ -1,7 +1,19 @@
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -Misc-Fixed-Medium-R-Normal--8-80-75-75-C-50-ISO8859-2
+ at Thu Jan 8 13:49:54 1998.
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
+
+
#include "gdfontt.h"
char gdFontTinyData[] = {
-
+/* Char 0 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -11,6 +23,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 1 */
0,0,0,0,0,
0,0,1,0,0,
0,1,1,1,0,
@@ -20,15 +33,17 @@
0,0,0,0,0,
0,0,0,0,0,
-0,0,0,0,0,
-0,0,1,0,1,
+/* Char 2 */
0,1,0,1,0,
-0,0,1,0,1,
+1,0,1,0,0,
0,1,0,1,0,
-0,0,1,0,1,
+1,0,1,0,0,
0,1,0,1,0,
-0,0,1,0,1,
+1,0,1,0,0,
+0,1,0,1,0,
+1,0,1,0,0,
+/* Char 3 */
0,1,0,1,0,
0,1,0,1,0,
0,1,1,1,0,
@@ -38,6 +53,7 @@
0,0,0,1,0,
0,0,0,1,0,
+/* Char 4 */
1,1,1,0,0,
1,0,0,0,0,
1,1,0,0,0,
@@ -47,6 +63,7 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 5 */
0,1,1,0,0,
1,0,0,0,0,
0,1,1,0,0,
@@ -56,6 +73,7 @@
0,0,1,1,0,
0,0,1,0,1,
+/* Char 6 */
1,0,0,0,0,
1,0,0,0,0,
1,0,0,0,0,
@@ -65,15 +83,17 @@
0,0,1,1,0,
0,0,1,0,0,
+/* Char 7 */
+0,0,0,0,0,
+0,1,0,0,0,
+1,0,1,0,0,
+0,1,0,0,0,
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,1,0,
-0,1,0,1,0,
-0,1,1,1,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 8 */
0,0,0,0,0,
0,0,1,0,0,
0,1,1,1,0,
@@ -83,6 +103,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 9 */
1,0,0,1,0,
1,1,0,1,0,
1,0,1,1,0,
@@ -92,6 +113,7 @@
0,0,1,0,0,
0,0,1,1,1,
+/* Char 10 */
1,0,1,0,0,
1,0,1,0,0,
1,0,1,0,0,
@@ -101,6 +123,7 @@
0,0,0,1,0,
0,0,0,1,0,
+/* Char 11 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -110,6 +133,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 12 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -119,6 +143,7 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 13 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -128,6 +153,7 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 14 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -137,6 +163,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 15 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -146,8 +173,9 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 16 */
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,1,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -155,42 +183,47 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 17 */
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,1,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 18 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,1,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 19 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,1,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 20 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,1,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 21 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -200,6 +233,7 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 22 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -209,7 +243,7 @@
0,0,1,0,0,
0,0,1,0,0,
-0,0,1,0,0,
+/* Char 23 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -217,8 +251,9 @@
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-
0,0,0,0,0,
+
+/* Char 24 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -226,7 +261,9 @@
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
+0,0,1,0,0,
+/* Char 25 */
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -236,6 +273,7 @@
0,0,1,0,0,
0,0,1,0,0,
+/* Char 26 */
0,0,0,0,0,
0,0,0,1,0,
0,0,1,0,0,
@@ -245,6 +283,7 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 27 */
0,0,0,0,0,
0,1,0,0,0,
0,0,1,0,0,
@@ -254,15 +293,18 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 28 */
+0,0,0,0,0,
+0,0,0,0,0,
0,0,0,0,0,
1,1,1,1,1,
0,1,0,1,0,
0,1,0,1,0,
0,1,0,1,0,
-0,1,0,1,0,
-0,0,0,0,0,
0,0,0,0,0,
+/* Char 29 */
+0,0,0,0,0,
0,0,0,0,0,
0,0,0,1,0,
1,1,1,1,1,
@@ -270,17 +312,18 @@
1,1,1,1,1,
0,1,0,0,0,
0,0,0,0,0,
-0,0,0,0,0,
+/* Char 30 */
+0,0,0,0,0,
0,0,1,1,0,
0,1,0,0,1,
1,1,1,0,0,
0,1,0,0,0,
-0,1,1,1,0,
-1,1,0,1,1,
-0,1,0,0,0,
+0,1,0,0,1,
+1,0,1,1,0,
0,0,0,0,0,
+/* Char 31 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -290,6 +333,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 32 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -299,8 +343,9 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 33 */
+0,0,0,0,0,
0,0,0,0,0,
-0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -308,15 +353,17 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 34 */
0,0,0,0,0,
0,1,0,1,0,
0,1,0,1,0,
-0,1,0,1,0,
+0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 35 */
0,1,0,1,0,
0,1,0,1,0,
1,1,1,1,1,
@@ -326,6 +373,7 @@
0,1,0,1,0,
0,0,0,0,0,
+/* Char 36 */
0,0,1,0,0,
0,1,1,1,0,
1,0,1,0,0,
@@ -335,26 +383,29 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 37 */
0,0,0,0,0,
-0,1,0,0,0,
-0,1,0,1,0,
-0,0,1,0,0,
-0,1,0,1,0,
-0,0,0,1,0,
0,0,0,0,0,
+1,1,0,0,1,
+1,1,0,1,0,
+0,0,1,0,0,
+0,1,0,1,1,
+1,0,0,1,1,
0,0,0,0,0,
+/* Char 38 */
+0,0,0,0,0,
0,0,1,0,0,
0,1,0,1,0,
-0,1,0,1,0,
0,0,1,0,0,
0,1,0,1,0,
0,1,0,1,0,
0,0,1,0,1,
0,0,0,0,0,
+/* Char 39 */
0,0,0,0,0,
-0,0,1,1,0,
+0,1,1,0,0,
0,0,1,0,0,
0,1,0,0,0,
0,0,0,0,0,
@@ -362,15 +413,17 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 40 */
0,0,0,0,0,
-0,0,0,1,0,
-0,0,1,0,0,
0,0,1,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
0,0,1,0,0,
-0,0,0,1,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 41 */
0,0,0,0,0,
0,1,0,0,0,
0,0,1,0,0,
@@ -380,15 +433,17 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 42 */
0,0,0,0,0,
-0,1,0,0,1,
-0,0,1,1,0,
-0,1,1,1,1,
-0,0,1,1,0,
-0,1,0,0,1,
+1,0,0,1,0,
+0,1,1,0,0,
+1,1,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 43 */
0,0,0,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -398,6 +453,7 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 44 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -407,33 +463,37 @@
0,1,0,0,0,
0,0,0,0,0,
+/* Char 45 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
+1,1,1,1,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 46 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,0,0,
-0,1,1,1,0,
-0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 47 */
+0,0,0,0,0,
0,0,0,0,0,
-0,0,0,0,1,
0,0,0,0,1,
0,0,0,1,0,
0,0,1,0,0,
0,1,0,0,0,
-0,1,0,0,0,
+1,0,0,0,0,
0,0,0,0,0,
+/* Char 48 */
0,0,0,0,0,
0,0,1,0,0,
0,1,0,1,0,
@@ -443,6 +503,7 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 49 */
0,0,0,0,0,
0,0,1,0,0,
0,1,1,0,0,
@@ -452,87 +513,98 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 50 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,0,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+0,0,0,1,0,
+0,0,1,0,0,
0,1,0,0,0,
-0,1,1,1,1,
+1,1,1,1,0,
0,0,0,0,0,
+/* Char 51 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
+0,1,1,0,0,
+1,0,0,1,0,
+0,0,1,0,0,
0,0,0,1,0,
-0,0,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 52 */
0,0,0,0,0,
-0,0,0,1,0,
-0,0,1,1,0,
-0,1,0,1,0,
-0,1,1,1,1,
-0,0,0,1,0,
-0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+1,0,1,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,0,1,0,0,
0,0,0,0,0,
+/* Char 53 */
0,0,0,0,0,
-0,1,1,1,1,
-0,1,0,0,0,
-0,1,1,1,0,
-0,0,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+0,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 54 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,0,
-0,1,0,1,0,
-0,1,1,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 55 */
0,0,0,0,0,
-0,1,1,1,1,
-0,0,0,0,1,
-0,0,0,1,0,
+1,1,1,1,0,
0,0,0,1,0,
0,0,1,0,0,
0,0,1,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
0,0,0,0,0,
+/* Char 56 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 57 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,1,1,
-0,0,1,0,1,
-0,0,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 58 */
0,0,0,0,0,
-0,0,1,1,0,
-0,0,1,1,0,
0,0,0,0,0,
-0,0,1,1,0,
-0,0,1,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
0,0,0,0,0,
+0,1,1,0,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 59 */
+0,0,0,0,0,
0,0,0,0,0,
0,0,1,1,0,
0,0,1,1,0,
@@ -540,35 +612,38 @@
0,0,1,1,0,
0,0,1,0,0,
0,1,0,0,0,
-0,0,0,0,0,
+/* Char 60 */
+0,0,0,0,0,
0,0,0,0,0,
0,0,0,1,0,
0,0,1,0,0,
0,1,0,0,0,
-0,1,0,0,0,
0,0,1,0,0,
0,0,0,1,0,
0,0,0,0,0,
+/* Char 61 */
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,0,
0,0,0,0,0,
-0,1,1,1,0,
+1,1,1,1,0,
0,0,0,0,0,
+1,1,1,1,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 62 */
+0,0,0,0,0,
0,0,0,0,0,
0,1,0,0,0,
0,0,1,0,0,
0,0,0,1,0,
-0,0,0,1,0,
0,0,1,0,0,
0,1,0,0,0,
0,0,0,0,0,
+/* Char 63 */
0,0,0,0,0,
0,0,1,0,0,
0,1,0,1,0,
@@ -578,6 +653,7 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 64 */
0,0,1,1,0,
0,1,0,0,1,
1,0,0,1,1,
@@ -587,78 +663,87 @@
0,1,0,0,0,
0,0,1,1,0,
+/* Char 65 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,1,
-0,1,0,0,1,
-0,1,0,0,1,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 66 */
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
0,0,0,0,0,
+/* Char 67 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 68 */
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
0,0,0,0,0,
+/* Char 69 */
0,0,0,0,0,
-0,1,1,1,1,
-0,1,0,0,0,
-0,1,1,1,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,1,1,1,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
0,0,0,0,0,
+/* Char 70 */
0,0,0,0,0,
-0,1,1,1,1,
-0,1,0,0,0,
-0,1,1,1,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
0,0,0,0,0,
+/* Char 71 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,0,
-0,1,0,1,1,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,0,0,
+1,0,1,1,0,
+1,0,0,1,0,
+0,1,1,1,0,
0,0,0,0,0,
+/* Char 72 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 73 */
0,0,0,0,0,
0,1,1,1,0,
0,0,1,0,0,
@@ -668,96 +753,107 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 74 */
0,0,0,0,0,
-0,0,1,1,1,
-0,0,0,0,1,
-0,0,0,0,1,
-0,0,0,0,1,
-0,1,0,0,1,
0,0,1,1,0,
+0,0,0,1,0,
+0,0,0,1,0,
+0,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 75 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,1,0,
-0,1,1,0,0,
-0,1,0,1,0,
-0,1,0,1,0,
-0,1,0,0,1,
+1,0,0,1,0,
+1,0,1,0,0,
+1,1,0,0,0,
+1,0,1,0,0,
+1,0,1,0,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 76 */
0,0,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
0,0,0,0,0,
+/* Char 77 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,1,1,1,
-0,1,1,1,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,0,1,0,
+1,1,1,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 78 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,1,0,1,
-0,1,1,1,1,
-0,1,0,1,1,
-0,1,0,1,1,
-0,1,0,0,1,
+1,0,0,1,0,
+1,1,0,1,0,
+1,1,1,1,0,
+1,0,1,1,0,
+1,0,1,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 79 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 80 */
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,0,
-0,1,0,0,0,
-0,1,0,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
0,0,0,0,0,
+/* Char 81 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,0,1,
-0,1,0,1,1,
-0,0,1,1,0,
-0,0,0,0,1,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,0,1,0,
+1,0,1,1,0,
+0,1,1,0,0,
+0,0,0,1,0,
+/* Char 82 */
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,0,
-0,1,0,1,1,
-0,1,0,0,1,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,1,0,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 83 */
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,0,1,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,0,0,
0,0,0,1,0,
-0,1,0,0,1,
-0,0,1,1,0,
+1,1,1,0,0,
0,0,0,0,0,
+/* Char 84 */
0,0,0,0,0,
1,1,1,1,1,
0,0,1,0,0,
@@ -767,42 +863,47 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 85 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 86 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
-0,0,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 87 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,1,
-0,1,1,1,1,
-0,1,0,0,1,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 88 */
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 89 */
0,0,0,0,0,
1,0,0,0,1,
1,0,0,0,1,
@@ -812,15 +913,17 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 90 */
0,0,0,0,0,
-0,1,1,1,1,
-0,0,0,0,1,
+1,1,1,1,0,
0,0,0,1,0,
0,0,1,0,0,
0,1,0,0,0,
-0,1,1,1,1,
+1,0,0,0,0,
+1,1,1,1,0,
0,0,0,0,0,
+/* Char 91 */
0,0,0,0,0,
0,1,1,1,0,
0,1,0,0,0,
@@ -830,15 +933,17 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 92 */
0,0,0,0,0,
-0,1,0,0,0,
+0,0,0,0,0,
+1,0,0,0,0,
0,1,0,0,0,
0,0,1,0,0,
0,0,0,1,0,
0,0,0,0,1,
-0,0,0,0,1,
0,0,0,0,0,
+/* Char 93 */
0,0,0,0,0,
0,1,1,1,0,
0,0,0,1,0,
@@ -848,15 +953,17 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 94 */
0,0,0,0,0,
0,0,1,0,0,
0,1,0,1,0,
-0,1,0,1,0,
+0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 95 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -866,6 +973,7 @@
0,0,0,0,0,
1,1,1,1,1,
+/* Char 96 */
0,0,0,0,0,
0,1,1,0,0,
0,1,0,0,0,
@@ -875,78 +983,87 @@
0,0,0,0,0,
0,0,0,0,0,
+/* Char 97 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,0,1,
-0,1,0,1,1,
-0,1,0,1,1,
-0,0,1,0,1,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
0,0,0,0,0,
+/* Char 98 */
0,0,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
0,0,0,0,0,
+/* Char 99 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,0,1,1,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,1,0,
0,0,0,0,0,
+/* Char 100 */
0,0,0,0,0,
-0,0,0,0,1,
-0,0,0,0,1,
-0,0,1,0,1,
-0,1,0,1,1,
-0,1,0,1,1,
-0,0,1,0,1,
+0,0,0,1,0,
+0,0,0,1,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
0,0,0,0,0,
+/* Char 101 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,1,0,
-0,1,1,1,1,
-0,1,0,0,0,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,1,1,0,
+1,1,0,0,0,
+0,1,1,1,0,
0,0,0,0,0,
+/* Char 102 */
0,0,0,0,0,
-0,0,0,1,0,
-0,0,1,0,1,
-0,0,1,0,0,
-0,1,1,1,0,
-0,0,1,0,0,
0,0,1,0,0,
+0,1,0,1,0,
+0,1,0,0,0,
+1,1,1,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
0,0,0,0,0,
+/* Char 103 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,0,1,1,1,
-0,0,0,0,1,
-0,0,1,1,0,
-
-0,0,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,0,1,0,
+0,1,1,1,0,
+0,0,0,1,0,
+0,1,1,0,0,
+
+/* Char 104 */
+0,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 105 */
0,0,0,0,0,
0,0,1,0,0,
0,0,0,0,0,
@@ -956,6 +1073,7 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 106 */
0,0,0,0,0,
0,0,0,1,0,
0,0,0,0,0,
@@ -965,15 +1083,17 @@
0,1,0,1,0,
0,0,1,0,0,
+/* Char 107 */
0,0,0,0,0,
-0,1,0,0,0,
-0,1,0,0,0,
-0,1,0,0,1,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 108 */
0,0,0,0,0,
0,1,1,0,0,
0,0,1,0,0,
@@ -983,87 +1103,97 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 109 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,0,1,0,
+1,1,0,1,0,
1,0,1,0,1,
1,0,1,0,1,
1,0,0,0,1,
0,0,0,0,0,
+/* Char 110 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 111 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,1,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
0,0,0,0,0,
+/* Char 112 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,0,
-0,1,0,0,1,
-0,1,1,1,0,
-0,1,0,0,0,
-0,1,0,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+/* Char 113 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,1,1,1,
-0,1,0,0,1,
-0,0,1,1,1,
-0,0,0,0,1,
-0,0,0,0,1,
+0,1,1,1,0,
+1,0,0,1,0,
+0,1,1,1,0,
+0,0,0,1,0,
+0,0,0,1,0,
+/* Char 114 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,0,1,0,
-0,1,1,0,1,
-0,1,0,0,0,
-0,1,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
0,0,0,0,0,
+/* Char 115 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,1,1,1,0,
-0,1,1,0,0,
-0,0,0,1,0,
-0,1,1,1,0,
+1,1,0,0,0,
+0,0,1,1,0,
+1,1,1,0,0,
0,0,0,0,0,
+/* Char 116 */
0,0,0,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
+1,1,1,0,0,
+0,1,0,0,0,
+0,1,0,1,0,
0,0,1,0,0,
-0,0,1,0,0,
-0,1,1,1,0,
-0,0,1,0,0,
-0,0,1,0,1,
-0,0,0,1,0,
0,0,0,0,0,
+/* Char 117 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,1,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
0,0,0,0,0,
+/* Char 118 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -1073,6 +1203,7 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 119 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -1082,42 +1213,47 @@
0,1,1,1,0,
0,0,0,0,0,
+/* Char 120 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,0,0,1,
-0,0,1,1,0,
-0,0,1,1,0,
-0,1,0,0,1,
+1,0,0,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
0,0,0,0,0,
+/* Char 121 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,0,0,1,
-0,1,0,0,1,
-0,0,1,1,1,
-0,1,0,0,1,
-0,0,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,1,0,
+0,0,0,1,0,
+0,1,1,0,0,
+/* Char 122 */
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,1,1,1,1,
-0,0,0,1,0,
+1,1,1,1,0,
0,0,1,0,0,
-0,1,1,1,1,
+0,1,0,0,0,
+1,1,1,1,0,
0,0,0,0,0,
-0,0,0,1,1,
+/* Char 123 */
+0,0,1,1,0,
+0,1,0,0,0,
0,0,1,0,0,
-0,0,0,1,0,
-0,1,1,0,0,
-0,0,0,1,0,
+1,1,0,0,0,
0,0,1,0,0,
-0,0,0,1,1,
+0,1,0,0,0,
+0,0,1,1,0,
0,0,0,0,0,
+/* Char 124 */
0,0,0,0,0,
0,0,1,0,0,
0,0,1,0,0,
@@ -1127,6 +1263,7 @@
0,0,1,0,0,
0,0,0,0,0,
+/* Char 125 */
0,1,1,0,0,
0,0,0,1,0,
0,0,1,0,0,
@@ -1136,15 +1273,18 @@
0,1,1,0,0,
0,0,0,0,0,
+/* Char 126 */
0,0,0,0,0,
-0,0,1,0,1,
0,1,0,1,0,
+1,0,1,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
+/* Char 127 */
+0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
@@ -1152,16 +1292,1299 @@
0,0,0,0,0,
0,0,0,0,0,
0,0,0,0,0,
-0,0,0,0,0
-};
-gdFont gdFontTinyRep = {
- 128,
- 0,
- 5,
- 8,
- gdFontTinyData
-};
+/* Char 128 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
-gdFontPtr gdFontTiny = &gdFontTinyRep;
+/* Char 129 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 130 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 131 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 132 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 133 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 134 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 135 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 136 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 137 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 138 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 139 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 140 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 141 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 142 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 143 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 144 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 145 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 146 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 147 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 148 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 149 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 150 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 151 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 152 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 153 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 154 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 155 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 156 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 157 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 158 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 159 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 160 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 161 */
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,0,0,1,1,
+
+/* Char 162 */
+1,0,0,0,1,
+0,1,1,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 163 */
+0,0,0,0,0,
+0,1,0,0,0,
+0,1,0,1,0,
+0,1,1,0,0,
+0,1,0,0,0,
+1,1,0,0,0,
+0,1,1,1,1,
+0,0,0,0,0,
+
+/* Char 164 */
+0,0,0,0,0,
+1,0,0,0,1,
+0,1,1,1,0,
+0,1,0,1,0,
+0,1,1,1,0,
+1,0,0,0,1,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 165 */
+0,0,1,1,0,
+1,0,0,1,0,
+1,0,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 166 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+0,1,1,0,0,
+0,0,0,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 167 */
+0,0,0,0,0,
+0,0,1,1,0,
+0,1,0,0,0,
+0,0,1,0,0,
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,1,0,
+0,1,1,0,0,
+
+/* Char 168 */
+0,1,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 169 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+0,1,1,0,0,
+0,0,0,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 170 */
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,0,0,
+0,0,0,1,0,
+1,1,1,0,0,
+0,1,0,0,0,
+
+/* Char 171 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,1,1,1,1,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,0,0,0,
+
+/* Char 172 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 173 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+1,1,1,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 174 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 175 */
+0,1,1,0,0,
+0,0,0,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 176 */
+0,0,1,0,0,
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 177 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,1,1,
+
+/* Char 178 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,1,0,0,
+0,0,0,1,1,
+
+/* Char 179 */
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,1,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 180 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 181 */
+0,0,0,1,1,
+1,1,0,0,1,
+0,1,0,1,0,
+0,1,0,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 182 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,1,0,0,0,
+0,0,1,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 183 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 184 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,1,0,
+0,1,1,0,0,
+
+/* Char 185 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,1,0,0,0,
+0,0,1,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 186 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,1,0,0,0,
+0,0,1,1,0,
+1,1,1,0,0,
+0,1,0,0,0,
+
+/* Char 187 */
+0,0,0,1,1,
+0,1,0,0,1,
+0,1,0,1,0,
+1,1,1,0,0,
+0,1,0,0,0,
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+
+/* Char 188 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 189 */
+0,1,0,0,1,
+1,0,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 190 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 191 */
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,0,0,0,
+1,1,1,1,0,
+0,0,1,0,0,
+0,1,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 192 */
+0,0,1,0,0,
+0,1,0,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,1,0,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 193 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 194 */
+0,1,1,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 195 */
+1,0,0,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 196 */
+1,0,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,1,1,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 197 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 198 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 199 */
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+1,1,0,0,0,
+
+/* Char 200 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 201 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 202 */
+0,0,0,0,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,1,1,
+
+/* Char 203 */
+1,0,0,1,0,
+0,0,0,0,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 204 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,1,1,1,0,
+1,0,0,0,0,
+1,1,1,0,0,
+1,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 205 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 206 */
+0,0,1,0,0,
+0,1,0,1,0,
+0,0,0,0,0,
+0,1,1,1,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 207 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 208 */
+0,0,0,0,0,
+1,1,1,0,0,
+0,1,0,1,0,
+1,1,0,1,0,
+0,1,0,1,0,
+0,1,0,1,0,
+1,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 209 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,0,0,1,0,
+1,1,0,1,0,
+1,1,1,1,0,
+1,0,1,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 210 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,0,0,1,0,
+1,1,0,1,0,
+1,1,1,1,0,
+1,0,1,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 211 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 212 */
+0,1,1,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 213 */
+0,1,0,0,1,
+1,0,0,1,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 214 */
+1,0,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 215 */
+0,0,0,0,0,
+0,0,0,0,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 216 */
+0,1,0,1,0,
+0,0,1,0,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,1,0,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 217 */
+0,1,1,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 218 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 219 */
+0,1,0,0,1,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 220 */
+1,0,0,1,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 221 */
+0,0,0,1,0,
+0,0,1,0,0,
+1,0,0,0,1,
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,0,0,0,
+
+/* Char 222 */
+0,0,0,0,0,
+1,1,1,1,1,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,0,0,0,
+
+/* Char 223 */
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,1,1,0,0,
+1,0,0,1,0,
+1,1,0,1,0,
+1,0,1,0,0,
+1,0,0,0,0,
+
+/* Char 224 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 225 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 226 */
+0,0,1,0,0,
+0,1,0,1,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 227 */
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 228 */
+1,0,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 229 */
+0,0,0,0,1,
+0,0,0,1,0,
+0,1,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 230 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 231 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,1,0,
+1,1,1,0,0,
+
+/* Char 232 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 233 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,1,1,0,
+1,1,0,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 234 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,1,1,0,
+1,1,0,0,0,
+0,1,1,1,0,
+0,0,0,1,1,
+
+/* Char 235 */
+0,0,0,0,0,
+1,0,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,1,1,0,
+1,1,0,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 236 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,1,1,0,
+1,1,0,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 237 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 238 */
+0,0,1,0,0,
+0,1,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,1,0,0,
+0,0,1,0,0,
+0,1,1,1,0,
+0,0,0,0,0,
+
+/* Char 239 */
+0,0,0,1,1,
+0,0,1,0,1,
+0,0,1,0,1,
+0,1,1,0,0,
+1,0,1,0,0,
+1,0,1,0,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 240 */
+0,0,0,1,0,
+0,0,1,1,1,
+0,0,0,1,0,
+0,1,1,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 241 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 242 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,0,0,0,0,
+
+/* Char 243 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 244 */
+0,1,1,0,0,
+1,0,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 245 */
+0,1,0,0,1,
+1,0,0,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 246 */
+1,0,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 247 */
+0,0,0,0,0,
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,0,0,0,
+1,1,1,1,0,
+0,0,0,0,0,
+0,1,1,0,0,
+0,0,0,0,0,
+
+/* Char 248 */
+0,1,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,1,0,0,
+1,1,0,1,0,
+1,0,0,0,0,
+1,0,0,0,0,
+0,0,0,0,0,
+
+/* Char 249 */
+0,1,1,0,0,
+0,1,1,0,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 250 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 251 */
+0,1,0,0,1,
+1,0,0,1,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 252 */
+1,0,0,1,0,
+0,0,0,0,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+1,0,1,1,0,
+0,1,0,1,0,
+0,0,0,0,0,
+
+/* Char 253 */
+0,0,0,1,0,
+0,0,1,0,0,
+0,0,0,0,0,
+1,0,0,1,0,
+1,0,0,1,0,
+0,1,1,1,0,
+0,0,0,1,0,
+0,1,1,0,0,
+
+/* Char 254 */
+0,0,0,0,0,
+0,1,0,0,0,
+0,1,0,0,0,
+1,1,1,0,0,
+0,1,0,0,0,
+0,1,0,1,0,
+0,0,1,0,0,
+0,1,1,0,0,
+
+/* Char 255 */
+0,0,0,0,0,
+0,0,1,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+0,0,0,0,0,
+
+
+};
+
+gdFont gdFontTinyRep = {
+ 256,
+ 0,
+ 5,
+ 8,
+ gdFontTinyData
+};
+
+gdFontPtr gdFontTiny = &gdFontTinyRep;
+
+/* This file has not been truncated. */
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfonts.h Sat Jul 13 19:23:39 2002
@@ -1,15 +1,20 @@
-#ifndef GDFONTS_H
-#define GDFONTS_H 1
-/* gdfonts.h: brings in the smaller of the two provided fonts.
- Also link with gdfonts.c. */
+#ifndef _GDFONTS_H_
+#define _GDFONTS_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -misc-fixed-medium-r-semicondensed-sans-12-116-75-75-c-60-iso8859-2
+ at Thu Jan 8 14:13:20 1998.
+ No copyright info was found in the original bdf.
+ */
-#include "gd.h"
-/* 6x12 font derived from a public domain font in the X
- distribution. Only contains the 96 standard ascii characters,
- sorry. Feel free to improve on this. */
+#include "gd.h"
extern gdFontPtr gdFontSmall;
#endif
+
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.h
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.h (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gdfontt.h Sat Jul 13 19:23:40 2002
@@ -1,14 +1,21 @@
-#ifndef GDFONTT_H
-#define GDFONTT_H 1
-/* gdfontt.h: brings in the tinyest of the provided fonts.
- Also link with gdfontt.c. */
+#ifndef _GDFONTT_H_
+#define _GDFONTT_H_ 1
+
+/*
+ This is a header file for gd font, generated using
+ bdftogd version 0.5 by Jan Pazdziora, adelton at fi.muni.cz
+ from bdf font
+ -Misc-Fixed-Medium-R-Normal--8-80-75-75-C-50-ISO8859-2
+ at Thu Jan 8 13:49:54 1998.
+ The original bdf was holding following copyright:
+ "Libor Skarvada, libor at informatics.muni.cz"
+ */
-#include "gd.h"
-/* 5x8 font derived from a public domain font in the X
- distribution. Contains the 127 standard ascii characters. */
+#include "gd.h"
extern gdFontPtr gdFontTiny;
#endif
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/Makefile.am Sat Jul 13 19:23:40 2002
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS = foreign
+
+#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=config
+
+noinst_LTLIBRARIES = librrd_gd.la
+
+librrd_gd_la_SOURCES = \
+ gd.c gdfontg.c gdfontl.c gdfontmb.c \
+ gdfonts.c gdfontt.c gdlucidab10.c gdlucidab12.c \
+ gdlucidab14.c gdlucidan10.c gdlucidan12.c gdlucidan14.c \
+ gd.h gdfontmb.h gdlucidab10.h gdlucidan10.h \
+ gdfontg.h gdfonts.h gdlucidab12.h gdlucidan12.h \
+ gdfontl.h gdfontt.h gdlucidab14.h gdlucidan14.h
+
+
+EXTRA_DIST= README.rrdtool demoin.gif gd.dsp gd.dsw index.html readme.txt \
+ webgif.c mtables.c mathmake.c giftogd.c
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/index.html
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/index.html (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/index.html Sat Jul 13 19:23:41 2002
@@ -1,9 +1,9 @@
<HTML>
<HEAD>
-<TITLE>gd 1.2</TITLE>
+<TITLE>gd 1.3</TITLE>
</HEAD>
<BODY>
-<H1>gd 1.2</H1>
+<H1>gd 1.3</H1>
<H2>A graphics library for fast GIF creation</H2>
<H2>Follow this link to the
<A HREF="http://www.boutell.com/gd/">latest version
@@ -11,12 +11,9 @@
<H3>Table of Contents</H3>
<UL>
<LI><A HREF="#notice">Credits and license terms</A>
-<LI><A HREF="#whatsnew1.2">What's new in version 1.2?</A>
-<LI><A HREF="#whatsnew1.1.1">What's new in version 1.1.1?</A>
+<LI><A HREF="#whatsnew1.3">What's new in version 1.3?</A>
<LI><A HREF="#whatis">What is gd?</A>
-<LI><A HREF="#gdperl">What if I want to use Perl instead of C?</A>
-<LI><A HREF="#gdtcl">What if I want to use Tcl instead of C?</A>
-<LI><A HREF="#gdit">What if I want to use another scripting language?</A>
+<LI><A HREF="#gdother">What if I want to use another programming language?</A>
<LI><A HREF="#required">What else do I need to use gd?</A>
<LI><A HREF="#getgd">How do I get gd?</A>
<LI><A HREF="#buildgd">How do I build gd?</A>
@@ -27,80 +24,59 @@
<LI><A HREF="#informing"><strong>Please</strong>
tell us you're using gd!</A>
<LI><A HREF="#problems">If you have problems</A>
-<LI><A HREF="#languages">Using gd from tcl</A></LI>
<LI><A HREF="#index">Alphabetical quick index</A>
</UL>
<P><A HREF="http://www.boutell.com/">
-Up to the <EM>boutell.com, Inc. Home Page</EM></A>
+Up to the <EM>Boutell.Com, Inc. Home Page</EM></A>
<A NAME="notice"><H3>Credits and license terms</A></H3>
<P>
-gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
-Cold Spring Harbor Labs. Permission granted to copy and distribute
-this work provided that this notice remains intact. Credit
-for the library must be given to the Quest Protein Database Center,
-Cold Spring Harbor Labs, in all derived works. This does not
-affect your ownership of the derived work itself, and the intent
-is to assure proper credit for Quest, not to interfere with your
-use of gd. If you have questions, ask. ("Derived works"
-includes all programs that utilize the library. Credit must
-be given in user-visible documentation.)
-<p>
-gd 1.2 was written by Thomas Boutell and is currently
-distributed by boutell.com, Inc.
+In order to resolve any possible confusion regarding the authorship
+of gd, the following copyright statement covers all of the authors
+who have required such a statement. <em>Although his LZW compression
+code no longer appears in gd, the authors wish to thank David Rowley
+for the original LZW-based GIF compression code, which has been removed
+due to patent concerns.</em> <strong>If you are aware of any oversights
+in this copyright notice, please contact
+<a href="mailto:boutell at boutell.com">Thomas Boutell</a> who will be
+pleased to correct them.</strong>
+<pre>
+COPYRIGHT STATEMENT FOLLOWS THIS LINE
+</pre>
+<blockquote>
+Portions copyright 1994, 1995, 1996, 1997, 1998, by Cold Spring
+Harbor Laboratory. Funded under Grant P41-RR02188 by the National
+Institutes of Health.
<P>
-If you wish to release modifications to gd,
-please clear them first by sending email to
-boutell at boutell.com; if this is not done, any modified version of the gd
-library must be clearly labeled as such.
-<P>
-The Quest Protein Database Center is funded under Grant P41-RR02188 by
-the National Institutes of Health.
-<P>
-Written by <A HREF="http://sunsite.unc.edu/boutell/index.html">
-Thomas Boutell</A>, 2/94 - 8/95.
-<P>
-The GIF compression code is based on that found in the pbmplus
-utilities, which in turn is based on GIFENCOD by David Rowley. See the
-notice below:
-
-<PRE>
-/*
-** Based on GIFENCOD by David Rowley <mgardi at watdscu.waterloo.edu>.A
-** Lempel-Zim compression based on "compress".
-**
-** Modified by Marcel Wijkstra <wijkstra at fwi.uva.nl>
-**
-** Copyright (C) 1989 by Jef Poskanzer.
-**
-** Permission to use, copy, modify, and distribute this software and its
-** documentation for any purpose and without fee is hereby granted, provided
-** that the above copyright notice appear in all copies and that both that
-** copyright notice and this permission notice appear in supporting
-** documentation. This software is provided "as is" without express or
-** implied warranty.
-**
-** The Graphics Interchange Format(c) is the Copyright property of
-** CompuServe Incorporated. GIF(sm) is a Service Mark property of
-** CompuServe Incorporated.
-*/
-</PRE>
-<P>
-<A NAME="koblas">
-The GIF decompression is based on that found in the pbmplus
-utilities, which in turn is based on GIFDECOD by David Koblas. See the
-notice below:
-<PRE>
-/* +-------------------------------------------------------------------+ */
-/* | Copyright 1990, 1991, 1993, David Koblas. (koblas at netcom.com) | */
-/* | Permission to use, copy, modify, and distribute this software | */
-/* | and its documentation for any purpose and without fee is hereby | */
-/* | granted, provided that the above copyright notice appear in all | */
-/* | copies and that both that copyright notice and this permission | */
-/* | notice appear in supporting documentation. This software is | */
-/* | provided "as is" without express or implied warranty. | */
-/* +-------------------------------------------------------------------+ */
-</PRE>
-</A>
+Portions copyright 1996, 1997, 1998, by Boutell.Com, Inc.
+<p>
+GIF decompression code copyright 1990, 1991, 1993, by David Koblas
+(koblas at netcom.com).
+<p>
+Non-LZW-based GIF compression code copyright 1998, by Hutchison Avenue
+Software Corporation (<a href="http://www.hasc.com">http://www.hasc.com/</a>,
+info at hasc.com).
+<p>
+<strong>Permission has been granted to copy and distribute gd in any
+context, including a commercial application, provided that this notice
+is present in user-accessible supporting documentation.</strong>
+<p>
+This does not affect your ownership of the derived work itself, and the intent
+is to assure proper credit for the authors of gd, not to interfere
+with your productive use of gd. If you have questions, ask.
+"Derived works" includes all programs that utilize the library.
+Credit must be given in user-accessible documentation.
+<p>
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation. This software is provided "as is" without express or
+implied warranty.
+<p>
+</blockquote>
+<pre>
+END OF COPYRIGHT STATEMENT
+</pre>
<A NAME="whatis"><H3>What is gd?</H3></A>
<P>
gd is a graphics library. It allows your code to quickly
@@ -111,197 +87,140 @@
format used for inline images.
<P>
gd is not a paint program.
-If you are looking for a paint program, try xpaint by David
-Koblas, available by <A HREF="ftp://ftp.netcom.com/pub/ko/koblas">
-anonymous FTP</A> from ftp.netcom.com in pub/ko/koblas.
-(That package is for the X Window System; for the Mac and the PC, paint
-programs are considerably easier to find.)
+If you are looking for a paint program, you are looking in
+the wrong place. If you are not a programmer, you are looking
+in the wrong place.
<P>
gd does not provide for every possible desirable graphics
operation. It is not necessary or desirable for gd to become
-a kitchen-sink graphics package, but version 1.2 incorporates
-most of the commonly requested features for a 2D package.
-Font support does need improvement, and support for the PNG
-graphics format will arrive in a forthcoming release.
-<P>
-<A NAME="gdperl"><H3>What if I want to use Perl instead of C?</H3></A>
+a kitchen-sink graphics package, but version 1.3 incorporates
+most of the commonly requested features for an 8-bit 2D package.
+Support for scalable fonts, and truecolor images, JPEG and PNG
+is planned for version 2.0. Version 1.3 was released to correct
+longstanding bugs and provide an LZW-free GIF compression routine.
+<P>
+<A NAME="gdother"><H3>What if I want to use another programming
+language?</h3></A>
+<h4>Perl</h4>
gd can also be used from Perl, courtesy of
Lincoln Stein's
<a href="http://www-genome.wi.mit.edu/ftp/pub/software/WWW/GD.html">
GD.pm</a> library, which uses gd as the basis for a set of
Perl 5.x classes. GD.pm is based on gd 1.1.1 but gd 1.2 should
be compatible.
-<A NAME="gdtcl"><H3>What if I want to use Tcl instead of C?</H3></A>
-gd can also be used from Tcl by way of the
-<a href="http://guraldi.hgp.med.umich.edu/gdtcl.html">gdtcl</a>
-Tcl extension.
-<A NAME="gdit"><H3>What if I want to use another scripting language?</H3></A>
+<h4>Any Language</h4>
There are, at the moment, at least three simple interpreters that
perform gd operations. You can output the desired commands to a simple
text file from whatever scripting language you prefer to use, then
invoke the interpreter.
<p>
-These packages are based on gd 1.1.1 as of this writing but should
-be compatible with gd 1.2 with minimal tweaking.
+These packages are based on gd 1.2 as of this writing but should
+be compatible with gd 1.3 with minimal tweaking.
<ul>
-<li><a href="http://www.demon.co.uk/3Wiz/gdit/">gdit</a>, by David
-Harvey-George
<li><a href="http://s27w007.pswfs.gov/tgd/">tgd</a>, by Bradley K. Sherman
<li><a href="http://www.unimelb.edu.au/fly/fly.html">fly</a>, by Martin Gleeson
</ul>
-<P><A NAME="whatsnew1.2"><H3>What's new in version 1.2?</H3></A>
-Version 1.2 is another fine-tuning release. The next major release
-will after 1.2 will be version 2.0 and will feature support for
-the new <a href="http://sunsite.unc.edu/boutell/png.html">PNG</a>
-graphics format as well as improved font support. gd 1.2 does
-add several new fonts in the meantime.
-<p>
-Version 1.2 moves gd to ANSI standard C. Non-ANSI C compilers,
-such as the old SunOS 4.1.3 cc compiler, will not work. The use
-of pre-ANSI C led to several long-standing bugs, and the ANSI C
-standard has been with us for nearly ten years now. If your compiler
-does not support ANSI, upgrade to a recent release of your compiler,
-or get gcc, which is free and does support ANSI C.
-<P>
-The provided Unix Makefile has been changed to be a bit
-more broadly compatible, and to acknowledge the changes that
-may be necessary on various systems.
-<P>
-Version 1.2 also includes the following improvements:
-<P>
-<ul>
-<li><a href="#gdImageCopy">gdImageCopy</a> and
-<a href="#gdImageCopyResized">gdImageCopyResized</a> now ignore
-pixels which are transparent in the source image. This is allows
-easy copying of non-square regions, which could previously be
-accomplished only with brushes.
-<li><a href="#gdImageFilledPolygon">gdImageFilledPolygon</a>
-now draws horizontal edges correctly, correcting a
-long-standing bug. In addition, gdImageFilledPolygon copes
-with polygons which have several horizontal segments on
-the same scan line. There can still be a few pixels of
-disagreement between gdImagePolygon and gdImageFilledPolygon
-with regard to the borders of the polygon, however.
-<li>Several new public-domain fonts are included, courtesy of
-Joseph M. Orost at AT&T.
-<li>gd now properly recognizes an existing image with a
-high color slot number transparent.
-<li>Bugs in the <a href="#gdImageCreateFromXbm">gdImageCreateFromXbm</a>
-function have been corrected. Previously the function was incorrect
-for image widths not evenly divisible by eight.
-</ul>
-<P>
-<A NAME="whatsnew1.1.1"><H3>What's new in version 1.1.1?</H3></A>
-A fine-tuning and bug-fixing release.
-<P>
-<A HREF="#gdImageSetStyle">gdImageSetStyle</A> now copies
-the style array to make it easier to take advantage of
-the line styling feature; it is now safe to free the memory
-associated with your style array after setting a style
-(or allocate styles on the stack...). This should not break
-existing code.
-<P>
-<A HREF="#webgif">webgif</A>, a small but powerful GIF-manipulating
-utility program, has been added as an additional code example.
-<P>
-An access macro to determine
-whether an image is interlaced has been added; see
-<A HREF="gdImageGetInterlaced">gdImageGetInterlaced</A>.
-<P>
-A better Unix Makefile, provided by Mark Scott. Note that
-an actual library (libgd.a) is now produced; you will want
-to link with this library in your own gd apps, in the same
-manner that gddemo and giftogd link with it. You no longer
-need to explicitly list the standard font files on the link
-line. No doubt many users have already made this enhancement
-themselves.
-<p>
-<strong>Important:</strong> depending on your system you may
-need to rewrite this Makefile. Basic code-compiling skills
-are expected for the use of this library.
-<P>
-<A HREF="#koblas">David Koblas</A> has been given proper credit
-for the original GIF decoding routine; previously I erroneously
-credited David Rowley with both the encoder and the decoder.
-<P>
-<A HREF="#gdImageFill">gdImageFill</A> no longer crashes when
-attempting to fill a region with the color it already has.
-Also, attempting to fill a region with the special color
-<A HREF="#gdTiled">gdTiled</A> no longer crashes.
-<P>
-However, filling a region with a transparent tile has been
-forbidden (gdImageFill simply draws nothing in this case).
-Otherwise, gd would not know when to stop drawing
-without the use of an additional image to keep track of
-which pixels have been visited.
-<P>
-Invoking <A HREF="#gdImageFillToBorder">gdImageFillToBorder</A>
-with a special border color such as <A HREF="#gdTiled">gdTiled</A>
-now fails, for similar reasons. However, the color
-you are filling <em>with</em> can be <A HREF="#gdTiled">gdTiled</A>,
-even if it is transparent. See the discussion of
-<A HREF="#gdImageFillToBorder">gdImageFillToBorder</A> for
-additional caveats.
-<P>
-Many documentation fixes.
-<P>
-<A NAME="whatsnew1.1"><H3>What's new in version 1.1?</H3></A>
-<P>
-<UL>
-<LI><A HREF="#gdImageFilledPolygon">Polygon fills</A></LI>
-<LI><A HREF="#gdImageSetStyle">Line styling</A></LI>
-<LI><A HREF="#gdImageSetBrush">"Brushing" of lines with a brush image</A></LI>
-<LI><A HREF="#gdImageSetTile">Tiling of polygon, rectangle and flood-fills</A>
-<LI><A HREF="#gdImageInterlace">Interlaced GIFs for gradual fade-in</A></LI>
-</LI>
-<LI>Macros to access <A HREF="#gdImageSX">image size</A>, etc.</LI>
-</UL>
-<P>
+<P><A NAME="whatsnew1.2"><H3>What's new in version 1.3?</H3></A>
+Version 1.3 features the following changes:
+<dl>
+<dt>Non-LZW-based GIF compression code
+<dd>
+Version 1.3 contains GIF compression code that uses simple Run Length
+Encoding instead of LZW compression, while still retaining compatibility
+with normal LZW-based GIF decoders (your browser will still like your GIFs).
+<strong>LZW compression is patented by Unisys. This is why there have
+been no new versions of gd for a long time. THANKS to
+Hutchison Avenue Software Corporation for contributing
+this code. THE NEW CODE PRODUCES LARGER GIFS AND IS NOT WELL
+SUITED TO PHOTOGRAPHIC IMAGES. THIS IS A LEGAL ISSUE.
+IT IS NOT A QUESTION OF TECHNICAL SKILL. PLEASE DON'T
+COMPLAIN ABOUT THE SIZE OF GIF OUTPUT. THANKS!</strong>
+<dt>8-bit fonts, and 8-bit font support
+<dd>This improves support for European languages. Thanks are due
+to Honza Pazdziora <adelton at informatics.muni.cz> and also to
+Jan Pazdziora <adelton at fi.muni.cz>. Also see the provided bdftogd
+Perl script if you wish to convert fixed-width X11 fonts
+to gd fonts.
+<dt>16-bit font support (no fonts provided)
+<dd>Although no such fonts are provided in the distribution,
+fonts containing more than 256 characters should work if the
+gdImageString16 and gdImageStringUp16 routines are used.
+<dt>Improvements to the "webgif" example/utility
+<dd>The "webgif" utility is now a slightly more useful application. Thanks to
+Brian Dowling for this code.
+<dt>Corrections to the color resolution field of GIF output
+<dd>Thanks to Bruno Aureli.
+<dt>Fixed polygon fills
+<dd>A one-line patch for the infamous polygon fill bug, courtesy
+of Jim Mason. I believe this fix is sufficient. However, if you
+find a situation where polygon fills still fail to behave properly,
+please send code that demonstrates the problem, <em>and</em> a fix if
+you have one. Verifying the fix is important.
+<dt>Row-major, not column-major
+<dd>Internally, gd now represents the array of pixels as
+an array of rows of pixels, rather than an array of columns
+of pixels. This improves the performance of compression and
+decompression routines slightly, because horizontally adjacent
+pixels are now next to each other in memory. <strong>This should
+not affect properly written gd applications, but applications that
+directly manipulate the <code>pixels</code> array will require
+changes.</strong>
+</dl>
<A NAME="required"><H3>What else do I need to use gd?</H3></A>
<P>
-To use gd, you will need an ANSI C compiler. Any full-ANSI-standard
-C compiler should be adequate, although those with PCs will need to replace
-the Makefile with one of their own. <strong>The cc compiler released
-with SunOS 4.1.3 is not an ANSI C compiler. Get gcc, which is freely
-available. See the Sun-related newsgroups for more information.</strong>
+To use gd, you will need an ANSI C compiler. <strong>All popular
+Windows 95 and NT C compilers are ANSI C compliant.</strong> Any
+full-ANSI-standard C compiler should be adequate. <strong>The cc
+compiler released with SunOS 4.1.3 is not an ANSI C compiler.
+Most Unix users who do not already have gcc should get it.
+gcc is free, ANSI compliant and a de facto industry standard.
+Ask your ISP why it is missing.</strong>
<P>
You will also want a GIF viewer, if you do not already have
one for your system, since you will need a good way to check the
-results of your work. lview is a good package for
-Windows PCs; xv is a good package for X11. There are
-GIF viewers available for every graphics-capable
+results of your work. Any web browser will work, but you might
+be happier with a package like Lview Pro for Windows or
+xv for X. There are GIF viewers available for every graphics-capable
computer out there, so consult newsgroups relevant to
your particular system.
<P>
<A NAME="getgd"><H3>How do I get gd?</H3></A>
+<h4>By HTTP</h4>
+<ul>
+<li><a href="http://www.boutell.com/gd/http/gd1.3.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="http://www.boutell.com/gd/http/gd13.zip">.ZIP File (Windows)</a>
+</ul>
+<h4>By FTP</h4>
+<ul>
+<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd1.3.tar.gz">Gzipped Tar File (Unix)</a>
+<li><a href="ftp://ftp.boutell.com/pub/boutell/gd/gd13.zip">.ZIP File (Windows)</a>
+</ul>
<P>
-You can
-<A HREF="http://www.boutell.com/gd/gd1.2.tar.Z">
-fetch gd as a compressed tar file</A> from www.boutell.com.
<A NAME="buildgd"><H3>How do I build gd?</H3></A>
<P>
-In order to build gd, first uncompress and untar the gd.tar file with the
-following commands:
-<P>
-<em>Note:</em> if you have a non-Unix system, you will need
-to acquire versions of "uncompress" and "tar" suitable for
-your system. Both have been ported to PC and Mac
-environments. Consult newsgroups relevant to your
-particular system.
-<PRE>
-uncompress gd1.2.tar.Z
-tar -xf gd1.2.tar
-</PRE>
-This will create the directory "gd1.2" beneath the current
-directory.
-<P>
-cd to this directory and examine the Makefile, which you may need
-to change slightly depending on your installation (or more than
-slightly for a Windows or Mac environment).
+In order to build gd, you must first unpack the archive you have
+downloaded. If you are not familiar with <code>tar</code> and
+<code>gunzip</code> (Unix) or <code>ZIP</code> (Windows), please
+consult with an experienced user of your system. Sorry, we cannot
+answer questions about basic Internet skills.
+<p>
+Unpacking the archive will produce a directory called "gd1.3".
+<p>
+<h4>For Unix</h4>
+<code>cd</code> to the gd1.3 directory and examine the Makefile, which
+you will probably need to change slightly depending on your operating
+system and your needs.
+<h4>For Windows, Mac, Et Cetera</h4>
+Create a project using your favorite programming environment.
+Copy all of the gd files to the project directory. Add <code>gd.c</code>
+to your project. Add other source files as appropriate. Learning the
+basic skills of creating projects with your chosen C environment
+is up to you.
<P>
Now, to build the demonstration program, just type "make gddemo"
-if you are working in a command-line environment. If all goes well,
-the program "gddemo" will be compiled and linked without incident.
+if you are working in a command-line environment, or build a project
+that includes gddemo.c if you are using a graphical environment. If all
+goes well, the program "gddemo" will be compiled and linked without incident.
Depending on your system you may need to edit the Makefile.
Understanding the basic techniques of compiling and linking
programs on your system is up to you.
@@ -316,15 +235,8 @@
<P>
Display demoout.gif in your GIF viewer. The image should
be 128x128 pixels and should contain an image of the
-space shuttle with the word "hi" written in the upper
-left corner twice (once across and once upwards),
-an arc in the middle and an oval intersecting the arc
-(these are somewhat faint).
-<p>
-In addition, a diagonal line made up of tiny space shuttle
-images should appear from the lower left to the upper
-right corner. A blue frame with green interior trim should
-surround the picture.
+space shuttle with quite a lot of graphical elements drawn
+on top of it.
<P>
(If you are missing the demoin.gif file, the other items
should appear anyway.)
@@ -335,9 +247,8 @@
<A NAME="basics"><H3>gd basics: using gd in your program</H3></A>
gd lets you create GIF images on the fly. To use gd in your
program, include the file gd.h, and link with the libgd.a
-library produced by "make libgd.a", under Unix. You will
-need to adapt the makefile for your needs if you are using
-a non-Unix operating system, but this is very straightforward.
+library produced by "make libgd.a", under Unix. Under other
+operating systems you will add gd.c to your own project.
<P>
If you want to use the provided fonts, include
gdfontt.h, gdfonts.h, gdfontmb.h, gdfontl.h and/or gdfontg.h. If you
@@ -417,174 +328,6 @@
webgif.c is provided in the distribution. Unix users can
simply type "make webgif" to compile the program. Type
"webgif" with no arguments to see the available options.
-A discussion of the code follows.
-<PRE>
-/* Bring in the gd library functions */
-#include "gd.h"
-
-/* Bring in standard I/O and string manipulation functions */
-#include <stdio.h>
-#include <string.h>
-
-int main(argc, argv)
- int argc;
- char *argv[];
-{
- FILE *in;
- FILE *out;
- /* Declare our image pointer */
- <A HREF="#gdImagePtr">gdImagePtr</A> im = 0;
- int i;
- /* We'll clear 'no' once we know the user has made a
- reasonable request. */
- int no = 1;
- /* We'll set 'write' once we know the user's request
- requires that the image be written back to disk. */
- int write = 0;
- /* C programs always get at least one argument; we want at
- least one more (the image), more in practice. */
- if (argc < 2) {
- no = 1;
- goto usage;
- }
- /* The last argument should be the image. Open the file. */
- in = fopen(argv[argc-1], "rb");
- if (!in) {
- fprintf(stderr,
- "Error: can't open file %s.\n", argv[argc-1]);
- }
- /* Now load the image. */
- im = <A HREF="#gdImageCreateFromGif">gdImageCreateFromGif</A>(in);
- fclose(in);
- /* If the load failed, it must not be a GIF file. */
- if (!im) {
- fprintf(stderr,
- "Error: %s is not a valid gif file.\n", argv[1]);
- exit(1);
- }
- /* Consider each argument in turn. */
- for (i=1; (i < (argc-1)); i++) {
- /* -i turns on and off interlacing. */
- if (!strcmp(argv[i], "-i")) {
- if (i == (argc-2)) {
- fprintf(stderr,
- "Error: -i specified without y or n.\n");
- no = 1;
- goto usage;
- }
- if (!strcmp(argv[i+1], "y")) {
- /* Set interlace. */
- <A HREF="#gdImageInterlace">gdImageInterlace</A>(im, 1);
- } else if (!strcmp(argv[i+1], "n")) {
- /* Clear interlace. */
- <A HREF="#gdImageInterlace">gdImageInterlace</A>(im, 0);
- } else {
- fprintf(stderr,
- "Error: -i specified without y or n.\n");
- no = 1;
- goto usage;
- }
- i++;
- no = 0;
- write = 1;
- } else if (!strcmp(argv[i], "-t")) {
- /* Set transparent index (or none). */
- int index;
- if (i == (argc-2)) {
- fprintf(stderr,
- "Error: -t specified without a color table index.\n");
- no = 1;
- goto usage;
- }
- if (!strcmp(argv[i+1], "none")) {
- /* -1 means not transparent. */
- <A HREF="#gdImageColorTransparent">gdImageColorTransparent</A>(im, -1);
- } else {
- /* OK, get an integer and set the index. */
- index = atoi(argv[i+1]);
- <A HREF="#gdImageColorTransparent">gdImageColorTransparent</A>(im, index);
- }
- i++;
- write = 1;
- no = 0;
- } else if (!strcmp(argv[i], "-l")) {
- /* List the colors in the color table. */
- int j;
- /* Tabs used below. */
- printf("Index Red Green Blue\n");
- for (j=0; (j < <A HREF="#gdImageColorsTotal">gdImageColorsTotal</A>(im)); j++) {
- /* Use access macros to learn colors. */
- printf("%d %d %d %d\n",
- j,
- <A HREF="#gdImageRed">gdImageRed</A>(im, j),
- <A HREF="#gdImageGreen">gdImageGreen</A>(im, j),
- <A HREF="#gdImageBlue">gdImageBlue</A>(im, j));
- }
- no = 0;
- } else if (!strcmp(argv[i], "-d")) {
- /* Output dimensions, etc. */
- int t;
- printf("Width: %d Height: %d Colors: %d\n",
- <A HREF="#gdImageSX">gdImageSX</A>(im), <A HREF="#gdImageSY">gdImageSY</A>(im),
- <A HREF="#gdImageColorsTotal">gdImageColorsTotal</A>(im));
- t = <A HREF="#gdImageGetTransparent">gdImageGetTransparent</A>(im);
- if (t != (-1)) {
- printf("Transparent index: %d\n", t);
- } else {
- /* -1 means the image is not transparent. */
- printf("Transparent index: none\n");
- }
- if (<A HREF="#gdImageGetInterlaced">gdImageGetInterlaced</A>(im)) {
- printf("Interlaced: yes\n");
- } else {
- printf("Interlaced: no\n");
- }
- no = 0;
- } else {
- fprintf(stderr, "Unknown argument: %s\n", argv[i]);
- break;
- }
- }
-usage:
- if (no) {
- /* If the command failed, output an explanation. */
- fprintf(stderr,
- "Usage: webgif [-i y|n ] [-l] [-t index|off ] [-d] gifname.gif\n");
- fprintf(stderr,
- "Where -i controls interlace (specify y or n for yes or no),\n");
- fprintf(stderr,
- "-l outputs a table of color indexes, -t sets the specified\n");
- fprintf(stderr,
- "color index (0-255 or none) to be the transparent color, and\n");
- fprintf(stderr,
- "-d reports the dimensions and other characteristics of the image.\n");
- fprintf(stderr,
- "Note: you may wish to pipe to \"more\" when using the -l option.\n");
- }
- if (write) {
- /* Open a temporary file. */
- out = fopen("temp.tmp", "wb");
- if (!out) {
- fprintf(stderr,
- "Unable to write to temp.tmp -- exiting\n");
- exit(1);
- }
- /* Write the new gif. */
- <A HREF="#gdImageGif">gdImageGif</A>(im, out);
- fclose(out);
- /* Erase the old gif. */
- unlink(argv[argc-1]);
- /* Rename the new to the old. */
- rename("temp.tmp", argv[argc-1]);
- }
- /* Delete the image from memory. */
- if (im) {
- <A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
- }
- /* All's well that ends well. */
- return 0;
-}
-</PRE>
<H2><A NAME="reference">Function and type reference</A></H2>
<UL>
<LI><A HREF="#types">Types</A></LI>
@@ -1428,7 +1171,8 @@
<DD>
gdImageChar is used to draw single characters on the image.
(To draw multiple characters, use <A HREF="#gdImageString">
-gdImageString</A>.) The second argument is a
+gdImageString</A> or <A HREF="#gdImageString16">
+gdImageString16</A>.) The second argument is a
pointer to a font definition structure; five fonts are
provided with gd, gdFontTiny, gdFontSmall, gdFontMediumBold,
gdFontLarge, and gdFontGiant. You must
@@ -1467,7 +1211,8 @@
gdImageCharUp is used to draw single characters on the image,
rotated 90 degrees.
(To draw multiple characters, use <A HREF="#gdImageStringUp">
-gdImageStringUp</A>.) The second argument is a
+gdImageStringUp</A> or <A HREF="#gdImageStringUp16">
+gdImageStringUp16</A>.) The second argument is a
pointer to a font definition structure; five fonts are
provided with gd, gdFontTiny, gdFontSmall, gdFontMediumBold,
gdFontLarge, and gdFontGiant. You must
@@ -1501,7 +1246,7 @@
</PRE>
<DT><A NAME="gdImageString">
void gdImageString(gdImagePtr im, gdFontPtr font, int x, int y,
-char *s, int color)</A>
+unsigned char *s, int color)</A>
<STRONG>(FUNCTION)</STRONG>
<DD>
gdImageString is used to draw multiple characters on the image.
@@ -1543,9 +1288,34 @@
/* Destroy it */
<A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
</PRE>
+<DT><A NAME="gdImageString16">
+void gdImageString16(gdImagePtr im, gdFontPtr font, int x, int y,
+unsigned short *s, int color)</A>
+<STRONG>(FUNCTION)</STRONG>
+<DD>
+gdImageString is used to draw multiple 16-bit characters on the image.
+(To draw single characters, use <A HREF="#gdImageChar">
+gdImageChar</A>.) The second argument is a
+pointer to a font definition structure; five fonts are
+provided with gd, gdFontTiny, gdFontSmall, gdFontMediumBold,
+gdFontLarge, and gdFontGiant. You must
+include the files "gdfontt.h", "gdfonts.h", "gdfontmb.h",
+"gdfontl.h" and "gdfontg.h" respectively
+and (if you are not using a library-based approach) link with the
+corresponding .c files to use the provided fonts.
+The null-terminated string of characters represented as 16-bit unsigned
+short integers specified by the fifth argument is drawn from left to right
+in the specified
+color. (See <A HREF="#gdImageStringUp16">gdImageStringUp16</A> for a way
+of drawing vertical text.) Pixels not
+set by a particular character retain their previous color.
+<p>
+This function was added in gd1.3 to provide a means of rendering
+fonts with more than 256 characters for those who have them. A
+more frequently used routine is <a href="#gdImageString">gdImageString</a>.
<DT><A NAME="gdImageStringUp">
void gdImageStringUp(gdImagePtr im, gdFontPtr font, int x, int y,
-char *s, int color)</A>
+unsigned char *s, int color)</A>
<STRONG>(FUNCTION)</STRONG>
<DD>
gdImageStringUp is used to draw multiple characters on the image,
@@ -1589,7 +1359,31 @@
/* Destroy it */
<A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
</PRE>
-</DL>
+<DT><A NAME="gdImageStringUp16">
+void gdImageStringUp16(gdImagePtr im, gdFontPtr font, int x, int y,
+unsigned short *s, int color)</A>
+<STRONG>(FUNCTION)</STRONG>
+<DD>
+gdImageString is used to draw multiple 16-bit characters vertically on
+the image. (To draw single characters, use <A HREF="#gdImageChar">
+gdImageChar</A>.) The second argument is a
+pointer to a font definition structure; five fonts are
+provided with gd, gdFontTiny, gdFontSmall, gdFontMediumBold,
+gdFontLarge, and gdFontGiant. You must
+include the files "gdfontt.h", "gdfonts.h", "gdfontmb.h",
+"gdfontl.h" and "gdfontg.h" respectively
+and (if you are not using a library-based approach) link with the
+corresponding .c files to use the provided fonts.
+The null-terminated string of characters represented as 16-bit unsigned
+short integers specified by the fifth argument is drawn from bottom to top
+in the specified color.
+(See <A HREF="#gdImageStringUp16">gdImageStringUp16</A> for a way
+of drawing horizontal text.) Pixels not
+set by a particular character retain their previous color.
+<p>
+This function was added in gd1.3 to provide a means of rendering
+fonts with more than 256 characters for those who have them. A
+more frequently used routine is <a href="#gdImageStringUp">gdImageStringUp</a>.</DL>
<H3><A NAME="colors">Color-handling functions</A></H3>
<DL>
<DT><A NAME="gdImageColorAllocate">
@@ -2114,17 +1908,10 @@
visible on the web, a URL is a wonderful thing to receive, but
if it's not a publicly visible project, a simple note is just
as welcome.
-<A NAME="languages"><H3>Using gd with TCL</H3></A>
-If you prefer TCL to C, you can use gd from your tcl program
-thanks to the <A HREF="http://guraldi.hgp.med.umich.edu/gdtcl.html">
-TCL gd extension</A> by Spencer W. Thomas, available at the link
-above or by anonymous FTP to guraldi.hgp.med.umich.edu
-in the directory pub/gdtcl.shar.
<A NAME="problems"><H3>If you have problems</H3></A>
If you have any difficulties with gd, feel free to contact
-the author, <A HREF="http://sunsite.unc.edu/boutell/index.html">
-Thomas Boutell</A>. Be sure to read this manual
-carefully first.
+the author, <A HREF="http://www.boutell.com/boutell/">Thomas Boutell</A>.
+Be sure to read this manual carefully first.
<H3><A NAME="index">Alphabetical quick index</A></H3>
<A HREF="#gdBrushed">gdBrushed</A> |
<A HREF="#gdDashSize">gdDashSize</A> |
@@ -2170,7 +1957,9 @@
<A HREF="#gdImageSetStyle">gdImageSetStyle</A> |
<A HREF="#gdImageSetTile">gdImageSetTile</A> |
<A HREF="#gdImageString">gdImageString</A> |
+<A HREF="#gdImageString16">gdImageString16</A> |
<A HREF="#gdImageStringUp">gdImageStringUp</A> |
+<A HREF="#gdImageStringUp">gdImageStringUp16</A> |
<A HREF="#gdMaxColors">gdMaxColors</A> |
<A HREF="#gdPoint">gdPoint</A> |
<A HREF="#gdStyled">gdStyled</A> |
@@ -2178,7 +1967,7 @@
<A HREF="#gdTiled">gdTiled</A> |
<A HREF="#gdTransparent">gdTransparent</A>
<P>
-<em><A HREF="http://sunsite.unc.edu/boutell/index.html">
-Thomas Boutell, boutell at netcom.com</A></em>
+<em><A HREF="http://www.boutell.com/">
+Boutell.Com, Inc.</A></em>
</BODY>
</HTML>
Modified: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.c
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.c (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gd.c Sat Jul 13 19:23:42 2002
@@ -1,4 +1,3 @@
-#include <malloc.h>
#include <stdio.h>
#include <math.h>
#include <string.h>
@@ -13,16 +12,18 @@
{
int i;
gdImagePtr im;
- im = (gdImage *) malloc(sizeof(gdImage));
- im->pixels = (unsigned char **) malloc(sizeof(unsigned char *) * sx);
+ im = (gdImage *) calloc(1,sizeof(gdImage));
+ /* NOW ROW-MAJOR IN GD 1.3 */
+ im->pixels = (unsigned char **) malloc(sizeof(unsigned char *) * sy);
im->polyInts = 0;
im->polyAllocated = 0;
im->brush = 0;
im->tile = 0;
im->style = 0;
- for (i=0; (i<sx); i++) {
+ for (i=0; (i<sy); i++) {
+ /* NOW ROW-MAJOR IN GD 1.3 */
im->pixels[i] = (unsigned char *) calloc(
- sy, sizeof(unsigned char));
+ sx, sizeof(unsigned char));
}
im->sx = sx;
im->sy = sy;
@@ -35,7 +36,7 @@
void gdImageDestroy(gdImagePtr im)
{
int i;
- for (i=0; (i<im->sx); i++) {
+ for (i=0; (i<im->sy); i++) {
free(im->pixels[i]);
}
free(im->pixels);
@@ -157,7 +158,8 @@
break;
default:
if (gdImageBoundsSafe(im, x, y)) {
- im->pixels[x][y] = color;
+ /* NOW ROW-MAJOR IN GD 1.3 */
+ im->pixels[y][x] = color;
}
break;
}
@@ -216,7 +218,8 @@
int gdImageGetPixel(gdImagePtr im, int x, int y)
{
if (gdImageBoundsSafe(im, x, y)) {
- return im->pixels[x][y];
+ /* NOW ROW-MAJOR IN GD 1.3 */
+ return im->pixels[y][x];
} else {
return 0;
}
@@ -310,19 +313,8 @@
}
}
-/* As above, plus dashing */
-
-#define dashedSet \
- { \
- dashStep++; \
- if (dashStep == gdDashSize) { \
- dashStep = 0; \
- on = !on; \
- } \
- if (on) { \
- gdImageSetPixel(im, x, y, color); \
- } \
- }
+static void dashedSet(gdImagePtr im, int x, int y, int color,
+ int *onP, int *dashStepP);
void gdImageDashedLine(gdImagePtr im, int x1, int y1, int x2, int y2, int color)
{
@@ -346,7 +338,7 @@
ydirflag = 1;
xend = x2;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
if (((y2 - y1) * ydirflag) > 0) {
while (x < xend) {
x++;
@@ -356,7 +348,7 @@
y++;
d+=incr2;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
}
} else {
while (x < xend) {
@@ -367,7 +359,7 @@
y--;
d+=incr2;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
}
}
} else {
@@ -385,7 +377,7 @@
yend = y2;
xdirflag = 1;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
if (((x2 - x1) * xdirflag) > 0) {
while (y < yend) {
y++;
@@ -395,7 +387,7 @@
x++;
d+=incr2;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
}
} else {
while (y < yend) {
@@ -406,19 +398,38 @@
x--;
d+=incr2;
}
- dashedSet;
+ dashedSet(im, x, y, color, &on, &dashStep);
}
}
}
}
+static void dashedSet(gdImagePtr im, int x, int y, int color,
+ int *onP, int *dashStepP)
+{
+ int dashStep = *dashStepP;
+ int on = *onP;
+ dashStep++;
+ if (dashStep == gdDashSize) {
+ dashStep = 0;
+ on = !on;
+ }
+ if (on) {
+ gdImageSetPixel(im, x, y, color);
+ }
+ *dashStepP = dashStep;
+ *onP = on;
+}
+
+
int gdImageBoundsSafe(gdImagePtr im, int x, int y)
{
return (!(((y < 0) || (y >= im->sy)) ||
((x < 0) || (x >= im->sx))));
}
-void gdImageChar(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color)
+void gdImageChar(gdImagePtr im, gdFontPtr f, int x, int y,
+ int c, int color)
{
int cx, cy;
int px, py;
@@ -441,7 +452,8 @@
}
}
-void gdImageCharUp(gdImagePtr im, gdFontPtr f, int x, int y, char c, int color)
+void gdImageCharUp(gdImagePtr im, gdFontPtr f,
+ int x, int y, int c, int color)
{
int cx, cy;
int px, py;
@@ -464,7 +476,8 @@
}
}
-void gdImageString(gdImagePtr im, gdFontPtr f, int x, int y, char *s, int color)
+void gdImageString(gdImagePtr im, gdFontPtr f,
+ int x, int y, char *s, int color)
{
int i;
int l;
@@ -475,7 +488,8 @@
}
}
-void gdImageStringUp(gdImagePtr im, gdFontPtr f, int x, int y, char *s, int color)
+void gdImageStringUp(gdImagePtr im, gdFontPtr f,
+ int x, int y, char *s, int color)
{
int i;
int l;
@@ -486,6 +500,42 @@
}
}
+static int strlen16(unsigned short *s);
+
+void gdImageString16(gdImagePtr im, gdFontPtr f,
+ int x, int y, unsigned short *s, int color)
+{
+ int i;
+ int l;
+ l = strlen16(s);
+ for (i=0; (i<l); i++) {
+ gdImageChar(im, f, x, y, s[i], color);
+ x += f->w;
+ }
+}
+
+void gdImageStringUp16(gdImagePtr im, gdFontPtr f,
+ int x, int y, unsigned short *s, int color)
+{
+ int i;
+ int l;
+ l = strlen16(s);
+ for (i=0; (i<l); i++) {
+ gdImageCharUp(im, f, x, y, s[i], color);
+ y -= f->w;
+ }
+}
+
+static int strlen16(unsigned short *s)
+{
+ int len = 0;
+ while (*s) {
+ s++;
+ len++;
+ }
+ return len;
+}
+
/* s and e are integers modulo 360 (degrees), with 0 degrees
being the rightmost extreme and degrees changing clockwise.
cx and cy are the center in pixels; w and h are the horizontal
@@ -696,19 +746,6 @@
}
}
-#ifdef TEST_CODE
-void gdImageDump(gdImagePtr im)
-{
- int i, j;
- for (i=0; (i < im->sy); i++) {
- for (j=0; (j < im->sx); j++) {
- printf("%d", im->pixels[j][i]);
- }
- printf("\n");
- }
-}
-#endif
-
/* Code drawn from ppmtogif.c, from the pbmplus package
**
** Based on GIFENCOD by David Rowley <mgardi at watdscu.waterloo.edu>. A
@@ -728,32 +765,25 @@
** The Graphics Interchange Format(c) is the Copyright property of
** CompuServe Incorporated. GIF(sm) is a Service Mark property of
** CompuServe Incorporated.
+*
+* Heavily modified by Mouse, 1998-02-12.
+* Remove LZW compression.
+* Added miGIF run length compression.
+*
*/
/*
* a code_int must be able to hold 2**GIFBITS values of type int, and also -1
*/
-typedef int code_int;
-
-#ifdef SIGNED_COMPARE_SLOW
-typedef unsigned long int count_int;
-typedef unsigned short int count_short;
-#else /*SIGNED_COMPARE_SLOW*/
-typedef long int count_int;
-#endif /*SIGNED_COMPARE_SLOW*/
+typedef int code_int;
static int colorstobpp(int colors);
static void BumpPixel (void);
static int GIFNextPixel (gdImagePtr im);
static void GIFEncode (FILE *fp, int GWidth, int GHeight, int GInterlace, int Background, int Transparent, int BitsPerPixel, int *Red, int *Green, int *Blue, gdImagePtr im);
static void Putword (int w, FILE *fp);
-static void compress (int init_bits, FILE *outfile, gdImagePtr im);
+static void compress (int, FILE *, gdImagePtr, int);
static void output (code_int code);
-static void cl_block (void);
-static void cl_hash (register count_int hsize);
-static void char_init (void);
-static void char_out (int c);
-static void flush_char (void);
/* Allows for reuse */
static void init_statics(void);
@@ -955,7 +985,7 @@
/*
* OR in the resolution
*/
- B |= (Resolution - 1) << 5;
+ B |= (Resolution - 1) << 4;
/*
* OR in the Bits per Pixel
@@ -1030,7 +1060,7 @@
/*
* Go and actually compress the data
*/
- compress( InitCodeSize+1, fp, im );
+ compress( InitCodeSize+1, fp, im, Background );
/*
* Write out a Zero-length packet (to end the series)
@@ -1053,341 +1083,404 @@
fputc( (w / 256) & 0xff, fp );
}
+#define GIFBITS 12
-/***************************************************************************
+/*-----------------------------------------------------------------------
*
- * GIFCOMPR.C - GIF Image compression routines
+ * miGIF Compression - mouse and ivo's GIF-compatible compression
*
- * Lempel-Ziv compression based on 'compress'. GIF modifications by
- * David Rowley (mgardi at watdcsu.waterloo.edu)
+ * -run length encoding compression routines-
*
- ***************************************************************************/
-
-/*
- * General DEFINEs
- */
-
-#define GIFBITS 12
-
-#define HSIZE 5003 /* 80% occupancy */
-
-#ifdef NO_UCHAR
- typedef char char_type;
-#else /*NO_UCHAR*/
- typedef unsigned char char_type;
-#endif /*NO_UCHAR*/
-
-/*
+ * Copyright (C) 1998 Hutchison Avenue Software Corporation
+ * http://www.hasc.com
+ * info at hasc.com
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation. This software is provided "AS IS." The Hutchison Avenue
+ * Software Corporation disclaims all warranties, either express or implied,
+ * including but not limited to implied warranties of merchantability and
+ * fitness for a particular purpose, with respect to this code and accompanying
+ * documentation.
+ *
+ * The miGIF compression routines do not, strictly speaking, generate files
+ * conforming to the GIF spec, since the image data is not LZW-compressed
+ * (this is the point: in order to avoid transgression of the Unisys patent
+ * on the LZW algorithm.) However, miGIF generates data streams that any
+ * reasonably sane LZW decompresser will decompress to what we want.
*
- * GIF Image compression - modified 'compress'
+ * miGIF compression uses run length encoding. It compresses horizontal runs
+ * of pixels of the same color. This type of compression gives good results
+ * on images with many runs, for example images with lines, text and solid
+ * shapes on a solid-colored background. It gives little or no compression
+ * on images with few runs, for example digital or scanned photos.
*
- * Based on: compress.c - File compression ala IEEE Computer, June 1984.
+ * der Mouse
+ * mouse at rodents.montreal.qc.ca
+ * 7D C8 61 52 5D E7 2D 39 4E F1 31 3E E8 B3 27 4B
*
- * By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
- * Jim McKie (decvax!mcvax!jim)
- * Steve Davies (decvax!vax135!petsd!peora!srd)
- * Ken Turkowski (decvax!decwrl!turtlevax!ken)
- * James A. Woods (decvax!ihnp4!ames!jaw)
- * Joe Orost (decvax!vax135!petsd!joe)
+ * ivo at hasc.com
+ *
+ * The Graphics Interchange Format(c) is the Copyright property of
+ * CompuServe Incorporated. GIF(sm) is a Service Mark property of
+ * CompuServe Incorporated.
*
*/
-#include <ctype.h>
-
-#define ARGVAL() (*++(*argv) || (--argc && *++argv))
-static int n_bits; /* number of bits/code */
-static int maxbits = GIFBITS; /* user settable max # bits/code */
-static code_int maxcode; /* maximum code, given n_bits */
-static code_int maxmaxcode = (code_int)1 << GIFBITS; /* should NEVER generate this code */
-#ifdef COMPATIBLE /* But wrong! */
-# define MAXCODE(n_bits) ((code_int) 1 << (n_bits) - 1)
-#else /*COMPATIBLE*/
-# define MAXCODE(n_bits) (((code_int) 1 << (n_bits)) - 1)
-#endif /*COMPATIBLE*/
-
-static count_int htab [HSIZE];
-static unsigned short codetab [HSIZE];
-#define HashTabOf(i) htab[i]
-#define CodeTabOf(i) codetab[i]
+static int rl_pixel;
+static int rl_basecode;
+static int rl_count;
+static int rl_table_pixel;
+static int rl_table_max;
+static int just_cleared;
+static int out_bits;
+static int out_bits_init;
+static int out_count;
+static int out_bump;
+static int out_bump_init;
+static int out_clear;
+static int out_clear_init;
+static int max_ocodes;
+static int code_clear;
+static int code_eof;
+static unsigned int obuf;
+static int obits;
+static FILE *ofile;
+static unsigned char oblock[256];
+static int oblen;
+
+/* Used only when debugging GIF compression code */
+/* #define DEBUGGING_ENVARS */
+
+#ifdef DEBUGGING_ENVARS
+
+static int verbose_set = 0;
+static int verbose;
+#define VERBOSE (verbose_set?verbose:set_verbose())
+
+static int set_verbose(void)
+{
+ verbose = !!getenv("GIF_VERBOSE");
+ verbose_set = 1;
+ return(verbose);
+}
-static code_int hsize = HSIZE; /* for dynamic table sizing */
+#else
-/*
- * To save much memory, we overlay the table used by compress() with those
- * used by decompress(). The tab_prefix table is the same size and type
- * as the codetab. The tab_suffix table needs 2**GIFBITS characters. We
- * get this from the beginning of htab. The output stack uses the rest
- * of htab, and contains characters. There is plenty of room for any
- * possible stack (stack used to be 8000 characters).
- */
+#define VERBOSE 0
-#define tab_prefixof(i) CodeTabOf(i)
-#define tab_suffixof(i) ((char_type*)(htab))[i]
-#define de_stack ((char_type*)&tab_suffixof((code_int)1<<GIFBITS))
-
-static code_int free_ent = 0; /* first unused entry */
+#endif
-/*
- * block compression parameters -- after all codes are used up,
- * and compression rate changes, start over.
- */
-static int clear_flg = 0;
-static int offset;
-static long int in_count = 1; /* length of input */
-static long int out_count = 0; /* # of codes output (for debugging) */
+static const char *binformat(unsigned int v, int nbits)
+{
+ static char bufs[8][64];
+ static int bhand = 0;
+ unsigned int bit;
+ int bno;
+ char *bp;
-/*
- * compress stdin to stdout
- *
- * Algorithm: use open addressing double hashing (no chaining) on the
- * prefix code / next character combination. We do a variant of Knuth's
- * algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
- * secondary probe. Here, the modular division first probe is gives way
- * to a faster exclusive-or manipulation. Also do block compression with
- * an adaptive reset, whereby the code table is cleared when the compression
- * ratio decreases, but after the table fills. The variable-length output
- * codes are re-sized at this point, and a special CLEAR code is generated
- * for the decompressor. Late addition: construct the table according to
- * file size for noticeable speed improvement on small files. Please direct
- * questions about this implementation to ames!jaw.
- */
+ bhand --;
+ if (bhand < 0) bhand = (sizeof(bufs)/sizeof(bufs[0]))-1;
+ bp = &bufs[bhand][0];
+ for (bno=nbits-1,bit=1U<<bno;bno>=0;bno--,bit>>=1)
+ { *bp++ = (v & bit) ? '1' : '0';
+ if (((bno&3) == 0) && (bno != 0)) *bp++ = '.';
+ }
+ *bp = '\0';
+ return(&bufs[bhand][0]);
+}
-static int g_init_bits;
-static FILE* g_outfile;
+static void write_block(void)
+{
+ int i;
-static int ClearCode;
-static int EOFCode;
+ if (VERBOSE)
+ { printf("write_block %d:",oblen);
+ for (i=0;i<oblen;i++) printf(" %02x",oblock[i]);
+ printf("\n");
+ }
+ fputc(oblen,ofile);
+ fwrite(&oblock[0],1,oblen,ofile);
+ oblen = 0;
+}
-static void
-compress(int init_bits, FILE *outfile, gdImagePtr im)
+static void block_out(unsigned char c)
{
- register long fcode;
- register code_int i /* = 0 */;
- register int c;
- register code_int ent;
- register code_int disp;
- register code_int hsize_reg;
- register int hshift;
-
- /*
- * Set up the globals: g_init_bits - initial number of bits
- * g_outfile - pointer to output file
- */
- g_init_bits = init_bits;
- g_outfile = outfile;
-
- /*
- * Set up the necessary values
- */
- offset = 0;
- out_count = 0;
- clear_flg = 0;
- in_count = 1;
- maxcode = MAXCODE(n_bits = g_init_bits);
-
- ClearCode = (1 << (init_bits - 1));
- EOFCode = ClearCode + 1;
- free_ent = ClearCode + 2;
-
- char_init();
-
- ent = GIFNextPixel( im );
-
- hshift = 0;
- for ( fcode = (long) hsize; fcode < 65536L; fcode *= 2L )
- ++hshift;
- hshift = 8 - hshift; /* set hash code range bound */
-
- hsize_reg = hsize;
- cl_hash( (count_int) hsize_reg); /* clear hash table */
-
- output( (code_int)ClearCode );
-
-#ifdef SIGNED_COMPARE_SLOW
- while ( (c = GIFNextPixel( im )) != (unsigned) EOF ) {
-#else /*SIGNED_COMPARE_SLOW*/
- while ( (c = GIFNextPixel( im )) != EOF ) { /* } */
-#endif /*SIGNED_COMPARE_SLOW*/
-
- ++in_count;
-
- fcode = (long) (((long) c << maxbits) + ent);
- i = (((code_int)c << hshift) ^ ent); /* xor hashing */
-
- if ( HashTabOf (i) == fcode ) {
- ent = CodeTabOf (i);
- continue;
- } else if ( (long)HashTabOf (i) < 0 ) /* empty slot */
- goto nomatch;
- disp = hsize_reg - i; /* secondary hash (after G. Knott) */
- if ( i == 0 )
- disp = 1;
-probe:
- if ( (i -= disp) < 0 )
- i += hsize_reg;
-
- if ( HashTabOf (i) == fcode ) {
- ent = CodeTabOf (i);
- continue;
- }
- if ( (long)HashTabOf (i) > 0 )
- goto probe;
-nomatch:
- output ( (code_int) ent );
- ++out_count;
- ent = c;
-#ifdef SIGNED_COMPARE_SLOW
- if ( (unsigned) free_ent < (unsigned) maxmaxcode) {
-#else /*SIGNED_COMPARE_SLOW*/
- if ( free_ent < maxmaxcode ) { /* } */
-#endif /*SIGNED_COMPARE_SLOW*/
- CodeTabOf (i) = free_ent++; /* code -> hashtable */
- HashTabOf (i) = fcode;
- } else
- cl_block();
- }
- /*
- * Put out the final code.
- */
- output( (code_int)ent );
- ++out_count;
- output( (code_int) EOFCode );
+ if (VERBOSE) printf("block_out %s\n",binformat(c,8));
+ oblock[oblen++] = c;
+ if (oblen >= 255) write_block();
}
-/*****************************************************************
- * TAG( output )
- *
- * Output the given code.
- * Inputs:
- * code: A n_bits-bit integer. If == -1, then EOF. This assumes
- * that n_bits =< (long)wordsize - 1.
- * Outputs:
- * Outputs code to the file.
- * Assumptions:
- * Chars are 8 bits long.
- * Algorithm:
- * Maintain a GIFBITS character long buffer (so that 8 codes will
- * fit in it exactly). Use the VAX insv instruction to insert each
- * code in turn. When the buffer fills up empty it and start over.
- */
-
-static unsigned long cur_accum = 0;
-static int cur_bits = 0;
-
-static unsigned long masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
- 0x001F, 0x003F, 0x007F, 0x00FF,
- 0x01FF, 0x03FF, 0x07FF, 0x0FFF,
- 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-static void
-output(code_int code)
+static void block_flush(void)
{
- cur_accum &= masks[ cur_bits ];
-
- if( cur_bits > 0 )
- cur_accum |= ((long)code << cur_bits);
- else
- cur_accum = code;
-
- cur_bits += n_bits;
+ if (VERBOSE) printf("block_flush\n");
+ if (oblen > 0) write_block();
+}
- while( cur_bits >= 8 ) {
- char_out( (unsigned int)(cur_accum & 0xff) );
- cur_accum >>= 8;
- cur_bits -= 8;
- }
+static void output(int val)
+{
+ if (VERBOSE) printf("output %s [%s %d %d]\n",binformat(val,out_bits),binformat(obuf,obits),obits,out_bits);
+ obuf |= val << obits;
+ obits += out_bits;
+ while (obits >= 8)
+ { block_out(obuf&0xff);
+ obuf >>= 8;
+ obits -= 8;
+ }
+ if (VERBOSE) printf("output leaving [%s %d]\n",binformat(obuf,obits),obits);
+}
- /*
- * If the next entry is going to be too big for the code size,
- * then increase it, if possible.
- */
- if ( free_ent > maxcode || clear_flg ) {
-
- if( clear_flg ) {
-
- maxcode = MAXCODE (n_bits = g_init_bits);
- clear_flg = 0;
-
- } else {
-
- ++n_bits;
- if ( n_bits == maxbits )
- maxcode = maxmaxcode;
- else
- maxcode = MAXCODE(n_bits);
- }
- }
+static void output_flush(void)
+{
+ if (VERBOSE) printf("output_flush\n");
+ if (obits > 0) block_out(obuf);
+ block_flush();
+}
- if( code == EOFCode ) {
- /*
- * At EOF, write the rest of the buffer.
- */
- while( cur_bits > 0 ) {
- char_out( (unsigned int)(cur_accum & 0xff) );
- cur_accum >>= 8;
- cur_bits -= 8;
- }
+static void did_clear(void)
+{
+ if (VERBOSE) printf("did_clear\n");
+ out_bits = out_bits_init;
+ out_bump = out_bump_init;
+ out_clear = out_clear_init;
+ out_count = 0;
+ rl_table_max = 0;
+ just_cleared = 1;
+}
- flush_char();
+static void output_plain(int c)
+{
+ if (VERBOSE) printf("output_plain %s\n",binformat(c,out_bits));
+ just_cleared = 0;
+ output(c);
+ out_count ++;
+ if (out_count >= out_bump)
+ { out_bits ++;
+ out_bump += 1 << (out_bits - 1);
+ }
+ if (out_count >= out_clear)
+ { output(code_clear);
+ did_clear();
+ }
+}
- fflush( g_outfile );
+static unsigned int isqrt(unsigned int x)
+{
+ unsigned int r;
+ unsigned int v;
- if( ferror( g_outfile ) )
- return;
- }
+ if (x < 2) return(x);
+ for (v=x,r=1;v;v>>=2,r<<=1) ;
+ while (1)
+ { v = ((x / r) + r) / 2;
+ if ((v == r) || (v == r+1)) return(r);
+ r = v;
+ }
}
-/*
- * Clear out the hash table
- */
-static void
-cl_block (void) /* table clear for block compress */
+static unsigned int compute_triangle_count(unsigned int count, unsigned int nrepcodes)
{
+ unsigned int perrep;
+ unsigned int cost;
- cl_hash ( (count_int) hsize );
- free_ent = ClearCode + 2;
- clear_flg = 1;
+ cost = 0;
+ perrep = (nrepcodes * (nrepcodes+1)) / 2;
+ while (count >= perrep)
+ { cost += nrepcodes;
+ count -= perrep;
+ }
+ if (count > 0)
+ { unsigned int n;
+ n = isqrt(count);
+ while ((n*(n+1)) >= 2*count) n --;
+ while ((n*(n+1)) < 2*count) n ++;
+ cost += n;
+ }
+ return(cost);
+}
- output( (code_int)ClearCode );
+static void max_out_clear(void)
+{
+ out_clear = max_ocodes;
}
-static void
-cl_hash(register count_int hsize) /* reset code table */
-
+static void reset_out_clear(void)
{
+ out_clear = out_clear_init;
+ if (out_count >= out_clear)
+ { output(code_clear);
+ did_clear();
+ }
+}
- register count_int *htab_p = htab+hsize;
+static void rl_flush_fromclear(int count)
+{
+ int n;
- register long i;
- register long m1 = -1;
+ if (VERBOSE) printf("rl_flush_fromclear %d\n",count);
+ max_out_clear();
+ rl_table_pixel = rl_pixel;
+ n = 1;
+ while (count > 0)
+ { if (n == 1)
+ { rl_table_max = 1;
+ output_plain(rl_pixel);
+ count --;
+ }
+ else if (count >= n)
+ { rl_table_max = n;
+ output_plain(rl_basecode+n-2);
+ count -= n;
+ }
+ else if (count == 1)
+ { rl_table_max ++;
+ output_plain(rl_pixel);
+ count = 0;
+ }
+ else
+ { rl_table_max ++;
+ output_plain(rl_basecode+count-2);
+ count = 0;
+ }
+ if (out_count == 0) n = 1; else n ++;
+ }
+ reset_out_clear();
+ if (VERBOSE) printf("rl_flush_fromclear leaving table_max=%d\n",rl_table_max);
+}
+
+static void rl_flush_clearorrep(int count)
+{
+ int withclr;
+
+ if (VERBOSE) printf("rl_flush_clearorrep %d\n",count);
+ withclr = 1 + compute_triangle_count(count,max_ocodes);
+ if (withclr < count)
+ { output(code_clear);
+ did_clear();
+ rl_flush_fromclear(count);
+ }
+ else
+ { for (;count>0;count--) output_plain(rl_pixel);
+ }
+}
+
+static void rl_flush_withtable(int count)
+{
+ int repmax;
+ int repleft;
+ int leftover;
+
+ if (VERBOSE) printf("rl_flush_withtable %d\n",count);
+ repmax = count / rl_table_max;
+ leftover = count % rl_table_max;
+ repleft = (leftover ? 1 : 0);
+ if (out_count+repmax+repleft > max_ocodes)
+ { repmax = max_ocodes - out_count;
+ leftover = count - (repmax * rl_table_max);
+ repleft = 1 + compute_triangle_count(leftover,max_ocodes);
+ }
+ if (VERBOSE) printf("rl_flush_withtable repmax=%d leftover=%d repleft=%d\n",repmax,leftover,repleft);
+ if (1+compute_triangle_count(count,max_ocodes) < repmax+repleft)
+ { output(code_clear);
+ did_clear();
+ rl_flush_fromclear(count);
+ return;
+ }
+ max_out_clear();
+ for (;repmax>0;repmax--) output_plain(rl_basecode+rl_table_max-2);
+ if (leftover)
+ { if (just_cleared)
+ { rl_flush_fromclear(leftover);
+ }
+ else if (leftover == 1)
+ { output_plain(rl_pixel);
+ }
+ else
+ { output_plain(rl_basecode+leftover-2);
+ }
+ }
+ reset_out_clear();
+}
+
+static void rl_flush(void)
+{
+
+ if (VERBOSE) printf("rl_flush [ %d %d\n",rl_count,rl_pixel);
+ if (rl_count == 1)
+ { output_plain(rl_pixel);
+ rl_count = 0;
+ if (VERBOSE) printf("rl_flush ]\n");
+ return;
+ }
+ if (just_cleared)
+ { rl_flush_fromclear(rl_count);
+ }
+ else if ((rl_table_max < 2) || (rl_table_pixel != rl_pixel))
+ { rl_flush_clearorrep(rl_count);
+ }
+ else
+ { rl_flush_withtable(rl_count);
+ }
+ if (VERBOSE) printf("rl_flush ]\n");
+ rl_count = 0;
+}
+
+static void compress(int init_bits, FILE *outfile, gdImagePtr im, int background)
+{
+ int c;
+
+ ofile = outfile;
+ obuf = 0;
+ obits = 0;
+ oblen = 0;
+ code_clear = 1 << (init_bits - 1);
+ code_eof = code_clear + 1;
+ rl_basecode = code_eof + 1;
+ out_bump_init = (1 << (init_bits - 1)) - 1;
+ /* for images with a lot of runs, making out_clear_init larger will
+ give better compression. */
+ out_clear_init = (init_bits <= 3) ? 9 : (out_bump_init-1);
+#ifdef DEBUGGING_ENVARS
+ { const char *ocienv;
+ ocienv = getenv("GIF_OUT_CLEAR_INIT");
+ if (ocienv)
+ { out_clear_init = atoi(ocienv);
+ if (VERBOSE) printf("[overriding out_clear_init to %d]\n",out_clear_init);
+ }
+ }
+#endif
+ out_bits_init = init_bits;
+ max_ocodes = (1 << GIFBITS) - ((1 << (out_bits_init - 1)) + 3);
+ did_clear();
+ output(code_clear);
+ rl_count = 0;
+ while (1)
+ { c = GIFNextPixel(im);
+ if ((rl_count > 0) && (c != rl_pixel)) rl_flush();
+ if (c == EOF) break;
+ if (rl_pixel == c)
+ { rl_count ++;
+ }
+ else
+ { rl_pixel = c;
+ rl_count = 1;
+ }
+ }
+ output(code_eof);
+ output_flush();
+}
- i = hsize - 16;
- do { /* might use Sys V memset(3) here */
- *(htab_p-16) = m1;
- *(htab_p-15) = m1;
- *(htab_p-14) = m1;
- *(htab_p-13) = m1;
- *(htab_p-12) = m1;
- *(htab_p-11) = m1;
- *(htab_p-10) = m1;
- *(htab_p-9) = m1;
- *(htab_p-8) = m1;
- *(htab_p-7) = m1;
- *(htab_p-6) = m1;
- *(htab_p-5) = m1;
- *(htab_p-4) = m1;
- *(htab_p-3) = m1;
- *(htab_p-2) = m1;
- *(htab_p-1) = m1;
- htab_p -= 16;
- } while ((i -= 16) >= 0);
+/*-----------------------------------------------------------------------
+ *
+ * End of miGIF section - See copyright notice at start of section.
+ *
+ *-----------------------------------------------------------------------
- for ( i += 16; i > 0; --i )
- *--htab_p = m1;
-}
-/******************************************************************************
+ ******************************************************************************
*
* GIF Specific routines
*
@@ -1399,43 +1492,8 @@
static int a_count;
/*
- * Set up the 'byte output' routine
- */
-static void
-char_init(void)
-{
- a_count = 0;
-}
-
-/*
* Define the storage for the packet accumulator
*/
-static char accum[ 256 ];
-
-/*
- * Add a character to the end of the current packet, and if it is 254
- * characters, flush the packet to disk.
- */
-static void
-char_out(int c)
-{
- accum[ a_count++ ] = c;
- if( a_count >= 254 )
- flush_char();
-}
-
-/*
- * Flush the packet to disk, and reset the accumulator
- */
-static void
-flush_char(void)
-{
- if( a_count > 0 ) {
- fputc( a_count, g_outfile );
- fwrite( accum, 1, a_count, g_outfile );
- a_count = 0;
- }
-}
static void init_statics(void) {
/* Some of these are properly initialized later. What I'm doing
@@ -1450,22 +1508,6 @@
Pass = 0;
Interlace = 0;
a_count = 0;
- cur_accum = 0;
- cur_bits = 0;
- g_init_bits = 0;
- g_outfile = 0;
- ClearCode = 0;
- EOFCode = 0;
- free_ent = 0;
- clear_flg = 0;
- offset = 0;
- in_count = 1;
- out_count = 0;
- hsize = HSIZE;
- n_bits = 0;
- maxbits = GIFBITS;
- maxcode = 0;
- maxmaxcode = (code_int)1 << GIFBITS;
}
@@ -1695,7 +1737,7 @@
}
static int
-GetDataBlock(FILE *fd, unsigned char *buf)
+GetDataBlock_(FILE *fd, unsigned char *buf)
{
unsigned char count;
@@ -1713,7 +1755,25 @@
}
static int
-GetCode(FILE *fd, int code_size, int flag)
+GetDataBlock(FILE *fd, unsigned char *buf)
+{
+ int rv;
+ int i;
+
+ rv = GetDataBlock_(fd,buf);
+ if (VERBOSE)
+ { printf("[GetDataBlock returning %d",rv);
+ if (rv > 0)
+ { printf(":");
+ for (i=0;i<rv;i++) printf(" %02x",buf[i]);
+ }
+ printf("]\n");
+ }
+ return(rv);
+}
+
+static int
+GetCode_(FILE *fd, int code_size, int flag)
{
static unsigned char buf[280];
static int curbit, lastbit, done, last_byte;
@@ -1750,12 +1810,21 @@
ret |= ((buf[ i / 8 ] & (1 << (i % 8))) != 0) << j;
curbit += code_size;
-
return ret;
}
static int
-LWZReadByte(FILE *fd, int flag, int input_code_size)
+GetCode(FILE *fd, int code_size, int flag)
+{
+ int rv;
+
+ rv = GetCode_(fd,code_size,flag);
+ if (VERBOSE) printf("[GetCode(,%d,%d) returning %d]\n",code_size,flag,rv);
+ return(rv);
+}
+
+static int
+LWZReadByte_(FILE *fd, int flag, int input_code_size)
{
static int fresh = FALSE;
int code, incode;
@@ -1866,6 +1935,16 @@
return code;
}
+static int
+LWZReadByte(FILE *fd, int flag, int input_code_size)
+{
+ int rv;
+
+ rv = LWZReadByte_(fd,flag,input_code_size);
+ if (VERBOSE) printf("[LWZReadByte(,%d,%d) returning %d]\n",flag,input_code_size,rv);
+ return(rv);
+}
+
static void
ReadImage(gdImagePtr im, FILE *fd, int len, int height, unsigned char (*cmap)[256], int interlace, int ignore)
{
@@ -2182,7 +2261,8 @@
gdImageDestroy(im);
return 0;
}
- im->pixels[x][y] = ch;
+ /* ROW-MAJOR IN GD 1.3 */
+ im->pixels[y][x] = ch;
}
}
return im;
@@ -2212,7 +2292,8 @@
}
for (y=0; (y < im->sy); y++) {
for (x=0; (x < im->sx); x++) {
- putc((unsigned char)im->pixels[x][y], out);
+ /* ROW-MAJOR IN GD 1.3 */
+ putc((unsigned char)im->pixels[y][x], out);
}
}
}
@@ -2375,7 +2456,8 @@
y2 = p[i].y;
}
}
- for (y=y1; (y <= y2); y++) {
+ /* Fix in 1.3: count a vertex only once */
+ for (y=y1; (y < y2); y++) {
int interLast = 0;
int dirLast = 0;
int interFirst = 1;
@@ -2533,4 +2615,3 @@
{
im->interlace = interlaceArg;
}
-
Added: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/readme.txt
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/readme.txt (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/readme.txt Sat Jul 13 19:23:43 2002
@@ -0,0 +1,1837 @@
+SEE INDEX.HTML FOR AN EASILY BROWSED HYPERTEXT VERSION OF THIS MANUAL.
+
+* * *
+
+ gd 1.3
+
+A graphics library for fast GIF creation
+
+Follow this link to the latest version of this document.
+
+ Table of Contents
+
+ * Credits and license terms
+ * What's new in version 1.3?
+ * What is gd?
+ * What if I want to use another programming language?
+ * What else do I need to use gd?
+ * How do I get gd?
+ * How do I build gd?
+ * gd basics: using gd in your program
+ * webgif: a useful example
+ * Function and type reference by category
+ * About the additional .gd image file format
+ * Please tell us you're using gd!
+ * If you have problems
+ * Alphabetical quick index
+
+ Up to the Boutell.Com, Inc. Home Page
+
+ Credits and license terms
+
+ In order to resolve any possible confusion regarding the authorship of
+ gd, the following copyright statement covers all of the authors who
+ have required such a statement. Although his LZW compression code no
+ longer appears in gd, the authors wish to thank David Rowley for the
+ original LZW-based GIF compression code, which has been removed due to
+ patent concerns. If you are aware of any oversights in this copyright
+ notice, please contact Thomas Boutell who will be pleased to correct
+ them.
+
+COPYRIGHT STATEMENT FOLLOWS THIS LINE
+
+ Portions copyright 1994, 1995, 1996, 1997, 1998, by Cold Spring
+ Harbor Laboratory. Funded under Grant P41-RR02188 by the National
+ Institutes of Health.
+
+ Portions copyright 1996, 1997, 1998, by Boutell.Com, Inc.
+
+ GIF decompression code copyright 1990, 1991, 1993, by David Koblas
+ (koblas at netcom.com).
+
+ Non-LZW-based GIF compression code copyright 1998, by Hutchison
+ Avenue Software Corporation (http://www.hasc.com/, info at hasc.com).
+
+ Permission has been granted to copy and distribute gd in any
+ context, including a commercial application, provided that this
+ notice is present in user-accessible supporting documentation.
+
+ This does not affect your ownership of the derived work itself, and
+ the intent is to assure proper credit for the authors of gd, not to
+ interfere with your productive use of gd. If you have questions,
+ ask. "Derived works" includes all programs that utilize the
+ library. Credit must be given in user-accessible documentation.
+
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. This software is
+ provided "as is" without express or implied warranty.
+
+END OF COPYRIGHT STATEMENT
+
+ What is gd?
+
+ gd is a graphics library. It allows your code to quickly draw images
+ complete with lines, arcs, text, multiple colors, cut and paste from
+ other images, and flood fills, and write out the result as a .GIF
+ file. This is particularly useful in World Wide Web applications,
+ where .GIF is the format used for inline images.
+
+ gd is not a paint program. If you are looking for a paint program, you
+ are looking in the wrong place. If you are not a programmer, you are
+ looking in the wrong place.
+
+ gd does not provide for every possible desirable graphics operation.
+ It is not necessary or desirable for gd to become a kitchen-sink
+ graphics package, but version 1.3 incorporates most of the commonly
+ requested features for an 8-bit 2D package. Support for scalable
+ fonts, and truecolor images, JPEG and PNG is planned for version 2.0.
+ Version 1.3 was released to correct longstanding bugs and provide an
+ LZW-free GIF compression routine.
+
+ What if I want to use another programming language?
+
+ Perl
+
+ gd can also be used from Perl, courtesy of Lincoln Stein's GD.pm
+ library, which uses gd as the basis for a set of Perl 5.x classes.
+ GD.pm is based on gd 1.1.1 but gd 1.2 should be compatible.
+
+ Any Language
+
+ There are, at the moment, at least three simple interpreters that
+ perform gd operations. You can output the desired commands to a simple
+ text file from whatever scripting language you prefer to use, then
+ invoke the interpreter.
+
+ These packages are based on gd 1.2 as of this writing but should be
+ compatible with gd 1.3 with minimal tweaking.
+ * tgd, by Bradley K. Sherman
+ * fly, by Martin Gleeson
+
+ What's new in version 1.3?
+
+ Version 1.3 features the following changes:
+
+ Non-LZW-based GIF compression code
+ Version 1.3 contains GIF compression code that uses simple Run
+ Length Encoding instead of LZW compression, while still
+ retaining compatibility with normal LZW-based GIF decoders
+ (your browser will still like your GIFs). LZW compression is
+ patented by Unisys. This is why there have been no new versions
+ of gd for a long time. THANKS to Hutchison Avenue Software
+ Corporation for contributing this code. THE NEW CODE PRODUCES
+ LARGER GIFS AND IS NOT WELL SUITED TO PHOTOGRAPHIC IMAGES. THIS
+ IS A LEGAL ISSUE. IT IS NOT A QUESTION OF TECHNICAL SKILL.
+ PLEASE DON'T COMPLAIN ABOUT THE SIZE OF GIF OUTPUT. THANKS!
+
+ 8-bit fonts, and 8-bit font support
+ This improves support for European languages. Thanks are due to
+ Honza Pazdziora and also to Jan Pazdziora . Also see the
+ provided bdftogd Perl script if you wish to convert fixed-width
+ X11 fonts to gd fonts.
+
+ 16-bit font support (no fonts provided)
+ Although no such fonts are provided in the distribution, fonts
+ containing more than 256 characters should work if the
+ gdImageString16 and gdImageStringUp16 routines are used.
+
+ Improvements to the "webgif" example/utility
+ The "webgif" utility is now a slightly more useful application.
+ Thanks to Brian Dowling for this code.
+
+ Corrections to the color resolution field of GIF output
+ Thanks to Bruno Aureli.
+
+ Fixed polygon fills
+ A one-line patch for the infamous polygon fill bug, courtesy of
+ Jim Mason. I believe this fix is sufficient. However, if you
+ find a situation where polygon fills still fail to behave
+ properly, please send code that demonstrates the problem, and a
+ fix if you have one. Verifying the fix is important.
+
+ Row-major, not column-major
+ Internally, gd now represents the array of pixels as an array
+ of rows of pixels, rather than an array of columns of pixels.
+ This improves the performance of compression and decompression
+ routines slightly, because horizontally adjacent pixels are now
+ next to each other in memory. This should not affect properly
+ written gd applications, but applications that directly
+ manipulate the pixels array will require changes.
+
+ What else do I need to use gd?
+
+ To use gd, you will need an ANSI C compiler. All popular Windows 95
+ and NT C compilers are ANSI C compliant. Any full-ANSI-standard C
+ compiler should be adequate. The cc compiler released with SunOS 4.1.3
+ is not an ANSI C compiler. Most Unix users who do not already have gcc
+ should get it. gcc is free, ANSI compliant and a de facto industry
+ standard. Ask your ISP why it is missing.
+
+ You will also want a GIF viewer, if you do not already have one for
+ your system, since you will need a good way to check the results of
+ your work. Any web browser will work, but you might be happier with a
+ package like Lview Pro for Windows or xv for X. There are GIF viewers
+ available for every graphics-capable computer out there, so consult
+ newsgroups relevant to your particular system.
+
+ How do I get gd?
+
+ By HTTP
+
+ * Gzipped Tar File (Unix)
+ * .ZIP File (Windows)
+
+ By FTP
+
+ * Gzipped Tar File (Unix)
+ * .ZIP File (Windows)
+
+ How do I build gd?
+
+ In order to build gd, you must first unpack the archive you have
+ downloaded. If you are not familiar with tar and gunzip (Unix) or ZIP
+ (Windows), please consult with an experienced user of your system.
+ Sorry, we cannot answer questions about basic Internet skills.
+
+ Unpacking the archive will produce a directory called "gd1.3".
+
+ For Unix
+
+ cd to the gd1.3 directory and examine the Makefile, which you will
+ probably need to change slightly depending on your operating system
+ and your needs.
+
+ For Windows, Mac, Et Cetera
+
+ Create a project using your favorite programming environment. Copy all
+ of the gd files to the project directory. Add gd.c to your project.
+ Add other source files as appropriate. Learning the basic skills of
+ creating projects with your chosen C environment is up to you.
+
+ Now, to build the demonstration program, just type "make gddemo" if
+ you are working in a command-line environment, or build a project that
+ includes gddemo.c if you are using a graphical environment. If all
+ goes well, the program "gddemo" will be compiled and linked without
+ incident. Depending on your system you may need to edit the Makefile.
+ Understanding the basic techniques of compiling and linking programs
+ on your system is up to you.
+
+ You have now built a demonstration program which shows off the
+ capabilities of gd. To see it in action, type "gddemo".
+
+ gddemo should execute without incident, creating the file demoout.gif.
+ (Note there is also a file named demoin.gif, which is provided in the
+ package as part of the demonstration.)
+
+ Display demoout.gif in your GIF viewer. The image should be 128x128
+ pixels and should contain an image of the space shuttle with quite a
+ lot of graphical elements drawn on top of it.
+
+ (If you are missing the demoin.gif file, the other items should appear
+ anyway.)
+
+ Look at demoin.gif to see the original space shuttle image which was
+ scaled and copied into the output image.
+
+ gd basics: using gd in your program
+
+ gd lets you create GIF images on the fly. To use gd in your program,
+ include the file gd.h, and link with the libgd.a library produced by
+ "make libgd.a", under Unix. Under other operating systems you will add
+ gd.c to your own project.
+
+ If you want to use the provided fonts, include gdfontt.h, gdfonts.h,
+ gdfontmb.h, gdfontl.h and/or gdfontg.h. If you are not using the
+ provided Makefile and/or a library-based approach, be sure to include
+ the source modules as well in your project. (They may be too large for
+ 16-bit memory models, that is, 16-bit DOS and Windows.)
+
+ Here is a short example program. (For a more advanced example, see
+ gddemo.c, included in the distribution. gddemo.c is NOT the same
+ program; it demonstrates additional features!)
+
+/* Bring in gd library functions */
+#include "gd.h"
+
+/* Bring in standard I/O so we can output the GIF to a file */
+#include <stdio.h>
+
+int main() {
+ /* Declare the image */
+ gdImagePtr im;
+ /* Declare an output file */
+ FILE *out;
+ /* Declare color indexes */
+ int black;
+ int white;
+
+ /* Allocate the image: 64 pixels across by 64 pixels tall */
+ im = gdImageCreate(64, 64);
+
+ /* Allocate the color black (red, green and blue all minimum).
+ Since this is the first color in a new image, it will
+ be the background color. */
+ black = gdImageColorAllocate(im, 0, 0, 0);
+
+ /* Allocate the color white (red, green and blue all maximum). */
+ white = gdImageColorAllocate(im, 255, 255, 255);
+
+ /* Draw a line from the upper left to the lower right,
+ using white color index. */
+ gdImageLine(im, 0, 0, 63, 63, white);
+
+ /* Open a file for writing. "wb" means "write binary", important
+ under MSDOS, harmless under Unix. */
+ out = fopen("test.gif", "wb");
+
+ /* Output the image to the disk file. */
+ gdImageGif(im, out);
+
+ /* Close the file. */
+ fclose(out);
+
+ /* Destroy the image in memory. */
+ gdImageDestroy(im);
+}
+
+ When executed, this program creates an image, allocates two colors
+ (the first color allocated becomes the background color), draws a
+ diagonal line (note that 0, 0 is the upper left corner), writes the
+ image to a GIF file, and destroys the image.
+
+ The above example program should give you an idea of how the package
+ works. gd provides many additional functions, which are listed in the
+ following reference chapters, complete with code snippets
+ demonstrating each. There is also an alphabetical index.
+
+ Webgif: a more powerful gd example
+
+ Webgif is a simple utility program to manipulate GIFs from the command
+ line. It is written for Unix and similar command-line systems, but
+ should be easily adapted for other environments. Webgif allows you to
+ set transparency and interlacing and output interesting information
+ about the GIF in question.
+
+ webgif.c is provided in the distribution. Unix users can simply type
+ "make webgif" to compile the program. Type "webgif" with no arguments
+ to see the available options.
+
+Function and type reference
+
+ * Types
+ * Image creation, destruction, loading and saving
+ * Drawing, styling, brushing, tiling and filling functions
+ * Query functions (not color-related)
+ * Font and text-handling functions
+ * Color handling functions
+ * Copying and resizing functions
+ * Miscellaneous Functions
+ * Constants
+
+ Types
+
+ gdImage(TYPE)
+ The data structure in which gd stores images. gdImageCreate
+ returns a pointer to this type, and the other functions expect
+ to receive a pointer to this type as their first argument. You
+ may read the members sx (size on X axis), sy (size on Y axis),
+ colorsTotal (total colors), red (red component of colors; an
+ array of 256 integers between 0 and 255), green (green
+ component of colors, as above), blue (blue component of colors,
+ as above), and transparent (index of transparent color, -1 if
+ none); please do so using the macros provided. Do NOT set the
+ members directly from your code; use the functions provided.
+
+
+typedef struct {
+ unsigned char ** pixels;
+ int sx;
+ int sy;
+ int colorsTotal;
+ int red[gdMaxColors];
+ int green[gdMaxColors];
+ int blue[gdMaxColors];
+ int open[gdMaxColors];
+ int transparent;
+} gdImage;
+
+ gdImagePtr (TYPE)
+ A pointer to an image structure. gdImageCreate returns this
+ type, and the other functions expect it as the first argument.
+
+ gdFont (TYPE)
+ A font structure. Used to declare the characteristics of a
+ font. Plese see the files gdfontl.c and gdfontl.h for an
+ example of the proper declaration of this structure. You can
+ provide your own font data by providing such a structure and
+ the associated pixel array. You can determine the width and
+ height of a single character in a font by examining the w and h
+ members of the structure. If you will not be creating your own
+ fonts, you will not need to concern yourself with the rest of
+ the components of this structure.
+
+
+typedef struct {
+ /* # of characters in font */
+ int nchars;
+ /* First character is numbered... (usually 32 = space) */
+ int offset;
+ /* Character width and height */
+ int w;
+ int h;
+ /* Font data; array of characters, one row after another.
+ Easily included in code, also easily loaded from
+ data files. */
+ char *data;
+} gdFont;
+
+ gdFontPtr (TYPE)
+ A pointer to a font structure. Text-output functions expect
+ these as their second argument, following the gdImagePtr
+ argument. Two such pointers are declared in the provided
+ include files gdfonts.h and gdfontl.h.
+
+ gdPoint (TYPE)
+ Represents a point in the coordinate space of the image; used
+ by gdImagePolygon and gdImageFilledPolygon.
+
+
+typedef struct {
+ int x, y;
+} gdPoint, *gdPointPtr;
+
+ gdPointPtr (TYPE)
+ A pointer to a gdPoint structure; passed as an argument to
+ gdImagePolygon and gdImageFilledPolygon.
+
+ Image creation, destruction, loading and saving
+
+ gdImageCreate(sx, sy) (FUNCTION)
+ gdImageCreate is called to create images. Invoke gdImageCreate
+ with the x and y dimensions of the desired image. gdImageCreate
+ returns a gdImagePtr to the new image, or NULL if unable to
+ allocate the image. The image must eventually be destroyed
+ using gdImageDestroy().
+
+
+... inside a function ...
+gdImagePtr im;
+im = gdImageCreate(64, 64);
+/* ... Use the image ... */
+gdImageDestroy(im);
+
+ gdImageCreateFromGif(FILE *in) (FUNCTION)
+ gdImageCreateFromGif is called to load images from GIF format
+ files. Invoke gdImageCreateFromGif with an already opened
+ pointer to a file containing the desired image.
+ gdImageCreateFromGif returns a gdImagePtr to the new image, or
+ NULL if unable to load the image (most often because the file
+ is corrupt or does not contain a GIF image).
+ gdImageCreateFromGif does not close the file. You can inspect
+ the sx and sy members of the image to determine its size. The
+ image must eventually be destroyed using gdImageDestroy().
+
+
+gdImagePtr im;
+... inside a function ...
+FILE *in;
+in = fopen("mygif.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+/* ... Use the image ... */
+gdImageDestroy(im);
+
+ gdImageCreateFromGd(FILE *in) (FUNCTION)
+ gdImageCreateFromGd is called to load images from gd format
+ files. Invoke gdImageCreateFromGd with an already opened
+ pointer to a file containing the desired image in the gd file
+ format, which is specific to gd and intended for very fast
+ loading. (It is not intended for compression; for compression,
+ use GIF.) gdImageCreateFromGd returns a gdImagePtr to the new
+ image, or NULL if unable to load the image (most often because
+ the file is corrupt or does not contain a gd format image).
+ gdImageCreateFromGd does not close the file. You can inspect
+ the sx and sy members of the image to determine its size. The
+ image must eventually be destroyed using gdImageDestroy().
+
+
+... inside a function ...
+gdImagePtr im;
+FILE *in;
+in = fopen("mygd.gd", "rb");
+im = gdImageCreateFromGd(in);
+fclose(in);
+/* ... Use the image ... */
+gdImageDestroy(im);
+
+ gdImageCreateFromXbm(FILE *in) (FUNCTION)
+ gdImageCreateFromXbm is called to load images from X bitmap
+ format files. Invoke gdImageCreateFromXbm with an already
+ opened pointer to a file containing the desired image.
+ gdImageCreateFromXbm returns a gdImagePtr to the new image, or
+ NULL if unable to load the image (most often because the file
+ is corrupt or does not contain an X bitmap format image).
+ gdImageCreateFromXbm does not close the file. You can inspect
+ the sx and sy members of the image to determine its size. The
+ image must eventually be destroyed using gdImageDestroy().
+
+
+... inside a function ...
+gdImagePtr im;
+FILE *in;
+in = fopen("myxbm.xbm", "rb");
+im = gdImageCreateFromXbm(in);
+fclose(in);
+/* ... Use the image ... */
+gdImageDestroy(im);
+
+ gdImageDestroy(gdImagePtr im) (FUNCTION)
+ gdImageDestroy is used to free the memory associated with an
+ image. It is important to invoke gdImageDestroy before exiting
+ your program or assigning a new image to a gdImagePtr variable.
+
+
+... inside a function ...
+gdImagePtr im;
+im = gdImageCreate(10, 10);
+/* ... Use the image ... */
+/* Now destroy it */
+gdImageDestroy(im);
+
+ void gdImageGif(gdImagePtr im, FILE *out) (FUNCTION)
+ gdImageGif outputs the specified image to the specified file in
+ GIF format. The file must be open for writing. Under MSDOS, it
+ is important to use "wb" as opposed to simply "w" as the mode
+ when opening the file, and under Unix there is no penalty for
+ doing so. gdImageGif does not close the file; your code must do
+ so.
+
+
+... inside a function ...
+gdImagePtr im;
+int black, white;
+FILE *out;
+/* Create the image */
+im = gdImageCreate(100, 100);
+/* Allocate background */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Allocate drawing color */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Draw rectangle */
+gdImageRectangle(im, 0, 0, 99, 99, black);
+/* Open output file in binary mode */
+out = fopen("rect.gif", "wb");
+/* Write GIF */
+gdImageGif(im, out);
+/* Close file */
+fclose(out);
+/* Destroy image */
+gdImageDestroy(im);
+
+ void gdImageGd(gdImagePtr im, FILE *out) (FUNCTION)
+ gdImageGd outputs the specified image to the specified file in
+ the gd image format. The file must be open for writing. Under
+ MSDOS, it is important to use "wb" as opposed to simply "w" as
+ the mode when opening the file, and under Unix there is no
+ penalty for doing so. gdImageGif does not close the file; your
+ code must do so.
+
+ The gd image format is intended for fast reads and writes of
+ images your program will need frequently to build other images.
+ It is not a compressed format, and is not intended for general
+ use.
+
+
+... inside a function ...
+gdImagePtr im;
+int black, white;
+FILE *out;
+/* Create the image */
+im = gdImageCreate(100, 100);
+/* Allocate background */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Allocate drawing color */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Draw rectangle */
+gdImageRectangle(im, 0, 0, 99, 99, black);
+/* Open output file in binary mode */
+out = fopen("rect.gd", "wb");
+/* Write gd format file */
+gdImageGd(im, out);
+/* Close file */
+fclose(out);
+/* Destroy image */
+gdImageDestroy(im);
+
+ Drawing Functions
+
+ void gdImageSetPixel(gdImagePtr im, int x, int y, int color)
+ (FUNCTION)
+ gdImageSetPixel sets a pixel to a particular color index.
+ Always use this function or one of the other drawing functions
+ to access pixels; do not access the pixels of the gdImage
+ structure directly.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Set a pixel near the center. */
+gdImageSetPixel(im, 50, 50, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageLine(gdImagePtr im, int x1, int y1, int x2, int y2, int
+ color) (FUNCTION)
+ gdImageLine is used to draw a line between two endpoints (x1,y1
+ and x2, y2). The line is drawn using the color index specified.
+ Note that the color index can be an actual color returned by
+ gdImageColorAllocate or one of gdStyled, gdBrushed or
+ gdStyledBrushed.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a line from the upper left corner to the lower right corner. */
+gdImageLine(im, 0, 0, 99, 99, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageDashedLine(gdImagePtr im, int x1, int y1, int x2, int y2,
+ int color) (FUNCTION)
+ gdImageDashedLine is provided solely for backwards
+ compatibility with gd 1.0. New programs should draw dashed
+ lines using the normal gdImageLine function and the new
+ gdImageSetStyle function.
+
+ gdImageDashedLine is used to draw a dashed line between two
+ endpoints (x1,y1 and x2, y2). The line is drawn using the color
+ index specified. The portions of the line that are not drawn
+ are left transparent so the background is visible.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a dashed line from the upper left corner to the lower right corner. */
+gdImageDashedLine(im, 0, 0, 99, 99);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImagePolygon(gdImagePtr im, gdPointPtr points, int pointsTotal,
+ int color) (FUNCTION)
+ gdImagePolygon is used to draw a polygon with the verticies (at
+ least 3) specified, using the color index specified. See also
+ gdImageFilledPolygon.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+/* Points of polygon */
+gdPoint points[3];
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a triangle. */
+points[0].x = 50;
+points[0].y = 0;
+points[1].x = 99;
+points[1].y = 99;
+points[2].x = 0;
+points[2].y = 99;
+gdImagePolygon(im, points, 3, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageRectangle(gdImagePtr im, int x1, int y1, int x2, int y2,
+ int color) (FUNCTION)
+ gdImageRectangle is used to draw a rectangle with the two
+ corners (upper left first, then lower right) specified, using
+ the color index specified.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a rectangle occupying the central area. */
+gdImageRectangle(im, 25, 25, 74, 74, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageFilledPolygon(gdImagePtr im, gdPointPtr points, int
+ pointsTotal, int color) (FUNCTION)
+ gdImageFilledPolygon is used to fill a polygon with the
+ verticies (at least 3) specified, using the color index
+ specified. See also gdImagePolygon.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+int red;
+/* Points of polygon */
+gdPoint points[3];
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Allocate the color red. */
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* Draw a triangle. */
+points[0].x = 50;
+points[0].y = 0;
+points[1].x = 99;
+points[1].y = 99;
+points[2].x = 0;
+points[2].y = 99;
+/* Paint it in white */
+gdImageFilledPolygon(im, points, 3, white);
+/* Outline it in red; must be done second */
+gdImagePolygon(im, points, 3, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageFilledRectangle(gdImagePtr im, int x1, int y1, int x2, int
+ y2, int color) (FUNCTION)
+ gdImageFilledRectangle is used to draw a solid rectangle with
+ the two corners (upper left first, then lower right) specified,
+ using the color index specified.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = int gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a filled rectangle occupying the central area. */
+gdImageFilledRectangle(im, 25, 25, 74, 74, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageArc(gdImagePtr im, int cx, int cy, int w, int h, int s,
+ int e, int color) (FUNCTION)
+ gdImageArc is used to draw a partial ellipse centered at the
+ given point, with the specified width and height in pixels. The
+ arc begins at the position in degrees specified by s and ends
+ at the position specified by e. The arc is drawn in the color
+ specified by the last argument. A circle can be drawn by
+ beginning from 0 degrees and ending at 360 degrees, with width
+ and height being equal. e must be greater than s. Values
+ greater than 360 are interpreted modulo 360.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 50);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Inscribe an ellipse in the image. */
+gdImageArc(im, 50, 25, 98, 48, 0, 360, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageFillToBorder(gdImagePtr im, int x, int y, int border, int
+ color) (FUNCTION)
+ gdImageFillToBorder floods a portion of the image with the
+ specified color, beginning at the specified point and stopping
+ at the specified border color. For a way of flooding an area
+ defined by the color of the starting point, see gdImageFill.
+
+ The border color cannot be a special color such as gdTiled; it
+ must be a proper solid color. The fill color can be, however.
+
+ Note that gdImageFillToBorder is recursive. It is not the most
+ naive implementation possible, and the implementation is
+ expected to improve, but there will always be degenerate cases
+ in which the stack can become very deep. This can be a problem
+ in MSDOS and MS Windows environments. (Of course, in a Unix or
+ NT environment with a proper stack, this is not a problem at
+ all.)
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+int red;
+im = gdImageCreate(100, 50);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Allocate the color red. */
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* Inscribe an ellipse in the image. */
+gdImageArc(im, 50, 25, 98, 48, 0, 360, white);
+/* Flood-fill the ellipse. Fill color is red, border color is
+ white (ellipse). */
+gdImageFillToBorder(im, 50, 50, white, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageFill(gdImagePtr im, int x, int y, int color) (FUNCTION)
+ gdImageFill floods a portion of the image with the specified
+ color, beginning at the specified point and flooding the
+ surrounding region of the same color as the starting point. For
+ a way of flooding a region defined by a specific border color
+ rather than by its interior color, see gdImageFillToBorder.
+
+ The fill color can be gdTiled, resulting in a tile fill using
+ another image as the tile. However, the tile image cannot be
+ transparent. If the image you wish to fill with has a
+ transparent color index, call gdImageTransparent on the tile
+ image and set the transparent color index to -1 to turn off its
+ transparency.
+
+ Note that gdImageFill is recursive. It is not the most naive
+ implementation possible, and the implementation is expected to
+ improve, but there will always be degenerate cases in which the
+ stack can become very deep. This can be a problem in MSDOS and
+ MS Windows environments. (Of course, in a Unix or NT
+ environment with a proper stack, this is not a problem at all.)
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+int red;
+im = gdImageCreate(100, 50);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Allocate the color red. */
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* Inscribe an ellipse in the image. */
+gdImageArc(im, 50, 25, 98, 48, 0, 360, white);
+/* Flood-fill the ellipse. Fill color is red, and will replace the
+ black interior of the ellipse. */
+gdImageFill(im, 50, 50, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageSetBrush(gdImagePtr im, gdImagePtr brush) (FUNCTION)
+ A "brush" is an image used to draw wide, shaped strokes in
+ another image. Just as a paintbrush is not a single point, a
+ brush image need not be a single pixel. Any gd image can be
+ used as a brush, and by setting the transparent color index of
+ the brush image with gdImageColorTransparent, a brush of any
+ shape can be created. All line-drawing functions, such as
+ gdImageLine and gdImagePolygon, will use the current brush if
+ the special "color" gdBrushed or gdStyledBrushed is used when
+ calling them.
+
+ gdImageSetBrush is used to specify the brush to be used in a
+ particular image. You can set any image to be the brush. If the
+ brush image does not have the same color map as the first
+ image, any colors missing from the first image will be
+ allocated. If not enough colors can be allocated, the closest
+ colors already available will be used. This allows arbitrary
+ GIFs to be used as brush images. It also means, however, that
+ you should not set a brush unless you will actually use it; if
+ you set a rapid succession of different brush images, you can
+ quickly fill your color map, and the results will not be
+ optimal.
+
+ You need not take any special action when you are finished with
+ a brush. As for any other image, if you will not be using the
+ brush image for any further purpose, you should call
+ gdImageDestroy. You must not use the color gdBrushed if the
+ current brush has been destroyed; you can of course set a new
+ brush to replace it.
+
+
+... inside a function ...
+gdImagePtr im, brush;
+FILE *in;
+int black;
+im = gdImageCreate(100, 100);
+/* Open the brush GIF. For best results, portions of the
+ brush that should be transparent (ie, not part of the
+ brush shape) should have the transparent color index. */
+in = fopen("star.gif", "rb");
+brush = gdImageCreateFromGif(in);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+gdImageSetBrush(im, brush);
+/* Draw a line from the upper left corner to the lower right corner
+ using the brush. */
+gdImageLine(im, 0, 0, 99, 99, gdBrushed);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+/* Destroy the brush image */
+gdImageDestroy(brush);
+
+ void gdImageSetTile(gdImagePtr im, gdImagePtr tile) (FUNCTION)
+ A "tile" is an image used to fill an area with a repeated
+ pattern. Any gd image can be used as a tile, and by setting the
+ transparent color index of the tile image with
+ gdImageColorTransparent, a tile that allows certain parts of
+ the underlying area to shine through can be created. All
+ region-filling functions, such as gdImageFill and
+ gdImageFilledPolygon, will use the current tile if the special
+ "color" gdTiled is used when calling them.
+
+ gdImageSetTile is used to specify the tile to be used in a
+ particular image. You can set any image to be the tile. If the
+ tile image does not have the same color map as the first image,
+ any colors missing from the first image will be allocated. If
+ not enough colors can be allocated, the closest colors already
+ available will be used. This allows arbitrary GIFs to be used
+ as tile images. It also means, however, that you should not set
+ a tile unless you will actually use it; if you set a rapid
+ succession of different tile images, you can quickly fill your
+ color map, and the results will not be optimal.
+
+ You need not take any special action when you are finished with
+ a tile. As for any other image, if you will not be using the
+ tile image for any further purpose, you should call
+ gdImageDestroy. You must not use the color gdTiled if the
+ current tile has been destroyed; you can of course set a new
+ tile to replace it.
+
+
+... inside a function ...
+gdImagePtr im, tile;
+FILE *in;
+int black;
+im = gdImageCreate(100, 100);
+/* Open the tile GIF. For best results, portions of the
+ tile that should be transparent (ie, allowing the
+ background to shine through) should have the transparent
+ color index. */
+in = fopen("star.gif", "rb");
+tile = gdImageCreateFromGif(in);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+gdImageSetTile(im, tile);
+/* Fill an area using the tile. */
+gdImageFilledRectangle(im, 25, 25, 75, 75, gdTiled);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+/* Destroy the tile image */
+gdImageDestroy(tile);
+
+ void gdImageSetStyle(gdImagePtr im, int *style, int styleLength)
+ (FUNCTION)
+ It is often desirable to draw dashed lines, dotted lines, and
+ other variations on a broken line. gdImageSetStyle can be used
+ to set any desired series of colors, including a special color
+ that leaves the background intact, to be repeated during the
+ drawing of a line.
+
+ To use gdImageSetStyle, create an array of integers and assign
+ them the desired series of color values to be repeated. You can
+ assign the special color value gdTransparent to indicate that
+ the existing color should be left unchanged for that particular
+ pixel (allowing a dashed line to be attractively drawn over an
+ existing image).
+
+ Then, to draw a line using the style, use the normal
+ gdImageLine function with the special color value gdStyled.
+
+ As of version 1.1.1, the style array is copied when you set the
+ style, so you need not be concerned with keeping the array
+ around indefinitely. This should not break existing code that
+ assumes styles are not copied.
+
+ You can also combine styles and brushes to draw the brush image
+ at intervals instead of in a continuous stroke. When creating a
+ style for use with a brush, the style values are interpreted
+ differently: zero (0) indicates pixels at which the brush
+ should not be drawn, while one (1) indicates pixels at which
+ the brush should be drawn. To draw a styled, brushed line, you
+ must use the special color value gdStyledBrushed. For an
+ example of this feature in use, see gddemo.c (provided in the
+ distribution).
+
+
+gdImagePtr im;
+int styleDotted[2], styleDashed[6];
+FILE *in;
+int black;
+int red;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* Set up dotted style. Leave every other pixel alone. */
+styleDotted[0] = red;
+styleDotted[1] = gdTransparent;
+/* Set up dashed style. Three on, three off. */
+styleDashed[0] = red;
+styleDashed[1] = red;
+styleDashed[2] = red;
+styleDashed[3] = gdTransparent;
+styleDashed[4] = gdTransparent;
+styleDashed[5] = gdTransparent;
+/* Set dotted style. Note that we have to specify how many pixels are
+ in the style! */
+gdImageSetStyle(im, styleDotted, 2);
+/* Draw a line from the upper left corner to the lower right corner. */
+gdImageLine(im, 0, 0, 99, 99, gdStyled);
+/* Now the dashed line. */
+gdImageSetStyle(im, styleDashed, 6);
+gdImageLine(im, 0, 99, 0, 99, gdStyled);
+
+/* ... Do something with the image, such as saving it to a file ... */
+
+/* Destroy it */
+gdImageDestroy(im);
+
+ Query Functions
+
+ int gdImageBlue(gdImagePtr im, int color) (MACRO)
+ gdImageBlue is a macro which returns the blue component
+ of the specified color index. Use this macro rather than
+ accessing the structure members directly.
+
+ int gdImageGetPixel(gdImagePtr im, int x, int y) (FUNCTION)
+ gdImageGetPixel() retrieves the color index of a
+ particular pixel. Always use this function to query
+ pixels; do not access the pixels of the gdImage structure
+ directly.
+
+
+... inside a function ...
+FILE *in;
+gdImagePtr im;
+int c;
+in = fopen("mygif.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+c = gdImageGetPixel(im, gdImageSX(im) / 2, gdImageSY(im) / 2);
+printf("The value of the center pixel is %d; RGB values are %d,%d,%d\n",
+ c, im->red[c], im->green[c], im->blue[c]);
+gdImageDestroy(im);
+
+ int gdImageBoundsSafe(gdImagePtr im, int x, int y) (FUNCTION)
+ gdImageBoundsSafe returns true (1) if the specified point
+ is within the bounds of the image, false (0) if not. This
+ function is intended primarily for use by those who wish
+ to add functions to gd. All of the gd drawing functions
+ already clip safely to the edges of the image.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+if (gdImageBoundsSafe(im, 50, 50)) {
+ printf("50, 50 is within the image bounds\n");
+} else {
+ printf("50, 50 is outside the image bounds\n");
+}
+gdImageDestroy(im);
+
+ int gdImageGreen(gdImagePtr im, int color) (MACRO)
+ gdImageGreen is a macro which returns the green component
+ of the specified color index. Use this macro rather than
+ accessing the structure members directly.
+
+ int gdImageRed(gdImagePtr im, int color) (MACRO)
+ gdImageRed is a macro which returns the red component of
+ the specified color index. Use this macro rather than
+ accessing the structure members directly.
+
+ int gdImageSX(gdImagePtr im) (MACRO)
+ gdImageSX is a macro which returns the width of the image
+ in pixels. Use this macro rather than accessing the
+ structure members directly.
+
+ int gdImageSY(gdImagePtr im) (MACRO)
+ gdImageSY is a macro which returns the height of the
+ image in pixels. Use this macro rather than accessing the
+ structure members directly.
+
+ Fonts and text-handling functions
+
+ void gdImageChar(gdImagePtr im, gdFontPtr font, int x, int y, int
+ c, int color) (FUNCTION)
+ gdImageChar is used to draw single characters on the
+ image. (To draw multiple characters, use gdImageString or
+ gdImageString16.) The second argument is a pointer to a
+ font definition structure; five fonts are provided with
+ gd, gdFontTiny, gdFontSmall, gdFontMediumBold,
+ gdFontLarge, and gdFontGiant. You must include the files
+ "gdfontt.h", "gdfonts.h", "gdfontmb.h", "gdfontl.h" and
+ "gdfontg.h" respectively and (if you are not using a
+ library-based approach) link with the corresponding .c
+ files to use the provided fonts. The character specified
+ by the fifth argument is drawn from left to right in the
+ specified color. (See gdImageCharUp for a way of drawing
+ vertical text.) Pixels not set by a particular character
+ retain their previous color.
+
+
+#include "gd.h"
+#include "gdfontl.h"
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a character. */
+gdImageChar(im, gdFontLarge, 0, 0, 'Q', white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageCharUp(gdImagePtr im, gdFontPtr font, int x, int y,
+ int c, int color) (FUNCTION)
+ gdImageCharUp is used to draw single characters on the
+ image, rotated 90 degrees. (To draw multiple characters,
+ use gdImageStringUp or gdImageStringUp16.) The second
+ argument is a pointer to a font definition structure;
+ five fonts are provided with gd, gdFontTiny, gdFontSmall,
+ gdFontMediumBold, gdFontLarge, and gdFontGiant. You must
+ include the files "gdfontt.h", "gdfonts.h", "gdfontmb.h",
+ "gdfontl.h" and "gdfontg.h" respectively and (if you are
+ not using a library-based approach) link with the
+ corresponding .c files to use the provided fonts. The
+ character specified by the fifth argument is drawn from
+ bottom to top, rotated at a 90-degree angle, in the
+ specified color. (See gdImageChar for a way of drawing
+ horizontal text.) Pixels not set by a particular
+ character retain their previous color.
+
+
+#include "gd.h"
+#include "gdfontl.h"
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a character upwards so it rests against the top of the image. */
+gdImageCharUp(im, gdFontLarge,
+ 0, gdFontLarge->h, 'Q', white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageString(gdImagePtr im, gdFontPtr font, int x, int y,
+ unsigned char *s, int color) (FUNCTION)
+ gdImageString is used to draw multiple characters on the
+ image. (To draw single characters, use gdImageChar.) The
+ second argument is a pointer to a font definition
+ structure; five fonts are provided with gd, gdFontTiny,
+ gdFontSmall, gdFontMediumBold, gdFontLarge, and
+ gdFontGiant. You must include the files "gdfontt.h",
+ "gdfonts.h", "gdfontmb.h", "gdfontl.h" and "gdfontg.h"
+ respectively and (if you are not using a library-based
+ approach) link with the corresponding .c files to use the
+ provided fonts. The null-terminated C string specified by
+ the fifth argument is drawn from left to right in the
+ specified color. (See gdImageStringUp for a way of
+ drawing vertical text.) Pixels not set by a particular
+ character retain their previous color.
+
+
+#include "gd.h"
+#include "gdfontl.h"
+#include <string.h>
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+/* String to draw. */
+char *s = "Hello.";
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a centered string. */
+gdImageString(im, gdFontLarge,
+ im->w / 2 - (strlen(s) * gdFontLarge->w / 2),
+ im->h / 2 - gdFontLarge->h / 2,
+ s, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageString16(gdImagePtr im, gdFontPtr font, int x, int y,
+ unsigned short *s, int color) (FUNCTION)
+ gdImageString is used to draw multiple 16-bit characters
+ on the image. (To draw single characters, use
+ gdImageChar.) The second argument is a pointer to a font
+ definition structure; five fonts are provided with gd,
+ gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge,
+ and gdFontGiant. You must include the files "gdfontt.h",
+ "gdfonts.h", "gdfontmb.h", "gdfontl.h" and "gdfontg.h"
+ respectively and (if you are not using a library-based
+ approach) link with the corresponding .c files to use the
+ provided fonts. The null-terminated string of characters
+ represented as 16-bit unsigned short integers specified
+ by the fifth argument is drawn from left to right in the
+ specified color. (See gdImageStringUp16 for a way of
+ drawing vertical text.) Pixels not set by a particular
+ character retain their previous color.
+
+ This function was added in gd1.3 to provide a means of
+ rendering fonts with more than 256 characters for those
+ who have them. A more frequently used routine is
+ gdImageString.
+
+ void gdImageStringUp(gdImagePtr im, gdFontPtr font, int x, int y,
+ unsigned char *s, int color) (FUNCTION)
+ gdImageStringUp is used to draw multiple characters on
+ the image, rotated 90 degrees. (To draw single
+ characters, use gdImageCharUp.) The second argument is a
+ pointer to a font definition structure; five fonts are
+ provided with gd, gdFontTiny, gdFontSmall,
+ gdFontMediumBold, gdFontLarge, and gdFontGiant. You must
+ include the files "gdfontt.h", "gdfonts.h", "gdfontmb.h",
+ "gdfontl.h" and "gdfontg.h" respectively and (if you are
+ not using a library-based approach) link with the
+ corresponding .c files to use the provided fonts.The
+ null-terminated C string specified by the fifth argument
+ is drawn from bottom to top (rotated 90 degrees) in the
+ specified color. (See gdImageString for a way of drawing
+ horizontal text.) Pixels not set by a particular
+ character retain their previous color.
+
+
+#include "gd.h"
+#include "gdfontl.h"
+#include <string.h>
+... inside a function ...
+gdImagePtr im;
+int black;
+int white;
+/* String to draw. */
+char *s = "Hello.";
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color white (red, green and blue all maximum). */
+white = gdImageColorAllocate(im, 255, 255, 255);
+/* Draw a centered string going upwards. Axes are reversed,
+ and Y axis is decreasing as the string is drawn. */
+gdImageStringUp(im, gdFontLarge,
+ im->w / 2 - gdFontLarge->h / 2,
+ im->h / 2 + (strlen(s) * gdFontLarge->w / 2),
+ s, white);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageStringUp16(gdImagePtr im, gdFontPtr font, int x, int
+ y, unsigned short *s, int color) (FUNCTION)
+ gdImageString is used to draw multiple 16-bit characters
+ vertically on the image. (To draw single characters, use
+ gdImageChar.) The second argument is a pointer to a font
+ definition structure; five fonts are provided with gd,
+ gdFontTiny, gdFontSmall, gdFontMediumBold, gdFontLarge,
+ and gdFontGiant. You must include the files "gdfontt.h",
+ "gdfonts.h", "gdfontmb.h", "gdfontl.h" and "gdfontg.h"
+ respectively and (if you are not using a library-based
+ approach) link with the corresponding .c files to use the
+ provided fonts. The null-terminated string of characters
+ represented as 16-bit unsigned short integers specified
+ by the fifth argument is drawn from bottom to top in the
+ specified color. (See gdImageStringUp16 for a way of
+ drawing horizontal text.) Pixels not set by a particular
+ character retain their previous color.
+
+ This function was added in gd1.3 to provide a means of
+ rendering fonts with more than 256 characters for those
+ who have them. A more frequently used routine is
+ gdImageStringUp.
+
+ Color-handling functions
+
+ int gdImageColorAllocate(gdImagePtr im, int r, int g, int b)
+ (FUNCTION)
+ gdImageColorAllocate finds the first available color
+ index in the image specified, sets its RGB values to
+ those requested (255 is the maximum for each), and
+ returns the index of the new color table entry. When
+ creating a new image, the first time you invoke this
+ function, you are setting the background color for that
+ image.
+
+ In the event that all gdMaxColors colors (256) have
+ already been allocated, gdImageColorAllocate will return
+ -1 to indicate failure. (This is not uncommon when
+ working with existing GIF files that already use 256
+ colors.) Note that gdImageColorAllocate does not check
+ for existing colors that match your request; see
+ gdImageColorExact and gdImageColorClosest for ways to
+ locate existing colors that approximate the color desired
+ in situations where a new color is not available.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+int red;
+im = gdImageCreate(100, 100);
+/* Background color (first allocated) */
+black = gdImageColorAllocate(im, 0, 0, 0);
+/* Allocate the color red. */
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* Draw a dashed line from the upper left corner to the lower right corner. */
+gdImageDashedLine(im, 0, 0, 99, 99, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ int gdImageColorClosest(gdImagePtr im, int r, int g, int b)
+ (FUNCTION)
+ gdImageColorClosest searches the colors which have been
+ defined thus far in the image specified and returns the
+ index of the color with RGB values closest to those of
+ the request. (Closeness is determined by Euclidian
+ distance, which is used to determine the distance in
+ three-dimensional color space between colors.)
+
+ If no colors have yet been allocated in the image,
+ gdImageColorClosest returns -1.
+
+ This function is most useful as a backup method for
+ choosing a drawing color when an image already contains
+ gdMaxColors (256) colors and no more can be allocated.
+ (This is not uncommon when working with existing GIF
+ files that already use many colors.) See
+ gdImageColorExact for a method of locating exact matches
+ only.
+
+
+... inside a function ...
+gdImagePtr im;
+FILE *in;
+int red;
+/* Let's suppose that photo.gif is a scanned photograph with
+ many colors. */
+in = fopen("photo.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+/* Try to allocate red directly */
+red = gdImageColorAllocate(im, 255, 0, 0);
+/* If we fail to allocate red... */
+if (red == (-1)) {
+ /* Find the closest color instead. */
+ red = gdImageColorClosest(im, 255, 0, 0);
+}
+/* Draw a dashed line from the upper left corner to the lower right corner */
+gdImageDashedLine(im, 0, 0, 99, 99, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ int gdImageColorExact(gdImagePtr im, int r, int g, int b)
+ (FUNCTION)
+ gdImageColorExact searches the colors which have been
+ defined thus far in the image specified and returns the
+ index of the first color with RGB values which exactly
+ match those of the request. If no allocated color matches
+ the request precisely, gdImageColorExact returns -1. See
+ gdImageColorClosest for a way to find the color closest
+ to the color requested.
+
+
+... inside a function ...
+gdImagePtr im;
+int red;
+in = fopen("photo.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+/* The image may already contain red; if it does, we'll save a slot
+ in the color table by using that color. */
+/* Try to allocate red directly */
+red = gdImageColorExact(im, 255, 0, 0);
+/* If red isn't already present... */
+if (red == (-1)) {
+ /* Second best: try to allocate it directly. */
+ red = gdImageColorAllocate(im, 255, 0, 0);
+ /* Out of colors, so find the closest color instead. */
+ red = gdImageColorClosest(im, 255, 0, 0);
+}
+/* Draw a dashed line from the upper left corner to the lower right corner */
+gdImageDashedLine(im, 0, 0, 99, 99, red);
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ int gdImageColorsTotal(gdImagePtr im) (MACRO)
+ gdImageColorsTotal is a macro which returns the number of
+ colors currently allocated in the image. Use this macro
+ to obtain this information; do not access the structure
+ directly.
+
+ int gdImageColorRed(gdImagePtr im, int c) (MACRO)
+ gdImageColorRed is a macro which returns the red portion
+ of the specified color in the image. Use this macro to
+ obtain this information; do not access the structure
+ directly.
+
+ int gdImageColorGreen(gdImagePtr im, int c) (MACRO)
+ gdImageColorGreen is a macro which returns the green
+ portion of the specified color in the image. Use this
+ macro to obtain this information; do not access the
+ structure directly.
+
+ int gdImageColorBlue(gdImagePtr im, int c) (MACRO)
+ gdImageColorBlue is a macro which returns the green
+ portion of the specified color in the image. Use this
+ macro to obtain this information; do not access the
+ structure directly.
+
+ int gdImageGetInterlaced(gdImagePtr im) (MACRO)
+ gdImageGetInterlaced is a macro which returns true (1) if
+ the image is interlaced, false (0) if not. Use this macro
+ to obtain this information; do not access the structure
+ directly. See gdImageInterlace for a means of interlacing
+ images.
+
+ int gdImageGetTransparent(gdImagePtr im) (MACRO)
+ gdImageGetTransparent is a macro which returns the
+ current transparent color index in the image. If there is
+ no transparent color, gdImageGetTransparent returns -1.
+ Use this macro to obtain this information; do not access
+ the structure directly.
+
+ void gdImageColorDeallocate(gdImagePtr im, int color) (FUNCTION)
+ gdImageColorDeallocate marks the specified color as being
+ available for reuse. It does not attempt to determine
+ whether the color index is still in use in the image.
+ After a call to this function, the next call to
+ gdImageColorAllocate for the same image will set new RGB
+ values for that color index, changing the color of any
+ pixels which have that index as a result. If multiple
+ calls to gdImageColorDeallocate are made consecutively,
+ the lowest-numbered index among them will be reused by
+ the next gdImageColorAllocate call.
+
+
+... inside a function ...
+gdImagePtr im;
+int red, blue;
+in = fopen("photo.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+/* Look for red in the color table. */
+red = gdImageColorExact(im, 255, 0, 0);
+/* If red is present... */
+if (red != (-1)) {
+ /* Deallocate it. */
+ gdImageColorDeallocate(im, red);
+ /* Allocate blue, reusing slot in table.
+ Existing red pixels will change color. */
+ blue = gdImageColorAllocate(im, 0, 0, 255);
+}
+/* ... Do something with the image, such as saving it to a file... */
+/* Destroy it */
+gdImageDestroy(im);
+
+ void gdImageColorTransparent(gdImagePtr im, int color) (FUNCTION)
+
+ gdImageColorTransparent sets the transparent color index
+ for the specified image to the specified index. To
+ indicate that there should be no transparent color,
+ invoke gdImageColorTransparent with a color index of -1.
+
+ The color index used should be an index allocated by
+ gdImageColorAllocate, whether explicitly invoked by your
+ code or implicitly invoked by loading an image. In order
+ to ensure that your image has a reasonable appearance
+ when viewed by users who do not have transparent
+ background capabilities, be sure to give reasonable RGB
+ values to the color you allocate for use as a transparent
+ color, even though it will be transparent on systems that
+ support transparency.
+
+
+... inside a function ...
+gdImagePtr im;
+int black;
+FILE *in, *out;
+in = fopen("photo.gif", "rb");
+im = gdImageCreateFromGif(in);
+fclose(in);
+/* Look for black in the color table and make it transparent. */
+black = gdImageColorExact(im, 0, 0, 0);
+/* If black is present... */
+if (black != (-1)) {
+ /* Make it transparent */
+ gdImageColorTransparent(im, black);
+}
+/* Save the newly-transparent image back to the file */
+out = fopen("photo.gif", "wb");
+gdImageGif(im, out);
+fclose(out);
+/* Destroy it */
+gdImageDestroy(im);
+
+ Copying and resizing functions
+
+ void gdImageCopy(gdImagePtr dst, gdImagePtr src, int dstX, int
+ dstY, int srcX, int srcY, int w, int h) (FUNCTION)
+ gdImageCopy is used to copy a rectangular portion of one
+ image to another image. (For a way of stretching or
+ shrinking the image in the process, see
+ gdImageCopyResized.)
+
+ The dst argument is the destination image to which the
+ region will be copied. The src argument is the source
+ image from which the region is copied. The dstX and dstY
+ arguments specify the point in the destination image to
+ which the region will be copied. The srcX and srcY
+ arguments specify the upper left corner of the region in
+ the source image. The w and h arguments specify the width
+ and height of the region.
+
+ When you copy a region from one location in an image to
+ another location in the same image, gdImageCopy will
+ perform as expected unless the regions overlap, in which
+ case the result is unpredictable.
+
+ Important note on copying between images: since different
+ images do not necessarily have the same color tables,
+ pixels are not simply set to the same color index values
+ to copy them. gdImageCopy will attempt to find an
+ identical RGB value in the destination image for each
+ pixel in the copied portion of the source image by
+ invoking gdImageColorExact. If such a value is not found,
+ gdImageCopy will attempt to allocate colors as needed
+ using gdImageColorAllocate. If both of these methods
+ fail, gdImageCopy will invoke gdImageColorClosest to find
+ the color in the destination image which most closely
+ approximates the color of the pixel being copied.
+
+
+... Inside a function ...
+gdImagePtr im_in;
+gdImagePtr im_out;
+int x, y;
+FILE *in;
+FILE *out;
+/* Load a small gif to tile the larger one with */
+in = fopen("small.gif", "rb");
+im_in = gdImageCreateFromGif(in);
+fclose(in);
+/* Make the output image four times as large on both axes */
+im_out = gdImageCreate(im_in->sx * 4, im_in->sy * 4);
+/* Now tile the larger image using the smaller one */
+for (y = 0; (y < 4); y++) {
+ for (x = 0; (x < 4); x++) {
+ gdImageCopy(im_out, im_in,
+ x * im_in->sx, y * im_in->sy,
+ 0, 0,
+ im_in->sx, im_in->sy);
+ }
+}
+out = fopen("tiled.gif", "wb");
+gdImageGif(im_out, out);
+fclose(out);
+gdImageDestroy(im_in);
+gdImageDestroy(im_out);
+
+ void gdImageCopyResized(gdImagePtr dst, gdImagePtr src, int dstX,
+ int dstY, int srcX, int srcY, int destW, int destH, int
+ srcW, int srcH) (FUNCTION)
+ gdImageCopyResized is used to copy a rectangular portion
+ of one image to another image. The X and Y dimensions of
+ the original region and the destination region can vary,
+ resulting in stretching or shrinking of the region as
+ appropriate. (For a simpler version of this function
+ which does not deal with resizing, see gdImageCopy.)
+
+ The dst argument is the destination image to which the
+ region will be copied. The src argument is the source
+ image from which the region is copied. The dstX and dstY
+ arguments specify the point in the destination image to
+ which the region will be copied. The srcX and srcY
+ arguments specify the upper left corner of the region in
+ the source image. The dstW and dstH arguments specify the
+ width and height of the destination region. The srcW and
+ srcH arguments specify the width and height of the source
+ region and can differ from the destination size, allowing
+ a region to be scaled during the copying process.
+
+ When you copy a region from one location in an image to
+ another location in the same image, gdImageCopy will
+ perform as expected unless the regions overlap, in which
+ case the result is unpredictable. If this presents a
+ problem, create a scratch image in which to keep
+ intermediate results.
+
+ Important note on copying between images: since images do
+ not necessarily have the same color tables, pixels are
+ not simply set to the same color index values to copy
+ them. gdImageCopy will attempt to find an identical RGB
+ value in the destination image for each pixel in the
+ copied portion of the source image by invoking
+ gdImageColorExact. If such a value is not found,
+ gdImageCopy will attempt to allocate colors as needed
+ using gdImageColorAllocate. If both of these methods
+ fail, gdImageCopy will invoke gdImageColorClosest to find
+ the color in the destination image which most closely
+ approximates the color of the pixel being copied.
+
+
+... Inside a function ...
+gdImagePtr im_in;
+gdImagePtr im_out;
+int x, y;
+FILE *in;
+FILE *out;
+/* Load a small gif to expand in the larger one */
+in = fopen("small.gif", "rb");
+im_in = gdImageCreateFromGif(in);
+fclose(in);
+/* Make the output image four times as large on both axes */
+im_out = gdImageCreate(im_in->sx * 4, im_in->sy * 4);
+/* Now copy the smaller image, but four times larger */
+gdImageCopyResized(im_out, im_in, 0, 0, 0, 0,
+ im_out->sx, im_out->sy,
+ im_in->sx, im_in->sy);
+out = fopen("large.gif", "wb");
+gdImageGif(im_out, out);
+fclose(out);
+gdImageDestroy(im_in);
+gdImageDestroy(im_out);
+
+ Miscellaneous Functions
+
+ gdImageInterlace(gdImagePtr im, int interlace) (FUNCTION)
+ gdImageInterlace is used to determine whether an
+ image should be stored in a linear fashion, in
+ which lines will appear on the display from first
+ to last, or in an interlaced fashion, in which the
+ image will "fade in" over several passes. By
+ default, images are not interlaced.
+
+ A nonzero value for the interlace argument turns on
+ interlace; a zero value turns it off. Note that
+ interlace has no effect on other functions, and has
+ no meaning unless you save the image in GIF format;
+ the gd and xbm formats do not support interlace.
+
+ When a GIF is loaded with gdImageCreateFromGif ,
+ interlace will be set according to the setting in
+ the GIF file.
+
+ Note that many GIF viewers and web browsers do not
+ support interlace. However, the interlaced GIF
+ should still display; it will simply appear all at
+ once, just as other images do.
+
+
+gdImagePtr im;
+FILE *out;
+/* ... Create or load the image... */
+
+/* Now turn on interlace */
+gdImageInterlace(im, 1);
+/* And open an output file */
+out = fopen("test.gif", "wb");
+/* And save the image */
+gdImageGif(im, out);
+fclose(out);
+gdImageDestroy(im);
+
+ Constants
+
+ gdBrushed (CONSTANT)
+ Used in place of a color when invoking a
+ line-drawing function such as gdImageLine or
+ gdImageRectangle. When gdBrushed is used as the
+ color, the brush image set with gdImageSetBrush is
+ drawn in place of each pixel of the line (the brush
+ is usually larger than one pixel, creating the
+ effect of a wide paintbrush). See also
+ gdStyledBrushed for a way to draw broken lines with
+ a series of distinct copies of an image.
+
+ gdMaxColors(CONSTANT)
+ The constant 256. This is the maximum number of
+ colors in a GIF file according to the GIF standard,
+ and is also the maximum number of colors in a gd
+ image.
+
+ gdStyled (CONSTANT)
+ Used in place of a color when invoking a
+ line-drawing function such as gdImageLine or
+ gdImageRectangle. When gdStyled is used as the
+ color, the colors of the pixels are drawn
+ successively from the style that has been set with
+ gdImageSetStyle. If the color of a pixel is equal
+ to gdTransparent, that pixel is not altered. (This
+ mechanism is completely unrelated to the
+ "transparent color" of the image itself; see
+ gdImageColorTransparent gdImageColorTransparent for
+ that mechanism.) See also gdStyledBrushed.
+
+ gdStyledBrushed (CONSTANT)
+ Used in place of a color when invoking a
+ line-drawing function such as gdImageLine or
+ gdImageRectangle. When gdStyledBrushed is used as
+ the color, the brush image set with gdImageSetBrush
+ is drawn at each pixel of the line, providing that
+ the style set with gdImageSetStyle contains a
+ nonzero value (OR gdTransparent, which does not
+ equal zero but is supported for consistency) for
+ the current pixel. (Pixels are drawn successively
+ from the style as the line is drawn, returning to
+ the beginning when the available pixels in the
+ style are exhausted.) Note that this differs from
+ the behavior of gdStyled, in which the values in
+ the style are used as actual pixel colors, except
+ for gdTransparent.
+
+ gdDashSize (CONSTANT)
+ The length of a dash in a dashed line. Defined to
+ be 4 for backwards compatibility with programs that
+ use gdImageDashedLine. New programs should use
+ gdImageSetStyle and call the standard gdImageLine
+ function with the special "color" gdStyled or
+ gdStyledBrushed.
+
+ gdTiled (CONSTANT)
+ Used in place of a normal color in
+ gdImageFilledRectangle, gdImageFilledPolygon,
+ gdImageFill, and gdImageFillToBorder. gdTiled
+ selects a pixel from the tile image set with
+ gdImageSetTile in such a way as to ensure that the
+ filled area will be tiled with copies of the tile
+ image. See the discussions of gdImageFill and
+ gdImageFillToBorder for special restrictions
+ regarding those functions.
+
+ gdTransparent (CONSTANT)
+ Used in place of a normal color in a style to be
+ set with gdImageSetStyle. gdTransparent is not the
+ transparent color index of the image; for that
+ functionality please see gdImageColorTransparent.
+
+ About the additional .gd image file format
+
+ In addition to reading and writing the GIF format
+ and reading the X Bitmap format, gd has the
+ capability to read and write its own ".gd" format.
+ This format is not intended for general purpose use
+ and should never be used to distribute images. It
+ is not a compressed format. Its purpose is solely
+ to allow very fast loading of images your program
+ needs often in order to build other images for
+ output. If you are experiencing performance
+ problems when loading large, fixed GIF images your
+ program needs to produce its output images, you may
+ wish to examine the functions gdImageCreateFromGd
+ and gdImageGd, which read and write .gd format
+ images.
+
+ The program "giftogd.c" is provided as a simple way
+ of converting .gif files to .gd format. I emphasize
+ again that you will not need to use this format
+ unless you have a need for high-speed loading of a
+ few frequently-used images in your program.
+
+ Please tell us you're using gd!
+
+ When you contact us and let us know you are using
+ gd, you help us justify the time spent in
+ maintaining and improving it. So please let us
+ know. If the results are publicly visible on the
+ web, a URL is a wonderful thing to receive, but if
+ it's not a publicly visible project, a simple note
+ is just as welcome.
+
+ If you have problems
+
+ If you have any difficulties with gd, feel free to
+ contact the author, Thomas Boutell. Be sure to read
+ this manual carefully first.
+
+ Alphabetical quick index
+
+ gdBrushed | gdDashSize | gdFont | gdFontPtr |
+ gdImage | gdImageArc | gdImageBlue |
+ gdImageBoundsSafe | gdImageChar | gdImageCharUp |
+ gdImageColorAllocate | gdImageColorClosest |
+ gdImageColorDeallocate | gdImageColorExact |
+ gdImageColorTransparent | gdImageCopy |
+ gdImageCopyResized | gdImageCreate |
+ gdImageCreateFromGd | gdImageCreateFromGif |
+ gdImageCreateFromXbm | gdImageDashedLine |
+ gdImageDestroy | gdImageFill | gdImageFillToBorder
+ | gdImageFilledRectangle | gdImageGd |
+ gdImageGetInterlaced | gdImageGetPixel |
+ gdImageGetTransparent | gdImageGif | gdImageGreen |
+ gdImageInterlace | gdImageLine |
+ gdImageFilledPolygon | gdImagePolygon | gdImagePtr
+ | gdImageRectangle | gdImageRed | gdImageSetBrush |
+ gdImageSetPixel | gdImageSetStyle | gdImageSetTile
+ | gdImageString | gdImageString16 | gdImageStringUp
+ | gdImageStringUp16 | gdMaxColors | gdPoint |
+ gdStyled | gdStyledBrushed | gdTiled |
+ gdTransparent
+
+ Boutell.Com, Inc.
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/gddemo.c
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/gd1.3/README
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.in Sat Jul 13 19:23:44 2002
@@ -0,0 +1,227 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+#AUTOMAKE_OPTIONS= foreign
+#
+#ACLOCAL_M4= $(top_srcdir)/config/aclocal.m4
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CGI_LIB_DIR = @CGI_LIB_DIR@
+COMP_PERL = @COMP_PERL@
+CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
+LIBTOOL = @LIBTOOL@
+PERL = @PERL@
+PNG_LIB_DIR = @PNG_LIB_DIR@
+RANLIB = @RANLIB@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+
+EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
+
+examplesdir = $(prefix)/examples
+examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = ../config/config.h
+CONFIG_CLEAN_FILES = shared-demo.pl piped-demo.pl stripes.pl bigtops.pl \
+minmax.pl cgi-demo.cgi
+SCRIPTS = $(examples_SCRIPTS)
+
+DIST_COMMON = Makefile.am Makefile.in bigtops.pl.in cgi-demo.cgi.in \
+minmax.pl.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps examples/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+shared-demo.pl: $(top_builddir)/config.status shared-demo.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+piped-demo.pl: $(top_builddir)/config.status piped-demo.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+stripes.pl: $(top_builddir)/config.status stripes.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+bigtops.pl: $(top_builddir)/config.status bigtops.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+minmax.pl: $(top_builddir)/config.status minmax.pl.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+cgi-demo.cgi: $(top_builddir)/config.status cgi-demo.cgi.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+install-examplesSCRIPTS: $(examples_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(examplesdir)
+ @list='$(examples_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(examplesdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(examplesdir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(examplesdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(examplesdir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-examplesSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(examples_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(examplesdir)/`echo $$p|sed '$(transform)'`; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = examples
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-examplesSCRIPTS
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-examplesSCRIPTS
+uninstall: uninstall-am
+all-am: Makefile $(SCRIPTS)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(examplesdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+ -rm -f libtool
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-examplesSCRIPTS install-examplesSCRIPTS tags distdir \
+info-am info dvi-am dvi check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/piped-demo.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/piped-demo.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/piped-demo.pl.in Sat Jul 13 19:23:44 2002
@@ -0,0 +1,158 @@
+#! @PERL@
+
+#makes things work when run without install
+use lib qw( ../perl-piped/blib/lib ../lib/perl );
+
+#makes programm work AFTER install
+use lib qw( @prefix@/lib/perl );
+
+use RRDp;
+
+# this simpulates a standard mrtg-2.x setup ... we can use this to
+# compare performance ...
+
+$main::DEBUG=0;
+$STEP = 300;
+$RUNS = 12*24*30*6;
+$GRUNS = 20;
+$RRD = "piped-demo.rrd";
+$GIF = "piped-demo.gif";
+$PNG = "piped-demo.png";
+
+# some magic to find the correct rrdtol executable
+if ( -x "@prefix@/bin/rrdtool") {
+ RRDp::start "@prefix@/bin/rrdtool";
+} elsif ( -x "../bin/rrdtool") {
+ RRDp::start "../bin/rrdtool";
+} else {
+ RRDp::start "../src/rrdtool";
+}
+
+print "* Creating RRD with properties equivalent to mrtg-2.x logfile\n\n";
+
+$START = time()-$RUNS*$STEP;
+
+RRDp::cmd "create $RRD -b $START -s $STEP
+ DS:in:GAUGE:400:U:U
+ DS:out:GAUGE:400:U:U
+ RRA:AVERAGE:0.5:1:600
+ RRA:AVERAGE:0.5:6:600
+ RRA:MAX:0.5:6:600
+ RRA:AVERAGE:0.5:24:600
+ RRA:MAX:0.5:24:600
+ RRA:AVERAGE:0.5:144:600
+ RRA:MAX:0.5:144:600";
+
+$answer = RRDp::read;
+($user,$sys,$real) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+
+print "* Filling RRD with $RUNS Values. One moment please ...\n";
+print " If you are running over NFS this will take *MUCH* longer\n\n";
+
+for ($i=$START+1;
+ $i<$START+$STEP*$RUNS;
+ $i+=$STEP+int((rand()-0.5)*7)){
+
+ $line = "update $RRD $i:".int(rand(100000)).":".int(rand(100000));
+ RRDp::cmd $line;
+ $answer = RRDp::read;
+}
+
+($user1,$sys1,$real1) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+
+printf "-- performance analysis Update test\n".
+ " usr/upd: %1.5fs sys/upd: %1.5fs real/upd: %1.5fs upd/sec: %1.0f\n",
+ ($user1-$user)/($RUNS), ($sys1-$sys)/($RUNS),
+ ($real1-$real)/($RUNS), ($RUNS)/($real1-$real);
+print "\n";
+# creating some graphs
+
+print "* Creating $GRUNS GIF graphs: $GIF\n\n";
+$now = time;
+for ($i=0;$i<$GRUNS;$i++) {
+RRDp::cmd "graph $GIF ", "--title 'Test GRAPH' ",
+ "--height 150 --vertical-label 'Dummy Units' ".
+ "--start now".(-$RUNS*$STEP),
+ "--color ARROW#bfbfbf",
+ "DEF:alpha=$RRD:in:AVERAGE",
+ "DEF:beta=$RRD:out:AVERAGE",
+ "CDEF:calc=alpha,beta,+,1.5,/",
+ "AREA:alpha#0022e9:Alpha",
+ "STACK:beta#00b871:Beta",
+ "STACK:calc#ff0091:Calc\\j",
+ "PRINT:alpha:AVERAGE:'Average Alpha\\: %1.2f %S'",
+ "PRINT:alpha:MIN:'Min Alpha\\: %1.2f %S'",
+ "PRINT:alpha:MAX:'Max Alpha\\: %1.2f %S'",
+ "GPRINT:calc:AVERAGE:'Average calc\\: %1.2f %S\\r'",
+ "GPRINT:calc:MIN:'Min calc\\: %1.2f %S'",
+ "GPRINT:calc:MAX:'Max calc\\: %1.2f %S'",
+ "VRULE:".($now-3600)."#008877:'60 Minutes ago'",
+ "COMMENT:'\\s'",
+ "COMMENT:'Graph created on: ".localtime(time())."\\c'";
+
+$answer = RRDp::read;
+}
+($user2,$sys2,$real2) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+
+print "ANSWER:\n$$answer";
+
+printf "\n-- average Time for one Graph\n".
+ " usr/grf: %1.5fs sys/grf: %1.5fs real/grf: %1.5fs graphs/sec: %1.2f\n",
+ ($user2-$user1)/$GRUNS,
+ ($sys2-$sys1)/$GRUNS,
+ ($real2-$real1)/$GRUNS,
+ $GRUNS/($real2-$real1);
+
+print "\n\n* Creating $GRUNS PNG graphs: $PNG\n\n";
+
+$now = time;
+($user1,$sys1,$real1) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+for ($i=0;$i<$GRUNS;$i++) {
+RRDp::cmd "graph $PNG ", "--title 'Test GRAPH' ",
+ "--imgformat PNG --height 150 --vertical-label 'Dummy Units' ".
+ "--start now".(-$RUNS*$STEP),
+ "--color ARROW#bfbfbf",
+ "DEF:alpha=$RRD:in:AVERAGE",
+ "DEF:beta=$RRD:out:AVERAGE",
+ "CDEF:calc=alpha,beta,+,1.5,/",
+ "AREA:alpha#0022e9:Alpha",
+ "STACK:beta#00b871:Beta",
+ "STACK:calc#ff0091:Calc\\j",
+ "PRINT:alpha:AVERAGE:'Average Alpha\\: %1.2f %S'",
+ "PRINT:alpha:MIN:'Min Alpha\\: %1.2f %S'",
+ "PRINT:alpha:MAX:'Max Alpha\\: %1.2f %S'",
+ "GPRINT:calc:AVERAGE:'Average calc\\: %1.2f %S\\r'",
+ "GPRINT:calc:MIN:'Min calc\\: %1.2f %S'",
+ "GPRINT:calc:MAX:'Max calc\\: %1.2f %S'",
+ "VRULE:".($now-3600)."#008877:'60 Minutes ago'",
+ "COMMENT:'\\s'",
+ "COMMENT:'Graph created on: ".localtime(time())."\\c'";
+
+$answer = RRDp::read;
+}
+($user2,$sys2,$real2) = ($RRDp::user,$RRDp::sys,$RRDp::real);
+
+print "ANSWER:\n$$answer";
+
+printf "\n-- average Time for one PNG Graph\n".
+ " usr/grf: %1.5fs sys/grf: %1.5fs real/grf: %1.5fs".
+ " graphs/sec: %1.2f\n\n",
+ ($user2-$user1)/$GRUNS,
+ ($sys2-$sys1)/$GRUNS,
+ ($real2-$real1)/$GRUNS,
+ $GRUNS/($real2-$real1);
+
+RRDp::end;
+
+
+
+
+
+
+
+
+
+
+
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/bigtops.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/bigtops.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/bigtops.pl.in Sat Jul 13 19:23:45 2002
@@ -0,0 +1,52 @@
+#! @PERL@
+
+#makes things work when run without install
+use lib qw( ../perl-shared/blib/lib ../perl-shared/blib/arch );
+# this is for after install
+use lib qw( @prefix@/lib/perl ../lib/perl );
+
+use RRDs;
+my $start=time;
+my $rrd="randome.rrd";
+my $name = $0;
+$name =~ s/\.pl.*//g;
+
+RRDs::create ($rrd, "--start",$start-1, "--step",300,
+ "DS:a:GAUGE:600:U:U",
+ "DS:b:GAUGE:600:U:U",
+ "RRA:AVERAGE:0.5:1:300");
+my $ERROR = RRDs::error;
+die "$0: unable to create `$rrd': $ERROR\n" if $ERROR;
+
+# dropt some data into the rrd
+my $t;
+for ($t=$start; $t<$start+300*300; $t+=300){
+ RRDs::update $rrd, "$t:".rand(100).":".(sin($t/800)*50+50);
+ if ($ERROR = RRDs::error) {
+ die "$0: unable to update `$rrd': $ERROR\n";
+ }
+}
+
+RRDs::graph "$name.png",
+ "--title", uc($name)." Demo",
+ "--start", "$start + 1 h",
+ "--end", "start + 1000 min",
+ "--interlace",
+ "--imgformat","PNG",
+ "--width=450",
+ "DEF:a=$rrd:a:AVERAGE",
+ "DEF:b=$rrd:b:AVERAGE",
+ "CDEF:line=TIME,2400,%,300,LT,a,UNKN,IF",
+ "AREA:b#00b6e4:beta",
+ "AREA:line#0022e9:alpha",
+ "LINE3:line#ff0000",
+
+;
+
+if ($ERROR = RRDs::error) {
+ print "ERROR: $ERROR\n";
+};
+
+
+print "This script has created $name.png in the current directory\n";
+print "This demonstrates the use of the TIME and % RPN operators\n";
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/shared-demo.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/shared-demo.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/shared-demo.pl.in Sat Jul 13 19:23:45 2002
@@ -0,0 +1,175 @@
+#! @PERL@
+
+
+END {
+ print "not ok 1\n" unless $loaded;
+ unlink "demo.rrd";
+}
+
+sub ok
+{
+ my($what, $result) = @_ ;
+ $ok_count++;
+ print "not " unless $result;
+ print "ok $ok_count $what\n";
+}
+
+#makes things work when run without install
+use lib qw( ../perl-shared/blib/lib ../perl-shared/blib/arch );
+
+#makes programm work AFTER install
+use lib qw( @prefix@/lib/perl ../lib/perl );
+
+use strict;
+use vars qw(@ISA $loaded);
+
+use RRDs;
+$loaded = 1;
+my $ok_count = 1;
+
+ok("loading",1);
+
+######################### End of black magic.
+
+my $STEP = 100;
+my $RUNS = 500;
+my $GRUNS = 4;
+my $RRD1 = "shared-demo.rrd";
+my $RRD2 = "shared-demob.rrd";
+my $GIF1 = "shared-demo1.gif";
+my $GIF2 = "shared-demo2.gif";
+my $time = 30*int(time/30);
+my $START = $time-$RUNS*$STEP;
+
+my @options = ("-b", $START, "-s", $STEP,
+ "DS:a:GAUGE:2000:U:U",
+ "DS:b:GAUGE:200:U:U",
+ "DS:c:GAUGE:200:U:U",
+ "DS:d:GAUGE:200:U:U",
+ "DS:e:DERIVE:200:U:U",
+ "RRA:AVERAGE:0.5:1:5000",
+ "RRA:AVERAGE:0.5:10:500");
+
+print "* Creating RRD $RRD1 starting at $time.\n\n";
+RRDs::create $RRD1, @options;
+
+my $ERROR = RRDs::error;
+ok("create", !$ERROR); # 2
+if ($ERROR) {
+ die "$0: unable to create `$RRD1': $ERROR\n";
+}
+
+print "* Creating RRD $RRD2 starting at $time.\n\n";
+RRDs::create $RRD2, @options;
+
+$ERROR= RRDs::error;
+ok("creat",!$ERROR); # 3
+if ($ERROR) {
+ die "$0: unable to create `$RRD2': $ERROR\n";
+}
+
+my $last = RRDs::last $RRD1;
+if ($ERROR = RRDs::error) {
+ die "$0: unable to get last `$RRD1': $ERROR\n";
+}
+ok("last", $last == $START); # 4
+
+$last = RRDs::last $RRD2;
+if ($ERROR = RRDs::error) {
+ die "$0: unable to get last `$RRD2': $ERROR\n";
+}
+ok("last 2", $last == $START); # 5
+
+print "* Filling $RRD1 and $RRD2 with $RUNS*5 values. One moment please ...\n";
+print "* If you are running over NFS this will take *MUCH* longer\n\n";
+
+srand(int($time / 100));
+
+ at options = ();
+
+my $counter = 1e7;
+for (my $t=$START+1;
+ $t<$START+$STEP*$RUNS;
+ $t+=$STEP+int((rand()-0.5)*7)){
+ $counter += 2500*sin($t/2000)*$STEP;
+ my $data = (1000+500*sin($t/1000)).":".
+ (1000+900*sin($t/2330)).":".
+ (2000*cos($t/1550)).":".
+ (3220*sin($t/3420)).":$counter";
+ push(@options, "$t:$data");
+ RRDs::update $RRD1, "$t:$data";
+ if ($ERROR = RRDs::error) {
+ die "$0: unable to update `$RRD1': $ERROR\n";
+ }
+}
+
+RRDs::update $RRD2, @options;
+
+if ($ERROR = RRDs::error) {
+ die "$0: unable to update `$RRD2': $ERROR\n";
+}
+
+print "* Creating $GRUNS graphs: $GIF1 & $GIF2\n\n";
+my $now = $time;
+for (my $i=0;$i<$GRUNS;$i++) {
+ my @rrd_gifs = ($RRD1, $GIF1, $RRD2, $GIF2);
+ while (@rrd_gifs) {
+ my $RRD = shift(@rrd_gifs);
+ my $GIF = shift(@rrd_gifs);
+ my ($graphret,$xs,$ys) = RRDs::graph $GIF, "--title", 'Test GRAPH',
+ '--base', '1024',
+ "--vertical-label", 'Dummy Units', "--start", (-$RUNS*$STEP),
+ "--end", $time,
+ "--interlace", "--imgformat","GIF",
+ "DEF:alpha=$RRD:a:AVERAGE",
+ "DEF:beta=$RRD:b:AVERAGE",
+ "DEF:gamma=$RRD:c:AVERAGE",
+ "DEF:delta=$RRD:d:AVERAGE",
+ "DEF:epsilon=$RRD:e:AVERAGE",
+ "CDEF:calc=alpha,beta,+,2,/,100,*,102,/",
+ "AREA:alpha#0022e9:Short",
+ "GPRINT:calc:MAX:Max calc %1.2f",
+ "STACK:beta#00b871:Demo Text",
+ "GPRINT:calc:AVERAGE:Average calc %1.2f",
+ "STACK:beta#0ad871:Demo Text 2",
+ "LINE1:gamma#ff0000:Line 1",
+ "LINE2:delta#888800:Line 2",
+ "LINE3:calc#00ff44:Line 3",
+ "LINE3:epsilon#000000:Line 4",
+ "HRULE:1500#ff8800:Horizontal Line at 1500",
+ "PRINT:alpha:AVERAGE:Average Alpha %1.2f",
+ "PRINT:alpha:MIN:Min Alpha %1.2f",
+ "PRINT:alpha:MAX:Max Alpha %1.2f",
+ "GPRINT:calc:MIN:Min calc %1.2f",
+ "VRULE:".($now-3600)."#008877:60 Minutes ago",
+ "VRULE:".($now-7200)."#008877:120 Minutes ago";
+
+ if ($ERROR = RRDs::error) {
+ print "ERROR: $ERROR\n";
+ } else {
+ print "GIF Size: ${xs}x${ys}\n";
+ print "Graph Return:\n",(join "\n", @$graphret),"\n\n";
+ }
+ }
+}
+
+
+
+my ($start,$step,$names,$array) = RRDs::fetch $RRD1, "AVERAGE";
+$ERROR = RRDs::error;
+print "ERROR: $ERROR\n" if $ERROR ;
+print "start=$start, step=$step\n";
+print " ";
+map {printf("%12s",$_)} @$names ;
+print "\n";
+foreach my $line (@$array){
+ print "".localtime($start)," ";
+ $start += $step;
+ foreach my $val (@$line) {
+ printf "%12.1f", $val;
+ }
+ print "\n";
+}
+
+
+
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/minmax.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/minmax.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/minmax.pl.in Sat Jul 13 19:23:46 2002
@@ -0,0 +1,54 @@
+#! @PERL@
+
+#makes things work when run without install
+use lib qw( ../perl-shared/blib/lib ../perl-shared/blib/arch );
+# this is for after install
+use lib qw( @prefix@/lib/perl ../lib/perl );
+
+use RRDs;
+my $start=time;
+my $rrd="randome.rrd";
+my $name = $0;
+$name =~ s/\.pl.*//g;
+
+RRDs::create ($rrd, "--start",$start-1, "--step",300,
+ "DS:a:GAUGE:600:U:U",
+ "RRA:AVERAGE:0.5:1:300",
+ "RRA:MIN:0.5:12:300",
+ "RRA:MAX:0.5:12:300",
+);
+my $ERROR = RRDs::error;
+die "$0: unable to create `$rrd': $ERROR\n" if $ERROR;
+
+# dropt some data into the rrd
+my $t;
+for ($t=$start; $t<$start+300*300; $t+=300){
+ RRDs::update $rrd, "$t:".(sin($t/3000)*50+50);
+ if ($ERROR = RRDs::error) {
+ die "$0: unable to update `$rrd': $ERROR\n";
+ }
+}
+
+RRDs::graph "$name.png",
+ "--title", uc($name)." Demo",
+ "--start", "now",
+ "--end", "start+1d",
+ "--lower-limit=0",
+ "--interlace",
+ "--imgformat","PNG",
+ "--width=450",
+ "DEF:a=$rrd:a:AVERAGE",
+ "DEF:b=$rrd:a:MIN",
+ "DEF:c=$rrd:a:MAX",
+ "AREA:a#00b6e4:real",
+ "LINE1:b#0022e9:min",
+ "LINE1:c#00ee22:max",
+;
+
+if ($ERROR = RRDs::error) {
+ print "ERROR: $ERROR\n";
+};
+
+
+print "This script has created $name.png in the current directory\n";
+print "This demonstrates the use of the TIME and % RPN operators\n";
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/stripes.pl.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/stripes.pl.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/stripes.pl.in Sat Jul 13 19:23:46 2002
@@ -0,0 +1,51 @@
+#! @PERL@
+
+#makes things work when run without install
+use lib qw( ../perl-shared/blib/lib ../perl-shared/blib/arch );
+
+#makes programm work AFTER install
+use lib qw( @prefix@/lib/perl ../lib/perl );
+
+use strict;
+use vars qw(@ISA $loaded);
+
+use RRDs;
+my $start=time;
+my $rrd="randome.rrd";
+RRDs::create ($rrd, "--start",$start-1, "--step",300,
+ "DS:a:GAUGE:600:U:U",
+ "DS:b:GAUGE:600:U:U",
+ "RRA:AVERAGE:0.5:1:200");
+my $ERROR = RRDs::error;
+die "$0: unable to create `$rrd': $ERROR\n" if $ERROR;
+my $t;
+for ($t=$start; $t<$start+200*300; $t+=300){
+ RRDs::update $rrd, "$t:".rand(100).":".(sin($t/800)*50+50);
+ if ($ERROR = RRDs::error) {
+ die "$0: unable to update `$rrd': $ERROR\n";
+ }
+}
+RRDs::graph "stripes.png",
+ "--title", 'Stripes Demo',
+ "--start", $start,
+ "--end", "start + 400 min",
+ "--interlace",
+ "--imgformat","PNG",
+ "--width=450",
+ "DEF:a=$rrd:a:AVERAGE",
+ "DEF:b=$rrd:b:AVERAGE",
+ "CDEF:alpha=TIME,1200,%,600,LT,a,UNKN,IF",
+ "CDEF:beta=TIME,1200,%,600,GE,b,UNKN,IF",
+ "AREA:alpha#0022e9:alpha",
+ "AREA:beta#00b674:beta",
+ "LINE1:b#ff4400:beta envelope\\c",
+ "COMMENT:\\s",
+ "COMMENT:CDEF\:alpha=TIME,1200,%,600,LT,a,UNKN,IF",
+ "COMMENT:CDEF\:beta=TIME,1200,%,600,GE,b,UNKN,IF\\j";
+if ($ERROR = RRDs::error) {
+ print "ERROR: $ERROR\n";
+};
+
+
+print "This script has created stripes.png in the current directory\n";
+print "This demonstrates the use of the TIME and % RPN operators\n";
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.am
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.am (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/Makefile.am Sat Jul 13 19:23:47 2002
@@ -0,0 +1,10 @@
+## Process this file with automake to produce Makefile.in
+
+#AUTOMAKE_OPTIONS= foreign
+#
+#ACLOCAL_M4= $(top_srcdir)/config/aclocal.m4
+
+EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
+
+examplesdir = $(prefix)/examples
+examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
Added: trunk/orca/packages/rrdtool-1.0.7.2/examples/cgi-demo.cgi.in
==============================================================================
--- trunk/orca/packages/rrdtool-1.0.7.2/examples/cgi-demo.cgi.in (original)
+++ trunk/orca/packages/rrdtool-1.0.7.2/examples/cgi-demo.cgi.in Sat Jul 13 19:23:47 2002
@@ -0,0 +1,40 @@
+#! @prefix@/bin/rrdcgi
+
+<HTML>
+<HEAD>
+<TITLE>RRDCGI Demo</TITLE>
+</HEAD>
+<BODY>
+Note: This Demo will only work if have previously run
+the <TT>shared-demo.pl</TT>.
+
+<H1>This is NOT traffic</H1>
+
+
+<P><RRD::GRAPH cgi-demo1.gif
+ --lower-limit 0
+ --start 'end-10h'
+ --title "Graph in Localtime"
+ DEF:alpha=shared-demo.rrd:a:AVERAGE
+ DEF:beta=shared-demo.rrd:b:AVERAGE
+ AREA:alpha#0022e9:"Trees on Mars"
+ STACK:beta#00b871:"Elchs in Norway">
+</P>
+
+<P><RRD::SETENV TZ UTC>
+ <RRD::GRAPH cgi-demo2.gif
+ --lower-limit 0
+ --start 'end-10h'
+ --title "Graph in UTC"
+ DEF:alpha=shared-demo.rrd:a:AVERAGE
+ DEF:beta=shared-demo.rrd:b:AVERAGE
+ AREA:alpha#0022e9:"Trees on Mars"
+ STACK:beta#00b871:"Elchs in Norway">
+</P>
+
+</BODY>
+</HTML>
+
+
+
+
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/Makefile.dist
Deleted: trunk/orca/packages/rrdtool-1.0.7.2/MANIFEST
Modified: trunk/orca/packages/Digest-MD5-2.09/MD5.pm
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/MD5.pm (original)
+++ trunk/orca/packages/Digest-MD5-2.09/MD5.pm Sat Jul 13 19:23:49 2002
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '2.07'; # $Date: 1999/04/03 18:07:49 $
+$VERSION = '2.09'; # $Date: 1999/08/05 23:24:05 $
require Exporter;
*import = \&Exporter::import;
@@ -152,13 +152,13 @@
$md5 = Digest::MD5->new;
$md5->add('foo', 'bar');
$md5->add('baz');
- $digest = $md5->digest();
+ $digest = $md5->hexdigest;
- print "Digest is ", unpack("H*", $digest), "\n";
+ print "Digest is $digest\n";
With OO style you can break the message arbitrary. This means that we
-are no longer limited to have space for the whole message in memory.
-We can handle messages of any size.
+are no longer limited to have space for the whole message in memory, i.e.
+we can handle messages of any size.
This is useful when calculating checksum for files:
@@ -175,7 +175,8 @@
close(FILE);
print $md5->b64digest, " $file\n";
-Or we can use the builtin addfile method to read the file much faster:
+Or we can use the builtin addfile method for more efficient reading of
+the file:
use Digest::MD5;
Added: trunk/orca/packages/Digest-MD5-2.09/MD2/t/badfile.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/MD2/t/badfile.t (original)
+++ trunk/orca/packages/Digest-MD5-2.09/MD2/t/badfile.t Sat Jul 13 19:23:49 2002
@@ -0,0 +1,21 @@
+# Digest::MD5 2.07 and older used to trigger a core dump when
+# passed an illegal file handle that failed to open.
+
+print "1..2\n";
+
+use Digest::MD2 ();
+
+$md5 = Digest::MD2->new;
+
+eval {
+ use vars qw(*FOO);
+ $md5->addfile(*FOO);
+};
+print "not " unless $@ =~ /^Bad filehandle: FOO/;
+print "ok 1\n";
+
+open(BAR, "none-existing-file.$$");
+$md5->addfile(*BAR);
+
+print "not " unless $md5->hexdigest eq Digest::MD2->new->hexdigest;
+print "ok 2\n";
Modified: trunk/orca/packages/Digest-MD5-2.09/MD2/MD2.xs
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/MD2/MD2.xs (original)
+++ trunk/orca/packages/Digest-MD5-2.09/MD2/MD2.xs Sat Jul 13 19:23:49 2002
@@ -1,4 +1,4 @@
-/* $Id: MD2.xs,v 1.8 1999/03/05 21:13:03 gisle Exp $ */
+/* $Id: MD2.xs,v 1.9 1999/07/28 10:33:47 gisle Exp $ */
/*
* This library is free software; you can redistribute it and/or
@@ -322,10 +322,12 @@
unsigned char buffer[4096];
int n;
CODE:
- /* Process blocks until EOF */
- while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
- MD2Update(context, buffer, n);
- }
+ if (fh) {
+ /* Process blocks until EOF */
+ while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
+ MD2Update(context, buffer, n);
+ }
+ }
XSRETURN(1); /* self */
void
Modified: trunk/orca/packages/Digest-MD5-2.09/t/files.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/t/files.t (original)
+++ trunk/orca/packages/Digest-MD5-2.09/t/files.t Sat Jul 13 19:23:50 2002
@@ -7,10 +7,10 @@
# This is the output of: 'md5sum Changes README MD5.pm MD5.xs rfc1321.txt'
#
my $EXPECT = <<EOT;
-2eb85a6e3342d3dcd4695ef65e208a9b Changes
-3bb95afbdd85db7bb46b230b81c10466 README
-4cccdccc1aab2df360757e9034fa448f MD5.pm
-0ebd4a0bd1cc9840114d811254826cdd MD5.xs
+b9071b32f32f43369a924eccf577d9c3 Changes
+95b8301e390d5a12ea5a544e9dfa89a0 README
+59a47ddf31ab471af4e4ab644fde3338 MD5.pm
+709a74b880357389287af3c9936f97a4 MD5.xs
754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt
EOT
Added: trunk/orca/packages/Digest-MD5-2.09/t/badfile.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/t/badfile.t (original)
+++ trunk/orca/packages/Digest-MD5-2.09/t/badfile.t Sat Jul 13 19:23:50 2002
@@ -0,0 +1,21 @@
+# Digest::MD5 2.07 and older used to trigger a core dump when
+# passed an illegal file handle that failed to open.
+
+print "1..2\n";
+
+use Digest::MD5 ();
+
+$md5 = Digest::MD5->new;
+
+eval {
+ use vars qw(*FOO);
+ $md5->addfile(*FOO);
+};
+print "not " unless $@ =~ /^Bad filehandle: FOO/;
+print "ok 1\n";
+
+open(BAR, "none-existing-file.$$");
+$md5->addfile(*BAR);
+
+print "not " unless $md5->hexdigest eq "d41d8cd98f00b204e9800998ecf8427e";
+print "ok 2\n";
Modified: trunk/orca/packages/Digest-MD5-2.09/lib/MD5.pm
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/lib/MD5.pm (original)
+++ trunk/orca/packages/Digest-MD5-2.09/lib/MD5.pm Sat Jul 13 19:23:51 2002
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA);
-$VERSION = '2.00'; # $Date: 1998/10/23 11:19:27 $
+$VERSION = '2.01'; # $Date: 1999/08/05 23:17:54 $
require Digest::MD5;
@ISA=qw(Digest::MD5);
@@ -40,11 +40,11 @@
The current C<MD5> module is just a wrapper around the C<Digest::MD5>
module. It is provided so that legacy code that rely on the old
-interface get the speed benefit of the new module.
+interface still work and get the speed benefit of the new module.
-In addition to the methods provided by C<Digest::MD5> this module
-provide the class methods MD5->hash() and MD5->hexhash() that
-basically do the same as the md5() and md5_hex() functions provided
+In addition to the methods provided for C<Digest::MD5> objects, this
+module provide the class methods MD5->hash() and MD5->hexhash() that
+basically do the same as the md5() and md5_hex() functions provided by
C<Digest::MD5>.
=head1 SEE ALSO
Modified: trunk/orca/packages/Digest-MD5-2.09/lib/Digest.pm
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/lib/Digest.pm (original)
+++ trunk/orca/packages/Digest-MD5-2.09/lib/Digest.pm Sat Jul 13 19:23:51 2002
@@ -53,8 +53,8 @@
The C<Digest::> modules calculate digests, also called "fingerprints"
or "hashes", of some data, called a message. The digest is some small
-fixed size string. The actual size depend of the algorithm used. The
-message is simply a sequence of arbitrary bytes.
+fixed size string. The actual size of the digest depend of the
+algorithm used. The message is simply a sequence of arbitrary bytes.
An important property of the digest algorithms is that the digest is
I<likely> to change if the message change in some way. Another
@@ -85,7 +85,7 @@
A string of portable printable characters. This is the base64 encoded
representation of the digest with any trailing padding removed. The
-string will be about 30% longer than the binary version. The
+string will be about 30% longer than the binary version.
L<MIME::Base64> tells you more about this encoding.
=back
@@ -125,7 +125,8 @@
If new() is called as a instance method (i.e. $ctx->new) it will just
reset the state the object to the state of a newly created object. No
-new object is created in this case.
+new object is created in this case, and the return value is the
+reference to the object (i.e. $ctx).
=item $ctx->reset
Modified: trunk/orca/packages/Digest-MD5-2.09/MANIFEST
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/MANIFEST (original)
+++ trunk/orca/packages/Digest-MD5-2.09/MANIFEST Sat Jul 13 19:23:52 2002
@@ -4,6 +4,7 @@
MD2/MD2.xs MD2 XS implementation
MD2/Makefile.PL Perl Makefile builder
MD2/rfc1319.txt The MD2 Message-Digest Algorithm
+MD2/t/badfile.t Try addfile() on unopened file
MD2/t/md2.t Test if Digest::MD2 works
MD2/typemap Supplementary typemap
MD5.pm Digest::MD5 Perl Module
@@ -20,12 +21,16 @@
SHA1/Makefile.PL Perl Makefile builder
SHA1/SHA1.pm Digest::SHA1 module
SHA1/SHA1.xs SHA-1 XS implementation
+SHA1/fip180-1.gif SHA-1 specification illustration
+SHA1/fip180-1.html SHA-1 specification
SHA1/lib/SHA.pm SHA backwards compatibility stuff
+SHA1/t/badfile.t Try addfile() on unopened file
SHA1/t/sha.t Uwe's old test
SHA1/t/sha1.t Test if Digest::SHA1 works
SHA1/typemap Supplementary typemap
rfc1321.txt The MD5 Message-Digest Algorithm
rfc2104.txt HMAC: Keyed-Hashing for Message Authentication
+t/badfile.t Try addfile() on unopened file
t/digest.t Test Digest.pm loader
t/files.t Check a few files.
t/md5.t Test suite using standard Perl conventions
Modified: trunk/orca/packages/Digest-MD5-2.09/Changes
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/Changes (original)
+++ trunk/orca/packages/Digest-MD5-2.09/Changes Sat Jul 13 19:23:52 2002
@@ -1,3 +1,20 @@
+1999-08-06 Gisle Aas <gisle at aas.no>
+
+ Release 2.09
+
+ Documentation update.
+
+
+
+1999-07-28 Gisle Aas <gisle at aas.no>
+
+ Release 2.08
+
+ The addfile() methods could trigger a core dump when passed
+ a filehandle that had failed to open.
+
+
+
1999-04-26 Gisle Aas <gisle at aas.no>
Release 2.07
@@ -8,7 +25,7 @@
SHA module did.
The module should now work better when liked statically with perl,
- because we know use a safer module-loaded test in Digest.pm.
+ because we now use a safer module-loaded test in Digest.pm.
Assume we know the outcome of the alignment test on VMS. Patch by
Chuck Lane <lane at duphy4.physics.drexel.edu>
Added: trunk/orca/packages/Digest-MD5-2.09/SHA1/t/badfile.t
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/SHA1/t/badfile.t (original)
+++ trunk/orca/packages/Digest-MD5-2.09/SHA1/t/badfile.t Sat Jul 13 19:23:53 2002
@@ -0,0 +1,21 @@
+# Digest::MD5 2.07 and older used to trigger a core dump when
+# passed an illegal file handle that failed to open.
+
+print "1..2\n";
+
+use Digest::SHA1 ();
+
+$sha = Digest::SHA1->new;
+
+eval {
+ use vars qw(*FOO);
+ $sha->addfile(*FOO);
+};
+print "not " unless $@ =~ /^Bad filehandle: FOO/;
+print "ok 1\n";
+
+open(BAR, "none-existing-file.$$");
+$sha->addfile(*BAR);
+
+print "not " unless $sha->hexdigest eq Digest::SHA1->new->hexdigest;
+print "ok 2\n";
Modified: trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.xs
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.xs (original)
+++ trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.xs Sat Jul 13 19:23:53 2002
@@ -1,4 +1,4 @@
-/* $Id: SHA1.xs,v 1.4 1999/04/26 09:30:29 gisle Exp $ */
+/* $Id: SHA1.xs,v 1.5 1999/07/28 10:36:56 gisle Exp $ */
#ifdef __cplusplus
extern "C" {
@@ -441,10 +441,12 @@
unsigned char buffer[4096];
int n;
CODE:
- /* Process blocks until EOF */
- while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
- sha_update(context, buffer, n);
- }
+ if (fh) {
+ /* Process blocks until EOF */
+ while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
+ sha_update(context, buffer, n);
+ }
+ }
XSRETURN(1); /* self */
void
Modified: trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.pm
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.pm (original)
+++ trunk/orca/packages/Digest-MD5-2.09/SHA1/SHA1.pm Sat Jul 13 19:23:54 2002
@@ -3,7 +3,7 @@
use strict;
use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '1.01'; # $Date: 1999/04/26 09:24:25 $
+$VERSION = '1.02'; # $Date: 1999/08/05 22:58:42 $
require Exporter;
*import = \&Exporter::import;
@@ -103,6 +103,8 @@
L<Digest>, L<Digest::HMAC_SHA1>, L<Digest::MD5>
+http://www.itl.nist.gov/fipspubs/fip180-1.htm
+
=head1 COPYRIGHT
This library is free software; you can redistribute it and/or
Added: trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.html
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.html (original)
+++ trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.html Sat Jul 13 19:23:54 2002
@@ -0,0 +1,1035 @@
+<html><body bgcolor="FFFFFF"><title>FIPS 180-1 - Secure Hash Standard </TITLE>
+<A NAME="FIPS_TOP">
+<!--
+<hr>
+<center>Return to the FIPS<br>
+<a href="index.html" target=_top">Home Page</a></CENTER>
+<hr>
+-->
+<b>FIPS PUB 180-1</B><br>
+Supersedes FIPS PUB 180<br>
+1993 May 11<br><p>
+
+<center>Federal Information<br>
+Processing Standards Publication 180-1<br>
+<br>
+1995 April 17<br></CENTER>
+<b><center>Announcing the Standard for</CENTER></B>
+<br>
+<center><h1>SECURE HASH STANDARD</h1></CENTER>
+<menu>
+<font size=2><A HREF="#FORE_SEC">(The Foreword, Abstract, and
+Key Words</A><br> can be found at the end of this document.) </font><br>
+</MENU>
+<h5>
+Federal Information Processing Standards Publications (FIPS PUBS)
+are issued by the National Institute of Standards and Technology after
+approval by the Secretary of Commerce pursuant to Section 111(d) of the
+Federal Property and Administrative Services Act of 1949, as amended by the
+Computer Security Act of 1987, Public Law 100-235.</h5>
+</P>
+<b>Name of Standard:</B> Secure Hash Standard.
+<br><br>
+<b>Category of Standard:</B> Computer Security.
+<br><br>
+<b>Explanation:</B> This Standard specifies a Secure Hash Algorithm,
+SHA-1, for computing a condensed representation of a message or a data file.
+When a message of any length < 2<sup><font size=1>64</font></sup> bits is
+input, the SHA-1 produces a 160-bit output called a message digest. The
+message digest can then be input to the Digital Signature Algorithm (DSA)
+which generates or verifies the signature for the message. Signing the
+message
+digest rather than the message often improves the efficiency of the process
+because the message digest is usually much smaller in size than the message.
+The same hash algorithm must be used by the verifier of a digital signature as
+was used by the creator of the digital signature.
+<br><br>
+The SHA-1 is called secure because it is computationally infeasible to find
+a message which corresponds to a given message digest, or to find two
+different messages which produce the same message digest. Any change to a
+message in transit will, with very high probability, result in a different
+message digest, and the signature will fail to verify. SHA-1 is a technical
+revision of SHA (FIPS 180). A circular left shift operation has been added
+to the specifications in section 7, line b, page 9 of FIPS 180 and its
+equivalent in section 8, line c, page 10 of FIPS 180. This revision improves
+the security provided by this standard. The SHA-1 is based on principles
+similar to those used by Professor Ronald L. Rivest of MIT when designing
+the MD4 message digest algorithm ("The MD4 Message Digest Algorithm,"
+Advances in Cryptology - CRYPTO '90 Proceedings, Springer-Verlag, 1991,
+pp. 303-311), and is closely modelled after that algorithm.
+<br>
+<center><img src="fip180-1.gif"><br>
+<b>Figure 1: Using the SHA-1 with the DSA</B></CENTER><br><br>
+<b>Approving Authority:</B> Secretary of Commerce.
+<br><br>
+<b>Maintenance Agency:</B> U.S. Department of Commerce, National
+Institute of Standards and Technology, Computer Systems Laboratory.
+<br><br>
+<b>Applicability:</B> This standard is applicable to all Federal departments
+and agencies for the protection of unclassified information that is not subject
+to section 2315 of Title 10, United States Code, or section 3502(2) of Title
+44, United States Code. This standard is required for use with the Digital
+Signature Algorithm (DSA) as specified in the Digital Signature Standard
+(DSS) and whenever a secure hash algorithm is required for Federal applica-
+tions. Private and commercial organizations are encouraged to adopt and use
+this standard.
+<br><br>
+<b>Applications: </B> The SHA-1 may be used with the DSA in electronic
+mail, electronic funds transfer, software distribution, data storage, and other
+applications which require data integrity assurance and data origin
+authentication. The SHA-1 may also be used whenever it is necessary to
+generate a condensed version of a message.
+<br><br>
+<b>Implementations:</B> The SHA-1 may be implemented in software,
+firmware, hardware, or any combination thereof. Only implementations of
+the
+SHA-1 that are validated by NIST will be considered as complying with this
+standard. Information about the requirements for validating
+implementations
+of this standard can be obtained from the National Institute of Standards
+and Technology, Computer Systems Laboratory, Attn: SHS Validation,
+Gaithersburg, MD 20899.
+<br><br>
+<b>Export Control:</B> Implementations of this standard are subject to
+FederalGovernment export controls as specified in Title 15, Code of Federal
+Regulations, Parts 768 through 799. Exporters are advised to contact the
+Department of Commerce, Bureau of Export Administration for more
+information.
+<br><br>
+<b>Patents:</B> Implementations of the SHA-1 in this standard may be
+covered by U.S. and foreign patents.
+<br><br>
+<b>Implementation Schedule:</B> This standard becomes effective October
+2, 1995.
+<br><br>
+<b>Specifications:</B> Federal Information Processing Standard (FIPS
+180-1) Secure Hash Standard (affixed).
+<br><br>
+<b>Cross Index:</B>
+<dl>
+<dd>a. FIPS PUB 46-2, Data Encryption Standard.
+<br><br>
+<dd>b. FIPS PUB 73, Guidelines for Security of Computer Applications.
+<br><br>
+<dd>c. FIPS PUB 140-1, Security Requirements for Cryptographic Modules.
+<br><br>
+<dd>d. FIPS PUB 186, Digital Signature Standard.
+<br><br>
+<dd>e. Federal Informations Resources Management Regulations (FIRMR)
+subpart 201.20.303, Standards, and subpart 201.39.1002, Federal Standards.
+</DL><br>
+<b>Objectives:</B> The objectives of this standard are to:
+<dl>
+<dd>a. Specify the secure hash algorithm required for use with the Digital
+ Signature Standard (FIPS 186) in the generation and verification of
+ digital signatures;
+<br><br>
+<dd>b. Specify the secure hash algorithm to be used whenever a secure hash
+ algorithm is required for Federal applications; and<br><br>
+
+<dd>c. Encourage the adoption and use of the specified secure hash algorithm
+ by private and commercial organizations.
+</DL><br>
+<b>Qualifications:</B> While it is the intent of this standard to specify a
+secure hash algorithm, conformance to this standard does not assure that a
+particular implementation is secure. The responsible authority in each agency
+or department shall assure that an overall implementation provides an
+acceptable level of security. This standard will be reviewed every five years in
+order to assess its adequacy.
+<br><br>
+<b>Waiver Procedure:</B> Under certain exceptional circumstances, the
+heads of Federal departments and agencies may approve waivers to Federal
+Information Processing Standards (FIPS). The head of such agency may
+redelegate such authority only to a senior official designated pursuant to
+section 3506(b) of Title 44, United States Code. Waiver shall be granted only
+when:
+<dl>
+<dd>a. Compliance with a standard would adversely affect the
+accomplishment of the mission of an operator of a Federal computer system;
+or<br><br>
+<dd>b. Compliance with a standard would cause a major adverse financial
+impact on the operator which is not offset by Government-wide savings.
+</OL><br>
+Agency heads may act upon a written waiver request containing the
+information detailed above. Agency heads may also act without a written
+waiver request when they determine that conditions for meeting the standard
+cannot be met. Agency heads may approve waivers only by a written decision
+which explains the basis on which the agency head made the required
+finding(s). A copy of each decision, with procurement sensitive or classified
+portions clearly identified, shall be sent to: National Institute of Standards
+and
+Technology; ATTN: FIPS Waiver Decisions, Technology Building, Room
+B-154, Gaithersburg, MD 20899.
+<br><br>
+In addition, notice of each waiver granted and each delegation of authority
+to approve waivers shall be sent promptly to the Committee on Government
+Operations of the House of Representatives and the Committee on
+Government Affairs of the Senate and shall be published promptly in the
+Federal Register.
+<br><br>
+When the determination on a waiver applies to the procurement of equipment
+and/or services, a notice of the waiver determination must be published in
+the Commerce Business Daily as a part of the notice of solicitation for
+offers of an acquisition or, if the waiver determination is made after that
+notice is published, by amendment to such notice.
+<br><br>
+A copy of the waiver, any supporting documents, the document approving the
+waiver and any accompanying documents, with such deletions as the agency is
+authorized and decides to make under 5 United States Code Section 552(b),
+shall be part of the procurement documentation and retained by the agency.
+<br><br>
+<b>Where to Obtain Copies of the Standard: </B> Copies of this publication
+are for sale by the National Technical Information Service, U.S. Department
+of
+Commerce, Springfield, VA 22161. When ordering, refer to Federal
+Information Processing Standards Publication 180-1 (FIPSPUB180-1), and
+identify the title. When microfiche is desired, this should be specified. Prices
+are published by NTIS in current catalogs and other issuances. Payment may
+be made by check, money order, deposit account or charged to a credit card
+accepted by NTIS.</P>
+<br><hr>
+<b>FIPS PUB 180-1</B><br>
+Supersedes FIPS PUB 180<br>
+1993 May 11<br>
+<p>
+<center>Federal Information<br>
+Processing Standards Publication 180-1<br><br>
+1995 April 17<br></CENTER>
+<b><center>Specifications for</CENTER></B>
+<br>
+<center><h1>SECURE HASH STANDARD</h1></CENTER>
+<br><br>
+<center><b>1. INTRODUCTION</B></CENTER>
+<br><br>
+The Secure Hash Algorithm (SHA-1) is required for use with the Digital
+Signature Algorithm (DSA) as specified in the Digital Signature Standard
+(DSS) and whenever a secure hash algorithm is required for federal applica-
+tions. For a message of length < 2^64 bits, the SHA-1 produces a 160-bit
+condensed representation of the message called a message digest. The
+message
+digest is used during generation of a signature for the message. The SHA-1
+is also used to compute a message digest for the received version of the
+message during the process of verifying the signature. Any change to the
+message in transit will, with very high probability, result in a different
+message digest, and the signature will fail to verify.
+<br><br>
+The SHA-1 is designed to have the following properties: it is computationally
+infeasible to find a message which corresponds to a given message digest, or
+to find two different messages which produce the same message digest.
+<br><br>
+<center><b>2. BIT STRINGS AND INTEGERS</B></CENTER>
+<br><br>
+The following terminology related to bit strings and integers will be used:
+<dl>
+<dd>a. A hex digit is an element of the set {0, 1, ... , 9, A, ... , F}. A hex digit
+is the representation of a 4-bit string. <b>Examples:</B> 7 = 0111, A = 1010.
+<br><br>
+<dd>b. A word equals a 32-bit string which may be represented as a sequence
+of 8 hex digits. To convert a word to 8 hex digits each 4-bit string is converted
+to its hex equivalent as described in (a) above. <b>Example: </B><br><br>
+<center>
+ 1010 0001 0000 0011 1111 1110 0010 0011 = A103FE23.
+</CENTER><br>
+<dd>c. An integer between 0 and 2<sup><font size=1>32</font></sup> - 1
+inclusive may be represented as a word. The least significant four bits of the
+integer are represented by the
+right-most hex digit of the word representation. <b>Example:</B> the
+integer
+291 = 2<sup><font size=1>8</font></sup>+2<sup><font
+size=1>5</font></sup>+2<sup><font size=1>1</font></sup>+2<sup><font
+size=1>0</font></sup> = 256+32+2+1 is represented by the hex word,
+00000123.
+<br><br>
+<dd>If z is an integer, 0 <= z < 2<sup><font size=1>64</font></sup>, then z =
+2<sup><font size=1>32</font></sup>x + y where
+ 0 <= x < 2<sup><font size=1>32</font></sup> and 0 <= y < 2<sup><font
+size=1>32</font></sup>. Since x and y can be represented as
+ words X and Y, respectively, z can be represented as the pair of words
+ (X,Y).
+<br><br>
+<dd>d. block = 512-bit string. A block (e.g., B) may be represented as a
+ sequence of 16 words.</DL><br>
+<center><b>3. OPERATIONS ON WORDS</B></CENTER>
+<br><br>
+The following logical operators will be applied to words:
+<dl>
+<dd>a. Bitwise logical word operations
+<pre>
+X ^ Y = bitwise logical "and" of X and Y.
+
+X \/ Y = bitwise logical "inclusive-or" of X and Y.
+
+X XOR Y = bitwise logical "exclusive-or" of X and Y.
+
+~ X = bitwise logical "complement" of X.
+</PRE><br>
+ <dd><b>Example: </B>
+<pre>
+ 01101100101110011101001001111011
+ XOR 01100101110000010110100110110111
+ --------------------------------
+ = 00001001011110001011101111001100
+</pre>
+ <dd>b. The operation X + Y is defined as follows: words X and Y represent
+ integers x and y, where 0 <= x < 2<sup><font size=1>32</font></sup> and
+0
+<= y < 2<sup><font size=1>32</font></sup>. For positive
+ integers n and m, let n mod m be the remainder upon dividing n by m.
+ Compute
+<dl>
+<dd>z = (x + y) mod 2<sup><font size=1>32</font></sup>.
+</DL><br>
+<dd>Then 0 <= z < 2<sup><font size=1>32</FONT></sup>. Convert z to a
+word, Z, and define Z = X + Y.
+<br><br>
+ <dd>c. The circular left shift operation S<sup><font
+size=1>n</font></sup>(X), where X is a word and n is an
+ integer with 0 <= n <sup><font size=1>32</font></sup>, is defined by
+<dl>
+<dd>S<sup><font size=1>n</font></sup>(X) = (X << n) OR (X >> 32-n).
+</DL><br>
+<dd>In the above, X << n is obtained as follows: discard the left-most n
+ bits of X and then pad the result with n zeroes on the right (the result
+ will still be 32 bits). X >> n is obtained by discarding the right-most
+ n bits of X and then padding the result with n zeroes on the left. Thus
+ S<sup><font size=1>n</font></sup>(X) is equivalent to a circular shift of
+X
+by n positions to the left.</DL><br>
+
+<center><b>4. MESSAGE PADDING</B></CENTER>
+<br><br>
+The SHA-1 is used to compute a message digest for a message or data file that
+is provided as input. The message or data file should be considered to be a
+bit string. The length of the message is the number of bits in the message
+(the empty message has length 0). If the number of bits in a message is a
+multiple of 8, for compactness we can represent the message in hex. The
+purpose of message padding is to make the total length of a padded message a
+multiple of 512. The SHA-1 sequentially processes blocks of 512 bits when
+computing the message digest. The following specifies how this padding shall
+be performed. As a summary, a "1" followed by m "0"s followed by a 64-bit
+integer are appended to the end of the message to produce a padded message
+of length 512 * n. The 64-bit integer is l, the length of the original message.
+The padded message is then processed by the SHA-1 as n 512-bit blocks.
+<br><br>
+Suppose a message has length l < 2<sup><font size=1>64</font></sup>.
+Before it is input to the SHA-1, the
+message is padded on the right as follows:
+<dl>
+ <dd>a. "1" is appended. <b> Example:</B> if the original message is
+"01010000", this is padded to "010100001".
+<br><br>
+ <dd>b. "0"s are appended. The number of "0"s will depend on the original
+length of the message. The last 64 bits of the last 512-bit block are reserved
+for the length l of the original message.
+<dl>
+<dd><b>Example:</B> Suppose the original message is the bit string<br>
+
+<center>01100001 01100010 01100011 01100100 01100101.</CENTER>
+ <br>
+<dd>After step (a) this gives
+<br>
+<center>01100001 01100010 01100011 01100100 01100101 1.</CENTER>
+<br><br>
+<dd>Since l = 40, the number of bits in the above is 41 and 407 "0"s are
+ appended, making the total now 448. This gives (in hex)
+<dl>
+<dd>61626364 65800000 00000000 00000000
+<dd>00000000 00000000 00000000 00000000
+<dd>00000000 00000000 00000000 00000000
+<dd>00000000 00000000.
+</DL><br>
+ <dd>c. Obtain the 2-word representation of l, the number of bits in the
+original message. If l < 2<sup><font size=1>32</font></sup> then the first
+word is all zeroes. Append these two words to the padded message.
+<dl>
+<dd><b>Example:</B> Suppose the original message is as in (b). Then l = 40
+(note that l is computed before any padding). The two-word representation of
+40 is hex 00000000 00000028. Hence the final padded message is hex
+<dl>
+<dd>61626364 65800000 00000000 00000000
+<dd>00000000 00000000 00000000 00000000
+<dd>00000000 00000000 00000000 00000000
+<dd>00000000 00000000 00000000 00000028.
+</DL><br></DL>
+The padded message will contain 16 * n words for some n > 0. The padded
+message is regarded as a sequence of n blocks M<sub><font
+size=1>1</font></sub> , M<sub><font size=1>2</font></sub>, ... ,
+M<sub><font size=1>n</font></sub>, where
+each M<sub><font size=1>i</font></sub> contains 16 words and
+M<sub><font
+size=1>1</font></sub> contains the first characters (or bits)
+of the message.<br><br>
+<center><b>5. FUNCTIONS USED</B></CENTER>
+<br><br>
+A sequence of logical functions f<sub><font size=1>0</font></sub>,
+f<sub><font size=1>1</font></sub>,..., f<sub><font size=1>79</font></sub>
+is
+used in the SHA-1.
+Each f<sub><font size=1>t</font></sub>, 0 <= t <= 79, operates on three
+32-bit words B, C, D and produces
+a 32-bit word as output. f<sub><font size=1>t</font></sub>(B,C,D) is defined
+as follows:
+for words B, C, D,<dl>
+
+<dd>f<sub><font size=1>t</font></sub>(B,C,D) = (B AND C) OR ((NOT B)
+AND D) ( 0 <= t <= 19)
+<br><br>
+<dd>f<sub><font size=1>t</font></sub>(B,C,D) = B XOR C XOR D
+
+ (20 <= t <= 39)
+<br><br>
+<dd>f<sub><font size=1>t</font></sub>(B,C,D) = (B AND C) OR (B AND
+D)
+OR (C AND D) (40 <= t <= 59)
+<br><br>
+<dd>f<sub><font size=1>t</font></sub>(B,C,D) = B XOR C XOR D
+
+ (60 <= t <= 79).
+</DL><br>
+<center><b>6. CONSTANTS USED</B></CENTER>
+<br><br>
+ A sequence of constant words K(0), K(1), ... , K(79) is used in the SHA-1.
+In hex these are given by
+<dl>
+<dd>K = 5A827999 ( 0 <= t <= 19)
+<br><br>
+<dd>K<sub><font size=1>t</font></sub> = 6ED9EBA1 (20 <= t <= 39)
+<br><br>
+<dd>K<sub><font size=1>t</font></sub> = 8F1BBCDC (40 <= t <= 59)
+<br><br>
+<dd>K<sub><font size=1>t</font></sub> = CA62C1D6 (60 <= t <= 79).
+</DL><br>
+<center><b>7. COMPUTING THE MESSAGE DIGEST</B></CENTER>
+<br><br>
+ The message digest is computed using the final padded message. The
+computation uses two buffers, each consisting of five 32-bit words, and a
+sequence of eighty 32-bit words. The words of the first 5-word buffer are
+labeled A,B,C,D,E. The words of the second 5-word buffer are labeled
+H<sub><font size=1>0</font></sub>, H<sub><font size=1>1</font></sub>,
+H<sub><font size=1>2</font></sub>, H<sub><font size=1>3</font></sub>,
+H<sub><font size=1>4</font></sub>. The words of the 80-word sequence are
+labeled W<sub><font size=1>0</font></sub>, W<sub><font
+size=1>1</font></sub>,...,
+W<sub><font size=1>79</font></sub>. A single word buffer TEMP is also
+employed.
+<br><br>
+ To generate the message digest, the 16-word blocks M<sub><font
+size=1>1</font></sub>, M<sub><font size=1>2</font></sub>,...,
+M<sub><font
+size=1>n</font></sub>
+defined in Section 4 are processed in order. The processing of each
+M<sub><font size=1>i</font></sub>
+involves 80 steps.
+<br><br>
+ Before processing any blocks, the {H<sub><font size=1>i</font></sub>} are
+initialized as follows: in hex,
+<dl>
+<dd>H<sub><font size=1>0</font></sub> = 67452301
+<br><br>
+<dd>H<sub><font size=1>1</font></sub> = EFCDAB89
+<br><br>
+<dd>H<sub><font size=1>2</font></sub> = 98BADCFE
+<br><br>
+<dd>H<sub><font size=1>3</font></sub> = 10325476
+<br><br>
+<dd>H<sub><font size=1>4</font></sub> = C3D2E1F0.
+</DL><br>
+ Now M<sub><font size=1>1</font></sub>, M<sub><font
+size=1>2</font></sub>, ... , M<sub><font size=1>n</font></sub> are
+processed. To process M<sub><font size=1>i</font></sub>, we proceed as
+follows:
+<dl>
+<dd>a. Divide M<sub><font size=1>i</font></sub> into 16 words
+W<sub><font size=1>0</font></sub>, W<sub><font size=1>1</font></sub>,
+...
+, W<sub><font size=1>15</font></sub>, where W<sub><font
+size=1>0</font></sub> is the left-most word.
+<br><br>
+<dd>b. For t = 16 to 79 let W<sub><font size=1>t</font></sub> =
+S<sup><font
+size=1>1</font></sup>(W<sub><font size=1>t-3</font></sub> XOR
+W<sub><font size=1>t-8</font></sub> XOR W<sub><font size=1>t-
+14</font></sub> XOR W<sub><font size=1>t-16</font></sub>).
+<br><br>
+<dd>c. Let A = H<sub><font size=1>0</font></sub>, B = H<sub><font
+size=1>1</font></sub>, C = H<sub><font size=1>2</font></sub>, D =
+H<sub><font size=1>3</font></sub>, E = H<sub><font
+size=1>4</font></sub>.<br><br>
+<dd>d. For t = 0 to 79 do
+<dl>
+<dd>TEMP = S<sup><font size=1>5</font></sup>(A) + f<sub><font
+size=1>t</font></sub>(B,C,D) + E + W<sub><font size=1>t</font></sub> +
+K<sub><font size=1>t</font></sub>;
+<br><br>
+<dd>E = D; D = C; C = S<sup><font size=1>30</font></sup>(B); B = A; A =
+TEMP;
+</DL><br>
+<dd>e. Let H<sub><font size=1>0</font></sub> = H<sub><font
+size=1>0</font></sub> + A, H<sub><font size=1>1</font></sub> =
+H<sub><font size=1>1</font></sub> + B, H<sub><font
+size=1>2</font></sub>
+= H<sub><font size=1>2</font></sub> + C, H<sub><font
+size=1>3</font></sub> = H<sub><font size=1>3</font></sub> + D,
+H<sub><font size=1>4</font></sub> = H<sub><font size=1>4</font></sub> +
+E.
+</DL><br>
+ After processing M<sub><font size=1>n</font></sub>, the message digest is
+the 160-bit string
+represented by the 5 words
+<dl>
+<dd>H<sub><font size=1>0</font></sub> H<sub><font
+size=1>1</font></sub> H<sub><font size=1>2</font></sub> H<sub><font
+size=1>3</font></sub> H<sub><font size=1>4</font></sub>.
+</DL><br>
+<center><b>8. ALTERNATE METHOD OF COMPUTATION</B>
+</CENTER><br><br>
+ The above assumes that the sequence W<sub><font size=1>0</font></sub>,
+... , W<sub><font size=1>79</font></sub> is implemented
+as an array of eighty 32-bit words. This is efficient from the standpoint
+of minimization of execution time, since the addresses of W<sub><font
+size=1>t-3</font></sub>, ... ,W<sub><font size=1>t-16</font></sub>
+in step (b) are easily computed. If space is at a premium, an alternative is
+to regard { W<sub><font size=1>t</font></sub> } as a circular queue, which
+may be implemented using an
+array of sixteen 32-bit words W[0], ... W[15]. In this case, in hex let
+MASK = 0000000F. Then processing of M<sub><font size=1>i</font></sub>
+is as follows:
+<dl>
+<dd>a. Divide M<sub><font size=1>i</font></sub> into 16 words W[0], ... ,
+W[15], where W[0] is the
+ left-most word.
+<br><br>
+<dd>b. Let A = H<sub><font size=1>0</font></sub>, B = H<sub><font
+size=1>1</font></sub>, C = H<sub><font size=1>2</font></sub>, D =
+H<sub>3<font size=1></font></sub>, E = H<sub><font
+size=1>4</font></sub>.
+<br><br>
+<dd>c. For t = 0 to 79 do
+ <dl>
+<dd>s = t ^ MASK;
+<br><br>
+<dd>if (t >= 16) W[s] = S<sup><font size=1>1</font></sup>(W[(s + 13) ^
+MASK] XOR W[(s + 8) AND MASK]
+XOR W[(s + 2) ^ MASK] XOR W[s]);
+<br><br>
+<dd>TEMP = S<sup><font size=1>5</font></sup>(A) + f<sub><font
+size=1>t</font></sub>(B,C,D) + E + W[s] + K<sub><font
+size=1>t</font></sub>;
+<br><br>
+<dd>E = D; D = C; C = S<sup><font size=1>30</font></sup>(B); B = A; A =
+TEMP;
+</DL><br>
+<dd>d. Let H<sub><font size=1>0</font></sub> = H<sub><font
+size=1>0</font></sub> + A, H<sub><font size=1>1</font></sub> =
+H<sub><font size=1>1</font></sub> + B, H<sub><font
+size=1>2</font></sub>
+= H<sub><font size=1>2</font></sub> + C, H<sub><font
+size=1>3</font></sub> = H<sub><font size=1>3</font></sub> + D,
+H<sub><font size=1>4</font></sub> = H<sub><font size=1>4</font></sub> +
+E.
+</DL><br>
+<center><b>9. COMPARISON OF METHODS</B></CENTER>
+<br><br>
+The methods of Sections 7 and 8 yield the same message digest. Although
+using the method of Section 8 saves sixty-four 32-bit words of storage, it
+is likely to lengthen execution time due to the increased complexity of the
+address computations for the { W[t] } in step (c). Other computation methods
+which give identical results may be implemented in conformance with the
+standard.
+<br><br></UL></DL>
+<center><b>APPENDIX A. A SAMPLE MESSAGE AND ITS MESSAGE
+DIGEST</B></CENTER>
+<br><br>
+This appendix is for informational purposes only and is not required to meet
+the standard.
+<br><br>
+Let the message be the ASCII binary-coded form of "abc", i.e.,
+<br><dl>
+<dd>01100001 01100010 01100011.
+</DL><br>
+This message has length l = 24. In step (a) of Section 4, we append "1". In
+step (b) we append 423 "0"s. In step (c) we append hex 00000000 00000018,
+the 2-word representation of 24. Thus the final padded message consists of
+one block, so that n = 1 in the notation of Section 4.
+<br><br>
+The initial hex values of {H<sub><font size=1>i</font></sub>} are
+<br><br>
+H<sub><font size=1>0</font></sub> = 67452301
+<br>
+H<sub><font size=1>1</font></sub> = EFCDAB89
+<br>
+H<sub><font size=1>2</font></sub> = 98BADCFE
+<br>
+H<sub><font size=1>3</font></sub> = 10325476
+<br>
+H<sub><font size=1>4</font></sub> = C3D2E1F0.
+<br><br>
+Start processing block 1. The words of block 1 are
+<br><br>
+W[0] = 61626380<br>
+W[1] = 00000000<br>
+W[2] = 00000000<br>
+W[3] = 00000000<br>
+W[4] = 00000000<br>
+W[5] = 00000000<br>
+W[6] = 00000000<br>
+W[7] = 00000000<br>
+W[8] = 00000000<br>
+W[9] = 00000000<br>
+W[10] = 00000000<br>
+W[11] = 00000000<br>
+W[12] = 00000000<br>
+W[13] = 00000000<br>
+W[14] = 00000000<br>
+W[15] = 00000018.
+<br><br>
+The hex values of A,B,C,D,E after pass t of the "for t = 0 to 79" loop
+(step (d) of Section 7 or step (c) of Section 8) are<br><pre>
+
+ A B C D E
+
+t = 0: 0116FC33 67452301 7BF36AE2 98BADCFE 10325476
+t = 1: 8990536D 0116FC33 59D148C0 7BF36AE2 98BADCFE
+t = 2: A1390F08 8990536D C045BF0C 59D148C0 7BF36AE2
+t = 3: CDD8E11B A1390F08 626414DB C045BF0C 59D148C0
+t = 4: CFD499DE CDD8E11B 284E43C2 626414DB C045BF0C
+t = 5: 3FC7CA40 CFD499DE F3763846 284E43C2 626414DB
+t = 6: 993E30C1 3FC7CA40 B3F52677 F3763846 284E43C2
+t = 7: 9E8C07D4 993E30C1 0FF1F290 B3F52677 F3763846
+t = 8: 4B6AE328 9E8C07D4 664F8C30 0FF1F290 B3F52677
+t = 9: 8351F929 4B6AE328 27A301F5 664F8C30 0FF1F290
+t = 10: FBDA9E89 8351F929 12DAB8CA 27A301F5 664F8C30
+t = 11: 63188FE4 FBDA9E89 60D47E4A 12DAB8CA 27A301F5
+t = 12: 4607B664 63188FE4 7EF6A7A2 60D47E4A 12DAB8CA
+t = 13: 9128F695 4607B664 18C623F9 7EF6A7A2 60D47E4A
+t = 14: 196BEE77 9128F695 1181ED99 18C623F9 7EF6A7A2
+t = 15: 20BDD62F 196BEE77 644A3DA5 1181ED99 18C623F9
+t = 16: 4E925823 20BDD62F C65AFB9D 644A3DA5 1181ED99
+t = 17: 82AA6728 4E925823 C82F758B C65AFB9D 644A3DA5
+t = 18: DC64901D 82AA6728 D3A49608 C82F758B C65AFB9D
+t = 19: FD9E1D7D DC64901D 20AA99CA D3A49608 C82F758B
+t = 20: 1A37B0CA FD9E1D7D 77192407 20AA99CA D3A49608
+t = 21: 33A23BFC 1A37B0CA 7F67875F 77192407 20AA99CA
+t = 22: 21283486 33A23BFC 868DEC32 7F67875F 77192407
+t = 23: D541F12D 21283486 0CE88EFF 868DEC32 7F67875F
+t = 24: C7567DC6 D541F12D 884A0D21 0CE88EFF 868DEC32
+t = 25: 48413BA4 C7567DC6 75507C4B 884A0D21 0CE88EFF
+t = 26: BE35FBD5 48413BA4 B1D59F71 75507C4B 884A0D21
+t = 27: 4AA84D97 BE35FBD5 12104EE9 B1D59F71 75507C4B
+t = 28: 8370B52E 4AA84D97 6F8D7EF5 12104EE9 B1D59F71
+t = 29: C5FBAF5D 8370B52E D2AA1365 6F8D7EF5 12104EE9
+t = 30: 1267B407 C5FBAF5D A0DC2D4B D2AA1365 6F8D7EF5
+t = 31: 3B845D33 1267B407 717EEBD7 A0DC2D4B D2AA1365
+t = 32: 046FAA0A 3B845D33 C499ED01 717EEBD7 A0DC2D4B
+t = 33: 2C0EBC11 046FAA0A CEE1174C C499ED01 717EEBD7
+t = 34: 21796AD4 2C0EBC11 811BEA82 CEE1174C C499ED01
+t = 35: DCBBB0CB 21796AD4 4B03AF04 811BEA82 CEE1174C
+t = 36: 0F511FD8 DCBBB0CB 085E5AB5 4B03AF04 811BEA82
+t = 37: DC63973F 0F511FD8 F72EEC32 085E5AB5 4B03AF04
+t = 38: 4C986405 DC63973F 03D447F6 F72EEC32 085E5AB5
+t = 39: 32DE1CBA 4C986405 F718E5CF 03D447F6 F72EEC32
+t = 40: FC87DEDF 32DE1CBA 53261901 F718E5CF 03D447F6
+t = 41: 970A0D5C FC87DEDF 8CB7872E 53261901 F718E5CF
+t = 42: 7F193DC5 970A0D5C FF21F7B7 8CB7872E 53261901
+t = 43: EE1B1AAF 7F193DC5 25C28357 FF21F7B7 8CB7872E
+t = 44: 40F28E09 EE1B1AAF 5FC64F71 25C28357 FF21F7B7
+t = 45: 1C51E1F2 40F28E09 FB86C6AB 5FC64F71 25C28357
+t = 46: A01B846C 1C51E1F2 503CA382 FB86C6AB 5FC64F71
+t = 47: BEAD02CA A01B846C 8714787C 503CA382 FB86C6AB
+t = 48: BAF39337 BEAD02CA 2806E11B 8714787C 503CA382
+t = 49: 120731C5 BAF39337 AFAB40B2 2806E11B 8714787C
+t = 50: 641DB2CE 120731C5 EEBCE4CD AFAB40B2 2806E11B
+t = 51: 3847AD66 641DB2CE 4481CC71 EEBCE4CD AFAB40B2
+t = 52: E490436D 3847AD66 99076CB3 4481CC71 EEBCE4CD
+t = 53: 27E9F1D8 E490436D 8E11EB59 99076CB3 4481CC71
+t = 54: 7B71F76D 27E9F1D8 792410DB 8E11EB59 99076CB3
+t = 55: 5E6456AF 7B71F76D 09FA7C76 792410DB 8E11EB59
+t = 56: C846093F 5E6456AF 5EDC7DDB 09FA7C76 792410DB
+t = 57: D262FF50 C846093F D79915AB 5EDC7DDB 09FA7C76
+t = 58: 09D785FD D262FF50 F211824F D79915AB 5EDC7DDB
+t = 59: 3F52DE5A 09D785FD 3498BFD4 F211824F D79915AB
+t = 60: D756C147 3F52DE5A 4275E17F 3498BFD4 F211824F
+t = 61: 548C9CB2 D756C147 8FD4B796 4275E17F 3498BFD4
+t = 62: B66C020B 548C9CB2 F5D5B051 8FD4B796 4275E17F
+t = 63: 6B61C9E1 B66C020B 9523272C F5D5B051 8FD4B796
+t = 64: 19DFA7AC 6B61C9E1 ED9B0082 9523272C F5D5B051
+t = 65: 101655F9 19DFA7AC 5AD87278 ED9B0082 9523272C
+t = 66: 0C3DF2B4 101655F9 0677E9EB 5AD87278 ED9B0082
+t = 67: 78DD4D2B 0C3DF2B4 4405957E 0677E9EB 5AD87278
+t = 68: 497093C0 78DD4D2B 030F7CAD 4405957E 0677E9EB
+t = 69: 3F2588C2 497093C0 DE37534A 030F7CAD 4405957E
+t = 70: C199F8C7 3F2588C2 125C24F0 DE37534A 030F7CAD
+t = 71: 39859DE7 C199F8C7 8FC96230 125C24F0 DE37534A
+t = 72: EDB42DE4 39859DE7 F0667E31 8FC96230 125C24F0
+t = 73: 11793F6F EDB42DE4 CE616779 F0667E31 8FC96230
+t = 74: 5EE76897 11793F6F 3B6D0B79 CE616779 F0667E31
+t = 75: 63F7DAB7 5EE76897 C45E4FDB 3B6D0B79 CE616779
+t = 76: A079B7D9 63F7DAB7 D7B9DA25 C45E4FDB 3B6D0B79
+t = 77: 860D21CC A079B7D9 D8FDF6AD D7B9DA25 C45E4FDB
+t = 78: 5738D5E1 860D21CC 681E6DF6 D8FDF6AD D7B9DA25
+t = 79: 42541B35 5738D5E1 21834873 681E6DF6 D8FDF6AD.
+</PRE>
+Block 1 has been processed. The values of {H<sub><font
+size=1>i</font></sub>} are
+<br><br>
+H<sub><font size=1>0</font></sub> = 67452301 + 42541B35 = A9993E36
+<br>
+H<sub><font size=1>1</font></sub> = EFCDAB89 + 5738D5E1 =
+4706816A
+<br>
+H<sub><font size=1>2</font></sub> = 98BADCFE + 21834873 =
+BA3E2571
+<br>
+H<sub><font size=1>3</font></sub> = 10325476 + 681E6DF6 = 7850C26C
+<br>
+H<sub><font size=1>4</font></sub> = C3D2E1F0 + D8FDF6AD =
+9CD0D89D.
+<br><br>
+Message digest = A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+<br><br><br></UL></DL>
+<center><b>APPENDIX B. A SECOND SAMPLE MESSAGE AND ITS
+MESSAGE DIGEST</B></CENTER>
+<br><br>
+This appendix is for informational purposes only and is not required to
+meet the standard.
+<br><br>
+Let the message be the binary-coded form (cf. Appendix A) of the ASCII
+string
+<br>
+<center>"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq".
+</CENTER><br>
+Since each of the 56 characters is converted to 8 bits, the length of the
+message is l = 448. In step (a) of Section 4, we append "1". In step (b)
+we append 511 "0"s. In step (c) we append the 2-word representation of 448,
+i.e., hex 00000000 000001C0. This gives n = 2.
+<br><br>
+The initial hex values of {H<sub><font size=1>i</font></sub>} are
+<br><br>
+H<sub><font size=1>0</font></sub> = 67452301
+<br>
+H<sub><font size=1>1</font></sub> = EFCDAB89
+<br>
+H<sub><font size=1>2</font></sub> = 98BADCFE
+<br>
+H<sub><font size=1>3</font></sub> = 10325476
+<br>
+H<sub><font size=1>4</font></sub> = C3D2E1F0.
+<br><br>
+Start processing block 1. The words of block 1 are
+<br><br>
+W[0] = 61626364<br>
+W[1] = 62636465<br>
+W[2] = 63646566<br>
+W[3] = 64656667<br>
+W[4] = 65666768<br>
+W[5] = 66676869<br>
+W[6] = 6768696A<br>
+W[7] = 68696A6B<br>
+W[8] = 696A6B6C<br>
+W[9] = 6A6B6C6D<br>
+W[10] = 6B6C6D6E<br>
+W[11] = 6C6D6E6F<br>
+W[12] = 6D6E6F70<br>
+W[13] = 6E6F7071<br>
+W[14] = 80000000<br>
+W[15] = 00000000.
+<br><br>
+The hex values of A,B,C,D,E after pass t of the "for t = 0 to 79" loop (step
+(d) of Section 7 or step (c) of Section 8) are<br>
+ <pre>
+ A B C D E
+
+t = 0: 0116FC17 67452301 7BF36AE2 98BADCFE 10325476
+t = 1: EBF3B452 0116FC17 59D148C0 7BF36AE2 98BADCFE
+t = 2: 5109913A EBF3B452 C045BF05 59D148C0 7BF36AE2
+t = 3: 2C4F6EAC 5109913A BAFCED14 C045BF05 59D148C0
+t = 4: 33F4AE5B 2C4F6EAC 9442644E BAFCED14 C045BF05
+t = 5: 96B85189 33F4AE5B 0B13DBAB 9442644E BAFCED14
+t = 6: DB04CB58 96B85189 CCFD2B96 0B13DBAB 9442644E
+t = 7: 45833F0F DB04CB58 65AE1462 CCFD2B96 0B13DBAB
+t = 8: C565C35E 45833F0F 36C132D6 65AE1462 CCFD2B96
+t = 9: 6350AFDA C565C35E D160CFC3 36C132D6 65AE1462
+t = 10: 8993EA77 6350AFDA B15970D7 D160CFC3 36C132D6
+t = 11: E19ECAA2 8993EA77 98D42BF6 B15970D7 D160CFC3
+t = 12: 8603481E E19ECAA2 E264FA9D 98D42BF6 B15970D7
+t = 13: 32F94A85 8603481E B867B2A8 E264FA9D 98D42BF6
+t = 14: B2E7A8BE 32F94A85 A180D207 B867B2A8 E264FA9D
+t = 15: 42637E39 B2E7A8BE 4CBE52A1 A180D207 B867B2A8
+t = 16: 6B068048 42637E39 ACB9EA2F 4CBE52A1 A180D207
+t = 17: 426B9C35 6B068048 5098DF8E ACB9EA2F 4CBE52A1
+t = 18: 944B1BD1 426B9C35 1AC1A012 5098DF8E ACB9EA2F
+t = 19: 6C445652 944B1BD1 509AE70D 1AC1A012 5098DF8E
+t = 20: 95836DA5 6C445652 6512C6F4 509AE70D 1AC1A012
+t = 21: 09511177 95836DA5 9B111594 6512C6F4 509AE70D
+t = 22: E2B92DC4 09511177 6560DB69 9B111594 6512C6F4
+t = 23: FD224575 E2B92DC4 C254445D 6560DB69 9B111594
+t = 24: EEB82D9A FD224575 38AE4B71 C254445D 6560DB69
+t = 25: 5A142C1A EEB82D9A 7F48915D 38AE4B71 C254445D
+t = 26: 2972F7C7 5A142C1A BBAE0B66 7F48915D 38AE4B71
+t = 27: D526A644 2972F7C7 96850B06 BBAE0B66 7F48915D
+t = 28: E1122421 D526A644 CA5CBDF1 96850B06 BBAE0B66
+t = 29: 05B457B2 E1122421 3549A991 CA5CBDF1 96850B06
+t = 30: A9C84BEC 05B457B2 78448908 3549A991 CA5CBDF1
+t = 31: 52E31F60 A9C84BEC 816D15EC 78448908 3549A991
+t = 32: 5AF3242C 52E31F60 2A7212FB 816D15EC 78448908
+t = 33: 31C756A9 5AF3242C 14B8C7D8 2A7212FB 816D15EC
+t = 34: E9AC987C 31C756A9 16BCC90B 14B8C7D8 2A7212FB
+t = 35: AB7C32EE E9AC987C 4C71D5AA 16BCC90B 14B8C7D8
+t = 36: 5933FC99 AB7C32EE 3A6B261F 4C71D5AA 16BCC90B
+t = 37: 43F87AE9 5933FC99 AADF0CBB 3A6B261F 4C71D5AA
+t = 38: 24957F22 43F87AE9 564CFF26 AADF0CBB 3A6B261F
+t = 39: ADEB7478 24957F22 50FE1EBA 564CFF26 AADF0CBB
+t = 40: D70E5010 ADEB7478 89255FC8 50FE1EBA 564CFF26
+t = 41: 79BCFB08 D70E5010 2B7ADD1E 89255FC8 50FE1EBA
+t = 42: F9BCB8DE 79BCFB08 35C39404 2B7ADD1E 89255FC8
+t = 43: 633E9561 F9BCB8DE 1E6F3EC2 35C39404 2B7ADD1E
+t = 44: 98C1EA64 633E9561 BE6F2E37 1E6F3EC2 35C39404
+t = 45: C6EA241E 98C1EA64 58CFA558 BE6F2E37 1E6F3EC2
+t = 46: A2AD4F02 C6EA241E 26307A99 58CFA558 BE6F2E37
+t = 47: C8A69090 A2AD4F02 B1BA8907 26307A99 58CFA558
+t = 48: 88341600 C8A69090 A8AB53C0 B1BA8907 26307A99
+t = 49: 7E846F58 88341600 3229A424 A8AB53C0 B1BA8907
+t = 50: 86E358BA 7E846F58 220D0580 3229A424 A8AB53C0
+t = 51: 8D2E76C8 86E358BA 1FA11BD6 220D0580 3229A424
+t = 52: CE892E10 8D2E76C8 A1B8D62E 1FA11BD6 220D0580
+t = 53: EDEA95B1 CE892E10 234B9DB2 A1B8D62E 1FA11BD6
+t = 54: 36D1230A EDEA95B1 33A24B84 234B9DB2 A1B8D62E
+t = 55: 776C3910 36D1230A 7B7AA56C 33A24B84 234B9DB2
+t = 56: A681B723 776C3910 8DB448C2 7B7AA56C 33A24B84
+t = 57: AC0A794F A681B723 1DDB0E44 8DB448C2 7B7AA56C
+t = 58: F03D3782 AC0A794F E9A06DC8 1DDB0E44 8DB448C2
+t = 59: 9EF775C3 F03D3782 EB029E53 E9A06DC8 1DDB0E44
+t = 60: 36254B13 9EF775C3 BC0F4DE0 EB029E53 E9A06DC8
+t = 61: 4080D4DC 36254B13 E7BDDD70 BC0F4DE0 EB029E53
+t = 62: 2BFAF7A8 4080D4DC CD8952C4 E7BDDD70 BC0F4DE0
+t = 63: 513F9CA0 2BFAF7A8 10203537 CD8952C4 E7BDDD70
+t = 64: E5895C81 513F9CA0 0AFEBDEA 10203537 CD8952C4
+t = 65: 1037D2D5 E5895C81 144FE728 0AFEBDEA 10203537
+t = 66: 14A82DA9 1037D2D5 79625720 144FE728 0AFEBDEA
+t = 67: 6D17C9FD 14A82DA9 440DF4B5 79625720 144FE728
+t = 68: 2C7B07BD 6D17C9FD 452A0B6A 440DF4B5 79625720
+t = 69: FDF6EFFF 2C7B07BD 5B45F27F 452A0B6A 440DF4B5
+t = 70: 112B96E3 FDF6EFFF 4B1EC1EF 5B45F27F 452A0B6A
+t = 71: 84065712 112B96E3 FF7DBBFF 4B1EC1EF 5B45F27F
+t = 72: AB89FB71 84065712 C44AE5B8 FF7DBBFF 4B1EC1EF
+t = 73: C5210E35 AB89FB71 A10195C4 C44AE5B8 FF7DBBFF
+t = 74: 352D9F4B C5210E35 6AE27EDC A10195C4 C44AE5B8
+t = 75: 1A0E0E0A 352D9F4B 7148438D 6AE27EDC A10195C4
+t = 76: D0D47349 1A0E0E0A CD4B67D2 7148438D 6AE27EDC
+t = 77: AD38620D D0D47349 86838382 CD4B67D2 7148438D
+t = 78: D3AD7C25 AD38620D 74351CD2 86838382 CD4B67D2
+t = 79: 8CE34517 D3AD7C25 6B4E1883 74351CD2 86838382.
+</PRE><br>
+Block 1 has been processed. The values of {H<sub><font
+size=1>i</font></sub>} are
+<br><br>
+H<sub><font size=1>0</font></sub> = 67452301 + 8CE34517 = F4286818
+<br>
+H<sub><font size=1>1</font></sub> = EFCDAB89 + D3AD7C25 =
+C37B27AE
+<br>
+H<sub><font size=1>2</font></sub> = 98BADCFE + 6B4E1883 =
+0408F581
+<br>
+H<sub><font size=1>3</font></sub> = 10325476 + 74351CD2 = 84677148
+<br>
+H<sub><font size=1>4</font></sub> = C3D2E1F0 + 86838382 = 4A566572.
+ <br><br>
+Start processing block 2. The words of block 2 are
+<br><br>
+W[0] = 00000000<br>
+W[1] = 00000000<br>
+W[2] = 00000000<br>
+W[3] = 00000000<br>
+W[4] = 00000000<br>
+W[5] = 00000000<br>
+W[6] = 00000000<br>
+W[7] = 00000000<br>
+W[8] = 00000000<br>
+W[9] = 00000000<br>
+W[10] = 00000000<br>
+W[11] = 00000000<br>
+W[12] = 00000000<br>
+W[13] = 00000000<br>
+W[14] = 00000000<br>
+W[15] = 000001C0.
+<br><br>
+The hex values of A,B,C,D,E after pass t of the for "t = 0 to 79" loop
+(step (d) of Section 7 or step (c) of Section 8) are<br>
+<pre>
+ A B C D E
+
+t = 0: 2DF257E9 F4286818 B0DEC9EB 0408F581 84677148
+t = 1: 4D3DC58F 2DF257E9 3D0A1A06 B0DEC9EB 0408F581
+t = 2: C352BB05 4D3DC58F 4B7C95FA 3D0A1A06 B0DEC9EB
+t = 3: EEF743C6 C352BB05 D34F7163 4B7C95FA 3D0A1A06
+t = 4: 41E34277 EEF743C6 70D4AEC1 D34F7163 4B7C95FA
+t = 5: 5443915C 41E34277 BBBDD0F1 70D4AEC1 D34F7163
+t = 6: E7FA0377 5443915C D078D09D BBBDD0F1 70D4AEC1
+t = 7: C6946813 E7FA0377 1510E457 D078D09D BBBDD0F1
+t = 8: FDDE1DE1 C6946813 F9FE80DD 1510E457 D078D09D
+t = 9: B8538ACA FDDE1DE1 F1A51A04 F9FE80DD 1510E457
+t = 10: 6BA94F63 B8538ACA 7F778778 F1A51A04 F9FE80DD
+t = 11: 43A2792F 6BA94F63 AE14E2B2 7F778778 F1A51A04
+t = 12: FECD7BBF 43A2792F DAEA53D8 AE14E2B2 7F778778
+t = 13: A2604CA8 FECD7BBF D0E89E4B DAEA53D8 AE14E2B2
+t = 14: 258B0BAA A2604CA8 FFB35EEF D0E89E4B DAEA53D8
+t = 15: D9772360 258B0BAA 2898132A FFB35EEF D0E89E4B
+t = 16: 5507DB6E D9772360 8962C2EA 2898132A FFB35EEF
+t = 17: A51B58BC 5507DB6E 365DC8D8 8962C2EA 2898132A
+t = 18: C2EB709F A51B58BC 9541F6DB 365DC8D8 8962C2EA
+t = 19: D8992153 C2EB709F 2946D62F 9541F6DB 365DC8D8
+t = 20: 37482F5F D8992153 F0BADC27 2946D62F 9541F6DB
+t = 21: EE8700BD 37482F5F F6264854 F0BADC27 2946D62F
+t = 22: 9AD594B9 EE8700BD CDD20BD7 F6264854 F0BADC27
+t = 23: 8FBAA5B9 9AD594B9 7BA1C02F CDD20BD7 F6264854
+t = 24: 88FB5867 8FBAA5B9 66B5652E 7BA1C02F CDD20BD7
+t = 25: EEC50521 88FB5867 63EEA96E 66B5652E 7BA1C02F
+t = 26: 50BCE434 EEC50521 E23ED619 63EEA96E 66B5652E
+t = 27: 5C416DAF 50BCE434 7BB14148 E23ED619 63EEA96E
+t = 28: 2429BE5F 5C416DAF 142F390D 7BB14148 E23ED619
+t = 29: 0A2FB108 2429BE5F D7105B6B 142F390D 7BB14148
+t = 30: 17986223 0A2FB108 C90A6F97 D7105B6B 142F390D
+t = 31: 8A4AF384 17986223 028BEC42 C90A6F97 D7105B6B
+t = 32: 6B629993 8A4AF384 C5E61888 028BEC42 C90A6F97
+t = 33: F15F04F3 6B629993 2292BCE1 C5E61888 028BEC42
+t = 34: 295CC25B F15F04F3 DAD8A664 2292BCE1 C5E61888
+t = 35: 696DA404 295CC25B FC57C13C DAD8A664 2292BCE1
+t = 36: CEF5AE12 696DA404 CA573096 FC57C13C DAD8A664
+t = 37: 87D5B80C CEF5AE12 1A5B6901 CA573096 FC57C13C
+t = 38: 84E2A5F2 87D5B80C B3BD6B84 1A5B6901 CA573096
+t = 39: 03BB6310 84E2A5F2 21F56E03 B3BD6B84 1A5B6901
+t = 40: C2D8F75F 03BB6310 A138A97C 21F56E03 B3BD6B84
+t = 41: BFB25768 C2D8F75F 00EED8C4 A138A97C 21F56E03
+t = 42: 28589152 BFB25768 F0B63DD7 00EED8C4 A138A97C
+t = 43: EC1D3D61 28589152 2FEC95DA F0B63DD7 00EED8C4
+t = 44: 3CAED7AF EC1D3D61 8A162454 2FEC95DA F0B63DD7
+t = 45: C3D033EA 3CAED7AF 7B074F58 8A162454 2FEC95DA
+t = 46: 7316056A C3D033EA CF2BB5EB 7B074F58 8A162454
+t = 47: 46F93B68 7316056A B0F40CFA CF2BB5EB 7B074F58
+t = 48: DC8E7F26 46F93B68 9CC5815A B0F40CFA CF2BB5EB
+t = 49: 850D411C DC8E7F26 11BE4EDA 9CC5815A B0F40CFA
+t = 50: 7E4672C0 850D411C B7239FC9 11BE4EDA 9CC5815A
+t = 51: 89FBD41D 7E4672C0 21435047 B7239FC9 11BE4EDA
+t = 52: 1797E228 89FBD41D 1F919CB0 21435047 B7239FC9
+t = 53: 431D65BC 1797E228 627EF507 1F919CB0 21435047
+t = 54: 2BDBB8CB 431D65BC 05E5F88A 627EF507 1F919CB0
+t = 55: 6DA72E7F 2BDBB8CB 10C7596F 05E5F88A 627EF507
+t = 56: A8495A9B 6DA72E7F CAF6EE32 10C7596F 05E5F88A
+t = 57: E785655A A8495A9B DB69CB9F CAF6EE32 10C7596F
+t = 58: 5B086C42 E785655A EA1256A6 DB69CB9F CAF6EE32
+t = 59: A65818F7 5B086C42 B9E15956 EA1256A6 DB69CB9F
+t = 60: 7AAB101B A65818F7 96C21B10 B9E15956 EA1256A6
+t = 61: 93614C9C 7AAB101B E996063D 96C21B10 B9E15956
+t = 62: F66D9BF4 93614C9C DEAAC406 E996063D 96C21B10
+t = 63: D504902B F66D9BF4 24D85327 DEAAC406 E996063D
+t = 64: 60A9DA62 D504902B 3D9B66FD 24D85327 DEAAC406
+t = 65: 8B687819 60A9DA62 F541240A 3D9B66FD 24D85327
+t = 66: 083E90C3 8B687819 982A7698 F541240A 3D9B66FD
+t = 67: F6226BBF 083E90C3 62DA1E06 982A7698 F541240A
+t = 68: 76C0563B F6226BBF C20FA430 62DA1E06 982A7698
+t = 69: 989DD165 76C0563B FD889AEF C20FA430 62DA1E06
+t = 70: 8B2C7573 989DD165 DDB0158E FD889AEF C20FA430
+t = 71: AE1B8E7B 8B2C7573 66277459 DDB0158E FD889AEF
+t = 72: CA1840DE AE1B8E7B E2CB1D5C 66277459 DDB0158E
+t = 73: 16F3BABB CA1840DE EB86E39E E2CB1D5C 66277459
+t = 74: D28D83AD 16F3BABB B2861037 EB86E39E E2CB1D5C
+t = 75: 6BC02DFE D28D83AD C5BCEEAE B2861037 EB86E39E
+t = 76: D3A6E275 6BC02DFE 74A360EB C5BCEEAE B2861037
+t = 77: DA955482 D3A6E275 9AF00B7F 74A360EB C5BCEEAE
+t = 78: 58C0AAC0 DA955482 74E9B89D 9AF00B7F 74A360EB
+t = 79: 906FD62C 58C0AAC0 B6A55520 74E9B89D 9AF00B7F.
+</PRE><br>
+Block 2 has been processed. The values of {H<sub><font
+size=1>i</font></sub>} are
+<br><br>
+H<sub><font size=1>0</font></sub> = F4286818 + 906FD62C = 84983E44
+<br>
+H<sub><font size=1>1</font></sub> = C37B27AE + 58C0AAC0 =
+1C3BD26E
+<br>
+H<sub><font size=1>2</font></sub> = 0408F581 + B6A55520 =
+BAAE4AA1
+<br>
+H<sub><font size=1>3</font></sub> = 84677148 + 74E9B89D = F95129E5
+<br>
+H<sub><font size=1>4</font></sub> = 4A566572 + 9AF00B7F = E54670F1.
+<br><br>
+Message digest = 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+<br><br></UL></DL>
+<center><b>APPENDIX C. A THIRD SAMPLE MESSAGE AND ITS
+MESSAGE DIGEST</B></CENTER>
+<br><br>
+This appendix is for informational purposes only and is not required to meet
+the standard.
+<br><br>
+Let the message be the binary-coded form of the ASCII string which consists
+of 1,000,000 repetitions of "a".
+<br><br>
+Message digest = 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+</UL></DL></P>
+<br><hr>
+<A NAME="FORE_SEC">
+<center><b>The Foreword, Abstract, and Key Words follow:
+</B><br></CENTER>
+<p>
+FIPS PUB 180-1<br>
+FEDERAL INFORMATION<br>
+ PROCESSING STANDARDS PUBLICATION<br><br>
+
+1995 April 17<br>
+U.S. DEPARTMENT OF COMMERCE/National Institute of Standards and
+Technology <br><br>
+
+<h2><center>SECURE HASH STANDARD</H2>
+</CENTER>
+
+U.S. DEPARTMENT OF COMMERCE, Ronald H. Brown,
+<i>Secretary</I><br>
+
+National Institute of Standards and Technology, Arati Prabhakar,
+<i>Director</I>
+<br><br><center><b>Foreword</B></CENTER>
+ The Federal Information Processing Standards Publication Series
+of the National Institute of Standards and Technology (NIST) is the official
+publication relating to standards and guidelines adopted and promulgated
+under the provisions of Section 111(d) of the Federal Property and
+Administrative Services Act of 1949 as amended by the Computer Security
+Act
+of 1987, Public Law 100-235. These mandates have given the Secretary of
+Commerce and NIST important responsibilities for improving the utilization
+and management of computers and related telecommunications systems in the
+Federal Government. The NIST, through its Computer Systems Laboratory,
+provides leadership, technical guidance, and coordination of Government
+efforts in the development of standards and guidelines in these areas.
+<br><br>
+ Comments concerning Federal Information Processing Standards
+Publications are welcomed and should be addressed to the Director,
+Computer Systems Laboratory, National Institute of Standards and
+Technology, Gaithersburg, MD 20899.
+<br><br>
+James H. Burrows, <i>Director</I><br>
+Computer Systems Laboratory<br><br>
+
+<center><b>Abstract</CENTER></B>
+ This standard specifies a Secure Hash Algorithm (SHA-1) which can
+be used to generate a condensed representation of a message called a
+message digest. The SHA-1 is required for use with the Digital Signature
+Algorithm (DSA) as specified in the Digital Signature Standard (DSS) and
+whenever a secure hash algorithm is required for Federal applications.
+The SHA-1 is used by both the transmitter and intended receiver of a
+message in computing and verifying a digital signature.
+<br><br>
+
+<b>Key words:</B> computer security; digital signatures; Federal
+Information
+Processing Standard (FIPS); hash algorithm.</P>
+<!--
+<br><hr><br>
+<center>
+<menu>Go Back to the<A HREF="#FIPS_TOP"> Top</A>.</MENU>
+Return to the FIPS<br>
+<a href="index.html" target=_top">Home Page</a></CENTER>
+<br><hr><br>
+-->
+</BODY></HTML>
Added: trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.gif
==============================================================================
Binary files trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.gif (original) and trunk/orca/packages/Digest-MD5-2.09/SHA1/fip180-1.gif differ
Modified: trunk/orca/packages/Digest-MD5-2.09/README
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/README (original)
+++ trunk/orca/packages/Digest-MD5-2.09/README Sat Jul 13 19:23:55 2002
@@ -1,9 +1,14 @@
-Digest:: MD5, MD2, SHA1, and HMAC
----------------------------------
+Digest::*
+---------
-This is a Perl extension interface to the RSA Data Security Inc. MD5,
-MD2, as well as NIST SHA-1, Message Digest algorithms. This package
-also provide modules which calculate HMAC digests.
+This package contains Perl extension interfaces for the following
+message digest algorithms:
+
+ - RSA Data Security Inc. MD5 (RFC 1321)
+ - RSA Data Security Inc. MD2 (RFC 1319)
+ - NIST SHA-1 (FIPS PUB 180-1)
+
+Modules to calculate HMAC (RFC 2104) digests are also provided.
To build the extensions, unpack this distribution somewhere, create
the Makefile by running 'perl Makefile.PL' and do a 'make', 'make
Modified: trunk/orca/packages/Digest-MD5-2.09/MD5.xs
==============================================================================
--- trunk/orca/packages/Digest-MD5-2.09/MD5.xs (original)
+++ trunk/orca/packages/Digest-MD5-2.09/MD5.xs Sat Jul 13 19:23:56 2002
@@ -1,4 +1,4 @@
-/* $Id: MD5.xs,v 1.23 1999/03/26 13:27:49 gisle Exp $ */
+/* $Id: MD5.xs,v 1.24 1999/07/28 10:38:50 gisle Exp $ */
/*
* This library is free software; you can redistribute it and/or
@@ -555,21 +555,23 @@
unsigned char buffer[4096];
int n;
CODE:
- if (fill) {
- /* The MD5Update() function is faster if it can work with
- * complete blocks. This will fill up any buffered block
- * first.
- */
- STRLEN missing = 64 - fill;
- if ( (n = PerlIO_read(fh, buffer, missing)))
- MD5Update(context, buffer, n);
- else
- XSRETURN(1); /* self */
- }
+ if (fh) {
+ if (fill) {
+ /* The MD5Update() function is faster if it can work with
+ * complete blocks. This will fill up any buffered block
+ * first.
+ */
+ STRLEN missing = 64 - fill;
+ if ( (n = PerlIO_read(fh, buffer, missing)))
+ MD5Update(context, buffer, n);
+ else
+ XSRETURN(1); /* self */
+ }
- /* Process blocks until EOF */
- while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
- MD5Update(context, buffer, n);
+ /* Process blocks until EOF */
+ while ( (n = PerlIO_read(fh, buffer, sizeof(buffer)))) {
+ MD5Update(context, buffer, n);
+ }
}
XSRETURN(1); /* self */
Modified: trunk/orca/packages/Math-Interpolate-1.05/t/01interval.t
==============================================================================
--- trunk/orca/packages/Math-Interpolate-1.05/t/01interval.t (original)
+++ trunk/orca/packages/Math-Interpolate-1.05/t/01interval.t Sat Jul 13 19:23:56 2002
@@ -8,7 +8,7 @@
$| = 1;
$NumberTests = 500;
$ArraySize = 500;
- print "1..", 2*$NumberTests+5, "\n";
+ print "1..", 2*$NumberTests+6, "\n";
}
END {print "not ok 1\n" unless $loaded; }
@@ -35,8 +35,6 @@
$_[0] >= $_[1];
}
-my @array = (0 .. $ArraySize-1);
-
srand();
# Check for illegal parameters.
@@ -47,7 +45,20 @@
# Check that -1 is returned for an empty array.
ok( interval_search(10, []) == -1 ); # 5
+# Try to create a properly sorted array by placing new values in the
+# correct location in the array.
+my @array = ();
+for (my $i=0; $i<$ArraySize; ++$i) {
+ my $value = rand(100);
+ my $location = interval_search($value, \@array) + 1;
+ splice(@array, $location, 0, $value);
+}
+
+my @array1 = sort {$a <=> $b} @array;
+ok( "@array" eq "@array1" ); # 6
+
# Check a random test.
+ at array = (0 .. $ArraySize-1);
for (1 .. $NumberTests) {
my $ok = 1;
my $number = 1.5 * $ArraySize * rand() - $ArraySize/3;
@@ -61,7 +72,7 @@
elsif ( int($number) != $answer ) {
$ok = 0;
}
- ok( $ok ); # 6
+ ok( $ok ); # 7
}
# Reverse the array and use some different comparision routines.
@@ -83,5 +94,5 @@
$ok = 0;
}
- ok( $ok ); # 7
+ ok( $ok ); # 8
}
Modified: trunk/orca/packages/Math-Interpolate-1.05/lib/Math/Interpolate.pm
==============================================================================
--- trunk/orca/packages/Math-Interpolate-1.05/lib/Math/Interpolate.pm (original)
+++ trunk/orca/packages/Math-Interpolate-1.05/lib/Math/Interpolate.pm Sat Jul 13 19:23:57 2002
@@ -1,17 +1,16 @@
package Math::Interpolate;
-require 5.004_04;
+require 5.004_01;
use strict;
-use vars qw(@ISA $VERSION @EXPORT_OK);
use Exporter;
-use Carp qw(cluck);
use Math::IntervalSearch qw(interval_search);
+use vars qw(@EXPORT_OK @ISA $VERSION);
-$VERSION = do {my @r=(q$Revision: 1.02 $=~/\d+/g);sprintf "%d."."%02d"x$#r, at r};
- at ISA = qw(Exporter);
@EXPORT_OK = qw(derivatives constant_interpolate
linear_interpolate robust_interpolate);
+ at ISA = qw(Exporter);
+$VERSION = substr q$Revision: 1.05 $, 10;
sub derivatives {
my $X = shift;
@@ -291,64 +290,65 @@
increasing numerical order.
If there is an error in the input, such as I<x_sequence> and I<y_sequence>
-containing a different number of elements, then the subroutine returns an
-empty list in list context, an undefined value in scalar context, or nothing
-in a void context.
+containing a different number of elements, then the subroutine returns
+an empty list in list context, an undefined value in scalar context,
+or nothing in a void context.
=item B<constant_interpolate> I<x> I<x_sequence> I<y_sequence>
Given a reference to an array of x values in I<x_sequence> and a reference
-to an array of y values in I<y_sequence>, return the y value associated with
-the first x value less than or equal to I<x>. In other words, if
+to an array of y values in I<y_sequence>, return the y value associated
+with the first x value less than or equal to I<x>. In other words, if
I<x_sequence>->[i] <= I<x> < I<x_sequence>->[i+1]
then return
I<y_sequence>->[i]
-If I<x> is less than I<x_sequence>->[0], then return I<y_sequence>->[0]. If
-I<x> is greater than I<x_sequence->[-1], then return I<y_sequence>->[-1].
+If I<x> is less than I<x_sequence>->[0], then return I<y_sequence>->[0].
+If I<x> is greater than I<x_sequence->[-1], then return
+I<y_sequence>->[-1].
If there is an error in the input, such as I<x_sequence> and I<y_sequence>
-containing a different number of elements, then the subroutine returns an
-empty list in list context, an undefined value in scalar context, or nothing
-in a void context.
+containing a different number of elements, then the subroutine returns
+an empty list in list context, an undefined value in scalar context,
+or nothing in a void context.
=item B<linear_interpolate> I<x> I<x_sequence> I<y_sequence>
Given a reference to an array of x values in I<x_sequence> and a reference
to an array of y values in I<y_sequence>, calculate the interpolated
-value y that corresponds to the value I<x>. The returned value y lies on
-the straight line between the two points surrounding I<x>. If <x> lies
-outside of the range of values spanned by I<x_sequence> then a linear
-extrapolation will be done.
+value y that corresponds to the value I<x>. The returned value y lies
+on the straight line between the two points surrounding I<x>. If <x>
+lies outside of the range of values spanned by I<x_sequence> then a
+linear extrapolation will be done.
In an array context, I<linear_interpolate> will return an array containing
the y value and and slope between the two nearest surrounding points.
If there is an error in the input, such as I<x_sequence> and I<y_sequence>
-containing a different number of elements, then the subroutine returns an
-empty list in list context, an undefined value in scalar context, or nothing
-in a void context.
+containing a different number of elements, then the subroutine returns
+an empty list in list context, an undefined value in scalar context,
+or nothing in a void context.
=item B<robust_interpolate> I<value> I<x_sequence> I<y_sequence> [I<dy_sequence>]
Given a reference to an array of x values in I<x_sequence> and a reference
to an array of y values in I<y_sequence>, calculate the interpolated
value y that corresponds to the value I<x>. The interpolated curve
-generated by I<robust_interpolate> is smooth and even the derivatives of the
-curve are smooth with only a few exceptions.
+generated by I<robust_interpolate> is smooth and even the derivatives
+of the curve are smooth with only a few exceptions.
The returned value y lies on the curve between the two points surrounding
I<x>. If <x> lies outside of the range of values spanned by I<x_sequence>
then a linear extrapolation will be done.
-
+
In an array context, I<linear_interpolate> will return an array containing
the y value and and slope between the two nearest surrounding points.
If there is an error in the input, such as I<x_sequence> and I<y_sequence>
-containing a different number of elements, then the subroutine returns an
-empty list in list context, an undefined value in scalar context, or nothing
-in a void context.
+containing a different number of elements, then the subroutine returns
+an empty list in list context, an undefined value in scalar context,
+or nothing in a void context.
=back 4
Modified: trunk/orca/packages/Math-Interpolate-1.05/lib/Math/IntervalSearch.pm
==============================================================================
--- trunk/orca/packages/Math-Interpolate-1.05/lib/Math/IntervalSearch.pm (original)
+++ trunk/orca/packages/Math-Interpolate-1.05/lib/Math/IntervalSearch.pm Sat Jul 13 19:23:57 2002
@@ -1,15 +1,17 @@
package Math::IntervalSearch;
-require 5.004_04;
+require 5.004_01;
use strict;
-use vars qw(@ISA $VERSION @EXPORT_OK);
+use vars qw(@EXPORT_OK @ISA $VERSION);
use Exporter;
-use Carp qw(cluck);
+use Carp;
-$VERSION = do {my @r=(q$Revision: 1.02 $=~/\d+/g);sprintf "%d."."%02d"x$#r, at r};
- at ISA = qw(Exporter);
@EXPORT_OK = qw(interval_search);
+ at ISA = qw(Exporter);
+$VERSION = substr q$Revision: 1.05 $, 10;
+
+sub cluck { warn Carp::longmess @_ }
sub LessThan {
$_[0] < $_[1];
@@ -77,8 +79,7 @@
# Is the point greater than the largest point in the sequence?
if ( &$LessThanEqualTo($sequenceRef->[$num-1], $x) ) {
- $last_interval_result = $num - 1;
- return $last_interval_result;
+ return $last_interval_result = $num - 1;
}
# Use the result from the last run as a start for this run.
@@ -160,9 +161,9 @@
=head1 SYNOPSIS
- use Math::IntervalSearch qw(interval);
+ use Math::IntervalSearch qw(interval_search);
my @array = (1..5);
- my $location = interval(2.4, \@array);
+ my $location = interval_search(2.4, \@array);
# Use your own comparison operators.
sub ReverseLessThan {
@@ -173,64 +174,66 @@
$_[0] <= $_[1];
}
- $location = interval(2.4,
- \@array,
- \&ReverseLessThan,
- \&ReverseLessThanEqualTo);
+ $location = interval_search(2.4,
+ \@array,
+ \&ReverseLessThan,
+ \&ReverseLessThanEqualTo);
=head1 DESCRIPTION
-This subroutine is used to locate a position in an array of values where a
-given value would fit. It has been designed to be efficient in the common
-situation that it is called repeatedly. The user can supply a different
-set of comparison operators to replace the standard < and <=.
+This subroutine is used to locate a position in an array of values where
+a given value would fit. It has been designed to be efficient in the
+common situation that it is called repeatedly. The user can supply a
+different set of comparison operators to replace the standard < and <=.
=head1 SUBROUTINES
=over 4
-=item B<interval> I<value> I<sequence> [I<less_than> [I<less_than_equal_to>]]
+=item B<interval_search> I<value> I<sequence> [I<less_than> [I<less_than_equal_to>]]
-Given a I<value> I<interval> returns the location in the reference to an array
-I<sequence> where the value would fit. The default < operator to compare the
-elements in I<sequence> can be replaced by the subroutine I<less_than> which
-should return 1 if the first element passed to I<less_than> is less than the
-second. The default <= operator to compare the elements in I<sequence> can
-be replaced by the subroutine I<less_than> which should return 1 if the first
-element passed to I<less_than> is less than the second.
-
-The values in I<sequence> should already be sorted in numerically increasing
-order or in the order that would be produced by using the I<less_than>
-subroutine.
+Given a I<value> I<interval_search> returns the location in the reference
+to an array I<sequence> where the value would fit. The default <
+operator to compare the elements in I<sequence> can be replaced by the
+subroutine I<less_than> which should return 1 if the first element passed
+to I<less_than> is less than the second. The default <= operator to
+compare the elements in I<sequence> can be replaced by the subroutine
+I<less_than> which should return 1 if the first element passed to
+I<less_than> is less than the second.
+
+The values in I<sequence> should already be sorted in numerically
+increasing order or in the order that would be produced by using the
+I<less_than> subroutine.
Let N be the number of elements in referenced array I<sequence>, then
-I<interval> returns these values:
+I<interval_search> returns these values:
-1 if I<value> < I<sequence>->[0]
i if I<sequence>->[i] <= I<value> < I<sequence>->[i+1]
N-1 if I<sequence>->[N-1] <= I<value>
If a reference is made to an empty array, then -1 is always returned.
-If there is illegal input to I<interval>, such as an improper number of
-arguments, then an empty list in list context, an undefined value in
-scalar context, or nothing in a void context is returned.
-
-This subroutine is designed to be efficient in the common situation that it is
-called repeatedly, with I<value> taken from an increasing or decreasing
-list of values. This will happen, e.g., when an irregular waveform is
-interpolated to create a sequence with constant separation. The first guess
-for the output is therefore taken to be the value returned at the previous
-call and stored in the variable ilo. A first check ascertains that ilo is
-less than the number of data points in I<sequence>. This is necessary since
-the present call may have nothing to do with the previous call. Then, if
- I<sequence>->[ilo] <= I<value> < I<sequence>->[ilo+1],
+If there is illegal input to I<interval_search>, such as an improper
+number of arguments, then an empty list in list context, an undefined
+value in scalar context, or nothing in a void context is returned.
+
+This subroutine is designed to be efficient in the common situation
+that it is called repeatedly, with I<value> taken from an increasing or
+decreasing list of values. This will happen, e.g., when an irregular
+waveform is interpolated to create a sequence with constant separation.
+The first guess for the output is therefore taken to be the value
+returned at the previous call and stored in the variable ilo. A first
+check ascertains that ilo is less than the number of data points in
+I<sequence>. This is necessary since the present call may have nothing
+to do with the previous call. Then, if
+ I<sequence>->[ilo] <= I<value> < I<sequence>->[ilo+1],
-we set left = ilo and are done after just three comparisons.
-Otherwise, we repeatedly double the difference
+we set left = ilo and are done after just three comparisons. Otherwise,
+we repeatedly double the difference
istep = ihi - ilo
while also moving ilo and ihi in the direction of x, until
- I<sequence>->[ilo] <= x < I<sequence>->[ihi],
+ I<sequence>->[ilo] <= x < I<sequence>->[ihi],
after which bisection is used to get, in addition,
ilo+1 = ihi.
Modified: trunk/orca/packages/Math-Interpolate-1.05/CHANGES
==============================================================================
--- trunk/orca/packages/Math-Interpolate-1.05/CHANGES (original)
+++ trunk/orca/packages/Math-Interpolate-1.05/CHANGES Sat Jul 13 19:23:57 2002
@@ -1,3 +1,30 @@
+Tue Aug 24 11:28:45 PDT 1999
+
+ Release 1.05.
+
+Tue Aug 24 11:28:19 PDT 1999
+
+ Make the module work with Perl 5.004_01.
+
+Tue Aug 17 11:42:49 PDT 1999
+
+ Release 1.04.
+
+Tue Aug 17 11:42:26 PDT 1999
+
+ Add one more test to check if a properly sorted array can be
+ created using interval_search.
+
+Tue Aug 17 11:12:12 PDT 1999
+
+ Release 1.03.
+
+Tue Aug 17 11:07:53 PDT 1999
+
+ Update the POD documentation in Math::IntervalSearch. It was not
+ correctly listing the interval_search function, rather it was
+ listing a function named interval.
+
Thu Apr 8 10:20:30 PDT 1999 <blair at geostaff.com> (Blair Zajac)
Have ok() in t/*.t return the success or failure of the
Modified: trunk/orca/packages/Math-Interpolate-1.05/README
==============================================================================
--- trunk/orca/packages/Math-Interpolate-1.05/README (original)
+++ trunk/orca/packages/Math-Interpolate-1.05/README Sat Jul 13 19:23:58 2002
@@ -1,4 +1,4 @@
-Package Math::Interpolate version 1.02
+Package Math::Interpolate version 1.05
This is the Math::Interpolate package. This module contains several
useful routines for interpolating data sets and finding where a given
More information about the Orca-checkins
mailing list