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 5d1cb6aa7334bd0e48128844ee97e60b0a273305..86cc9dc9b16daeb648fde7454c1bfc3c4fb6d5f2 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -1,21 +1,23 @@
 // -*- C++ -*-
 /**
- *  \file GraphicsParams.h
+ * \file GraphicsParams.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- *  \author Angus Leeming
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
- *  Used internally by the grfx::Image.
+ * Used internally by the lyx::graphics::Image.
  */
 
 #ifndef GRAPHICSPARAMS_H
 #define GRAPHICSPARAMS_H
 
-#include "GraphicsTypes.h"
-#include "LString.h"
+#include "support/FileName.h"
+
+#include <string>
+#include <iosfwd>
 
 
 namespace lyx {
@@ -24,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;
@@ -42,15 +45,20 @@ struct BoundingBox {
 bool operator==(BoundingBox const &, BoundingBox const &);
 bool operator!=(BoundingBox const &, BoundingBox const &);
 
-struct Params
+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.
@@ -62,7 +70,7 @@ struct Params
         *  image.
         */
        /// Rotation angle.
-       float angle;
+       double angle;
 };
 
 bool operator==(Params const &, Params const &);