Commit 2326a722 authored by Davis King's avatar Davis King
Browse files

fix code not compiling with some versions of libjpeg as a result of the change I just made.

parent e1b66718
...@@ -138,7 +138,7 @@ namespace dlib ...@@ -138,7 +138,7 @@ namespace dlib
jpeg_create_decompress(&cinfo); jpeg_create_decompress(&cinfo);
if (file != NULL) jpeg_stdio_src(&cinfo, file); if (file != NULL) jpeg_stdio_src(&cinfo, file);
else if (imgbuffer != NULL) jpeg_mem_src(&cinfo, imgbuffer, imgbuffersize); else if (imgbuffer != NULL) jpeg_mem_src(&cinfo, (unsigned char*)imgbuffer, imgbuffersize);
else throw image_load_error(std::string("jpeg_loader: no valid image source")); else throw image_load_error(std::string("jpeg_loader: no valid image source"));
jpeg_read_header(&cinfo, TRUE); jpeg_read_header(&cinfo, TRUE);
......
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