← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src-ILUT/src/ilut_states.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-ILUT/src/ilut_states.c
1
1
//-----------------------------------------------------------------------------
2
2
//
3
3
// ImageLib Utility Toolkit Sources
4
 
// Copyright (C) 2000-2002 by Denton Woods
5
 
// Last modified: 05/18/2002 <--Y2K Compliant! =]
 
4
// Copyright (C) 2000-2008 by Denton Woods
 
5
// Last modified: 12/17/2008
6
6
//
7
7
// Filename: src-ILUT/src/ilut_states.c
8
8
//
18
18
//#endif
19
19
 
20
20
 
21
 
const char *_ilutVendor         = "Abysmal Software";
22
 
const char *_ilutVersion        = "Developer's Image Library Utility Toolkit (ILUT) 1.6.7 " __DATE__;
23
 
 
 
21
ILconst_string _ilutVendor      = IL_TEXT("Abysmal Software");
 
22
//ILconst_string _ilutVersion   = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.5 " IL_TEXT(__DATE__));
 
23
ILconst_string _ilutVersion     = IL_TEXT("Developer's Image Library Utility Toolkit (ILUT) 1.7.5 ");
24
24
 
25
25
 
26
26
// Set all states to their defaults
27
 
ILvoid ilutDefaultStates()
 
27
void ilutDefaultStates()
28
28
{
29
29
        ilutStates[ilutCurrentPos].ilutUsePalettes = IL_FALSE;
 
30
        ilutStates[ilutCurrentPos].ilutForceIntegerFormat = IL_FALSE;
30
31
        ilutStates[ilutCurrentPos].ilutOglConv = IL_FALSE;  // IL_TRUE ?
31
32
        ilutStates[ilutCurrentPos].ilutDXTCFormat = 0;
32
33
        ilutStates[ilutCurrentPos].ilutUseS3TC = IL_FALSE;
38
39
}
39
40
 
40
41
 
41
 
ILvoid ILAPIENTRY ilutD3D8MipFunc(ILuint NumLevels)
 
42
void ILAPIENTRY ilutD3D8MipFunc(ILuint NumLevels)
42
43
{
43
44
        ilutStates[ilutCurrentPos].D3DMipLevels = NumLevels;
44
45
        return;
81
82
                        ilutStates[ilutCurrentPos].ilutUsePalettes = Flag;
82
83
                        break;
83
84
 
 
85
                case ILUT_FORCE_INTEGER_FORMAT:
 
86
                        ilutStates[ilutCurrentPos].ilutForceIntegerFormat = Flag;
 
87
                        break;
 
88
 
84
89
                case ILUT_OPENGL_CONV:
85
90
                        ilutStates[ilutCurrentPos].ilutOglConv = Flag;
86
91
                        break;
114
119
                case ILUT_PALETTE_MODE:
115
120
                        return ilutStates[ilutCurrentPos].ilutUsePalettes;
116
121
 
 
122
                case ILUT_FORCE_INTEGER_FORMAT:
 
123
                        return ilutStates[ilutCurrentPos].ilutForceIntegerFormat;
 
124
 
117
125
                case ILUT_OPENGL_CONV:
118
126
                        return ilutStates[ilutCurrentPos].ilutOglConv;
119
127
 
141
149
}
142
150
 
143
151
 
144
 
ILvoid ILAPIENTRY ilutGetBooleanv(ILenum Mode, ILboolean *Param)
 
152
void ILAPIENTRY ilutGetBooleanv(ILenum Mode, ILboolean *Param)
145
153
{
146
154
        switch (Mode)
147
155
        {
149
157
                        *Param = ilutStates[ilutCurrentPos].ilutUsePalettes;
150
158
                        break;
151
159
 
 
160
                case ILUT_FORCE_INTEGER_FORMAT:
 
161
                        *Param = ilutStates[ilutCurrentPos].ilutForceIntegerFormat;
 
162
                        break;
 
163
 
152
164
                case ILUT_OPENGL_CONV:
153
165
                        *Param = ilutStates[ilutCurrentPos].ilutOglConv;
154
166
                        break;
180
192
}
181
193
 
182
194
 
183
 
ILvoid ILAPIENTRY ilutGetIntegerv(ILenum Mode, ILint *Param)
 
195
void ILAPIENTRY ilutGetIntegerv(ILenum Mode, ILint *Param)
184
196
{
185
197
        switch (Mode)
186
198
        {
193
205
                case ILUT_PALETTE_MODE:
194
206
                        *Param = ilutStates[ilutCurrentPos].ilutUsePalettes;
195
207
                        break;
 
208
                case ILUT_FORCE_INTEGER_FORMAT:
 
209
                        *Param = ilutStates[ilutCurrentPos].ilutForceIntegerFormat;
 
210
                        break;
196
211
                case ILUT_OPENGL_CONV:
197
212
                        *Param = ilutStates[ilutCurrentPos].ilutOglConv;
198
213
                        break;
233
248
}
234
249
 
235
250
 
236
 
ILvoid ILAPIENTRY ilutSetInteger(ILenum Mode, ILint Param)
 
251
void ILAPIENTRY ilutSetInteger(ILenum Mode, ILint Param)
237
252
{
238
253
        switch (Mode)
239
254
        {
255
270
                        break;
256
271
                case ILUT_GL_USE_S3TC:
257
272
                        if (Param == IL_TRUE || Param == IL_FALSE) {
258
 
                                ilutStates[ilutCurrentPos].ilutUseS3TC = Param;
 
273
                                ilutStates[ilutCurrentPos].ilutUseS3TC = (ILboolean)Param;
259
274
                                return;
260
275
                        }
261
276
                        break;
262
277
                case ILUT_GL_GEN_S3TC:
263
278
                        if (Param == IL_TRUE || Param == IL_FALSE) {
264
 
                                ilutStates[ilutCurrentPos].ilutGenS3TC = Param;
 
279
                                ilutStates[ilutCurrentPos].ilutGenS3TC = (ILboolean)Param;
265
280
                                return;
266
281
                        }
267
282
                        break;
268
283
                case ILUT_GL_AUTODETECT_TEXTURE_TARGET:
269
284
                        if (Param == IL_TRUE || Param == IL_FALSE) {
270
 
                                ilutStates[ilutCurrentPos].ilutAutodetectTextureTarget = Param;
 
285
                                ilutStates[ilutCurrentPos].ilutAutodetectTextureTarget = (ILboolean)Param;
271
286
                                return;
272
287
                        }
273
288
                        break;
303
318
}
304
319
 
305
320
 
306
 
ILvoid ILAPIENTRY ilutPushAttrib(ILuint Bits)
 
321
void ILAPIENTRY ilutPushAttrib(ILuint Bits)
307
322
{
308
323
        // Should we check here to see if ilCurrentPos is negative?
309
324
 
330
345
}
331
346
 
332
347
 
333
 
ILvoid ILAPIENTRY ilutPopAttrib()
 
348
void ILAPIENTRY ilutPopAttrib()
334
349
{
335
350
        if (ilutCurrentPos <= 0) {
336
351
                ilutCurrentPos = 0;
374
389
                return ilutD3D9Init();
375
390
        #endif
376
391
                
 
392
                #ifdef ILUT_USE_DIRECTX10
 
393
        case ILUT_DIRECT3D10:
 
394
                return ilutD3D10Init();
 
395
        #endif
 
396
 
377
397
                default:
378
398
                        ilSetError(ILUT_NOT_SUPPORTED);
379
399
        }