mirror of
https://github.com/thorvg/thorvg.git
synced 2025-06-08 13:43:43 +00:00
ed01ef717e
Remove the requirement for unique_ptr in the function prototypes. This change will simplify the API usage, making it more streamlined and user-friendly. However, memory management will now be the responsibility of the user. C++ API Modification: - Result Paint::mask(std::unique_ptr<Paint> target, MaskMethod method) -> Result Paint::mask(Paint* target, MaskMethod method) - Result Paint::clip(std::unique_ptr<Paint> clipper) -> Result Paint::clip(Paint* clipper) - virtual Result Canvas::push(std::unique_ptr<Paint> paint) -> virtual Result Canvas::push(Paint* paint) - std::unique_ptr<LinearGradient> LinearGradient::gen() -> LinearGradient* LinearGradient::gen() - std::unique_ptr<RadialGradient> RadialGradient::gen() -> RadialGradient* RadialGradient::gen() - Result Shape::strokeFill(std::unique_ptr<Fill> f) -> Result Shape::strokeFill(Fill* f) - Result Shape::fill(std::unique_ptr<Fill> f) -> Result Shape::fill(Fill* f) - std::unique_ptr<Shape> Shape::gen() -> Shape* Shape::gen() - std::unique_ptr<Picture> Picture::gen() -> Result Picture::push(Paint* paint) - std::unique_ptr<Scene> Scene::gen() -> Scene* Scene::gen() - Result Text::fill(std::unique_ptr<Fill> f) -> Result Text::fill(Fill* f) - std::unique_ptr<Text> Text::gen() -> Text* Text::gen() - std::unique_ptr<SwCanvas> SwCanvas::gen() -> SwCanvas* SwCanvas::gen() - std::unique_ptr<GlCanvas> GlCanvas::gen() -> GlCanvas* GlCanvas::gen() - std::unique_ptr<Animation> Animation::gen() -> Animation* Animation::gen() - Result Saver::background(std::unique_ptr<Paint> paint) -> Result Saver::background(Paint* paint) - Result Saver::save(std::unique_ptr<Paint> paint, const char* filename, uint32_t quality = 100) -> Result Saver::save(Paint* paint, const char* filename, uint32_t quality = 100) - std::unique_ptr<Saver> Saver::gen() -> Saver* Saver::gen() - std::unique_ptr<Accessor> Accessor::gen() -> Accessor* Accessor::gen() C++ API removal: - template<typename T = tvg::Paint> std::unique_ptr<T> cast(Paint* paint) - template<typename T = tvg::Paint> std::unique_ptr<T> cast(Paint* paint) issue: https://github.com/thorvg/thorvg/issues
87 lines
No EOL
2.8 KiB
C++
87 lines
No EOL
2.8 KiB
C++
/*
|
|
* Copyright (c) 2022 - 2024 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 <thorvg.h>
|
|
#include "config.h"
|
|
#include "catch.hpp"
|
|
|
|
using namespace tvg;
|
|
using namespace std;
|
|
|
|
TEST_CASE("Accessor Creation", "[tvgAccessor]")
|
|
{
|
|
auto accessor = unique_ptr<Accessor>(Accessor::gen());
|
|
REQUIRE(accessor);
|
|
|
|
auto accessor2 = unique_ptr<Accessor>(Accessor::gen());
|
|
REQUIRE(accessor2);
|
|
}
|
|
|
|
#ifdef THORVG_SVG_LOADER_SUPPORT
|
|
|
|
TEST_CASE("Set", "[tvgAccessor]")
|
|
{
|
|
REQUIRE(Initializer::init(0) == Result::Success);
|
|
|
|
auto canvas = unique_ptr<SwCanvas>(SwCanvas::gen());
|
|
REQUIRE(canvas);
|
|
|
|
uint32_t buffer[100*100];
|
|
REQUIRE(canvas->target(buffer, 100, 100, 100, ColorSpace::ABGR8888) == Result::Success);
|
|
|
|
auto picture = unique_ptr<Picture>(Picture::gen());
|
|
REQUIRE(picture);
|
|
REQUIRE(picture->load(TEST_DIR"/logo.svg") == Result::Success);
|
|
|
|
auto accessor = unique_ptr<Accessor>(Accessor::gen());
|
|
REQUIRE(accessor);
|
|
|
|
//Case 1
|
|
REQUIRE(accessor->set(picture.get(), nullptr, nullptr) == Result::InvalidArguments);
|
|
|
|
//Case 2
|
|
Shape* ret = nullptr;
|
|
|
|
auto f = [](const tvg::Paint* paint, void* data) -> bool
|
|
{
|
|
if (paint->type() == Type::Shape) {
|
|
auto shape = (tvg::Shape*) paint;
|
|
uint8_t r, g, b;
|
|
shape->fillColor(&r, &g, &b);
|
|
if (r == 37 && g == 47 && b == 53) {
|
|
shape->fill(0, 0, 255);
|
|
shape->id = Accessor::id("TestAccessor");
|
|
*static_cast<Shape**>(data) = shape;
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
};
|
|
|
|
REQUIRE(accessor->set(picture.get(), f, &ret) == Result::Success);
|
|
|
|
REQUIRE((ret && ret->id == Accessor::id("TestAccessor")));
|
|
|
|
REQUIRE(Initializer::term() == Result::Success);
|
|
}
|
|
|
|
#endif |