Commit 5cbd4ebc authored by Erwin Janssen's avatar Erwin Janssen

Deleted lib/gd

- Deleted the the folder and all the files.
- Removed the project from the Visual Studio build
- libgd wasn't part of the autotools build, so nothing changed there.
parent f9aa2861
......@@ -114,10 +114,6 @@
<Project>{5ec4407d-0dcd-47e0-9fdb-09011efa6382}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\lib\gd\gd.vcxproj">
<Project>{05be968c-b4f4-4b5f-ac4f-c6f8585023bc}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\lib\gvc.vcxproj">
<Project>{15229511-9f6c-48a5-9194-660ca6492563}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
......@@ -34,8 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_pango", "plugin\pa
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gd", "plugin\gd\gvplugin_gd.vcxproj", "{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "lib\gd\gd.vcxproj", "{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfio", "lib\sfio\sfio.vcxproj", "{7DC8987A-C87D-465A-94CF-1F6DF59B38FB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast", "lib\ast\ast.vcxproj", "{7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}"
......@@ -116,9 +114,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prune", "contrib\prune\prun
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diffimg", "contrib\diffimg\diffimg.vcxproj", "{89ED80CE-5DEF-46B1-9A12-1D991236EE3E}"
ProjectSection(ProjectDependencies) = postProject
{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glcomp", "lib\glcomp\glcomp.vcxproj", "{CCEF85C9-BC40-4C26-8755-581276C8B7DA}"
EndProject
......@@ -236,9 +231,6 @@ Global
{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Debug|Win32.ActiveCfg = Debug|Win32
{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Release|Win32.ActiveCfg = Release|Win32
{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}.Release|Win32.Build.0 = Release|Win32
{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Debug|Win32.ActiveCfg = Debug|Win32
{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.ActiveCfg = Release|Win32
{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.Build.0 = Release|Win32
{7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Debug|Win32.ActiveCfg = Debug|Win32
{7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Release|Win32.ActiveCfg = Release|Win32
{7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Release|Win32.Build.0 = Release|Win32
......
Portions copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002 by Cold Spring Harbor Laboratory. Funded under Grant
P41-RR02188 by the National Institutes of Health.
Portions copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 by
Boutell.Com, Inc.
Portions relating to GD2 format copyright 1999, 2000, 2001, 2002
Philip Warner.
Portions relating to PNG copyright 1999, 2000, 2001, 2002 Greg
Roelofs.
Portions relating to gdttf.c copyright 1999, 2000, 2001, 2002 John
Ellson (ellson@lucent.com).
Portions relating to gdft.c copyright 2001, 2002 John Ellson
(ellson@lucent.com).
Portions relating to JPEG and to color quantization copyright 2000,
2001, 2002, Doug Becker and copyright (C) 1994, 1995, 1996, 1997,
1998, 1999, 2000, 2001, 2002, Thomas G. Lane. This software is
based in part on the work of the Independent JPEG Group. See the
file README-JPEG.TXT for more information.
Portions relating to WBMP copyright 2000, 2001, 2002 Maurice
Szmurlo and Johan Van den Brande.
Permission has been granted to copy, distribute and modify gd in
any context without fee, 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.
This software is provided "AS IS." The copyright holders disclaim
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.
Although their code does not appear in gd, the authors wish to thank
David Koblas, David Rowley, and Hutchison Avenue Software Corporation
for their prior contributions.
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
will cause the specified gcc to be used as the C compiler (unless it is
overridden in the site shell script).
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
# $Id$ $Revision$
## Process this file with automake to produce Makefile.in
html = gd.html
AM_CPPFLAGS = @FREETYPE2_CFLAGS@ @FONTCONFIG_CFLAGS@ @PNG_INCLUDES@ @JPEG_INCLUDES@ @Z_INCLUDES@
htmldir = $(pkgdatadir)/doc/html
if WITH_MYLIBGD
noinst_HEADERS = gd.h gd_io.h gdcache.h gdfontg.h gdfontl.h gdfontmb.h \
gdfonts.h gdfontt.h gdhelpers.h jisx0208.h wbmp.h gdfx.h entities.h
noinst_LTLIBRARIES = libgvgd_C.la
html_DATA = $(html)
AM_CPPFLAGS += -DNONDLL
endif
libgvgd_C_la_SOURCES = \
gdtables.c gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c \
gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c \
gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c \
gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c \
gdhelpers.c gdkanji.c gdxpm.c wbmp.c
gd.html: index.html
cp $(top_srcdir)/lib/gd/index.html gd.html
# keep the contents of the original gd-2.0.31 distribution
EXTRA_DIST = README-JPEG.TXT README.TXT configure.pl bdftogd demoin.png \
index.html install-item makefile.sample readme.jpn \
entities.html entities.tcl \
annotate.c gdparttopng.c gdtopng.c gd2copypal.c gd2topng.c pngtogd.c \
pngtogd2.c webpng.c gd2togif.c gdcmpgif.c giftogd2.c \
fontsizetest.c fontwheeltest.c gdtest.c gddemo.c gd2time.c gdtestft.c \
testac.c circletexttest.c testtr.c fontconfigtest.c gifanimtest.c \
configure.ac gd.vcxproj*\
config.hin config test $(html)
DISTCLEANFILES = $(html_DATA)
all: libgd.a
ROOT=../..
include $(ROOT)/Config.mk
include $(ROOT)/makearch/$(ARCH)
INCS = -I. -I$(ROOT) $(EXTLIB_INC) -I$(X11INC)
DEFINES = -DHAVE_CONFIG_H
OBJS = gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o \
gd_ss.o gd_io_ss.o gd_gif_in.o gd_gif_out.o gd_jpeg.o gd_png.o \
gdcache.o gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o \
gdhelpers.o gdkanji.o gdtables.o gdft.o gdxpm.o \
wbmp.o gd_wbmp.o gd_topal.o gdfx.o gd_security.o
libgd.a: $(OBJS)
$(RM) libgd.a
$(AR) cr libgd.a $(OBJS)
$(RANLIB) libgd.a
install: libgd.a
$(MKPATH) $(LIBDIR)
$(INSTALL) libgd.a $(LIBDIR)
clean:
$(RM) *.o
distclean: clean
$(RM) *.a lib*.so.*
This diff is collapsed.
For documentation, browse index.html.
Quick install guide:
1. Type './configure'
2. Type 'make install'
Generic configuration instructions are in the file INSTALL.
The following 3rd-party libraries will be used by gd if found by configure.
While gd will compile and install even without these, we suggest that at
least zlib and libpng are installed, and recommend that freetype and jpeg
are installed as well:
1. zlib, available from http://www.gzip.org/zlib/
Data compression library
2. libpng, available from http://www.libpng.org/pub/png/
Portable Network Graphics library; requires zlib
3. FreeType 2.x, available from http://www.freetype.org/
Free, high-quality, and portable font engine
4. JPEG library, available from http://www.ijg.org/
Portable JPEG compression/decompression library
5. XPM, available from http://koala.ilog.fr/lehors/xpm.html
X Pixmap library
If any of these libraries are installed, but not detected by configure,
you can use the following command line options:
--with-png=DIR
Without the DIR argument, configure will check for png header files and
libraries in a default location. To switch off png support, use
--without-png, or --with-png=no.
If the DIR argument is specified, configure tries to find the png header
files in DIR/include, and the libraries in DIR/lib. To accommodate
OpenBSD ports, DIR/include/libpng is also checked if necessary.
--with-freetype=DIR
Dto. for freetype 2.x library. The search path for include files is
DIR/include/freetype2.
--with-jpeg=DIR
Dto. for jpeg library.
--with-xpm=DIR
Dto. for xpm library.
Last but not least, if all else fails, you can still try Tom Boutell's
original, perl-based configure utility, which is included in this
distribution as configure.pl, or even the included makefile.sample.
This diff is collapsed.
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "gd.h"
/* A neat little utility which adds freetype text to
existing JPEG images. Type annotate -h for instructions.
Thanks to Joel Dubiner for supporting this work. -TBB */
enum
{
left, center, right
};
int
main (int argc, char *argv[])
{
#ifndef HAVE_FREETYPE2
/* 2.0.12 */
fprintf (stderr, "annotate is not useful without freetype.\n"
"Install freetype, then './configure; make clean; make install'\n"
"the gd library again.\n");
return 1;
#else
gdImagePtr im;
char *iin, *iout;
FILE *in, *out;
char s[1024];
int bounds[8];
int lines = 1;
int color = gdTrueColor (0, 0, 0);
char font[1024];
int size = 12;
int align = left;
int x = 0, y = 0;
char *fontError;
strcpy (font, "times");
if (argc != 3)
{
fprintf (stderr, "Usage: annotate imagein.jpg imageout.jpg\n\n");
fprintf (stderr, "Standard input should consist of\n");
fprintf (stderr, "lines in the following formats:\n");
fprintf (stderr, "color r g b (0-255 each) [a (0-127, 0 is opaque)]\n");
fprintf (stderr, "font fontname\n");
fprintf (stderr, "size pointsize\n");
fprintf (stderr, "align (left|right|center)\n");
fprintf (stderr, "move x y\n");
fprintf (stderr, "text actual-output-text\n\n");
fprintf (stderr,
"If the file 'paris.ttf' exists in /usr/share/fonts/truetype or in a\n");
fprintf (stderr,
"location specified in the GDFONTPATH environment variable, 'font paris' is\n");
fprintf (stderr,
"sufficient. You may also specify the full, rooted path of a font file.\n");
exit (1);
}
iin = argv[1];
iout = argv[2];
in = fopen (iin, "rb");
if (!in)
{
fprintf (stderr, "Couldn't open %s\n", iin);
exit (2);
}
#ifdef HAVE_LIBJPEG
im = gdImageCreateFromJpeg (in);
#else
fprintf (stderr, "No JPEG library support available.\n");
#endif
fclose (in);
if (!im)
{
fprintf (stderr, "%s did not load properly\n", iin);
exit (3);
}
while (fgets (s, sizeof (s), stdin))
{
char *st;
char *text;
st = strtok (s, " \t\r\n");
if (!st)
{
/* Be nice about blank lines */
continue;
}
if (!strcmp (st, "font"))
{
char *st = strtok (0, " \t\r\n");
if (!st)
{
goto badLine;
}
strcpy (font, st);
}
else if (!strcmp (st, "align"))
{
char *st = strtok (0, " \t\r\n");
if (!st)
{
goto badLine;
}
if (!strcmp (st, "left"))
{
align = 0;
}
else if (!strcmp (st, "center"))
{
align = 1;
}
else if (!strcmp (st, "right"))
{
align = 2;
}
}
else if (!strcmp (st, "size"))
{
char *st = strtok (0, " \t\r\n");
if (!st)
{
goto badLine;
}
size = atoi (st);
}
else if (!strcmp (st, "color"))
{
char *st = strtok (0, "\r\n");
int r, g, b, a = 0;
if (!st)
{
goto badLine;
}
if (sscanf (st, "%d %d %d %d", &r, &g, &b, &a) < 3)
{
fprintf (stderr, "Bad color at line %d\n", lines);
exit (2);
}
color = gdTrueColorAlpha (r, g, b, a);
}
else if (!strcmp (st, "move"))
{
char *st = strtok (0, "\r\n");
if (!st)
{
goto badLine;
}
if (sscanf (st, "%d %d", &x, &y) != 2)
{
fprintf (stderr, "Missing coordinates at line %d\n", lines);
exit (3);
}
}
else if (!strcmp (st, "text"))
{
int rx = x;
text = strtok (0, "\r\n");
if (!text)
{
text = "";
}
gdImageStringFT (0, bounds, color, font, size, 0, x, y, text);
switch (align)
{
case left:
break;
case center:
rx -= (bounds[2] - bounds[0]) / 2;
break;
case right:
rx -= (bounds[2] - bounds[0]);
break;
}
fontError = gdImageStringFT (im, 0, color, font,
size, 0, rx, y, text);
if (fontError)
{
fprintf (stderr, "font error at line %d: %s\n", lines,
fontError);
exit (7);
}
y -= (bounds[7] - bounds[1]);
}
else
{
goto badLine;
}
lines++;
continue;
badLine:
fprintf (stderr, "Bad syntax, line %d\n", lines);
exit (4);
}
out = fopen (iout, "wb");
if (!out)
{
fprintf (stderr, "Cannot create %s\n", iout);
exit (5);
}
#ifdef HAVE_LIBJPEG
gdImageJpeg (im, out, 95);
#else
fprintf (stderr, "No JPEG library support available.\n");
#endif
gdImageDestroy (im);
fclose (out);
return 0;
#endif /* HAVE_FREETYPE2 */
}
#!/usr/bin/perl -w
#
# Simple convertor from bdf to gd font format.
#
# Author: Jan Pazdziora, adelton@fi.muni.cz, http://www.fi.muni.cz/~adelton/
# at Faculty of Informatics, Masaryk University in Brno, Czech Republic.
#
# Example of use:
# fstobdf -s fontserverhost:7100 -fn 8x16 | ./bdftogd FontLarge gdfontl
#
use strict;
my $VERSION = '0.60';
my $now = localtime;
if (@ARGV != 2)
{ die "usage: bdftogd fontname filename, eg. bdftogd FontLarge gdfontl\n"; }
my $gdname = shift;
$gdname = 'gd' . $gdname unless $gdname =~ /^gd/i;
my $filename = shift;
$filename = 'gd' . $filename unless $filename =~ /^gd/i;
if (-f "$filename.c") { die "File $filename.c already exists, won't overwrite\n"; }
if (-f "$filename.h") { die "File $filename.h already exists, won't overwrite\n"; }
my ($width, $height);
my (@data, @left, @bottom);
my ($globalleft, $globaltop);