logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch (2786B)

    

  1. From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001

  2. From: Patrick Hodoul <patrick.hodoul@autodesk.com>

  3. Date: Mon, 27 Nov 2017 17:29:57 -0500

  4. Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp

  5. 

  6. Fix Linux compilation

  7. Fix gcc 5.4.0 build breaks

  8. Fix the temp filename for Linux

  9. ---

  10.  src/core/Lut1DOp.cpp                 |  4 +++-

  11.  src/core/MathUtils.cpp               | 23 ++++++++++++-----------

  12.  src/pyglue/PyAllocationTransform.cpp |  1 -

  13.  3 files changed, 15 insertions(+), 13 deletions(-)

  14. 

  15. diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp

  16. index 404ee0b..180e30f 100644

  17. --- a/src/core/Lut1DOp.cpp

  18. +++ b/src/core/Lut1DOp.cpp

  19. @@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER

  20.          {

  21.              return simple_lut[clamp(index, 0.0f, maxIndex)];

  22.          }

  23. -        

  24. +

  25. +#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)

  26.          void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)

  27.          {

  28.              float maxIndex[3];

  29. @@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER

  30.                  rgbaBuffer += 4;

  31.              }

  32.          }

  33. +#endif

  34.  #ifdef USE_SSE

  35.          void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)

  36.          {

  37. diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp

  38. index e1a26c0..3881eb3 100644

  39. --- a/src/core/MathUtils.cpp

  40. +++ b/src/core/MathUtils.cpp

  41. @@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER

  42.          GetV4Sum(vout, vout, v2);

  43.      }

  44.      

  45. -    namespace

  46. -    {

  47. -    

  48. -    void GetMxbResult(float* vout, float* m, float* x, float* v)

  49. -    {

  50. -        GetM44V4Product(vout, m, x);

  51. -        GetV4Sum(vout, vout, v);

  52. -    }

  53. -    

  54. -    } // anon namespace

  55. -    

  56.      bool GetMxbInverse(float* mout, float* vout,

  57.                         const float* m_, const float* v_)

  58.      {

  59. @@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING

  60.  

  61.  #include "UnitTest.h"

  62.  

  63. +namespace

  64. +{

  65. +

  66. +    void GetMxbResult(float* vout, float* m, float* x, float* v)

  67. +    {

  68. +        GetM44V4Product(vout, m, x);

  69. +        GetV4Sum(vout, vout, v);

  70. +    }

  71. +

  72. +}

  73. +

  74. +

  75.  OIIO_ADD_TEST(MathUtils, M44_is_diagonal)

  76.  {

  77.      {

  78. diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp

  79. index 20bb50e..06b418a 100644

  80. --- a/src/pyglue/PyAllocationTransform.cpp

  81. +++ b/src/pyglue/PyAllocationTransform.cpp

  82. @@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER

  83.          ///

  84.          

  85.          int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);

  86. -        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);

  87.          PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);

  88.          PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);

  89.          PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);

  90. -- 

  91. 2.15.1

  92.