diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-04-03 08:21:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-03 08:21:24 +0300 |
commit | 600a627f6e326f4542a876e6e82f771cd3da218f (patch) | |
tree | 9df2dd448e8da7b885d8cf8e56645a062f6d842c /source/blender/editors/screen | |
parent | 04fe37f93116bd3b276ebe86d9fa53f18223ee6a (diff) |
Cleanup: use abbreviated names for unsigned types in editors
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/glutil.c | 8 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_draw.c | 12 | ||||
-rw-r--r-- | source/blender/editors/screen/screendump.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index f757b856dcf..ddb345ab65e 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -132,7 +132,7 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, float yzoom, float color[4]) { - unsigned char *uc_rect = (unsigned char *)rect; + uchar *uc_rect = (uchar *)rect; const float *f_rect = (float *)rect; int subpart_x, subpart_y, tex_w, tex_h; int seamless, offset_x, offset_y, nsubparts_x, nsubparts_y; @@ -185,7 +185,7 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, tex_w, tex_h, 0, format, GL_UNSIGNED_BYTE, NULL); } - unsigned int pos = state->pos, texco = state->texco; + uint pos = state->pos, texco = state->texco; /* optional */ /* NOTE: Shader could be null for GLSL OCIO drawing, it is fine, since @@ -650,7 +650,7 @@ void ED_draw_imbuf_clipping(ImBuf *ibuf, /* In case GLSL failed or not usable, fallback to glaDrawPixelsAuto */ if (need_fallback) { - unsigned char *display_buffer; + uchar *display_buffer; void *cache_handle; display_buffer = IMB_display_buffer_acquire( @@ -758,7 +758,7 @@ int ED_draw_imbuf_method(ImBuf *ibuf) /* don't move to GPU_immediate_util.h because this uses user-prefs * and isn't very low level */ -void immDrawBorderCorners(unsigned int pos, const rcti *border, float zoomx, float zoomy) +void immDrawBorderCorners(uint pos, const rcti *border, float zoomx, float zoomy) { float delta_x = 4.0f * UI_DPI_FAC / zoomx; float delta_y = 4.0f * UI_DPI_FAC / zoomy; diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index 3331f4db11b..dbc7609722c 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -41,7 +41,7 @@ * Draw horizontal shape visualizing future joining * (left as well right direction of future joining). */ -static void draw_horizontal_join_shape(ScrArea *sa, char dir, unsigned int pos) +static void draw_horizontal_join_shape(ScrArea *sa, char dir, uint pos) { const float width = screen_geom_area_width(sa) - 1; const float height = screen_geom_area_height(sa) - 1; @@ -122,7 +122,7 @@ static void draw_horizontal_join_shape(ScrArea *sa, char dir, unsigned int pos) /** * Draw vertical shape visualizing future joining (up/down direction). */ -static void draw_vertical_join_shape(ScrArea *sa, char dir, unsigned int pos) +static void draw_vertical_join_shape(ScrArea *sa, char dir, uint pos) { const float width = screen_geom_area_width(sa) - 1; const float height = screen_geom_area_height(sa) - 1; @@ -203,7 +203,7 @@ static void draw_vertical_join_shape(ScrArea *sa, char dir, unsigned int pos) /** * Draw join shape due to direction of joining. */ -static void draw_join_shape(ScrArea *sa, char dir, unsigned int pos) +static void draw_join_shape(ScrArea *sa, char dir, uint pos) { if (dir == 'u' || dir == 'd') { draw_vertical_join_shape(sa, dir, pos); @@ -294,7 +294,7 @@ static GPUBatch *batch_screen_edges_get(int *corner_len) /** * Draw screen area darker with arrow (visualization of future joining). */ -static void scrarea_draw_shape_dark(ScrArea *sa, char dir, unsigned int pos) +static void scrarea_draw_shape_dark(ScrArea *sa, char dir, uint pos) { GPU_blend_set_func_separate( GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA); @@ -306,7 +306,7 @@ static void scrarea_draw_shape_dark(ScrArea *sa, char dir, unsigned int pos) /** * Draw screen area lighter with arrow shape ("eraser" of previous dark shape). */ -static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir), unsigned int pos) +static void scrarea_draw_shape_light(ScrArea *sa, char UNUSED(dir), uint pos) { GPU_blend_set_func(GPU_DST_COLOR, GPU_SRC_ALPHA); /* value 181 was hardly computed: 181~105 */ @@ -608,7 +608,7 @@ static void screen_preview_draw(const bScreen *screen, int size_x, int size_y) /** * Render the preview for a screen layout in \a screen. */ -void ED_screen_preview_render(const bScreen *screen, int size_x, int size_y, unsigned int *r_rect) +void ED_screen_preview_render(const bScreen *screen, int size_x, int size_y, uint *r_rect) { char err_out[256] = "unknown"; GPUOffScreen *offscreen = GPU_offscreen_create(size_x, size_y, 0, true, false, err_out); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index d52dc262c3f..89b83b3518a 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -54,7 +54,7 @@ #include "screen_intern.h" typedef struct ScreenshotData { - unsigned int *dumprect; + uint *dumprect; int dumpsx, dumpsy; rcti crop; |