-/*
+/**
* \file GraphicsParams.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 Angus Leeming <a.leeming@ic.ac.uk>
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <cstdlib>
#include "GraphicsParams.h"
#include "Lsstream.h"
+#include "lyxlength.h"
+using std::abs;
namespace grfx {
-GParams::GParams()
- : width(0),
- height(0),
- scale(0),
+Params::Params()
+ : display(ColorDisplay),
+ scale(100),
angle(0)
{}
-bool operator==(GParams const & a, GParams const & b)
+bool operator==(Params const & a, Params const & b)
{
return (a.filename == b.filename &&
- a.display == b.display &&
- a.bb == b.bb &&
- a.width == b.width &&
- a.height == b.height &&
- a.scale == b.scale &&
- a.angle == b.angle);
+ a.display == b.display &&
+ a.bb == b.bb &&
+ a.scale == b.scale &&
+ a.angle == b.angle);
}
-bool operator!=(GParams const & a, GParams const & b)
+bool operator!=(Params const & a, Params const & b)
{
return !(a == b);
}
// inBP returns the length in Postscript points.
// Note further that there are 72 Postscript pixels per inch.
- int const xl_tmp = LyXLength(a).inBP();
- int const yb_tmp = LyXLength(b).inBP();
- int const xr_tmp = LyXLength(c).inBP();
- int const yt_tmp = LyXLength(d).inBP();
+ unsigned int const xl_tmp = abs(LyXLength(a).inBP());
+ unsigned int const yb_tmp = abs(LyXLength(b).inBP());
+ unsigned int const xr_tmp = abs(LyXLength(c).inBP());
+ unsigned int const yt_tmp = abs(LyXLength(d).inBP());
if (xr_tmp <= xl_tmp || yt_tmp <= yb_tmp)
return;