[Bf-blender-cvs] [d4f0ccb6b48] master: Cleanup: pass const view_area in sequencer functions

Campbell Barton noreply at git.blender.org
Fri Nov 4 08:51:28 CET 2022


Commit: d4f0ccb6b484b6c5e4ba7db0f530f0169fab58bc
Author: Campbell Barton
Date:   Fri Nov 4 18:49:06 2022 +1100
Branches: master
https://developer.blender.org/rBd4f0ccb6b484b6c5e4ba7db0f530f0169fab58bc

Cleanup: pass const view_area in sequencer functions

===================================================================

M	source/blender/sequencer/SEQ_render.h
M	source/blender/sequencer/intern/image_cache.c
M	source/blender/sequencer/intern/image_cache.h
M	source/blender/sequencer/intern/render.c

===================================================================

diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.h
index 9c163de4230..f95497b32b8 100644
--- a/source/blender/sequencer/SEQ_render.h
+++ b/source/blender/sequencer/SEQ_render.h
@@ -66,7 +66,7 @@ void SEQ_render_thumbnails(const struct SeqRenderData *context,
                            struct Sequence *seq,
                            struct Sequence *seq_orig,
                            float frame_step,
-                           rctf *view_area,
+                           const struct rctf *view_area,
                            const short *stop);
 /**
  * Get cached thumbnails.
@@ -82,7 +82,7 @@ struct ImBuf *SEQ_get_thumbnail(const struct SeqRenderData *context,
 float SEQ_render_thumbnail_first_frame_get(const struct Scene *scene,
                                            struct Sequence *seq,
                                            float frame_step,
-                                           struct rctf *view_area);
+                                           const struct rctf *view_area);
 /**
  * Get frame for first thumbnail.
  */
@@ -102,7 +102,7 @@ int SEQ_render_thumbnails_guaranteed_set_frame_step_get(const struct Scene *scen
 void SEQ_render_thumbnails_base_set(const struct SeqRenderData *context,
                                     struct Sequence *seq,
                                     struct Sequence *seq_orig,
-                                    rctf *view_area,
+                                    const struct rctf *view_area,
                                     const short *stop);
 
 void SEQ_render_init_colorspace(struct Sequence *seq);
diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c
index 87da2017296..21ce2cbdf9a 100644
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@ -811,8 +811,11 @@ bool seq_cache_put_if_possible(
   return false;
 }
 
-void seq_cache_thumbnail_put(
-    const SeqRenderData *context, Sequence *seq, float timeline_frame, ImBuf *i, rctf *view_area)
+void seq_cache_thumbnail_put(const SeqRenderData *context,
+                             Sequence *seq,
+                             float timeline_frame,
+                             ImBuf *i,
+                             const rctf *view_area)
 {
   Scene *scene = context->scene;
 
diff --git a/source/blender/sequencer/intern/image_cache.h b/source/blender/sequencer/intern/image_cache.h
index a7ae130dc41..7b7e020c926 100644
--- a/source/blender/sequencer/intern/image_cache.h
+++ b/source/blender/sequencer/intern/image_cache.h
@@ -48,7 +48,7 @@ void seq_cache_thumbnail_put(const struct SeqRenderData *context,
                              struct Sequence *seq,
                              float timeline_frame,
                              struct ImBuf *i,
-                             rctf *view_area);
+                             const struct rctf *view_area);
 bool seq_cache_put_if_possible(const struct SeqRenderData *context,
                                struct Sequence *seq,
                                float timeline_frame,
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index e3fd9216842..3cb15e092c8 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -2010,7 +2010,7 @@ ImBuf *SEQ_render_give_ibuf_direct(const SeqRenderData *context,
 float SEQ_render_thumbnail_first_frame_get(const Scene *scene,
                                            Sequence *seq,
                                            float frame_step,
-                                           rctf *view_area)
+                                           const rctf *view_area)
 {
   int first_drawable_frame = max_iii(
       SEQ_time_left_handle_frame_get(scene, seq), seq->start, view_area->xmin);
@@ -2102,7 +2102,7 @@ void SEQ_render_thumbnails(const SeqRenderData *context,
                            Sequence *seq,
                            Sequence *seq_orig,
                            float frame_step,
-                           rctf *view_area,
+                           const rctf *view_area,
                            const short *stop)
 {
   SeqRenderState state;
@@ -2163,7 +2163,7 @@ int SEQ_render_thumbnails_guaranteed_set_frame_step_get(const Scene *scene, cons
 void SEQ_render_thumbnails_base_set(const SeqRenderData *context,
                                     Sequence *seq,
                                     Sequence *seq_orig,
-                                    rctf *view_area,
+                                    const rctf *view_area,
                                     const short *stop)
 {
   SeqRenderState state;



More information about the Bf-blender-cvs mailing list