From 2f87cca2e129471f57df0c3a8a3adc0c73a4811c Mon Sep 17 00:00:00 2001 From: Patrick Hodoul Date: Tue, 24 Mar 2020 15:26:17 -0400 Subject: [PATCH] Adsk Contrib - Fix macos issues (#973) Signed-off-by: Patrick Hodoul --- src/OpenColorIO/ImageDesc.cpp | 4 ++-- src/OpenColorIO/ops/log/LogOpGPU.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenColorIO/ImageDesc.cpp b/src/OpenColorIO/ImageDesc.cpp index 493ee4ff0..8471a9edd 100644 --- a/src/OpenColorIO/ImageDesc.cpp +++ b/src/OpenColorIO/ImageDesc.cpp @@ -34,8 +34,8 @@ std::ostream& operator<< (std::ostream& os, const ImageDesc& img) os << "gData=" << planarImg->getGData() << ", "; os << "bData=" << planarImg->getBData() << ", "; os << "aData=" << planarImg->getAData() << ", "; - os << "width=" << packedImg->getWidth() << ", "; - os << "height=" << packedImg->getHeight() << ", "; + os << "width=" << planarImg->getWidth() << ", "; + os << "height=" << planarImg->getHeight() << ", "; os << "xStrideBytes=" << planarImg->getXStrideBytes() << ", "; os << "yStrideBytes=" << planarImg->getYStrideBytes() << ""; os << ">"; diff --git a/src/OpenColorIO/ops/log/LogOpGPU.cpp b/src/OpenColorIO/ops/log/LogOpGPU.cpp index 7babb814d..411796133 100644 --- a/src/OpenColorIO/ops/log/LogOpGPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpGPU.cpp @@ -213,7 +213,7 @@ void AddCameraLogToLinShader(GpuShaderCreatorRcPtr & shaderCreator, st.newLine() << "logSeg = lin_slopeinv * (logSeg - lin_offset);"; // Combine linear and log segments. - st.newLine() << pixrgb << " = isAboveBreak * logSeg + ( " << st.vec4fConst(1.0f) << " - isAboveBreak ) * linSeg;"; + st.newLine() << pixrgb << " = isAboveBreak * logSeg + ( " << st.vec3fConst(1.0f) << " - isAboveBreak ) * linSeg;"; st.dedent(); st.newLine() << "}";