Adsk Contrib - Hue curve python binding was not copying all parameters (#2276)

* Fix bug in hue curve python binding

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

* Pointer check improvement

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

* Dangling reference fix

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

---------

Signed-off-by: Doug Walker <doug.walker@autodesk.com>

Author: doug-walker

src/OpenColorIO/Config.cpp

@@ -798,7 +798,7 @@ class Config::Impl
         }
 
         const ViewVec & views = searchShared ? m_sharedViews : iter->second.m_views;
-        const auto & viewIt = FindView(views, view);
+        const auto viewIt = FindView(views, view);
 
         if (viewIt != views.end())
         {

src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp

@@ -856,25 +856,25 @@ void CTFReaderInfoElt::end()
 
 //////////////////////////////////////////////////////////
 
-void CTFReaderDescElt::start(const char **  atttributes )
+void CTFReaderDescElt::start(const char **  atts )
 {
     m_desc = {};
     m_language = {};
 
-    const char ** attr = atttributes;
-    while (*attr)
+    unsigned i = 0;
+    while (atts[i] && *atts[i])
     {
-        if (0 == Platform::Strcasecmp(ATTR_LANGUAGE, *attr))
+        if (0 == Platform::Strcasecmp(ATTR_LANGUAGE, *atts))
         {
-            if (!attr || !(attr + 1))
+            if (!atts[i + 1] || !*atts[i + 1])
             {
                 throwMessage("Attribute 'language' does not have a value.");
             }
 
-            m_language = *(attr + 1);
+            m_language = atts[i + 1];
         }
 
-        attr += 2;
+        i += 2;
     }
 }
 

src/bindings/python/PyGradingData.cpp

@@ -21,11 +21,14 @@ using GradingControlPointIterator = PyIterator<GradingBSplineCurveRcPtr, IT_CONT
 
 void CopyGradingBSpline(GradingBSplineCurveRcPtr to, const ConstGradingBSplineCurveRcPtr from)
 {
+    to->setSplineType(from->getSplineType());
+
     const size_t numPt = from->getNumControlPoints();
     to->setNumControlPoints(numPt);
     for (size_t pt = 0; pt < numPt; ++pt)
     {
         to->getControlPoint(pt) = from->getControlPoint(pt);
+        to->setSlope(pt, from->getSlope(pt));
     }
 }
 

tests/python/GradingDataTest.py

@@ -368,6 +368,29 @@ def test_huecurve(self):
         assertEqualBSpline(self, hcrv.lum_sat, ls)
         self.assertEqual(hcrv.lum_sat, ls)
 
+        # Check that setting the hue curve preserves the spline type.
+        hcrv.hue_sat = ls
+        ls2 = hcrv.hue_sat
+        # Spline type is now different than what hue_sat normally uses (PERIODIC_1_B_SPLINE).
+        self.assertEqual(ls2.getSplineType(), OCIO.HORIZONTAL1_B_SPLINE)
+        self.assertEqual(hcrv.hue_sat, ls)
+        self.assertEqual(ls2, ls)
+
+        # Check that setting the hue curve preserves the slopes.
+        self.assertEqual(ls.slopesAreDefault(), True)
+        slopes = ls.getSlopes()
+        slopes[1] = 0.5
+        ls.setSlopes(slopes)
+        self.assertEqual(ls.slopesAreDefault(), False)
+        hcrv.hue_sat = ls
+        ls2 = hcrv.hue_sat
+        self.assertEqual(ls2.slopesAreDefault(), False)
+        slopes2 = ls2.getSlopes()
+        self.assertEqual(slopes2[1], 0.5)
+        self.assertEqual(slopes2, slopes)
+        self.assertEqual(hcrv.hue_sat, ls)
+        self.assertEqual(ls2, ls)
+
     def test_rgbmsw(self):
         """
         Test the GradingRGBMSW struct.