7392abbe58
Skia uses the Windows generic macros that map to the ANSI *A variants or the unicode *W variants of functions/types, but in LO code we mostly use explicitly the *W variants and do not set the UNICODE define. So build Skia with UNICODE and explicitly use *W API in SKia's API that we use. Change-Id: I689797b30a412820f97d9ce88e9fe078ead2cf76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91376 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
31 lines
1.4 KiB
Text
31 lines
1.4 KiB
Text
diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h
|
|
index f659adf0e9..34446fc7a1 100644
|
|
--- ./include/ports/SkTypeface_win.h
|
|
+++ ./include/ports/SkTypeface_win.h
|
|
@@ -26,7 +26,7 @@ typedef LOGFONTA LOGFONT;
|
|
* corresponding typeface for the specified logfont. The caller is responsible
|
|
* for calling unref() when it is finished.
|
|
*/
|
|
-SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&);
|
|
+SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONTW&);
|
|
|
|
/**
|
|
* Copy the LOGFONT associated with this typeface into the lf parameter. Note
|
|
@@ -34,7 +34,7 @@ SK_API SkTypeface* SkCreateTypefaceFromLOGFONT(const LOGFONT&);
|
|
* not track this (the paint does).
|
|
* typeface may be NULL, in which case we return the logfont for the default font.
|
|
*/
|
|
-SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf);
|
|
+SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONTW* lf);
|
|
|
|
/**
|
|
* Set an optional callback to ensure that the data behind a LOGFONT is loaded.
|
|
@@ -42,7 +42,7 @@ SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf);
|
|
* Normally this is null, and is only required if the font data needs to be
|
|
* remotely (re)loaded.
|
|
*/
|
|
-SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&));
|
|
+SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONTW&));
|
|
|
|
// Experimental!
|
|
//
|