psd: add PSB support #313
Merged
psd: add PSB support #313
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sylikc
reviewed
Jun 21, 2024
src/JPEGView/PSDWrapper.cpp
Outdated
|
|
||
| // Compression. 0 = Raw Data, 1 = RLE compressed, 2 = ZIP without prediction, 3 = ZIP with prediction. | ||
| unsigned short nCompressionMethod = ReadUShortFromFile(hFile); | ||
| ThrowIf(nCompressionMethod != COMPRESSION_RLE && nCompressionMethod != COMPRESSION_None); | ||
|
|
||
| unsigned int nImageDataSize = nFileSize - (26 + 4 + nColorDataSize + 4 + nResourceSectionSize + 4 + nLayerSize + 2); | ||
| unsigned int nImageDataSize = nFileSize - (26 + 4 + nColorDataSize + 4 + nResourceSectionSize + nLayerSizeBytes + nLayerSize + 2); |
There was a problem hiding this comment.
eek that's lots of offsets, is 26 part of the header?
sylikc
added
enhancement
|
i read through all the code, and you really make this look easy. I know it's not... since I really can't figure out the formats stuff, but I appreciate all the updates to improve JPEGView! thanks a bunch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge #308 and #312 first. A lot of PSBs will still fail due to the filesize/dimension/pixel count limits.
The relevant differences between PSB/PSD are: