griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge -r40295:40367 ^/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-09-21 17:15:54 +00:00
parent b602024a26 d78231734d
commit 14475d07cd
191 changed files with 3268 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/audaspace/intern/AUD_ConverterReader.cpp
View File

@@ -36,9 +36,6 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader,
AUD_EffectReader(reader),
m_format(specs.format)
{
int bigendian = 1;
bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
switch(m_format)
{
case AUD_FORMAT_U8:
@@ -48,10 +45,11 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_Reference<AUD_IReader> reader,
m_convert = AUD_convert_float_s16;
break;
case AUD_FORMAT_S24:
if(bigendian)
m_convert = AUD_convert_float_s24_be;
else
m_convert = AUD_convert_float_s24_le;
#ifdef __BIG_ENDIAN__
m_convert = AUD_convert_float_s24_be;
#else
m_convert = AUD_convert_float_s24_le;
#endif
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;

13
intern/audaspace/intern/AUD_Mixer.cpp
View File

@@ -37,9 +37,6 @@
AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) :
m_specs(specs)
{
int bigendian = 1;
bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
switch(m_specs.format)
{
case AUD_FORMAT_U8:
@@ -49,10 +46,12 @@ AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) :
m_convert = AUD_convert_float_s16;
break;
case AUD_FORMAT_S24:
if(bigendian)
m_convert = AUD_convert_float_s24_be;
else
m_convert = AUD_convert_float_s24_le;
#ifdef __BIG_ENDIAN__
m_convert = AUD_convert_float_s24_be;
#else
m_convert = AUD_convert_float_s24_le;
#endif
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;

6
intern/guardedalloc/intern/mallocn.c
View File

@@ -124,10 +124,10 @@ static const char *check_memlist(MemHead *memh);
/* locally used defines */
/* --------------------------------------------------------------------- */
#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__))
#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
#ifdef __BIG_ENDIAN__
# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
#else
#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
#endif
#define MEMTAG1 MAKE_ID('M', 'E', 'M', 'O')

2
intern/itasc/kdl/frames.hpp
View File

@@ -299,7 +299,7 @@ public:
double data[9];
inline Rotation() {
*this = Rotation::Identity();
*this = Identity();
}
inline Rotation(double Xx,double Yx,double Zx,
double Xy,double Yy,double Zy,

2
intern/string/intern/STR_String.cpp
View File

@@ -45,7 +45,7 @@
#include <ctype.h>
#include <string.h>
#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX)
#include <strings.h>
# include <strings.h>
#endif
#include "STR_String.h"