projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optionally allow subtitle issue dates to differ.
[libdcp.git]
/
src
/
types.h
diff --git
a/src/types.h
b/src/types.h
index ca7603abdbad9d5df1480d49edcf7dd9bd9b421e..bfcc5a3f6e4fb0ce63b8730c64fa36abd92fb7b9 100644
(file)
--- a/
src/types.h
+++ b/
src/types.h
@@
-147,6
+147,7
@@
public:
extern bool operator== (Fraction const & a, Fraction const & b);
extern bool operator!= (Fraction const & a, Fraction const & b);
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.
/** @struct EqualityOptions
* @brief A class to describe what "equality" means for a particular test.
@@
-164,6
+165,7
@@
struct EqualityOptions
, cpl_annotation_texts_can_differ (false)
, reel_annotation_texts_can_differ (false)
, reel_hashes_can_differ (false)
, cpl_annotation_texts_can_differ (false)
, reel_annotation_texts_can_differ (false)
, reel_hashes_can_differ (false)
+ , issue_dates_can_differ (false)
{}
/** The maximum allowable mean difference in pixel value between two images */
{}
/** The maximum allowable mean difference in pixel value between two images */
@@
-172,12
+174,14
@@
struct EqualityOptions
double max_std_dev_pixel_error;
/** The maximum difference in audio sample value between two soundtracks */
int max_audio_sample_error;
double max_std_dev_pixel_error;
/** The maximum difference in audio sample value between two soundtracks */
int max_audio_sample_error;
- /** true if the
<AnnotationText>
nodes of CPLs are allowed to differ */
+ /** true if the
<AnnotationText>
nodes of CPLs are allowed to differ */
bool cpl_annotation_texts_can_differ;
bool cpl_annotation_texts_can_differ;
- /** true if the
<AnnotationText>
nodes of Reels are allowed to differ */
+ /** true if the
<AnnotationText>
nodes of Reels are allowed to differ */
bool reel_annotation_texts_can_differ;
/** true if <Hash>es in Reels can differ */
bool reel_hashes_can_differ;
bool reel_annotation_texts_can_differ;
/** true if <Hash>es in Reels can differ */
bool reel_hashes_can_differ;
+ /** true if IssueDate nodes can differ */
+ bool issue_dates_can_differ;
};
/* I've been unable to make mingw happy with ERROR as a symbol, so
};
/* I've been unable to make mingw happy with ERROR as a symbol, so