Kaydet (Commit) c5777b4e authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

android lok: fix paintTile JNI method

Change-Id: Ife12b8bc49d722ae614b7de253bb2061bea5bb7f
üst 263039f3
...@@ -42,7 +42,7 @@ public class Document { ...@@ -42,7 +42,7 @@ public class Document {
setPartNative(handle, part); setPartNative(handle, part);
} }
void paintTile(ByteBuffer buffer, int canvasWidth, int canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int tileHeight) { public void paintTile(ByteBuffer buffer, int canvasWidth, int canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int tileHeight) {
paintTileNative(handle, buffer, canvasWidth, canvasHeight, tilePositionX, tilePositionY, tileWidth, tileHeight); paintTileNative(handle, buffer, canvasWidth, canvasHeight, tilePositionX, tilePositionY, tileWidth, tileHeight);
} }
......
...@@ -64,7 +64,6 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Office_document ...@@ -64,7 +64,6 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Office_document
pEnv->ReleaseStringUTFChars(documentPath, aCharDocumentPath); pEnv->ReleaseStringUTFChars(documentPath, aCharDocumentPath);
LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject); LibreOfficeKit* pLibreOfficeKit = getHandle<LibreOfficeKit>(pEnv, aObject);
LOGI("D( %s ): %d", aCloneDocumentPath, (int) pLibreOfficeKit);
LibreOfficeKitDocument* pDocument = pLibreOfficeKit->pClass->documentLoad(pLibreOfficeKit, aCloneDocumentPath); LibreOfficeKitDocument* pDocument = pLibreOfficeKit->pClass->documentLoad(pLibreOfficeKit, aCloneDocumentPath);
return (jlong) (intptr_t) pDocument; return (jlong) (intptr_t) pDocument;
...@@ -93,12 +92,17 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_org_libreoffice_kit_Document_getDocu ...@@ -93,12 +92,17 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_org_libreoffice_kit_Document_getDocu
} }
extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_paintTileNative extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_paintTileNative
(JNIEnv* pEnv, jobject aObject, jobject /*aByteBuffer*/, (JNIEnv* pEnv, jobject aObject, jobject aByteBuffer,
jint nCanvasWidth, jint nCanvasHeight, jint nTilePosX, jint nTilePosY, jint nCanvasWidth, jint nCanvasHeight, jint nTilePosX, jint nTilePosY,
jint nTileWidth, jint nTileHeight) jint nTileWidth, jint nTileHeight)
{ {
LibreOfficeKitDocument* pDocument = getHandle<LibreOfficeKitDocument>(pEnv, aObject); LibreOfficeKitDocument* pDocument = getHandle<LibreOfficeKitDocument>(pEnv, aObject);
return pDocument->pClass->paintTile(pDocument, NULL, nCanvasWidth, nCanvasHeight, NULL, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
unsigned char* buffer = (unsigned char*) pEnv->GetDirectBufferAddress(aByteBuffer);
jlong capacity = pEnv->GetDirectBufferCapacity(aByteBuffer);
int nStride = 0;
pDocument->pClass->paintTile(pDocument, buffer, nCanvasWidth, nCanvasHeight, &nStride, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
(void) nStride;
} }
extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Document_getDocumentHeightNative extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Document_getDocumentHeightNative
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment