diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-07-12 13:13:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-07-12 12:39:16 +0200 |
| commit | 619cf1b304e19ed3a38bf466797f590f32b07310 (patch) | |
| tree | 65c68c64b483c98e01502a9d8ec2a5cc4bcc967a | |
| parent | cypress: disable this unstable test. (diff) | |
| download | online-619cf1b304e19ed3a38bf466797f590f32b07310.tar.gz online-619cf1b304e19ed3a38bf466797f590f32b07310.zip | |
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@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | common/RenderTiles.hpp | 10 | ||||
| -rw-r--r-- | kit/Kit.cpp | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/common/RenderTiles.hpp b/common/RenderTiles.hpp index 4c5ede5cd8..bcde5afeeb 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 0124946763..810118c222 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" |