Drop paintTile's row stride output parameter that nobody is interested in

Change-Id: I166b4b713c2ea52c62c52045bb2073b6d84c1547

3 files changed, 3 insertions, 19 deletions

diff --git a/libreofficekit/qa/lokdocview_quad/lokdocview_quad.c b/libreofficekit/qa/lokdocview_quad/lokdocview_quad.c
index c920f1ff2312..9024006475a4 100644
--- a/libreofficekit/qa/lokdocview_quad/lokdocview_quad.c
+++ b/libreofficekit/qa/lokdocview_quad/lokdocview_quad.c
@@ -109,7 +109,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
 {
     long nWidth, nHeight;
     int nRenderWidth, nRenderHeight;
-    int nRowStride;
     int x, y;
     GdkPixbuf* pTempBuf;
 
@@ -145,7 +144,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
     pDocView->pDocument->pClass->paintTile( pDocView->pDocument,
                                             gdk_pixbuf_get_pixels( pDocView->pPixBuf[0][0] ),
                                             nRenderWidth / 2, nRenderHeight / 2,
-                                            &nRowStride,
                                             0, 0, // origin
                                             nWidth / 2, nHeight / 2 );
 
@@ -155,7 +153,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
     pDocView->pDocument->pClass->paintTile( pDocView->pDocument,
                                             gdk_pixbuf_get_pixels( pDocView->pPixBuf[1][0] ),
                                             nRenderWidth, nRenderHeight,
-                                            &nRowStride,
                                             nWidth / 2, 0,
                                             nWidth / 2, nHeight / 2 );
     pTempBuf = gdk_pixbuf_scale_simple( GDK_PIXBUF( pDocView->pPixBuf[1][0] ),
@@ -172,7 +169,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
     pDocView->pDocument->pClass->paintTile( pDocView->pDocument,
                                             gdk_pixbuf_get_pixels( pDocView->pPixBuf[0][1] ),
                                             nRenderWidth / 4, nRenderHeight / 4,
-                                            &nRowStride,
                                             0, nHeight / 2,
                                             nWidth / 2, nHeight / 2 );
     pTempBuf = gdk_pixbuf_scale_simple( GDK_PIXBUF( pDocView->pPixBuf[0][1] ),
@@ -188,7 +184,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
     pDocView->pDocument->pClass->paintTile( pDocView->pDocument,
                                             gdk_pixbuf_get_pixels( pDocView->pPixBuf[1][1] ),
                                             nRenderWidth / 8, nRenderHeight / 8,
-                                            &nRowStride,
                                             nWidth / 2, nHeight / 2,
                                             nWidth / 2, nHeight / 2 );
     pTempBuf = gdk_pixbuf_scale_simple( GDK_PIXBUF( pDocView->pPixBuf[1][1] ),
@@ -200,11 +195,6 @@ void renderDocument( LOKDocViewQuad* pDocView )
 
 
 
-    // TODO: double check that the rowstride really matches what we expected,
-    // although presumably we'd already be crashing by now if things were
-    // wrong.
-    (void) nRowStride;
-
     //    gtk_image_set_from_pixbuf( GTK_IMAGE( pDocView->pCanvas ), pDocView->pPixBuf );
     for ( x = 0; x < 2; x++ )
     {
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx
index 013f8667ac7d..e72c730a6dfe 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -98,8 +98,7 @@ int main( int argc, char* argv[] )
 
             { // whole document
                 aTimes.push_back(TimeRecord("render whole document"));
-                int nRowStride = 256;
-                pDocument->paintTile(pPixels, 256, 256, &nRowStride,
+                pDocument->paintTile(pPixels, 256, 256,
                                      0, 0, nWidth, nHeight); // not square
                 aTimes.push_back(TimeRecord());
             }
@@ -112,10 +111,9 @@ int main( int argc, char* argv[] )
                 {
                     for (int nY = 0; nY < nHeight / nSplit; nY++)
                     {
-                        int nRowStride = 256;
                         int nTilePosX = nX * nSplit;
                         int nTilePosY = nY * nSplit;
-                        pDocument->paintTile(pPixels, 256, 256, &nRowStride,
+                        pDocument->paintTile(pPixels, 256, 256,
                                              nTilePosX, nTilePosY, 256, 256);
                         nTiles++;
                         fprintf (stderr, "   rendered tile %d at %d, %d\n",
@@ -133,10 +131,9 @@ int main( int argc, char* argv[] )
                 {
                     for (int nY = 0; nY < nHeight / nSplit; nY++)
                     {
-                        int nRowStride = 256;
                         int nTilePosX = nX * nSplit;
                         int nTilePosY = nY * nSplit;
-                        pDocument->paintTile(pPixels, 256, 256, &nRowStride,
+                        pDocument->paintTile(pPixels, 256, 256,
                                              nTilePosX, nTilePosY, nSplit, nSplit);
                         nTiles++;
                         fprintf (stderr, "   rendered tile %d at %d, %d\n",
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 668d6dec77d9..b2597d24c23e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -697,17 +697,14 @@ void renderDocument(LOKDocView* pDocView, GdkRectangle* pPartial)
                 GdkPixbuf* pPixBuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, aTileRectanglePixels.width, aTileRectanglePixels.height);
                 unsigned char* pBuffer = gdk_pixbuf_get_pixels(pPixBuf);
                 g_info("renderDocument: paintTile(%d, %d)", nRow, nColumn);
-                int nRowStride;
                 pDocView->pDocument->pClass->paintTile(pDocView->pDocument,
                                                        // Buffer and its size, depends on the position only.
                                                        pBuffer,
                                                        aTileRectanglePixels.width, aTileRectanglePixels.height,
-                                                       &nRowStride,
                                                        // Position of the tile.
                                                        aTileRectangleTwips.x, aTileRectangleTwips.y,
                                                        // Size of the tile, depends on the zoom factor and the tile position only.
                                                        aTileRectangleTwips.width, aTileRectangleTwips.height);
-                (void) nRowStride;
 
                 if (pDocView->pCanvas[nTile])
                     gtk_widget_destroy(GTK_WIDGET(pDocView->pCanvas[nTile]));