[Bf-blender-cvs] [4813c37ae24] master: Cleanup: Better const-correctness in the space clip
Sergey Sharybin
noreply at git.blender.org
Thu Jan 5 12:40:42 CET 2023
Commit: 4813c37ae245ba454fd66e42e4b7d5001ab7604d
Author: Sergey Sharybin
Date: Thu Jan 5 12:38:42 2023 +0100
Branches: master
https://developer.blender.org/rB4813c37ae245ba454fd66e42e4b7d5001ab7604d
Cleanup: Better const-correctness in the space clip
===================================================================
M source/blender/editors/include/ED_clip.h
M source/blender/editors/space_clip/clip_editor.c
===================================================================
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 0f981e270a0..73dd05c0366 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -69,73 +69,79 @@ bool ED_space_clip_maskedit_mask_poll(struct bContext *C);
* - Mask has visible and editable splines. */
bool ED_space_clip_maskedit_mask_visible_splines_poll(struct bContext *C);
-void ED_space_clip_get_size(struct SpaceClip *sc, int *width, int *height);
-void ED_space_clip_get_size_fl(struct SpaceClip *sc, float size[2]);
-void ED_space_clip_get_zoom(struct SpaceClip *sc,
- struct ARegion *region,
+void ED_space_clip_get_size(const struct SpaceClip *sc, int *width, int *height);
+void ED_space_clip_get_size_fl(const struct SpaceClip *sc, float size[2]);
+void ED_space_clip_get_zoom(const struct SpaceClip *sc,
+ const struct ARegion *region,
float *zoomx,
float *zoomy);
-void ED_space_clip_get_aspect(struct SpaceClip *sc, float *aspx, float *aspy);
-void ED_space_clip_get_aspect_dimension_aware(struct SpaceClip *sc, float *aspx, float *aspy);
+void ED_space_clip_get_aspect(const struct SpaceClip *sc, float *aspx, float *aspy);
+void ED_space_clip_get_aspect_dimension_aware(const struct SpaceClip *sc,
+ float *aspx,
+ float *aspy);
/**
* Return current frame number in clip space.
*/
-int ED_space_clip_get_clip_frame_number(struct SpaceClip *sc);
+int ED_space_clip_get_clip_frame_number(const struct SpaceClip *sc);
-struct ImBuf *ED_space_clip_get_buffer(struct SpaceClip *sc);
-struct ImBuf *ED_space_clip_get_stable_buffer(struct SpaceClip *sc,
+struct ImBuf *ED_space_clip_get_buffer(const struct SpaceClip *sc);
+struct ImBuf *ED_space_clip_get_stable_buffer(const struct SpaceClip *sc,
float loc[2],
float *scale,
float *angle);
-bool ED_space_clip_get_position(struct SpaceClip *sc,
- struct ARegion *region,
+bool ED_space_clip_get_position(const struct SpaceClip *sc,
+ const struct ARegion *region,
int mval[2],
float fpos[2]);
/**
* Returns color in linear space, matching #ED_space_image_color_sample().
*/
-bool ED_space_clip_color_sample(struct SpaceClip *sc,
- struct ARegion *region,
+bool ED_space_clip_color_sample(const struct SpaceClip *sc,
+ const struct ARegion *region,
const int mval[2],
float r_col[3]);
void ED_clip_update_frame(const struct Main *mainp, int cfra);
-bool ED_clip_view_selection(const struct bContext *C, struct ARegion *region, bool fit);
+bool ED_clip_view_selection(const struct bContext *C, const struct ARegion *region, bool fit);
-void ED_clip_select_all(struct SpaceClip *sc, int action, bool *r_has_selection);
+void ED_clip_select_all(const struct SpaceClip *sc, int action, bool *r_has_selection);
bool ED_clip_can_select(struct bContext *C);
-void ED_clip_point_undistorted_pos(struct SpaceClip *sc, const float co[2], float r_co[2]);
-void ED_clip_point_stable_pos(
- struct SpaceClip *sc, struct ARegion *region, float x, float y, float *xr, float *yr);
+void ED_clip_point_undistorted_pos(const struct SpaceClip *sc, const float co[2], float r_co[2]);
+void ED_clip_point_stable_pos(const struct SpaceClip *sc,
+ const struct ARegion *region,
+ float x,
+ float y,
+ float *xr,
+ float *yr);
/**
* \brief the reverse of #ED_clip_point_stable_pos(), gets the marker region coords.
* better name here? view_to_track / track_to_view or so?
*/
-void ED_clip_point_stable_pos__reverse(struct SpaceClip *sc,
- struct ARegion *region,
+void ED_clip_point_stable_pos__reverse(const struct SpaceClip *sc,
+ const struct ARegion *region,
const float co[2],
float r_co[2]);
/**
* Takes `event->mval`.
*/
-void ED_clip_mouse_pos(struct SpaceClip *sc,
- struct ARegion *region,
+void ED_clip_mouse_pos(const struct SpaceClip *sc,
+ const struct ARegion *region,
const int mval[2],
float co[2]);
-bool ED_space_clip_check_show_trackedit(struct SpaceClip *sc);
-bool ED_space_clip_check_show_maskedit(struct SpaceClip *sc);
+bool ED_space_clip_check_show_trackedit(const struct SpaceClip *sc);
+bool ED_space_clip_check_show_maskedit(const struct SpaceClip *sc);
-struct MovieClip *ED_space_clip_get_clip(struct SpaceClip *sc);
+struct MovieClip *ED_space_clip_get_clip(const struct SpaceClip *sc);
void ED_space_clip_set_clip(struct bContext *C,
struct bScreen *screen,
struct SpaceClip *sc,
struct MovieClip *clip);
-struct Mask *ED_space_clip_get_mask(struct SpaceClip *sc);
+struct Mask *ED_space_clip_get_mask(const struct SpaceClip *sc);
void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mask *mask);
/* Locked state is used to preserve current clip editor viewport upon changes. Example usage:
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index 3f28f409fd1..5ebc41d9cc7 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -143,7 +143,7 @@ bool ED_space_clip_maskedit_mask_visible_splines_poll(bContext *C)
/** \name Common Editing Functions
* \{ */
-void ED_space_clip_get_size(SpaceClip *sc, int *width, int *height)
+void ED_space_clip_get_size(const SpaceClip *sc, int *width, int *height)
{
if (sc->clip) {
BKE_movieclip_get_size(sc->clip, &sc->user, width, height);
@@ -153,7 +153,7 @@ void ED_space_clip_get_size(SpaceClip *sc, int *width, int *height)
}
}
-void ED_space_clip_get_size_fl(SpaceClip *sc, float size[2])
+void ED_space_clip_get_size_fl(const SpaceClip *sc, float size[2])
{
int size_i[2];
ED_space_clip_get_size(sc, &size_i[0], &size_i[1]);
@@ -161,7 +161,7 @@ void ED_space_clip_get_size_fl(SpaceClip *sc, float size[2])
size[1] = size_i[1];
}
-void ED_space_clip_get_zoom(SpaceClip *sc, ARegion *region, float *zoomx, float *zoomy)
+void ED_space_clip_get_zoom(const SpaceClip *sc, const ARegion *region, float *zoomx, float *zoomy)
{
int width, height;
@@ -173,7 +173,7 @@ void ED_space_clip_get_zoom(SpaceClip *sc, ARegion *region, float *zoomx, float
(BLI_rctf_size_y(®ion->v2d.cur) * height);
}
-void ED_space_clip_get_aspect(SpaceClip *sc, float *aspx, float *aspy)
+void ED_space_clip_get_aspect(const SpaceClip *sc, float *aspx, float *aspy)
{
MovieClip *clip = ED_space_clip_get_clip(sc);
@@ -194,7 +194,7 @@ void ED_space_clip_get_aspect(SpaceClip *sc, float *aspx, float *aspy)
}
}
-void ED_space_clip_get_aspect_dimension_aware(SpaceClip *sc, float *aspx, float *aspy)
+void ED_space_clip_get_aspect_dimension_aware(const SpaceClip *sc, float *aspx, float *aspy)
{
int w, h;
@@ -228,7 +228,7 @@ void ED_space_clip_get_aspect_dimension_aware(SpaceClip *sc, float *aspx, float
}
}
-int ED_space_clip_get_clip_frame_number(SpaceClip *sc)
+int ED_space_clip_get_clip_frame_number(const SpaceClip *sc)
{
MovieClip *clip = ED_space_clip_get_clip(sc);
@@ -236,7 +236,7 @@ int ED_space_clip_get_clip_frame_number(SpaceClip *sc)
return BKE_movieclip_remap_scene_to_clip_frame(clip, sc->user.framenr);
}
-ImBuf *ED_space_clip_get_buffer(SpaceClip *sc)
+ImBuf *ED_space_clip_get_buffer(const SpaceClip *sc)
{
if (sc->clip) {
ImBuf *ibuf;
@@ -255,7 +255,10 @@ ImBuf *ED_space_clip_get_buffer(SpaceClip *sc)
return NULL;
}
-ImBuf *ED_space_clip_get_stable_buffer(SpaceClip *sc, float loc[2], float *scale, float *angle)
+ImBuf *ED_space_clip_get_stable_buffer(const SpaceClip *sc,
+ float loc[2],
+ float *scale,
+ float *angle)
{
if (sc->clip) {
ImBuf *ibuf;
@@ -275,8 +278,8 @@ ImBuf *ED_space_clip_get_stable_buffer(SpaceClip *sc, float loc[2], float *scale
return NULL;
}
-bool ED_space_clip_get_position(struct SpaceClip *sc,
- struct ARegion *region,
+bool ED_space_clip_get_position(const SpaceClip *sc,
+ const ARegion *region,
int mval[2],
float fpos[2])
{
@@ -292,7 +295,10 @@ bool ED_space_clip_get_position(struct SpaceClip *sc,
return true;
}
-bool ED_space_clip_color_sample(SpaceClip *sc, ARegion *region, const int mval[2], float r_col[3])
+bool ED_space_clip_color_sample(const SpaceClip *sc,
+ const ARegion *region,
+ const int mval[2],
+ float r_col[3])
{
ImBuf *ibuf;
float fx, fy, co[2];
@@ -355,7 +361,7 @@ void ED_clip_update_frame(const Main *mainp, int cfra)
}
}
-bool ED_clip_view_selection(const bContext *C, ARegion *UNUSED(region), bool fit)
+bool ED_clip_view_selection(const bContext *C, const ARegion *UNUSED(region), bool fit)
{
float offset_x, offset_y;
float zoom;
@@ -371,7 +377,7 @@ bool ED_clip_view_selection(const bContext *C, ARegion *UNUSED(region), bool fit
return true;
}
-void ED_clip_select_all(SpaceClip *sc, int action, bool *r_has_selection)
+void ED_clip_select_all(const SpaceClip *sc, int action, bool *r_has_selection)
{
MovieClip *clip = ED_space_clip_get_clip
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list