diff --git a/inc/thorvg.h b/inc/thorvg.h index ab036986..fae48633 100644 --- a/inc/thorvg.h +++ b/inc/thorvg.h @@ -1361,8 +1361,8 @@ public: { ABGR8888 = 0, ///< The channels are joined in the order: alpha, blue, green, red. Colors are alpha-premultiplied. ARGB8888, ///< The channels are joined in the order: alpha, red, green, blue. Colors are alpha-premultiplied. - ABGR8888_STRAIGHT, ///< @BETA_API The channels are joined in the order: alpha, blue, green, red. Colors are un-alpha-premultiplied. - ARGB8888_STRAIGHT, ///< @BETA_API The channels are joined in the order: alpha, red, green, blue. Colors are un-alpha-premultiplied. + ABGR8888S, ///< @BETA_API The channels are joined in the order: alpha, blue, green, red. Colors are un-alpha-premultiplied. + ARGB8888S, ///< @BETA_API The channels are joined in the order: alpha, red, green, blue. Colors are un-alpha-premultiplied. }; /** diff --git a/src/bin/svg2png/svg2png.cpp b/src/bin/svg2png/svg2png.cpp index 9792194c..56191a0d 100644 --- a/src/bin/svg2png/svg2png.cpp +++ b/src/bin/svg2png/svg2png.cpp @@ -125,7 +125,7 @@ public: return 1; } - if (canvas->target(buffer, w, w, h, tvg::SwCanvas::ARGB8888_STRAIGHT) != tvg::Result::Success) { + if (canvas->target(buffer, w, w, h, tvg::SwCanvas::ARGB8888S) != tvg::Result::Success) { cout << "Error: Canvas target failure" << endl; return 1; } diff --git a/test/testSwEngine.cpp b/test/testSwEngine.cpp index 6f463c0e..9143da4f 100644 --- a/test/testSwEngine.cpp +++ b/test/testSwEngine.cpp @@ -38,7 +38,7 @@ TEST_CASE("Basic draw", "[tvgSwEngine]") REQUIRE(canvas); uint32_t buffer[100*100]; - REQUIRE(canvas->target(buffer, 100, 100, 100, SwCanvas::Colorspace::ABGR8888_STRAIGHT) == Result::Success); + REQUIRE(canvas->target(buffer, 100, 100, 100, SwCanvas::Colorspace::ABGR8888S) == Result::Success); //Arc Line auto shape1 = tvg::Shape::gen();