dev: Change collage encoder to JPEG.

cosmin42 · Feb 11, 2025 · 55f0ca0 · 55f0ca0
1 parent bb36dda
commit 55f0ca0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/PB/src/CollageMakerJob.cpp b/PB/src/CollageMakerJob.cpp
@@ -51,15 +51,15 @@ void CollageMakerJob::mapJobs(Path templatePath, std::vector<Path> imagesPaths)
 
   auto resourcePath = mPlatformInfo->projectSupportFolder(mProject->first);
 
-  mResourcesProviderId = mResources->addResource(resourcePath);
+  mResourcesProviderId = mResources->addResource(resourcePath / "thumbnail-images");
 
   std::vector<Path> imagesNames;
   for (auto const &imagePath : imagesPaths) {
-    imagesNames.push_back(imagePath.filename());
+    imagesNames.push_back(imagePath);
   }
 
   std::string newImageName =
-      boost::uuids::to_string(boost::uuids::random_generator()()) + ".png";
+      boost::uuids::to_string(boost::uuids::random_generator()()) + ".jpeg";
 
   Path projectThumbnailsRoot =
       mPlatformInfo->projectSupportFolder(mProject->first);

diff --git a/PB/src/CollageService.cpp b/PB/src/CollageService.cpp
@@ -89,7 +89,7 @@ void CollageService::combineImages(unsigned                     templateIndex,
   auto templatePaths = mThumbnailsJob->getSourceTemplates();
   std::vector<Path> imagesPaths;
   for (const auto &image : images) {
-    imagesPaths.push_back(image->full());
+    imagesPaths.push_back(Path("thumbnail-images") / image->full());
   }
   mCollageMakerJob->mapJobs(templatePaths.at(templateIndex).path, imagesPaths);
   mCollageMakerStopSource =

diff --git a/PB/src/CollageThumbnailsMakerJob.cpp b/PB/src/CollageThumbnailsMakerJob.cpp
@@ -104,8 +104,8 @@ CollageThumbnailsMakerJob::getSourceTemplates() const
 
 void CollageThumbnailsMakerJob::createPlaceholdersFolder()
 {
-  bool success = std::filesystem::create_directories(
-      mPlatformInfo->collagesFolder(mProject->first));
+  auto collagesPath = mPlatformInfo->collagesFolder(mProject->first);
+  bool success = std::filesystem::create_directories(collagesPath);
   if (success) {
     spdlog::info("[CollageThumbnailsMakerJob] Created placeholders folder for "
                  "project: {}",
@@ -156,6 +156,8 @@ void CollageThumbnailsMakerJob::createTemplatesThumbnail(unsigned i)
   Path     outFilePath = mPlatformInfo->collagesFolder(mProject->first) /
                      (path.stem().string() + ".png");
   if (std::filesystem::exists(outFilePath)) {
+    auto collageTemplateInfo = parseTemplatePath(outFilePath);
+    mGeneratedLibraries.push_back(collageTemplateInfo);
     return;
   }
   SkFILEWStream outFile(outFilePath.string().c_str());

diff --git a/PB/src/DrawingService.cpp b/PB/src/DrawingService.cpp
@@ -9,7 +9,7 @@
 #include <include/core/SkCanvas.h>
 #include <include/core/SkImageInfo.h>
 #include <include/core/SkSurface.h>
-#include <include/encode/SkPngEncoder.h>
+#include <include/encode/SkJpegEncoder.h>
 #include <modules/skshaper/utils/FactoryHelpers.h>
 #include <modules/svg/include/SkSVGDOM.h>
 #pragma warning(pop)
@@ -69,12 +69,14 @@ void DrawingService::renderToStream(PBDev::SkiaResourcesId resourceId,
 
   image->peekPixels(&pixmap);
 
-  SkPngEncoder::Options options;
+  SkJpegEncoder::Options options;
+
+  auto success = SkJpegEncoder::Encode(&outputStream, pixmap, options);
+  PBDev::basicAssert(success);
 
-  SkPngEncoder::Encode(&outputStream, pixmap, options);
   outputStream.flush();
 }
 
 void DrawingService::renderToBuffer() {}
 
-} // namespace PB
+} // namespace PB::Service