From e8702de0594758944ded12241bbab29962a96281 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 3625 -> 3587 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp index 6526f3c8..86d117a3 100644 --- a/src/savers/tvg/tvgTvgSaver.cpp +++ b/src/savers/tvg/tvgTvgSaver.cpp @@ -458,7 +458,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 1143bdf66df4969879817a1725ef2743ad8027a6..e59b8440ab3e30546a853aec7275296ac56cccc3 100644 GIT binary patch delta 3578 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