Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd7c97bc authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "PDFium interface changed, hence adjust the adapter jni code." into nyc-dev

parents be3bcae7 79bd8d48

core/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -193,9 +193,9 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/system/media/camera/include \

    $(TOP)/system/netd/include \

    external/pdfium/core/include/fpdfapi \

    external/pdfium/core/include/fpdfdoc \

    external/pdfium/fpdfsdk/include \

    external/pdfium/public \

    external/pdfium \

    external/skia/include/private \

    external/skia/src/core \

    external/skia/src/effects \

core/jni/android/graphics/pdf/PdfEditor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static void nativeSetTransformAndClip(JNIEnv* env, jclass thiz, jlong documentPt 
        return;

    }



    CFX_AffineMatrix matrix;

    CFX_Matrix matrix;



    SkMatrix* skTransform = reinterpret_cast<SkMatrix*>(transformPtr);

core/jni/android/graphics/pdf/PdfRenderer.cpp

+4 −5
Original line number Diff line number Diff line
@@ -205,11 +205,10 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i 
    clip.bottom = destBottom;

    fxgeDevice->SetClip_Rect(&clip);



    CPDF_RenderContext* pageContext = new CPDF_RenderContext;

    CPDF_RenderContext* pageContext = new CPDF_RenderContext(pPage);

    pContext->m_pContext = pageContext;

    pageContext->Create(pPage);



    CFX_AffineMatrix matrix;

    CFX_Matrix matrix;

    if (!transform) {

        pPage->GetDisplayMatrix(matrix, destLeft, destTop, destRight - destLeft,

                destBottom - destTop, 0);
@@ -232,8 +231,8 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i 
    }

    pageContext->AppendObjectList(pPage, &matrix);



    pContext->m_pRenderer = new CPDF_ProgressiveRenderer;

    pContext->m_pRenderer->Start(pageContext, fxgeDevice, renderOptions, NULL);

    pContext->m_pRenderer = new CPDF_ProgressiveRenderer(pageContext, fxgeDevice, renderOptions);

    pContext->m_pRenderer->Start(NULL);



    fxgeDevice->RestoreState();