Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-01-20 23:57:48 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-01-20 23:57:48 +0300
commit82187a58f53fef8fe88f89a8aa38729d871a2a37 (patch)
tree45edecca823e02d3901dd76e37a7211ed6d4b4fb /source/blender/blenkernel/intern/text.c
parent475d536f720df3ed9bed783e6d108fa1341fe541 (diff)
Fix own mistake in rB051526da6279, confusing off_t with ptrdiff_t.
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r--source/blender/blenkernel/intern/text.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index a0b987d8cfe..88575c7d3be 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -235,8 +235,8 @@ Text *BKE_text_add(Main *bmain, const char *name)
/* to a valid utf-8 sequences */
int txt_extended_ascii_as_utf8(char **str)
{
- size_t bad_char, i = 0;
- const size_t length = strlen(*str);
+ ptrdiff_t bad_char, i = 0;
+ const ptrdiff_t length = (ptrdiff_t)strlen(*str);
int added = 0;
while ((*str)[i]) {
@@ -249,7 +249,7 @@ int txt_extended_ascii_as_utf8(char **str)
if (added != 0) {
char *newstr = MEM_mallocN(length + added + 1, "text_line");
- size_t mi = 0;
+ ptrdiff_t mi = 0;
i = 0;
while ((*str)[i]) {