mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 02:28:35 +00:00
(John): Enable the libXPM-based loader to cope with "opaque" as a colour.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4083 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
86d8e730d7
commit
5632b2d03c
@ -1,3 +1,8 @@
|
||||
2002-04-28 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* GraphicsImageXPM.C: understand convert's use of "opaque"
|
||||
as a colour name
|
||||
|
||||
2002-04-19 Marco Morandini <morandini@aero.polimi.it>
|
||||
|
||||
* GraphicsCache.[Ch] (loadableFormats): new method. A wrapper for
|
||||
|
@ -188,13 +188,18 @@ bool GImageXPM::setPixmap(GParams const & params)
|
||||
attrib.valuemask |= XpmColorKey;
|
||||
|
||||
// Set the color "none" entry to the color of the background.
|
||||
XpmColorSymbol xpm_col;
|
||||
xpm_col.name = 0;
|
||||
xpm_col.value = "none";
|
||||
xpm_col.pixel = lyxColorHandler->colorPixel(LColor::graphicsbg);
|
||||
XpmColorSymbol xpm_col[2];
|
||||
xpm_col[0].name = 0;
|
||||
xpm_col[0].value = "none";
|
||||
xpm_col[0].pixel = lyxColorHandler->colorPixel(LColor::graphicsbg);
|
||||
|
||||
attrib.numsymbols = 1;
|
||||
attrib.colorsymbols = &xpm_col;
|
||||
// some image magick versions use this
|
||||
xpm_col[1].name = 0;
|
||||
xpm_col[1].value = "opaque";
|
||||
xpm_col[1].pixel = lyxColorHandler->colorPixel(LColor::white);
|
||||
|
||||
attrib.numsymbols = 2;
|
||||
attrib.colorsymbols = xpm_col;
|
||||
attrib.valuemask |= XpmColorSymbols;
|
||||
|
||||
// Load up the pixmap
|
||||
|
Loading…
Reference in New Issue
Block a user