Mercurial > hg > xemacs-beta
comparison src/glyphs-msw.c @ 396:6719134a07c2 r21-2-13
Import from CVS: tag r21-2-13
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:12:05 +0200 |
parents | aabb7f5b1c81 |
children | 74fd4e045ea6 |
comparison
equal
deleted
inserted
replaced
395:de2c2a7459d2 | 396:6719134a07c2 |
---|---|
684 Lisp_Object cons = XCAR (results); | 684 Lisp_Object cons = XCAR (results); |
685 colortbl[j].color = | 685 colortbl[j].color = |
686 COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (XCDR (cons))); | 686 COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (XCDR (cons))); |
687 | 687 |
688 GET_C_STRING_OS_DATA_ALLOCA (XCAR (cons), colortbl[j].name); | 688 GET_C_STRING_OS_DATA_ALLOCA (XCAR (cons), colortbl[j].name); |
689 colortbl[j].name = xstrdup (colortbl[j].name); /* mustn't lose this when we return */ | |
689 free_cons (XCONS (cons)); | 690 free_cons (XCONS (cons)); |
690 cons = results; | 691 cons = results; |
691 results = XCDR (results); | 692 results = XCDR (results); |
692 free_cons (XCONS (cons)); | 693 free_cons (XCONS (cons)); |
693 } | 694 } |
882 signal_simple_error ("XPM to EImage conversion failed", | 883 signal_simple_error ("XPM to EImage conversion failed", |
883 image_instance); | 884 image_instance); |
884 } | 885 } |
885 | 886 |
886 if (color_symbols) | 887 if (color_symbols) |
887 xfree(color_symbols); | 888 { |
889 while (nsymbols--) | |
890 { | |
891 xfree (color_symbols[nsymbols].name); | |
892 } | |
893 xfree(color_symbols); | |
894 } | |
888 | 895 |
889 /* build a bitmap from the eimage */ | 896 /* build a bitmap from the eimage */ |
890 if (!(bmp_info=convert_EImage_to_DIBitmap (device, width, height, eimage, | 897 if (!(bmp_info=convert_EImage_to_DIBitmap (device, width, height, eimage, |
891 &bmp_bits, &bmp_data))) | 898 &bmp_bits, &bmp_data))) |
892 { | 899 { |