Fix plaintext

This commit is contained in:
Anton Thomasson 2022-06-10 19:40:51 +02:00
parent c30e7d3548
commit 813e1edb6a

View file

@ -721,6 +721,10 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
{ // Can't process Postscript { // Can't process Postscript
emit doJustUpload(filename, contents); emit doJustUpload(filename, contents);
} }
else if((mimeType == targetFormat) && (targetFormat == Mimer::Plaintext))
{
emit doFixupPlaintext(filename, contents);
}
else if((mimeType != Mimer::SVG) && mimer->isImage(mimeType) && mimer->isImage(targetFormat)) else if((mimeType != Mimer::SVG) && mimer->isImage(mimeType) && mimer->isImage(targetFormat))
{ // Just make sure the image is in the desired format (and jpeg baseline-encoded), don't resize locally { // Just make sure the image is in the desired format (and jpeg baseline-encoded), don't resize locally
emit doPrintImageAsImage(filename, contents, targetFormat); emit doPrintImageAsImage(filename, contents, targetFormat);
@ -744,16 +748,9 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
emit doConvertPdf(filename, contents, Params); emit doConvertPdf(filename, contents, Params);
} }
else if(mimeType == Mimer::Plaintext) else if(mimeType == Mimer::Plaintext)
{
if(targetFormat == Mimer::Plaintext)
{
emit doFixupPlaintext(filename, contents);
}
else
{ {
emit doConvertPlaintext(filename, contents, Params); emit doConvertPlaintext(filename, contents, Params);
} }
}
else if (Mimer::isImage(mimeType)) else if (Mimer::isImage(mimeType))
{ {
emit doConvertImage(filename, contents, Params, margins); emit doConvertImage(filename, contents, Params, margins);