diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 11:33:28 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 13:17:08 +0300 |
commit | f68cfd6bb078482c4a779a6e26a56e2734edb5b8 (patch) | |
tree | 2878e5b80dba5bdeba186d99661d604eb38879cd /source/blender/render/intern | |
parent | c7b247a118e302a3afc6473797e53b6af28b69e2 (diff) |
Cleanup: replace C-style casts with functional casts for numeric types
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/engine.cc | 2 | ||||
-rw-r--r-- | source/blender/render/intern/initrender.cc | 2 | ||||
-rw-r--r-- | source/blender/render/intern/pipeline.cc | 2 | ||||
-rw-r--r-- | source/blender/render/intern/render_result.cc | 4 | ||||
-rw-r--r-- | source/blender/render/intern/texture_margin.cc | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index 87152822fab..9b5a5fff6b0 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -802,7 +802,7 @@ void RE_engine_frame_set(RenderEngine *engine, int frame, float subframe) DEG_ids_clear_recalc(engine->depsgraph, false); Render *re = engine->re; - double cfra = (double)frame + (double)subframe; + double cfra = double(frame) + double(subframe); CLAMP(cfra, MINAFRAME, MAXFRAME); BKE_scene_frame_set(re->scene, cfra); diff --git a/source/blender/render/intern/initrender.cc b/source/blender/render/intern/initrender.cc index 1ea93cbf6c8..591791587fe 100644 --- a/source/blender/render/intern/initrender.cc +++ b/source/blender/render/intern/initrender.cc @@ -128,7 +128,7 @@ float RE_filter_value(int type, float x) case R_FILTER_FAST_GAUSS: { const float two_gaussfac2 = 2.0f * gaussfac * gaussfac; x *= 3.0f * gaussfac; - return 1.0f / sqrtf((float)M_PI * two_gaussfac2) * expf(-x * x / two_gaussfac2); + return 1.0f / sqrtf(float(M_PI) * two_gaussfac2) * expf(-x * x / two_gaussfac2); } case R_FILTER_MITCH: diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 74db967885c..6bb3a1ffe11 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -1368,7 +1368,7 @@ static void do_render_sequencer(Render *re) /* set overall progress of sequence rendering */ if (re->r.efra != re->r.sfra) { - re->progress(re->prh, (float)(cfra - re->r.sfra) / (re->r.efra - re->r.sfra)); + re->progress(re->prh, float(cfra - re->r.sfra) / (re->r.efra - re->r.sfra)); } else { re->progress(re->prh, 1.0f); diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc index c628ed8d6fb..7c4b0713d7c 100644 --- a/source/blender/render/intern/render_result.cc +++ b/source/blender/render/intern/render_result.cc @@ -169,7 +169,7 @@ static void render_layer_allocate_pass(RenderResult *rr, RenderPass *rp) return; } - const size_t rectsize = ((size_t)rr->rectx) * rr->recty * rp->channels; + const size_t rectsize = size_t(rr->rectx) * rr->recty * rp->channels; rp->rect = MEM_cnew_array<float>(rectsize, rp->name); if (STREQ(rp->name, RE_PASSNAME_VECTOR)) { @@ -780,7 +780,7 @@ static void do_merge_tile( copylen = tilex = rrpart->rectx; tiley = rrpart->recty; - ofs = (((size_t)rrpart->tilerect.ymin) * rr->rectx + rrpart->tilerect.xmin); + ofs = (size_t(rrpart->tilerect.ymin) * rr->rectx + rrpart->tilerect.xmin); target += pixsize * ofs; copylen *= sizeof(float) * pixsize; diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index dda9999b843..201908234fe 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -245,8 +245,8 @@ class TextureMarginMap { for (int i = 0; i < maxPolygonSteps; i++) { /* Force to pixel grid. */ - int nx = (int)round(destX); - int ny = (int)round(destY); + int nx = int(round(destX)); + int ny = int(round(destY)); uint32_t polygon_from_map = get_pixel(nx, ny); if (other_poly == polygon_from_map) { found_pixel_in_polygon = true; @@ -562,8 +562,8 @@ static void generate_margin(ImBuf *ibuf, * our intersection tests where a pixel gets in between 2 faces or the middle of a quad, * camera aligned quads also have this problem but they are less common. * Add a small offset to the UVs, fixes bug T18685. */ - vec[a][0] = (uv[0] - uv_offset[0]) * (float)ibuf->x - (0.5f + 0.001f); - vec[a][1] = (uv[1] - uv_offset[1]) * (float)ibuf->y - (0.5f + 0.002f); + vec[a][0] = (uv[0] - uv_offset[0]) * float(ibuf->x) - (0.5f + 0.001f); + vec[a][1] = (uv[1] - uv_offset[1]) * float(ibuf->y) - (0.5f + 0.002f); } /* NOTE: we need the top bit for the dijkstra distance map. */ |