rpms
/
OpenColorIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add patch to deal with null pointer in ImageDesc.cpp

This commit is contained in:
Richard Shaw 2021-06-08 21:20:03 -05:00
parent 120ae78e7f
commit 74873217aa
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenColorIO.spec
View File

@ -20,6 +20,8 @@ Patch0: OpenColorIO-setuptools.patch
# https://github.com/imageworks/OpenColorIO/issues/517
Patch1: ocio-1.1.0-yamlcpp060.patch
Patch2: ocio-glext_h.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1923344
Patch3: ocio-null_pointer.patch
# Utilities
BuildRequires: cmake gcc-c++
@ -73,8 +75,6 @@ BuildRequires: tex(cm-super-ts1.enc)
# Fonts
BuildRequires: texlive-cm texlive-ec texlive-times texlive-helvetic
BuildRequires: texlive-courier
# Font maps
BuildRequires: texlive-updmap-map
# Babel
BuildRequires: texlive-babel-english
# Styles

15
ocio-null_pointer.patch Normal file
View File

@ -0,0 +1,15 @@
Index: OpenColorIO-1.1.1/src/core/ImageDesc.cpp
===================================================================
--- OpenColorIO-1.1.1.orig/src/core/ImageDesc.cpp
+++ OpenColorIO-1.1.1/src/core/ImageDesc.cpp
@@ -57,8 +57,8 @@ OCIO_NAMESPACE_ENTER
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 << "yStrideBytes=" << planarImg->getYStrideBytes() << "";
os << ">";
}