[cairo-commit] 3 commits - pixman/src src/cairo-meta-surface.c src/cairo-pattern.c src/cairo-traps.c

[Carl Worth]

 pixman/src/pixman.h      |    2 +-
 src/cairo-meta-surface.c |    4 ++--
 src/cairo-pattern.c      |    4 ++--
 src/cairo-traps.c        |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree 32c0e85d45ee26c34ba1af0e4ba6ced044e469cc (from 3690eeb44cd86ac02eb21163d9a5e84784f6417d)
Author: Zakharov Mikhail <zmey20000 at yahoo.com>
Date:   Wed Jun 7 18:32:16 2006 +0400

    pixman: fix compilation on HP-UX 11.11

diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h
index 79b97a9..1c98fd9 100644
--- a/pixman/src/pixman.h
+++ b/pixman/src/pixman.h
@@ -76,7 +76,7 @@ SOFTWARE.
 
 #if defined (__SVR4) && defined (__sun)
 # include <sys/int_types.h>
-#elif defined (__OpenBSD__) || defined (_AIX) || defined (__osf__)
+#elif defined (__OpenBSD__) || defined (_AIX) || defined (__osf__) || defined (__hpux__)
 # include <inttypes.h>
 #elif defined (_MSC_VER)
   typedef __int8 int8_t;
diff-tree 3690eeb44cd86ac02eb21163d9a5e84784f6417d (from 7f2cf378d595fa559401c76f051ca9b5e6809763)
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jun 7 02:59:51 2006 -0700

    Change all instances of UINT16_MAX to INT16_MAX to avoid new bug.
    
    A recent renaming from CAIRO_MAXSHORT also changed the range of some
    values from INT16_MAX to UINT16_MAX. The test suite shows one case
    where this introduces a bug, (push/pop_group with SVG and RGB24
    surfaces).
    
    I haven't tracked the bug down, (presumably there's overflow of the
    unsigned value at some point), but I'm now reverting this to avoid
    triggering the bug.

diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c
index 02868e5..1ddeed0 100644
--- a/src/cairo-meta-surface.c
+++ b/src/cairo-meta-surface.c
@@ -551,8 +551,8 @@ _cairo_meta_surface_get_extents (void			
 {
     rectangle->x = 0;
     rectangle->y = 0;
-    rectangle->width = UINT16_MAX;
-    rectangle->height = UINT16_MAX;
+    rectangle->width = INT16_MAX;
+    rectangle->height = INT16_MAX;
 
     return CAIRO_STATUS_SUCCESS;
 }
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 1ea6db0..496a884 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1457,8 +1457,8 @@ _cairo_pattern_get_extents (cairo_patter
 
     extents->x = 0;
     extents->y = 0;
-    extents->width = UINT16_MAX;
-    extents->height = UINT16_MAX;
+    extents->width = INT16_MAX;
+    extents->height = INT16_MAX;
 
     return CAIRO_STATUS_SUCCESS;
 }
diff-tree 7f2cf378d595fa559401c76f051ca9b5e6809763 (from bf458c9c67120a2d175f18447dd710060f0ba014)
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jun 7 01:17:53 2006 -0700

    Fix MAX vs. MIN bug introduced with rename away from CAIRO_MINSHORT

diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index cb9e9e4..107276c 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -74,7 +74,7 @@ _cairo_traps_init (cairo_traps_t *traps)
     traps->traps_size = 0;
     traps->traps = NULL;
     traps->extents.p1.x = traps->extents.p1.y = INT16_MAX << 16;
-    traps->extents.p2.x = traps->extents.p2.y = INT16_MAX << 16;
+    traps->extents.p2.x = traps->extents.p2.y = INT16_MIN << 16;
 }
 
 void