From 0117159719b710a3c9021068b0613200f3de77ea Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Tue, 12 Jan 2021 11:26:29 -0800 Subject: [PATCH 1/2] Include where required by newer compilers Signed-off-by: Cary Phillips --- src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp | 1 + src/lib/OpenEXR/ImfDeepTiledInputFile.cpp | 1 + src/lib/OpenEXR/ImfDwaCompressor.cpp | 1 + src/lib/OpenEXR/ImfTiledMisc.cpp | 1 + src/test/OpenEXRTest/testLargeDataWindowOffsets.cpp | 1 + src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp | 1 + 6 files changed, 6 insertions(+) diff --git a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp index d145a0a8da..29a620d84e 100644 --- a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp @@ -69,6 +69,7 @@ #include #include #include +#include #include "ImfNamespace.h" OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER diff --git a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp index 94452905ca..9ce2a6eaf9 100644 --- a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp @@ -65,6 +65,7 @@ #include #include #include +#include #include "ImfNamespace.h" diff --git a/src/lib/OpenEXR/ImfDwaCompressor.cpp b/src/lib/OpenEXR/ImfDwaCompressor.cpp index e3d1e68021..943c402293 100644 --- a/src/lib/OpenEXR/ImfDwaCompressor.cpp +++ b/src/lib/OpenEXR/ImfDwaCompressor.cpp @@ -156,6 +156,7 @@ #include #include #include +#include #include diff --git a/src/lib/OpenEXR/ImfTiledMisc.cpp b/src/lib/OpenEXR/ImfTiledMisc.cpp index 89ef97cb5c..06ea314481 100644 --- a/src/lib/OpenEXR/ImfTiledMisc.cpp +++ b/src/lib/OpenEXR/ImfTiledMisc.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include "ImfNamespace.h" diff --git a/src/test/OpenEXRTest/testLargeDataWindowOffsets.cpp b/src/test/OpenEXRTest/testLargeDataWindowOffsets.cpp index 52407b8f7f..85d9ce6a53 100644 --- a/src/test/OpenEXRTest/testLargeDataWindowOffsets.cpp +++ b/src/test/OpenEXRTest/testLargeDataWindowOffsets.cpp @@ -40,6 +40,7 @@ #include "ImfStandardAttributes.h" #include #include +#include #include #include #include diff --git a/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp b/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp index 07e64a1282..5bfa5afc01 100644 --- a/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp +++ b/src/test/OpenEXRTest/testOptimizedInterleavePatterns.cpp @@ -44,6 +44,7 @@ #include "ImfStandardAttributes.h" #include #include +#include #include #include #include From 0f7099e5963239647f1a1b3451b9290f85076cb9 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Wed, 13 Jan 2021 10:07:49 -0800 Subject: [PATCH 2/2] Removed redundant #include Signed-off-by: Cary Phillips --- src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp | 1 - src/lib/OpenEXR/ImfDeepTiledInputFile.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp index 29a620d84e..302b0d61df 100644 --- a/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepScanLineInputFile.cpp @@ -66,7 +66,6 @@ #include #include -#include #include #include #include diff --git a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp index 9ce2a6eaf9..884c34ce9b 100644 --- a/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp +++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.cpp @@ -62,7 +62,6 @@ #include #include -#include #include #include #include