summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-04-13 19:20:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-13 19:20:59 +0000
commit073f36c6c1bc937a55393f7fe9a21b95e822bfda (patch)
treeb893a2628d6bf80f5c41a0941b38809a741e6657 /graphics
parentbed238fcea7c5dc5f0ad6f14d1b585b0947a4cdc (diff)
parenta771b9861d11671c780092d35c0062eeefcf37c0 (diff)
downloadframeworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.zip
frameworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.tar.gz
frameworks_base-073f36c6c1bc937a55393f7fe9a21b95e822bfda.tar.bz2
Merge "Change how Java Bitmaps are accessed in a few places"
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/pdf/PdfRenderer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java
index b32dcc6..feb8052 100644
--- a/graphics/java/android/graphics/pdf/PdfRenderer.java
+++ b/graphics/java/android/graphics/pdf/PdfRenderer.java
@@ -380,7 +380,7 @@ public final class PdfRenderer implements AutoCloseable {
final long transformPtr = (transform != null) ? transform.native_instance : 0;
- nativeRenderPage(mNativeDocument, mNativePage, destination.getSkBitmap(), contentLeft,
+ nativeRenderPage(mNativeDocument, mNativePage, destination, contentLeft,
contentTop, contentRight, contentBottom, transformPtr, renderMode);
}
@@ -425,7 +425,7 @@ public final class PdfRenderer implements AutoCloseable {
private static native void nativeClose(long documentPtr);
private static native int nativeGetPageCount(long documentPtr);
private static native boolean nativeScaleForPrinting(long documentPtr);
- private static native void nativeRenderPage(long documentPtr, long pagePtr, long destPtr,
+ private static native void nativeRenderPage(long documentPtr, long pagePtr, Bitmap dest,
int destLeft, int destTop, int destRight, int destBottom, long matrixPtr, int renderMode);
private static native long nativeOpenPageAndGetSize(long documentPtr, int pageIndex,
Point outSize);