summaryrefslogtreecommitdiffstats
path: root/core/jni/android/graphics/pdf
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-12 08:03:48 -0800
committerAndreas Gampe <agampe@google.com>2014-11-13 15:20:37 -0800
commit0f0b4919667f418b249c497f5ad3e83fdf4437e5 (patch)
tree3a583c918c72b7d8d48b784505502f7b3fdf05e9 /core/jni/android/graphics/pdf
parent537888be7d5cfa6bfa9ddd459a622ea208339735 (diff)
downloadframeworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.zip
frameworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.tar.gz
frameworks_base-0f0b4919667f418b249c497f5ad3e83fdf4437e5.tar.bz2
Frameworks/base: Wall Werror in core/jni
Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
Diffstat (limited to 'core/jni/android/graphics/pdf')
-rw-r--r--core/jni/android/graphics/pdf/PdfRenderer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/core/jni/android/graphics/pdf/PdfRenderer.cpp
index 303ddea..b68aa38 100644
--- a/core/jni/android/graphics/pdf/PdfRenderer.cpp
+++ b/core/jni/android/graphics/pdf/PdfRenderer.cpp
@@ -20,7 +20,11 @@
#include "SkBitmap.h"
#include "SkMatrix.h"
#include "fpdfview.h"
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#include "fsdk_rendercontext.h"
+#pragma GCC diagnostic pop
#include <android_runtime/AndroidRuntime.h>
#include <vector>
@@ -228,7 +232,6 @@ static void nativeRenderPage(JNIEnv* env, jclass thiz, jlong documentPtr, jlong
jlong bitmapPtr, jint destLeft, jint destTop, jint destRight, jint destBottom,
jlong matrixPtr, jint renderMode) {
- FPDF_DOCUMENT document = reinterpret_cast<FPDF_DOCUMENT>(documentPtr);
FPDF_PAGE page = reinterpret_cast<FPDF_PAGE>(pagePtr);
SkBitmap* skBitmap = reinterpret_cast<SkBitmap*>(bitmapPtr);
SkMatrix* skMatrix = reinterpret_cast<SkMatrix*>(matrixPtr);