Gentoo Attachment #148190 for bug #216008

View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (-31 / +39 lines)

Lines 45-52	Link Here

#ifndef _BITSTREAM_HPP_

#ifndef _BITSTREAM_HPP_

#define _BITSTREAM_HPP_

#define _BITSTREAM_HPP_

#include "inbits.h"

#include "inbits.h"

#include <istream.h>

#include <istream>

#include <ostream.h>

#include <ostream>

class CIOBitStream

class CIOBitStream

Lines 39-46	Link Here

#ifndef __ENTROPY_HPP_

#ifndef __ENTROPY_HPP_

#define __ENTROPY_HPP_

#define __ENTROPY_HPP_

#include <istream.h>

#include <istream>

#include <ostream.h>

#include <ostream>

using namespace std;

class CInBitStream;

class CInBitStream;

class COutBitStream;

class COutBitStream;

Lines 79-84	Link Here

#include "tm5rc.hpp"

#include "tm5rc.hpp"

using namespace std;

class CFwdBlockDCT;

class CFwdBlockDCT;

// HHI Schueuer:  scan selection classes to support the sadct

// HHI Schueuer:  scan selection classes to support the sadct

Lines 99-105	Link Here

#include "mode.hpp"

#include "mode.hpp"

#include "tm5rc.hpp"

#include "tm5rc.hpp"

#include "fstream.h"

#include "fstream"

#include "sesenc.hpp"

#include "sesenc.hpp"

// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)

// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)

Lines 54-60	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 46-52	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include <assert.h>

#include <assert.h>

#include "typeapi.h"

#include "typeapi.h"

Lines 75-81	Link Here

#include <stdlib.h>

#include <stdlib.h>

#include <math.h>

#include <math.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

#include "mode.hpp"

#include "mode.hpp"

Lines 60-66	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 53-59	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 67-73	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 44-50	Link Here

**************************************************************************/

**************************************************************************/

#include <stdio.h>

#include <stdio.h>

#include <fstream.h>

#include <fstream>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

Lines 43-49	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 83-90	Link Here

#include "stdlib.h"

#include "stdlib.h"

#include "stdio.h"

#include "stdio.h"

#include "math.h"

#include "math.h"

#include "fstream.h"

#include "fstream"

#include "ostream.h"

#include "ostream"

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 40-46	Link Here

*************************************************************************/

*************************************************************************/

#include <stdio.h>

#include <stdio.h>

#include <iostream.h>

#include <iostream>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

Lines 52-58	Link Here

#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include <math.h>

#include <math.h>

#include "header.h"

#include "header.h"

#include "typeapi.h"

#include "typeapi.h"

Lines 73-79	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 35-41	Link Here

#include <stdio.h>

#include <stdio.h>

#include <math.h>

#include <math.h>

#include <stdlib.h>

#include <stdlib.h>

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

#include "codehead.h"

#include "codehead.h"

Lines 50-56	Link Here

#include <string.h>

#include <string.h>

#include <iostream.h>

#include <iostream>

#include <math.h>

#include <math.h>

#include "typeapi.h"

#include "typeapi.h"

#include "mode.hpp"

#include "mode.hpp"

Lines 36-42	Link Here

*************************************************************************/

*************************************************************************/

#include <stdio.h>

#include <stdio.h>

#include <fstream.h>

#include <fstream>

#include <stdlib.h>

#include <stdlib.h>

#include "typeapi.h"

#include "typeapi.h"

Lines 42-49	Link Here

*************************************************************************/

*************************************************************************/

#include <fstream.h>

#include <fstream>

#include <iostream.h>

#include <iostream>

#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include "typeapi.h"

#include "typeapi.h"

Lines 55-61	Link Here

#include "bitstrm.hpp"

#include "bitstrm.hpp"

#include "vlc.hpp"

#include "vlc.hpp"

#include <iostream.h>

#include <iostream>

#ifdef __MFC_

#ifdef __MFC_

#ifdef _DEBUG

#ifdef _DEBUG

#undef THIS_FILE

#undef THIS_FILE

Lines 37-43	Link Here

#include "dct.hpp"

#include "dct.hpp"

#include <math.h>

#include <math.h>

#if defined(__DEBUG_SADCT_) && !defined(NDEBUG)

#if defined(__DEBUG_SADCT_) && !defined(NDEBUG)

#include <iostream.h>

#include <iostream>

#endif

#endif

#ifdef __MFC_

#ifdef __MFC_

#ifdef _DEBUG

#ifdef _DEBUG

Lines 39-47	Link Here

*************************************************************************/

*************************************************************************/

#include <iostream.h>

#include <iostream>

#include "typeapi.h"

#include "typeapi.h"

using namespace std;

#ifdef __MFC_

#ifdef __MFC_

#ifdef _DEBUG

#ifdef _DEBUG

#undef THIS_FILE

#undef THIS_FILE

Lines 37-43	Link Here

*************************************************************************/

*************************************************************************/

#include "typeapi.h"

#include "typeapi.h"

#include <iostream.h>

#include <iostream>

using namespace std;

#ifdef __MFC_

#ifdef __MFC_

#ifdef _DEBUG

#ifdef _DEBUG

Lines 57-63	Link Here

#include <math.h>

#include <math.h>

#include <assert.h>

#include <assert.h>

// begin: added by Sharp (99/2/16)

// begin: added by Sharp (99/2/16)

#include <iostream.h>

#include <iostream>

#include <sys/stat.h>

#include <sys/stat.h>

// end: added by Sharp (99/2/16)

// end: added by Sharp (99/2/16)

Lines 33-38	Link Here

	transfo.h\

	transfo.h\

	util.h

	util.h

INCLUDES = -I$(top_srcdir)/include

INCLUDES = -I$(top_srcdir)/include

AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing

AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing

EXTRA_DIST = COPYING libfaad60.dsp README

EXTRA_DIST = COPYING libfaad60.dsp README

Lines 90-96	Link Here

void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,

void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,

	     uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,

	     uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,

	     uint8_t *tY, uint8_t *tU, uint8_t *fV,

	     uint8_t *tY, uint8_t *tU, uint8_t *f_V,

	     uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,

	     uint32_t tyStride, uint32_t tvStride, uint32_t tv_Stride,

	     uint32_t w, uint32_t h);

	     uint32_t w, uint32_t h);

#endif

#endif

Attachment #148190: Fix includes, stream usage, and array bounds for gcc-4.3 for bug #216008