Previous

15994 Revisions

Next

r15056 Sunday 29th April, 2012 at 17:42:05 UTC by Firewave
fixed several GCC 4.6 warnings with libflac and lib7z

[src/lib/lib7z]	LzmaEnc.c
[src/lib/libflac/libflac]	lpc.c stream_decoder.c stream_encoder.c

src/lib/lib7z/LzmaEnc.c

r15055	r15056
1905	1905	static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
1906	1906	{
1907	1907	UInt32 beforeSize = kNumOpts;
1908		//  Bool btMode;
	1908	#ifndef _7ZIP_ST
	1909	Bool btMode;
	1910	#endif
1909	1911	if (!RangeEnc_Alloc(&p->rc, alloc))
1910	1912	return SZ_ERROR_MEM;
1911		//  btMode = (p->matchFinderBase.btMode != 0);
1912	1913	#ifndef _7ZIP_ST
	1914	btMode = (p->matchFinderBase.btMode != 0);
1913	1915	p->mtMode = (p->multiThread && !p->fastMode && btMode);
1914	1916	#endif
1915	1917

src/lib/libflac/libflac/lpc.c

r15055	r15056
112	112	void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__double error[])
113	113	{
114	114	unsigned i, j;
115		FLAC__double r, err, lpc[FLAC__MAX_LPC_ORDER]; // , ref[FLAC__MAX_LPC_ORDER];
	115	FLAC__double r, err, /*ref[FLAC__MAX_LPC_ORDER],*/ lpc[FLAC__MAX_LPC_ORDER];
116	116
117	117	FLAC__ASSERT(0 != max_order);
118	118	FLAC__ASSERT(0 < *max_order);
r15055	r15056
126	126	r = -autoc[i+1];
127	127	for(j = 0; j < i; j++)
128	128	r -= lpc[j] * autoc[i-j];
129		//      ref[i] = (r/=err);
	129	//ref[i] = (r/=err);
130	130
131	131	/* Update LPC coefficients and total error. */
132	132	lpc[i]=r;

src/lib/libflac/libflac/stream_decoder.c

r15055	r15056
40	40	#include <sys/types.h> /* for off_t */
41	41	#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
42	42	#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
	43	#ifndef fseeko
43	44	#define fseeko fseek
	45	#endif
	46	#ifndef ftello
44	47	#define ftello ftell
45	48	#endif
46	49	#endif
	50	#endif
47	51	#include "flac/assert.h"
48	52	#include "share/alloc.h"
49	53	#include "protected/stream_decoder.h"

src/lib/libflac/libflac/stream_encoder.c

r15055	r15056
40	40	#include <sys/types.h> /* for off_t */
41	41	#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
42	42	#if (!defined(_MSC_VER) || _MSC_VER <= 1600) || defined __BORLANDC__ /* @@@ [2G limit] */
	43	#ifndef fseeko
43	44	#define fseeko fseek
	45	#endif
	46	#ifndef ftello
44	47	#define ftello ftell
45	48	#endif
46	49	#endif
	50	#endif
47	51	#include "flac/assert.h"
48	52	#include "flac/stream_decoder.h"
49	53	#include "share/alloc.h"

Previous

15994 Revisions

Next

---

© 1998-2018 The MESS Team