e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix use of uninitialized data and incorrect indexing. 

This fixes broken rendering in certain situations.


SVN revision: 26193
This commit is contained in:
Kim Woelders 2006-09-28 21:03:04 +00:00
parent 57ffc16033
commit ed89a800a9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epplets/E-Cpu.c
View File

@ -184,6 +184,7 @@ draw_flame(void)
flame[(y * 40) + 39] = 0;
for (y = 0; y < 40; y++)
flame[(y * 40) + 38] /= 2;
rgb = Epplet_get_rgb_pointer(buf);
for (y = 0; y < 40; y++)
{
@ -450,9 +451,9 @@ main(int argc, char **argv)
atexit(Epplet_cleanup);
cpus = count_cpus();
load_val = malloc(sizeof(int) * cpus);
prev_val = malloc(sizeof(double) * cpus);
prev_val_nice = malloc(sizeof(double) * cpus);
load_val = calloc(cpus, sizeof(int));
prev_val = calloc(cpus, sizeof(double));
prev_val_nice = calloc(cpus, sizeof(double));
Epplet_Init("E-Cpu", "0.1", "Enlightenment CPU Epplet", 3, 3, argc, argv, 0);
Epplet_load_config();

21
epplets/E-NetFlame.c
View File

@ -134,11 +134,10 @@ draw_flame(void)
/* initialize the flame if it isn't done already */
if (!flame)
{
vspread = malloc(40 * sizeof(int));
hspread = malloc(40 * sizeof(int));
residual = malloc(40 * sizeof(int));
flame = malloc(sizeof(int) * WIDTH * HEIGHT);
memset(flame, 0, sizeof(int) * WIDTH * HEIGHT);
vspread = malloc(WIDTH * sizeof(int));
hspread = malloc(WIDTH * sizeof(int));
residual = malloc(WIDTH * sizeof(int));
flame = calloc(WIDTH * HEIGHT, sizeof(int));
}
/* move to the bottom left of the drawing area */
ptr = flame + ((HEIGHT - 1) * WIDTH);
@ -147,12 +146,12 @@ draw_flame(void)
{
/* adjust spreads and residual values to reflect the
* load values... */
vspread[x] = VSPREAD + (load_val[(x * DIVISIONS) / HEIGHT] / 50);
vspread[x] = VSPREAD + (load_val[(x * DIVISIONS) / WIDTH] / 50);
hspread[x] = HSPREAD + (load_val[(x * DIVISIONS) / WIDTH] / 50);
residual[x] = RESIDUAL + (load_val[(x * DIVISIONS) / HEIGHT] / 50);
residual[x] = RESIDUAL + (load_val[(x * DIVISIONS) / WIDTH] / 50);
/* assign a random value to the pixel according to the
* load ... gives randomness to flames */
ptr[x] = (rand() % ((load_val[(x * DIVISIONS) / 40]) + 155));
ptr[x] = (rand() % ((load_val[(x * DIVISIONS) / WIDTH]) + 155));
/* bounds checking */
if (ptr[x] > MAX)
{
@ -238,7 +237,7 @@ draw_flame(void)
rgb = Epplet_get_rgb_pointer(buf);
for (y = 0; y < HEIGHT; y++)
{
ptr = flame + (y * WIDTH) + 1;
ptr = flame + (y * WIDTH);
rptr = rgb + (y * WIDTH * 4);
for (x = 0; x < WIDTH; x++)
{
@ -428,8 +427,8 @@ main(int argc, char **argv)
setpriority(PRIO_PROCESS, getpid(), prio + 10);
atexit(Epplet_cleanup);
load_val = malloc(sizeof(int) * DIVISIONS);
prev_val = malloc(sizeof(double) * DIVISIONS);
load_val = calloc(DIVISIONS, sizeof(int));
prev_val = calloc(DIVISIONS, sizeof(double));
Epplet_Init("E-NetFlame", "0.3", "E Net-Flame Epplet", 3, 3, argc, argv, 0);
Epplet_load_config();