diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 8 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_sequencer.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 48 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 10 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 45 | ||||
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 38 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_multi.h | 6 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_stub.cpp | 6 | ||||
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 10 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 32 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
14 files changed, 116 insertions, 104 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index aa698317e33..2eac5b6ce5e 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -153,17 +153,17 @@ bool BKE_scene_multiview_is_stereo3d(const struct RenderData *rd); bool BKE_scene_multiview_is_render_view_active(const struct RenderData *rd, const struct SceneRenderView *srv); bool BKE_scene_multiview_is_render_view_first(const struct RenderData *rd, const char *viewname); bool BKE_scene_multiview_is_render_view_last(const struct RenderData *rd, const char *viewname); -size_t BKE_scene_multiview_num_views_get(const struct RenderData *rd); +int BKE_scene_multiview_num_views_get(const struct RenderData *rd); struct SceneRenderView *BKE_scene_multiview_render_view_findindex(const struct RenderData *rd, const int view_id); const char *BKE_scene_multiview_render_view_name_get(const struct RenderData *rd, const int view_id); -size_t BKE_scene_multiview_view_id_get(const struct RenderData *rd, const char *viewname); +int BKE_scene_multiview_view_id_get(const struct RenderData *rd, const char *viewname); void BKE_scene_multiview_filepath_get(struct SceneRenderView *srv, const char *filepath, char *r_filepath); void BKE_scene_multiview_view_filepath_get(const struct RenderData *rd, const char *filepath, const char *view, char *r_filepath); const char *BKE_scene_multiview_view_suffix_get(const struct RenderData *rd, const char *viewname); -const char *BKE_scene_multiview_view_id_suffix_get(const struct RenderData *rd, const size_t view_id); +const char *BKE_scene_multiview_view_id_suffix_get(const struct RenderData *rd, const int view_id); void BKE_scene_multiview_view_prefix_get(struct Scene *scene, const char *name, char *rprefix, const char **rext); void BKE_scene_multiview_videos_dimensions_get(const struct RenderData *rd, const size_t width, const size_t height, size_t *r_width, size_t *r_height); -size_t BKE_scene_multiview_num_videos_get(const struct RenderData *rd); +int BKE_scene_multiview_num_videos_get(const struct RenderData *rd); #ifdef __cplusplus } diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index 06f46131c68..418179ceab7 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -101,7 +101,7 @@ typedef struct SeqRenderData { float motion_blur_shutter; bool skip_cache; bool is_proxy_render; - size_t view_id; + int view_id; /* special case for OpenGL render */ struct GPUOffScreen *gpu_offscreen; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 8f8ce6eeebc..ff305434b1b 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -100,7 +100,7 @@ static SpinLock image_spin; /* prototypes */ -static size_t image_num_files(struct Image *ima); +static int image_num_files(struct Image *ima); static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **r_lock); static void image_update_views_format(Image *ima, ImageUser *iuser); static void image_add_view(Image *ima, const char *viewname, const char *filepath); @@ -837,7 +837,7 @@ Image *BKE_image_add_generated(Main *bmain, unsigned int width, unsigned int hei Image *ima = image_alloc(bmain, name, IMA_SRC_GENERATED, IMA_TYPE_UV_TEST); if (ima) { - size_t view_id; + int view_id; const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME}; /* BLI_strncpy(ima->name, name, FILE_MAX); */ /* don't do this, this writes in ain invalid filepath! */ @@ -895,7 +895,7 @@ Image *BKE_image_add_from_imbuf(ImBuf *ibuf, const char *name) static void image_memorypack_multiview(Image *ima) { ImageView *iv; - size_t i; + int i; image_free_packedfiles(ima); @@ -996,7 +996,7 @@ void BKE_image_memorypack(Image *ima) void BKE_image_packfiles(ReportList *reports, Image *ima, const char *basepath) { - const size_t totfiles = image_num_files(ima); + const int totfiles = image_num_files(ima); if (totfiles == 1) { ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image packed file"); @@ -1028,7 +1028,7 @@ void BKE_image_packfiles(ReportList *reports, Image *ima, const char *basepath) void BKE_image_packfiles_from_mem(ReportList *reports, Image *ima, char *data, const size_t data_len) { - const size_t totfiles = image_num_files(ima); + const int totfiles = image_num_files(ima); if (totfiles != 1) { BKE_report(reports, RPT_ERROR, "Cannot pack multiview images from raw data currently..."); @@ -2665,7 +2665,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal) case IMA_SIGNAL_RELOAD: /* try to repack file */ if (BKE_image_has_packedfile(ima)) { - const size_t totfiles = image_num_files(ima); + const int totfiles = image_num_files(ima); if (totfiles != BLI_listbase_count_ex(&ima->packedfiles, totfiles + 1)) { /* in case there are new available files to be loaded */ @@ -2948,7 +2948,7 @@ void BKE_image_backup_render(Scene *scene, Image *ima) /**************************** multiview save openexr *********************************/ #ifdef WITH_OPENEXR -static const char *image_get_view_cb(void *base, const size_t view_id) +static const char *image_get_view_cb(void *base, const int view_id) { Image *ima = base; ImageView *iv = BLI_findlink(&ima->views, view_id); @@ -2957,7 +2957,7 @@ static const char *image_get_view_cb(void *base, const size_t view_id) #endif /* WITH_OPENEXR */ #ifdef WITH_OPENEXR -static ImBuf *image_get_buffer_cb(void *base, const size_t view_id) +static ImBuf *image_get_buffer_cb(void *base, const int view_id) { Image *ima = base; ImageUser iuser = {0}; @@ -3033,7 +3033,7 @@ static void image_add_view_cb(void *base, const char *str) static void image_add_buffer_cb(void *base, const char *str, ImBuf *ibuf, const int frame) { Image *ima = base; - size_t id; + int id; bool predivide = (ima->alpha_mode == IMA_ALPHA_PREMUL); const char *colorspace = ima->colorspace_settings.name; const char *to_colorspace = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_SCENE_LINEAR); @@ -3123,7 +3123,7 @@ static int imbuf_alpha_flags_for_image(Image *ima) } /* the number of files will vary according to the stereo format */ -static size_t image_num_files(Image *ima) +static int image_num_files(Image *ima) { const bool is_multiview = BKE_image_is_multiview(ima); @@ -3139,7 +3139,7 @@ static size_t image_num_files(Image *ima) } } -static ImBuf *load_sequence_single(Image *ima, ImageUser *iuser, int frame, const size_t view_id, bool *r_assign) +static ImBuf *load_sequence_single(Image *ima, ImageUser *iuser, int frame, const int view_id, bool *r_assign) { struct ImBuf *ibuf; char name[FILE_MAX]; @@ -3208,7 +3208,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame) { struct ImBuf *ibuf = NULL; const bool is_multiview = BKE_image_is_multiview(ima); - const size_t totfiles = image_num_files(ima); + const int totfiles = image_num_files(ima); bool assign = false; if (!is_multiview) { @@ -3218,9 +3218,9 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame) } } else { - size_t i; + const int totviews = BLI_listbase_count(&ima->views); + int i; struct ImBuf **ibuf_arr; - const size_t totviews = BLI_listbase_count(&ima->views); ibuf_arr = MEM_mallocN(sizeof(ImBuf *) * totviews, "Image Views Imbufs"); @@ -3305,7 +3305,7 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f return ibuf; } -static ImBuf *load_movie_single(Image *ima, ImageUser *iuser, int frame, const size_t view_id) +static ImBuf *load_movie_single(Image *ima, ImageUser *iuser, int frame, const int view_id) { struct ImBuf *ibuf = NULL; ImageAnim *ia; @@ -3365,8 +3365,8 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame) { struct ImBuf *ibuf = NULL; const bool is_multiview = BKE_image_is_multiview(ima); - const size_t totfiles = image_num_files(ima); - size_t i; + const int totfiles = image_num_files(ima); + int i; if (totfiles != BLI_listbase_count_ex(&ima->anims, totfiles + 1)) { image_free_anims(ima); @@ -3384,7 +3384,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame) } else { struct ImBuf **ibuf_arr; - const size_t totviews = BLI_listbase_count(&ima->views); + const int totviews = BLI_listbase_count(&ima->views); ibuf_arr = MEM_mallocN(sizeof(ImBuf *) * totviews, "Image Views (movie) Imbufs"); @@ -3426,7 +3426,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame) static ImBuf *load_image_single( Image *ima, ImageUser *iuser, int cfra, - const size_t view_id, + const int view_id, const bool has_packed, bool *r_assign) { @@ -3521,7 +3521,7 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra) struct ImBuf *ibuf = NULL; bool assign = false; const bool is_multiview = BKE_image_is_multiview(ima); - const size_t totfiles = image_num_files(ima); + const int totfiles = image_num_files(ima); bool has_packed = BKE_image_has_packedfile(ima); /* always ensure clean ima */ @@ -3542,9 +3542,9 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra) } } else { - size_t i; struct ImBuf **ibuf_arr; - const size_t totviews = BLI_listbase_count(&ima->views); + const int totviews = BLI_listbase_count(&ima->views); + int i; BLI_assert(totviews > 0); ibuf_arr = MEM_callocN(sizeof(ImBuf *) * totviews, "Image Views Imbufs"); @@ -3817,7 +3817,7 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **r_loc return ibuf; } -static size_t image_get_multiview_index(Image *ima, ImageUser *iuser) +static int image_get_multiview_index(Image *ima, ImageUser *iuser) { const bool is_multilayer = BKE_image_is_multilayer(ima); const bool is_backdrop = (ima->source == IMA_SRC_VIEWER) && (ima->type == IMA_TYPE_COMPOSITE) && (iuser == NULL); @@ -4617,7 +4617,7 @@ static void image_update_views_format(Image *ima, ImageUser *iuser) /* nothing to do */ } else if (ima->views_format == R_IMF_VIEWS_STEREO_3D) { - size_t i; + int i; const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME}; for (i = 0; i < 2; i++) { diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index cc656775c14..d73797ccbd1 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2296,10 +2296,10 @@ double BKE_scene_unit_scale(const UnitSettings *unit, const int unit_type, doubl /******************** multiview *************************/ -size_t BKE_scene_multiview_num_views_get(const RenderData *rd) +int BKE_scene_multiview_num_views_get(const RenderData *rd) { SceneRenderView *srv; - size_t totviews = 0; + int totviews = 0; if ((rd->scemode & R_MULTIVIEW) == 0) return 1; @@ -2432,7 +2432,7 @@ const char *BKE_scene_multiview_render_view_name_get(const RenderData *rd, const return ""; } -size_t BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname) +int BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname) { SceneRenderView *srv; size_t nr; @@ -2503,7 +2503,7 @@ const char *BKE_scene_multiview_view_suffix_get(const RenderData *rd, const char return viewname; } -const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, const size_t view_id) +const char *BKE_scene_multiview_view_id_suffix_get(const RenderData *rd, const int view_id) { if ((rd->scemode & R_MULTIVIEW) == 0) { return ""; @@ -2558,7 +2558,7 @@ void BKE_scene_multiview_videos_dimensions_get( } } -size_t BKE_scene_multiview_num_videos_get(const RenderData *rd) +int BKE_scene_multiview_num_videos_get(const RenderData *rd) { if (BKE_imtype_is_movie(rd->im_format.imtype) == false) return 0; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index c070ad73156..c11f3e880b0 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -95,8 +95,8 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seq static ImBuf *seq_render_strip(const SeqRenderData *context, Sequence *seq, float cfra); static void seq_free_animdata(Scene *scene, Sequence *seq); static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr, bool make_float); -static size_t seq_num_files(Scene *scene, char views_format, const bool is_multiview); -static void seq_anim_add_suffix(Scene *scene, struct anim *anim, const size_t view_id); +static int seq_num_files(Scene *scene, char views_format, const bool is_multiview); +static void seq_anim_add_suffix(Scene *scene, struct anim *anim, const int view_id); /* **** XXX ******** */ #define SELECT 1 @@ -799,8 +799,9 @@ void BKE_sequence_calc(Scene *scene, Sequence *seq) } } -static void seq_multiview_name(Scene *scene, const size_t view_id, const char *prefix, - const char *ext, char *r_path, size_t r_size) +static void seq_multiview_name( + Scene *scene, const int view_id, const char *prefix, const char *ext, + char *r_path, size_t r_size) { const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, view_id); BLI_snprintf(r_path, r_size, "%s%s%s", prefix, suffix, ext); @@ -857,7 +858,7 @@ void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, const bool lock_r if (is_multiview && (seq->views_format == R_IMF_VIEWS_INDIVIDUAL)) { char prefix[FILE_MAX]; const char *ext = NULL; - size_t totfiles = seq_num_files(scene, seq->views_format, true); + const int totfiles = seq_num_files(scene, seq->views_format, true); int i = 0; BKE_scene_multiview_view_prefix_get(scene, path, prefix, &ext); @@ -1383,7 +1384,7 @@ typedef struct SeqIndexBuildContext { int size_flags; int quality; bool overwrite; - size_t view_id; + int view_id; Main *bmain; Scene *scene; @@ -1424,7 +1425,7 @@ static double seq_rendersize_to_scale_factor(int size) } /* the number of files will vary according to the stereo format */ -static size_t seq_num_files(Scene *scene, char views_format, const bool is_multiview) +static int seq_num_files(Scene *scene, char views_format, const bool is_multiview) { if (!is_multiview) { return 1; @@ -1489,7 +1490,7 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile) } if (is_multiview && seq->views_format == R_IMF_VIEWS_INDIVIDUAL) { - size_t totfiles = seq_num_files(scene, seq->views_format, true); + int totfiles = seq_num_files(scene, seq->views_format, true); char prefix[FILE_MAX]; const char *ext = NULL; int i; @@ -1572,7 +1573,7 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile) } } -static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render_size, char *name, const size_t view_id) +static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render_size, char *name, const int view_id) { int frameno; char dir[PROXY_MAXFILE]; @@ -1630,7 +1631,7 @@ static bool seq_proxy_get_fname(Editing *ed, Sequence *seq, int cfra, int render } if (view_id > 0) - BLI_snprintf(suffix, sizeof(suffix), "_%zu", view_id); + BLI_snprintf(suffix, sizeof(suffix), "_%d", view_id); if (proxy->storage & SEQ_STORAGE_PROXY_CUSTOM_FILE && sanim && sanim->anim && ed->proxy_storage != SEQ_EDIT_PROXY_DIR_STORAGE) @@ -1782,7 +1783,7 @@ static void seq_proxy_build_frame(const SeqRenderData *context, Sequence *seq, i /* returns whether the file this context would read from even exist, if not, don't create the context */ -static bool seq_proxy_multiview_context_invalid(Sequence *seq, Scene *scene, const size_t view_id) +static bool seq_proxy_multiview_context_invalid(Sequence *seq, Scene *scene, const int view_id) { if ((scene->r.scemode & R_MULTIVIEW) == 0) return false; @@ -1818,9 +1819,9 @@ static bool seq_proxy_multiview_context_invalid(Sequence *seq, Scene *scene, con /** This returns the maximum possible number of required contexts */ -static size_t seq_proxy_context_count(Sequence *seq, Scene *scene) +static int seq_proxy_context_count(Sequence *seq, Scene *scene) { - size_t num_views = 1; + int num_views = 1; if ((scene->r.scemode & R_MULTIVIEW) == 0) return 1; @@ -1858,8 +1859,8 @@ void BKE_sequencer_proxy_rebuild_context(Main *bmain, Scene *scene, Sequence *se SeqIndexBuildContext *context; Sequence *nseq; LinkData *link; - size_t i; - size_t num_files; + int num_files; + int i; if (!seq->strip || !seq->strip->proxy) { return; @@ -2751,8 +2752,8 @@ static ImBuf *seq_render_image_strip(const SeqRenderData *context, Sequence *seq /* don't do anything */ } else if (is_multiview) { - size_t totfiles = seq_num_files(context->scene, seq->views_format, true); - size_t totviews; + const int totfiles = seq_num_files(context->scene, seq->views_format, true); + int totviews; struct ImBuf **ibufs_arr; char prefix[FILE_MAX]; const char *ext = NULL; @@ -2853,8 +2854,8 @@ static ImBuf *seq_render_movie_strip(const SeqRenderData *context, Sequence *seq if (is_multiview) { ImBuf **ibuf_arr; - size_t totviews; - size_t totfiles = seq_num_files(context->scene, seq->views_format, true); + const int totfiles = seq_num_files(context->scene, seq->views_format, true); + int totviews; int i; if (totfiles != BLI_listbase_count_ex(&seq->anims, totfiles + 1)) @@ -3228,7 +3229,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq } else { Render *re = RE_GetRender(scene->id.name); - size_t totviews = BKE_scene_multiview_num_views_get(&scene->r); + const int totviews = BKE_scene_multiview_num_views_get(&scene->r); int i; ImBuf **ibufs_arr; @@ -5078,7 +5079,7 @@ Sequence *BKE_sequencer_add_sound_strip(bContext *C, ListBase *seqbasep, SeqLoad } #endif // WITH_AUDASPACE -static void seq_anim_add_suffix(Scene *scene, struct anim *anim, const size_t view_id) +static void seq_anim_add_suffix(Scene *scene, struct anim *anim, const int view_id) { const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, view_id); IMB_suffix_anim(anim, suffix); @@ -5095,7 +5096,7 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoad char colorspace[64] = "\0"; /* MAX_COLORSPACE_NAME */ bool is_multiview_loaded = false; const bool is_multiview = (seq_load->flag & SEQ_USE_VIEWS) != 0; - size_t totfiles = seq_num_files(scene, seq_load->views_format, is_multiview); + const int totfiles = seq_num_files(scene, seq_load->views_format, is_multiview); struct anim **anim_arr; int i; diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 4c10c07e189..57aafb549ac 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -192,7 +192,7 @@ static void image_buffer_rect_update(RenderJob *rj, RenderResult *rr, ImBuf *ibu /* TODO(sergey): Need to check has_combined here? */ if (iuser->pass == 0) { RenderView *rv; - size_t view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); + const int view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); rv = RE_RenderViewGetById(rr, view_id); /* find current float rect for display, first case is after composite... still weak */ diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 51c4e8bc16e..263abe752c2 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -105,7 +105,7 @@ typedef struct OGLRender { bMovieHandle *mh; int cfrao, nfra; - size_t totvideos; + int totvideos; /* quick lookup */ int view_id; @@ -622,7 +622,7 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender) { Main *bmain = CTX_data_main(C); Scene *scene = oglrender->scene; - size_t i; + int i; if (oglrender->mh) { if (BKE_imtype_is_movie(scene->r.im_format.imtype)) { @@ -680,7 +680,8 @@ static bool screen_opengl_render_anim_initialize(bContext *C, wmOperator *op) oglrender->reports = op->reports; if (BKE_imtype_is_movie(scene->r.im_format.imtype)) { - size_t i, width, height; + size_t width, height; + int i; BKE_scene_multiview_videos_dimensions_get(&scene->r, oglrender->sizex, oglrender->sizey, &width, &height); oglrender->mh = BKE_movie_handle_get(scene->r.im_format.imtype); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index faba61c7d28..ab062eb133b 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1758,9 +1758,9 @@ static bool save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI } /* individual multiview images */ else if (imf->views_format == R_IMF_VIEWS_INDIVIDUAL) { - size_t i; + int i; unsigned char planes = ibuf->planes; - const size_t totviews = (rr ? BLI_listbase_count(&rr->views) : BLI_listbase_count(&ima->views)); + const int totviews = (rr ? BLI_listbase_count(&rr->views) : BLI_listbase_count(&ima->views)); if (!is_multilayer) { ED_space_image_release_buffer(sima, ibuf, lock); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index e3c02736755..63c21827a79 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -371,9 +371,10 @@ static void openexr_header_metadata_callback(void *data, const char *propname, c } -static bool imb_save_openexr_half(ImBuf *ibuf, const char *name, const int flags, const size_t totviews, - const char * (*getview)(void *base, size_t view_id), - ImBuf * (*getbuffer)(void *base, const size_t view_id)) +static bool imb_save_openexr_half( + ImBuf *ibuf, const char *name, const int flags, const int totviews, + const char * (*getview)(void *base, int view_id), + ImBuf *(*getbuffer)(void *base, const int view_id)) { const int channels = ibuf->channels; const bool is_alpha = (channels >= 4) && (ibuf->planes == 32); @@ -385,7 +386,7 @@ static bool imb_save_openexr_half(ImBuf *ibuf, const char *name, const int flags BLI_assert((!is_multiview) || (getview && getbuffer)); std::vector <string> views; - size_t view_id; + int view_id; try { @@ -488,9 +489,10 @@ static bool imb_save_openexr_half(ImBuf *ibuf, const char *name, const int flags return true; } -static bool imb_save_openexr_float(ImBuf *ibuf, const char *name, const int flags, const size_t totviews, - const char * (*getview)(void *base, const size_t view_id), - ImBuf * (*getbuffer)(void *base, const size_t view_id)) +static bool imb_save_openexr_float( + ImBuf *ibuf, const char *name, const int flags, const int totviews, + const char * (*getview)(void *base, const int view_id), + ImBuf *(*getbuffer)(void *base, const int view_id)) { const int channels = ibuf->channels; const bool is_alpha = (channels >= 4) && (ibuf->planes == 32); @@ -502,7 +504,7 @@ static bool imb_save_openexr_float(ImBuf *ibuf, const char *name, const int flag BLI_assert((!is_multiview) || (getview && getbuffer)); std::vector <string> views; - size_t view_id; + int view_id; try { @@ -591,9 +593,10 @@ int imb_save_openexr(struct ImBuf *ibuf, const char *name, int flags) } } -static bool imb_save_openexr_multiview(ImBuf *ibuf, const char *name, const int flags, const size_t totviews, - const char * (*getview)(void *base, const size_t view_id), - ImBuf * (*getbuffer)(void *base, const size_t view_id)) +static bool imb_save_openexr_multiview( + ImBuf *ibuf, const char *name, const int flags, const int totviews, + const char *(*getview)(void *base, const int view_id), + ImBuf *(*getbuffer)(void *base, const int view_id)) { if (flags & IB_mem) { printf("OpenEXR-save: Create multiview EXR in memory CURRENTLY NOT SUPPORTED !\n"); @@ -616,9 +619,10 @@ static bool imb_save_openexr_multiview(ImBuf *ibuf, const char *name, const int /* Save single-layer multiview OpenEXR * If we have more multiview formats in the future, the function below could be incorporated * in our ImBuf write functions, meanwhile this is an OpenEXR special case only */ -bool IMB_exr_multiview_save(ImBuf *ibuf, const char *name, const int flags, const size_t totviews, - const char * (*getview)(void *base, size_t view_id), - ImBuf * (*getbuffer)(void *base, const size_t view_id)) +bool IMB_exr_multiview_save( + ImBuf *ibuf, const char *name, const int flags, const int totviews, + const char *(*getview)(void *base, const int view_id), + ImBuf *(*getbuffer)(void *base, const int view_id)) { return imb_save_openexr_multiview(ibuf, name, flags, totviews, getview, getbuffer); } @@ -1050,7 +1054,7 @@ float *IMB_exr_channel_rect(void *handle, const char *layname, const char *pass BLI_strncpy(name, temp_buf, sizeof(name)); } else if (data->multiView->size() > 1) { - size_t view_id = std::max(0, imb_exr_get_multiView_id(*data->multiView, viewname)); + const int view_id = std::max(0, imb_exr_get_multiView_id(*data->multiView, viewname)); std::string raw_name = insertViewName(name, *data->multiView, view_id); BLI_strncpy(name, raw_name.c_str(), sizeof(name)); } @@ -1135,7 +1139,7 @@ void IMB_exrtile_write_channels(void *handle, int partx, int party, int level, c FrameBuffer frameBuffer; ExrChannel *echan; std::string view(viewname); - const size_t view_id = imb_exr_get_multiView_id(*data->multiView, view); + const int view_id = imb_exr_get_multiView_id(*data->multiView, view); exr_printf("\nIMB_exrtile_write_channels(view: %s)\n", viewname); exr_printf("%s %-6s %-22s \"%s\"\n", "p", "view", "name", "internal_name"); @@ -1181,7 +1185,7 @@ void IMB_exrtile_write_channels(void *handle, int partx, int party, int level, c void IMB_exrmultiview_write_channels(void *handle, const char *viewname) { ExrHandle *data = (ExrHandle *)handle; - const size_t view_id = viewname ? imb_exr_get_multiView_id(*data->multiView, viewname) : -1; + const int view_id = viewname ? imb_exr_get_multiView_id(*data->multiView, viewname) : -1; int numparts = (view_id == -1 ? data->parts : view_id + 1); std::vector <FrameBuffer> frameBuffers(numparts); std::vector <OutputPart> outputParts; diff --git a/source/blender/imbuf/intern/openexr/openexr_multi.h b/source/blender/imbuf/intern/openexr/openexr_multi.h index 70ba4978124..0fa0f64bdce 100644 --- a/source/blender/imbuf/intern/openexr/openexr_multi.h +++ b/source/blender/imbuf/intern/openexr/openexr_multi.h @@ -85,9 +85,9 @@ void IMB_exr_multiview_convert( const int 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 int totviews, + const char *(*getview)(void *base, int view_id), + struct ImBuf *(*getbuffer)(void *base, const int view_id)); void IMB_exr_close(void *handle); diff --git a/source/blender/imbuf/intern/openexr/openexr_stub.cpp b/source/blender/imbuf/intern/openexr/openexr_stub.cpp index c198cac6357..498e246a915 100644 --- a/source/blender/imbuf/intern/openexr/openexr_stub.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_stub.cpp @@ -69,9 +69,9 @@ void IMB_exr_multiview_convert( } 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 int /*totviews*/, + const char *(* /*getview*/)(void *base, const int view_id), + struct ImBuf *(* /*getbuffer*/)(void *base, const int view_id)) { return false; } diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 2f95601946a..131a5a3a966 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -273,10 +273,12 @@ void RE_init_threadcount(Render *re); /* the main processor, assumes all was set OK! */ void RE_TileProcessor(struct Render *re); -bool RE_WriteRenderViewsImage(struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, const bool stamp, char *name); -bool RE_WriteRenderViewsMovie(struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, struct RenderData *rd, - struct bMovieHandle *mh, const size_t width, const size_t height, void **movie_ctx_arr, - const size_t totvideos, bool preview); +bool RE_WriteRenderViewsImage( + struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, const bool stamp, char *name); +bool RE_WriteRenderViewsMovie( + struct ReportList *reports, struct RenderResult *rr, struct Scene *scene, struct RenderData *rd, + struct bMovieHandle *mh, const size_t width, const size_t height, void **movie_ctx_arr, + const int totvideos, bool preview); /* only RE_NewRender() needed, main Blender render calls */ void RE_BlenderFrame(struct Render *re, struct Main *bmain, struct Scene *scene, diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index cdbcfbc2202..811209f95e6 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -135,7 +135,7 @@ Render R; /* ********* alloc and free ******** */ -static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const size_t totvideos, const char *name_override); +static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const int totvideos, const char *name_override); static volatile int g_break = 0; static int thread_break(void *UNUSED(arg)) @@ -430,7 +430,7 @@ void RE_ReleaseResultImage(Render *re) void RE_ResultGet32(Render *re, unsigned int *rect) { RenderResult rres; - const size_t view_id = BKE_scene_multiview_view_id_get(&re->r, re->viewname); + const int view_id = BKE_scene_multiview_view_id_get(&re->r, re->viewname); RE_AcquireResultImageViews(re, &rres); render_result_rect_get_pixels(&rres, rect, re->rectx, re->recty, &re->scene->view_settings, &re->scene->display_settings, view_id); @@ -2589,7 +2589,7 @@ static void do_render_seq(Render *re) RenderResult *rr; /* don't assign re->result here as it might change during give_ibuf_seq */ int cfra = re->r.cfra; SeqRenderData context; - size_t view_id, tot_views; + int view_id, tot_views; struct ImBuf **ibuf_arr; int re_x, re_y; @@ -3205,7 +3205,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen else if (is_mono || (rd->im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)) { RenderView *rv; - size_t view_id; + int view_id; char filepath[FILE_MAX]; BLI_strncpy(filepath, name, sizeof(filepath)); @@ -3331,8 +3331,9 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen return ok; } -bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scene, RenderData *rd, bMovieHandle *mh, - const size_t width, const size_t height, void **movie_ctx_arr, const size_t totvideos, bool preview) +bool RE_WriteRenderViewsMovie( + ReportList *reports, RenderResult *rr, Scene *scene, RenderData *rd, bMovieHandle *mh, + const size_t width, const size_t height, void **movie_ctx_arr, const int totvideos, bool preview) { bool is_mono; bool ok = true; @@ -3343,7 +3344,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scen is_mono = BLI_listbase_count_ex(&rr->views, 2) < 2; if (is_mono || (scene->r.im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)) { - size_t view_id; + int view_id; for (view_id = 0; view_id < totvideos; view_id++) { bool do_free = false; const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, view_id); @@ -3378,7 +3379,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scen const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME}; ImBuf *ibuf_arr[3] = {NULL}; bool do_free[2] = {false, false}; - size_t i; + int i; BLI_assert((totvideos == 1) && (scene->r.im_format.views_format == R_IMF_VIEWS_STEREO_3D)); @@ -3418,7 +3419,7 @@ bool RE_WriteRenderViewsMovie(ReportList *reports, RenderResult *rr, Scene *scen return ok; } -static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const size_t totvideos, const char *name_override) +static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const int totvideos, const char *name_override) { char name[FILE_MAX]; RenderResult rres; @@ -3465,7 +3466,9 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie return ok; } -static void get_videos_dimensions(Render *re, RenderData *rd, size_t *r_width, size_t *r_height) +static void get_videos_dimensions( + Render *re, RenderData *rd, + size_t *r_width, size_t *r_height) { size_t width, height; if (re->r.mode & R_BORDER) { @@ -3486,9 +3489,9 @@ static void get_videos_dimensions(Render *re, RenderData *rd, size_t *r_width, s BKE_scene_multiview_videos_dimensions_get(rd, width, height, r_width, r_height); } -static void re_movie_free_all(Render *re, bMovieHandle *mh, size_t totvideos) +static void re_movie_free_all(Render *re, bMovieHandle *mh, int totvideos) { - size_t i; + int i; for (i = 0; i < totvideos; i++) { mh->end_movie(re->movie_ctx_arr[i]); @@ -3506,7 +3509,7 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri bMovieHandle *mh = NULL; int cfrao = scene->r.cfra; int nfra, totrendered = 0, totskipped = 0; - const size_t totvideos = BKE_scene_multiview_num_videos_get(&rd); + const int totvideos = BKE_scene_multiview_num_videos_get(&rd); const bool is_movie = BKE_imtype_is_movie(scene->r.im_format.imtype); const bool is_multiview_name = ((scene->r.scemode & R_MULTIVIEW) != 0 && (scene->r.im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)); @@ -3524,7 +3527,8 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri } if (is_movie) { - size_t i, width, height; + size_t width, height; + int i; bool is_error = false; get_videos_dimensions(re, &rd, &width, &height); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 27fc412e1cd..d323c4004b6 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -485,7 +485,7 @@ static void set_pass_name(char *passname, int passtype, int channel, const char static RenderPass *render_layer_add_pass(RenderResult *rr, RenderLayer *rl, int channels, int passtype, const char *viewname) { - const size_t view_id = BLI_findstringindex(&rr->views, viewname, offsetof(RenderView, name)); + const int view_id = BLI_findstringindex(&rr->views, viewname, offsetof(RenderView, name)); const char *typestr = name_from_passtype(passtype, -1); RenderPass *rpass = MEM_callocN(sizeof(RenderPass), typestr); size_t rectsize = ((size_t)rr->rectx) * rr->recty * channels; |