Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-09-25 10:04:52 +0300
committerCampbell Barton <campbell@blender.org>2022-09-25 11:26:27 +0300
commit891949cbb47143420f4324cb60efc05ef5d70b39 (patch)
treefe70a45612ae96f9ce1f37378ef5ff035d3127f5 /source/blender/render/intern
parentc9e35c2ced92082c86f1ecb9ecd16c6230218c7c (diff)
Cleanup: use 'u' prefixed integer types for brevity & cast style
To use function style cast '(unsigned char)x' can't be replaced by 'unsigned char(x)'.
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r--source/blender/render/intern/bake.c2
-rw-r--r--source/blender/render/intern/pipeline.cc9
-rw-r--r--source/blender/render/intern/render_result.cc18
3 files changed, 10 insertions, 19 deletions
diff --git a/source/blender/render/intern/bake.c b/source/blender/render/intern/bake.c
index c383d13e4e1..59719fb4590 100644
--- a/source/blender/render/intern/bake.c
+++ b/source/blender/render/intern/bake.c
@@ -456,7 +456,7 @@ static TriTessFace *mesh_calc_tri_tessface(Mesh *me, bool tangent, Mesh *me_eval
TriTessFace *triangles;
/* calculate normal for each polygon only once */
- unsigned int mpoly_prev = UINT_MAX;
+ uint mpoly_prev = UINT_MAX;
float no[3];
const MVert *verts = BKE_mesh_verts(me);
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc
index 3c9849591f4..74db967885c 100644
--- a/source/blender/render/intern/pipeline.cc
+++ b/source/blender/render/intern/pipeline.cc
@@ -475,7 +475,7 @@ void RE_ReleaseResultImage(Render *re)
}
}
-void RE_ResultGet32(Render *re, unsigned int *rect)
+void RE_ResultGet32(Render *re, uint *rect)
{
RenderResult rres;
const int view_id = BKE_scene_multiview_view_id_get(&re->r, re->viewname);
@@ -491,10 +491,7 @@ void RE_ResultGet32(Render *re, unsigned int *rect)
RE_ReleaseResultImageViews(re, &rres);
}
-void RE_AcquiredResultGet32(Render *re,
- RenderResult *result,
- unsigned int *rect,
- const int view_id)
+void RE_AcquiredResultGet32(Render *re, RenderResult *result, uint *rect, const int view_id)
{
render_result_rect_get_pixels(result,
rect,
@@ -1241,7 +1238,7 @@ static void renderresult_stampinfo(Render *re)
BKE_image_stamp_buf(re->scene,
ob_camera_eval,
(re->r.stamp & R_STAMP_STRIPMETA) ? rres.stamp_data : nullptr,
- (unsigned char *)rres.rect32,
+ (uchar *)rres.rect32,
rres.rectf,
rres.rectx,
rres.recty,
diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc
index 8b7a07e2b3f..c628ed8d6fb 100644
--- a/source/blender/render/intern/render_result.cc
+++ b/source/blender/render/intern/render_result.cc
@@ -654,8 +654,8 @@ static int order_render_passes(const void *a, const void *b)
/* 1 if `a` is after `b`. */
RenderPass *rpa = (RenderPass *)a;
RenderPass *rpb = (RenderPass *)b;
- unsigned int passtype_a = passtype_from_name(rpa->name);
- unsigned int passtype_b = passtype_from_name(rpb->name);
+ uint passtype_a = passtype_from_name(rpa->name);
+ uint passtype_b = passtype_from_name(rpb->name);
/* Render passes with default type always go first. */
if (passtype_b && !passtype_a) {
@@ -1026,7 +1026,7 @@ ImBuf *RE_render_result_rect_to_ibuf(RenderResult *rr,
RenderView *rv = RE_RenderViewGetById(rr, view_id);
/* if not exists, BKE_imbuf_write makes one */
- ibuf->rect = (unsigned int *)rv->rect32;
+ ibuf->rect = (uint *)rv->rect32;
ibuf->rect_float = rv->rectf;
ibuf->zbuf_float = rv->rectz;
@@ -1112,7 +1112,7 @@ void render_result_rect_fill_zero(RenderResult *rr, const int view_id)
}
void render_result_rect_get_pixels(RenderResult *rr,
- unsigned int *rect,
+ uint *rect,
int rectx,
int recty,
const ColorManagedViewSettings *view_settings,
@@ -1125,14 +1125,8 @@ void render_result_rect_get_pixels(RenderResult *rr,
memcpy(rect, rv->rect32, sizeof(int) * rr->rectx * rr->recty);
}
else if (rv && rv->rectf) {
- IMB_display_buffer_transform_apply((unsigned char *)rect,
- rv->rectf,
- rr->rectx,
- rr->recty,
- 4,
- view_settings,
- display_settings,
- true);
+ IMB_display_buffer_transform_apply(
+ (uchar *)rect, rv->rectf, rr->rectx, rr->recty, 4, view_settings, display_settings, true);
}
else {
/* else fill with black */