Skip to content

John Bowler's "Added -S, iTXt, zTXt support" - #43

Draft
landfillbaby wants to merge 13 commits into
pnggroup:mainfrom
landfillbaby:old-development
Draft

John Bowler's "Added -S, iTXt, zTXt support"#43
landfillbaby wants to merge 13 commits into
pnggroup:mainfrom
landfillbaby:old-development

Conversation

@landfillbaby

@landfillbaby landfillbaby commented Jun 5, 2025

Copy link
Copy Markdown

the main commits are the first 3

@jbowler wrote the code here, i just merged up to v3.0.3 in my older repo which was originally forked from his before he deleted it, and then i rebased that entire repo onto this one, so the merges are still there

jbowler and others added 13 commits June 5, 2025 11:06
Added the required inflate engine.

Signed-off-by: John Bowler <jbowler@acm.org>
Signed-off-by: John Bowler <jbowler@acm.org>
The formatting of zTXt and iTXt uncompressed text is still wrong because
the internal buffer printing inserts a four-space indent between each
uncompressed block.

Signed-off-by: John Bowler <jbowler@acm.org>
Merges a patch from Greg Roelofs
Signed-off-by: John Bowler <jbowler@acm.org>
turns out this doesn't report an error on PNGSuite xs4n0g01 (signature byte 4 lowercase), and I traced the problem to here a single comparison in check_magic
Output zlib version error/warning to stderr
Greg might have some other design principle but I definitely believe all error messages should go to stderr.
@ctruta

ctruta commented Jun 5, 2025

Copy link
Copy Markdown
Member

the main commits are the first 3

Thank you for that, you must always rebase to our tip of tree, force-push that into your clone, then submit a clean PR from there, consisting exclusively of your three commits.

I just had a cursory look, and I'm sorry for what I've done, just yesterday: I landed a commit that breaks yours, due to the removal of the USE_ZLIB macro. (Oopsie!...) Any new code should behave as if USE_ZLIB is always true, because we will always use zlib unconditionally, going forward.

@landfillbaby

landfillbaby commented Jun 5, 2025

Copy link
Copy Markdown
Author

i'll make a branch that's properly squashed and rebased later, unless someone else wants to. again this isn't my code other than the merges and a single off-by-one bugfix though

@ctruta

ctruta commented Jun 6, 2025

Copy link
Copy Markdown
Member

i'll make a branch that's properly squashed and rebased later, unless someone else wants to. again this isn't my code other than the merges and a single off-by-one bugfix though

Understood. As a matter of fact, I had it in my plans to bring this in, myself, but I haven't gotten to doing it yet, because my attention was on other things.

So if you @landfillbaby can do it, so I don't have to -- that'd be great!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants