diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-12 14:24:22 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-12 14:25:39 +0300 |
commit | 29529d2ac31a35f5cdd8c02e9c36cfcc1e0c7bc4 (patch) | |
tree | a449346b68565d0f982a33c54ae94b545deadd25 | |
parent | bac735380189c63d2b8824cba8e0398bb35e9af2 (diff) |
ImBuf: Update stubs so strict compiler is happy about unused arguments
Also use C++-style unused arguments tagging instead of legacy c-style.
It's less annoying this way because does not require adding argument to
two places of the function.
-rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_stub.cpp | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp index c326efd2427..ace19165ef5 100644 --- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp @@ -31,55 +31,53 @@ #include "openexr_api.h" #include "openexr_multi.h" -#include "BLI_utildefines.h" /* UNUSED_VARS */ void *IMB_exr_get_handle (void) {return NULL;} -void *IMB_exr_get_handle_name (const char *name) {(void)name; return NULL;} -void IMB_exr_add_channel (void *handle, const char *layname, const char *passname, const char *view, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)passname; (void)xstride; (void)ystride; (void)rect; } +void *IMB_exr_get_handle_name (const char * /*name*/) { return NULL;} +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) { (void)handle; (void)filename; (void)width; (void)height; return 0;} -int IMB_exr_begin_write (void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;} -void IMB_exrtile_begin_write (void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; } +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;} +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) { (void)handle; (void)layname; (void)passname; (void)xstride; (void)ystride; (void)rect; } -float *IMB_exr_channel_rect (void *handle, const char *layname, const char *passname, const char *view) { (void)handle; (void)layname; (void)passname; (void)view; return NULL; } +void IMB_exr_set_channel (void * /*handle*/, const char * /*layname*/, const char * /*passname*/, int /*xstride*/, int /*ystride*/, float * /*rect*/) { } +float *IMB_exr_channel_rect (void * /*handle*/, const char * /*layname*/, const char * /*passname*/, const char * /*view*/) { return NULL; } -void IMB_exr_read_channels (void *handle) { (void)handle; } -void IMB_exr_write_channels (void *handle) { (void)handle; } -void IMB_exrtile_write_channels (void *handle, int partx, int party, int level, const char *viewname) { UNUSED_VARS(handle, partx, party, level, viewname); } -void IMB_exrmultiview_write_channels(void *handle, const char *viewname) { UNUSED_VARS(handle, viewname); } -void IMB_exr_clear_channels (void *handle) { (void)handle; } +void IMB_exr_read_channels (void * /*handle*/) { } +void IMB_exr_write_channels (void * /*handle*/) { } +void IMB_exrtile_write_channels (void * /*handle*/, int /*partx*/, int /*party*/, int /*level*/, const char * /*viewname*/) { } +void IMB_exrmultiview_write_channels(void * /*handle*/, const char * /*viewname*/) { } +void IMB_exr_clear_channels (void * /*handle*/) { } void IMB_exr_multilayer_convert( - void *handle, void *base, - void * (*addview)(void *base, const char *str), - void * (*addlayer)(void *base, const char *str), - void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan, - const char *chan_id, const char *view)) + void * /*handle*/, void * /*base*/, + void * (* /*addview*/)(void *base, const char *str), + void * (* /*addlayer*/)(void *base, const char *str), + void (* /*addpass*/)(void *base, void *lay, const char *str, float *rect, int totchan, + const char *chan_id, const char *view)) { - UNUSED_VARS(handle, base, addview, addlayer, addpass); } 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 *base, const char *str), + void (* /*addbuffer*/)(void *base, const char *str, struct ImBuf *ibuf, const int frame), + const int /*frame*/) { - UNUSED_VARS(handle, base, addview, addbuffer, 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)) + 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)) { - UNUSED_VARS(ibuf, name, flags, totviews, getview, getbuffer); return false; } -void IMB_exr_close (void *handle) { (void)handle; } +void IMB_exr_close (void * /*handle*/) { } -void IMB_exr_add_view(void *handle, const char *name) { UNUSED_VARS(handle, name); } -int IMB_exr_split_token(const char *str, const char *end, const char **token) { UNUSED_VARS(str, end, token); return 1; } -bool IMB_exr_has_multilayer(void *handle) { UNUSED_VARS(handle); return false; } -bool IMB_exr_has_singlelayer_multiview(void *handle) { UNUSED_VARS(handle); return false; } +void IMB_exr_add_view(void * /*handle*/, const char * /*name*/) { } +int IMB_exr_split_token(const char * /*str*/, const char * /*end*/, const char ** /*token*/) { return 1; } +bool IMB_exr_has_multilayer(void * /*handle*/) { return false; } +bool IMB_exr_has_singlelayer_multiview(void * /*handle*/) { return false; } |