Commit: b90c7dd730f15a9708a6bfcb507bf7264508deba
Author: Campbell Barton
Date: Tue May 26 17:49:08 2015 +0200
Branches: master
https://developer.blender.org/rBb90c7dd730f15a9708a6bfcb507bf7264508deba
Building without OpenEXR works again
===================================================================
M source/blender/blenkernel/BKE_image.h
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/BKE_image.h
b/source/blender/blenkernel/BKE_image.h
index a2eb26d..facf3cf 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -64,7 +64,7 @@ typedef void (StampCallback)(void *data, const char
*propname, const char *propv
void BKE_render_result_stamp_info(struct Scene *scene, struct Object
*camera, struct RenderResult *rr);
void BKE_imbuf_stamp_info(struct RenderResult *rr, struct ImBuf *ibuf);
-void BKE_stamp_info_callback(void *data, struct StampData *stamp_data,
StampCallback callback);
+void BKE_stamp_info_callback(void *data, const struct StampData
*stamp_data, StampCallback callback);
void BKE_image_stamp_buf(struct Scene *scene, struct Object *camera,
unsigned char *rect, float *rectf, int width, int height, int channels);
bool BKE_imbuf_alpha_test(struct ImBuf *ibuf);
int BKE_imbuf_write_stamp(struct Scene *scene, struct RenderResult *rr,
struct ImBuf *ibuf, const char *name, struct ImageFormatData *imf);
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index f22a519..a8c5620 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2099,7 +2099,7 @@ void BKE_imbuf_stamp_info(RenderResult *rr, struct ImBuf
*ibuf)
if (stamp_data->rendertime[0]) IMB_metadata_change_field(ibuf,
"RenderTime", stamp_data->rendertime);
}
-void BKE_stamp_info_callback(void *data, struct StampData *stamp_data,
StampCallback callback)
+void BKE_stamp_info_callback(void *data, const struct StampData *stamp_data,
StampCallback callback)
{
if (!callback || !stamp_data) return;
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp
b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 1950fd8..22c854d 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -829,7 +829,7 @@ void IMB_exr_add_channel(void *handle, const char *layname,
const char *passname
}
/* used for output files (from RenderResult) (single and multilayer, single
and multiview) */
-int IMB_exr_begin_write(void *handle, const char *filename, int width, int
height, int compress, struct StampData *stamp)
+int IMB_exr_begin_write(void *handle, const char *filename, int width, int
height, int compress, const StampData *stamp)
{
ExrHandle *data = (ExrHandle *)handle;
Header header(width, height);
diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h
b/source/blender/imbuf/intern/openexr/openexr_multi.h
index dbef24c..77fa420 100644
--- a/source/blender/imbuf/intern/openexr/openexr_multi.h
+++ b/source/blender/imbuf/intern/openexr/openexr_multi.h
@@ -55,7 +55,7 @@ void *IMB_exr_get_handle_name(const char *name);
void IMB_exr_add_channel(void *handle, const char *layname, const char
*passname, const char *view, int xstride, int ystride, float *rect);
int IMB_exr_begin_read(void *handle, const char *filename, int *width, int
*height);
-int IMB_exr_begin_write(void *handle, const char *filename, int width, int
height, int compress, struct StampData *stamp);
+int IMB_exr_begin_write(void *handle, const char *filename, int width, int
height, int compress, const struct StampData *stamp);
void IMB_exrtile_begin_write(void *handle, const char *filename, int
mipmap, int width, int height, int tilex, int tiley);
void IMB_exr_set_channel(void *handle, const char *layname, const char
*passname, int xstride, int ystride, float *rect);
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
index ace1916..1a2ae7a 100644
--- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp
@@ -38,7 +38,7 @@ void IMB_exr_add_channel (void * /*handle*/, const
char * /*layname*/
int /*xstride*/, int /*ystride*/, float *
/*rect*/) { }
int IMB_exr_begin_read (void * /*handle*/, const char *
/*filename*/, int * /*width*/, int * /*height*/) { return 0;}
-int IMB_exr_begin_write (void * /*handle*/, const char *
/*filename*/, int /*width*/, int /*height*/, int /*compress*/) { return 0;}
+int IMB_exr_begin_write (void * /*handle*/, const char *
/*filename*/, int /*width*/, int /*height*/, int /*compress*/, const struct
StampData * /*stamp*/) { return 0;}
void IMB_exrtile_begin_write (void * /*handle*/, const char *
/*filename*/, int /*mipmap*/, int /*width*/, int /*height*/, int /*tilex*/, int
/*tiley*/) { }
void IMB_exr_set_channel (void * /*handle*/, const char *
/*layname*/, const char * /*passname*/, int /*xstride*/, int /*ystride*/, float
* /*rect*/) { }
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
