blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Building without OpenEXR works again

This commit is contained in:
Campbell Barton 2015-05-26 17:49:08 +02:00
parent d45c4af469
commit b90c7dd730
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_image.h
View File

@ -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);

2
source/blender/blenkernel/intern/image.c
View File

@ -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;

2
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@ -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);

2
source/blender/imbuf/intern/openexr/openexr_multi.h
View File

@ -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);

2
source/blender/imbuf/intern/openexr/openexr_stub.cpp
View File

@ -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*/) { }