aboutsummaryrefslogtreecommitdiffstats
path: root/testing/opencolorio/OpenColorIO-gcc.patch
blob: de05849f28357429d0514a75367cf81be4db4db9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
From f39552d70098a98f7c1fb3b4f020b550ce2dd75a Mon Sep 17 00:00:00 2001
From: Patrick Hodoul <patrick.hodoul@autodesk.com>
Date: Mon, 27 Nov 2017 17:29:57 -0500
Subject: [PATCH] Fix Linux compilation Fix gcc 5.4.0 build breaks Fix the temp
 filename for Linux

---
 src/core/Lut1DOp.cpp                 |  4 +++-
 src/core/MathUtils.cpp               | 23 ++++++++++++-----------
 src/pyglue/PyAllocationTransform.cpp |  1 -
 3 files changed, 15 insertions(+), 13 deletions(-)

--- a/src/core/Lut1DOp.cpp
+++ b/src/core/Lut1DOp.cpp
@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
         {
             return simple_lut[clamp(index, 0.0f, maxIndex)];
         }
-        
+
+#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
         void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
         {
             float maxIndex[3];
@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
                 rgbaBuffer += 4;
             }
         }
+#endif
 #ifdef USE_SSE
         void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
         {
--- a/src/core/MathUtils.cpp
+++ b/src/core/MathUtils.cpp
@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
         GetV4Sum(vout, vout, v2);
     }
     
-    namespace
-    {
-    
-    void GetMxbResult(float* vout, float* m, float* x, float* v)
-    {
-        GetM44V4Product(vout, m, x);
-        GetV4Sum(vout, vout, v);
-    }
-    
-    } // anon namespace
-    
     bool GetMxbInverse(float* mout, float* vout,
                        const float* m_, const float* v_)
     {
@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
 
 #include "UnitTest.h"
 
+namespace
+{
+    
+    void GetMxbResult(float* vout, float* m, float* x, float* v)
+    {
+        GetM44V4Product(vout, m, x);
+        GetV4Sum(vout, vout, v);
+    }
+    
+}
+
+   
 OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
 {
     {
--- a/src/pyglue/PyAllocationTransform.cpp
+++ b/src/pyglue/PyAllocationTransform.cpp
@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
         ///
         
         int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
-        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);
         PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
         PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);
         PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);