Skip to content

Add image/x-amiga-icon format #2547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitplane wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add image/x-amiga-icon format #2547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
188d3cb
ignore configure~ file and other temp files ending in ~
bitplane Mar 7, 2026
d4c8fdf
add Amiga .info file format
bitplane Mar 7, 2026
09fae41
integer overflows, underflows and truncated data fixes
bitplane Mar 7, 2026
a0f28a1
use image format and profile to show ecoding and slot type
bitplane Mar 7, 2026
592a9cd
test against 298,170 real files
bitplane Mar 8, 2026
c5ef146
Flip comparisons to avoid overflows, add some guards against infinite…
bitplane Mar 9, 2026
5f1a33e
consistent types, size guards, report errors
bitplane Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ MediaInfoLib.VC.db

# Visual Studio 2015+ cache/options directory
.vs/

# Temporary files
*~
3 changes: 3 additions & 0 deletions Project/BCB/Library/MediaInfoLib.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,9 @@
<None Include="..\..\..\Source\MediaInfo\HashWrapper.h">
<BuildOrder>209</BuildOrder>
</None>
<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp">
<BuildOrder>70</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp">
<BuildOrder>71</BuildOrder>
</CppCompile>
Expand Down
1 change: 1 addition & 0 deletions Project/CMake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ set(MediaInfoLib_SRCS
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Export/Export_PBCore.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Export/Export_PBCore2.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Export/Export_reVTMD.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Image/File_AmigaIcon.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Image/File_ArriRaw.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Image/File_Bmp.cpp
${MediaInfoLib_SOURCES_PATH}/MediaInfo/Image/File_Bpg.cpp
Expand Down
1 change: 1 addition & 0 deletions Project/GNU/Library/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
../../../Source/MediaInfo/Export/Export_reVTMD.cpp \
../../../Source/MediaInfo/Export/Export_Niso.cpp \
../../../Source/MediaInfo/Export/Export_Graph.cpp \
../../../Source/MediaInfo/Image/File_AmigaIcon.cpp \
../../../Source/MediaInfo/Image/File_ArriRaw.cpp \
../../../Source/MediaInfo/Image/File_Bmp.cpp \
../../../Source/MediaInfo/Image/File_Bpg.cpp \
Expand Down
3 changes: 3 additions & 0 deletions Project/GNU/Library/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ AC_ARG_ENABLE(tta, AC_HELP_STRING([--disable-tta], [Disable Audio - True
AC_ARG_ENABLE(twinvq, AC_HELP_STRING([--disable-twinvq], [Disable Audio - TwinVQ]), MediaInfoTwinVQ=$enableval, MediaInfoTwinVQ=depend)
AC_ARG_ENABLE(vorbis, AC_HELP_STRING([--disable-vorbis], [Disable Audio - Vorbis]), MediaInfovorbis=$enableval, MediaInfovorbis=depend)
AC_ARG_ENABLE(wvpk, AC_HELP_STRING([--disable-wvpk], [Disable Audio - Wavepack]), MediaInfoWvpk=$enableval, MediaInfoWvpk=depend)
AC_ARG_ENABLE(amigaicon, AC_HELP_STRING([--disable-amigaicon], [Disable Image - Amiga Icon]), MediaInfoAmigaIcon=$enableval, MediaInfoAmigaIcon=depend)
AC_ARG_ENABLE(arriraw, AC_HELP_STRING([--disable-arriraw], [Disable Image - Arri Raw]), MediaInfoArriRaw=$enableval, MediaInfoArriRaw=depend)
AC_ARG_ENABLE(bmp, AC_HELP_STRING([--disable-bmp], [Disable Image - Bitmap]), MediaInfoBmp=$enableval, MediaInfoBmp=depend)
AC_ARG_ENABLE(bpg, AC_HELP_STRING([--disable-bpg], [Disable Image - BPG]), MediaInfoBpg=$enableval, MediaInfoBpg=depend)
Expand Down Expand Up @@ -300,6 +301,7 @@ if test "$MediaInfoTta" = "no"; then AC_DEFINE(MEDIAINFO_TTA_NO) fi; if
if test "$MediaInfoTwinVQ" = "no"; then AC_DEFINE(MEDIAINFO_TWINVQ_NO) fi; if test "$MediaInfoTwinVQ" = "yes"; then AC_DEFINE(MEDIAINFO_TWINVQ_YES) fi
if test "$MediaInfoVorbis" = "no"; then AC_DEFINE(MEDIAINFO_VORBIS_NO) fi; if test "$MediaInfoVorbis" = "yes"; then AC_DEFINE(MEDIAINFO_VORBIS_YES) fi
if test "$MediaInfoWvpk" = "no"; then AC_DEFINE(MEDIAINFO_WVPK_NO) fi; if test "$MediaInfoWvpk" = "yes"; then AC_DEFINE(MEDIAINFO_WVPK_YES) fi
if test "$MediaInfoAmigaIcon" = "no"; then AC_DEFINE(MEDIAINFO_AMIGAICON_NO) fi; if test "$MediaInfoAmigaIcon" = "yes"; then AC_DEFINE(MEDIAINFO_AMIGAICON_YES) fi
if test "$MediaInfoArriRaw" = "no"; then AC_DEFINE(MEDIAINFO_ARRIRAW_NO) fi; if test "$MediaInfoArriRaw" = "yes"; then AC_DEFINE(MEDIAINFO_ARRIRAW_YES) fi
if test "$MediaInfoBmp" = "no"; then AC_DEFINE(MEDIAINFO_BMP_NO) fi; if test "$MediaInfoBmp" = "yes"; then AC_DEFINE(MEDIAINFO_BMP_YES) fi
if test "$MediaInfoBpg" = "no"; then AC_DEFINE(MEDIAINFO_BPG_NO) fi; if test "$MediaInfoBpg" = "yes"; then AC_DEFINE(MEDIAINFO_BPG_YES) fi
Expand Down Expand Up @@ -1076,6 +1078,7 @@ Mcho "Tta " "$MediaInfoTta"
Mcho "TwinVQ " "$MediaInfoTwinVQ"
Mcho "Vorbis " "$MediaInfoVorbis"
Mcho "Wvpk " "$MediaInfoWvpk"
Mcho "AmigaIcon" "$MediaInfoAmigaIcon"
Mcho "ArriRaw" "$MediaInfoArriRaw"
Mcho "Bmp " "$MediaInfoBmp"
Mcho "Bpg " "$MediaInfoBpg"
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\HashWrapper.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Bpg.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dds.cpp" />
Expand Down Expand Up @@ -823,6 +824,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\File_Other.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\File_Unknown.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\HashWrapper.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Bpg.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dds.h" />
Expand Down
6 changes: 6 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,9 @@
<ClCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_PerPackage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp">
<Filter>Source Files\Image</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp">
<Filter>Source Files\Image</Filter>
</ClCompile>
Expand Down Expand Up @@ -1489,6 +1492,9 @@
<ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo_Config_PerPackage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h">
<Filter>Header Files\Image</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h">
<Filter>Header Files\Image</Filter>
</ClInclude>
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2022/Library/MediaInfoLib_UWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\HashWrapper.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Bpg.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dds.cpp" />
Expand Down Expand Up @@ -563,6 +564,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\File_Other.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\File_Unknown.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\HashWrapper.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Bpg.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dds.h" />
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2026/Library/MediaInfoLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\HashWrapper.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Bpg.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dds.cpp" />
Expand Down Expand Up @@ -823,6 +824,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\File_Other.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\File_Unknown.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\HashWrapper.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Bpg.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dds.h" />
Expand Down
6 changes: 6 additions & 0 deletions Project/MSVC2026/Library/MediaInfoLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,9 @@
<ClCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_PerPackage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp">
<Filter>Source Files\Image</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp">
<Filter>Source Files\Image</Filter>
</ClCompile>
Expand Down Expand Up @@ -1489,6 +1492,9 @@
<ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo_Config_PerPackage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h">
<Filter>Header Files\Image</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h">
<Filter>Header Files\Image</Filter>
</ClInclude>
Expand Down
2 changes: 2 additions & 0 deletions Project/MSVC2026/Library/MediaInfoLib_UWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@
<ClCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\HashWrapper.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Bpg.cpp" />
<ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dds.cpp" />
Expand Down Expand Up @@ -563,6 +564,7 @@
<ClInclude Include="..\..\..\Source\MediaInfo\File_Other.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\File_Unknown.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\HashWrapper.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_AmigaIcon.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_ArriRaw.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Bpg.h" />
<ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dds.h" />
Expand Down
2 changes: 2 additions & 0 deletions Project/Qt/MediaInfoLib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ HEADERS += \
../../Source/MediaInfo/File_Other.h \
../../Source/MediaInfo/File_Unknown.h \
../../Source/MediaInfo/HashWrapper.h \
../../Source/MediaInfo/Image/File_AmigaIcon.h \
../../Source/MediaInfo/Image/File_ArriRaw.h \
../../Source/MediaInfo/Image/File_Bmp.h \
../../Source/MediaInfo/Image/File_Bpg.h \
Expand Down Expand Up @@ -368,6 +369,7 @@ SOURCES += \
../../Source/MediaInfo/File_Other.cpp \
../../Source/MediaInfo/File_Unknown.cpp \
../../Source/MediaInfo/HashWrapper.cpp \
../../Source/MediaInfo/Image/File_AmigaIcon.cpp \
../../Source/MediaInfo/Image/File_ArriRaw.cpp \
../../Source/MediaInfo/Image/File_Bmp.cpp \
../../Source/MediaInfo/Image/File_Bpg.cpp \
Expand Down
6 changes: 6 additions & 0 deletions Source/MediaInfo/File__MultipleParsing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@
#if defined(MEDIAINFO_BPG_YES)
#include "MediaInfo/Image/File_Bpg.h"
#endif
#if defined(MEDIAINFO_AMIGAICON_YES)
#include "MediaInfo/Image/File_AmigaIcon.h"
#endif
#if defined(MEDIAINFO_DDS_YES)
#include "MediaInfo/Image/File_Dds.h"
#endif
Expand Down Expand Up @@ -777,6 +780,9 @@ File__MultipleParsing::File__MultipleParsing()
#if defined(MEDIAINFO_BPG_YES)
Parser.push_back(new File_Bpg());
#endif
#if defined(MEDIAINFO_AMIGAICON_YES)
Parser.push_back(new File_AmigaIcon());
#endif
#if defined(MEDIAINFO_DDS_YES)
Parser.push_back(new File_Dds());
#endif
Expand Down
Loading
Loading