← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src-ILU/src/ilu_main.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
http://bugs.debian.org/512122
Actually fix CVE-2008-5262. Closes: #512122.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src-ILU/src/ilu_main.c
29
29
/* Only needed for MSVC++ unless extended to actually do something =) */
30
30
#if defined(_WIN32) && defined(_MSC_VER)
31
31
 
32
 
BOOL ILAPIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 
32
#ifndef IL_STATIC_LIB
 
33
BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
33
34
{
34
35
        hModule;  ul_reason_for_call;  lpReserved;
35
36
        
41
42
}
42
43
 
43
44
#endif
44
 
 
45
 
 
46
 
ILvoid ILAPIENTRY iluInit()
 
45
#endif
 
46
 
 
47
void ILAPIENTRY iluInit()
47
48
{
48
49
        // Used mostly for rotations
49
50
        //IL_PI = 4 * atan(1);          // precomputed value of pi
50
51
        //IL_DEGCONV = IL_PI / 180;     // division is slow on some computers
 
52
 
 
53
        iluSetLanguage(ILU_ENGLISH);
51
54
        return;
52
55
}
53
56
 
54
57
 
55
58
//#ifndef _WIN32_WCE
56
 
ILuint ILAPIENTRY iluLoadImage(const ILstring FileName)
 
59
ILuint ILAPIENTRY iluLoadImage(ILconst_string FileName)
57
60
{
58
61
        ILuint Id;
59
62
        ilGenImages(1, &Id);