@@ -15,7 +15,7 @@ ALLEGRO_DEBUG_CHANNEL("image")
15
15
16
16
static bool freeimage_initialized = false;
17
17
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 ) {
19
19
ALLEGRO_ERROR ("FreeImage %s : %s\n" , (fif == FIF_UNKNOWN )? "UNKNOWN" : FreeImage_GetFormatFromFIF (fif ), message );
20
20
}
21
21
@@ -81,7 +81,7 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap(const char *filename, int flags)
81
81
if (fif == FIF_UNKNOWN )
82
82
fif = FreeImage_GetFileType (filename , 0 );
83
83
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 );
85
85
return NULL ;
86
86
}
87
87
@@ -123,6 +123,10 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
123
123
FIBITMAP * fib = NULL ;
124
124
FREE_IMAGE_FORMAT fif = FIF_UNKNOWN ;
125
125
126
+ if (flags != 0 ) {
127
+ ALLEGRO_WARN ("Ignoring bitmap loading flags.\n" );
128
+ }
129
+
126
130
ASSERT (f );
127
131
ASSERT (freeimage_initialized == true);
128
132
@@ -133,7 +137,7 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
133
137
134
138
fif = FreeImage_GetFileTypeFromHandle (& fio , (fi_handle )f , 0 );
135
139
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 " );
137
141
return NULL ;
138
142
}
139
143
@@ -155,7 +159,6 @@ ALLEGRO_BITMAP *_al_load_fi_bitmap_f(ALLEGRO_FILE *f, int flags)
155
159
bool _al_identify_fi (ALLEGRO_FILE * f )
156
160
{
157
161
FreeImageIO fio ;
158
- ALLEGRO_BITMAP * bitmap = NULL ;
159
162
FREE_IMAGE_FORMAT fif = FIF_UNKNOWN ;
160
163
161
164
ASSERT (f );
@@ -168,7 +171,7 @@ bool _al_identify_fi(ALLEGRO_FILE *f)
168
171
169
172
fif = FreeImage_GetFileTypeFromHandle (& fio , (fi_handle )f , 0 );
170
173
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 " );
172
175
return false;
173
176
}
174
177
0 commit comments