From 857b2a9d3e6d1db788184a57d960f60b01206e42 Mon Sep 17 00:00:00 2001 From: Thiago Ize Date: Sun, 11 Aug 2024 15:43:33 -0600 Subject: [PATCH] Finish removing Imath include (#4371) https://github.com/lgritz/OpenImageIO/commit/4cb956b0a0a123376e468a5b5e6e188178ec077e lost this removal when resolving a merge conflict. This properly removes it. https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4076 implemented matrix44::inverse() so that we could stop including Imath.h. It removed the Imath.h include in the master/dev-2.6 branch but the dev-2.5 branch kept the include, likely because of an improperly resolved merge conflict. This PR removes the include like in master. No tests are needed. As long as it compiles, this should be good. I verified this builds on arm64. Signed-off-by: Thiago Ize <10453105+ThiagoIze@users.noreply.github.com> Co-authored-by: Thiago Ize <10453105+ThiagoIze@users.noreply.github.com> --- src/include/OpenImageIO/simd.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/include/OpenImageIO/simd.h b/src/include/OpenImageIO/simd.h index 05db5f636d..85ecd629cc 100644 --- a/src/include/OpenImageIO/simd.h +++ b/src/include/OpenImageIO/simd.h @@ -46,11 +46,6 @@ #include -// Without SSE, we need to fall back on Imath for matrix44 invert -#if !OIIO_SIMD_SSE -# include -#endif - ////////////////////////////////////////////////////////////////////////// // Sort out which SIMD capabilities we have and set definitions