Bug 382741. Updating cairo patch list.
authorroc+@cs.cmu.edu
Wed, 13 Jun 2007 15:49:19 -0700
changeset 2365 5c7f9597390f0daf34073b8e6f513cd338451e24
parent 2364 a531162bf671f514cc9833c2700dde93a393cbd6
child 2366 5debd76fc0eb8feb5fddb24133cfb5e0a8c0298e
push idunknown
push userunknown
push dateunknown
bugs382741
milestone1.9a6pre
Bug 382741. Updating cairo patch list.
gfx/cairo/README
gfx/cairo/nonfatal-assertions.patch
--- a/gfx/cairo/README
+++ b/gfx/cairo/README
@@ -24,8 +24,10 @@ max-font-size.patch: Clamp freetype font
 
 fbcompose-bandaid.patch: Disable "optimized" code in non-MMX case due to bugs
 
 quartz-glyph-rounding.patch: Round glyph positions, not advances, to float
 
 win32-scaled-font-size.patch: Add cairo_win32_font_face_create_for_logfontw_hfont,
 allow win32 scaled_fonts to rescale themselves properly to the required CTM
 and only use the font_face's hfont if we're sure it's appropriate
+
+nonfatal-assertions.patch: Make assertions non-fatal
new file mode 100644
--- /dev/null
+++ b/gfx/cairo/nonfatal-assertions.patch
@@ -0,0 +1,39 @@
+Index: gfx/cairo/cairo/src/cairoint.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairoint.h,v
+retrieving revision 1.34
+diff -u -p -1 -2 -r1.34 cairoint.h
+--- gfx/cairo/cairo/src/cairoint.h	4 Apr 2007 01:09:16 -0000	1.34
++++ gfx/cairo/cairo/src/cairoint.h	1 Jun 2007 02:05:18 -0000
+@@ -231,24 +231,31 @@ typedef void *cairo_mutex_t;
+ #define FALSE 0
+ #endif
+ 
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
+ 
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+ #endif
+ 
+ #ifndef MOZILLA_CAIRO_NOT_DEFINED
++/* Make assertions non-fatal */
++#ifndef NDEBUG
++#undef assert
++#define assert(expr) \
++    do { if (!(expr)) fprintf(stderr, "Assertion failed at %s:%d: %s\n", \
++          __FILE__, __LINE__, #expr); } while (0)
++#endif
+ #ifndef INT32_MAX
+ # ifdef INT_MAX
+ #  define INT32_MAX INT_MAX
+ #  define INT32_MIN INT_MIN
+ # else
+ #  define INT32_MAX 2147483647
+ #  define INT32_MIN (-2147483647 - 1)
+ # endif
+ #endif
+ #endif
+ 
+ /* Size in bytes of buffer to use off the stack per functions.