diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-20 13:12:08 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-20 13:14:44 +0200 |
| commit | 7edd92c5576cc358815eb21634b3c27a43990c20 (patch) | |
| tree | ff6b3fef1be2a5efe349003811a266d0520c89ac /desktop | |
| parent | 3925b8acf75aaea98894602542d907cfdf0b922d (diff) | |
Drop paintTile's row stride output parameter that nobody is interested in
Change-Id: I166b4b713c2ea52c62c52045bb2073b6d84c1547
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/lib/lokandroid.cxx | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c29223b73baf..d0ae29b15498 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -185,7 +185,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, int nPartMode); void doc_paintTile(LibreOfficeKitDocument* pThis, unsigned char* pBuffer, const int nCanvasWidth, const int nCanvasHeight, - int* pRowStride, const int nTilePosX, const int nTilePosY, const int nTileWidth, const int nTileHeight); static void doc_getDocumentSize(LibreOfficeKitDocument* pThis, @@ -585,7 +584,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, void doc_paintTile (LibreOfficeKitDocument* pThis, unsigned char* pBuffer, const int nCanvasWidth, const int nCanvasHeight, - int* pRowStride, const int nTilePosX, const int nTilePosY, const int nTileWidth, const int nTileHeight) { @@ -615,8 +613,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, pDoc->paintTile(aDevice, nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); - - *pRowStride = GetRowStrideForLibreOfficeKit(aDevice.getSalVirtualDevice()); #else SystemGraphicsData aData; aData.rCGContext = reinterpret_cast<CGContextRef>(pBuffer); @@ -625,8 +621,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, pDoc->paintTile(aDevice, nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); - - (void) pRowStride; #endif static bool bDebug = getenv("LOK_DEBUG") != 0; @@ -646,7 +640,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, (void) pBuffer; (void) nCanvasWidth; (void) nCanvasHeight; - (void) pRowStride; (void) nTilePosX; (void) nTilePosY; (void) nTileWidth; diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx index c23fd3f0cbd3..5f7eab4d2fb7 100644 --- a/desktop/source/lib/lokandroid.cxx +++ b/desktop/source/lib/lokandroid.cxx @@ -220,9 +220,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_paintTi LibreOfficeKitDocument* pDocument = getHandle<LibreOfficeKitDocument>(pEnv, aObject); unsigned char* buffer = (unsigned char*) pEnv->GetDirectBufferAddress(aByteBuffer); - int nStride = 0; - pDocument->pClass->paintTile(pDocument, buffer, nCanvasWidth, nCanvasHeight, &nStride, nTilePosX, nTilePosY, nTileWidth, nTileHeight); - (void) nStride; + pDocument->pClass->paintTile(pDocument, buffer, nCanvasWidth, nCanvasHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); } extern "C" SAL_JNI_EXPORT jlong JNICALL Java_org_libreoffice_kit_Document_getDocumentHeight |