Avoid an exception when the lyxpreview2bitmap.py script fails completely

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

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index 338b300ae463c0ee35f378c907bf437113be568b..86cc9dc9b16daeb648fde7454c1bfc3c4fb6d5f2 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -14,8 +14,9 @@
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
-#include "support/std_string.h"
+#include "support/FileName.h"
+
+#include <string>
 #include <iosfwd>
 
 
@@ -25,11 +26,12 @@ 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;
@@ -46,15 +48,17 @@ bool operator!=(BoundingBox const &, BoundingBox const &);
 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.
-       string filename;
+       support::FileName filename;
 
        /** Note that the BoundingBox is always relative to the BoundingBox
         *  as stored in the EPS file.
@@ -66,7 +70,7 @@ struct Params
         *  image.
         */
        /// Rotation angle.
-       float angle;
+       double angle;
 };
 
 bool operator==(Params const &, Params const &);