Chameleon

Chameleon Commit Details

Date:2010-07-25 04:09:41 (10 years 4 months ago)
Author:Tamás Kosárszky
Commit:237
Parents: 236
Message:Added missing #ifdef EMBED_THEME .. #endif conditionals. Now a simple 'make' should run flawlessly.
Changes:
M/branches/zef/i386/boot2/gui.c

File differences

branches/zef/i386/boot2/gui.c
174174
175175
176176
177
177178
178179
179180
......
184185
185186
186187
188
187189
188190
189191
190192
191
193
194
195
196
192197
193198
194199
......
222227
223228
224229
225
230
226231
227232
228233
......
233238
234239
235240
236
237
241
238242
239243
240244
return -1;
}
#ifdef EMBED_THEME
static int getEmbeddedImageIndexByName(const char *name)
{
int i;
}
return -1;
}
#endif
static int loadThemeImage(const char *image, int alt_image)
{
chardirspec[256];
int i, e;
int i;
#ifdef EMBED_THEME
int e;
#endif
uint16_twidth;
uint16_theight;
uint8_t*imagedata;
embed_data = embeddedImages[e].pngdata;
embed_size = *embeddedImages[e].length;
if (embed_size > 0 && (loadEmbeddedPngImage(embed_data, embed_size, &width, &height, &imagedata)) == 0)
if (loadEmbeddedPngImage(embed_data, embed_size, &width, &height, &imagedata) == 0)
{
images[i].image->width = width;
images[i].image->height = height;
return 0;
}
#endif
#endif
else if (alt_image != IMG_REQUIRED && images[alt_image].image->pixels != NULL)
{
// Using the passed alternate image for non-mandatory images.

Archive Download the corresponding diff file

Revision: 237