Skip to content

Commit bd79095

Browse files
SiegeLordExSiegeLord
authored andcommitted
Assorted fixes for the FreeImage backend.
1 parent e18c44e commit bd79095

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

addons/image/freeimage.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ALLEGRO_DEBUG_CHANNEL("image")
1515

1616
static bool freeimage_initialized = false;
1717

18-
static void _fiio_al_error_handler(FREE_IMAGE_FORMAT fif, void *message) {
18+
static void _fiio_al_error_handler(FREE_IMAGE_FORMAT fif, const char *message) {
1919
ALLEGRO_ERROR("FreeImage %s : %s\n", (fif == FIF_UNKNOWN)? "UNKNOWN" : FreeImage_GetFormatFromFIF(fif), message);
2020
}
2121

@@ -81,7 +81,7 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap(const char *filename, int flags)
8181
if (fif == FIF_UNKNOWN)
8282
fif = FreeImage_GetFileType(filename, 0);
8383
if (fif == FIF_UNKNOWN) {
84-
ALLEGRO_WARN("Could not determine the file type for '%s'", filename);
84+
ALLEGRO_WARN("Could not determine the file type for '%s'\n", filename);
8585
return NULL;
8686
}
8787

@@ -123,6 +123,10 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
123123
FIBITMAP *fib = NULL;
124124
FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
125125

126+
if (flags != 0) {
127+
ALLEGRO_WARN("Ignoring bitmap loading flags.\n");
128+
}
129+
126130
ASSERT(f);
127131
ASSERT(freeimage_initialized == true);
128132

@@ -133,7 +137,7 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
133137

134138
fif = FreeImage_GetFileTypeFromHandle(&fio, (fi_handle)f, 0);
135139
if (fif == FIF_UNKNOWN) {
136-
ALLEGRO_WARN("Could not determine the file type for Allegro file.");
140+
ALLEGRO_WARN("Could not determine the file type for Allegro file.\n");
137141
return NULL;
138142
}
139143

@@ -155,7 +159,6 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
155159
bool _al_identify_fi(ALLEGRO_FILE *f)
156160
{
157161
FreeImageIO fio;
158-
ALLEGRO_BITMAP *bitmap = NULL;
159162
FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
160163

161164
ASSERT(f);
@@ -168,7 +171,7 @@ bool _al_identify_fi(ALLEGRO_FILE *f)
168171

169172
fif = FreeImage_GetFileTypeFromHandle(&fio, (fi_handle)f, 0);
170173
if (fif == FIF_UNKNOWN) {
171-
ALLEGRO_WARN("Could not determine the file type for Allegro file.");
174+
ALLEGRO_WARN("Could not determine the file type for Allegro file.\n");
172175
return false;
173176
}
174177

0 commit comments

Comments
 (0)