From ddfde2f0c74d9bbe03256c9c772c25174b415ea9 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Mon, 22 Jul 2013 13:39:45 -0500 Subject: [PATCH] Update patch for large unsigned value in test. --- oiio-typedef.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/oiio-typedef.patch b/oiio-typedef.patch index 7d3bddb..4b51352 100644 --- a/oiio-typedef.patch +++ b/oiio-typedef.patch @@ -103,3 +103,29 @@ index cf3717e..8a31dfc 100644 -- 1.8.1.6 +From db797a45b9060294ef02a879fde66c4265a90a14 Mon Sep 17 00:00:00 2001 +From: Larry Gritz +Date: Fri, 12 Jul 2013 10:51:13 -0700 +Subject: [PATCH] Fix compiler warnings with large unsigned value in test + +--- + src/libOpenImageIO/fmath_test.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libOpenImageIO/fmath_test.cpp b/src/libOpenImageIO/fmath_test.cpp +index fefaac0..fdf7f4e 100644 +--- a/src/libOpenImageIO/fmath_test.cpp ++++ b/src/libOpenImageIO/fmath_test.cpp +@@ -72,8 +72,8 @@ void test_bit_range_convert () + OIIO_CHECK_EQUAL ((bit_range_convert<2,20>(3)), 1048575); + OIIO_CHECK_EQUAL ((bit_range_convert<20,2>(1048575)), 3); + OIIO_CHECK_EQUAL ((bit_range_convert<20,21>(1048575)), 2097151); +- OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295)), 4294967295); +- OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295)), 65535); ++ OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295U)), 4294967295U); ++ OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295U)), 65535); + // These are not expected to work, since bit_range_convert only takes a + // regular 'unsigned int' as parameter. If we need >32 bit conversion, + // we need to add a uint64_t version of bit_range_convert. +-- +1.8.1.6