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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Sun Jul 12 10:39:35 UTC 2020


 common/RenderTiles.hpp |   10 ----------
 kit/Kit.cpp            |    1 -
 2 files changed, 11 deletions(-)

New commits:
commit 619cf1b304e19ed3a38bf466797f590f32b07310
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sun Jul 12 13:13:30 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Sun Jul 12 12:39:16 2020 +0200

    Bin DeltaGenerator-using code that has been commented out since 2017
    
    "Disable for now - pushed in error" says the comment added in
    e11794da2551639e52d9f94867f6f35bae40a6c4.
    
    Change-Id: Ia2b72bfe20f8ff16d74d1966d511c74eab3e4417
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98587
    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 4c5ede5cd..bcde5afee 100644
--- a/common/RenderTiles.hpp
+++ b/common/RenderTiles.hpp
@@ -74,7 +74,6 @@ private:
     size_t _cacheHits;
     size_t _cacheTests;
     TileWireId _nextId;
-    DeltaGenerator _deltaGen;
 
     std::unordered_map< TileBinaryHash, CacheEntry > _cache;
     // This uses little storage so can be much larger
@@ -505,15 +504,6 @@ namespace RenderTiles
                         PngCache::CacheData data(new std::vector< char >() );
                         data->reserve(pixmapWidth * pixmapHeight * 1);
 
-                        /*
-                         * Disable for now - pushed in error.
-                         *
-                         if (_deltaGen.createDelta(pixmap, startX, startY, width, height,
-                                                   bufferWidth, bufferHeight,
-                                                   output, wid, oldWid))
-                         else ...
-                        */
-
                         LOG_DBG("Encode a new png for tile #" << tileIndex);
                         if (!Png::encodeSubBufferToPNG(pixmap.data(), offsetX, offsetY, pixelWidth, pixelHeight,
                                                        pixmapWidth, pixmapHeight, *data, mode))
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 012494676..810118c22 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -65,7 +65,6 @@
 #include <Unit.hpp>
 #include <UserMessages.hpp>
 #include <Util.hpp>
-#include "Delta.hpp"
 #include "Watermark.hpp"
 #include "RenderTiles.hpp"
 #include "SetupKitEnvironment.hpp"


More information about the Libreoffice-commits mailing list