Fix broken clang build.

Author: c-lipka

source/base/image/jpeg.cpp

@@ -51,12 +51,21 @@
 #include <memory>
 #include <string>
 
+// Make sure we can later identify whether JPEGlib wants `TRUE` and `FALSE` to be macros.
+#undef TRUE
+#undef FALSE
+
 // Other 3rd party header files
 extern "C"
 {
 #include <jpeglib.h>
 }
 
+// Check whether JPEGlib wants `TRUE` and `FALSE` to be macros.
+#ifdef TRUE
+#define POV_KEEP_BOOLEAN_MACROS
+#endif
+
 // POV-Ray header files (base module)
 #include "base/fileinputoutput.h"
 #include "base/image/colourspace.h"
@@ -68,6 +77,13 @@ extern "C"
 // this must be the last file included
 #include "base/povdebug.h"
 
+// Work around an issue on Mac OS X, where `TRUE` and `FALSE` are defined
+// _somewhere_, in a manner that is incompatible with JPEGlib.
+#ifndef POV_KEEP_BOOLEAN_MACROS
+#undef TRUE
+#undef FALSE
+#endif
+
 namespace pov_base
 {
 

source/base/stringutilities.cpp

@@ -438,7 +438,7 @@ struct CharsetUCS4 final : public CharsetUCS4Subset
     }
 };
 
-static const CharsetUCS4 kCharsetUCS4;
+static const auto kCharsetUCS4 = CharsetUCS4();
 
 //------------------------------------------------------------------------------
 
@@ -459,7 +459,7 @@ struct CharsetUCS2 final : public CharsetUCS4Subset
     }
 };
 
-static const CharsetUCS2 kCharsetUCS2;
+static const auto kCharsetUCS2 = CharsetUCS2();
 
 //------------------------------------------------------------------------------
 
@@ -480,7 +480,7 @@ struct CharsetLatin1 final : public CharsetUCS4Subset
     }
 };
 
-static const CharsetLatin1 kCharsetLatin1;
+static const auto kCharsetLatin1 = CharsetLatin1();
 
 //------------------------------------------------------------------------------
 
@@ -501,7 +501,7 @@ struct CharsetASCII final : public CharsetUCS4Subset
     }
 };
 
-static const CharsetASCII kCharsetASCII;
+static const auto kCharsetASCII = CharsetASCII();
 
 //------------------------------------------------------------------------------
 
@@ -512,8 +512,8 @@ struct CharsetExtendedASCII final : public Charset
         int i = 0;
         for (UCS4 c : highCharacters)
             mHighCharacters[i++] = c;
-        while (i < kNumNonASCIICharacters)
-            mHighCharacters[i++] = kFirstNonASCIICharacter + i;
+        for (; i < kNumNonASCIICharacters; ++i)
+            mHighCharacters[i] = kFirstNonASCIICharacter + i;
     }
 
     virtual bool Encode(POV_UINT32& result, UCS4 character) const override