fix loss of an attribute in sqrt

DesktopEditor/cximage/CxImage/tif_xfile.cpp

@@ -16,15 +16,7 @@
 static tsize_t 
 _tiffReadProcEx(thandle_t fd, tdata_t buf, tsize_t size)
 {
-	tsize_t nReadCount = (tsize_t)((CxFile*)fd)->Read(buf, 1, size);
-
-	if (nReadCount < size)
-	{
-		memset(static_cast<char*>(buf) + nReadCount, 0, size - nReadCount);
-		return size;
-	}
-
-	return nReadCount;
+	return (tsize_t)((CxFile*)fd)->Read(buf, 1, size);
 }
 
 static tsize_t

OdfFile/Reader/Converter/StarMath2OOXML/cstarmathpars.cpp

@@ -94,6 +94,8 @@ namespace StarMath
 
 			if(pReader->GetAttribute() != nullptr && !CheckForLeftArgument(pReader->GetGlobalType()))
 				pElement->SetBaseAttribute(pReader->GetAttribute());
+			else if(pReader->GetAttribute() != nullptr && pElement->GetBaseType() == TypeElement::Index && dynamic_cast<CElementIndex*>(pElement)->GetType() == TypeElement::sqrt)
+				pElement->SetBaseAttribute(pReader->GetAttribute());
 			else if(pReader->GetAttribute() != nullptr && (pReader->GetLocalType() == TypeElement::plus || TypeElement::minus == pReader->GetLocalType() || TypeElement::frac == pReader->GetLocalType() || TypeElement::neg == pReader->GetLocalType()))
 				pElement->SetBaseAttribute(pReader->GetAttribute());
 			pReader->ClearReader();
@@ -2610,6 +2612,8 @@ namespace StarMath
 			m_pLeftArg->SetBaseAttribute(pAttribute);
 			this->SetBaseAttribute(m_pLeftArg->GetAttribute());
 		}
+		if(m_enTypeIndex == TypeElement::sqrt)
+			this->SetBaseAttribute(pAttribute);
 		if(m_pValueIndex != nullptr)
 			m_pValueIndex->SetAttribute(pAttribute);
 		if(m_pLeftArg != nullptr)

PdfFile/PdfEditor.cpp

@@ -3662,12 +3662,24 @@ std::vector<double> CPdfEditor::WriteRedact(const std::vector<std::wstring>& arr
 				arrRes.insert(arrRes.end(), m_arrRedact[j].arrQuads.begin(), m_arrRedact[j].arrQuads.end());
 			return arrRes;
 		}
-
 		CRedactData oRedact = m_arrRedact[i];
-		if (oRedact.bDraw || !oRedact.pRender || oRedact.nLenRender != oRedact.arrQuads.size() / 8 * 12)
+		if (oRedact.bDraw || !oRedact.pRender)
 			continue;
 
-		BYTE* pMemory = oRedact.pRender;
+		LONG nLenRender = oRedact.nLenRender;
+		BYTE* pRender = oRedact.pRender;
+
+		BYTE* pMemory = pRender;
+		int ret = *((int*)pMemory);
+		pMemory += 4;
+		LONG R = ret;
+		ret = *((int*)pMemory);
+		pMemory += 4;
+		LONG G = ret;
+		ret = *((int*)pMemory);
+		LONG B = ret;
+		LONG lColor = (LONG)(R | (G << 8) | (B << 16) | ((LONG)255 << 24));
+
 		m_pWriter->AddRedact({});
 		double dM1, dM2, dM3, dM4, dM5, dM6;
 		m_pWriter->GetTransform(&dM1, &dM2, &dM3, &dM4, &dM5, &dM6);
@@ -3680,32 +3692,22 @@ std::vector<double> CPdfEditor::WriteRedact(const std::vector<std::wstring>& arr
 		m_pWriter->SetTransform(1, 0, 0, 1, 0, 0);
 		m_pWriter->PathCommandEnd();
 		m_pWriter->put_BrushType(c_BrushTypeSolid);
+		m_pWriter->put_BrushColor1(lColor);
 		m_pWriter->put_BrushAlpha1(255);
 		m_pWriter->put_BrushAlpha2(255);
 
 		for (int i = 0; i < oRedact.arrQuads.size(); i += 8)
 		{
-			int ret = *((int*)pMemory);
-			pMemory += 4;
-			LONG R = ret;
-			ret = *((int*)pMemory);
-			pMemory += 4;
-			LONG G = ret;
-			ret = *((int*)pMemory);
-			pMemory += 4;
-			LONG B = ret;
-			LONG lColor = (LONG)(R | (G << 8) | (B << 16) | ((LONG)255 << 24));
-
-			m_pWriter->put_BrushColor1(lColor);
 			m_pWriter->PathCommandMoveTo(PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 0]), PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 1]));
 			m_pWriter->PathCommandLineTo(PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 2]), PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 3]));
 			m_pWriter->PathCommandLineTo(PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 4]), PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 5]));
 			m_pWriter->PathCommandLineTo(PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 6]), PdfReader::PDFCoordsToMM(oRedact.arrQuads[i + 7]));
 			m_pWriter->PathCommandClose();
-			m_pWriter->DrawPath(NULL, L"", c_nWindingFillMode);
-			m_pWriter->PathCommandEnd();
 		}
 
+		m_pWriter->DrawPath(NULL, L"", c_nWindingFillMode);
+		m_pWriter->PathCommandEnd();
+
 		m_pWriter->SetTransform(dM1, dM2, dM3, dM4, dM5, dM6);
 		m_pWriter->put_BrushType(lType);
 		m_pWriter->put_BrushColor1(lColorB);

PdfFile/PdfReader.cpp

@@ -844,19 +844,18 @@ void CPdfReader::DrawPageOnRenderer(IRenderer* pRenderer, int _nPageIndex, bool*
 		if (m_vRedact[i]->m_nPageIndex == _nPageIndex)
 		{
 			BYTE* pMemory = m_vRedact[i]->m_pChanges;
+			int ret = *((int*)pMemory);
+			pMemory += 4;
+			LONG R = ret;
+			ret = *((int*)pMemory);
+			pMemory += 4;
+			LONG G = ret;
+			ret = *((int*)pMemory);
+			LONG B = ret;
+			LONG lColor = (LONG)(R | (G << 8) | (B << 16) | ((LONG)255 << 24));
+
 			for (int j = 0; j < m_vRedact[i]->m_arrRedactBox.size(); j += 8)
 			{
-				int ret = *((int*)pMemory);
-				pMemory += 4;
-				LONG R = ret;
-				ret = *((int*)pMemory);
-				pMemory += 4;
-				LONG G = ret;
-				ret = *((int*)pMemory);
-				pMemory += 4;
-				LONG B = ret;
-				LONG lColor = (LONG)(R | (G << 8) | (B << 16) | ((LONG)255 << 24));
-
 				pRenderer->PathCommandEnd();
 				pRenderer->put_BrushColor1(lColor);
 				pRenderer->PathCommandMoveTo(PdfReader::PDFCoordsToMM(m_vRedact[i]->m_arrRedactBox[j + 0] - cropBox->x1), PdfReader::PDFCoordsToMM(cropBox->y2 - m_vRedact[i]->m_arrRedactBox[j + 1]));