Attachment #299961 for bug #398023

View | Details | Raw Unified | Return to bug 398023
Collapse All | Expand All

Lines 38-43 Link Here

(-)devil-1.7.8.orig/src-IL/include/il_internal.h (+1 lines)
38	#include <IL/devil_internal_exports.h>	38	#include <IL/devil_internal_exports.h>
39	#include "il_files.h"	39	#include "il_files.h"
40	#include "il_endian.h"	40	#include "il_endian.h"
		41	#include "il_manip.h"
41		42
42	#ifndef _WIN32	43	#ifndef _WIN32
43	// The Microsoft HD Photo Device Porting Kit has not been ported to anything other	44	// The Microsoft HD Photo Device Porting Kit has not been ported to anything other

Lines 15-21 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_bmp.c (-1 lines)
15	#include "il_internal.h"	15	#include "il_internal.h"
16	#ifndef IL_NO_BMP	16	#ifndef IL_NO_BMP
17	#include "il_bmp.h"	17	#include "il_bmp.h"
18	#include "il_manip.h"
19	#include "il_endian.h"	18	#include "il_endian.h"
20	#include <stdio.h>	19	#include <stdio.h>
21	void GetShiftFromMask(const ILuint Mask, ILuint * CONST_RESTRICT ShiftLeft, ILuint * CONST_RESTRICT ShiftRight);	20	void GetShiftFromMask(const ILuint Mask, ILuint * CONST_RESTRICT ShiftLeft, ILuint * CONST_RESTRICT ShiftRight);

Lines 12-18 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_convbuff.c (-1 lines)
12		12
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#include "il_manip.h"
16	#ifdef ALTIVEC_GCC	15	#ifdef ALTIVEC_GCC
17	#include "altivec_typeconversion.h"	16	#include "altivec_typeconversion.h"
18	#endif	17	#endif

Lines 12-18 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_convert.c (-1 lines)
12		12
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#include "il_manip.h"
16	#include <limits.h>	15	#include <limits.h>
17		16
18		17

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_cut.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_CUT	15	#ifndef IL_NO_CUT
16	#include "il_manip.h"
17	#include "il_pal.h"	16	#include "il_pal.h"
18	#include "il_bits.h"	17	#include "il_bits.h"
19		18

Lines 14-20 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_dcx.c (-1 lines)
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_DCX	15	#ifndef IL_NO_DCX
16	#include "il_dcx.h"	16	#include "il_dcx.h"
17	#include "il_manip.h"
18		17
19		18
20	//! Checks if the file specified in FileName is a valid .dcx file.	19	//! Checks if the file specified in FileName is a valid .dcx file.

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_dds-save.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#include "il_dds.h"	15	#include "il_dds.h"
16	#include "il_manip.h"
17	#include <limits.h>	16	#include <limits.h>
18		17
19		18

Lines 14-20 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_devil.c (-1 lines)
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#include <string.h>	15	#include <string.h>
16	#include <limits.h>	16	#include <limits.h>
17	#include "il_manip.h"
18		17
19		18
20	ILAPI ILboolean ILAPIENTRY ilInitImage(ILimage Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void Data)	19	ILAPI ILboolean ILAPIENTRY ilInitImage(ILimage Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void Data)

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_doom.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_DOOM	15	#ifndef IL_NO_DOOM
16	#include "il_manip.h"
17	#include "il_pal.h"	16	#include "il_pal.h"
18	#include "il_doompal.h"	17	#include "il_doompal.h"
19		18

Lines 44-50 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_jpeg.c (-1 lines)
44	#endif	44	#endif
45		45
46	#include "il_jpeg.h"	46	#include "il_jpeg.h"
47	#include "il_manip.h"
48	#include <setjmp.h>	47	#include <setjmp.h>
49		48
50		49

Lines 11-17 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_manip.c (-1 lines)
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#include "il_internal.h"	13	#include "il_internal.h"
14	#include "il_manip.h"
15		14
16		15
17	ILAPI void ILAPIENTRY iFlipBuffer(ILubyte *buff, ILuint depth, ILuint line_size, ILuint line_num)	16	ILAPI void ILAPIENTRY iFlipBuffer(ILubyte *buff, ILuint depth, ILuint line_size, ILuint line_num)

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_nvidia.cpp (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#include "il_dds.h"	15	#include "il_dds.h"
16	#include "il_manip.h"
17	#include <limits.h>	16	#include <limits.h>
18		17
19		18

Lines 15-21 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pcd.c (-1 lines)
15		15
16	#include "il_internal.h"	16	#include "il_internal.h"
17	#ifndef IL_NO_PCD	17	#ifndef IL_NO_PCD
18	#include "il_manip.h"
19		18
20		19
21	ILboolean iLoadPcdInternal(void);	20	ILboolean iLoadPcdInternal(void);

Lines 14-20 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pcx.c (-1 lines)
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_PCX	15	#ifndef IL_NO_PCX
16	#include "il_pcx.h"	16	#include "il_pcx.h"
17	#include "il_manip.h"
18		17
19		18
20	//! Checks if the file specified in FileName is a valid .pcx file.	19	//! Checks if the file specified in FileName is a valid .pcx file.

Lines 15-21 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pic.c (-1 lines)
15	#include "il_internal.h"	15	#include "il_internal.h"
16	#ifndef IL_NO_PIC	16	#ifndef IL_NO_PIC
17	#include "il_pic.h"	17	#include "il_pic.h"
18	#include "il_manip.h"
19	#include <string.h>	18	#include <string.h>
20		19
21		20

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pix.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_PIX	15	#ifndef IL_NO_PIX
16	#include "il_manip.h"
17	#include "il_endian.h"	16	#include "il_endian.h"
18		17
19		18

Lines 19-25 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_png.c (-1 lines)
19	#include "il_internal.h"	19	#include "il_internal.h"
20	#ifndef IL_NO_PNG	20	#ifndef IL_NO_PNG
21	#include <png.h>	21	#include <png.h>
22	#include "il_manip.h"
23	#include <stdlib.h>	22	#include <stdlib.h>
24	#if PNG_LIBPNG_VER < 10200	23	#if PNG_LIBPNG_VER < 10200
25	#warning DevIL was designed with libpng 1.2.0 or higher in mind. Consider upgrading at www.libpng.org.	24	#warning DevIL was designed with libpng 1.2.0 or higher in mind. Consider upgrading at www.libpng.org.

Lines 17-23 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pnm.c (-1 lines)
17	#include "il_pnm.h"	17	#include "il_pnm.h"
18	#include <limits.h> // for maximum values	18	#include <limits.h> // for maximum values
19	#include <ctype.h>	19	#include <ctype.h>
20	#include "il_manip.h"
21	#include "il_bits.h"	20	#include "il_bits.h"
22		21
23	// According to the ppm specs, it's 70, but PSP	22	// According to the ppm specs, it's 70, but PSP

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_pxr.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_PXR	15	#ifndef IL_NO_PXR
16	#include "il_manip.h"
17	#include "il_endian.h"	16	#include "il_endian.h"
18		17
19		18

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_rawdata.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	//#ifndef IL_NO_DATA	15	//#ifndef IL_NO_DATA
16	#include "il_manip.h"
17		16
18		17
19	ILboolean iLoadDataInternal(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);	18	ILboolean iLoadDataInternal(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_sgi.c (-1 lines)
13	#include "il_internal.h"	13	#include "il_internal.h"
14	#ifndef IL_NO_SGI	14	#ifndef IL_NO_SGI
15	#include "il_sgi.h"	15	#include "il_sgi.h"
16	#include "il_manip.h"
17	#include <limits.h>	16	#include <limits.h>
18		17
19	static char *FName = NULL;	18	static char *FName = NULL;

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_squish.cpp (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	/*#include "il_dds.h"	15	/*#include "il_dds.h"
16	#include "il_manip.h"
17	#include <limits.h>*/	16	#include <limits.h>*/
18		17
19		18

Lines 16-22 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_targa.c (-1 lines)
16	#include "il_targa.h"	16	#include "il_targa.h"
17	//#include <time.h> // for ilMakeString()	17	//#include <time.h> // for ilMakeString()
18	#include <string.h>	18	#include <string.h>
19	#include "il_manip.h"
20	#include "il_bits.h"	19	#include "il_bits.h"
21		20
22	#ifdef DJGPP	21	#ifdef DJGPP

Lines 17-23 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_tiff.c (-1 lines)
17	#include "tiffio.h"	17	#include "tiffio.h"
18		18
19	#include <time.h>	19	#include <time.h>
20	#include "il_manip.h"
21		20
22	#define MAGIC_HEADER1 0x4949	21	#define MAGIC_HEADER1 0x4949
23	#define MAGIC_HEADER2 0x4D4D	22	#define MAGIC_HEADER2 0x4D4D

Lines 13-19 Link Here

(-)devil-1.7.8.orig/src-IL/src/il_wal.c (-1 lines)
13		13
14	#include "il_internal.h"	14	#include "il_internal.h"
15	#ifndef IL_NO_WAL	15	#ifndef IL_NO_WAL
16	#include "il_manip.h"
17	#include "il_q2pal.h"	16	#include "il_q2pal.h"
18		17
19		18

Return to bug 398023