Fix incorrect scale mode caused by File::editableImages is nullptr when all image layers are editable (#3010)

Author: CodeJhF

src/codec/Codec.cpp

@@ -304,5 +304,19 @@ void Codec::UpdateFileAttributes(std::shared_ptr<File> file, CodecContext* conte
   file->editableImages = context->editableImages;
   file->editableTexts = context->editableTexts;
   file->imageScaleModes = context->imageScaleModes;
+  if (file->editableImages == nullptr) {
+    auto maxIndex = file->numImages();
+    file->editableImages = new std::vector<int>(maxIndex);
+    for (int i = 0; i < maxIndex; i++) {
+      file->editableImages->at(i) = i;
+    }
+  }
+  if (file->editableTexts == nullptr) {
+    auto maxIndex = file->numTexts();
+    file->editableTexts = new std::vector<int>(maxIndex);
+    for (int i = 0; i < maxIndex; i++) {
+      file->editableTexts->at(i) = i;
+    }
+  }
 }
 }  // namespace pag

src/codec/tags/EditableIndices.cpp

@@ -34,7 +34,8 @@ void ReadEditableIndices(DecodeStream* stream) {
 }
 
 TagCode WriteEditableIndices(EncodeStream* stream, const File* file) {
-  if (file->editableImages != nullptr) {
+  if (file->editableImages != nullptr &&
+      file->editableImages->size() != static_cast<size_t>(file->numImages())) {
     stream->writeEncodedUint32(static_cast<uint32_t>(file->editableImages->size()));
     for (int index : *file->editableImages) {
       stream->writeEncodedInt32(index);
@@ -43,7 +44,8 @@ TagCode WriteEditableIndices(EncodeStream* stream, const File* file) {
     stream->writeEncodedUint32(0);
   }
 
-  if (file->editableTexts != nullptr) {
+  if (file->editableTexts != nullptr &&
+      file->editableTexts->size() != static_cast<size_t>(file->numTexts())) {
     stream->writeEncodedUint32(static_cast<uint32_t>(file->editableTexts->size()));
     for (int index : *file->editableTexts) {
       stream->writeEncodedInt32(index);

src/codec/tags/FileTags.cpp

@@ -178,7 +178,10 @@ void WriteTagsOfFile(EncodeStream* stream, const File* file, PerformanceData* pe
   if (!file->images.empty()) {
     WriteImages(stream, &(file->images));
   }
-  if (file->editableImages != nullptr || file->editableTexts != nullptr) {
+  if ((file->editableImages != nullptr &&
+       file->editableImages->size() != static_cast<size_t>(file->numImages())) ||
+      (file->editableTexts != nullptr &&
+       file->editableTexts->size() != static_cast<size_t>(file->numTexts()))) {
     WriteTag(stream, file, WriteEditableIndices);
   }
   if (file->imageScaleModes != nullptr) {

src/rendering/layers/PAGFile.cpp

@@ -216,30 +216,21 @@ bool PAGFile::isPAGFile() const {
 }
 
 std::vector<int> PAGFile::getEditableIndices(LayerType layerType) {
-  int maxIndex = 0;
   switch (layerType) {
     case LayerType::Image:
       if (file->editableImages != nullptr) {
         return *file->editableImages;
       }
-      maxIndex = file->numImages();
       break;
     case LayerType::Text:
       if (file->editableTexts != nullptr) {
         return *file->editableTexts;
       }
-      maxIndex = file->numTexts();
       break;
-    case LayerType::Solid:
-      return {-1};
     default:
       break;
   }
-  std::vector<int> result;
-  for (int i = 0; i < maxIndex; i++) {
-    result.emplace_back(i);
-  }
-  return result;
+  return {};
 }
 
 Frame PAGFile::stretchedFrameDuration() const {