Fix the issue that the default scale modes set by PAGExporter is not applied. (#2684)

Author: CodeJhF

include/pag/pag.h

@@ -808,6 +808,7 @@ class PAG_API PAGImageLayer : public PAGLayer {
   Frame getFrameFromTimeRemap(Frame value);
   void measureBounds(tgfx::Rect* bounds) override;
   int64_t contentDurationInternal();
+  int getDefaultScaleMode();
 
   friend class RenderCache;
 

src/rendering/editing/ImageReplacement.cpp

@@ -22,12 +22,10 @@
 #include "rendering/graphics/Recorder.h"
 
 namespace pag {
-ImageReplacement::ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage)
-    : pagImage(std::move(pagImage)) {
-  auto imageFillRule = imageLayer->imageFillRule;
-  defaultScaleMode = imageFillRule ? imageFillRule->scaleMode : PAGScaleMode::LetterBox;
-  contentWidth = imageLayer->imageBytes->width;
-  contentHeight = imageLayer->imageBytes->height;
+ImageReplacement::ImageReplacement(std::shared_ptr<PAGImage> pagImage, int scaleMode,
+                                   ImageBytes* imageBytes)
+    : pagImage(std::move(pagImage)), defaultScaleMode(scaleMode), contentWidth(imageBytes->width),
+      contentHeight(imageBytes->height) {
 }
 
 void ImageReplacement::measureBounds(tgfx::Rect* bounds) {

src/rendering/editing/ImageReplacement.h

@@ -22,7 +22,7 @@
 namespace pag {
 class ImageReplacement : public Content {
  public:
-  ImageReplacement(ImageLayer* imageLayer, std::shared_ptr<PAGImage> pagImage);
+  ImageReplacement(std::shared_ptr<PAGImage> pagImage, int scaleMode, ImageBytes* imageBytes);
 
   void measureBounds(tgfx::Rect* bounds) override;
   void draw(Recorder* recorder) override;

src/rendering/layers/PAGImageLayer.cpp

@@ -202,7 +202,8 @@ void PAGImageLayer::setImageInternal(std::shared_ptr<PAGImage> image) {
   }
   delete replacement;
   if (image != nullptr) {
-    replacement = new ImageReplacement(static_cast<ImageLayer*>(layer), image);
+    replacement = new ImageReplacement(image, getDefaultScaleMode(),
+                                       static_cast<ImageLayer*>(layer)->imageBytes);
   } else {
     replacement = nullptr;
   }
@@ -676,4 +677,17 @@ int64_t PAGImageLayer::contentDurationInternal() {
   return FrameToTime(maxFrame + 1, frameRate);
 }
 
+int PAGImageLayer::getDefaultScaleMode() {
+  auto imageLayer = static_cast<ImageLayer*>(layer);
+  if (imageLayer && imageLayer->imageFillRule) {
+    return imageLayer->imageFillRule->scaleMode;
+  }
+  int index = editableIndex();
+  if (index >= 0 && file && file->imageScaleModes && !file->imageScaleModes->empty()) {
+    return file->imageScaleModes->at(index);
+  }
+
+  return PAGScaleMode::LetterBox;
+}
+
 }  // namespace pag