Commit 6989ee25 authored by Darin Adler's avatar Darin Adler

Add art_render_mask.[ch].

	* Makefile.am: Add art_render_mask.[ch].

	* art_bpath.h:
	* art_rect_svp.h:
	* art_rect_uta.h:
	* art_render.h:
	* art_render_gradient.h:
	* art_render_mask.h:
	* art_render_svp.h:
	* art_rgb_svp.h:
	* art_svp_intersect.h:
	* art_svp_ops.h:
	* art_svp_point.h:
	* art_svp_render_aa.h:
	* art_svp_vpath.h:
	* art_svp_vpath_stroke.h:
	* art_svp_wind.h:
	* art_uta.h:
	* art_uta_rect.h:
	* art_uta_ops.h:
	* art_uta_svp.h:
	* art_uta_vpath.h:
	* art_vpath_bpath.h:
	* art_vpath_dash.h:
	* art_vpath_svp.h:
	Fix includes so that each header includes what it needs.

	* art_affine.c:
	* art_alphagamma.c:
	* art_bpath.c:
	* art_gray_svp.c:
	* art_misc.c:
	* art_pixbuf.c:
	* art_rect.c:
	* art_rect_svp.c:
	* art_rect_uta.c:
	* art_render.c:
	* art_render_gradient.c:
	* art_render_mask.c:
	* art_render_svp.c:
	* art_rgb.c:
	* art_rgb_a_affine.c:
	* art_rgb_affine.c:
	* art_rgb_affine_private.c:
	* art_rgb_bitmap_affine.c:
	* art_rgb_pixbuf_affine.c:
	* art_rgb_rgba_affine.c:
	* art_rgb_svp.c:
	* art_rgba.c:
	* art_svp.c:
	* art_svp_intersect.c:
	* art_svp_ops.c:
	* art_svp_point.c:
	* art_svp_render_aa.c:
	* art_svp_vpath.c:
	* art_svp_vpath_stroke.c:
	* art_svp_wind.c:
	* art_uta.c:
	* art_uta_ops.c:
	* art_uta_rect.c:
	* art_uta_svp.c:
	* art_uta_vpath.c:
	* art_vpath.c:
	* art_vpath_bpath.c:
	* art_vpath_dash.c:
	* art_vpath_svp.c:
	Fix order of includes so that the corresponding header is
	included first, to test that each header includes what it
	needs.
parent 7c97d869
2002-01-03 Darin Adler <darin@bentspoon.com>
* Makefile.am: Add art_render_mask.[ch].
* art_bpath.h:
* art_rect_svp.h:
* art_rect_uta.h:
* art_render.h:
* art_render_gradient.h:
* art_render_mask.h:
* art_render_svp.h:
* art_rgb_svp.h:
* art_svp_intersect.h:
* art_svp_ops.h:
* art_svp_point.h:
* art_svp_render_aa.h:
* art_svp_vpath.h:
* art_svp_vpath_stroke.h:
* art_svp_wind.h:
* art_uta.h:
* art_uta_rect.h:
* art_uta_ops.h:
* art_uta_svp.h:
* art_uta_vpath.h:
* art_vpath_bpath.h:
* art_vpath_dash.h:
* art_vpath_svp.h:
Fix includes so that each header includes what it needs.
* art_affine.c:
* art_alphagamma.c:
* art_bpath.c:
* art_gray_svp.c:
* art_misc.c:
* art_pixbuf.c:
* art_rect.c:
* art_rect_svp.c:
* art_rect_uta.c:
* art_render.c:
* art_render_gradient.c:
* art_render_mask.c:
* art_render_svp.c:
* art_rgb.c:
* art_rgb_a_affine.c:
* art_rgb_affine.c:
* art_rgb_affine_private.c:
* art_rgb_bitmap_affine.c:
* art_rgb_pixbuf_affine.c:
* art_rgb_rgba_affine.c:
* art_rgb_svp.c:
* art_rgba.c:
* art_svp.c:
* art_svp_intersect.c:
* art_svp_ops.c:
* art_svp_point.c:
* art_svp_render_aa.c:
* art_svp_vpath.c:
* art_svp_vpath_stroke.c:
* art_svp_wind.c:
* art_uta.c:
* art_uta_ops.c:
* art_uta_rect.c:
* art_uta_svp.c:
* art_uta_vpath.c:
* art_vpath.c:
* art_vpath_bpath.c:
* art_vpath_dash.c:
* art_vpath_svp.c:
Fix order of includes so that the corresponding header is
included first, to test that each header includes what it
needs.
2002-01-02 Darin Adler <darin@bentspoon.com>
* art_alphagamma.h:
......
......@@ -26,6 +26,7 @@ libart_lgpl_2_la_SOURCES = \
art_rect_uta.c \
art_render.c \
art_render_gradient.c \
art_render_mask.c \
art_render_svp.c \
art_rgb.c \
art_rgb_affine.c \
......@@ -75,6 +76,7 @@ libart_lgplinc_HEADERS = \
art_rect_uta.h \
art_render.h \
art_render_gradient.h \
art_render_mask.h \
art_render_svp.h \
art_rgb.h \
art_rgb_affine.h \
......@@ -125,4 +127,4 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libart-2.0.pc
libart2-config: libart-config
cp -f libart-config libart2-config
\ No newline at end of file
cp -f libart-config libart2-config
......@@ -19,12 +19,12 @@
/* Simple manipulations with affine transformations */
#include "config.h"
#include "art_affine.h"
#include <math.h>
#include <stdio.h> /* for sprintf */
#include <string.h> /* for strcpy */
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
/* According to a strict interpretation of the libart structure, this
......
......@@ -19,11 +19,11 @@
/* Some functions to build alphagamma tables */
#include <math.h>
#include "art_misc.h"
#include "config.h"
#include "art_alphagamma.h"
#include <math.h>
/**
* art_alphagamma_new: Create a new #ArtAlphaGamma.
* @gamma: Gamma value.
......
......@@ -19,11 +19,11 @@
/* Basic constructors and operations for bezier paths */
#include <math.h>
#include "config.h"
#include "art_bpath.h"
#include "art_misc.h"
#include <math.h>
#include "art_bpath.h"
/**
* art_bpath_affine_transform: Affine transform an #ArtBpath.
......
......@@ -21,9 +21,11 @@
#define __ART_BPATH_H__
#ifdef LIBART_COMPILATION
#include "art_misc.h"
#include "art_point.h"
#include "art_pathcode.h"
#else
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_point.h>
#include <libart_lgpl/art_pathcode.h>
#endif
......
......@@ -19,12 +19,14 @@
/* Render a sorted vector path into a graymap. */
#include "config.h"
#include "art_gray_svp.h"
#include <string.h> /* for memset */
#include "art_misc.h"
#include "art_svp.h"
#include "art_svp_render_aa.h"
#include "art_gray_svp.h"
typedef struct _ArtGraySVPData ArtGraySVPData;
......
......@@ -20,12 +20,13 @@
/* Various utility functions RLL finds useful. */
#include "config.h"
#include "art_misc.h"
#ifdef HAVE_UINSTD_H
#include <unistd.h>
#endif
#include <stdio.h>
#include <stdarg.h>
#include "art_misc.h"
/**
* art_die: Print the error message to stderr and exit with a return code of 1.
......
......@@ -17,8 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#include "art_misc.h"
#include "config.h"
#include "art_pixbuf.h"
#include "art_misc.h"
#include <string.h>
/**
......
......@@ -17,10 +17,11 @@
* Boston, MA 02111-1307, USA.
*/
#include <math.h>
#include "art_misc.h"
#include "config.h"
#include "art_rect.h"
#include <math.h>
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif /* MAX */
......
......@@ -17,10 +17,12 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rect_svp.h"
#include "art_misc.h"
#include "art_svp.h"
#include "art_rect.h"
#include "art_rect_svp.h"
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
......
......@@ -22,6 +22,12 @@
/* Find the bounding box of a sorted vector path. */
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -17,9 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "art_misc.h"
#include "art_uta.h"
#include "art_rect.h"
#include "config.h"
#include "art_rect_uta.h"
/* Functions to decompose a microtile array into a list of rectangles. */
......
......@@ -21,8 +21,10 @@
#define __ART_RECT_UTA_H__
#ifdef LIBART_COMPILATION
#include "art_rect.h"
#include "art_uta.h"
#else
#include <libart_lgpl/art_rect.h>
#include <libart_lgpl/art_uta.h>
#endif
......
......@@ -20,12 +20,11 @@
* Boston, MA 02111-1307, USA.
*/
#include "art_misc.h"
#include "art_alphagamma.h"
#include "art_rgb.h"
#include "config.h"
#include "art_render.h"
#include "art_rgb.h"
typedef struct _ArtRenderPriv ArtRenderPriv;
struct _ArtRenderPriv {
......
......@@ -24,9 +24,9 @@
#define __ART_RENDER_H__
#ifdef LIBART_COMPILATION
#include "art_misc.h"
#include "art_alphagamma.h"
#else
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_alphagamma.h>
#endif
#ifdef __cplusplus
......
......@@ -23,15 +23,11 @@
* Alexander Larsson <alla@lysator.liu.se>
*/
#include <math.h>
#include "art_misc.h"
#include "art_alphagamma.h"
#include "art_filterlevel.h"
#include "art_render.h"
#include "config.h"
#include "art_render_gradient.h"
#include <math.h>
typedef struct _ArtImageSourceGradLin ArtImageSourceGradLin;
typedef struct _ArtImageSourceGradRad ArtImageSourceGradRad;
......
......@@ -26,6 +26,14 @@
#ifndef __ART_RENDER_GRADIENT_H__
#define __ART_RENDER_GRADIENT_H__
#ifdef LIBART_COMPILATION
#include "art_filterlevel.h"
#include "art_render.h"
#else
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_render.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -22,12 +22,11 @@
* Authors: Raph Levien <raph@acm.org>
*/
#include "config.h"
#include "art_render_mask.h"
#include <string.h>
#include <libart_lgpl/art_misc.h>
#include <libart_lgpl/art_alphagamma.h>
#include <libart_lgpl/art_render.h>
#include "art_render_mask.h"
typedef struct _ArtMaskSourceMask ArtMaskSourceMask;
......
/* This file is adapted from art_render_mask.h in Libart version 2.4.0 */
#include <libart_lgpl/libart-features.h>
#if LIBART_MAJOR_VERSION == 2 && LIBART_MINOR_VERSION < 4
/*
* art_render_mask.h: Alpha mask source for modular rendering.
*
......@@ -31,6 +25,12 @@
#ifndef __ART_RENDER_MASK_H__
#define __ART_RENDER_MASK_H__
#ifdef LIBART_COMPILATION
#include "art_render.h"
#else
#include <libart_lgpl/art_render.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......@@ -45,9 +45,3 @@ art_render_mask (ArtRender *render,
#endif /* __cplusplus */
#endif /* __ART_RENDER_MASK_H__ */
#else
#include <libart_lgpl/art_render_svp.h>
#endif
......@@ -22,13 +22,8 @@
* Authors: Raph Levien <raph@acm.org>
*/
#include "art_misc.h"
#include "art_alphagamma.h"
#include "art_svp.h"
#include "art_svp_render_aa.h"
#include "art_render.h"
#include "art_render_svp.h"
#include "art_svp_render_aa.h"
typedef struct _ArtMaskSourceSVP ArtMaskSourceSVP;
......
/*
* art_render_gradient.h: SVP mask source for modular rendering.
* art_render_svp.h: SVP mask source for modular rendering.
*
* Libart_LGPL - library of basic graphic primitives
* Copyright (C) 2000 Raph Levien
......@@ -25,6 +25,14 @@
#ifndef __ART_RENDER_SVP_H__
#define __ART_RENDER_SVP_H__
#ifdef LIBART_COMPILATION
#include "art_render.h"
#include "art_svp.h"
#else
#include <libart_lgpl/art_render.h>
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -17,11 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
#include <string.h> /* for memset */
#include "art_misc.h"
#include "config.h"
#include "art_rgb.h"
#include "config.h" /* for endianness */
#include <string.h> /* for memset */
/* Basic operators for manipulating 24-bit packed RGB buffers. */
......
......@@ -17,12 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_a_affine.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
#include "art_point.h"
#include "art_rgb_affine_private.h"
#include "art_rgb_a_affine.h"
/* This module handles compositing of affine-transformed alpha only images
over rgb pixel buffers. */
......
......@@ -17,11 +17,13 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_affine.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
#include "art_rgb_affine.h"
#include "art_rgb_affine_private.h"
/* This module handles compositing of affine-transformed rgb images
......
......@@ -17,11 +17,13 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_affine_private.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
#include "art_rgb_affine_private.h"
/* Private functions for the rgb affine image compositors - primarily,
the determination of runs, eliminating the need for source image
......
......@@ -17,12 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_bitmap_affine.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
#include "art_rgb_affine_private.h"
#include "art_rgb_bitmap_affine.h"
/* This module handles compositing of affine-transformed bitmap images
over rgb pixel buffers. */
......
......@@ -17,6 +17,9 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_pixbuf_affine.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
......@@ -25,7 +28,6 @@
#include "art_rgb_affine.h"
#include "art_rgb_affine.h"
#include "art_rgb_rgba_affine.h"
#include "art_rgb_pixbuf_affine.h"
/* This module handles compositing of affine-transformed generic
pixbuf images over rgb pixel buffers. */
......
......@@ -17,12 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_rgb_rgba_affine.h"
#include <math.h>
#include "art_misc.h"
#include "art_point.h"
#include "art_affine.h"
#include "art_rgb_affine_private.h"
#include "art_rgb_rgba_affine.h"
/* This module handles compositing of affine-transformed rgba images
over rgb pixel buffers. */
......
......@@ -19,12 +19,12 @@
/* Render a sorted vector path into an RGB buffer. */
#include "art_misc.h"
#include "config.h"
#include "art_rgb_svp.h"
#include "art_svp.h"
#include "art_svp_render_aa.h"
#include "art_rgb.h"
#include "art_rgb_svp.h"
typedef struct _ArtRgbSVPData ArtRgbSVPData;
typedef struct _ArtRgbSVPAlphaData ArtRgbSVPAlphaData;
......
......@@ -24,8 +24,10 @@
#ifdef LIBART_COMPILATION
#include "art_alphagamma.h"
#include "art_svp.h"
#else
#include <libart_lgpl/art_alphagamma.h>
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
......
......@@ -20,8 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include "art_misc.h"
#include "config.h"
#include "art_rgba.h"
#define ART_OPTIMIZE_SPACE
......
......@@ -19,11 +19,11 @@
/* Basic constructors and operations for sorted vector paths */
#include "art_misc.h"
#include "art_rect.h"
#include "config.h"
#include "art_svp.h"
#include "art_misc.h"
/* Add a new segment. The arguments can be zero and NULL if the caller
would rather fill them in later.
......
......@@ -21,6 +21,9 @@
code.
*/
#include "config.h"
#include "art_svp_intersect.h"
#include <math.h> /* for sqrt */
/* Sanitychecking verifies the main invariant on every priority queue
......@@ -35,8 +38,6 @@
#define noVERBOSE
#include "art_misc.h"
#include "art_svp.h"
#include "art_svp_intersect.h"
/* A priority queue - perhaps move to a separate file if it becomes
needed somewhere else */
......
......@@ -22,6 +22,12 @@
/* The funky new SVP intersector. */
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -21,6 +21,9 @@
/* Vector path set operations, over sorted vpaths. */
#include "config.h"
#include "art_svp_ops.h"
#include "art_misc.h"
#include "art_svp.h"
......@@ -32,7 +35,6 @@
#else
#include "art_svp_wind.h"
#endif
#include "art_svp_ops.h"
#include "art_vpath_svp.h"
/* Merge the segments of the two svp's. The resulting svp will share
......
......@@ -20,6 +20,12 @@
#ifndef __ART_SVP_OPS_H__
#define __ART_SVP_OPS_H__
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -17,11 +17,13 @@
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "art_svp_point.h"
#include <math.h>
#include "art_misc.h"
#include "art_svp.h"
#include "art_svp_point.h"
/* Determine whether a point is inside, or near, an svp. */
......
......@@ -22,6 +22,12 @@
/* Determine whether a point is inside, or near, an svp. */
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -19,6 +19,9 @@
/* The spiffy antialiased renderer for sorted vector paths. */
#include "config.h"
#include "art_svp_render_aa.h"
#include <math.h>
#include <string.h> /* for memmove */
#include "art_misc.h"
......@@ -26,8 +29,7 @@
#include "art_rect.h"
#include "art_svp.h"
#include "art_svp_render_aa.h"
#include "stdio.h"
#include <stdio.h>
typedef double artfloat;
......
......@@ -22,6 +22,12 @@
/* The spiffy antialiased renderer for sorted vector paths. */
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#else
#include <libart_lgpl/art_svp.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
......
......@@ -19,6 +19,9 @@
/* Sort vector paths into sorted vector paths */
#include "config.h"
#include "art_svp_vpath.h"
#include <stdlib.h>
#include <math.h>
......@@ -26,7 +29,6 @@
#include "art_vpath.h"
#include "art_svp.h"
#include "art_svp_vpath.h"
/* reverse a list of points in place */
......
......@@ -21,8 +21,10 @@
#define __ART_SVP_VPATH_H__
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#include "art_vpath.h"
#else
#include <libart_lgpl/art_svp.h>
#include <libart_lgpl/art_vpath.h>
#endif
......
......@@ -18,6 +18,9 @@
*/
#include "config.h"
#include "art_svp_vpath_stroke.h"
#include <stdlib.h>
#include <math.h>
......@@ -31,7 +34,6 @@
#include "art_svp_wind.h"
#endif
#include "art_svp_vpath.h"
#include "art_svp_vpath_stroke.h"
#define EPSILON 1e-6
#define EPSILON_2 1e-12
......
......@@ -22,6 +22,14 @@
/* Sort vector paths into sorted vector paths. */
#ifdef LIBART_COMPILATION
#include "art_svp.h"
#include "art_vpath.h"
#else
#include <libart_lgpl/art_svp.h>
#include <libart_lgpl/art_vpath.h>