medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make alwaysConvert do something again

Browse source
This commit is contained in:
Anton Thomasson 2020-06-05 21:01:59 +02:00
parent 5814a8c6a2
commit b7b587d099
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ippprinter.cpp
View file

@ -276,9 +276,13 @@ QString firstMatch(QJsonArray supported, QStringList wanted)
return ""; return "";
} }
QString targetFormatIfAuto(QString documentFormat, QString mimeType, QJsonArray supportedMimeTypes) QString targetFormatIfAuto(QString documentFormat, QString mimeType, QJsonArray supportedMimeTypes, bool forceRaster)
{ {
if(documentFormat == "application/octet-stream") if(forceRaster)
{
return firstMatch(supportedMimeTypes, {"image/pwg-raster", "image/urf"});
}
else if(documentFormat == "application/octet-stream")
{ {
if(mimeType == "application/pdf") if(mimeType == "application/pdf")
{ {
@ -329,9 +333,9 @@ void IppPrinter::print(QJsonObject attrs, QString filename, bool alwaysConvert)
QJsonArray jobCreationAttributes = _attrs["job-creation-attributes-supported"].toObject()["value"].toArray(); QJsonArray jobCreationAttributes = _attrs["job-creation-attributes-supported"].toObject()["value"].toArray();
QString documentFormat = getAttrOrDefault(attrs, "document-format").toString(); QString documentFormat = getAttrOrDefault(attrs, "document-format").toString();
qDebug() << "target format:" << documentFormat; qDebug() << "target format:" << documentFormat << "alwaysConvert:" << alwaysConvert;
documentFormat = targetFormatIfAuto(documentFormat, mimeType, supportedMimeTypes); documentFormat = targetFormatIfAuto(documentFormat, mimeType, supportedMimeTypes, alwaysConvert);
qDebug() << "adjusted target format:" << documentFormat; qDebug() << "adjusted target format:" << documentFormat;
if(documentFormat == "" || documentFormat == "application/octet-string") if(documentFormat == "" || documentFormat == "application/octet-string")