[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17039] trunk/blender: c3d_import needed encoding defined for python 2.5+ to run.

[Campbell Barton]

Revision: 17039
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17039
Author:   campbellbarton
Date:     2008-10-12 12:39:45 +0200 (Sun, 12 Oct 2008)

Log Message:
-----------
c3d_import needed encoding defined for python 2.5+ to run.
wav file reading minor fix checking array bounds.

Modified Paths:
--------------
    trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp
    trunk/blender/release/scripts/c3d_import.py

Modified: trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp
===================================================================
--- trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp	2008-10-12 07:58:05 UTC (rev 17038)
+++ trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp	2008-10-12 10:39:45 UTC (rev 17039)
@@ -309,7 +309,7 @@
 		{
 			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 @@
 		{
 			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;

Modified: trunk/blender/release/scripts/c3d_import.py
===================================================================
--- trunk/blender/release/scripts/c3d_import.py	2008-10-12 07:58:05 UTC (rev 17038)
+++ trunk/blender/release/scripts/c3d_import.py	2008-10-12 10:39:45 UTC (rev 17039)
@@ -1,5 +1,5 @@
 #!BPY
-
+# -*- coding: latin-1 -*-
 """
 Name: 'Motion Capture  (.c3d)...'
 Blender: 246