summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-01-09 19:55:30 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-12 11:06:44 +0100
commit8da64996c98daae4b49ed0b73b6f690f9c0a0e3c (patch)
tree5139ef9ba66c1ae15c622a8491a58ed1a54fc034 /android
parent2cd20fa87b69dfb7d5326ace04bac48414158733 (diff)
android: bypass Bitmap creation and copying when creating tiles
Copying tile buffer just because we can is not really a good idea when just using the buffer in CairoImage works perfectly well. This should speed things up a bit but probably won't be noticable. Change-Id: I8d191d3e3870b20b15db56841ed72da22546aefc
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index a70b0bca36e6..d8e11bce22bd 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -189,7 +189,6 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
@Override
public CairoImage createTile(float x, float y, IntSize tileSize, float zoom) {
ByteBuffer buffer = ByteBuffer.allocateDirect(tileSize.width * tileSize.height * 4);
- Bitmap bitmap = Bitmap.createBitmap(tileSize.width, tileSize.height, Bitmap.Config.ARGB_8888);
if (mDocument != null) {
float twipX = pixelToTwip(x, mDPI) / zoom;
@@ -207,9 +206,7 @@ public class LOKitTileProvider implements TileProvider, Document.MessageCallback
Log.e(LOGTAG, "Document is null!!");
}
- bitmap.copyPixelsFromBuffer(buffer);
-
- CairoImage image = new BufferedCairoImage(bitmap);
+ CairoImage image = new BufferedCairoImage(buffer, tileSize.width, tileSize.height, CairoImage.FORMAT_ARGB32);
return image;
}