~ubuntu-branches/ubuntu/precise/devil/precise

« back to all changes in this revision

Viewing changes to src-IL/src/il_rawdata.c

  • Committer: Bazaar Package Importer
  • Author(s): Bradley Smith
  • Date: 2009-01-17 15:01:18 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090117150118-4bwb6nmvbz4srsjl
Tags: 1.7.5-4
Actually fix CVE-2008-5262. Closes: #512122.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
 
22
22
//! Reads a raw data file
23
 
ILboolean ILAPIENTRY ilLoadData(const ILstring FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp)
 
23
ILboolean ILAPIENTRY ilLoadData(ILconst_string FileName, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp)
24
24
{
25
25
        ILHANDLE        RawFile;
26
26
        ILboolean       bRaw = IL_FALSE;
60
60
 
61
61
 
62
62
//! Reads from a raw data memory "lump"
63
 
ILboolean ILAPIENTRY ilLoadDataL(ILvoid *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp)
 
63
ILboolean ILAPIENTRY ilLoadDataL(void *Lump, ILuint Size, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp)
64
64
{
65
65
        iSetInputLump(Lump, Size);
66
66
        return iLoadDataInternal(Width, Height, Depth, Bpp);
98
98
 
99
99
 
100
100
//! Save the current image to FileName as raw data
101
 
ILboolean ILAPIENTRY ilSaveData(const ILstring FileName)
 
101
ILboolean ILAPIENTRY ilSaveData(ILconst_string FileName)
102
102
{
103
103
        ILHANDLE DataFile;
104
104