M125 public #244
Merged
M125 public #244
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…38.2-4059-ge2ea2eb3e0)
--- skia-m124/include/core/SkStream.h 2024-03-26 00:09:01.000000000 +0000
+++ skia-m125/include/core/SkStream.h 2024-04-29 01:34:47.000000000 +0100
@@ -392,13 +392,9 @@
*/
void setMemoryOwned(const void* data, size_t length);
-#if !defined(SK_REMOVE_LEGACY_STREAM_AS_DATA)
- sk_sp<SkData> asData() const { return fData; }
-#endif
sk_sp<SkData> getData() const override { return fData; }
void setData(sk_sp<SkData> data);
- void skipToAlign4();
const void* getAtPos();
size_t read(void* buffer, size_t size) override;
See: google/skia@3844fc4 "Remove SkMemoryStream::skipToAlign4" This has been replaced with SkRBuffer::skipToAlign4 and doesn't appear to be used. It also violates the invariant that `fOffset` is always an offset into `fData`.
|
This is the upstream commit google/skia@2cead39 which breaks system icu usage. |
The macOS detector macro is called `__APPLE__`, not `__apple__`
Fix fonts on macOS by using the right macro
Use python 3 for Windows and Linux, and requires c++17.
HinTak
force-pushed
the
m125-public
branch
4 times, most recently
from
b46be4e to
4c65efc
Compare
Skipping 1: GrBackendSurfaceMutableState (support removed in m118) Fix previous mistakes in vulkan argument names Fix Linux/Windows build
…mpressedBackendFormat
Between m87 and m116, the header for these two has moved from
include/private/GrContext_Base.h
to
include/private/gpu/ganesh/GrContext_Base.h
but otherwise more or less identical, so it should have just worked
(baring missing header at some point in the past).
…aded alternative Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Copied and adapted from: google/skia@3844fc4
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
M125 is out, small adjustments in skpath, changes in MemoryStream looks slightly complicated, and libunicode has split into _core and _icu and it seems we needs both; and it seems to require the internal copy of libicu (and doesn't work with my system-wide one).
The icu part looks to be a bit inconvenient (for my personal build, which uses a lot of more system libraries than the wheels). The tests don't run on my system for that reason (having problem loading the system libicu) but should work on CI.