diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 09:58:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-19 09:58:52 +0400 |
| commit | 20463cb842ac8a519a434a82c715b89370f14080 (patch) | |
| tree | 7e326f42c3a4d232de341da36e338f022dbaefe0 /source/blender/blenfont/intern/blf_util.c | |
| parent | e197b993d389d38b1ee6cbbdabe3ef2846f4aab6 (diff) | |
| parent | 049838fe0ce1b2e737c7d2c539cb8a945d52b902 (diff) | |
svn merge ^/trunk/blender -r40311:40338
Diffstat (limited to 'source/blender/blenfont/intern/blf_util.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenfont/intern/blf_util.c b/source/blender/blenfont/intern/blf_util.c index edd23ac1ba6..cfe77887674 100644 --- a/source/blender/blenfont/intern/blf_util.c +++ b/source/blender/blenfont/intern/blf_util.c @@ -46,7 +46,7 @@ unsigned int blf_next_p2(unsigned int x) x |= (x >> 2); x |= (x >> 1); x += 1; - return(x); + return x; } unsigned int blf_hash(unsigned int val) @@ -60,7 +60,7 @@ unsigned int blf_hash(unsigned int val) key ^= (key >> 13); key += ~(key << 9); key ^= (key >> 17); - return(key % 257); + return key % 257; } /* @@ -85,7 +85,7 @@ int blf_utf8_next(unsigned char *buf, unsigned int *iindex) d= buf[index++]; if (!d) - return(0); + return 0; while (buf[index] && ((buf[index] & 0xc0) == 0x80)) index++; @@ -124,5 +124,5 @@ int blf_utf8_next(unsigned char *buf, unsigned int *iindex) r |= (d4 & 0x3f); } *iindex= index; - return(r); + return r; } |