diff --git a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js index cc8ae4e4a3..cd29b55f09 100644 --- a/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js +++ b/DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js @@ -450,13 +450,10 @@ function readAction(reader, rec, readDoubleFunc, readStringFunc) } function readAnnot(reader, rec, readDoubleFunc, readDouble2Func, readStringFunc, isRead = false) { - if (!isRead) - rec["AP"] = {}; + rec["AP"] = {}; // Annot // number for relations with AP - let APi = reader.readInt(); - if (!isRead) - rec["AP"]["i"] = APi; + rec["AP"]["i"] = reader.readInt(); rec["annotflag"] = reader.readInt(); // 12.5.3 let bHidden = (rec["annotflag"] >> 1) & 1; // Hidden @@ -539,10 +536,7 @@ function readAnnot(reader, rec, readDoubleFunc, readDouble2Func, readStringFunc, if (flags & (1 << 6)) { if (isRead) - { - let APrender = reader.readData(); // TODO use Render - Uint8Array - // rec["AP"]["render"] = APrender; - } + rec["AP"]["render"] = reader.readData(); // TODO use Render - Uint8Array else rec["AP"]["have"] = (flags >> 6) & 1; } @@ -1180,15 +1174,9 @@ function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readString if (isRead) { if (flags & (1 << 12)) - { - let APV = readStringFunc.call(reader); - // rec["AP"]["V"] = APV; - } + rec["AP"]["V"] = readStringFunc.call(reader); if (flags & (1 << 13)) - { - let APrender = reader.readData(); // TODO use Render - Uint8Array - // rec["AP"]["render"] = APrender; - } + rec["AP"]["render"] = reader.readData(); // TODO use Render - Uint8Array } // 12.7.4.3 if (rec["flag"] >= 0) @@ -1225,10 +1213,7 @@ function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readString if (isRead) { if (flags & (1 << 12)) - { - let APV = readStringFunc.call(reader); - // rec["AP"]["V"] = APV; - } + rec["AP"]["V"] = readStringFunc.call(reader); } else { @@ -1257,10 +1242,7 @@ function readWidgetType(reader, rec, readDoubleFunc, readDouble2Func, readString rec["I"].push(reader.readInt()); } if (flags & (1 << 15)) - { - let APrender = reader.readData(); // TODO use Render - Uint8Array - // rec["AP"]["render"] = APrender; - } + rec["AP"]["render"] = reader.readData(); // TODO use Render - Uint8Array } // 12.7.4.4 if (rec["flag"] >= 0)