pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Aggplus::CalcBooleanOperation

Browse Source
This commit is contained in:
Svetlana Kulikova
2025-09-26 15:56:29 +03:00
parent 21a166208f
commit a873787fd7
8 changed files with 263 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
PdfFile/PdfWriter.cpp
View File

@ -903,6 +903,9 @@ HRESULT CPdfWriter::DrawPath(NSFonts::IApplicationFonts* pAppFonts, const std::w
UpdateBrush(pAppFonts, wsTempDirectory);
}
if (!m_arrRedact.empty())
m_oPath.Redact(m_oTransform, m_arrRedact);
if (!m_pShading)
{
m_oPath.Draw(m_pPage, bStroke, bFill, bEoFill);
@ -1076,26 +1079,9 @@ HRESULT CPdfWriter::DrawImage(IGrObject* pImage, const double& dX, const double&
{
m_oCommandManager.Flush();
if (!IsPageValid() || !pImage)
if (!IsPageValid() || !pImage || SkipRedact(dX, dY, dW, dH))
return S_OK;
if (!m_arrRedact.empty())
{
double dXmin = MM_2_PT(dX), dYmin = MM_2_PT(m_dPageHeight - dY - dH), dXmax = MM_2_PT(dX + dW), dYmax = MM_2_PT(m_dPageHeight - dY);
m_oTransform.Transform(dXmin, dYmin, &dXmin, &dYmin);
m_oTransform.Transform(dXmax, dYmax, &dXmax, &dYmax);
for (int i = 0; i < m_arrRedact.size(); i += 4)
{
double xMin = m_arrRedact[i + 0];
double yMin = m_arrRedact[i + 1];
double xMax = m_arrRedact[i + 2];
double yMax = m_arrRedact[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
return S_OK;
}
}
if (!DrawImage((Aggplus::CImage*)pImage, dX, dY, dW, dH, 255))
return S_FALSE;
@ -1105,26 +1091,9 @@ HRESULT CPdfWriter::DrawImageFromFile(NSFonts::IApplicationFonts* pAppFonts, con
{
m_oCommandManager.Flush();
if (!IsPageValid())
if (!IsPageValid() || SkipRedact(dX, dY, dW, dH))
return S_OK;
if (!m_arrRedact.empty())
{
double dXmin = MM_2_PT(dX), dYmin = MM_2_PT(m_dPageHeight - dY - dH), dXmax = MM_2_PT(dX + dW), dYmax = MM_2_PT(m_dPageHeight - dY);
m_oTransform.Transform(dXmin, dYmin, &dXmin, &dYmin);
m_oTransform.Transform(dXmax, dYmax, &dXmax, &dYmax);
for (int i = 0; i < m_arrRedact.size(); i += 4)
{
double xMin = m_arrRedact[i + 0];
double yMin = m_arrRedact[i + 1];
double xMax = m_arrRedact[i + 2];
double yMax = m_arrRedact[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
return S_OK;
}
}
if (m_pDocument->HasImage(wsImagePathSrc, nAlpha))
{
PdfWriter::CImageDict* pPdfImage = m_pDocument->GetImage(wsImagePathSrc, nAlpha);
@ -2653,6 +2622,8 @@ HRESULT CPdfWriter::AddMetaData(const std::wstring& sMetaName, BYTE* pMetaData,
HRESULT CPdfWriter::AddRedact(const std::vector<double>& arrRedact)
{
m_arrRedact.clear();
if (arrRedact.empty())
return S_OK;
m_arrRedact = arrRedact;
PdfWriter::CArrayObject* pPageBox = (PdfWriter::CArrayObject*)m_pPage->Get("CropBox");
@ -2705,26 +2676,9 @@ HRESULT CPdfWriter::DrawImage1bpp(NSImages::CPixJbig2* pImageBuffer, const unsig
{
m_oCommandManager.Flush();
if (!IsPageValid() || !pImageBuffer)
if (!IsPageValid() || !pImageBuffer || SkipRedact(dX, dY, dW, dH))
return S_OK;
if (!m_arrRedact.empty())
{
double dXmin = MM_2_PT(dX), dYmin = MM_2_PT(m_dPageHeight - dY - dH), dXmax = MM_2_PT(dX + dW), dYmax = MM_2_PT(m_dPageHeight - dY);
m_oTransform.Transform(dXmin, dYmin, &dXmin, &dYmin);
m_oTransform.Transform(dXmax, dYmax, &dXmax, &dYmax);
for (int i = 0; i < m_arrRedact.size(); i += 4)
{
double xMin = m_arrRedact[i + 0];
double yMin = m_arrRedact[i + 1];
double xMax = m_arrRedact[i + 2];
double yMax = m_arrRedact[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
return S_OK;
}
}
m_pPage->GrSave();
UpdateTransform();
@ -2756,26 +2710,9 @@ HRESULT CPdfWriter::DrawImageWith1bppMask(IGrObject* pImage, NSImages::CPixJbig2
{
m_oCommandManager.Flush();
if (!IsPageValid() || !pMaskBuffer || !pImage)
if (!IsPageValid() || !pMaskBuffer || !pImage || SkipRedact(dX, dY, dW, dH))
return S_OK;
if (!m_arrRedact.empty())
{
double dXmin = MM_2_PT(dX), dYmin = MM_2_PT(m_dPageHeight - dY - dH), dXmax = MM_2_PT(dX + dW), dYmax = MM_2_PT(m_dPageHeight - dY);
m_oTransform.Transform(dXmin, dYmin, &dXmin, &dYmin);
m_oTransform.Transform(dXmax, dYmax, &dXmax, &dYmax);
for (int i = 0; i < m_arrRedact.size(); i += 4)
{
double xMin = m_arrRedact[i + 0];
double yMin = m_arrRedact[i + 1];
double xMax = m_arrRedact[i + 2];
double yMax = m_arrRedact[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
return S_OK;
}
}
PdfWriter::CImageDict* pPdfImage = LoadImage((Aggplus::CImage*)pImage, 255);
if (!pPdfImage)
return S_OK;
@ -3224,6 +3161,25 @@ void CPdfWriter::Sign(const double& dX, const double& dY, const double& dW, cons
//----------------------------------------------------------------------------------------
// Внутренние функции
//----------------------------------------------------------------------------------------
bool CPdfWriter::SkipRedact(const double& dX, const double& dY, const double& dW, const double& dH)
{
if (m_arrRedact.empty())
return false;
double dXmin = MM_2_PT(dX), dYmin = MM_2_PT(m_dPageHeight - dY - dH), dXmax = MM_2_PT(dX + dW), dYmax = MM_2_PT(m_dPageHeight - dY);
m_oTransform.Transform(dXmin, dYmin, &dXmin, &dYmin);
m_oTransform.Transform(dXmax, dYmax, &dXmax, &dYmax);
for (int i = 0; i < m_arrRedact.size(); i += 4)
{
double xMin = m_arrRedact[i + 0];
double yMin = m_arrRedact[i + 1];
double xMax = m_arrRedact[i + 2];
double yMax = m_arrRedact[i + 3];
if (!(dXmax < xMin || dXmin > xMax || dYmax < yMin || dYmin > yMax))
return true;
}
return false;
}
PdfWriter::CImageDict* CPdfWriter::LoadImage(Aggplus::CImage* pImage, BYTE nAlpha)
{
TColor oColor;