Clean up README file

Fix ABI incompatibility crash (thanks to James for debugging the failing code)
Clean up debug spew
pull/1/head
Timothy Pearson 13 years ago
parent 150562b89b
commit 2e6e0a12e1

@ -19,7 +19,7 @@ http://www.gnome.org/~mathieu/libart/libart.html
====================================================================== ======================================================================
NOTE: The TDE project has take over maintinance of this library, NOTE: The TDE project has taken over maintenance of this library,
starting with the sources from the final upstream release v2.3.21. starting with the sources from the final upstream release v2.3.21.
This allows the TDE project to resolve remaining issues that cause This allows the TDE project to resolve remaining issues that cause

@ -30,9 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if 0
#include <assert.h>
#endif
/* Hack to find out how to define alloca on different platforms. /* Hack to find out how to define alloca on different platforms.
* Modified version of glib/galloca.h. * Modified version of glib/galloca.h.
@ -205,9 +202,6 @@ calc_color_at (ArtGradientStop *stops,
} }
printf ("WARNING! bad ix %d in calc_color_at() [internal error]\n", ix); printf ("WARNING! bad ix %d in calc_color_at() [internal error]\n", ix);
#if 0
assert (0);
#endif
} }
static void static void
@ -334,33 +328,19 @@ art_render_gradient_linear_render_8 (ArtRenderCallback *self,
#ifdef DEBUG_SPEW #ifdef DEBUG_SPEW
printf ("Initial ix: %d\n", ix); printf ("Initial ix: %d\n", ix);
#endif #endif
#if 0
assert (ix > 0);
assert (ix < n_stops);
assert ((stops[ix-1].offset <= offset_fraction + EPSILON) ||
((stops[ix].offset > (1.0 - EPSILON)) && (offset_fraction < EPSILON /* == 0.0*/)));
assert (offset_fraction <= stops[ix].offset);
/* FIXME: These asserts may be broken, it is for now
safer to not use them. Should be fixed!
See bug #121850
assert ((offset_fraction != stops[ix-1].offset) ||
(d_offset >= 0.0));
assert ((offset_fraction != stops[ix].offset) ||
(d_offset <= 0.0));
*/
#else
if (!( (ix > 0) && (ix < n_stops) if (!( (ix > 0) && (ix < n_stops)
&& ((stops[ix-1].offset <= offset_fraction + EPSILON) || && ((stops[ix-1].offset <= offset_fraction + EPSILON) ||
((stops[ix].offset > (1.0 - EPSILON)) ((stops[ix].offset > (1.0 - EPSILON))
&& (offset_fraction < EPSILON /* == 0.0*/))) && (offset_fraction < EPSILON /* == 0.0*/)))
&& (offset_fraction <= stops[ix].offset))) && (offset_fraction <= stops[ix].offset)))
{ {
#ifdef DEBUG_SPEW
printf ("art_render_gradient.c:%d: Old assert() failed!\n", __LINE__); printf ("art_render_gradient.c:%d: Old assert() failed!\n", __LINE__);
#endif
return; return;
} }
#endif
while (width > 0) while (width > 0)
{ {
#ifdef DEBUG_SPEW #ifdef DEBUG_SPEW

@ -60,9 +60,9 @@ struct _ArtGradientLinear {
struct _ArtGradientRadial { struct _ArtGradientRadial {
double affine[6]; /* transforms user coordinates to unit circle */ double affine[6]; /* transforms user coordinates to unit circle */
double fx, fy; /* focal point in unit circle coords */ double fx, fy; /* focal point in unit circle coords */
ArtGradientSpread spread;
int n_stops; int n_stops;
ArtGradientStop *stops; ArtGradientStop *stops;
ArtGradientSpread spread;
}; };
struct _ArtGradientStop { struct _ArtGradientStop {

@ -601,7 +601,9 @@ art_svp_intersect_add_horiz (ArtIntersectCtx *ctx, ArtActiveSeg *seg)
#ifdef CHEAP_SANITYCHECK #ifdef CHEAP_SANITYCHECK
if (seg->flags & ART_ACTIVE_FLAGS_IN_HORIZ) if (seg->flags & ART_ACTIVE_FLAGS_IN_HORIZ)
{ {
#ifdef VERBOSE
art_warn ("*** attempt to put segment in horiz list twice\n"); art_warn ("*** attempt to put segment in horiz list twice\n");
#endif
return; return;
} }
seg->flags |= ART_ACTIVE_FLAGS_IN_HORIZ; seg->flags |= ART_ACTIVE_FLAGS_IN_HORIZ;

Loading…
Cancel
Save