[cairo-commit] Branch '1.0' - 3 commits - ChangeLog doc/public
pixman/ChangeLog pixman/src src/cairo-ft-font.c
Behdad Esfahbod
behdad at kemper.freedesktop.org
Wed Mar 15 07:30:13 PST 2006
ChangeLog | 10 ++++++++++
doc/public/tmpl/cairo-font-options.sgml | 12 ------------
doc/public/tmpl/cairo-font.sgml | 3 ---
doc/public/tmpl/cairo-ft.sgml | 3 ---
doc/public/tmpl/cairo-glitz.sgml | 3 ---
doc/public/tmpl/cairo-image.sgml | 3 ---
doc/public/tmpl/cairo-matrix.sgml | 3 ---
doc/public/tmpl/cairo-paths.sgml | 3 ---
doc/public/tmpl/cairo-pattern.sgml | 3 ---
doc/public/tmpl/cairo-pdf.sgml | 3 ---
doc/public/tmpl/cairo-png.sgml | 3 ---
doc/public/tmpl/cairo-ps.sgml | 3 ---
doc/public/tmpl/cairo-quartz.sgml | 3 ---
doc/public/tmpl/cairo-scaled-font.sgml | 3 ---
doc/public/tmpl/cairo-status.sgml | 3 ---
doc/public/tmpl/cairo-surface.sgml | 3 ---
doc/public/tmpl/cairo-text.sgml | 3 ---
doc/public/tmpl/cairo-transforms.sgml | 3 ---
doc/public/tmpl/cairo-types.sgml | 3 ---
doc/public/tmpl/cairo-version.sgml | 3 ---
doc/public/tmpl/cairo-win32-fonts.sgml | 3 ---
doc/public/tmpl/cairo-win32.sgml | 3 ---
doc/public/tmpl/cairo-xcb-xrender.sgml | 3 ---
doc/public/tmpl/cairo-xcb.sgml | 3 ---
doc/public/tmpl/cairo-xlib-xrender.sgml | 3 ---
doc/public/tmpl/cairo-xlib.sgml | 3 ---
doc/public/tmpl/cairo.sgml | 3 ---
pixman/ChangeLog | 11 +++++++++++
pixman/src/fbpict.c | 2 +-
pixman/src/fbpict.h | 2 +-
src/cairo-ft-font.c | 11 ++++-------
31 files changed, 27 insertions(+), 96 deletions(-)
New commits:
diff-tree ff33ddb8f864a48c17c45746fb6bbbcf70216288 (from af0cbe2aed0b19613b90e171a2c252e8c8327efd)
Author: Behdad Esfahbod <behdad at home.(none)>
Date: Wed Mar 15 10:23:21 2006 -0500
Remove duplicate definitions of pixman_color_to_pixel and pixman_composite.
(cherry picked from 9e7076fd27b69b4de21a617a9cb0fa74f91f6bec commit)
diff --git a/ChangeLog b/ChangeLog
index 145fa86..baa8b8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,16 @@
than 'test =='). Thanks to Richard Lloyd and Klaus Heinz. Closes
bug #4823.
+2005-12-07 Carl Worth <cworth at cworth.org>
+
+ * src/pixman-remap.h: Remove duplicate definitions of
+ pixman_color_to_pixel and pixman_composite.
+
+2005-11-21 Carl Worth <cworth at cworth.org>
+
+ * ROADMAP: Add reminder to fix all memory leaks (as determined by
+ the test suite) before release 1.2.0.
+
2005-11-21 Carl Worth <cworth at cworth.org>
* src/pixman-remap.h: Remove duplicate definitions of
diff --git a/doc/public/tmpl/cairo-font-options.sgml b/doc/public/tmpl/cairo-font-options.sgml
index dcb04ec..8a7ce4b 100644
--- a/doc/public/tmpl/cairo-font-options.sgml
+++ b/doc/public/tmpl/cairo-font-options.sgml
@@ -14,9 +14,6 @@ How a font should be rendered
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_font_options_t ##### -->
<para>
@@ -66,15 +63,6 @@ How a font should be rendered
@other:
-<!-- ##### FUNCTION cairo_font_options_hash ##### -->
-<para>
-
-</para>
-
- at options:
- at Returns:
-
-
<!-- ##### FUNCTION cairo_font_options_equal ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-font.sgml b/doc/public/tmpl/cairo-font.sgml
index 4e50f69..efc4e8c 100644
--- a/doc/public/tmpl/cairo-font.sgml
+++ b/doc/public/tmpl/cairo-font.sgml
@@ -14,9 +14,6 @@ Base class for fonts
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_font_face_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-ft.sgml b/doc/public/tmpl/cairo-ft.sgml
index db92840..d120e7a 100644
--- a/doc/public/tmpl/cairo-ft.sgml
+++ b/doc/public/tmpl/cairo-ft.sgml
@@ -14,9 +14,6 @@ Font support for FreeType
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-glitz.sgml b/doc/public/tmpl/cairo-glitz.sgml
index 4d53e11..de7acd1 100644
--- a/doc/public/tmpl/cairo-glitz.sgml
+++ b/doc/public/tmpl/cairo-glitz.sgml
@@ -14,9 +14,6 @@ OpenGL accelerated rendering using the G
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_glitz_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-image.sgml b/doc/public/tmpl/cairo-image.sgml
index 7914188..41a5a6c 100644
--- a/doc/public/tmpl/cairo-image.sgml
+++ b/doc/public/tmpl/cairo-image.sgml
@@ -17,9 +17,6 @@ Rendering to memory buffers
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### ENUM cairo_format_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-matrix.sgml b/doc/public/tmpl/cairo-matrix.sgml
index 26f7fe3..1790cb6 100644
--- a/doc/public/tmpl/cairo-matrix.sgml
+++ b/doc/public/tmpl/cairo-matrix.sgml
@@ -29,9 +29,6 @@ Generic matrix operations
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### STRUCT cairo_matrix_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-paths.sgml b/doc/public/tmpl/cairo-paths.sgml
index 357dca3..bde8347 100644
--- a/doc/public/tmpl/cairo-paths.sgml
+++ b/doc/public/tmpl/cairo-paths.sgml
@@ -14,9 +14,6 @@ Creating paths and manipulating path dat
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### STRUCT cairo_path_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index cd7277c..950414f 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -14,9 +14,6 @@ Gradients and filtered sources
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_pattern_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-pdf.sgml b/doc/public/tmpl/cairo-pdf.sgml
index fd637a4..83964eb 100644
--- a/doc/public/tmpl/cairo-pdf.sgml
+++ b/doc/public/tmpl/cairo-pdf.sgml
@@ -14,9 +14,6 @@ Rendering PDF documents
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-png.sgml b/doc/public/tmpl/cairo-png.sgml
index d2e93f7..a595b02 100644
--- a/doc/public/tmpl/cairo-png.sgml
+++ b/doc/public/tmpl/cairo-png.sgml
@@ -14,9 +14,6 @@ Reading and writing PNG images
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_image_surface_create_from_png ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-ps.sgml b/doc/public/tmpl/cairo-ps.sgml
index 659455a..8a90f65 100644
--- a/doc/public/tmpl/cairo-ps.sgml
+++ b/doc/public/tmpl/cairo-ps.sgml
@@ -14,9 +14,6 @@ Rendering PostScript documents
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_ps_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-quartz.sgml b/doc/public/tmpl/cairo-quartz.sgml
index e6c5a69..55b580b 100644
--- a/doc/public/tmpl/cairo-quartz.sgml
+++ b/doc/public/tmpl/cairo-quartz.sgml
@@ -14,9 +14,6 @@ Rendering to Quartz surfaces
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_quartz_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-scaled-font.sgml b/doc/public/tmpl/cairo-scaled-font.sgml
index c94a2bc..6ee3a9c 100644
--- a/doc/public/tmpl/cairo-scaled-font.sgml
+++ b/doc/public/tmpl/cairo-scaled-font.sgml
@@ -14,9 +14,6 @@ Caching metrics for a particular font si
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index 4112fc0..33e64ec 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -14,9 +14,6 @@ Decoding cairo's status
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### ENUM cairo_status_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index 2b9bd51..c9e938f 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -14,9 +14,6 @@ Base class for surfaces
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_surface_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml
index 2f4d213..6c18416 100644
--- a/doc/public/tmpl/cairo-text.sgml
+++ b/doc/public/tmpl/cairo-text.sgml
@@ -14,9 +14,6 @@ Rendering text and sets of glyphs
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### STRUCT cairo_glyph_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-transforms.sgml b/doc/public/tmpl/cairo-transforms.sgml
index 55d1c5c..d84c1c7 100644
--- a/doc/public/tmpl/cairo-transforms.sgml
+++ b/doc/public/tmpl/cairo-transforms.sgml
@@ -14,9 +14,6 @@ Manipulating the current transformation
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_translate ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-types.sgml b/doc/public/tmpl/cairo-types.sgml
index c0c14fa..290c523 100644
--- a/doc/public/tmpl/cairo-types.sgml
+++ b/doc/public/tmpl/cairo-types.sgml
@@ -14,9 +14,6 @@ Generic data types used in the cairo API
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_bool_t ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-version.sgml b/doc/public/tmpl/cairo-version.sgml
index 2fb1b95..e0e74ae 100644
--- a/doc/public/tmpl/cairo-version.sgml
+++ b/doc/public/tmpl/cairo-version.sgml
@@ -14,9 +14,6 @@ Compile and run time version checks
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### MACRO CAIRO_VERSION ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-win32-fonts.sgml b/doc/public/tmpl/cairo-win32-fonts.sgml
index 2bc67f4..ea38e26 100644
--- a/doc/public/tmpl/cairo-win32-fonts.sgml
+++ b/doc/public/tmpl/cairo-win32-fonts.sgml
@@ -14,9 +14,6 @@ Font support for Microsoft Windows
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_win32_font_face_create_for_logfontw ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
index 8b52fc8..45f1064 100644
--- a/doc/public/tmpl/cairo-win32.sgml
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -14,9 +14,6 @@ Microsoft Windows surface support
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_win32_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xcb-xrender.sgml b/doc/public/tmpl/cairo-xcb-xrender.sgml
index a8cd029..b142ac9 100644
--- a/doc/public/tmpl/cairo-xcb-xrender.sgml
+++ b/doc/public/tmpl/cairo-xcb-xrender.sgml
@@ -14,9 +14,6 @@ X Window System rendering using the XCB
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_xcb_surface_create_with_xrender_format ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xcb.sgml b/doc/public/tmpl/cairo-xcb.sgml
index ad35253..b98c8f1 100644
--- a/doc/public/tmpl/cairo-xcb.sgml
+++ b/doc/public/tmpl/cairo-xcb.sgml
@@ -14,9 +14,6 @@ X Window System rendering using the XCB
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_xcb_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xlib-xrender.sgml b/doc/public/tmpl/cairo-xlib-xrender.sgml
index 398900e..1e17130 100644
--- a/doc/public/tmpl/cairo-xlib-xrender.sgml
+++ b/doc/public/tmpl/cairo-xlib-xrender.sgml
@@ -14,9 +14,6 @@ XLib/Xrender Backend
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_xlib_surface_create_with_xrender_format ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-xlib.sgml b/doc/public/tmpl/cairo-xlib.sgml
index bd3c8b6..b28a31b 100644
--- a/doc/public/tmpl/cairo-xlib.sgml
+++ b/doc/public/tmpl/cairo-xlib.sgml
@@ -14,9 +14,6 @@ X Window System rendering using XLib
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### FUNCTION cairo_xlib_surface_create ##### -->
<para>
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index eafe20b..59c4d62 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -24,9 +24,6 @@ The cairo drawing context
</para>
-<!-- ##### SECTION Stability_Level ##### -->
-
-
<!-- ##### TYPEDEF cairo_t ##### -->
<para>
diff-tree af0cbe2aed0b19613b90e171a2c252e8c8327efd (from 6da5947efa6fbd0da85352974c2eb762bd42ffa7)
Author: Behdad Esfahbod <behdad at home.(none)>
Date: Wed Mar 15 10:15:47 2006 -0500
Allow _get_bitmap_surface to work for 0x0 glyphs, (fix for bug #5734).
Patch from: Behdad Esfahbod <freedesktop at behdad.org>
Reviewed by: Carl Worth <cworth at cworth.org>
(cherry picked from 0152bd3a562442853ab930eaea316c08b34f6ba6 commit)
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index bc56dca..ef8e550 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -720,12 +720,7 @@ _get_bitmap_surface (cairo_image_glyph_c
width = bitmap->width;
height = bitmap->rows;
- if (width * height == 0) {
- if (own_buffer && bitmap->buffer)
- free (bitmap->buffer);
-
- val->image = NULL;
- } else {
+ {
switch (bitmap->pixel_mode) {
case FT_PIXEL_MODE_MONO:
stride = (((width + 31) & ~31) >> 3);
@@ -1080,7 +1075,9 @@ _render_glyph_bitmap (FT_Face
if (error)
return CAIRO_STATUS_NO_MEMORY;
- _get_bitmap_surface (val, &glyphslot->bitmap, FALSE, FC_RGBA_NONE);
+ status = _get_bitmap_surface (val, &glyphslot->bitmap, FALSE, FC_RGBA_NONE);
+ if (status)
+ return status;
val->size.x = glyphslot->bitmap_left;
val->size.y = - glyphslot->bitmap_top;
diff-tree 6da5947efa6fbd0da85352974c2eb762bd42ffa7 (from a5d13b472936b040755dd30624528cb7c6f52c73)
Author: Behdad Esfahbod <behdad at home.(none)>
Date: Wed Mar 15 10:07:58 2006 -0500
Bug #4260, Reviewed by B. Biggs
Use & not && for bitwise AND.
src/fbpict.c src/fbmmx.c: Take 'dest' as an argument, if pict and dest don't match for RGB, BGR, swap result.
(cherry picked from a1bca924b9296d769d735d8abaf1353143770def commit)
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index d1d915f..c6e7328 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -33,6 +33,17 @@
2005-08-28 Owen Taylor <otaylor at redhat.com>
+ Bug #4260, Reviewed by B. Biggs
+
+ * src/fbcompose.c (fbStore_a8b8g8r8, fbStore_x8b8g8r8): Use & not
+ && for bitwise AND.
+
+ * src/fbpict.h (fbComposeGetSolid) src/fbpict.c src/fbmmx.c: Take
+ 'dest' as an argument, if pict and dest don't match for RGB, BGR,
+ swap result.
+
+2005-08-28 Owen Taylor <otaylor at redhat.com>
+
* src/fbmmx.c (detectCPUFeatures): Use local labels rather than
global labels in the assembly, to be robust if the code is inlined
in multiple places. (#4283, Reported by Marco Manfredini)
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index b69e79a..09045eb 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1,5 +1,5 @@
/*
- * $Id: fbpict.c,v 1.5.2.2 2005-09-19 02:55:54 vektor Exp $
+ * $Id: fbpict.c,v 1.6 2005-09-12 12:55:11 otaylor Exp $
*
* Copyright © 2000 SuSE, Inc.
*
diff --git a/pixman/src/fbpict.h b/pixman/src/fbpict.h
index a6d2c15..95742ed 100644
--- a/pixman/src/fbpict.h
+++ b/pixman/src/fbpict.h
@@ -1,5 +1,5 @@
/*
- * $Id: fbpict.h,v 1.1.4.1 2005-09-16 13:43:41 otaylor Exp $
+ * $Id: fbpict.h,v 1.2 2005-09-12 12:55:11 otaylor Exp $
*
* Copyright © 2000 Keith Packard
* 2005 Lars Knoll & Zack Rusin, Trolltech
More information about the cairo-commit
mailing list