>>>>> "R" == R Lahaye <[EMAIL PROTECTED]> writes:
R> I would test that right away, but GraphicsImageXPM.C is badly
R> broken in CVS right now. Please fix that first:
Try the following patch.
JMarc
Index: src/graphics/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/ChangeLog,v
retrieving revision 1.95
diff -u -p -r1.95 ChangeLog
--- src/graphics/ChangeLog 15 Jul 2002 17:17:56 -0000 1.95
+++ src/graphics/ChangeLog 16 Jul 2002 12:29:45 -0000
@@ -1,3 +1,8 @@
+2002-07-16 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * GraphicsImageXPM.C (isDrawable): implement
+ (setPixmap): the opaque color is black, not white
+
2002-07-15 John Levon <[EMAIL PROTECTED]>
* GraphicsImage.h: remove getPixmap/X, add isDrawable()
@@ -272,6 +277,7 @@
pretty temperamemtal at the moment.
2002-04-16 Rob Lahaye <[EMAIL PROTECTED]>
+
* GraphicsImageXPM.C: fix clipping for boundingbox y-coordinates
2002-04-08 Angus Leeming <[EMAIL PROTECTED]>
Index: src/graphics/GraphicsImageXPM.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsImageXPM.C,v
retrieving revision 1.25
diff -u -p -r1.25 GraphicsImageXPM.C
--- src/graphics/GraphicsImageXPM.C 15 Jul 2002 10:19:45 -0000 1.25
+++ src/graphics/GraphicsImageXPM.C 16 Jul 2002 12:29:45 -0000
@@ -95,6 +95,12 @@ unsigned int ImageXPM::getHeight() const
}
+bool ImageXPM::isDrawable() const
+{
+ return pixmap_;
+}
+
+
Pixmap ImageXPM::getPixmap() const
{
if (!pixmap_status_ == PIXMAP_SUCCESS)
@@ -207,7 +213,7 @@ bool ImageXPM::setPixmap(Params const &
// some image magick versions use this
xpm_col[1].name = 0;
xpm_col[1].value = "opaque";
- xpm_col[1].pixel = lyxColorHandler->colorPixel(LColor::white);
+ xpm_col[1].pixel = lyxColorHandler->colorPixel(LColor::black);
attrib.numsymbols = 2;
attrib.colorsymbols = xpm_col;
Index: src/graphics/GraphicsImageXPM.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsImageXPM.h,v
retrieving revision 1.5
diff -u -p -r1.5 GraphicsImageXPM.h
--- src/graphics/GraphicsImageXPM.h 15 Jul 2002 10:19:45 -0000 1.5
+++ src/graphics/GraphicsImageXPM.h 16 Jul 2002 12:29:45 -0000
@@ -48,6 +48,8 @@ public:
/// Get the image height
unsigned int getHeight() const;
+ bool isDrawable() const;
+
/** Load the image file into memory.
* In this case (ImageXPM), the process is blocking.
*/
