[Libreoffice-commits] online.git: common/RenderTiles.hpp

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 15 12:32:34 UTC 2020


 common/RenderTiles.hpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d5d74d39f90489593172dca55ed7a29fe5b6a244
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jul 15 11:52:15 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jul 15 14:32:16 2020 +0200

    Avoid a few unused variables and functions in the iOS case
    
    Change-Id: I11f9186dc9502ad99eee303a46b22ece72230666
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98803
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/common/RenderTiles.hpp b/common/RenderTiles.hpp
index 1385665a7..011503f12 100644
--- a/common/RenderTiles.hpp
+++ b/common/RenderTiles.hpp
@@ -354,6 +354,7 @@ namespace RenderTiles
         unsigned char *data() { return _data; }
     };
 
+#ifndef IOS
     static void pushRendered(std::vector<TileDesc> &renderedTiles,
                              const TileDesc &desc, TileWireId wireId, size_t imgSize)
     {
@@ -361,6 +362,7 @@ namespace RenderTiles
         renderedTiles.back().setWireId(wireId);
         renderedTiles.back().setImgSize(imgSize);
     }
+#endif
 
 #ifdef IOS
 
@@ -516,8 +518,6 @@ namespace RenderTiles
 
         RenderTiles::Buffer pixmap(pixmapWidth, pixmapHeight);
 
-        const size_t pixmapSize = 4 * pixmapWidth * pixmapHeight;
-
         // Render the whole area
         const double area = pixmapWidth * pixmapHeight;
         auto start = std::chrono::system_clock::now();
@@ -602,6 +602,7 @@ namespace RenderTiles
 
         const auto mode = static_cast<LibreOfficeKitTileMode>(document->getTileMode());
 
+        const size_t pixmapSize = 4 * pixmapWidth * pixmapHeight;
         std::vector<char> output;
         output.reserve(pixmapSize);
 


More information about the Libreoffice-commits mailing list