[Bf-blender-cvs] [8bccc7d8611] master: Cleanup: add proper IMB_openexr.h instead of including file from intern/

Brecht Van Lommel noreply at git.blender.org
Tue Mar 22 01:37:46 CET 2022 

Commit: 8bccc7d8611a7379adc8d981bca18938ab0a5c27
Author: Brecht Van Lommel
Date:   Tue Mar 22 00:54:42 2022 +0100
Branches: master
https://developer.blender.org/rB8bccc7d8611a7379adc8d981bca18938ab0a5c27

Cleanup: add proper IMB_openexr.h instead of including file from intern/

===================================================================

M	source/blender/blenkernel/intern/image.cc
M	source/blender/blenkernel/intern/image_save.cc
M	source/blender/blenkernel/intern/movieclip.c
M	source/blender/blenkernel/intern/studiolight.c
M	source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
M	source/blender/compositor/operations/COM_OutputFileOperation.h
M	source/blender/editors/space_image/image_ops.c
M	source/blender/imbuf/CMakeLists.txt
R097	source/blender/imbuf/intern/openexr/openexr_multi.h	source/blender/imbuf/IMB_openexr.h
M	source/blender/imbuf/intern/openexr/CMakeLists.txt
M	source/blender/imbuf/intern/openexr/openexr_api.cpp
M	source/blender/imbuf/intern/openexr/openexr_stub.cpp
M	source/blender/makesdna/DNA_node_types.h
M	source/blender/nodes/composite/nodes/node_composite_output_file.cc
M	source/blender/render/RE_pipeline.h
M	source/blender/render/intern/render_result.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index f8fb2ec7e45..cfdd048495d 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -29,10 +29,7 @@
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
 #include "IMB_moviecache.h"
-
-#ifdef WITH_OPENEXR
-#  include "intern/openexr/openexr_multi.h"
-#endif
+#include "IMB_openexr.h"
 
 /* Allow using deprecated functionality for .blend file I/O. */
 #define DNA_DEPRECATED_ALLOW
diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc
index 3e7bc8a954a..f6ea814cbc0 100644
--- a/source/blender/blenkernel/intern/image_save.cc
+++ b/source/blender/blenkernel/intern/image_save.cc
@@ -19,8 +19,7 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 #include "BKE_colortools.h"
 #include "BKE_image.h"
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index c23110b4703..3a93b7cde84 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -60,6 +60,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_moviecache.h"
+#include "IMB_openexr.h"
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
@@ -68,10 +69,6 @@
 
 #include "BLO_read_write.h"
 
-#ifdef WITH_OPENEXR
-#  include "intern/openexr/openexr_multi.h"
-#endif
-
 static void free_buffers(MovieClip *clip);
 
 static void movie_clip_init_data(ID *id)
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index 811b6bfe182..7d0c6598440 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -25,13 +25,12 @@
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+#include "IMB_openexr.h"
 
 #include "GPU_texture.h"
 
 #include "MEM_guardedalloc.h"
 
-#include "intern/openexr/openexr_multi.h"
-
 /* Statics */
 static ListBase studiolights;
 static int last_studiolight_id = 0;
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index dac7a208e7e..6d36db3b777 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -11,7 +11,7 @@
 
 #include "DNA_color_types.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index 12fc9ddf5f6..51240082a80 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -10,7 +10,7 @@
 
 #include "DNA_color_types.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 35be7ffdb8b..1a7fb67954e 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -54,7 +54,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_moviecache.h"
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 #include "RE_pipeline.h"
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 294aa8bbb9c..25961e6e1d5 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -57,6 +57,7 @@ set(SRC
   IMB_imbuf_types.h
   IMB_metadata.h
   IMB_moviecache.h
+  IMB_openexr.h
   IMB_thumbs.h
   intern/IMB_allocimbuf.h
   intern/IMB_anim.h
diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/IMB_openexr.h
similarity index 97%
rename from source/blender/imbuf/intern/openexr/openexr_multi.h
rename to source/blender/imbuf/IMB_openexr.h
index f5a2f983b18..a41053b99bf 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/IMB_openexr.h
@@ -2,12 +2,12 @@
  * Copyright 2006 Blender Foundation. All rights reserved. */
 
 /** \file
- * \ingroup openexr
+ * \ingroup imbuf
  */
 
 #pragma once
 
-/* Experiment with more advanced EXR API. */
+/* API for reading and writing multilayer EXR files. */
 
 /* XXX layer+pass name max 64? */
 /* This api also supports max 8 channels per pass now. easy to fix! */
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 08b17764d12..681176d8cc4 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -18,8 +18,6 @@ set(INC_SYS
 
 set(SRC
   openexr_api.h
-  openexr_multi.h
-
   openexr_api.cpp
 )
 
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index d9b623cb765..aff9257d1f2 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -90,8 +90,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_metadata.h"
-
-#include "openexr_multi.h"
+#include "IMB_openexr.h"
 
 using namespace Imf;
 using namespace Imath;
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index 4ca4a8313b1..2a655360aa5 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -6,7 +6,8 @@
  */
 
 #include "openexr_api.h"
-#include "openexr_multi.h"
+
+#include "IMB_openexr.h"
 
 void *IMB_exr_get_handle(void)
 {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 609862eff4f..99d7e15fa7a 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -761,7 +761,7 @@ typedef struct NodeImageLayer {
   /* index in the Image->layers->passes lists */
   int pass_index DNA_DEPRECATED;
   /* render pass name */
-  /** Amount defined in openexr_multi.h. */
+  /** Amount defined in IMB_openexr.h. */
   char pass_name[64];
 } NodeImageLayer;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_output_file.cc b/source/blender/nodes/composite/nodes/node_composite_output_file.cc
index 0ddeee1d6a7..28de1f48b79 100644
--- a/source/blender/nodes/composite/nodes/node_composite_output_file.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_output_file.cc
@@ -22,9 +22,9 @@
 
 #include "WM_api.h"
 
-#include "node_composite_util.hh"
+#include "IMB_openexr.h"
 
-#include "intern/openexr/openexr_multi.h"
+#include "node_composite_util.hh"
 
 /* **************** OUTPUT FILE ******************** */
 
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index ed370d89dc2..cac320ad246 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -62,8 +62,8 @@ typedef struct RenderView {
 typedef struct RenderPass {
   struct RenderPass *next, *prev;
   int channels;
-  char name[64];   /* amount defined in openexr_multi.h */
-  char chan_id[8]; /* amount defined in openexr_multi.h */
+  char name[64];   /* amount defined in IMB_openexr.h */
+  char chan_id[8]; /* amount defined in IMB_openexr.h */
   float *rect;
   int rectx, recty;
 
diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 212df1e1c00..2fe6e6d3caa 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -34,8 +34,7 @@
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-
-#include "intern/openexr/openexr_multi.h"
+#include "IMB_openexr.h"
 
 #include "RE_engine.h"

More information about the Bf-blender-cvs mailing list