diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-14 21:34:52 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-15 12:21:31 +0100 |
| commit | 1cb70721ba00dd6c6958f0a10e39aa5c1866ec96 (patch) | |
| tree | 91492d2689fc3e599024fd5aaa6d99c01aef0593 /svx/source/svdraw/svdpdf.cxx | |
| parent | 891e89004b227326b6fae4c4a2a90dce741dc7aa (diff) | |
external: update pdfium to 4021
Change-Id: I1c3280e811bf65641bf559e3f01bc62e609548f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86811
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'svx/source/svdraw/svdpdf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdpdf.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index dee1f97d0223..d9d2bde7c476 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -770,9 +770,9 @@ void ImpSdrPdfImport::ImportForm(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTex // Get the form matrix to perform correct translation/scaling of the form sub-objects. const Matrix aOldMatrix = mCurMatrix; - double a, b, c, d, e, f; - FPDFFormObj_GetMatrix(pPageObject, &a, &b, &c, &d, &e, &f); - mCurMatrix = Matrix(a, b, c, d, e, f); + FS_MATRIX matrix; + FPDFFormObj_GetMatrix(pPageObject, &matrix); + mCurMatrix = Matrix(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f); const int nCount = FPDFFormObj_CountObjects(pPageObject); for (int nIndex = 0; nIndex < nCount; ++nIndex) @@ -800,8 +800,8 @@ void ImpSdrPdfImport::ImportText(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTex if (left == right || top == bottom) return; - double a, b, c, d, e, f; - FPDFTextObj_GetMatrix(pPageObject, &a, &b, &c, &d, &e, &f); + FS_MATRIX matrix; + FPDFTextObj_GetMatrix(pPageObject, &matrix); Matrix aTextMatrix(mCurMatrix); aTextMatrix.Transform(left, right, top, bottom); @@ -819,8 +819,8 @@ void ImpSdrPdfImport::ImportText(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTex OUString sText(pText.get(), nActualChars); const double dFontSize = FPDFTextObj_GetFontSize(pPageObject); - double dFontSizeH = fabs(sqrt2(a, c) * dFontSize); - double dFontSizeV = fabs(sqrt2(b, d) * dFontSize); + double dFontSizeH = fabs(sqrt2(matrix.a, matrix.c) * dFontSize); + double dFontSizeV = fabs(sqrt2(matrix.b, matrix.d) * dFontSize); dFontSizeH = lcl_PointToPixel(dFontSizeH); dFontSizeV = lcl_PointToPixel(dFontSizeV); dFontSizeH = lcl_ToLogic(dFontSizeH); @@ -863,6 +863,7 @@ void ImpSdrPdfImport::ImportText(FPDF_PAGEOBJECT pPageObject, FPDF_TEXTPAGE pTex break; case FPDF_TEXTRENDERMODE_STROKE: case FPDF_TEXTRENDERMODE_STROKE_CLIP: + case FPDF_TEXTRENDERMODE_UNKNOWN: break; case FPDF_TEXTRENDERMODE_INVISIBLE: case FPDF_TEXTRENDERMODE_CLIP: @@ -1035,9 +1036,9 @@ void ImpSdrPdfImport::ImportImage(FPDF_PAGEOBJECT pPageObject, int /*nPageObject void ImpSdrPdfImport::ImportPath(FPDF_PAGEOBJECT pPageObject, int /*nPageObjectIndex*/) { - double a, b, c, d, e, f; - FPDFPath_GetMatrix(pPageObject, &a, &b, &c, &d, &e, &f); - Matrix aPathMatrix(a, b, c, d, e, f); + FS_MATRIX matrix; + FPDFPath_GetMatrix(pPageObject, &matrix); + Matrix aPathMatrix(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f); aPathMatrix.Concatinate(mCurMatrix); basegfx::B2DPolyPolygon aPolyPoly; |