Bump libdcp for fix to spacey XSD filenames.

[libsub.git] / src / font_size.h

diff --git a/src/font_size.h b/src/font_size.h
index 6f4f8a52ace530b18c361436bf8029af3fe0a2c1..eeb09ef2d890a126aebdd7705e7c231629b72568 100644 (file)
--- a/src/font_size.h
+++ b/src/font_size.h
@@ -36,7 +36,7 @@ public:
        void set_proportional (float p) {
                _proportional = p;
        }
-       
+
        void set_points (int p) {
                _points = p;
        }
@@ -44,22 +44,29 @@ public:
        boost::optional<float> proportional () const {
                return _proportional;
        }
-       
+
        boost::optional<int> points () const {
                return _points;
        }
-       
+
+       bool specified () const;
+
        float proportional (int screen_height_in_points) const;
        int points (int screen_height_in_points) const;
-       
-private:               
+
+       static FontSize from_points (int p);
+       static FontSize from_proportional (float p);
+
+private:
        /** as a proportion of screen height */
        boost::optional<float> _proportional;
        /** in points */
        boost::optional<int> _points;
-       
+
 };
 
+extern bool operator== (FontSize const & a, FontSize const & b);
+
 }
 
 #endif