From d56eb4f2990f4fe9254e5e01e3eaab821016ff6a Mon Sep 17 00:00:00 2001 From: Charles Otto Date: Mon, 2 Feb 2015 00:11:33 -0500 Subject: [PATCH] bump block size to 100MB, remove commented out qDebugs --- openbr/core/qtutils.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/openbr/core/qtutils.cpp b/openbr/core/qtutils.cpp index 9c5bfcc..fdfd004 100644 --- a/openbr/core/qtutils.cpp +++ b/openbr/core/qtutils.cpp @@ -502,18 +502,18 @@ QString getAbsolutePath(const QString &filename) BlockCompression::BlockCompression(QIODevice *_basis) { - blockSize = 1000000; + blockSize = 100000000; setBasis(_basis); } -BlockCompression::BlockCompression() { blockSize = 1000000; }; +BlockCompression::BlockCompression() { blockSize = 100000000; }; bool BlockCompression::open(QIODevice::OpenMode mode) { this->setOpenMode(mode); bool res = basis->open(mode); -// qDebug() << "basis: " << basis->isReadable() << " write:" << basis->isWritable(); + if (!res) return false; @@ -525,13 +525,10 @@ bool BlockCompression::open(QIODevice::OpenMode mode) precompressedBlockWriter->open(QIODevice::ReadWrite); } else if (mode & QIODevice::ReadOnly) { -// qDebug() << "BLock reader status:" << blockReader.status(); QByteArray compressedBlock; blockReader >> compressedBlock; -// qDebug() <<" Post read attempt, " << blockReader.status(); decompressedBlock = qUncompress(compressedBlock); -// qDebug() << "Read compressed block: " << compressedBlock.size() << "Expanded to:" << decompressedBlock.size(); decompressedBlockReader.setBuffer(&decompressedBlock); decompressedBlockReader.open(QIODevice::ReadOnly); } @@ -560,19 +557,15 @@ void BlockCompression::setBasis(QIODevice *_basis) // block from basis qint64 BlockCompression::readData(char *data, qint64 remaining) { -// qDebug() <<" Reading: " << remaining; qint64 read = 0; while (remaining > 0) { qint64 single_read = decompressedBlockReader.read(data, remaining); if (single_read == -1) qFatal("miss read"); -// single_read = 0; - remaining -= single_read; read += single_read; data += single_read; -// qDebug() << "Read " << single_read << " reamining: "<< remaining; // need a new block if (remaining > 0) { -- libgit2 0.21.4