From e8800b232deaa11c7880f6454418ef666be27118 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 19 Mar 2018 13:43:10 -0700 Subject: [PATCH] Handle PDFium API change It now does not flip coordinate system anymore. Bug: 72134075 Test: atest CtsPdfTestCases Change-Id: I4dce299738f24a44478c06fa7179306a4904b5d5 --- core/jni/android/graphics/pdf/PdfRenderer.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/core/jni/android/graphics/pdf/PdfRenderer.cpp index d20c7ef2ec76e..32ac30fdabb05 100644 --- a/core/jni/android/graphics/pdf/PdfRenderer.cpp +++ b/core/jni/android/graphics/pdf/PdfRenderer.cpp @@ -92,20 +92,7 @@ static void nativeRenderPage(JNIEnv* env, jclass thiz, jlong documentPtr, jlong renderFlags |= FPDF_PRINTING; } - // PDF's coordinate system origin is left-bottom while in graphics it - // is the top-left. So, translate the PDF coordinates to ours. - SkMatrix reflectOnX = SkMatrix::MakeScale(1, -1); - SkMatrix moveUp = SkMatrix::MakeTrans(0, FPDF_GetPageHeight(page)); - SkMatrix coordinateChange = SkMatrix::Concat(moveUp, reflectOnX); - - // Apply the transformation - SkMatrix matrix; - if (transformPtr == 0) { - matrix = coordinateChange; - } else { - matrix = SkMatrix::Concat(*reinterpret_cast(transformPtr), coordinateChange); - } - + SkMatrix matrix = *reinterpret_cast(transformPtr); SkScalar transformValues[6]; if (!matrix.asAffine(transformValues)) { jniThrowException(env, "java/lang/IllegalArgumentException",