[Bf-blender-cvs] [6514e4c4180] blender-v3.0-release: Fix: Build issue on 32 bit archs

Ray Molenkamp noreply at git.blender.org
Tue Jan 11 10:38:36 CET 2022


Commit: 6514e4c418071a86d57f99780fc60ce33d2eb5d4
Author: Ray Molenkamp
Date:   Wed Dec 22 08:39:33 2021 -0700
Branches: blender-v3.0-release
https://developer.blender.org/rB6514e4c418071a86d57f99780fc60ce33d2eb5d4

Fix: Build issue on 32 bit archs

The cast to size_t leads to a build issue on 32
bit archs. cursor_delim_type_utf8 expects an int
so an additional cast to size_t is not required.

Reported by user frispete on devtalk.

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

M	source/blender/blenlib/intern/string_cursor_utf8.c

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

diff --git a/source/blender/blenlib/intern/string_cursor_utf8.c b/source/blender/blenlib/intern/string_cursor_utf8.c
index eb49572f06c..5e2a0b85814 100644
--- a/source/blender/blenlib/intern/string_cursor_utf8.c
+++ b/source/blender/blenlib/intern/string_cursor_utf8.c
@@ -199,7 +199,7 @@ void BLI_str_cursor_step_utf8(const char *str,
         const int pos_prev = *pos;
         if (BLI_str_cursor_step_prev_utf8(str, maxlen, pos)) {
           if ((jump != STRCUR_JUMP_ALL) &&
-              (delim_type != cursor_delim_type_utf8(str, maxlen, (size_t)*pos))) {
+              (delim_type != cursor_delim_type_utf8(str, maxlen, *pos))) {
             /* left only: compensate for index/change in direction */
             if ((pos_orig - (*pos)) >= 1) {
               *pos = pos_prev;



More information about the Bf-blender-cvs mailing list