X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsParams.h;h=052b006bff719aa42c1977904be4d2115ec3ea29;hb=a700d657b3b06541b10ddae8cc5847bd46d06aae;hp=678566e2bdc387bd679746df286ed992cf7c7bc3;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 678566e2bd..052b006bff 100644
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -14,7 +14,9 @@
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
+#include "Length.h"
+
+#include "support/FileName.h"
 
 #include <string>
 #include <iosfwd>
@@ -26,7 +28,8 @@ namespace graphics {
 /** Parse a string of the form "200pt 500pt 300mm 5in" into a
  *  usable bounding box.
  */
-struct BoundingBox {
+class BoundingBox {
+public:
 	///
 	BoundingBox();
 	///
@@ -35,27 +38,30 @@ struct BoundingBox {
 	/// 0 0 0 0 is empty!
 	bool empty() 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 &);
 
+/// output bounding box in LyX file format
 std::ostream & operator<<(std::ostream &, BoundingBox const &);
 
 
-struct Params
+class Params
 {
+public:
 	Params();
 
-	DisplayType display;
+	bool display;
 	unsigned int scale;
+	double pixel_ratio;
 
 	/// The image filename.
-	std::string filename;
+	support::FileName filename;
 
 	/** Note that the BoundingBox is always relative to the BoundingBox
 	 *  as stored in the EPS file.
@@ -67,7 +73,7 @@ struct Params
 	 *  image.
 	 */
 	/// Rotation angle.
-	float angle;
+	double angle;
 };
 
 bool operator==(Params const &, Params const &);