Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc updates #124

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Misc updates #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
80d7eae
Bump minimum CMake verison to 3.25.
perezmeyer Sep 11, 2023
d5eb71a
Replace depreceated endl with Qt::endl.
perezmeyer Sep 11, 2023
df15174
Replace deprecated calls on QByteArray::append(const QString &str)
perezmeyer Sep 11, 2023
6908d3c
Solve possible dangling reference warning by using auto.
perezmeyer Sep 11, 2023
b73a0ad
Add extra formats supported in Qt >= 5.14.
perezmeyer Sep 11, 2023
bf5e1dc
Fix typo when adding Qt::endl.
perezmeyer Sep 11, 2023
c284266
Replace deprecated QString:: namespace for Qt::.
perezmeyer Sep 11, 2023
deabdfa
Resolve possible dangling reference by using auto.
perezmeyer Sep 11, 2023
9a7059b
Issue a warning instead of crashing.
perezmeyer Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# END_COMMON_COPYRIGHT_HEADER


cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.25.0)
cmake_policy(SET CMP0028 NEW)

project(boomaga)
Expand Down
2 changes: 1 addition & 1 deletion src/boomaga/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# END_COMMON_COPYRIGHT_HEADER


cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.25.0)
cmake_policy(SET CMP0028 NEW)
if (POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
Expand Down
6 changes: 3 additions & 3 deletions src/boomaga/kernel/pdfprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void PdfProcessor::run(PDF::Writer *writer, quint32 objNumOffset)
************************************************/
void fillPageInfo(PdfPageInfo *pageInfo, const PDF::Dict &pageDict, const PDF::Dict &inherited)
{
const PDF::Array &mediaBox = pageDict.value("MediaBox", inherited.value("MediaBox")).asArray();
const auto mediaBox = pageDict.value("MediaBox", inherited.value("MediaBox")).asArray();
if (mediaBox.count() != 4)
throw QString("Incorrect MediaBox rectangle");

Expand All @@ -107,7 +107,7 @@ void fillPageInfo(PdfPageInfo *pageInfo, const PDF::Dict &pageDict, const PDF::D
mediaBox.at(2).asNumber().value() - mediaBox.at(0).asNumber().value(),
mediaBox.at(3).asNumber().value() - mediaBox.at(1).asNumber().value());

const PDF::Array &cropBox = pageDict.value("CropBox", inherited.value("CropBox")).asArray();
const auto cropBox = pageDict.value("CropBox", inherited.value("CropBox")).asArray();
if (cropBox.isValid())
{
if (cropBox.count() != 4)
Expand Down Expand Up @@ -169,7 +169,7 @@ int PdfProcessor::walkPageTree(int pageNum, const PDF::Object &page, const PDF::
}
catch (const QString &err)
{
throw QString("Error on page %1 %2: %3").arg(page.objNum()).arg(page.genNum()).arg(err);
qWarning() << QString("Error on page %1 %2: %3").arg(page.objNum()).arg(page.genNum()).arg(err);
}

pageInfo.xObjNums << writePageAsXObject(page, inherited);
Expand Down
28 changes: 17 additions & 11 deletions src/boomaga/kernel/project.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ QByteArray MetaData::asPDFDict() const
************************************************/
void MetaData::addDictItem(QByteArray &out, const QString &key, const QString &value) const
{
out.append("/" + key + " <FEFF");
out.append(QString("/").toLatin1() + key.toLatin1() + QString(" <FEFF").toLatin1());
const ushort* utf16 = value.utf16();
for (int i=0; utf16[i]>0; ++i)
{
Expand All @@ -1023,7 +1023,8 @@ void MetaData::addDictItem(QByteArray &out, const QString &key, const QString &v
qint8 b1 = (utf16[i] & 0xFF00) >> 8;
qint8 b2 = (utf16[i] & 0x00FF);
#endif
out.append(QString("%1%2").arg(b1, 2, 16, QChar('0')).arg(b2, 2, 16, QChar('0')));
auto string = QString("%1%2").arg(b1, 2, 16, QChar('0')).arg(b2, 2, 16, QChar('0'));
out.append(string.toLatin1());
}
out.append(">\n");
}
Expand All @@ -1038,18 +1039,23 @@ void MetaData::addDictItem(QByteArray &out, const QString &key, const QDateTime
utc.setTimeSpec(Qt::LocalTime);
int offset = utc.secsTo(value) / 60;

out.append("/" + key + " (");
out.append(value.toString("yyyyMMddhhmmss"));
out.append(QString("/").toLatin1() + key.toLatin1() + QString(" (").toLatin1());
out.append(value.toString("yyyyMMddhhmmss").toLatin1());

if (offset > 0)
out.append(QString("+%1'%2'")
.arg(offset / 60, 2, 10, QChar('0'))
.arg(offset % 60, 2, 10, QChar('0')));
{
auto string = QString("+%1'%2'")
.arg(offset / 60, 2, 10, QChar('0'))
.arg(offset % 60, 2, 10, QChar('0'));
out.append(string.toLatin1());
}
else if (offset < 0)
out.append(QString("-%1'%2'")
.arg(-offset / 60, 2, 10, QChar('0'))
.arg(-offset % 60, 2, 10, QChar('0')));

{
auto string = QString("-%1'%2'")
.arg(-offset / 60, 2, 10, QChar('0'))
.arg(-offset % 60, 2, 10, QChar('0'));
out.append(string.toLatin1());
}
out.append(")\n");
}

Expand Down
28 changes: 14 additions & 14 deletions src/boomaga/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ struct Args
void printHelp()
{
QTextStream out(stdout);
out << "Usage: boomaga [options] [files...]" << endl;
out << endl;
out << "Usage: boomaga [options] [files...]" << Qt::endl;
out <<Qt::endl;

out << "Boomaga provides a virtual printer for CUPS. This can be used" << endl;
out << "for print preview or for print booklets." << endl;
out << endl;
out << "Boomaga provides a virtual printer for CUPS. This can be used" <<Qt::endl;
out << "for print preview or for print booklets." <<Qt::endl;
out <<Qt::endl;

out << "Options:" << endl;
out << " -h, --help Show help about options" << endl;
out << " -V, --version Print program version" << endl;
out << endl;
out << "Options:" <<Qt::endl;
out << " -h, --help Show help about options" <<Qt::endl;
out << " -V, --version Print program version" <<Qt::endl;
out <<Qt::endl;

out << "Arguments:" << endl;
out << " files One or more PDF files" << endl;
out << "Arguments:" <<Qt::endl;
out << " files One or more PDF files" <<Qt::endl;


}
Expand All @@ -90,7 +90,7 @@ void printHelp()
void printVersion()
{
QTextStream out(stdout);
out << "boomaga " << FULL_VERSION << endl;
out << "boomaga " << FULL_VERSION <<Qt::endl;
}


Expand All @@ -100,8 +100,8 @@ void printVersion()
int printError(const QString &msg)
{
QTextStream out(stdout);
out << msg << endl << endl;
out << "Use --help to get a list of available command line options." << endl;
out << msg << Qt::endl;
out << "Use --help to get a list of available command line options." << Qt::endl;
return 1;
}

Expand Down
6 changes: 3 additions & 3 deletions src/boomaga/pdfparser/pdfreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ XRefStreamData::XRefStreamData(const char *buf, const quint64 size, const Dict &
Q_UNUSED(mSize)
// W - An array of integers representing the size of the fields in a
// single cross-reference entry.
const Array &w = dict.value("W").asArray();
const auto w = dict.value("W").asArray();
if (!w.isValid())
throw ReaderError("Incorrect XRef stream dictionary", 0);

Expand Down Expand Up @@ -1115,7 +1115,7 @@ void Reader::readObjectFromStream(ObjNum objNum, Object *res, ObjNum streamObjNu
}
else
{
const Link &extends = streamObj.dict().value("Extends").asLink();
const auto extends = streamObj.dict().value("Extends").asLink();
if (extends.isValid())
{
readObjectFromStream(objNum, res, extends.objNum(), extends.genNum(), 0);
Expand Down Expand Up @@ -1260,7 +1260,7 @@ Object Reader::getObject(const XRefEntry &xrefEntry) const
************************************************/
const Value Reader::find(const QString &path) const
{
QStringList objects = path.split('/', QString::SkipEmptyParts);
QStringList objects = path.split('/', Qt::SkipEmptyParts);
if (objects.first() == "Trailer")
objects.removeFirst();
QString val = objects.takeLast();
Expand Down
2 changes: 2 additions & 0 deletions src/boomaga/render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ QImage doRenderSheet(poppler::document *doc, int sheetNum, double resolution)
case poppler::image::format_mono: format = QImage::Format_Mono; break;
case poppler::image::format_rgb24: format = QImage::Format_RGB32; break;
case poppler::image::format_argb32: format = QImage::Format_ARGB32; break;
case poppler::image::format_gray8: format = QImage::Format_Grayscale8; break;
case poppler::image::format_bgr24: format = QImage::Format_BGR888; break;
}


Expand Down