From a56fc8173351e737458dcb4072e7ce9b7aa4392e Mon Sep 17 00:00:00 2001 From: Mira Grudzinska Date: Tue, 25 Jun 2024 23:42:08 +0200 Subject: [PATCH] tvg_saver: fix 'order' serialization Serialization of the "order" attribute caused the bytes counter to be overwritten, resulting in the created TVG file being corrupted. Correctly created tag.tvg file has been included as a test resource.. --- src/savers/tvg/tvgTvgSaver.cpp | 2 +- test/resources/tag.tvg | Bin 3614 -> 3587 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp index 96c285e0..cc68e489 100644 --- a/src/savers/tvg/tvgTvgSaver.cpp +++ b/src/savers/tvg/tvgTvgSaver.cpp @@ -456,7 +456,7 @@ TvgBinCounter TvgSaver::serializeStroke(const Shape* shape, const Matrix* pTrans //order if (auto flag = static_cast(P(shape)->strokeFirst())) - writeTagProperty(TVG_TAG_SHAPE_STROKE_ORDER, SIZE(TvgBinFlag), &flag); + cnt += writeTagProperty(TVG_TAG_SHAPE_STROKE_ORDER, SIZE(TvgBinFlag), &flag); //fill if (auto fill = shape->strokeFill()) { diff --git a/test/resources/tag.tvg b/test/resources/tag.tvg index bff46b52829164361557a07dbfe23325b0ea0dcb..e59b8440ab3e30546a853aec7275296ac56cccc3 100644 GIT binary patch delta 3568 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 delta 3595 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 NShnc0e(0jH{{v&C69WJM