Revert part of 47973dc2b, which was causing bug #11873.

[lyx.git] / src / graphics / GraphicsParams.h

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 732d28abb36c9be31c1ff85c43ffcf44f74d23e9..052b006bff719aa42c1977904be4d2115ec3ea29 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -14,9 +14,9 @@
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
+#include "Length.h"
 
-#include "support/filename.h"
+#include "support/FileName.h"
 
 #include <string>
 #include <iosfwd>
@@ -38,15 +38,16 @@ public:
        /// 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 &);
 
 
@@ -55,8 +56,9 @@ class Params
 public:
        Params();
 
-       DisplayType display;
+       bool display;
        unsigned int scale;
+       double pixel_ratio;
 
        /// The image filename.
        support::FileName filename;