X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftypes.h;h=16000daa809c8a58b342461e31e2bbd3169363c8;hb=03fb9d475366b6e02b6bde4421607f7dcd9936ad;hp=16908952a58c135d06c0fce3d42c0eec62fa291d;hpb=635c3ae7aee1cad4b871fcf0ddf02a8be1cdce78;p=libdcp.git diff --git a/src/types.h b/src/types.h index 16908952..16000daa 100644 --- a/src/types.h +++ b/src/types.h @@ -49,7 +49,7 @@ struct Size float ratio () const { return float (width) / height; } - + int width; int height; }; @@ -147,6 +147,7 @@ public: extern bool operator== (Fraction const & a, Fraction const & b); extern bool operator!= (Fraction const & a, Fraction const & b); +extern std::ostream& operator<< (std::ostream& s, Fraction const & f); /** @struct EqualityOptions * @brief A class to describe what "equality" means for a particular test. @@ -157,13 +158,15 @@ extern bool operator!= (Fraction const & a, Fraction const & b); struct EqualityOptions { /** Construct an EqualityOptions where nothing at all can differ */ - EqualityOptions () + EqualityOptions () : max_mean_pixel_error (0) , max_std_dev_pixel_error (0) , max_audio_sample_error (0) , cpl_annotation_texts_can_differ (false) , reel_annotation_texts_can_differ (false) , reel_hashes_can_differ (false) + , issue_dates_can_differ (false) + , keep_going (false) {} /** The maximum allowable mean difference in pixel value between two images */ @@ -178,6 +181,9 @@ struct EqualityOptions bool reel_annotation_texts_can_differ; /** true if es in Reels can differ */ bool reel_hashes_can_differ; + /** true if IssueDate nodes can differ */ + bool issue_dates_can_differ; + bool keep_going; }; /* I've been unable to make mingw happy with ERROR as a symbol, so