Commit 5df303fc authored by Carl Worth's avatar Carl Worth
Browse files

Remove pixman since it shouldn't exist at this point of the history.

parent 6aff3cbf
Makefile
Makefile.in
aclocal.m4
config.cache
config.h
config.h.in
config.log
config.status
configure
libpixregion.pc
libtool
stamp-h
stamp-h.in
X Window System authors
(libpixregion now maintained by Carl Worth <cworth@isi.edu>)
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
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, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
2003-11-25 Carl Worth <cworth@east.isi.edu>
* configure.in: Bump version to 0.1.5 for new 64-bit fixes.
* src/icutil.c (icStipple8Bits): One more fix needed for 64-bit
machine (alpha in this case). Thanks to Jakub Bogusz
<qboosh@pld-linux.org>.
2003-11-17 Carl Worth <cworth@isi.edu>
* src/icutil.c (icStipple1Bits):
* src/icrop.h (IcStipple16Bits): Fixes needed to compile libic on
x86_64. Many thanks to David R Bacon <dbacon@cis.ksu.edu>.
2003-11-06 Carl Worth <cworth@east.isi.edu>
* configure.in: Bump version to 0.1.4 just to mark removal of the
version from ic.h, (so not an interesting change and nothing worth
upgrading to).
* src/ic.h: Remove IC_MAJOR, IC_MINOR, and IC_REVISION, (which
were stale anyway so less than useful).
2003-10-31 Carl Worth <cworth@isi.edu>
* configure.in (LIBIC_VERSION): Bump version to 0.1.3 for new IcImageGetDepth.
* src/icimage.c (IcImageGetDepth): Add IcImageGetDepth.
2003-10-29 Carl Worth <cworth@isi.edu>
* src/icimage.h: Remove currently unused DevUnion datatype to
squelch compiler warning. Remove prototype for currently
unimplemented IcImageChange function.
* src/icimage.c (IcImageDestroy): Fixed memory leak of
image->transform.
2003-10-29 Carl Worth <cworth@east.isi.edu>
* configure.in: Drop AC_CONFIG_AUX_DIR(config) as it was confusing
"make distcheck"
2003-10-29 Carl Worth <cworth@east.isi.edu>
* configure.in: Bumped version to 0.1.2 to indicate new IcOperator
type.
* Everywhere: A large patch from Bryan Worth <bryan@theworths.org>
to eliminate lots of leftover, undesired dependencies on X header
files. More details below:
* src/ictransform.c:
* src/ictrap.c:
* src/ictri.c:
* src/icrect.c:
* src/iccompose.c:
* src/iccolor.c:
* src/icbltone.c:
* src/icblt.c:
* src/icimage.h:
* src/icimage.c:
* src/ic.c:
Replace CARD8/16/32 with uint8/16/32_t.
Replace INT16 with int16_t.
Use IcOperator in place of char or uint8_t.
Replace Bool/FALSE/TRUE with int/0/1.
* src/icint.h: Remove includes of X11/X.h, X11/Xmd.h,
X11/Xprotostr.h and X11/extensions/Xrender.h. Add IcPoint. Lift
definitions from X headers for Mask, GXor, ClipByChildren,
PolyEdgeSharp, PolyModePrecise, CPClipMask, and CPLastBit.
* src/icimage.h: Remove includes of X11/Xdefs.h and X11/Xprotostr.h.
Replace "pointer" with "void *".
Remove include of X11/Xutil.h.
Replace DDXPointRec with IcPoint.
Replace Atom/XID with unsigned long.
* src/icimage.c: Remove instances of BadAlloc and Success.
Replace XID with unsigned int.
Replace "pointer" with "void *".
Replace Atom with unsigned long.
* src/ic.h: Introduce new IcOperator enum, rather than using char
or uint8_t.
2003-09-09 Carl Worth <cworth@isi.edu>
* configure.in (SLIM_REQUIRED): Updated calls to slim_hidden_def
to track changes in slim 0.2.0.
2003-09-05 Carl Worth <cworth@isi.edu>
* configure.in (LIBIC_VERSION): Bumped version to 0.1.1.
* src/ictrap.c (IcCreateAlphaPicture): Fixed memory leak.
* src/icimage.h: icimage->image_format now a struct not a
pointer. Rename integral format_name to format_code.
* src/iccompose.c: Remove unused functions: IcCombineSaturateU,
IcCombineSaturateC, IcFetch_a2b2g2r2, IcFetch_c8, IcFetch_c4,
IcFetch_g1, IcStore_c8, IcStore_g8, IcStore_c4, IcStore_g4,
IcStore_g1.
* src/iccolor.c (_IcOnes): Rename Ones to _IcOnes and expose it
for internal use.
* src/ic.h: Changed IcFormatName from an int to an enum.
Changed IcFormat from an exposed struct to an opaque type.
Now expose IcFormatCreate, IcFormatCreateMasks, and
IcFormatDestroy.
2003-09-02 Carl Worth <cworth@isi.edu>
* src/ic.h: Include inttypes.h rather than stdint.h on OpenBSD,
(Michael Schubert <michael@schubert.cx>)
2003-07-31 Richard Henderson <rth@twiddle.net>
* src/iccolor.c (Ones): Define as __builtin_popcount when available.
2003-07-31 Richard Henderson <rth@twiddle.net>
* configure.in: Check for slim revision.
* libic.pc.in: Depend on slim.
* src/ic.c, src/iccompose.c: Don't include icimage.h.
* src/icimage.h: Don't include ic.h.
* src/ic.h: Include slim_{export,import}.h as appropriate. Mark all
symbols __external_linkage.
* src/icint.h: Include slim_import.h; mark symbols __internal_linkage;
add slim hidden_proto declarations.
* src/icimage.h: Mark all symbols __internal_linkage.
* src/icrop.h: Likewise.
* src/ic.c (IcComposite): Provide hidden definition.
* src/iccolor.c (IcColorToPixel): Likewise.
* src/icformat.c (IcFormatInit): Likewise.
* src/icimage.c (IcImageCreate, IcImageDestroy): Likewise.
(IcImageSetRepeat): Likewise.
* src/icrect.c (IcFillRectangles): Likewise.
* src/tri.c (IcRasterizeTriangle): Make static.
2003-07-31 Richard Henderson <rth@twiddle.net>
* src/ic.c: Make everything but IcComposite static.
* src/iccompose.c: Make everything except IcBuildCompositeOperand
and IcCompositeGeneral static.
* src/icbltone.c (Ic8Lane, Ic16Lane, Ic32Lane): Make static.
(IcLaneTable): Turn into a function.
(IcBltOne): Make IcLane const.
(icStipple24Bits): Make static.
* src/icimage.h: Remove lots of now static declarations.
* src/icrop.h: Likewise.
* src/icutil.c (icStipple8Bits, icStipple4Bits): Make static.
(icStipple2Bits, icStipple1Bits): Make static.
(IcStippleTable): Turn into a function.
2003-07-30 Carl Worth <cworth@isi.edu>
* src/ic.h: Fixed IcRectangle to be compatible with XRectangle.
2003-07-29 Billy Biggs <vektor@dumbterm.net>
* src/ic.h: Changed all references to CARD*/INT* to use stdint
names, (eg. uint32_t, int32_t).
2003-07-10 Anders Carlsson <andersca@codefactory.se>
* autogen.sh:
Pass --enable-maintainer-mode to configure
* configure.in:
Add compiler warning flags to CFLAGS.
2003-07-09 Anders Carlsson <andersca@codefactory.se>
* src/ic.h:
* src/icimage.c: (IcImageGetData):
Add accessor for getting a pointer to the image data.
2003-07-09 Anders Carlsson <andersca@codefactory.se>
* src/ic.h:
* src/icimage.c: (IcImageGetWidth), (IcImageGetHeight),
(IcImageGetStride):
Add accessors.
2003-05-14 Carl Worth <cworth@isi.edu>
* src/ic.h: Add IcImageSetFilter. Fixed transform support.
2003-05-05 Carl Worth <cworth@isi.edu>
* src/ictrap.c (IcCompositeTrapezoids): Avoid crash if there's
nothing to draw.
2003-04-26 Carl Worth <cworth@isi.edu>
* src/icimage.c (IcImageDestroy): Fix memory leak of image->pixels
when owns_pixels == 1;
2003-04-25 Carl Worth <cworth@east.isi.edu>
* src/ic.h (IC_REVISION): Added #defines for version.
Don't reference undefined XFixed datatype.
Added IcFixed16_16, IcPointFixed, IcLineFixed, IcRectangle,
IcTriangle, and IcTrapzezoid to eliminate X datatypes in public
interface.
* configure.in: Fixed libtool versioning.
2003-04-17 Carl Worth <cworth@isi.edu>
* src/icint.h: Removed reliance on some server include files,
(this included copy and paste of Xserver/render/picture.h into
icint.h)
* src/icformat.c (IcFormatInit): Replaced public
IcFormatCreate/IcFormatDestroy with IcFormatInit and an exposed
IcFormat structure.
(_IcFormatCreate): Tracked changes now that IcFormat no longer has
direct and indexed sub-structure.
* src/iccompose.c: Commented out all code supporting indexed
formats.
* src/ic.h: Expose IcFormat structure, (with no support for
indexed formats).
* src/ic.c (IcComposite): Track changes in IcImage structure
(format vs. format_name)
2003-03-10 Carl Worth <cworth@isi.edu>
* src/Makefile.am (INCLUDES): Cleaned up to no longer require
includes from X server source tree.
2003-03-05 Carl Worth <cworth@isi.edu>
* src/ictri.c (IcTriangles):
(IcTriStrip):
(IcTriFan): fixed argument order to match XRender
* src/icrect.c (IcRectangle): Add IcRectangle convenience function.
(IcRectangles): fixed argument order to match XRender
* src/ictri.c (IcTriangles):
(IcTriStrip):
(IcTriFan): Removed format argument from IcTri* functions.
* src/ictrap.c (IcTrapezoids): Removed format argument from
IcTrapezoids.
* src/icrect.c (IcRectangles): Initial (painfully slow)
implementation of IcRectangles.
* src/icimage.c (IcImageCreate): Simplified IcImageCreate, (no
longer requires mask/vlist/error/error_value)
(IcImageSetRepeat): Added IcImageSetRepeat
(IcImageSetClipRegion): Implemented simple IcImageSetClipRegion.
2003-02-25 Carl Worth <cworth@isi.edu>
* src/icimage.c (IcImageInit):
(IcImageDestroy):
(IcImageDestroyClip):
(IcClipImageReg):
(IcClipImageSrc):
(IcClipImageSrc):
(SetPictureClipRects):
(IcComputeCompositeRegion): Converted to use libpixregion rather
than region code from Xlib.
* src/iccompose.c (IcFetch_transform): Converted to use
libpixregion rather than region code from Xlib.
* src/ic.c (IcComposite): Converted to use libpixregion rather
than region code from Xlib.
2003-02-21 Carl Worth <cworth@isi.edu>
* src/ictri.c (IcRasterizeTriangle): Added triangle support to
libic.
* src/ic.h: Started cleaning up the public interface of
libic. Moved most of the cruft into icint.h.
2003-02-20 Carl Worth <cworth@isi.edu>
* AUTHORS: Added AUTHORS, NEWS, ChangeLog.
2003-10-29 Carl Worth <cworth@east.isi.edu>
* configure.in: Drop AC_CONFIG_AUX_DIR(config) as it was confusing
"make distcheck"
2003-09-09 Carl Worth <cworth@isi.edu>
* configure.in (SLIM_REQUIRED): Updated calls to slim_hidden_def
to track changes in slim 0.2.0.
2003-07-30 Carl Worth <cworth@east.isi.edu>
* src/pixregion.h: Implement our own 'extern "C"' block to avoid
false dependency on X.
* configure.in: Remove unnecessary AC_PATH_XTRA check for X
headers.
2003-07-30 Richard Henderson <rth@twiddle.net>
* configure.in: Run PKG_CHECK_MODULES on slim.
* libpixregion.pc.in: Require slim.
* src/pixregion.c (PixRegionCreateSimple): Mark hidden.
(PixRegionCopy, PixRegionUnion): Mark hidden.
* src/pixregion.h: Include and use X11/Xfuncproto.h. Include
slim_{export,import}.h as appropriate. Mark all functions with
__external_linkage.
* src/pixregionint.h: Rename include protect to _PIXREGIONINT_H_.
2003-04-22 Carl Worth <cworth@isi.edu>
* configure.in (LIBPIXREGION_MAJOR_VERSION): Fixed typo (Owen Taylor)
2003-02-25 Carl Worth <cworth@isi.edu>
* src/pixregion.c (PixRegionCreateSimple): Eliminated useless size
parameter from PixRegionCreateSized, (the server only ever calls
it with a value of 1 or 0).
(PixRegionInit):
(PixRegionUninit):
(PixRegionBreak): Changed these three functions to be static.
2003-09-23 Carl Worth <cworth@east.isi.edu>
* src/slim_internal.h: The slim_hidden_def macros were causing
build failures with gcc 2.95.4. I've bumped the test for these
macros up to: __GNUC__ >= 3. We'll see if that's sufficient.
2003-09-09 Carl Worth <cworth@isi.edu>
* configure.in (SLIM_VERSION): Bump version number to 0.2.0
instead, (this is an incompatible change after all).
* configure.in (SLIM_VERSION): Bump version number to 0.1.1
* src/slim_internal.h (slim_hidden_def): Remove ';' from macro
definition, (forcing the user to provide it which looks better
anyway). This also helps to avoid confusing etags.
2003-07-31 Richard Henderson <rth@twiddle.net>
* src/slim_internal.h (__internal_linkage): Attribute visibility
not present until gcc 3.3.
2003-07-30 Richard Henderson <rth@twiddle.net>
* Makefile.am (EXTRA_DIST, pkgconfigdir, pkgconfig_DATA): New.
* configure.in (AC_OUTPUT): Add slim.pc.
* slim.pc.in: New file.
2003-07-30 Richard Henderson <rth@twiddle.net>
* src/slim_internal.h: New file.
* src/slim_export.h: New file.
* src/slim_import.h: New file.
* src/Makefile.am (include_HEADERS): Add them.
* configure.in (AC_INIT): Check for src/slim_export.h
2003-07-29 Carl Worth <cworth@isi.edu>
* Create package skeleton.
This code uses automake, in order to generate the Makefiles use:
$ autogen.sh
After that, standard build procedures apply:
$ make
# make install
SUBDIRS = . src
EXTRA_DIST = \
COPYING \
libpixregion.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpixregion.pc
libpixregion - Pixel region Library
libpixregion is a generic library for manipulating pixel regions. A
PixRegion is a set of Y-X banded rectangles that cover the desired
region.
The original code for libxregion was part of the reference X server
implementation of the X Window System. A modified copy of the code
also exists in the Xlib client library. libpixregion was formed so
that both the X server and client libraries could share common code
for region manipulation.
libpixregion is also intended to be applicable outside of the X Window
System. The public interface of libpixregion does not depend on any
part of the X Window System.
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
set -e
ARGV0=$0
if test -z "$ACLOCAL_FLAGS"; then
acdir=`aclocal --print-ac-dir`
if [ ! -f $acdir/pkg.m4 ]; then
echo "$ARGV0: Error: Could not find pkg-config macros."
echo " (Looked in $acdir/pkg.m4)"
echo " If pkg.m4 is available in /another/directory, please set"
echo " ACLOCAL_FLAGS=\"-I /another/directory\""
echo " Otherwise, please install pkg-config."
echo ""
echo "pkg-config is available from:"
echo "http://www.freedesktop.org/software/pkgconfig/"
exit 1
fi
fi
if test -z "$*"; then
echo "$ARGV0: Note: \`./configure' will be run with no arguments."
echo " If you wish to pass any to it, please specify them on the"
echo " \`$0' command line."
echo
fi
do_cmd() {
echo "$ARGV0: running \`$@'"
$@
}
do_cmd libtoolize --force --copy
do_cmd aclocal ${ACLOCAL_FLAGS}
do_cmd autoheader
do_cmd automake --add-missing
do_cmd autoconf
do_cmd ./configure --enable-maintainer-mode ${1+"$@"} && echo "Now type \`make' to compile" || exit 1
# Process this file with autoconf to produce a configure script.
AC_INIT(src/pixregion.h)
dnl ===========================================================================
# Package version number, (as distinct from shared library version)
# This must be manually synchronized with the version in src/ic.h
LIBPIXREGION_VERSION=0.1.0
# libtool shared library version
# Increment if the interface has additions, changes, removals.
LT_CURRENT=1
# Increment any time the source changes; set to
# 0 if you increment CURRENT
LT_REVISION=0
# Increment if any interfaces have been added; set to 0
# if any interfaces have been removed. removal has
# precedence over adding, so set to 0 if both happened.
LT_AGE=0
VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
AC_SUBST(VERSION_INFO)
dnl ===========================================================================
AM_INIT_AUTOMAKE(libpixregion, $LIBPIXREGION_VERSION)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_PROG_CC
AM_PROG_LIBTOOL
dnl ===========================================================================
SLIM_REQUIRED=0.2.0
PKG_CHECK_MODULES(LIBPIXREGION, slim >= $SLIM_REQUIRED)
AC_SUBST(LIBPIXREGION_CFLAGS)
AC_SUBST(LIBPIXREGION_LIBS)
dnl ===========================================================================
AC_OUTPUT([
libpixregion.pc
Makefile
src/Makefile
])
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libpixregion
Description: Pixel region library
Requires: slim
Version: @VERSION@
Libs: -L${libdir} -lpixregion
Cflags: -I${includedir}
Makefile
Makefile.in
*.la
*.lo
.libs
.deps
lib_LTLIBRARIES = libpixregion.la
include_HEADERS = pixregion.h
libpixregion_la_SOURCES = \
pixregion.c \
pixregion.h \
pixregionint.h
libpixregion_la_LDFLAGS = -version-info @VERSION_INFO@
INCLUDES = $(LIBPIXREGION_CFLAGS)
libpixregion_la_LIBADD = $(LIBPIXREGION_LIBS)
This diff is collapsed.
/*
* Copyright 1998 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Keith Packard not be used in
* advertising or publicity pertaining to distribution of the software without
* specific, written prior permission. Keith Packard makes no
* representations about the suitability of this software for any purpose. It
* is provided "as is" without express or implied warranty.
*
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef IC_H_INCLUDED
#define IC_H_INCLUDED
#if defined (__SVR4) && defined (__sun)
# include <sys/int_types.h>
#else