Sync submodules

attah · May 7, 2023 · 1ac8220 · 1ac8220
1 parent c36a6ee
commit 1ac8220
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/harbour-seaprint.pro b/harbour-seaprint.pro
@@ -107,6 +107,7 @@ HEADERS += \
     ppm2pwg/UrfPgHdr.codable \
     ppm2pwg/bytestream/bytestream.h \
     ppm2pwg/bytestream/codable.h \
+    ppm2pwg/bytestream/array.h \
     ppm2pwg/argget.h \
     src/overrider.h \
     src/papersizes.h \

diff --git a/ppm2pwg b/ppm2pwg
diff --git a/src/convertchecker.cpp b/src/convertchecker.cpp
@@ -5,7 +5,7 @@
 #include <QProcess>
 #include <QtDebug>
 
-ConvertChecker::ConvertChecker() : poppler("libpoppler-glib.so.8")
+ConvertChecker::ConvertChecker() : libpoppler("libpoppler-glib.so.8")
 {
     _calligra = false;
 

diff --git a/src/convertchecker.h b/src/convertchecker.h
@@ -23,7 +23,7 @@ class ConvertChecker : public QObject
     ConvertChecker(const ConvertChecker &);
     ConvertChecker& operator=(const ConvertChecker &);
 
-    LibLoader poppler;
+    LibLoader libpoppler;
     bool _calligra;
 };
 

diff --git a/src/ippprinter.cpp b/src/ippprinter.cpp
@@ -752,7 +752,9 @@ void IppPrinter::print(QJsonObject jobAttrs, QString filename)
     Params.quality = getAttrOrDefault(jobAttrs, "print-quality").toInt();
 
     QString PrintColorMode = getAttrOrDefault(jobAttrs, "print-color-mode").toString();
-    Params.colors = PrintColorMode.contains("color") ? 3 : PrintColorMode.contains("monochrome") ? 1 : Params.colors;
+    Params.colorMode = PrintColorMode.contains("color") ? PrintParameters::sRGB24
+                     : PrintColorMode.contains("monochrome") ? PrintParameters::Gray8
+                     : Params.colorMode;
 
     QJsonArray supportedOperations = _attrs["operations-supported"].toObject()["value"].toArray();
 

diff --git a/src/printerworker.cpp b/src/printerworker.cpp
@@ -340,21 +340,21 @@ void PrinterWorker::convertPdf(QString filename, Bytestream header, PrintParamet
 
     OK(cr.write((char*)header.raw(), header.size()));
 
-    write_fun WriteFun([&cr](unsigned char const* buf, unsigned int len) -> bool
-              {
-                if(len == 0)
-                    return true;
-                return cr.write((const char*)buf, len);
-              });
-
-    progress_fun ProgressFun([this](size_t page, size_t total) -> void
-              {
-                emit progress(page, total);
-              });
+    WriteFun writeFun([&cr](unsigned char const* buf, unsigned int len) -> bool
+             {
+               if(len == 0)
+                   return true;
+               return cr.write((const char*)buf, len);
+             });
+
+    ProgressFun progressFun([this](size_t page, size_t total) -> void
+                {
+                  emit progress(page, total);
+                });
 
     bool verbose = QLoggingCategory::defaultCategory()->isDebugEnabled();
 
-    int res = pdf_to_printable(filename.toStdString(), WriteFun, Params, ProgressFun, verbose);
+    int res = pdf_to_printable(filename.toStdString(), writeFun, Params, progressFun, verbose);
 
     if(res != 0)
     {
@@ -484,17 +484,17 @@ void PrinterWorker::convertImage(QString filename, Bytestream header, PrintParam
 
         if(inImage.allGray())
         {
-            Params.colors = 1; // No need to waste space/bandwidth...
+            Params.colorMode = PrintParameters::Gray8; // No need to waste space/bandwidth...
         }
 
-        outImage.save(&buf, Params.colors==1 ? "pgm" : "ppm");
+        outImage.save(&buf, Params.getNumberOfColors() == 1 ? "pgm" : "ppm");
         buf.seek(0);
         // Skip header - TODO consider reimplementing
         buf.readLine(255);
         buf.readLine(255);
         buf.readLine(255);
 
-        Bytestream inBts(Params.getPaperSizeWInPixels() * Params.getPaperSizeHInPixels() * Params.colors);
+        Bytestream inBts(Params.getPaperSizeWInPixels() * Params.getPaperSizeHInPixels() * Params.getNumberOfColors());
 
         if((((size_t)buf.size())-buf.pos()) != inBts.size())
         {
+1 −0		.github/FUNDING.yml
+4 −1		README.md
+47 −40		argget.h
+31 −31		baselinify.cpp
+1 −1		baselinify.h
+10 −10		baselinify_main.cpp
+1 −1		bytestream
+1 −0		libfuncs
+6 −6		madness.h
+154 −147		pdf2printable.cpp
+4 −4		pdf2printable.h
+92 −54		pdf2printable_main.cpp
+25 −0		pointer.h
+98 −97		ppm2pwg.cpp
+7 −7		ppm2pwg.h
+42 −47		ppm2pwg_main.cpp
+56 −51		printparameters.cpp
+14 −6		printparameters.h
+22 −24		pwg2ppm.cpp
+3 −3		pwg2ppm.h
+22 −22		pwg2ppm_main.cpp
+94 −87		tests/test.cpp