Merge in changes from upstream?

[SlySven]

I note that the upstream project, now located at: https://icns.sourceforge.io/ rather than http://icns.sourceforge.net/ has not visibly gained a release since 0.8.1 but there has been developments since your commit-e261b0a2 which corresponds to its commit-91e2f813 such that it has less spelling errors, odd-line endings (check icnsutils/png2icns.c!), supports OpenJPEG version 2 as well as 1, and has removed some obsolete SVN junk. Basically the code is cleaner however it does not have your support for 128px (ic07) icon types or for avoiding the need to re-encode the .png image data .

Do you think there is any chance of bringing in the changes upstream - and/or passing back to them your enhancements?

[pabs3]

It looks like @kornelski made this fork before we switched the SourceForge project from Subversion to Git, because the Git history is not linked between the two projects.

I'm happy to do the work needed to merge the changes from the @kornelski fork into the SourceForge Git repository if @kornelski is happy with that. I am likely to need to adjust the commits slightly, since I noticed they include unrelated whitespace changes.

I don't intend to move libicns from SourceForge to GitHub as switching hosting locations is too disruptive to users and redistributors and the two platforms have similar functionality.

In case you @SlySven or @kornelski or others are interested in joining the SourceForge project, I'm happy to add you there.

If either of you have a sample of the ic07 icon type produced by a macOS machine, that would be helpful for validating the related code changes.

[kornelski]

No problem. Feel free to take the code.

[SlySven]

What can be done about version numbers? The code in this repository has advanced them to 0.9.0 but the upstream has not had an increment for eight years or so and is still on 0.8.1. I suppose that if upstream went to a 0.9.1 after it gained the ic07 and the .png reuse feature then it would reflect to third parties which would be the recommended one. However I am guessing that you @kornelski are not going to want to archive (lock and make read-only) this repository yet there would be other differences between the two that mean that they are not mirrors of each other. 🤔

Unfortunately I cannot help with that particular icon type as I don't have a Mac - which is what lead me into this area in the first place. 😆

But anyhow, thanks to you both for talking to each other.

[Luflosi]

Here is the firefox icon. I'm quite sure it contains the ic07 icon type. Let me know if this is what you were looking for.
firefox.icns.zip

[SlySven]

That is an interesting specimen, which indeed does seem to contain the ic07 type.

stephen@Ripley:~/src/libicns$ icns2png -l ./firefox.icns
----------------------------------------------------
Reading icns family from ./firefox.icns...
 Extracting icons from /firefox.icns...
 Icon family size is 1021785 bytes (including 8 byte header)
 Listing icon elements...
  's8mk' 16x16 8-bit mask (256 bytes)
  'is32' 16x16 32-bit icon (1024 bytes compressed to 642)
  'l8mk' 32x32 8-bit mask (1024 bytes)
  'il32' 32x32 32-bit icon (4096 bytes compressed to 2031)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic07'
  'ic07' 0x0 0-bit (18391 bytes)
  'ic08' 256x256 32-bit icon (262144 bytes compressed to 50218)
  'ic09' 512x512 32-bit icon (1048576 bytes compressed to 177374)
  'ic10' 1024x1024 32-bit icon (4194304 bytes compressed to 550467)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic11'
  'ic11' 0x0 0-bit (2244 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic12'
  'ic12' 0x0 0-bit (6115 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic13'
  'ic13' 0x0 0-bit (56903 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic14'
  'ic14' 0x0 0-bit (156016 bytes)
12 elements total found in /firefox.icns.
stephen@Ripley:~/src/libicns$

For reference on the other types I am referring to: https://en.wikipedia.org/wiki/Apple_Icon_Image_format#Icon_types .

[pabs3]

I've rebased, reworded, reformatted and merged the 128px ARGB (ic07) support and the warning fix upstream to SourceForge. Thanks for the Firefox icon, that helped me confirm the patch works. PS: I used the git imerge tool to do the incremental rebase. https://github.com/mhagger/git-imerge Re-using the original PNG data is an interesting idea. Probably it is faster than re-encoding, which I think is useful. The downside is that it includes all the PNG metadata from the original file, which might leak some things or might contain a lot of unneeded extra data. In addition the way it got implemented doesn't fit well with the design of the library and the command-line code. I think I would definitely prefer a command-line option to decide on the re-use or not and a separate function in the API that lets you re-use a PNG file. The default on the command-line could be to re-use the PNG file. Interesting, looking at WikiPedia, it seems libicns doesn't yet support the icp4 icp5 icp6 ic04 ic05 icsB icsb icon types. I don't have any samples of these formats nor any access to macOS devices, so if anyone knows where to get samples of those, please let me know. BTW, the ICNS entry on the File Formats wiki: http://fileformats.archiveteam.org/wiki/ICNS I'm happy to bump the version to 0.9.1 if that is wanted. After the now merged patches, the PNG data reuse change and the version increase, the two repositories are essentially equivalent as other committers to upstream did basically the same changes as @kornelski did for some of the commits. Once the needed changes are finalised, I'll go have a look at the distros and other potential sources of patches/fixes/bugs and then finalise a new release.

…

-- bye, pabs https://bonedaddy.net/pabs3/

[Luflosi]

Here is the Blender icon, which contains the ic04 and ic05 icon types you were looking for. I looked through a bunch of other app icons on my system but couldn't find any of the others. Is there a way to check programmatically if an icon contains a certain type? So far I just used macOS Preview to do the job.
blender icon.icns.zip

[pabs3]

Interesting, the blender one also contains an "info" icon type, which WikiPedia says is a binary plist, "Usage unknown". I guess I'll try to take a look at adding something for extracting that. If you have icns2png installed, the list option of it will tell you all of the icon types, even the ones that icns2png doesn't know about, and it will warn on stderr about icon types that it doesn't know about: icns2png -l foo.icns > /dev/null

…

-- bye, pabs https://bonedaddy.net/pabs3/

[Luflosi]

025_Receiver_Combo_Mac.icns.zip contains the icsB and icsb icon types.
document.icns.zip contains the icp4 and icp5 icon types.
programmer.icns.zip contains the icp6 icon type.

[pabs3]

Added support for icp6 upstream since that was pretty easy.

The icp4 and icp5 types don't seem to match what Wikipedia says. The icsB and icsb have no description on Wikipedia. The ic04 and ic05 types will need a new decoder to be written as there are no other types in this ARGB format.

[pabs3]

@Luflosi: any chance of some more samples of each type? Would be interesting to see if any of the other samples of icp4 and icp5 use PNG like Wikipedia suggests. For the others it would be useful to have a more than one sample for extra validation.

[Luflosi]

Unfortunately, I couldn't find any more icons with the icp6 icon type. 025_Apps_Combo_Mac.icns is from the same application bundle as 025_Receiver_Combo_Mac.icns from my last comment, so it probably has the same properties.
SKEAR_Mac.icns.zip contains the icsB type.
DVTGenericiOSDevice.icns.zip contains the icsB and icsb types.
025_Apps_Combo_Mac.icns.zip contains the icsB and icsb types.
APPL.icns.zip contains the icp4 and icp5 types.

Are there any other types you're interested in?

[pabs3]

Thanks, downloaded. Some containing the 'info' type might be useful to figure out when it is used and what it contains. Any containing the unknown 'name' type might be interesting in order to figure out what it is.

…

-- bye, pabs https://bonedaddy.net/pabs3/

[SlySven]

😊 It is a bit embarrassing but I was going through my project's artwork repository and I found an .icns that someone else had done - not sure if it was on a genuine 🍏 machine or they did it on-line but it has a load of formats that I cannot currently process with https://sourceforge.net/p/icns/code/ci/382937bb38ff1ab3513a7ef232b2a562433ec1be/ - it looks like all the "Retina ones":

stephen@Ripley:~/src/libicns$ icns2png -l ~/src/mudlet-dev/Mudlet/mudlet/src/icons/mudlet.icns
----------------------------------------------------
Reading icns family from /home/stephen/src/mudlet-dev/Mudlet/mudlet/src/icons/mudlet.icns...
 Extracting icons from /mudlet.icns...
 Icon family size is 914427 bytes (including 8 byte header)
 Listing icon elements...
  'TOC ' table of contents
  'ic08' 256x256 32-bit icon (262144 bytes compressed to 54444)
  'ic10' 1024x1024 32-bit icon (4194304 bytes compressed to 461443)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic13'
  'ic13' 0x0 0-bit (54444 bytes)
  'ic09' 512x512 32-bit icon (1048576 bytes compressed to 156444)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic12'
  'ic12' 0x0 0-bit (6232 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic07'
  'ic07' 0x0 0-bit (18279 bytes)
  'il32' 32x32 32-bit icon (4096 bytes compressed to 2280)
  'l8mk' 32x32 8-bit mask (1024 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic11'
  'ic11' 0x0 0-bit (2231 bytes)
  'is32' 16x16 32-bit icon (1024 bytes compressed to 698)
  's8mk' 16x16 8-bit mask (256 bytes)
libicns: icns_get_image_info_for_type: Unable to parse icon type 'ic14'
  'ic14' 0x0 0-bit (156444 bytes)
13 elements total found in /mudlet.icns.
stephen@Ripley:~/src/libicns$ 

From that Wikipedia page that works out to be:

• ic07 128x128 icon in JPEG 2000 or PNG format
• ic11 16x16@2x icon "retina" icon in JPEG 2000 or PNG format
• ic12 32x32@2x icon "retina" icon in JPEG 2000 or PNG format
• ic13 128x128@2x icon "retina" icon in JPEG 2000 or PNG format
• ic14 256x256@2x icon "retina" icon in JPEG 2000 or PNG format

Here is the file - zipped up so I can attach it here:
mudlet.zip

[pabs3]

Thanks. Are you sure that you are using the latest SourceForge version? When I compile icns2png it works for me with mudlet.icns. You might need to change your PATH or LD_LIBRARY_PATH to where you installed icns2png or libicns. I'm installing to ~/opt and using these: export LD_LIBRARY_PATH=$HOME/opt/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export PATH=$HOME/opt/bin${PATH:+:$PATH}

…

-- bye, pabs https://bonedaddy.net/pabs3/