Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-27 00:00:02 -04:00
Code Issues Projects Releases Wiki Activity

#648: (Re-)Added support for nested layer groups

Browse Source
This commit is contained in:
Harald Kuhr
2021-12-29 16:20:02 +01:00
parent 99b5f28a49
commit 123f0bb7fc
3 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
+9 -6
View File
@@ -992,24 +992,27 @@ public final class PSDImageReader extends ImageReaderBase {
private List<PSDLayerInfo> readLayerInfo(int layerCount) throws IOException {
PSDLayerInfo[] layerInfos = new PSDLayerInfo[layerCount];
List<PSDLayerInfo> groupedLayerInfo = Collections.emptyList();
Stack<List<PSDLayerInfo>> groupStack = new Stack<>();
List<PSDLayerInfo> currentGroup = Collections.emptyList();
for (int i = 0; i < layerInfos.length; i++) {
PSDLayerInfo layerInfo = new PSDLayerInfo(header.largeFormat, imageInput);
layerInfos[i] = layerInfo;
if (layerInfo.isDivider) {
groupedLayerInfo = new LinkedList<>();
groupStack.push(currentGroup);
currentGroup = new ArrayList<>();
}
else if (layerInfo.isGroup) {
for (PSDLayerInfo info : groupedLayerInfo) {
for (PSDLayerInfo info : currentGroup) {
info.groupId = layerInfo.getLayerId();
}
groupedLayerInfo = Collections.emptyList();
currentGroup = groupStack.pop();
}
else if (groupedLayerInfo != Collections.EMPTY_LIST) {
groupedLayerInfo.add(layerInfo);
if (currentGroup != Collections.EMPTY_LIST) {
currentGroup.add(layerInfo);
}
}