mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-02-13 02:20:33 +01:00
Merge branch 'develop2' into 'master'
renamed a confusingly named function in cairo-font-face.c See merge request cairo/cairo!279
This commit is contained in:
commit
58e133b313
1 changed files with 4 additions and 7 deletions
|
|
@ -135,7 +135,7 @@ cairo_font_face_reference (cairo_font_face_t *font_face)
|
|||
}
|
||||
|
||||
static inline cairo_bool_t
|
||||
__put(cairo_reference_count_t *v)
|
||||
_cairo_decrement_refcount_return_was_last (cairo_reference_count_t *v)
|
||||
{
|
||||
int c, old;
|
||||
|
||||
|
|
@ -149,10 +149,7 @@ __put(cairo_reference_count_t *v)
|
|||
cairo_bool_t
|
||||
_cairo_font_face_destroy (void *abstract_face)
|
||||
{
|
||||
#if 0 /* Nothing needs to be done, we can just drop the last reference */
|
||||
cairo_font_face_t *font_face = abstract_face;
|
||||
return _cairo_reference_count_dec_and_test (&font_face->ref_count);
|
||||
#endif
|
||||
(void)abstract_face;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +176,7 @@ cairo_font_face_destroy (cairo_font_face_t *font_face)
|
|||
* FreeType backend where cairo_ft_font_face_t and cairo_ft_unscaled_font_t
|
||||
* need to effectively mutually reference each other
|
||||
*/
|
||||
if (__put (&font_face->ref_count))
|
||||
if (_cairo_decrement_refcount_return_was_last (&font_face->ref_count))
|
||||
return;
|
||||
|
||||
if (! font_face->backend->destroy (font_face))
|
||||
|
|
@ -331,7 +328,7 @@ _cairo_unscaled_font_destroy (cairo_unscaled_font_t *unscaled_font)
|
|||
|
||||
assert (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&unscaled_font->ref_count));
|
||||
|
||||
if (__put (&unscaled_font->ref_count))
|
||||
if (_cairo_decrement_refcount_return_was_last (&unscaled_font->ref_count))
|
||||
return;
|
||||
|
||||
if (! unscaled_font->backend->destroy (unscaled_font))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue