From 28ce8463af9936982a5dd23ea0c7e6bfe9df2df2 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Sun, 8 Aug 2021 12:09:23 +0930 Subject: [PATCH] Fix check doc errors --- src/cairo-win32.h | 8 ++++---- src/win32/cairo-dwrite-font.cpp | 15 ++++++++------- src/win32/cairo-dwrite-private.hpp | 4 ++-- src/win32/cairo-win32-private.h | 2 +- src/win32/cairo-win32-refptr.hpp | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/cairo-win32.h b/src/cairo-win32.h index d11f9dec0..46910c017 100644 --- a/src/cairo-win32.h +++ b/src/cairo-win32.h @@ -124,16 +124,16 @@ cairo_win32_get_system_text_quality (void); cairo_public cairo_font_face_t * cairo_dwrite_font_face_create_for_dwrite_fontface (void *dwrite_font, void *dwrite_font_face); -void +cairo_public void cairo_dwrite_scaled_font_set_force_GDI_classic (cairo_scaled_font_t *dwrite_scaled_font, cairo_bool_t allowed); -cairo_bool_t +cairo_public cairo_bool_t cairo_dwrite_scaled_font_get_force_GDI_classic (cairo_scaled_font_t *dwrite_scaled_font); -void +cairo_public void cairo_dwrite_set_cleartype_params (FLOAT gamma, FLOAT contrast, FLOAT level, int geometry, int mode); -int +cairo_public int cairo_dwrite_get_cleartype_rendering_mode (); #endif /* CAIRO_HAS_DWRITE_FONT */ diff --git a/src/win32/cairo-dwrite-font.cpp b/src/win32/cairo-dwrite-font.cpp index a47111c5a..96593c2dd 100644 --- a/src/win32/cairo-dwrite-font.cpp +++ b/src/win32/cairo-dwrite-font.cpp @@ -134,7 +134,7 @@ int DWriteFactory::mRenderingMode = -1; ID2D1Factory *D2DFactory::mFactoryInstance = NULL; ID2D1DCRenderTarget *D2DFactory::mRenderTarget = NULL; -/* Functions cairo_font_face_backend_t */ +/* Functions #cairo_font_face_backend_t */ static cairo_status_t _cairo_dwrite_font_face_create_for_toy (cairo_toy_font_face_t *toy_face, cairo_font_face_t **font_face); @@ -155,7 +155,7 @@ const cairo_font_face_backend_t _cairo_dwrite_font_face_backend = { _cairo_dwrite_font_face_scaled_font_create }; -/* Functions cairo_scaled_font_backend_t */ +/* Functions #cairo_scaled_font_backend_t */ void _cairo_dwrite_scaled_font_fini(void *scaled_font); @@ -194,12 +194,13 @@ const cairo_scaled_font_backend_t _cairo_dwrite_scaled_font_backend = { /** + * _cairo_dwrite_matrix_from_matrix: * Get a DirectWrite matrix from a cairo matrix. Note that DirectWrite uses row * vectors where cairo uses column vectors. Hence the transposition. * * \param Cairo matrix * \return DirectWrite matrix - */ + **/ DWRITE_MATRIX _cairo_dwrite_matrix_from_matrix(const cairo_matrix_t *matrix) { @@ -213,7 +214,7 @@ _cairo_dwrite_matrix_from_matrix(const cairo_matrix_t *matrix) return dwmat; } -/* Helper functions for cairo_dwrite_scaled_glyph_init */ +/* Helper functions for cairo_dwrite_scaled_glyph_init() */ cairo_int_status_t _cairo_dwrite_scaled_font_init_glyph_metrics (cairo_dwrite_scaled_font_t *scaled_font, cairo_scaled_glyph_t *scaled_glyph); @@ -487,7 +488,7 @@ _cairo_dwrite_font_face_scaled_font_create (void *abstract_face, return _cairo_scaled_font_set_metrics (*font, &extents); } -/* Implementation cairo_dwrite_scaled_font_backend_t */ +/* Implementation #cairo_dwrite_scaled_font_backend_t */ void _cairo_dwrite_scaled_font_fini(void *scaled_font) { @@ -535,7 +536,7 @@ _cairo_dwrite_ucs4_to_index(void *scaled_font, return index; } -/* cairo_dwrite_scaled_glyph_init helper function bodies */ +/* cairo_dwrite_scaled_glyph_init() helper function bodies */ cairo_int_status_t _cairo_dwrite_scaled_font_init_glyph_metrics(cairo_dwrite_scaled_font_t *scaled_font, cairo_scaled_glyph_t *scaled_glyph) @@ -578,7 +579,7 @@ _cairo_dwrite_scaled_font_init_glyph_metrics(cairo_dwrite_scaled_font_t *scaled_ return CAIRO_INT_STATUS_SUCCESS; } -/** +/* * Stack-based helper implementing IDWriteGeometrySink. * Used to determine the path of the glyphs. */ diff --git a/src/win32/cairo-dwrite-private.hpp b/src/win32/cairo-dwrite-private.hpp index 5f2994cbc..829681c2e 100644 --- a/src/win32/cairo-dwrite-private.hpp +++ b/src/win32/cairo-dwrite-private.hpp @@ -43,7 +43,7 @@ typedef HRESULT (WINAPI*DWriteCreateFactoryFunc)( IUnknown **factory ); -/* cairo_scaled_font_t implementation */ +/* #cairo_scaled_font_t implementation */ struct _cairo_dwrite_scaled_font { cairo_scaled_font_t base; cairo_matrix_t mat; @@ -210,7 +210,7 @@ private: UINT16 mAutoIndices[kNumAutoGlyphs]; }; -/* cairo_font_face_t implementation */ +/* #cairo_font_face_t implementation */ struct _cairo_dwrite_font_face { cairo_font_face_t base; IDWriteFont *font; diff --git a/src/win32/cairo-win32-private.h b/src/win32/cairo-win32-private.h index e6be49b03..4538309fc 100644 --- a/src/win32/cairo-win32-private.h +++ b/src/win32/cairo-win32-private.h @@ -253,7 +253,7 @@ _cairo_win32_scaled_font_is_type1 (cairo_scaled_font_t *scaled_font); cairo_bool_t _cairo_win32_scaled_font_is_bitmap (cairo_scaled_font_t *scaled_font); -#ifdef CAIRO_HAS_DWRITE_FONT +#if CAIRO_HAS_DWRITE_FONT cairo_int_status_t _cairo_dwrite_show_glyphs_on_surface (void *surface, diff --git a/src/win32/cairo-win32-refptr.hpp b/src/win32/cairo-win32-refptr.hpp index 7dd678668..e361e4cf7 100644 --- a/src/win32/cairo-win32-refptr.hpp +++ b/src/win32/cairo-win32-refptr.hpp @@ -38,7 +38,7 @@ template class TemporaryRef; -/** +/* * RefPtr points to a refcounted thing that has AddRef and Release * methods to increase/decrease the refcount, respectively. After a * RefPtr is assigned a T*, the T* can be used through the RefPtr @@ -137,7 +137,7 @@ private: } }; -/** +/* * TemporaryRef represents an object that holds a temporary * reference to a T. TemporaryRef objects can't be manually ref'd or * unref'd (being temporaries, not lvalues), so can only relinquish