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

Remove unneccessary function argument

Browse source
This commit is contained in:
Anton Thomasson 2022-08-13 12:10:40 +02:00
parent 9287da53aa
commit 8712ee6eea
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ippprinter.cpp
View file

@ -419,16 +419,16 @@ QString targetFormatIfAuto(QString documentFormat, QString mimeType, QJsonArray
return documentFormat;
}
void IppPrinter::adjustRasterSettings(QString filename, QString mimeType, QString documentFormat, QJsonObject& jobAttrs, PrintParameters& Params)
void IppPrinter::adjustRasterSettings(QString filename, QString mimeType, QJsonObject& jobAttrs, PrintParameters& Params)
{
if(documentFormat != Mimer::PWG && documentFormat != Mimer::URF)
if(Params.format != PrintParameters::PWG && Params.format != PrintParameters::URF)
{
return;
}
jobAttrs.remove("printer-resolution");
if(documentFormat == Mimer::PWG)
if(Params.format == PrintParameters::PWG)
{
quint32 diff = std::numeric_limits<quint32>::max();
quint32 AdjustedHwResX = Params.hwResW;
@ -451,8 +451,8 @@ void IppPrinter::adjustRasterSettings(QString filename, QString mimeType, QStrin
Params.hwResW = AdjustedHwResX;
Params.hwResH = AdjustedHwResY;
}
else if(documentFormat == Mimer::URF)
{ // Ensure symmetric resolution for URF
else if(Params.format == PrintParameters::URF)
{ // Ensure Params.format resolution for URF
Params.hwResW = Params.hwResH = std::min(Params.hwResW, Params.hwResH);
quint32 diff = std::numeric_limits<quint32>::max();
@ -485,7 +485,7 @@ void IppPrinter::adjustRasterSettings(QString filename, QString mimeType, QStrin
if(Sides != "" && Sides != "one-sided")
{
if(documentFormat == Mimer::PWG)
if(Params.format == PrintParameters::PWG)
{
QString DocumentSheetBack = _attrs["pwg-raster-document-sheet-back"].toObject()["value"].toString();
if(Sides=="two-sided-long-edge")
@ -513,7 +513,7 @@ void IppPrinter::adjustRasterSettings(QString filename, QString mimeType, QStrin
}
}
}
else if(documentFormat == Mimer::URF)
else if(Params.format == PrintParameters::URF)
{
QJsonArray URfSupported = _attrs["urf-supported"].toObject()["value"].toArray();
if(Sides=="two-sided-long-edge")
@ -738,7 +738,7 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
}
}
adjustRasterSettings(filename, mimeType, targetFormat, jobAttrs, Params);
adjustRasterSettings(filename, mimeType, jobAttrs, Params);
QString Sides = getAttrOrDefault(jobAttrs, "sides").toString();

2
src/ippprinter.h
View file

@ -107,7 +107,7 @@ private:
QJsonObject opAttrs();
void adjustRasterSettings(QString filename, QString mimeType, QString documentFormat, QJsonObject& jobAttrs, PrintParameters& Params);
void adjustRasterSettings(QString filename, QString mimeType, QJsonObject& jobAttrs, PrintParameters& Params);
void setBusyMessage(QString msg);
void setProgress(qint64 sent, qint64 total);