Commit 4649193f authored by Davis King's avatar Davis King

Made dlib work with libgif v5

parent 9260243c
...@@ -58,6 +58,13 @@ namespace dlib ...@@ -58,6 +58,13 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// handle the differences in API between libgif v5 and older.
#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
#define DLIB_GIFLIB_HANDLE_DIFF_VERSIONS ,0
#else
#define DLIB_GIFLIB_HANDLE_DIFF_VERSIONS
#endif
template <typename image_type> template <typename image_type>
void load_image ( void load_image (
image_type& image, image_type& image,
...@@ -79,7 +86,7 @@ namespace dlib ...@@ -79,7 +86,7 @@ namespace dlib
case image_file_type::GIF: case image_file_type::GIF:
{ {
image_view<image_type> img(image); image_view<image_type> img(image);
GifFileType* gif = DGifOpenFileName(file_name.c_str()); GifFileType* gif = DGifOpenFileName(file_name.c_str() DLIB_GIFLIB_HANDLE_DIFF_VERSIONS);
try try
{ {
if (gif == 0) throw image_load_error("Couldn't open file " + file_name); if (gif == 0) throw image_load_error("Couldn't open file " + file_name);
...@@ -141,12 +148,12 @@ namespace dlib ...@@ -141,12 +148,12 @@ namespace dlib
} }
} }
} }
DGifCloseFile(gif); DGifCloseFile(gif DLIB_GIFLIB_HANDLE_DIFF_VERSIONS);
} }
catch(...) catch(...)
{ {
if (gif) if (gif)
DGifCloseFile(gif); DGifCloseFile(gif DLIB_GIFLIB_HANDLE_DIFF_VERSIONS);
throw; throw;
} }
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment