Commit 7146e2fc authored by Carl Worth's avatar Carl Worth
Browse files

Remove pixman from SNAPSHOT_0_1_22

parents 0f1b69b6 eff16701
......@@ -53,3 +53,9 @@ cairo_show_text is not updating the current point by the string's advance values
--
Caps are added only to the last subpath in a complex path.
--
ref_counts will go negative if destroy is called with ref_count ==
0. We noticed this is cairo_surface.c but it likely happens in several
places.
2004-04-16 Carl Worth <cworth@isi.edu>
* NEWS: Added notes for snapshot 0.1.22.
* configure.in: Now depends on libpixman 0.1.1.
Bump version to 0.1.22.
* src/cairo_image_surface.c (_create_pixman_format): Track pixman
fixes to PIXMAN_FORMAT_NAME_*.
* src/cairo_png_surface.c (cairo_png_surface_create): Explicitly
add cases for all enum values to eliminate compiler warnings.
* src/cairo.h: Remove proposal for surface_clip interface as
cairo_clip should be able to cover this case now.
* BUGS: Added bug concerning negative ref_counts.
2004-04-09 David Reveman <c99drn@cs.umu.se>
* NEWS: Added notes for snapshot 0.1.21.
......
Snapshot 0.1.22 (2004-04-16 Carl Worth <cworth@isi.edu>)
========================================================
Cairo was updated to track the changes in libpixman, and now depends
on libpixman version 0.1.1.
Snapshot 0.1.21 (2004-04-09 David Reveman <c99drn@cs.umu.se>)
=============================================================
New OpenGL backend
......
......@@ -3,7 +3,7 @@ AC_INIT(src/cairo.h)
dnl ===========================================================================
# Package version number, (as distinct from shared library version)
CAIRO_VERSION=0.1.21
CAIRO_VERSION=0.1.22
# libtool shared library version
......@@ -162,7 +162,7 @@ AC_SUBST(GL_REQUIRES)
dnl ===========================================================================
PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.0)
PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.1)
# Test for freetype2 separate from pkg-config since at least up to
# 2003-06-07, there was no freetype2.pc in the release.
......
......@@ -112,11 +112,11 @@ _create_pixman_format (cairo_format_t format)
return pixman_format_create (PIXMAN_FORMAT_NAME_A8);
break;
case CAIRO_FORMAT_RGB24:
return pixman_format_create (PIXMAN_FORMAT_NAME_RG_B24);
return pixman_format_create (PIXMAN_FORMAT_NAME_RGB24);
break;
case CAIRO_FORMAT_ARGB32:
default:
return pixman_format_create (PIXMAN_FORMAT_NAME_AR_GB32);
return pixman_format_create (PIXMAN_FORMAT_NAME_ARGB32);
break;
}
}
......
......@@ -636,19 +636,6 @@ cairo_surface_reference (cairo_surface_t *surface);
void
cairo_surface_destroy (cairo_surface_t *surface);
/* XXX: NYI
cairo_status_t
cairo_surface_clip_restore (cairo_surface_t *surface);
cairo_status_t
cairo_surface_clip_begin (cairo_surface_t *surface);
cairo_status_t
cairo_surface_clip_rectangle (cairo_surface_t *surface,
int x, int y,
int width, int height);
*/
/* XXX: Note: The current Render/Ic implementations don't do the right
thing with repeat when the surface has a non-identity matrix. */
/* XXX: Rework this as a cairo function with an enum: cairo_set_pattern_extend */
......
......@@ -112,11 +112,11 @@ _create_pixman_format (cairo_format_t format)
return pixman_format_create (PIXMAN_FORMAT_NAME_A8);
break;
case CAIRO_FORMAT_RGB24:
return pixman_format_create (PIXMAN_FORMAT_NAME_RG_B24);
return pixman_format_create (PIXMAN_FORMAT_NAME_RGB24);
break;
case CAIRO_FORMAT_ARGB32:
default:
return pixman_format_create (PIXMAN_FORMAT_NAME_AR_GB32);
return pixman_format_create (PIXMAN_FORMAT_NAME_ARGB32);
break;
}
}
......
......@@ -103,6 +103,10 @@ cairo_png_surface_create (FILE *file,
PNG_COMPRESSION_TYPE_DEFAULT,
PNG_FILTER_TYPE_DEFAULT);
break;
case CAIRO_FORMAT_A8:
case CAIRO_FORMAT_A1:
/* These are not currently supported. */
break;
}
png_convert_from_time_t (&png_time, now);
......@@ -118,6 +122,10 @@ cairo_png_surface_create (FILE *file,
png_set_filler (surface->png_w, 0, PNG_FILLER_AFTER);
png_set_bgr (surface->png_w);
break;
case CAIRO_FORMAT_A8:
case CAIRO_FORMAT_A1:
/* These are not currently supported. */
break;
}
return &surface->base;
......
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