Merge pull request #25 from askmeaboutlo0m/master

Allow reading pass-through property of layers
MolecularMatters · Oct 16, 2023 · 469fe1f · 469fe1f
2 parents 9f793c0 + 1ae7d32
commit 469fe1f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Psd/PsdLayer.h b/src/Psd/PsdLayer.h
@@ -41,6 +41,7 @@ struct Layer
 
  uint32_t type; ///< The layer's type. Can be any of \ref layerType::Enum.
  bool isVisible; ///< The layer's visibility.
+ bool isPassThrough; ///< If the layer is a pass-through group.
 };
 
 PSD_NAMESPACE_END
diff --git a/src/Psd/PsdParseLayerMaskSection.cpp b/src/Psd/PsdParseLayerMaskSection.cpp
@@ -528,6 +528,7 @@ namespace
  layer->layerMask = nullptr;
  layer->vectorMask = nullptr;
  layer->type = layerType::ANY;
+ layer->isPassThrough = false;
 
  layer->top = fileUtil::ReadFromFileBE<int32_t>(reader);
  layer->left = fileUtil::ReadFromFileBE<int32_t>(reader);
@@ -705,8 +706,22 @@ namespace
  {
  layer->type = fileUtil::ReadFromFileBE<uint32_t>(reader);
 
- // skip the rest of the data
- reader.Skip(length - 4u);
+ // there may be another blend mode here to tell us if the group is pass-through
+ if(length >= 12u)
+ {
+ const uint32_t lsctKey = fileUtil::ReadFromFileBE<uint32_t>(reader);
+ const uint32_t modeKey = fileUtil::ReadFromFileBE<uint32_t>(reader);
+ if (lsctKey == util::Key<'8', 'B', 'I', 'M'>::VALUE && modeKey == util::Key<'p', 'a', 's', 's'>::VALUE)
+ {
+ layer->isPassThrough = true;
+ }
+ reader.Skip(length - 12u);
+ }
+ else
+ {
+ // skip the rest of the data
+ reader.Skip(length - 4u);
+ }
  }
  // read Unicode layer name
  else if (key == util::Key<'l', 'u', 'n', 'i'>::VALUE)