diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 20:05:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 20:05:21 +0300 |
commit | 263830f0004481cd4921f03f4242d7c80794b08d (patch) | |
tree | 30b512a06df2e619681ecacf97faee69e46913f8 /source/blender/render/intern | |
parent | 7c86a1a95cbc643fdbbf8c28f0422face8a15a19 (diff) |
Enabled GCC -Wwrite-strings warning for CMake and replaced many 'char's for 'const char's,.
Only one functional change where Transform orientations passed "" to BIF_createTransformOrientation() which could then have the value written into.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index d3f52a5a911..e6c2a99446f 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -244,7 +244,7 @@ struct Render int (*test_break)(void *handle); void *tbh; - void (*error)(void *handle, char *str); + void (*error)(void *handle, const char *str); void *erh; RenderStats i; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 49ea0ac03e8..9c333b2d8c2 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -133,7 +133,7 @@ static void result_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr)) {} static void result_rcti_nothing(void *UNUSED(arg), RenderResult *UNUSED(rr), volatile struct rcti *UNUSED(rect)) {} static void stats_nothing(void *UNUSED(arg), RenderStats *UNUSED(rs)) {} static void float_nothing(void *UNUSED(arg), float UNUSED(val)) {} -static void print_error(void *UNUSED(arg), char *str) {printf("ERROR: %s\n", str);} +static void print_error(void *UNUSED(arg), const char *str) {printf("ERROR: %s\n", str);} static int default_break(void *UNUSED(arg)) {return G.afbreek == 1;} static void stats_background(void *UNUSED(arg), RenderStats *rs) @@ -278,7 +278,7 @@ static void pop_render_result(Render *re) /* NOTE: OpenEXR only supports 32 chars for layer+pass names In blender we now use max 10 chars for pass, max 20 for layer */ -static char *get_pass_name(int passtype, int channel) +static const char *get_pass_name(int passtype, int channel) { if(passtype == SCE_PASS_COMBINED) { @@ -471,7 +471,7 @@ static void render_unique_exr_name(Render *re, char *str, int sample) static void render_layer_add_pass(RenderResult *rr, RenderLayer *rl, int channels, int passtype) { - char *typestr= get_pass_name(passtype, 0); + const char *typestr= get_pass_name(passtype, 0); RenderPass *rpass= MEM_callocN(sizeof(RenderPass), typestr); int rectsize= rr->rectx*rr->recty*channels; @@ -1403,7 +1403,7 @@ void RE_test_break_cb(Render *re, void *handle, int (*f)(void *handle)) re->test_break= f; re->tbh= handle; } -void RE_error_cb(Render *re, void *handle, void (*f)(void *handle, char *str)) +void RE_error_cb(Render *re, void *handle, void (*f)(void *handle, const char *str)) { re->error= f; re->erh= handle; @@ -2663,7 +2663,7 @@ static int check_valid_camera(Scene *scene) return 1; } -int RE_is_rendering_allowed(Scene *scene, void *erh, void (*error)(void *handle, char *str)) +int RE_is_rendering_allowed(Scene *scene, void *erh, void (*error)(void *handle, const char *str)) { SceneRenderLayer *srl; |