diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-30 01:46:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-30 01:46:25 +0400 |
| commit | 5e74542bb652cb19741a3c81dbd53f5e961a3c22 (patch) | |
| tree | 9f514a459150991d56f389aa55f837d885b31108 /source/blender | |
| parent | d2f5a60ca2ee3d8cc9dfe1dbb3a2e7770a2b589c (diff) | |
use size_t for MEM_allocN_len as well as some of its callers
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/library.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index cfee7dd9f61..1381a3b19dd 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -650,7 +650,7 @@ void *copy_libblock(void *rt) ID *idn, *id; ListBase *lb; char *cp, *cpn; - int idn_len; + size_t idn_len; id= rt; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 9b3c613aef2..22cdf7d7f2b 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -586,7 +586,7 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq) if (seq->type == SEQ_IMAGE) { /* Hack? */ - int olen = MEM_allocN_len(seq->strip->stripdata)/sizeof(struct StripElem); + size_t olen = MEM_allocN_len(seq->strip->stripdata)/sizeof(struct StripElem); seq->len = olen; seq->len -= seq->anim_startofs; seq->len -= seq->anim_endofs; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f7dcbee79be..74cf3e0c479 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1357,7 +1357,8 @@ static void test_pointer_array(FileData *fd, void **mat) #else long long *lpoin, *lmat; #endif - int len, *ipoin, *imat; + int *ipoin, *imat; + size_t len; /* manually convert the pointer array in * the old dna format to a pointer array in |