[Bf-blender-cvs] [cb12fac] multiview: OpenEXR: cleanup (using C++ reference when possible)
Dalai Felinto
noreply at git.blender.org
Wed Sep 17 14:12:39 CEST 2014
Commit: cb12fac477c21ace4efb9eb4dde2aa04b5f26451
Author: Dalai Felinto
Date: Tue Sep 16 18:56:02 2014 +0200
Branches: multiview
https://developer.blender.org/rBcb12fac477c21ace4efb9eb4dde2aa04b5f26451
OpenEXR: cleanup (using C++ reference when possible)
===================================================================
M source/blender/blenkernel/intern/image.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/openexr/openexr_multi.h
M source/blender/imbuf/intern/openexr/openexr_stub.cpp
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 938e316..7c6c495 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2827,7 +2827,7 @@ bool BKE_image_save_openexr_multiview(Image *ima, ImBuf *ibuf, const char *filep
BLI_path_abs(name, G.main->name);
ibuf->userdata = ima;
- ok = IMB_exr_save_openexr_multiview(ibuf, name, flags, BLI_countlist(&ima->views), image_get_view_cb, image_get_buffer_cb);
+ ok = IMB_exr_multiview_save(ibuf, name, flags, BLI_countlist(&ima->views), image_get_view_cb, image_get_buffer_cb);
ibuf->userdata = NULL;
return ok;
@@ -2914,7 +2914,7 @@ static void image_create_multiview(Image *ima, ImBuf *ibuf, const int frame)
{
image_free_views(ima);
- IMB_exr_singlelayer_multiview_convert(ibuf->userdata, ima, image_add_view_cb, image_add_buffer_cb, frame);
+ IMB_exr_multiview_convert(ibuf->userdata, ima, image_add_view_cb, image_add_buffer_cb, frame);
image_update_multiview_flags(ima);
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 8d808aa..c1bbad0 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -556,9 +556,9 @@ int imb_save_openexr(struct ImBuf *ibuf, const char *name, int flags)
}
}
-static bool imb_save_multiview_openexr(ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
- const char * (*getview)(void *base, const size_t view_id),
- ImBuf * (*getbuffer)(void *base, const size_t view_id))
+static bool imb_save_openexr_multiview(ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
+ const char * (*getview)(void *base, const size_t view_id),
+ ImBuf * (*getbuffer)(void *base, const size_t view_id))
{
if (flags & IB_mem) {
printf("OpenEXR-save: Create multiview EXR in memory CURRENTLY NOT SUPPORTED !\n");
@@ -578,13 +578,14 @@ static bool imb_save_multiview_openexr(ImBuf *ibuf, const char *name, const int
}
}
-/* if we have more multiview formats in the future, the function below could be incorporated
+/* Save single-layer multiview OpenEXR
+ * If we have more multiview formats in the future, the function below could be incorporated
* in our ImBuf write functions, meanwhile this is an OpenEXR special case only */
-bool IMB_exr_save_openexr_multiview(ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
- const char * (*getview)(void *base, size_t view_id),
- ImBuf * (*getbuffer)(void *base, const size_t view_id))
+bool IMB_exr_multiview_save(ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
+ const char * (*getview)(void *base, size_t view_id),
+ ImBuf * (*getbuffer)(void *base, const size_t view_id))
{
- return imb_save_multiview_openexr(ibuf, name, flags, totviews, getview, getbuffer);
+ return imb_save_openexr_multiview(ibuf, name, flags, totviews, getview, getbuffer);
}
/* ********************* Nicer API, MultiLayer and with Tile file support ************************************ */
@@ -1369,10 +1370,10 @@ void IMB_exr_multilayer_convert(void *handle, void *base,
}
}
-void IMB_exr_singlelayer_multiview_convert(void *handle, void *base,
- void (*addview)(void *base, const char *str),
- void (*addbuffer)(void *base, const char *str, ImBuf *ibuf, const int frame),
- const int frame)
+void IMB_exr_multiview_convert(void *handle, void *base,
+ void (*addview)(void *base, const char *str),
+ void (*addbuffer)(void *base, const char *str, ImBuf *ibuf, const int frame),
+ const int frame)
{
ExrHandle *data = (ExrHandle *)handle;
MultiPartInputFile *file = data->ifile;
diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h
index 0b945f6..1733cac 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/intern/openexr/openexr_multi.h
@@ -72,14 +72,14 @@ void IMB_exr_multilayer_convert(void *handle, void *base,
void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan,
const char *chan_id, const char *view));
-void IMB_exr_singlelayer_multiview_convert(void *handle, void *base,
- void (*addview)(void *base, const char *str),
- void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf, const int frame),
- const int frame);
-
-bool IMB_exr_save_openexr_multiview (struct ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
- const char * (*getview)(void *base, size_t view_id),
- struct ImBuf * (*getbuffer)(void *base, const size_t view_id));
+void IMB_exr_multiview_convert(void *handle, void *base,
+ void (*addview)(void *base, const char *str),
+ void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf, const int frame),
+ const int frame);
+
+bool IMB_exr_multiview_save (struct ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
+ const char * (*getview)(void *base, size_t view_id),
+ struct ImBuf * (*getbuffer)(void *base, const size_t view_id));
void IMB_exr_close(void *handle);
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index 0368870..91ed0f0 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -58,16 +58,16 @@ void IMB_exr_multilayer_convert (void *handle, void *base,
(void)handle; (void)base; (void)addlayer; (void)addpass;
}
-void IMB_exr_singlelayer_multiview_convert(void *handle, void *base,
- void (*addview)(void *base, const char *str),
- void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf, const int frame), const int frame)
+void IMB_exr_multiview_convert(void *handle, void *base,
+ void (*addview)(void *base, const char *str),
+ void (*addbuffer)(void *base, const char *str, struct ImBuf *ibuf, const int frame), const int frame)
{
(void)handle; (void)base; (void)addview; (void)addbuffer; (void)frame;
}
-bool IMB_exr_save_openexr_multiview (struct ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
- const char * (*getview)(void *base, size_t view_id),
- struct ImBuf * (*getbuffer)(void *base, const size_t view_id))
+bool IMB_exr_multiview_save (struct ImBuf *ibuf, const char *name, const int flags, const size_t totviews,
+ const char * (*getview)(void *base, size_t view_id),
+ struct ImBuf * (*getbuffer)(void *base, const size_t view_id))
{
(void)ibuf; (void)name; (void)flags; (void)depth; (void)totviews; (void)getview; (void)getbuffer;
}
More information about the Bf-blender-cvs
mailing list