diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-10-12 14:39:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-10-12 14:39:45 +0400 |
| commit | 2ee4feda268f5c73938f78d06321163d8eeb467a (patch) | |
| tree | 9b31d2c3aece8a2fca9a46f1fe6966c18e4d4203 | |
| parent | 167676dbfeae96459247dcf627e34aec1c409048 (diff) | |
c3d_import needed encoding defined for python 2.5+ to run.
wav file reading minor fix checking array bounds.
| -rw-r--r-- | intern/SoundSystem/intern/SND_Utils.cpp | 4 | ||||
| -rw-r--r-- | release/scripts/c3d_import.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/SoundSystem/intern/SND_Utils.cpp b/intern/SoundSystem/intern/SND_Utils.cpp index 1593dd6c794..78115807970 100644 --- a/intern/SoundSystem/intern/SND_Utils.cpp +++ b/intern/SoundSystem/intern/SND_Utils.cpp @@ -309,7 +309,7 @@ unsigned int SND_GetNumberOfSamples(void* sample, int sample_length) { offset += block_align; - if (offset+4 > sample_length) /* save us from crashing */ + if (offset+block_align > sample_length) /* save us from crashing */ return 0; } offset += 4; @@ -347,7 +347,7 @@ unsigned int SND_GetHeaderSize(void* sample, int sample_length) { offset += block_align; - if (offset+4 > sample_length) /* save us from crashing */ + if (offset+block_align > sample_length) /* save us from crashing */ return 0; } headersize = offset + 8; diff --git a/release/scripts/c3d_import.py b/release/scripts/c3d_import.py index ca4f8cd79e9..bfe691c394c 100644 --- a/release/scripts/c3d_import.py +++ b/release/scripts/c3d_import.py @@ -1,5 +1,5 @@ #!BPY - +# -*- coding: latin-1 -*- """ Name: 'Motion Capture (.c3d)...' Blender: 246 |