summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-02-23 15:05:33 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-02-23 21:05:26 +0100
commit36bd5662e73f6fbd64bf03fd42936a8d69ed397b (patch)
treed93113c502e9b7c92043223ef073c3c6cbc56627
parent2e63d4554069b33654729a9247c0b32950803163 (diff)
Revert "tdf#96892 3 to 5 digit precision"
1 to 3 was helpful, reportedly 3 to 5 isn't. This reverts commit c4b23192b4ab1f3ea75df7e48da36b6b17de248b. Change-Id: I51d31a8473ff51f1dcc89a063af568803efe5e11 Reviewed-on: https://gerrit.libreoffice.org/50252 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/qa/cppunit/pdfexport/pdfexport.cxx4
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 5aadf9fe3d4f..cb03680a4703 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -732,14 +732,14 @@ void PdfExportTest::testTdf108963()
CPPUNIT_ASSERT_EQUAL(FPDF_SEGMENT_LINETO, FPDFPathSegment_GetType(pSegment));
FPDFPathSegment_GetPoint(pSegment, &fX, &fY);
CPPUNIT_ASSERT_EQUAL(275102, static_cast<int>(round(fX * 1000)));
- CPPUNIT_ASSERT_EQUAL(267591, static_cast<int>(round(fY * 1000)));
+ CPPUNIT_ASSERT_EQUAL(267590, static_cast<int>(round(fY * 1000)));
CPPUNIT_ASSERT(!FPDFPathSegment_GetClose(pSegment));
pSegment = FPDFPath_GetPathSegment(pPdfPageObject, 2);
CPPUNIT_ASSERT_EQUAL(FPDF_SEGMENT_LINETO, FPDFPathSegment_GetType(pSegment));
FPDFPathSegment_GetPoint(pSegment, &fX, &fY);
CPPUNIT_ASSERT_EQUAL(287518, static_cast<int>(round(fX * 1000)));
- CPPUNIT_ASSERT_EQUAL(251802, static_cast<int>(round(fY * 1000)));
+ CPPUNIT_ASSERT_EQUAL(251801, static_cast<int>(round(fY * 1000)));
CPPUNIT_ASSERT(!FPDFPathSegment_GetClose(pSegment));
pSegment = FPDFPath_GetPathSegment(pPdfPageObject, 3);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 89b87d44815e..f3aeb9372234 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -505,8 +505,8 @@ void doTestCode()
}
#endif
-static const sal_Int32 nLog10Divisor = 5;
-static const double fDivisor = 100000.0;
+static const sal_Int32 nLog10Divisor = 3;
+static const double fDivisor = 1000.0;
static inline double pixelToPoint( double px ) { return px/fDivisor; }
static inline sal_Int32 pointToPixel( double pt ) { return sal_Int32(pt*fDivisor); }