From 5632b2d03c2c6f0fb5ab268ad538cc460fb5d3bc Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 29 Apr 2002 09:12:26 +0000 Subject: [PATCH] (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 --- src/graphics/ChangeLog | 5 +++++ src/graphics/GraphicsImageXPM.C | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 7d32da96f4..6f4eb7b79a 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,8 @@ +2002-04-28 John Levon + + * GraphicsImageXPM.C: understand convert's use of "opaque" + as a colour name + 2002-04-19 Marco Morandini * GraphicsCache.[Ch] (loadableFormats): new method. A wrapper for diff --git a/src/graphics/GraphicsImageXPM.C b/src/graphics/GraphicsImageXPM.C index 23f0c3b69c..44850cbaf4 100644 --- a/src/graphics/GraphicsImageXPM.C +++ b/src/graphics/GraphicsImageXPM.C @@ -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); - - attrib.numsymbols = 1; - attrib.colorsymbols = &xpm_col; + XpmColorSymbol xpm_col[2]; + xpm_col[0].name = 0; + xpm_col[0].value = "none"; + xpm_col[0].pixel = lyxColorHandler->colorPixel(LColor::graphicsbg); + + // 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 -- 2.39.5