diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ae6aa06e..d9063fc85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,9 +282,10 @@ set (vector_project_sources ${PROJECT_SOURCE_DIR}/src/hb-zlib.cc ${PROJECT_SOURCE_DIR}/src/hb-zlib.hh ${PROJECT_SOURCE_DIR}/src/hb-vector.cc - ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-draw.cc + ${PROJECT_SOURCE_DIR}/src/hb-vector-draw.cc ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-path.cc - ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-paint.cc + ${PROJECT_SOURCE_DIR}/src/hb-vector-paint.cc + ${PROJECT_SOURCE_DIR}/src/hb-vector-paint-pdf.cc ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-path.hh ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-subset.cc ${PROJECT_SOURCE_DIR}/src/hb-vector-svg-subset.hh diff --git a/src/harfbuzz-world.cc b/src/harfbuzz-world.cc index 5922468eb..156231773 100644 --- a/src/harfbuzz-world.cc +++ b/src/harfbuzz-world.cc @@ -165,9 +165,9 @@ #ifdef HB_HAS_VECTOR #include "hb-static.cc" -#include "hb-vector-pdf-paint.cc" -#include "hb-vector-svg-draw.cc" -#include "hb-vector-svg-paint.cc" +#include "hb-vector-draw.cc" +#include "hb-vector-paint-pdf.cc" +#include "hb-vector-paint.cc" #include "hb-vector-svg-path.cc" #include "hb-vector-svg-subset.cc" #include "hb-vector-svg-utils.cc" diff --git a/src/hb-vector-svg-draw.cc b/src/hb-vector-draw.cc similarity index 100% rename from src/hb-vector-svg-draw.cc rename to src/hb-vector-draw.cc diff --git a/src/hb-vector-pdf-paint.cc b/src/hb-vector-paint-pdf.cc similarity index 99% rename from src/hb-vector-pdf-paint.cc rename to src/hb-vector-paint-pdf.cc index dd94f3498..9b7923573 100644 --- a/src/hb-vector-pdf-paint.cc +++ b/src/hb-vector-paint-pdf.cc @@ -1230,7 +1230,7 @@ free_static_pdf_paint_funcs () } hb_paint_funcs_t * -hb_vector_pdf_paint_funcs_get () +hb_vector_paint_pdf_funcs_get () { return static_pdf_paint_funcs.get_unconst (); } @@ -1239,7 +1239,7 @@ hb_vector_pdf_paint_funcs_get () /* ---- render ---- */ hb_blob_t * -hb_vector_pdf_paint_render (hb_vector_paint_t *paint) +hb_vector_paint_render_pdf (hb_vector_paint_t *paint) { if (!paint->has_extents) return nullptr; diff --git a/src/hb-vector-svg-paint.cc b/src/hb-vector-paint.cc similarity index 99% rename from src/hb-vector-svg-paint.cc rename to src/hb-vector-paint.cc index 01efa2531..554ae6b14 100644 --- a/src/hb-vector-svg-paint.cc +++ b/src/hb-vector-paint.cc @@ -1345,7 +1345,7 @@ hb_vector_paint_glyph (hb_vector_paint_t *paint, hb_buf_append_str (&body, " cm\n"); hb_bool_t ret = hb_font_paint_glyph_or_fail (font, glyph, - hb_vector_pdf_paint_funcs_get (), paint, + hb_vector_paint_pdf_funcs_get (), paint, (unsigned) paint->palette, paint->foreground); hb_buf_append_str (&body, "Q\n"); @@ -1543,7 +1543,7 @@ hb_blob_t * hb_vector_paint_render (hb_vector_paint_t *paint) { if (paint->format == HB_VECTOR_FORMAT_PDF) - return hb_vector_pdf_paint_render (paint); + return hb_vector_paint_render_pdf (paint); if (paint->format != HB_VECTOR_FORMAT_SVG) return nullptr; if (!paint->has_extents) diff --git a/src/hb-vector-paint.hh b/src/hb-vector-paint.hh index 01a46ff42..0b9ea9eef 100644 --- a/src/hb-vector-paint.hh +++ b/src/hb-vector-paint.hh @@ -80,12 +80,8 @@ struct hb_vector_paint_t hb_vector_t ¤t_body () { return group_stack.tail (); } }; -/* Implemented in hb-vector-svg-paint.cc */ -hb_paint_funcs_t * hb_vector_svg_paint_funcs_get (); -hb_blob_t * hb_vector_svg_paint_render (hb_vector_paint_t *paint); - -/* Implemented in hb-vector-pdf-paint.cc */ -HB_INTERNAL hb_paint_funcs_t * hb_vector_pdf_paint_funcs_get (); -HB_INTERNAL hb_blob_t * hb_vector_pdf_paint_render (hb_vector_paint_t *paint); +/* Implemented in hb-vector-paint-pdf.cc */ +HB_INTERNAL hb_paint_funcs_t * hb_vector_paint_pdf_funcs_get (); +HB_INTERNAL hb_blob_t * hb_vector_paint_render_pdf (hb_vector_paint_t *paint); #endif /* HB_VECTOR_PAINT_HH */ diff --git a/src/meson.build b/src/meson.build index 78430aa7d..67ab3e8dc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -753,10 +753,10 @@ hb_vector_sources = files( 'hb-zlib.cc', 'hb-zlib.hh', 'hb-vector.cc', - 'hb-vector-svg-draw.cc', + 'hb-vector-draw.cc', 'hb-vector-svg-path.cc', - 'hb-vector-svg-paint.cc', - 'hb-vector-pdf-paint.cc', + 'hb-vector-paint.cc', + 'hb-vector-paint-pdf.cc', 'hb-vector-svg-path.hh', 'hb-vector-svg-subset.cc', 'hb-vector-svg-subset.hh',