diff options
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/math_matrix.c | 40 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/string_utf8.c | 16 |
3 files changed, 29 insertions, 30 deletions
diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 019915b3128..a9a1f2bc57e 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -538,8 +538,7 @@ typedef struct FT_Outline_ short* contours; /* the contour end points */ int flags; /* outline masks */ - - } FT_Outline; +} FT_Outline; #endif diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index b32c5b833ae..fd49012491e 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -811,36 +811,36 @@ void orthogonalize_m4(float mat[][4], int axis) int is_orthogonal_m3(float m[][3]) { - int i, j; + int i, j; - for (i = 0; i < 3; i++) { - for (j = 0; j < i; j++) { - if (fabsf(dot_v3v3(m[i], m[j])) > 1.5f * FLT_EPSILON) - return 0; - } + for (i = 0; i < 3; i++) { + for (j = 0; j < i; j++) { + if (fabsf(dot_v3v3(m[i], m[j])) > 1.5f * FLT_EPSILON) + return 0; + } - if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f * FLT_EPSILON) - return 0; - } + if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f * FLT_EPSILON) + return 0; + } - return 1; + return 1; } int is_orthogonal_m4(float m[][4]) { - int i, j; + int i, j; - for (i = 0; i < 4; i++) { - for (j = 0; j < i; j++) { - if (fabsf(dot_vn_vn(m[i], m[j], 4)) > 1.5f * FLT_EPSILON) - return 0; - } + for (i = 0; i < 4; i++) { + for (j = 0; j < i; j++) { + if (fabsf(dot_vn_vn(m[i], m[j], 4)) > 1.5f * FLT_EPSILON) + return 0; + } - if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f * FLT_EPSILON) - return 0; - } + if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f * FLT_EPSILON) + return 0; + } - return 1; + return 1; } void normalize_m3(float mat[][3]) diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c index 6f181c1ee6e..aede08be7f9 100644 --- a/source/blender/blenlib/intern/string_utf8.c +++ b/source/blender/blenlib/intern/string_utf8.c @@ -359,16 +359,16 @@ int BLI_str_utf8_size(const char *p) **/ unsigned int BLI_str_utf8_as_unicode(const char *p) { - int i, mask = 0, len; - unsigned int result; - unsigned char c = (unsigned char) *p; + int i, mask = 0, len; + unsigned int result; + unsigned char c = (unsigned char) *p; - UTF8_COMPUTE (c, mask, len); - if (len == -1) - return BLI_UTF8_ERR; - UTF8_GET (result, p, i, mask, len, BLI_UTF8_ERR); + UTF8_COMPUTE (c, mask, len); + if (len == -1) + return BLI_UTF8_ERR; + UTF8_GET (result, p, i, mask, len, BLI_UTF8_ERR); - return result; + return result; } /* variant that increments the length */ |