strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't need to use dlsym for cairo_surface_set_device_scale...

Browse source 
for bundled cairo case

Change-Id: I8ca48433b3be144d8347defe3831b92cc87d7cbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175081
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-10-17 12:53:12 +01:00
parent 7be32268e0
commit 84ed46d7ee
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RepositoryExternal.mk
View file

@ -1188,6 +1188,7 @@ define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(CAIRO_CFLAGS) \
-DSYSTEM_CAIRO \
)
$(call gb_LinkTarget_use_external,$(1),freetype_headers)
$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))

4
vcl/headless/CairoCommon.cxx
View file

@ -39,7 +39,7 @@
void dl_cairo_surface_set_device_scale(cairo_surface_t* surface, double x_scale, double y_scale)
{
#if !HAVE_DLAPI
#if !HAVE_DLAPI || !defined(SYSTEM_CAIRO)
cairo_surface_set_device_scale(surface, x_scale, y_scale);
#else
static auto func = reinterpret_cast<void (*)(cairo_surface_t*, double, double)>(
@ -51,7 +51,7 @@ void dl_cairo_surface_set_device_scale(cairo_surface_t* surface, double x_scale,
void dl_cairo_surface_get_device_scale(cairo_surface_t* surface, double* x_scale, double* y_scale)
{
#if !HAVE_DLAPI
#if !HAVE_DLAPI || !defined(SYSTEM_CAIRO)
cairo_surface_get_device_scale(surface, x_scale, y_scale);
#else
static auto func = reinterpret_cast<void (*)(cairo_surface_t*, double*, double*)>(