diff --git a/src/lib/OpenEXR/ImfInputPart.cpp b/src/lib/OpenEXR/ImfInputPart.cpp index 8b8d4ef952..a4ac6a30fd 100644 --- a/src/lib/OpenEXR/ImfInputPart.cpp +++ b/src/lib/OpenEXR/ImfInputPart.cpp @@ -55,7 +55,21 @@ InputPart::isComplete () const bool InputPart::isOptimizationEnabled () const { +#if defined(_MSC_VER) + __pragma(warning(push)) + __pragma(warning(disable: 4996)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + return file->isOptimizationEnabled (); + +#if defined(_MSC_VER) + __pragma(warning(pop)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic pop +#endif } void diff --git a/src/lib/OpenEXR/ImfInputPart.h b/src/lib/OpenEXR/ImfInputPart.h index c25a4fa63f..45b5cc781f 100644 --- a/src/lib/OpenEXR/ImfInputPart.h +++ b/src/lib/OpenEXR/ImfInputPart.h @@ -34,6 +34,7 @@ class IMF_EXPORT_TYPE InputPart const FrameBuffer& frameBuffer () const; IMF_EXPORT bool isComplete () const; + OPENEXR_DEPRECATED ("No longer meaningful") IMF_EXPORT bool isOptimizationEnabled () const; IMF_EXPORT diff --git a/src/lib/OpenEXR/ImfStandardAttributes.cpp b/src/lib/OpenEXR/ImfStandardAttributes.cpp index ced81abe8c..07b4712380 100644 --- a/src/lib/OpenEXR/ImfStandardAttributes.cpp +++ b/src/lib/OpenEXR/ImfStandardAttributes.cpp @@ -111,13 +111,27 @@ IMF_STD_ATTRIBUTE_IMP (reelName, ReelName, string) IMF_STD_ATTRIBUTE_IMP (chromaticities, Chromaticities, Chromaticities) IMF_STD_ATTRIBUTE_IMP (whiteLuminance, WhiteLuminance, float) IMF_STD_ATTRIBUTE_IMP (adoptedNeutral, AdoptedNeutral, V2f) + +#if defined(_MSC_VER) + __pragma(warning(push)) + __pragma(warning(disable: 4996)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif IMF_STD_ATTRIBUTE_IMP (renderingTransform, RenderingTransform, string) IMF_STD_ATTRIBUTE_IMP (lookModTransform, LookModTransform, string) +IMF_STD_ATTRIBUTE_IMP (dwaCompressionLevel, DwaCompressionLevel, float) +#if defined(_MSC_VER) + __pragma(warning(pop)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic pop +#endif + IMF_STD_ATTRIBUTE_IMP (envmap, Envmap, Envmap) IMF_STD_ATTRIBUTE_IMP (wrapmodes, Wrapmodes, string) IMF_STD_ATTRIBUTE_IMP (multiView, MultiView, StringVector) IMF_STD_ATTRIBUTE_IMP (deepImageState, DeepImageState, DeepImageState) -IMF_STD_ATTRIBUTE_IMP (dwaCompressionLevel, DwaCompressionLevel, float) IMF_STD_ATTRIBUTE_IMP (idManifest, IDManifest, CompressedIDManifest) IMF_STD_ATTRIBUTE_IMP (colorInteropID, ColorInteropID, string) diff --git a/src/test/OpenEXRTest/testOptimized.cpp b/src/test/OpenEXRTest/testOptimized.cpp index b7bfd102bc..a55c0cd9c3 100644 --- a/src/test/OpenEXRTest/testOptimized.cpp +++ b/src/test/OpenEXRTest/testOptimized.cpp @@ -318,7 +318,22 @@ readPixels (const char pFilename[], int pNbChannels, Array2D& pPixels) lFile.setFrameBuffer (lInputFrameBuffer); +#if defined(_MSC_VER) + __pragma(warning(push)) + __pragma(warning(disable: 4996)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + bool is_optimized = lFile.isOptimizationEnabled (); + +#if defined(_MSC_VER) + __pragma(warning(pop)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic pop +#endif + if (is_optimized) { cout << " optimization enabled\n"; diff --git a/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp b/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp index 7995865d00..53345cfaa2 100644 --- a/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp +++ b/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp @@ -565,7 +565,21 @@ readfile ( infile.header ().dataWindow ().min.y, infile.header ().dataWindow ().max.y); +#if defined(_MSC_VER) + __pragma(warning(push)) + __pragma(warning(disable: 4996)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + return infile.isOptimizationEnabled (); + +#if defined(_MSC_VER) + __pragma(warning(pop)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic pop +#endif } void diff --git a/src/test/OpenEXRTest/testStandardAttributes.cpp b/src/test/OpenEXRTest/testStandardAttributes.cpp index f65473bbe0..6715b924e9 100644 --- a/src/test/OpenEXRTest/testStandardAttributes.cpp +++ b/src/test/OpenEXRTest/testStandardAttributes.cpp @@ -899,14 +899,27 @@ generatedFunctions () assert (hasChromaticities (header) == false); assert (hasWhiteLuminance (header) == false); assert (hasAdoptedNeutral (header) == false); - assert (hasRenderingTransform (header) == false); - assert (hasLookModTransform (header) == false); assert (hasEnvmap (header) == false); assert (hasWrapmodes (header) == false); assert (hasMultiView (header) == false); assert (hasDeepImageState (header) == false); assert (hasIDManifest (header) == false); assert (hasColorInteropID (header) == false); + +#if defined(_MSC_VER) + __pragma(warning(push)) + __pragma(warning(disable: 4996)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + assert (hasRenderingTransform (header) == false); + assert (hasLookModTransform (header) == false); +#if defined(_MSC_VER) + __pragma(warning(pop)) +#elif defined(__clang__) || defined(__GNUC__) + #pragma GCC diagnostic pop +#endif } void