f8c15850db
(from m111)
SK_SUPPORT_GPU is now SK_GANESH
GR_OP_ALLOCATE_USE_NEW was removed in skia m111
commit dd8f8ed3848cbe2032edc7ec08ef648a23e28ad9
Author: Mike Klein <mtklein@google.com>
Date: Thu Apr 22 12:17:33 2021 -0500
clean up defines that do nothing
the fast-png-write patch was removed. The underlying helper
function we need was removed in
commit 0ec4c84abd0b578a5c792b04b56653cbc325530e
Author: Kevin Lubick <kjlubick@google.com>
Date: Thu Apr 20 14:46:28 2023 -0400
Remove SkImageEncoder and SkImage::encodeToData
So I updated our dump() function in SkiaHelper.cxx to
use the new Skia API.
The constexpr-template patch seems to be superceded by skia
changes.
SkOpts: :hash_fn has been replaced with SkChecksum::Hash32
commit 657ed9cf2379a950b925cb2aba7c85d6e1dd36ed
Author: Brian Osman <brianosman@google.com>
Date: Tue May 23 12:40:12 2023 +0000
Reland "Replace SkOpts::hash/hash_fn with SkChecksum::Hash32"
The SkDebugf function needs to be exported from the library since
it leaks out to calling code via some of the headers.
Change-Id: I80ace8f25e660fa7889d22ef90676f47264d866c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154223
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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 sk_sp<SkTypeface> SkCreateTypefaceFromLOGFONT(const LOGFONT&);
|
|
+SK_API sk_sp<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!
|
|
//
|