[Bf-blender-cvs] [e150f4f] multiview: From review: use _arr for arrays
Dalai Felinto
noreply at git.blender.org
Wed Nov 26 19:45:04 CET 2014
Commit: e150f4f268a881473364fd0764b8335b75b0a516
Author: Dalai Felinto
Date: Wed Nov 26 09:59:52 2014 -0200
Branches: multiview
https://developer.blender.org/rBe150f4f268a881473364fd0764b8335b75b0a516
>From review: use _arr for arrays
===================================================================
M source/blender/editors/render/render_opengl.c
M source/blender/render/intern/source/pipeline.c
===================================================================
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 1b1bfdc..092c0cb 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -99,7 +99,7 @@ typedef struct OGLRender {
int write_still;
ReportList *reports;
- bMovieHandle **mh;
+ bMovieHandle **mh_arr;
int cfrao, nfra;
size_t totvideos;
@@ -597,7 +597,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
oglrender->win = win;
oglrender->totvideos = 0;
- oglrender->mh = NULL;
+ oglrender->mh_arr = NULL;
return true;
}
@@ -608,13 +608,13 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
Scene *scene = oglrender->scene;
size_t i;
- if (oglrender->mh) {
+ if (oglrender->mh_arr) {
for (i = 0; i < oglrender->totvideos; i++) {
if (BKE_imtype_is_movie(scene->r.im_format.imtype)) {
- oglrender->mh[i]->end_movie();
+ oglrender->mh_arr[i]->end_movie();
}
}
- MEM_freeN(oglrender->mh);
+ MEM_freeN(oglrender->mh_arr);
}
if (oglrender->timer) { /* exec will not have a timer */
@@ -661,14 +661,14 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
BKE_scene_videos_dimensions_get(&scene->r, oglrender->sizex, oglrender->sizey, &width, &height);
- oglrender->mh = MEM_mallocN(sizeof(bMovieHandle) * oglrender->totvideos, "Movies");
+ oglrender->mh_arr = MEM_mallocN(sizeof(bMovieHandle) * oglrender->totvideos, "Movies");
for (i = 0; i < oglrender->totvideos; i++) {
- oglrender->mh[i] = BKE_movie_handle_get(scene->r.im_format.imtype);
+ oglrender->mh_arr[i] = BKE_movie_handle_get(scene->r.im_format.imtype);
/*XXX MV MOV need to come up with a solution for the name issue, because at the moment
* it's handling the name entirely inside the movie format */
- if (!oglrender->mh[i]->start_movie(scene, &scene->r, oglrender->sizex, oglrender->sizey, oglrender->reports)) {
+ if (!oglrender->mh_arr[i]->start_movie(scene, &scene->r, oglrender->sizex, oglrender->sizey, oglrender->reports)) {
screen_opengl_render_end(C, oglrender);
return 0;
}
@@ -743,7 +743,7 @@ static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)
rr = RE_AcquireResultRead(oglrender->re);
if (is_movie) {
- ok = RE_WriteRenderViewsMovie(oglrender->reports, rr, scene, &scene->r, oglrender->mh, oglrender->sizex, oglrender->sizey, oglrender->totvideos);
+ ok = RE_WriteRenderViewsMovie(oglrender->reports, rr, scene, &scene->r, oglrender->mh_arr, oglrender->sizex, oglrender->sizey, oglrender->totvideos);
if (ok) {
printf("Append frame %d", scene->r.cfra);
BKE_reportf(op->reports, RPT_INFO, "Appended frame: %d", scene->r.cfra);
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index d2c5bed..3244f2d 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3119,24 +3119,24 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen
printf("Stereo 3D not support for MultiLayer image: %s\n", name);
}
else {
- ImBuf *ibuf[3] = {NULL};
+ ImBuf *ibuf_arr[3] = {NULL};
const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
int i;
for (i = 0; i < 2; i++) {
int view_id = BLI_findstringindex(&rr->views, names[i], offsetof(RenderView, name));
- ibuf[i] = render_result_rect_to_ibuf(rr, rd, view_id);
- IMB_colormanagement_imbuf_for_write(ibuf[i], true, false, &scene->view_settings,
+ ibuf_arr[i] = render_result_rect_to_ibuf(rr, rd, view_id);
+ IMB_colormanagement_imbuf_for_write(ibuf_arr[i], true, false, &scene->view_settings,
&scene->display_settings, &scene->r.im_format);
- IMB_prepare_write_ImBuf(IMB_isfloat(ibuf[i]), ibuf[i]);
+ IMB_prepare_write_ImBuf(IMB_isfloat(ibuf_arr[i]), ibuf_arr[i]);
}
- ibuf[2] = IMB_stereoImBuf(&scene->r.im_format, ibuf[0], ibuf[1]);
+ ibuf_arr[2] = IMB_stereoImBuf(&scene->r.im_format, ibuf_arr[0], ibuf_arr[1]);
if (stamp)
- ok = BKE_imbuf_write_stamp(scene, camera, ibuf[2], name, &rd->im_format);
+ ok = BKE_imbuf_write_stamp(scene, camera, ibuf_arr[2], name, &rd->im_format);
else
- ok = BKE_imbuf_write(ibuf[2], name, &rd->im_format);
+ ok = BKE_imbuf_write(ibuf_arr[2], name, &rd->im_format);
if (ok == false)
printf("Render error: cannot save %s\n", name);
@@ -3154,22 +3154,22 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen
name[strlen(name) - 4] = 0;
BKE_add_image_extension(name, &imf);
- ibuf[2]->planes = 24;
+ ibuf_arr[2]->planes = 24;
- IMB_colormanagement_imbuf_for_write(ibuf[2], true, false, &scene->view_settings,
+ IMB_colormanagement_imbuf_for_write(ibuf_arr[2], true, false, &scene->view_settings,
&scene->display_settings, &imf);
if (stamp)
- ok = BKE_imbuf_write_stamp(scene, camera, ibuf[2], name, &rd->im_format);
+ ok = BKE_imbuf_write_stamp(scene, camera, ibuf_arr[2], name, &rd->im_format);
else
- ok = BKE_imbuf_write(ibuf[2], name, &imf);
+ ok = BKE_imbuf_write(ibuf_arr[2], name, &imf);
printf("Saved: %s\n", name);
}
/* imbuf knows which rects are not part of ibuf */
for (i = 0; i < 3; i++) {
- IMB_freeImBuf(ibuf[i]);
+ IMB_freeImBuf(ibuf_arr[i]);
}
}
}
@@ -3219,7 +3219,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scen
}
else { /* R_IMF_VIEWS_STEREO_3D */
const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
- ImBuf *ibuf[3] = {NULL};
+ ImBuf *ibuf_arr[3] = {NULL};
bool do_free[2] = {false, false};
size_t i;
@@ -3227,34 +3227,34 @@ bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scen
for (i = 0; i < 2; i++) {
int view_id = BLI_findstringindex(&rr->views, names[i], offsetof(RenderView, name));
- ibuf[i] = render_result_rect_to_ibuf(rr, &scene->r, view_id);
+ ibuf_arr[i] = render_result_rect_to_ibuf(rr, &scene->r, view_id);
/* note; the way it gets 32 bits rects is weak... */
- if (ibuf[i]->rect == NULL) {
- ibuf[i]->rect = MEM_mapallocN(sizeof(int) * width * height, "temp 32 bits rect");
- ibuf[i]->mall |= IB_rect;
- render_result_rect_get_pixels(rr, ibuf[i]->rect, width, height, &scene->view_settings, &scene->display_settings, view_id);
+ if (ibuf_arr[i]->rect == NULL) {
+ ibuf_arr[i]->rect = MEM_mapallocN(sizeof(int) * width * height, "temp 32 bits rect");
+ ibuf_arr[i]->mall |= IB_rect;
+ render_result_rect_get_pixels(rr, ibuf_arr[i]->rect, width, height, &scene->view_settings, &scene->display_settings, view_id);
do_free[i] = true;
}
- IMB_colormanagement_imbuf_for_write(ibuf[i], true, false, &scene->view_settings,
+ IMB_colormanagement_imbuf_for_write(ibuf_arr[i], true, false, &scene->view_settings,
&scene->display_settings, &scene->r.im_format);
}
- ibuf[2] = IMB_stereoImBuf(&scene->r.im_format, ibuf[0], ibuf[1]);
+ ibuf_arr[2] = IMB_stereoImBuf(&scene->r.im_format, ibuf_arr[0], ibuf_arr[1]);
- ok = mh[0]->append_movie(rd, scene->r.sfra, scene->r.cfra, (int *) ibuf[2]->rect,
- ibuf[2]->x, ibuf[2]->y, reports);
+ ok = mh[0]->append_movie(rd, scene->r.sfra, scene->r.cfra, (int *) ibuf_arr[2]->rect,
+ ibuf_arr[2]->x, ibuf_arr[2]->y, reports);
for (i = 0; i < 2; i++) {
if (do_free[i]) {
- MEM_freeN(ibuf[i]->rect);
- ibuf[i]->rect = NULL;
- ibuf[i]->mall &= ~IB_rect;
+ MEM_freeN(ibuf_arr[i]->rect);
+ ibuf_arr[i]->rect = NULL;
+ ibuf_arr[i]->mall &= ~IB_rect;
}
/* imbuf knows which rects are not part of ibuf */
- IMB_freeImBuf(ibuf[i]);
+ IMB_freeImBuf(ibuf_arr[i]);
}
}
More information about the Bf-blender-cvs
mailing list