diff options
| author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
| commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
| tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /hacks/glx/glhanoi.c | |
| parent | Flush X events before locking if we have an external ungrab command (diff) | |
| parent | Update to 5.43 (diff) | |
| download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip | |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'hacks/glx/glhanoi.c')
| -rw-r--r-- | hacks/glx/glhanoi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hacks/glx/glhanoi.c b/hacks/glx/glhanoi.c index eaf775f..46cdc68 100644 --- a/hacks/glx/glhanoi.c +++ b/hacks/glx/glhanoi.c @@ -1296,7 +1296,7 @@ static void initData(glhcfg *glhanoi) glhanoi->pole[i].size = glhanoi->numberOfDisks; } checkAllocAndExit( - !!(glhanoi->diskPos = calloc(glhanoi->numberOfDisks, sizeof(double))), + !!(glhanoi->diskPos = calloc(glhanoi->numberOfDisks, sizeof(float))), "diskPos"); if (glhanoi->trailQSize) { @@ -1430,7 +1430,7 @@ static GLubyte *makeTexture(glhcfg *glhanoi, int x_size, int y_size, int z_size, double xi, yi, zi; if((textureData = - calloc(x_size * y_size * z_size, sizeof(GLuint))) == NULL) { + calloc(x_size * y_size * z_size, sizeof(GLubyte))) == NULL) { return NULL; } |