# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1529566362 -7200
# Node ID b53cefe3901c5732e90a0ce3196d16ca6cba4b44
# Parent  1bc4054ad96cf20b0d2ca7c873c6c47e33b36966# Parent  964fb9a5786d97d7b72228286f58270893a39d8b
integration mainline->jobs

diff -r 1bc4054ad96c -r b53cefe3901c Core/Images/JpegReader.cpp
--- a/Core/Images/JpegReader.cpp	Thu Jun 21 08:06:58 2018 +0200
+++ b/Core/Images/JpegReader.cpp	Thu Jun 21 09:32:42 2018 +0200
@@ -49,7 +49,10 @@
                          std::string& content,
                          ImageAccessor& accessor)
   {
-    jpeg_read_header(&cinfo, TRUE);
+    // The "static_cast" is necessary on OS X:
+    // https://github.com/simonfuhrmann/mve/issues/371
+    jpeg_read_header(&cinfo, static_cast<boolean>(true));
+
     jpeg_start_decompress(&cinfo);
 
     PixelFormat format;
diff -r 1bc4054ad96c -r b53cefe3901c Core/Images/JpegWriter.cpp
--- a/Core/Images/JpegWriter.cpp	Thu Jun 21 08:06:58 2018 +0200
+++ b/Core/Images/JpegWriter.cpp	Thu Jun 21 09:32:42 2018 +0200
@@ -96,8 +96,12 @@
     }
 
     jpeg_set_defaults(&cinfo);
-    jpeg_set_quality(&cinfo, quality, TRUE);
-    jpeg_start_compress(&cinfo, TRUE);
+
+    // The "static_cast" is necessary on OS X:
+    // https://github.com/simonfuhrmann/mve/issues/371
+    jpeg_set_quality(&cinfo, quality, static_cast<boolean>(true));
+    jpeg_start_compress(&cinfo, static_cast<boolean>(true));
+    
     jpeg_write_scanlines(&cinfo, &lines[0], height);
     jpeg_finish_compress(&cinfo);
     jpeg_destroy_compress(&cinfo);