Release 1.5.11 (January 28, 2015) -- compared to 1.5.10)

----------------------------------------------
* Fix build breaks for very old versions of Ilmbase (1.6 and earlier)
  that lack a definition of V4f used by our simd.h. #1048
* Fix signed/unsigned warning on 32 bit platforms in jpeginput.cpp. #1049
This commit is contained in:
Richard M. Shaw 2015-01-28 12:34:28 -06:00
parent 9ea7411614
commit fa5af9455d
4 changed files with 6 additions and 17 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@ clog
/oiio-Release-1.4.15.tar.gz
/oiio-Release-1.4.16.tar.gz
/oiio-Release-1.5.10.tar.gz
/oiio-Release-1.5.11.tar.gz

View File

@ -2,7 +2,7 @@
#global beta beta1
Name: OpenImageIO
Version: 1.5.10
Version: 1.5.11
Release: 1%{?dist}
Summary: Library for reading and writing images
@ -14,8 +14,6 @@ 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
@ -86,7 +84,6 @@ 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 \
@ -163,6 +160,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
* Wed Jan 28 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.11-1
- Update to latest upstream release.
* Tue Jan 27 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.10-1
- Update to latest upstream release.

View File

@ -1,12 +0,0 @@
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);

View File

@ -1 +1 @@
6baca6bddde4163a880517ec52e281cf oiio-Release-1.5.10.tar.gz
adb19fe4773605a1987c2ea753d84bc3 oiio-Release-1.5.11.tar.gz