Commit d56eb4f2990f4fe9254e5e01e3eaab821016ff6a
1 parent
ad88ddc7
bump block size to 100MB, remove commented out qDebugs
Showing
1 changed file
with
3 additions
and
10 deletions
openbr/core/qtutils.cpp
| ... | ... | @@ -502,18 +502,18 @@ QString getAbsolutePath(const QString &filename) |
| 502 | 502 | |
| 503 | 503 | BlockCompression::BlockCompression(QIODevice *_basis) |
| 504 | 504 | { |
| 505 | - blockSize = 1000000; | |
| 505 | + blockSize = 100000000; | |
| 506 | 506 | setBasis(_basis); |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | -BlockCompression::BlockCompression() { blockSize = 1000000; }; | |
| 509 | +BlockCompression::BlockCompression() { blockSize = 100000000; }; | |
| 510 | 510 | |
| 511 | 511 | |
| 512 | 512 | bool BlockCompression::open(QIODevice::OpenMode mode) |
| 513 | 513 | { |
| 514 | 514 | this->setOpenMode(mode); |
| 515 | 515 | bool res = basis->open(mode); |
| 516 | -// qDebug() << "basis: " << basis->isReadable() << " write:" << basis->isWritable(); | |
| 516 | + | |
| 517 | 517 | if (!res) |
| 518 | 518 | return false; |
| 519 | 519 | |
| ... | ... | @@ -525,13 +525,10 @@ bool BlockCompression::open(QIODevice::OpenMode mode) |
| 525 | 525 | precompressedBlockWriter->open(QIODevice::ReadWrite); |
| 526 | 526 | } |
| 527 | 527 | else if (mode & QIODevice::ReadOnly) { |
| 528 | -// qDebug() << "BLock reader status:" << blockReader.status(); | |
| 529 | 528 | QByteArray compressedBlock; |
| 530 | 529 | blockReader >> compressedBlock; |
| 531 | -// qDebug() <<" Post read attempt, " << blockReader.status(); | |
| 532 | 530 | |
| 533 | 531 | decompressedBlock = qUncompress(compressedBlock); |
| 534 | -// qDebug() << "Read compressed block: " << compressedBlock.size() << "Expanded to:" << decompressedBlock.size(); | |
| 535 | 532 | decompressedBlockReader.setBuffer(&decompressedBlock); |
| 536 | 533 | decompressedBlockReader.open(QIODevice::ReadOnly); |
| 537 | 534 | } |
| ... | ... | @@ -560,19 +557,15 @@ void BlockCompression::setBasis(QIODevice *_basis) |
| 560 | 557 | // block from basis |
| 561 | 558 | qint64 BlockCompression::readData(char *data, qint64 remaining) |
| 562 | 559 | { |
| 563 | -// qDebug() <<" Reading: " << remaining; | |
| 564 | 560 | qint64 read = 0; |
| 565 | 561 | while (remaining > 0) { |
| 566 | 562 | qint64 single_read = decompressedBlockReader.read(data, remaining); |
| 567 | 563 | if (single_read == -1) |
| 568 | 564 | qFatal("miss read"); |
| 569 | -// single_read = 0; | |
| 570 | - | |
| 571 | 565 | |
| 572 | 566 | remaining -= single_read; |
| 573 | 567 | read += single_read; |
| 574 | 568 | data += single_read; |
| 575 | -// qDebug() << "Read " << single_read << " reamining: "<< remaining; | |
| 576 | 569 | |
| 577 | 570 | // need a new block |
| 578 | 571 | if (remaining > 0) { | ... | ... |