forked from len0rd/rockbox
changes to compile without warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6057 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
e449d88b3e
commit
c3e55c01a5
3 changed files with 8 additions and 8 deletions
|
@ -40,7 +40,7 @@ int read_metadata_buff (WavpackContext *wpc, WavpackMetadata *wpmd)
|
||||||
wpmd->byte_length--;
|
wpmd->byte_length--;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wpmd->byte_length && wpmd->byte_length <= sizeof (wpc->read_buffer)) {
|
if (wpmd->byte_length && wpmd->byte_length <= (long)sizeof (wpc->read_buffer)) {
|
||||||
ulong bytes_to_read = wpmd->byte_length + (wpmd->byte_length & 1);
|
ulong bytes_to_read = wpmd->byte_length + (wpmd->byte_length & 1);
|
||||||
|
|
||||||
if (wpc->infile (wpc->read_buffer, bytes_to_read) != (long) bytes_to_read) {
|
if (wpc->infile (wpc->read_buffer, bytes_to_read) != (long) bytes_to_read) {
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#define LOSSY_MUTE
|
#define LOSSY_MUTE
|
||||||
|
|
||||||
|
@ -513,6 +514,7 @@ static void fixup_samples (WavpackStream *wps, long *buffer, ulong sample_count)
|
||||||
|
|
||||||
if (flags & HYBRID_FLAG) {
|
if (flags & HYBRID_FLAG) {
|
||||||
long min_value, max_value, min_shifted, max_shifted;
|
long min_value, max_value, min_shifted, max_shifted;
|
||||||
|
min_value = max_value = min_shifted = max_shifted = 0;
|
||||||
|
|
||||||
switch (flags & BYTES_STORED) {
|
switch (flags & BYTES_STORED) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -531,8 +533,9 @@ static void fixup_samples (WavpackStream *wps, long *buffer, ulong sample_count)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
min_shifted = (min_value = -(long)2147483648 >> shift) << shift;
|
// 0x80000000 is the same as 2147483648
|
||||||
max_shifted = (max_value = (long) 2147483647 >> shift) << shift;
|
min_shifted = (min_value = -0x80000000 >> shift) << shift;
|
||||||
|
max_shifted = (max_value = 0x80000000 >> shift) << shift;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,18 +8,15 @@
|
||||||
|
|
||||||
// wavpack.h
|
// wavpack.h
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <inttypes.h>
|
||||||
|
|
||||||
// This header file contains all the definitions required by WavPack.
|
// This header file contains all the definitions required by WavPack.
|
||||||
|
|
||||||
|
// not sure about them.. testing will bring more light into it..
|
||||||
typedef unsigned char uchar;
|
typedef unsigned char uchar;
|
||||||
#if !defined(__GNUC__) || defined(WIN32)
|
|
||||||
typedef unsigned short ushort;
|
typedef unsigned short ushort;
|
||||||
typedef unsigned long ulong;
|
typedef unsigned long ulong;
|
||||||
typedef unsigned int uint;
|
typedef unsigned int uint;
|
||||||
#elif defined(__APPLE__)
|
|
||||||
typedef unsigned long ulong;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// This structure is used to access the individual fields of 32-bit ieee
|
// This structure is used to access the individual fields of 32-bit ieee
|
||||||
// floating point numbers. This will not be compatible with compilers that
|
// floating point numbers. This will not be compatible with compilers that
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue