Merge pull request #21 from druiz17/serverless-domains

allow Octree to load compressed gz files
This commit is contained in:
Seth Alves 2018-02-22 10:14:44 -08:00 committed by GitHub
commit 7974857cea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);
}