ENH: Update PNG to v1.6.54#5864
Conversation
|
PR description is good and so detailed that I suspect AI was involved in writing it. Did AI do anything else, such as resolve those merge conflicts? |
|
Ah, I now notice "Generated using the update-third-party skill", after seeing it in #5865 too. Updating third party libraries was time consuming. I guess AI can help there. How much time do you devote to reviewing merge conflict resolution? |
|
@dzenanz Please see #5867 for the Agent skill I work on while making the updates. For libpng, I don't think there were any conflict. But with the skills instructions in pick up on the command in itk_png_mangle.h.in, and followed those to update the mangling. In VS code I was able too see some of the conflict and the changes made. I am not sure I saw them all but with the provided instructions Clause Sonnet 4.5 seems to do a good job. |
Code extracted from:
git://git.code.sf.net/p/libpng/code
at commit 02f2b4f4699f0ef9111a6534f093b53732df4452 (v1.6.54).
* upstream-png: png 2026-01-12 (02f2b4f4) # Conflicts: # Modules/ThirdParty/PNG/src/itkpng/pngconf.h
Added mangling definitions for new API functions introduced between v1.6.44 and v1.6.54: - png_get_cICP / png_set_cICP - png_get_cLLI / png_set_cLLI / png_get_cLLI_fixed / png_set_cLLI_fixed - png_get_mDCV / png_set_mDCV / png_get_mDCV_fixed / png_set_mDCV_fixed
59d7a8a
into
InsightSoftwareConsortium:main
This PR updates the PNG (libpng) third-party library from version v1.6.44 to v1.6.54.
Summary
UpdateFromUpstream.shto tag v1.6.54pngconf.hChanges
Conflict Resolution
A merge conflict occurred in
Modules/ThirdParty/PNG/src/itkpng/pngconf.h:#include "itk_png_mangle.h"which is critical for symbol mangling__declspec(dllexport/dllimport)handlingSymbol Mangling Updates
Added 10 new public API functions to
itk_png_mangle.h.in(new in v1.6.45–v1.6.54):png_get_cICP/png_set_cICP— ICC Profile chunkpng_get_cLLI/png_set_cLLI/png_get_cLLI_fixed/png_set_cLLI_fixed— Content Light Level Informationpng_get_mDCV/png_set_mDCV/png_get_mDCV_fixed/png_set_mDCV_fixed— Mastering Display Color VolumeNotes
update-third-partyskillUpstream releases: https://github.com/pnggroup/libpng/releases (v1.6.45 through v1.6.54)