From d394c891c59acedc1271d44cf9a214fbd1ca17d0 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Thu, 22 Feb 2018 10:10:54 -0800 Subject: [PATCH] allow Octreee to load compressed gz files --- libraries/octree/src/Octree.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index c63ff2f560..56969f8389 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -1685,6 +1685,15 @@ bool Octree::readFromURL(const QString& urlString) { } auto data = request->getData(); + + QByteArray uncompressedJsonData; + bool wasCompressed = gunzip(data, uncompressedJsonData); + + if (wasCompressed) { + QDataStream inputStream(uncompressedJsonData); + return readFromStream(uncompressedJsonData.size(), inputStream, marketplaceID); + } + QDataStream inputStream(data); return readFromStream(data.size(), inputStream, marketplaceID); }