diff --git a/sdk/core/core.cpp b/sdk/core/core.cpp index 72721bf..949667d 100644 --- a/sdk/core/core.cpp +++ b/sdk/core/core.cpp @@ -80,14 +80,14 @@ struct AlgorithmCore out << Globals->classes; // Compress and save to file - QtUtils::writeFile(model, data); + QtUtils::writeFile(model, data, -1); } void load(const QString &model) { // Load from file and decompress QByteArray data; - QtUtils::readFile(model, data); + QtUtils::readFile(model, data, true); // Create stream QDataStream in(&data, QFile::ReadOnly); diff --git a/sdk/core/qtutils.cpp b/sdk/core/qtutils.cpp index 61a8d08..f546ea3 100644 --- a/sdk/core/qtutils.cpp +++ b/sdk/core/qtutils.cpp @@ -81,11 +81,12 @@ void QtUtils::readFile(const QString &file, QStringList &lines) f.close(); } -void QtUtils::readFile(const QString &file, QByteArray &data) +void QtUtils::readFile(const QString &file, QByteArray &data, bool uncompress) { QFile f(file); if (!f.open(QFile::ReadOnly)) qFatal("QtUtils::readFile unable to open %s for reading.", qPrintable(file)); - data = qUncompress(f.readAll()); + data = f.readAll(); + if (uncompress) data = qUncompress(data); f.close(); } diff --git a/sdk/core/qtutils.h b/sdk/core/qtutils.h index 332d9cc..807ef43 100644 --- a/sdk/core/qtutils.h +++ b/sdk/core/qtutils.h @@ -34,10 +34,10 @@ namespace QtUtils QStringList getFiles(const QString ®exp); QStringList readLines(const QString &file); void readFile(const QString &file, QStringList &lines); - void readFile(const QString &file, QByteArray &data); + void readFile(const QString &file, QByteArray &data, bool uncompress = false); void writeFile(const QString &file, const QStringList &lines); void writeFile(const QString &file, const QString &data); - void writeFile(const QString &file, const QByteArray &data, int compression = -1); + void writeFile(const QString &file, const QByteArray &data, int compression = 0); /**** Directory Utilities ****/ void touchDir(const QDir &dir); diff --git a/sdk/plugins/meta.cpp b/sdk/plugins/meta.cpp index b3b92d4..d425f0c 100644 --- a/sdk/plugins/meta.cpp +++ b/sdk/plugins/meta.cpp @@ -394,7 +394,7 @@ private: QDataStream stream(&byteArray, QFile::WriteOnly); stream << description; transform->store(stream); - QtUtils::writeFile(baseName, byteArray); + QtUtils::writeFile(baseName, byteArray, -1); } void project(const Template &src, Template &dst) const @@ -421,7 +421,7 @@ private: qDebug("Loading %s", qPrintable(baseName)); QByteArray data; - QtUtils::readFile(file, data); + QtUtils::readFile(file, data, true); QDataStream stream(&data, QFile::ReadOnly); stream >> description; transform = Transform::make(description); diff --git a/share/openbr/doc b/share/openbr/doc index bcb22c7..504960d 160000 --- a/share/openbr/doc +++ b/share/openbr/doc @@ -1 +1 @@ -Subproject commit bcb22c79894d34b35891d4122e92e933380ec8ba +Subproject commit 504960df12db25e09c39ab098fb8614c1db51617