Skip to content
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

Jump to bottom

Include exported OpenEXR headers with "" instead of <> #1097

Merged
merged 2 commits into from
Jul 19, 2021
Merged

Include exported OpenEXR headers with "" instead of <> #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddd5887
Include exported OpenEXR headers with "" instead of <>
cary-ilm Jul 18, 2021
eb792ef
Replace #include <IexBaseExc> with "IexBaseExc"
cary-ilm Jul 19, 2021
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
2 changes: 1 addition & 1 deletion src/lib/OpenEXR/ImfAttribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "ImfIO.h"
#include "ImfXdr.h"

#include <IexBaseExc.h>
#include "IexBaseExc.h"

#include <typeinfo>
#include <cstring>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXRCore/openexr_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define OPENEXR_CONF_H
#pragma once

#include <OpenEXRConfig.h>
#include "OpenEXRConfig.h"

/// \addtogroup ExportMacros
/// @{
Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXRUtil/ImfDeepImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "ImfImage.h"
#include "ImfUtilExport.h"

#include <ImfTileDescription.h>
#include "ImfTileDescription.h"

OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER

Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXRUtil/ImfFlatImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "ImfImage.h"
#include "ImfUtilExport.h"

#include <ImfTileDescription.h>
#include "ImfTileDescription.h"

OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER

Expand Down
4 changes: 2 additions & 2 deletions src/lib/OpenEXRUtil/ImfFlatImageChannel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "ImfUtilExport.h"
#include "ImfImageLevel.h"

#include <ImfPixelType.h>
#include <ImfFrameBuffer.h>
#include "ImfPixelType.h"
#include "ImfFrameBuffer.h"
#include <ImathBox.h>
#include <half.h>
Comment on lines 25 to 26
Copy link
Contributor

@lgritz lgritz Jul 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't these be

<Imath/ImathBox.h>

etc?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would seem reasonable, but our CMake files must not be set up that way. The compile flags have -I_build/_deps/imath-src/src/Imath. The Imath headers only end up in the Imath subfolder after the install step. During the build, they're referenced out of the cloned source directory.

If you configure cmake with -DCMAKE_INSTALL_PATH=, then it works for the OpenEXR headers to include <Imath/ImathBox.h>, because the cflags have -I/include.


Expand Down
4 changes: 2 additions & 2 deletions src/lib/OpenEXRUtil/ImfImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
#include "ImfNamespace.h"

#include "ImfImageLevel.h"
#include <ImfTileDescription.h>
#include <ImfArray.h>
#include "ImfTileDescription.h"
#include "ImfArray.h"

OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER

Expand Down
8 changes: 4 additions & 4 deletions src/lib/OpenEXRUtil/ImfImageChannel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

#include "ImfUtilExport.h"

#include <IexBaseExc.h>
#include <ImfPixelType.h>
#include <ImfFrameBuffer.h>
#include <ImfChannelList.h>
#include "ImfPixelType.h"
#include "ImfFrameBuffer.h"
#include "ImfChannelList.h"
#include "IexBaseExc.h"
#include <ImathBox.h>
#include <half.h>

Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXRUtil/ImfImageChannelRenaming.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//
//----------------------------------------------------------------------------

#include <ImfNamespace.h>
#include "ImfNamespace.h"
#include <string>
#include <map>

Expand Down
2 changes: 1 addition & 1 deletion src/lib/OpenEXRUtil/ImfImageDataWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//----------------------------------------------------------------------------

#include "ImfUtilExport.h"
#include <ImfNamespace.h>
#include "ImfNamespace.h"
#include <ImathBox.h>

OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
Expand Down