Commit 4e0ac66e authored by Raph Levien's avatar Raph Levien

A bunch of very minor maintenance changes. The plan is for all these

changes to go to gnome-libs-1-0, then I start really branching.
parent dd7131e5
......@@ -6,6 +6,7 @@ INSTALL
Makefile
Makefile.in
aclocal.m4
art_config.h
confdefs.h
config.cache
config.guess
......@@ -15,7 +16,9 @@ config.log
config.status
config.sub
configure
gen_art_config
install-sh
libart-features.h
libtool
ltconfig
ltmain.sh
......
Tue May 16 15:03:35 2000 Raph Levien <raph@acm.org>
* art_rgb_pixbuf_affine.c: Included corresponding .h file.
* art_rgb_pixbuf_affine.h: Put recursive #includes inside
LIBART_COMPILATION test.
* art_gray_svp.c:
* art_rgb_svp.c: Explicit casts for callback data. Also removed
"render the steps into tmpbuf" comment.
* gen_art_config.c:
* Makefile.am:
* configure.in: Added code to automatically generate an
art_config.h file, to be installed in libart's include dir. This
file defines ART_SIZEOF_{CHAR,SHORT,INT,LONG} and art_u{8,16,32}.
* art_misc.h: Moved definition of art_u8 and art_u32 into
art_config.h. Added GCC printf format attributes.
* art_svp_wind.c (traverse): Fixed UMR bug here. The function
isn't actually used, so it's just for cleanliness.
2000-04-18 Lauris Kaplinski <lauris@ariman.ee>
* art_affine.c (art_affine_to_string): Replaced snprinf with
......
noinst_PROGRAMS = testart testuta
noinst_PROGRAMS = testart testuta gen_art_config
bin_SCRIPTS = \
libart-config
BUILT_SOURCES = art_config.h
art_config.h: gen_art_config
./gen_art_config > art_config.h
EXTRA_DIST = \
libart.m4 \
libartConf.sh.in \
......@@ -53,6 +58,7 @@ libart_lgplinc_HEADERS = \
art_affine.h \
art_alphagamma.h \
art_bpath.h \
art_config.h \
art_filterlevel.h \
art_gray_svp.h \
art_misc.h \
......
......@@ -38,7 +38,7 @@ static void
art_gray_svp_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ArtGraySVPData *data = callback_data;
ArtGraySVPData *data = (ArtGraySVPData *)callback_data;
art_u8 *linebuf;
int run_x0, run_x1;
int running_sum = start;
......@@ -66,7 +66,6 @@ art_gray_svp_callback (void *callback_data, int y,
if (run_x1 > x0)
memset (linebuf, running_sum >> 16, run_x1 - x0);
/* render the steps into tmpbuf */
for (k = 0; k < n_steps - 1; k++)
{
running_sum += steps[k].delta;
......
......@@ -25,6 +25,15 @@
#include <stdlib.h> /* for malloc, etc. */
/* The art_config.h file is automatically generated by
gen_art_config.c and contains definitions of
ART_SIZEOF_{CHAR,SHORT,INT,LONG} and art_u{8,16,32}. */
#ifdef LIBART_COMPILATION
#include "art_config.h"
#else
#include <libart_lgpl/art_config.h>
#endif
#define art_alloc malloc
#define art_free free
#define art_realloc realloc
......@@ -52,15 +61,27 @@ typedef int art_boolean;
#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
#endif /* M_SQRT2 */
/* These will be true on all platforms I care about. Nonetheless, it
should be autoconf'ed. */
typedef unsigned char art_u8;
typedef unsigned int art_u32;
/* Provide macros to feature the GCC function attribute.
*/
#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))
#define ART_GNUC_PRINTF( format_idx, arg_idx ) \
__attribute__((format (printf, format_idx, arg_idx)))
#else /* !__GNUC__ */
#define ART_GNUC_PRINTF( format_idx, arg_idx )
#endif /* !__GNUC__ */
#ifdef __cplusplus
extern "C" {
#endif
void
art_die (const char *fmt, ...);
art_die (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
void
art_warn (const char *fmt, ...);
art_warn (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
#ifdef __cplusplus
}
#endif
#endif /* __ART_MISC_H__ */
......@@ -25,7 +25,7 @@
#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. */
......
......@@ -23,9 +23,15 @@
/* This module handles compositing of affine-transformed generic
pixbuf images over rgb pixel buffers. */
#ifdef LIBART_COMPILATION
#include "art_filterlevel.h"
#include "art_alphagamma.h"
#include "art_pixbuf.h"
#else
#include <libart_lgpl/art_filterlevel.h>
#include <libart_lgpl/art_alphagamma.h>
#include <libart_lgpl/art_pixbuf.h>
#endif
#ifdef __cplusplus
extern "C" {
......
......@@ -46,9 +46,9 @@ struct _ArtRgbSVPAlphaData {
static void
art_rgb_svp_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ArtRgbSVPData *data = callback_data;
ArtRgbSVPData *data = (ArtRgbSVPData *)callback_data;
art_u8 *linebuf;
int run_x0, run_x1;
art_u32 running_sum = start;
......@@ -71,7 +71,6 @@ art_rgb_svp_callback (void *callback_data, int y,
run_x1 - x0);
}
/* render the steps into tmpbuf */
for (k = 0; k < n_steps - 1; k++)
{
running_sum += steps[k].delta;
......@@ -220,7 +219,7 @@ static void
art_rgb_svp_alpha_callback (void *callback_data, int y,
int start, ArtSVPRenderAAStep *steps, int n_steps)
{
ArtRgbSVPAlphaData *data = callback_data;
ArtRgbSVPAlphaData *data = (ArtRgbSVPAlphaData *)callback_data;
art_u8 *linebuf;
int run_x0, run_x1;
art_u32 running_sum = start;
......@@ -251,7 +250,6 @@ art_rgb_svp_alpha_callback (void *callback_data, int y,
run_x1 - x0);
}
/* render the steps into tmpbuf */
for (k = 0; k < n_steps - 1; k++)
{
running_sum += steps[k].delta;
......@@ -293,7 +291,7 @@ art_rgb_svp_alpha_opaque_callback (void *callback_data, int y,
int start,
ArtSVPRenderAAStep *steps, int n_steps)
{
ArtRgbSVPAlphaData *data = callback_data;
ArtRgbSVPAlphaData *data = (ArtRgbSVPAlphaData *)callback_data;
art_u8 *linebuf;
int run_x0, run_x1;
art_u32 running_sum = start;
......@@ -331,7 +329,6 @@ art_rgb_svp_alpha_opaque_callback (void *callback_data, int y,
}
}
/* render the steps into tmpbuf */
for (k = 0; k < n_steps - 1; k++)
{
running_sum += steps[k].delta;
......
......@@ -396,12 +396,13 @@ traverse (ArtSVP *vp)
break;
}
tmp1 = seg_idx;
for (j = i; j <= n_active_segs; j++)
for (j = i; j < n_active_segs; j++)
{
tmp2 = active_segs[j];
active_segs[j] = tmp1;
tmp1 = tmp2;
}
active_segs[n_active_segs] = tmp1;
n_active_segs++;
seg_idx++;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment