remove more forms.h cruft

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

diff --git a/src/graphics/ImageLoader.C b/src/graphics/ImageLoader.C
index b874ef55b7aee5de5db5a5c7be6048145030549b..5a75a3f14fed44cea380300f76e3a28d37fac91f 100644 (file)
--- a/src/graphics/ImageLoader.C
+++ b/src/graphics/ImageLoader.C
@@ -1,10 +1,9 @@
-// -*- C++ -*-
 /* This file is part of
  * =================================================
  * 
  *          LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ================================================= */
 
@@ -18,6 +17,8 @@
 
 #include "support/filetools.h"
 
+using std::endl;
+
 ImageLoader::ImageLoader()
                : image_(0)
 {
@@ -28,6 +29,13 @@ ImageLoader::~ImageLoader()
        freeImage();
 }
 
+void
+ImageLoader::freeImage()
+{
+       delete image_;
+       image_ = 0;
+}
+
 bool ImageLoader::isImageFormatOK(string const & /*filename*/) const
 {
        return false;
@@ -35,15 +43,14 @@ bool ImageLoader::isImageFormatOK(string const & /*filename*/) const
 
 void ImageLoader::setImage(LyXImage * image)
 {
-       freeImage();
-
        image_ = image;
 }
 
-void ImageLoader::freeImage()
+LyXImage * ImageLoader::getImage()
 {
-       delete image_;
+       LyXImage * tmp = image_;
        image_ = 0;
+       return tmp;
 }
 
 ImageLoader::FormatList const