* filetools.[Ch]: Make functions that start with a capital

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

diff --git a/src/graphics/GraphicsImage.C b/src/graphics/GraphicsImage.C
index 96052c708ef91324cdb3a68673679fb76755195e..b1d7e60707e09c7e39ad530fa73640e149d05806 100644 (file)
--- a/src/graphics/GraphicsImage.C
+++ b/src/graphics/GraphicsImage.C
@@ -1,46 +1,45 @@
-/*
+/**
  * \file GraphicsImage.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Baruch Even <baruch.even@writeme.com>
- * \author Angus Leeming <leeming@lyx.org>
- * \author Herbert Voss <voss@lyx.org>
+ * \author Baruch Even
+ * \author Angus Leeming
+ * \author Herbert Voß
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "GraphicsImage.h"
 #include "GraphicsParams.h"
 #include "debug.h"
 
-using std::endl;
-using std::abs;
 
-namespace grfx {
+namespace lyx {
+namespace graphics {
 
 // This is to be connected to a function that will return a new
 // instance of a viable derived class.
-boost::function0<Image::ImagePtr> Image::newImage;
+boost::function<Image::ImagePtr()> Image::newImage;
 
 /// Return the list of loadable formats.
-boost::function0<Image::FormatList> Image::loadableFormats;
+boost::function<Image::FormatList()> Image::loadableFormats;
 
 
 std::pair<unsigned int, unsigned int>
 Image::getScaledDimensions(Params const & params) const
 {
-       unsigned int width = getWidth();
-       unsigned int height = getHeight();
-
-       // scale only when value makes sense, i.e. not zero
+       // scale only when value > 0
+       unsigned int width;
+       unsigned int height;
        if (params.scale) {
-               width  = (width * params.scale) / 100;
-               height = (height * params.scale) / 100;
+               width  = (getWidth() * params.scale) / 100;
+               height = (getHeight() * params.scale) / 100;
+       } else {
+               width = getWidth();
+               height = getHeight();
        }
 
        lyxerr[Debug::GRAPHICS]
@@ -53,5 +52,5 @@ Image::getScaledDimensions(Params const & params) const
        return std::make_pair(width, height);
 }
 
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx