summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-04-30 21:00:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 21:00:08 +0000
commitdb672b03a2de26127b40dbe50c794b5697b01c37 (patch)
treee9610a9faf575cd38bc0c3d14b870fbfffc478a6 /graphics
parent0069301d364a219bbd4b166ba6f4d9be854d556f (diff)
parented207b92747234eac88dd3664ecfb535e45d8ed1 (diff)
downloadframeworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.zip
frameworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.tar.gz
frameworks_base-db672b03a2de26127b40dbe50c794b5697b01c37.tar.bz2
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
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);