fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-06-07 06:28:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Go back to returning NULL.

Browse source 
src/cairoint.h src/cairo-ft-font.c: Stop exporting _cairo_scaled_font_nil, since we dont' need it publically any more.
return surface->status not status. (Fixes warning)
This commit is contained in:
Owen Taylor 2005-07-27 16:23:11 +00:00
parent 2b5d9c8e00
commit 7143d8b7ae
6 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2005-07-27 Owen Taylor <otaylor@redhat.com>
* src/cairo-win32-font.c (_win32_scaled_font_create):
* src/cairo-ft-font.c (_ft_scaled_font_create): Go back to
returning NULL.
* src/cairoint.h src/cairo-ft-font.c: Stop exporting
_cairo_scaled_font_nil, since we dont' need it publically
any more.
* src/cairo-surface.c (_cairo_surface_reset_clip): return
surface->status not status. (Fixes warning)
2005-07-26 Carl Worth <cworth@cworth.org>
* src/cairo.h: Add CAIRO_STATUS_INVALID_CONTENT,

2
src/cairo-font.c
View file

@ -421,7 +421,7 @@ _cairo_simple_font_face_create (const char *family,
/* cairo_scaled_font_t */
const cairo_scaled_font_t _cairo_scaled_font_nil = {
static const cairo_scaled_font_t _cairo_scaled_font_nil = {
CAIRO_STATUS_NO_MEMORY, /* status */
-1, /* ref_count */
{ 1., 0., 0., 1., 0, 0}, /* font_matrix */

4
src/cairo-ft-font.c
View file

@ -1377,8 +1377,8 @@ _ft_scaled_font_create (ft_unscaled_font_t *unscaled,
cairo_ft_scaled_font_t *f = NULL;
f = malloc (sizeof(cairo_ft_scaled_font_t));
if (f == NULL)
return (cairo_scaled_font_t*) &_cairo_scaled_font_nil;
if (f == NULL)
return NULL;
f->unscaled = unscaled;
_cairo_unscaled_font_reference (&unscaled->base);

2
src/cairo-surface.c
View file

@ -1038,7 +1038,7 @@ _cairo_surface_reset_clip (cairo_surface_t *surface)
cairo_status_t status;
if (surface->status)
return status;
return surface->status;
if (surface->finished)
return CAIRO_STATUS_SURFACE_FINISHED;

6
src/cairo-win32-font.c
View file

@ -223,10 +223,8 @@ _win32_scaled_font_create (LOGFONTW *logfont,
cairo_matrix_t scale;
f = malloc (sizeof(cairo_win32_scaled_font_t));
if (f == NULL) {
_cairo_error (CAIRO_STATUS_NO_MEMORY);
return &_cairo_scaled_font_nil;
}
if (f == NULL)
return NULL;
f->logfont = *logfont;
f->options = *options;

2
src/cairoint.h
View file

@ -1311,8 +1311,6 @@ _cairo_simple_font_face_create (const char *family,
cairo_font_slant_t slant,
cairo_font_weight_t weight);
extern const cairo_scaled_font_t _cairo_scaled_font_nil;
cairo_private void
_cairo_scaled_font_init (cairo_scaled_font_t *scaled_font,
const cairo_matrix_t *font_matrix,