From 10315f15d452adf0051679692cfcffe395588798 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 11 Aug 2014 15:15:33 -0700 Subject: [PATCH] Simplify image loading. --- libraries/metavoxels/src/AttributeRegistry.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/metavoxels/src/AttributeRegistry.cpp b/libraries/metavoxels/src/AttributeRegistry.cpp index 2943ac152b..7e70d7b315 100644 --- a/libraries/metavoxels/src/AttributeRegistry.cpp +++ b/libraries/metavoxels/src/AttributeRegistry.cpp @@ -505,11 +505,7 @@ HeightfieldData::HeightfieldData(Bitstream& in, int bytes, const HeightfieldData reference->_encodedDelta = in.readAligned(bytes); reference->_deltaData = this; _contents = reference->_contents; - - QBuffer buffer(&reference->_encodedDelta); - buffer.open(QIODevice::ReadOnly); - QImage image; - image.load(&buffer, "PNG"); + QImage image = QImage::fromData(reference->_encodedDelta); QPoint offset = image.offset(); image = image.convertToFormat(QImage::Format_RGB888); if (offset.x() == 0) {