small fix with footnote, use stringstream some more

[lyx.git] / src / graphics / ImageLoaderXPM.C

diff --git a/src/graphics/ImageLoaderXPM.C b/src/graphics/ImageLoaderXPM.C
index 87be5a1b1c3eacb593245eb1d371662b1169d8d3..2e08b052e0e79944777f972aaa4439788163822c 100644 (file)
--- a/src/graphics/ImageLoaderXPM.C
+++ b/src/graphics/ImageLoaderXPM.C
@@ -62,7 +62,9 @@ ImageLoaderXPM::runImageLoader(string const & filename)
        Display * display = fl_get_display();
 
 //(BE 2000-08-05)
+#ifdef WITH_WARNINGS
 #warning This might be a dirty thing, but I dont know any other solution.
+#endif
        Screen * screen = ScreenOfDisplay(display, fl_screen);
 
        Pixmap pixmap;
@@ -84,7 +86,7 @@ ImageLoaderXPM::runImageLoader(string const & filename)
        }
        
        // This should have been set by the XpmReadFileToPixmap call!
-       Assert(attrib.valuemask & XpmSize);
+       lyx::Assert(attrib.valuemask & XpmSize);
 
        setImage(new LyXImage(pixmap, attrib.width, attrib.height));