diff options
| -rw-r--r-- | source/blender/blenlib/tests/BLI_string_utf8_test.cc | 10 | ||||
| -rw-r--r-- | source/blender/simulation/intern/implicit_blender.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenlib/tests/BLI_string_utf8_test.cc b/source/blender/blenlib/tests/BLI_string_utf8_test.cc index f0b6ab9cd2a..9743c1387a0 100644 --- a/source/blender/blenlib/tests/BLI_string_utf8_test.cc +++ b/source/blender/blenlib/tests/BLI_string_utf8_test.cc @@ -29,7 +29,7 @@ const char *utf8_invalid_tests[][3] = { /* 2 Boundary condition test cases * Note that those will pass for us, those are not erronéous unicode code points - * (asside from \x00, which is only valid as string terminator). + * (aside from \x00, which is only valid as string terminator). * 2.1 First possible sequence of a certain length */ {"2.1.1 1 byte (U-00000000): \"\x00\" |", "2.1.1 1 byte (U-00000000): \"\" |", "\x01"}, @@ -241,8 +241,8 @@ const char *utf8_invalid_tests[][3] = { "5.2.7 U+DBFF U+DC00 = ed af bf ed b0 80 = \"\" |", "\x06"}, {"5.2.8 U+DBFF U+DFFF = ed af bf ed bf bf = \"\xed\xaf\xbf\xed\xbf\xbf\" |", "5.2.8 U+DBFF U+DFFF = ed af bf ed bf bf = \"\" |", "\x06"}, -/* 5.3 Noncharacter code positions - * The following "noncharacters" are "reserved for internal use" by applications, and according to older versions +/* 5.3 Non-character code positions + * The following "non-characters" are "reserved for internal use" by applications, and according to older versions * of the Unicode Standard "should never be interchanged". Unicode Corrigendum #9 dropped the latter restriction. * Nevertheless, their presence in incoming UTF-8 data can remain a potential security risk, depending * on what use is made of these codes subsequently. Examples of such internal use: @@ -250,11 +250,11 @@ const char *utf8_invalid_tests[][3] = { * an end-of-file (EOF) or error condition. * - In some UTF-16 receivers, code point U+FFFE might trigger a byte-swap operation * (to convert between UTF-16LE and UTF-16BE). - * With such internal use of noncharacters, it may be desirable and safer to block those code points in + * With such internal use of non-characters, it may be desirable and safer to block those code points in * UTF-8 decoders, as they should never occur legitimately in incoming UTF-8 data, and could trigger * unsafe behavior in subsequent processing. * - * Particularly problematic noncharacters in 16-bit applications: */ + * Particularly problematic non-characters in 16-bit applications: */ {"5.3.1 U+FFFE = ef bf be = \"\xef\xbf\xbe\" |", "5.3.1 U+FFFE = ef bf be = \"\" |", "\x03"}, {"5.3.2 U+FFFF = ef bf bf = \"\xef\xbf\xbf\" |", diff --git a/source/blender/simulation/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c index f6f73ba7dd2..9bfe77d5e60 100644 --- a/source/blender/simulation/intern/implicit_blender.c +++ b/source/blender/simulation/intern/implicit_blender.c @@ -2352,8 +2352,8 @@ bool SIM_mass_spring_force_spring_goal(Implicit_Data *data, if (length > ALMOST_ZERO) { mul_v3_v3fl(f, dir, stiffness * length); - /* Ascher & Boxman, p.21: Damping only during elonglation - * something wrong with it... */ + /* Ascher & Boxman, p.21: Damping only during elongation + * something wrong with it. */ madd_v3_v3fl(f, dir, damping * dot_v3v3(vel, dir)); dfdx_spring(dfdx, dir, length, 0.0f, stiffness); |