Cherry picked fixes for proposed 1.1.x release (#678)

* Fix wrong display returned by getDefaultDisplay() (#638)

* Fix window-specific issue in GetEnv()

While the content of result was correct, its length was set
to a wrong size.

This is a patch by Patrick Hodoul.

* Fix wrong display returned by getDefaultDisplay()

Solved by ignoring environment variable if it's an empty string.
Ideally, need to test it to be NULL instead to support obscure
case when empty string is passed. Unfortunately, this is not
possible with the current API, and is unlikely scenario anyway.

The issue was caused by wrong logic around parsing display/views
override environment variable: if it is missing, it was converted
to an empty string. That empty string was considered an override
of one element display, with an empty name.

Additionally, make it so getDisplay() returns displays in order
of either active_displays configuration variable or environment
variable override. the issue there was caused by wrong order of
arguments to vector intersection.

Conflicts:
	src/OpenColorIO/Platform.cpp
	src/core/Config.cpp

This commit was cherry-picked from 718cc7f. Changes were made
for compatibility with the older version of Platform.cpp; mainly
reverting "Getenv" to "getenv".

* Add Compatibility with OIIO 1.9+ API changes (#601)

This fix adds compatibility with OIIO 1.9+, minor ImageInput/ImageOutput API changes. At a certain point ImageInput::create switched from returning a raw pointer (that later needed to be deleted) to returning a std::unique_ptr.

* Correct ImageInput/ImageOutput swaps

* Restore C++03 compat when using old OIIO (#682)

We recently tried to change the OCIO code so that it would build
against both OIIO 2.0 as well as the older 1.x versions. In doing so,
we inadvertently broke OCIO for C++03.

This patch still requires C++11 when building against OIIO 2.x (it has
to), but is fine with C++03 if using older OIIO.
(cherry picked from commit 65a08db)

* Add note about C++11 requirement when building with newer OIIO version

* Add error directive to apps when incompatable C++ std and OIIO lib are used

Author: michdolan

src/apps/ocioconvert/main.cpp

@@ -39,6 +39,9 @@ namespace OCIO = OCIO_NAMESPACE;
 namespace OIIO = OIIO_NAMESPACE;
 #endif
 
+#if OIIO_VERSION >= 10903 && __cplusplus < 201103
+#error While not officially supported, compile with C++11 (or higher) to use OIIO versions 1.9.3 or newer
+#endif
 
 #include "argparse.h"
 
@@ -119,7 +122,11 @@ int main(int argc, const char **argv)
     std::cerr << "Loading " << inputimage << std::endl;
     try
     {
+#if OIIO_VERSION < 10903
         OIIO::ImageInput* f = OIIO::ImageInput::create(inputimage);
+#else
+        auto f = OIIO::ImageInput::create(inputimage);
+#endif
         if(!f)
         {
             std::cerr << "Could not create image input." << std::endl;
@@ -143,7 +150,9 @@ int main(int argc, const char **argv)
         memset(&img[0], 0, imgwidth*imgheight*components*sizeof(float));
 
         f->read_image(OIIO::TypeDesc::TypeFloat, &img[0]);
-        delete f;
+#if OIIO_VERSION < 10903
+        OIIO::ImageInput::destroy(f);
+#endif
 
         std::vector<int> kchannels;
         //parse --ch argument
@@ -308,7 +317,11 @@ int main(int argc, const char **argv)
     // Write out the result
     try
     {
+#if OIIO_VERSION < 10903
         OIIO::ImageOutput* f = OIIO::ImageOutput::create(outputimage);
+#else
+        auto f = OIIO::ImageOutput::create(outputimage);
+#endif
         if(!f)
         {
             std::cerr << "Could not create output input." << std::endl;
@@ -318,7 +331,9 @@ int main(int argc, const char **argv)
         f->open(outputimage, spec);
         f->write_image(OIIO::TypeDesc::FLOAT, &img[0]);
         f->close();
-        delete f;
+#if OIIO_VERSION < 10903
+        OIIO::ImageOutput::destroy(f);
+#endif
     }
     catch(...)
     {

src/apps/ociodisplay/main.cpp

@@ -41,8 +41,9 @@ namespace OCIO = OCIO_NAMESPACE;
 
 #include <OpenImageIO/imageio.h>
 #include <OpenImageIO/typedesc.h>
-#if (OIIO_VERSION < 10100)
-namespace OIIO = OIIO_NAMESPACE;
+
+#if OIIO_VERSION >= 10903 && __cplusplus < 201103
+#error While not officially supported, compile with C++11 (or higher) to use OIIO versions 1.9.3 or newer
 #endif
 
 #ifdef __APPLE__
@@ -106,7 +107,11 @@ static void InitImageTexture(const char * filename)
         std::cout << "loading: " << filename << std::endl;
         try
         {
+#if OIIO_VERSION < 10903
             OIIO::ImageInput* f = OIIO::ImageInput::create(filename);
+#else
+            auto f = OIIO::ImageInput::create(filename);
+#endif
             if(!f)
             {
                 std::cerr << "Could not create image input." << std::endl;
@@ -137,7 +142,9 @@ static void InitImageTexture(const char * filename)
                 OIIO::TypeDesc::TypeFloat, 
 #endif
                 &img[0]);
+#if OIIO_VERSION < 10903
             OIIO::ImageInput::destroy(f);
+#endif
         }
         catch(...)
         {

src/apps/ociolutimage/main.cpp

@@ -32,8 +32,9 @@ OCIO_NAMESPACE_USING;
 
 #include <OpenImageIO/imageio.h>
 #include <OpenImageIO/typedesc.h>
-#if (OIIO_VERSION < 10100)
-namespace OIIO = OIIO_NAMESPACE;
+
+#if OIIO_VERSION >= 10903 && __cplusplus < 201103
+#error While not officially supported, compile with C++11 (or higher) to use OIIO versions 1.9.3 or newer
 #endif
 
 #include "argparse.h"
@@ -116,7 +117,11 @@ void Generate(int cubesize, int maxwidth,
         processor->apply(imgdesc);
     }
 
+#if OIIO_VERSION < 10903
     OIIO::ImageOutput* f = OIIO::ImageOutput::create(outputfile);
+#else
+    auto f = OIIO::ImageOutput::create(outputfile);
+#endif
     if(!f)
     {
         throw Exception( "Could not create output image.");
@@ -128,7 +133,9 @@ void Generate(int cubesize, int maxwidth,
     f->open(outputfile, spec);
     f->write_image(OIIO::TypeDesc::FLOAT, &img[0]);
     f->close();
-    delete f;
+#if OIIO_VERSION < 10903
+    OIIO::ImageOutput::destroy(f);
+#endif
 }
 
 
@@ -137,7 +144,11 @@ void Extract(int cubesize, int maxwidth,
              const std::string & outputfile)
 {
     // Read the image
+#if OIIO_VERSION < 10903
     OIIO::ImageInput* f = OIIO::ImageInput::create(inputfile);
+#else
+    auto f = OIIO::ImageInput::create(inputfile);
+#endif
     if(!f)
     {
         throw Exception("Could not create input image.");
@@ -183,7 +194,9 @@ void Extract(int cubesize, int maxwidth,
     std::vector<float> img;
     img.resize(spec.width*spec.height*spec.nchannels, 0);
     f->read_image(OIIO::TypeDesc::TypeFloat, &img[0]);
-    delete f;
+#if OIIO_VERSION < 10903
+    OIIO::ImageInput::destroy(f);
+#endif
 
     // Repack into rgb
     // Convert the RGB[...] image to an RGB image, in place.