Skip to content

Suppress deprecation warnings for isOptimizationEnabled and standard attributes #2124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Suppress deprecation warnings for isOptimizationEnabled and standard attributes #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/lib/OpenEXR/ImfInputPart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/lib/OpenEXR/ImfInputPart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion src/lib/OpenEXR/ImfStandardAttributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
15 changes: 15 additions & 0 deletions src/test/OpenEXRTest/testOptimized.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,22 @@ readPixels (const char pFilename[], int pNbChannels, Array2D<half>& 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";
Expand Down
14 changes: 14 additions & 0 deletions src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 15 additions & 2 deletions src/test/OpenEXRTest/testStandardAttributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading