summaryrefslogtreecommitdiff
path: root/render/render.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-03-19 07:58:39 +0000
committerDana Jansens <danakj@orodu.net>2003-03-19 07:58:39 +0000
commit7bd747389d3463b00919fd21dfb21d31feb2c3f8 (patch)
tree742c6e2cb26e426f12b92ff6eec8cb92ce0d26de /render/render.c
parent4bceaaf16550a2149d8b4a7315ce8356d700f2ce (diff)
initialize texture to NULL if theres no textures. use g_memdup to copy it
Diffstat (limited to 'render/render.c')
-rw-r--r--render/render.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/render/render.c b/render/render.c
index 51c3a9be..b048bcec 100644
--- a/render/render.c
+++ b/render/render.c
@@ -141,6 +141,7 @@ Appearance *appearance_new(SurfaceType type, int numtex)
out->textures = numtex;
out->xftdraw = NULL;
if (numtex) out->texture = g_new(Texture, numtex);
+ else out->texture = NULL;
out->pixmap = None;
switch (type) {
@@ -191,10 +192,8 @@ Appearance *appearance_copy(Appearance *orig)
break;
}
copy->textures = orig->textures;
- if (orig->textures) {
- copy->texture = malloc(orig->textures * sizeof(Texture));
- memcpy(copy->texture, orig->texture, orig->textures * sizeof(Texture));
- } else copy->texture = NULL;
+ copy->texture = g_memdup(orig->texture,
+ orig->textures * sizeof(Texture));
copy->pixmap = None;
copy->xftdraw = NULL;
return copy;