forked from godotengine/godot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https://github.com/thorvg/thorvg/releases/tag/v0.11.1 Godot related: + [SwEngine] Enhanced the quality of the dash line corners. + [SVG] Fixed a regression bug related to maskContentUnit, userSpaceOnUse/objectBoundingBox. Fixes godotengine#82982 icons. Fixes godotengine#83198 svg ← png/jpg.
- Loading branch information
1 parent
9bc68a8
commit fa16115
Showing
21 changed files
with
6,558 additions
and
27 deletions.
There are no files selected for viewing
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
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
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
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
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
13 changes: 13 additions & 0 deletions
13
thirdparty/thorvg/patches/loader_jpg-fix_regression_bug.patch
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp b/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp | ||
| index 88d359aaa3..61a5dc1c0f 100644 | ||
| --- a/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp | ||
| +++ b/thirdparty/thorvg/src/loaders/jpg/tvgJpgd.cpp | ||
| @@ -431,7 +431,7 @@ struct Row<1> | ||
| { | ||
| static void idct(int* pTemp, const jpgd_block_t* pSrc) | ||
| { | ||
| - const int dcval = pSrc[0] * (pSrc[0] * (PASS1_BITS * 2)); | ||
| + const int dcval = pSrc[0] * PASS1_BITS * 2; | ||
|
|
||
| pTemp[0] = dcval; | ||
| pTemp[1] = dcval; |
120 changes: 120 additions & 0 deletions
120
thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * Copyright (c) 2020 - 2023 the ThorVG project. All rights reserved. | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| #include "tvgLoader.h" | ||
| #include "tvgPngLoader.h" | ||
|
|
||
| /************************************************************************/ | ||
| /* Internal Class Implementation */ | ||
| /************************************************************************/ | ||
|
|
||
|
|
||
| /************************************************************************/ | ||
| /* External Class Implementation */ | ||
| /************************************************************************/ | ||
|
|
||
| PngLoader::PngLoader() | ||
| { | ||
| image = static_cast<png_imagep>(calloc(1, sizeof(png_image))); | ||
| image->version = PNG_IMAGE_VERSION; | ||
| image->opaque = NULL; | ||
| } | ||
|
|
||
| PngLoader::~PngLoader() | ||
| { | ||
| if (content) { | ||
| free((void*)content); | ||
| content = nullptr; | ||
| } | ||
| free(image); | ||
| } | ||
|
|
||
| bool PngLoader::open(const string& path) | ||
| { | ||
| image->opaque = NULL; | ||
|
|
||
| if (!png_image_begin_read_from_file(image, path.c_str())) return false; | ||
|
|
||
| w = (float)image->width; | ||
| h = (float)image->height; | ||
| cs = ColorSpace::ARGB8888; | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool PngLoader::open(const char* data, uint32_t size, bool copy) | ||
| { | ||
| image->opaque = NULL; | ||
|
|
||
| if (!png_image_begin_read_from_memory(image, data, size)) return false; | ||
|
|
||
| w = (float)image->width; | ||
| h = (float)image->height; | ||
| cs = ColorSpace::ARGB8888; | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
|
|
||
| bool PngLoader::read() | ||
| { | ||
| png_bytep buffer; | ||
| image->format = PNG_FORMAT_BGRA; | ||
| buffer = static_cast<png_bytep>(malloc(PNG_IMAGE_SIZE((*image)))); | ||
| if (!buffer) { | ||
| //out of memory, only time when libpng doesnt free its data | ||
| png_image_free(image); | ||
| return false; | ||
| } | ||
| if (!png_image_finish_read(image, NULL, buffer, 0, NULL)) { | ||
| free(buffer); | ||
| return false; | ||
| } | ||
| content = reinterpret_cast<uint32_t*>(buffer); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool PngLoader::close() | ||
| { | ||
| png_image_free(image); | ||
| return true; | ||
| } | ||
|
|
||
| unique_ptr<Surface> PngLoader::bitmap() | ||
| { | ||
| if (!content) return nullptr; | ||
|
|
||
| //TODO: It's better to keep this surface instance in the loader side | ||
| auto surface = new Surface; | ||
| surface->buf32 = content; | ||
| surface->stride = w; | ||
| surface->w = w; | ||
| surface->h = h; | ||
| surface->cs = cs; | ||
| surface->channelSize = sizeof(uint32_t); | ||
| surface->owner = true; | ||
| surface->premultiplied = false; | ||
|
|
||
| return unique_ptr<Surface>(surface); | ||
| } | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright (c) 2020 - 2023 the ThorVG project. All rights reserved. | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef _TVG_PNG_LOADER_H_ | ||
| #define _TVG_PNG_LOADER_H_ | ||
|
|
||
| #include <png.h> | ||
|
|
||
| class PngLoader : public LoadModule | ||
| { | ||
| public: | ||
| PngLoader(); | ||
| ~PngLoader(); | ||
|
|
||
| using LoadModule::open; | ||
| bool open(const string& path) override; | ||
| bool open(const char* data, uint32_t size, bool copy) override; | ||
| bool read() override; | ||
| bool close() override; | ||
|
|
||
| unique_ptr<Surface> bitmap() override; | ||
|
|
||
| private: | ||
| png_imagep image = nullptr; | ||
| uint32_t* content = nullptr; | ||
| }; | ||
|
|
||
| #endif //_TVG_PNG_LOADER_H_ |
Oops, something went wrong.