projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
lib
/
pixel_quanta.h
diff --git
a/src/lib/pixel_quanta.h
b/src/lib/pixel_quanta.h
index c37ba189bb34895696d5a3a8b8656619f363678b..37d2321f45b8474caeb777e2fe3cd4247f838b2a 100644
(file)
--- a/
src/lib/pixel_quanta.h
+++ b/
src/lib/pixel_quanta.h
@@
-23,12
+23,12
@@
#define DCPOMATIC_PIXEL_QUANTA_H
#define DCPOMATIC_PIXEL_QUANTA_H
-#include "warnings.h"
-
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
class PixelQuanta
class PixelQuanta
@@
-54,6
+54,7
@@
public:
int round_x (int x_) const;
int round_y (int y_) const;
int round_x (int x_) const;
int round_y (int y_) const;
+ dcp::Size round (dcp::Size size) const;
int x;
int y;
int x;
int y;