Skip to content

Commit 7854e7d

Browse files
SiegeLordExSiegeLord
authored andcommitted
Remove the native MacOS image loader.
It is too limited and is causing issues, please use libpng and libjpeg libraries instead. Fixes #1531
1 parent 5ae57ac commit 7854e7d

File tree

4 files changed

+1
-317
lines changed

4 files changed

+1
-317
lines changed

addons/image/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ if(WANT_NATIVE_IMAGE_LOADER)
7272
endif(SUPPORT_GDIPLUS)
7373
endif(WIN32)
7474

75-
if (ALLEGRO_MACOSX)
76-
set(ALLEGRO_CFG_IIO_SUPPORT_PNG 1)
77-
set(ALLEGRO_CFG_IIO_SUPPORT_JPG 1)
78-
list(APPEND IMAGE_SOURCES macosx.m)
79-
endif(ALLEGRO_MACOSX)
80-
8175
if(ANDROID)
8276
set(ALLEGRO_CFG_IIO_HAVE_ANDROID 1)
8377
set(ALLEGRO_CFG_IIO_SUPPORT_JPG 1)
@@ -93,7 +87,7 @@ endif(WANT_NATIVE_IMAGE_LOADER)
9387

9488
if(WIN32)
9589
image_summary(" - GDI+" SUPPORT_GDIPLUS)
96-
elseif(MACOSX OR ANDROID OR IPHONE)
90+
elseif(ANDROID OR IPHONE)
9791
image_summary(" - Native image loader" WANT_NATIVE_IMAGE_LOADER)
9892
endif()
9993

addons/image/allegro5/internal/aintern_image.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ ALLEGRO_IIO_FUNC(ALLEGRO_BITMAP *, _al_iphone_load_image, (const char *filename,
1616
ALLEGRO_IIO_FUNC(ALLEGRO_BITMAP *, _al_iphone_load_image_f, (ALLEGRO_FILE *f, int flags));
1717
#endif
1818

19-
#ifdef ALLEGRO_MACOSX
20-
ALLEGRO_IIO_FUNC(bool, _al_osx_register_image_loader, (void));
21-
#endif
22-
2319
#endif
2420

2521
ALLEGRO_IIO_FUNC(ALLEGRO_BITMAP *, _al_load_pcx, (const char *filename, int flags));

addons/image/iio.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,6 @@ bool al_init_image_addon(void)
149149
}
150150
}
151151
#endif
152-
153-
#ifdef ALLEGRO_MACOSX
154-
success |= _al_osx_register_image_loader();
155-
#endif
156152
#endif
157153

158154
if (success)

addons/image/macosx.m

Lines changed: 0 additions & 302 deletions
This file was deleted.

0 commit comments

Comments
 (0)