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

Add patch for jpegouput.cpp error on i686.

This commit is contained in:
Richard M. Shaw 2015-01-27 14:18:19 -06:00
parent 1013dfc10c
commit 9ea7411614
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenImageIO.spec
View File

@ -14,6 +14,8 @@ Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}
# Images for test suite
#Source1: oiio-images.tar.gz
Patch0: oiio-1.5.10-jpeg.patch
BuildRequires: cmake
BuildRequires: txt2man
BuildRequires: qt4-devel
@ -84,6 +86,7 @@ Development files for package %{name}
%prep
%setup -q -n oiio-Release-%{version}
%patch0 -p1 -b .jpeg_fix
# Remove bundled pugixml
rm -f src/include/pugixml.hpp \

12
oiio-1.5.10-jpeg.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur oiio-Release-1.5.10.orig/src/jpeg.imageio/jpegoutput.cpp oiio-Release-1.5.10/src/jpeg.imageio/jpegoutput.cpp
--- oiio-Release-1.5.10.orig/src/jpeg.imageio/jpegoutput.cpp 2015-01-26 12:44:18.000000000 -0600
+++ oiio-Release-1.5.10/src/jpeg.imageio/jpegoutput.cpp 2015-01-27 14:15:41.190085145 -0600
@@ -269,7 +269,7 @@
if (icc_profile && icc_profile_length){
/* Calculate the number of markers we'll need, rounding up of course */
int num_markers = icc_profile_length / MAX_DATA_BYTES_IN_MARKER;
- if (num_markers * MAX_DATA_BYTES_IN_MARKER != icc_profile_length)
+ if ((unsigned int)(num_markers * MAX_DATA_BYTES_IN_MARKER) != icc_profile_length)
num_markers++;
int curr_marker = 1; /* per spec, count strarts at 1*/
std::vector<unsigned char> profile (MAX_DATA_BYTES_IN_MARKER + ICC_HEADER_SIZE);