Mercurial > hg > xemacs-beta
comparison src/redisplay-output.c @ 3479:2b84dd8eb906
[xemacs-hg @ 2006-06-27 22:59:37 by james]
Don't leak Dynarr's in redisplay. <m3sllwwxja.fsf@jerrypc.cs.usu.edu>
author | james |
---|---|
date | Tue, 27 Jun 2006 22:59:40 +0000 |
parents | 3d8143fc88e1 |
children | 26dccfc8fa60 |
comparison
equal
deleted
inserted
replaced
3478:222e933cef23 | 3479:2b84dd8eb906 |
---|---|
1405 face_index findex, int UNUSED (cursor_start), | 1405 face_index findex, int UNUSED (cursor_start), |
1406 int UNUSED (cursor_width), int UNUSED (cursor_height)) | 1406 int UNUSED (cursor_width), int UNUSED (cursor_height)) |
1407 { | 1407 { |
1408 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); | 1408 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); |
1409 Lisp_Object rest, window = DOMAIN_WINDOW (domain); | 1409 Lisp_Object rest, window = DOMAIN_WINDOW (domain); |
1410 Ichar_dynarr *buf = Dynarr_new (Ichar); | 1410 Ichar_dynarr *buf; |
1411 struct window *w = XWINDOW (window); | 1411 struct window *w = XWINDOW (window); |
1412 struct device *d = DOMAIN_XDEVICE (domain); | 1412 struct device *d = DOMAIN_XDEVICE (domain); |
1413 int layout_height, layout_width; | 1413 int layout_height, layout_width; |
1414 | 1414 |
1415 layout_height = glyph_height (image_instance, domain); | 1415 layout_height = glyph_height (image_instance, domain); |
1421 printf ("outputing layout glyph %p\n", p); | 1421 printf ("outputing layout glyph %p\n", p); |
1422 #endif | 1422 #endif |
1423 /* This makes the glyph area fit into the display area. */ | 1423 /* This makes the glyph area fit into the display area. */ |
1424 if (!redisplay_normalize_glyph_area (db, dga)) | 1424 if (!redisplay_normalize_glyph_area (db, dga)) |
1425 return; | 1425 return; |
1426 | |
1427 buf = Dynarr_new (Ichar); | |
1426 | 1428 |
1427 /* Highly dodgy optimization. We want to only output the whole | 1429 /* Highly dodgy optimization. We want to only output the whole |
1428 layout if we really have to. */ | 1430 layout if we really have to. */ |
1429 if (!IMAGE_INSTANCE_OPTIMIZE_OUTPUT (p) | 1431 if (!IMAGE_INSTANCE_OPTIMIZE_OUTPUT (p) |
1430 || IMAGE_INSTANCE_LAYOUT_CHANGED (p) | 1432 || IMAGE_INSTANCE_LAYOUT_CHANGED (p) |