* 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 8b5be6fae04f28fd04f87d5f6282b138de032c3c..b1d7e60707e09c7e39ad530fa73640e149d05806 100644 (file)
--- a/src/graphics/GraphicsImage.C
+++ b/src/graphics/GraphicsImage.C
@@ -1,104 +1,56 @@
-/*
+/**
  * \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
 {
+       // scale only when value > 0
+       unsigned int width;
+       unsigned int height;
+       if (params.scale) {
+               width  = (getWidth() * params.scale) / 100;
+               height = (getHeight() * params.scale) / 100;
+       } else {
+               width = getWidth();
+               height = getHeight();
+       }
+
        lyxerr[Debug::GRAPHICS]
                << "GraphicsImage::getScaledDImensions()"
                << "\n\tparams.scale       : " << params.scale
-               << "\n\tparams.width       : " << params.width
-               << "\n\tparams.height      : " << params.height
-               << "\n\tkeepLyXAspectRatio : " << params.keepLyXAspectRatio
+               << "\n\twidth              : " << width
+               << "\n\theight             : " << height
                << std::endl;
-       if (params.width == 0 && params.height == 0 && params.scale == 0) {
-               // original size or scale/custom without any input
-               lyxerr[Debug::GRAPHICS]
-                       << "\treturn with the original values!\n";
-               return std::make_pair(getWidth(), getHeight());
-       }
-       
-       typedef unsigned int dimension;
-       dimension width  = 0;
-       dimension height = 0;
-       if (params.scale != 0) {
-               // GraphicsParams::Scale 
-               width  = dimension(double(getWidth())  * params.scale / 100.0);
-               height = dimension(getHeight() * params.scale / 100.0);
-               return std::make_pair(width, height);
-       } 
-       // GraphicsParams::WH
-       width  = (params.width > 0) ? params.width : getWidth();
-       height = (params.height > 0) ? params.height : getHeight(); 
-       if (!params.keepLyXAspectRatio)
-               return std::make_pair(width, height);
 
-       // calculate aspect ratio
-       float const rw  = getWidth();
-       float const rh = getHeight();
-       // there must be a width for the division
-       float const ratio = (rw > 0.001) ? rh/rw : 1.0;
-       lyxerr[Debug::GRAPHICS]
-               << "\tValue of LyXAspectRatio: " << ratio << std::endl;
-       // there are now four different cases
-       // w=0 & h=0 -> see above, no more possible at this place
-       // w>0 & h=0 -> calculate h
-       // w=0 & h>0 -> calculate w
-       // w>0 & h>0 -> the greatest difference to the original
-       //              value becomes the same
-       if (params.width > 0 && params.height > 0) {
-               // both widths are given and keepAspectRatio, too
-               int const diff_width = abs(int(getWidth() - params.width));
-               int const diff_height= abs(int(getHeight() - params.height));
-               if (diff_width > diff_height)
-                       height = int(ratio * params.width);
-               else
-                       width = int(ratio * params.height);
-               return std::make_pair(width, height);
-       }
-       if (params.width > 0) {
-               width = params.width;
-               height = int(ratio * params.width);
-               return std::make_pair(width, height);
-       }
-       if (params.height > 0) {
-               height = params.height;
-               width = int(ratio * params.height);
-               return std::make_pair(width, height);
-       }
-       // all other cases ... kind of paranoia :-)
-       return std::make_pair(getWidth(), getHeight());
+       return std::make_pair(width, height);
 }
 
-} // namespace grfx
-
+} // namespace graphics
+} // namespace lyx