diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegLoad.cpp djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegLoad.cpp

--- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegLoad.cpp    2015-09-14 08:16:34.000000000 +0300

+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegLoad.cpp 2015-09-14 13:37:07.093362271 +0300

@@ -215,16 +215,7 @@

     libjpeg::jpeg_save_markers(jpeg, JPEG_COM, 0xFFFF);

-    //! \todo How do we fix the windows/libjpeg TRUE name clash?

-

-    libjpeg::boolean b =

-#if defined(DJV_WINDOWS)

-        1;

-#else

-        libjpeg::TRUE;

-#endif // DJV_WINDOWS

-

-    if (! libjpeg::jpeg_read_header(jpeg, b))

+    if (! libjpeg::jpeg_read_header(jpeg, static_cast<libjpeg::boolean>(1)))

     {

         return false;

     }

diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegPlugin.h djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegPlugin.h

--- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegPlugin.h    2015-09-14 08:16:34.000000000 +0300

+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegPlugin.h 2015-09-14 13:42:10.457921343 +0300

@@ -38,16 +38,6 @@

 #include <stdio.h>

-//! \todo Is there a better way to fix theses libjpeg / X11 / OS define

-//! conflicts?

-

-#if defined(TRUE)

-#undef TRUE

-#endif // TRUE

-#if defined(FALSE)

-#undef FALSE

-#endif // FALSE

-

 //! \todo This namespace is meant to resolve conflicts on Windows, is it still

 //! necessary?

diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegSave.cpp djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegSave.cpp

--- djv-1.0.5git.20141225.orig/plugins/djvJpegPlugin/djvJpegSave.cpp    2015-09-14 08:16:34.000000000 +0300

+++ djv-1.0.5git.20141225/plugins/djvJpegPlugin/djvJpegSave.cpp 2015-09-14 13:39:00.597577219 +0300

@@ -242,17 +242,9 @@

     libjpeg::jpeg_set_defaults(jpeg);

-    //! \todo How do we fix the windows/libjpeg TRUE name clash?

-

-    libjpeg::boolean b =

-#if defined(DJV_WINDOWS)

-        1;

-#else

-        libjpeg::TRUE;

-#endif // DJV_WINDOWS

-

-    libjpeg::jpeg_set_quality(jpeg, quality, b);

-    libjpeg::jpeg_start_compress(jpeg, b);

+   libjpeg::jpeg_set_quality(jpeg, quality, static_cast<libjpeg::boolean>(1));

+   libjpeg::jpeg_start_compress(jpeg, static_cast<libjpeg::boolean>(1));

+ 

     QString tag = info.tags[djvImageTags::tagLabels()[djvImageTags::DESCRIPTION]];

​