X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsParams.h;h=052b006bff719aa42c1977904be4d2115ec3ea29;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=6da48f884389d8342a29fdcd0f482c6414ff3674;hpb=9a3737148b86a17f2aa5c7016ba2cb2148d649c3;p=lyx.git

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 6da48f8843..052b006bff 100644
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -14,8 +14,12 @@
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
-#include "support/std_string.h"
+#include "Length.h"
+
+#include "support/FileName.h"
+
+#include <string>
+#include <iosfwd>
 
 
 namespace lyx {
@@ -24,36 +28,40 @@ namespace graphics {
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
 	///
 	BoundingBox();
 	///
-	BoundingBox(string const &);
+	BoundingBox(std::string const &);
 
 	/// 0 0 0 0 is empty!
 	bool empty() const;
 
-	/// The bounding box as "xl yb xr yr"
-	string const asString() const;
-
-	unsigned int xl;
-	unsigned int yb;
-	unsigned int xr;
-	unsigned int yt;
+	Length xl;
+	Length yb;
+	Length xr;
+	Length yt;
 };
 
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct Params
+/// output bounding box in LyX file format
+std::ostream & operator<<(std::ostream &, BoundingBox const &);
+
+
+class Params
 {
+public:
 	Params();
 
-	DisplayType display;
+	bool display;
 	unsigned int scale;
+	double pixel_ratio;
 
 	/// The image filename.
-	string filename;
+	support::FileName filename;
 
 	/** Note that the BoundingBox is always relative to the BoundingBox
 	 *  as stored in the EPS file.
@@ -65,7 +73,7 @@ struct Params
 	 *  image.
 	 */
 	/// Rotation angle.
-	float angle;
+	double angle;
 };
 
 bool operator==(Params const &, Params const &);