diff options
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android/graphics/pdf/PdfEditor.cpp | 6 | ||||
| -rw-r--r-- | core/jni/android/graphics/pdf/PdfRenderer.cpp | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 40fee2c..faf926c 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -183,6 +183,7 @@ LOCAL_C_INCLUDES += \ external/pdfium/core/include/fpdfapi \ external/pdfium/core/include/fpdfdoc \ external/pdfium/fpdfsdk/include \ + external/pdfium/public \ external/skia/src/core \ external/skia/src/effects \ external/skia/src/images \ diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/core/jni/android/graphics/pdf/PdfEditor.cpp index 84434ae..52b69e0 100644 --- a/core/jni/android/graphics/pdf/PdfEditor.cpp +++ b/core/jni/android/graphics/pdf/PdfEditor.cpp @@ -20,8 +20,8 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" #include "fpdfview.h" -#include "fpdfedit.h" -#include "fpdfsave.h" +#include "fpdf_edit.h" +#include "fpdf_save.h" #include "fsdk_rendercontext.h" #include "fpdf_transformpage.h" #pragma GCC diagnostic pop @@ -58,7 +58,7 @@ static int sUnmatchedInitRequestCount = 0; static void initializeLibraryIfNeeded() { Mutex::Autolock _l(sLock); if (sUnmatchedInitRequestCount == 0) { - FPDF_InitLibrary(NULL); + FPDF_InitLibrary(); } sUnmatchedInitRequestCount++; } diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/core/jni/android/graphics/pdf/PdfRenderer.cpp index 876bea4..006eef8 100644 --- a/core/jni/android/graphics/pdf/PdfRenderer.cpp +++ b/core/jni/android/graphics/pdf/PdfRenderer.cpp @@ -50,7 +50,7 @@ static int sUnmatchedInitRequestCount = 0; static void initializeLibraryIfNeeded() { Mutex::Autolock _l(sLock); if (sUnmatchedInitRequestCount == 0) { - FPDF_InitLibrary(NULL); + FPDF_InitLibrary(); } sUnmatchedInitRequestCount++; } @@ -165,12 +165,12 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i // and FPDF_ANNOT flags. To add support for that refer to FPDF_RenderPage_Retail // in fpdfview.cpp - CRenderContext* pContext = FX_NEW CRenderContext; + CRenderContext* pContext = new CRenderContext; CPDF_Page* pPage = (CPDF_Page*) page; pPage->SetPrivateData((void*) 1, pContext, DropContext); - CFX_FxgeDevice* fxgeDevice = FX_NEW CFX_FxgeDevice; + CFX_FxgeDevice* fxgeDevice = new CFX_FxgeDevice; pContext->m_pDevice = fxgeDevice; // Reverse the bytes (last argument TRUE) since the Android @@ -180,7 +180,7 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i CPDF_RenderOptions* renderOptions = pContext->m_pOptions; if (!renderOptions) { - renderOptions = FX_NEW CPDF_RenderOptions; + renderOptions = new CPDF_RenderOptions; pContext->m_pOptions = renderOptions; } @@ -205,7 +205,7 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i clip.bottom = destBottom; fxgeDevice->SetClip_Rect(&clip); - CPDF_RenderContext* pageContext = FX_NEW CPDF_RenderContext; + CPDF_RenderContext* pageContext = new CPDF_RenderContext; pContext->m_pContext = pageContext; pageContext->Create(pPage); @@ -232,7 +232,7 @@ static void renderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int destLeft, i } pageContext->AppendObjectList(pPage, &matrix); - pContext->m_pRenderer = FX_NEW CPDF_ProgressiveRenderer; + pContext->m_pRenderer = new CPDF_ProgressiveRenderer; pContext->m_pRenderer->Start(pageContext, fxgeDevice, renderOptions, NULL); fxgeDevice->RestoreState(); |