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
/
position_image.h
diff --git
a/src/lib/position_image.h
b/src/lib/position_image.h
index 3e6d833e78a996a32b301df7446d0d85f0aa3313..ee352647ca83826e0e359d857ad2928a9d96ea4b 100644
(file)
--- a/
src/lib/position_image.h
+++ b/
src/lib/position_image.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,28
+18,33
@@
*/
*/
+
#ifndef DCPOMATIC_POSITION_IMAGE_H
#define DCPOMATIC_POSITION_IMAGE_H
#ifndef DCPOMATIC_POSITION_IMAGE_H
#define DCPOMATIC_POSITION_IMAGE_H
+
#include "position.h"
#include "position.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
class Image;
class Image;
+
class PositionImage
{
public:
PositionImage () {}
class PositionImage
{
public:
PositionImage () {}
- PositionImage (
boost::shared_ptr<
Image> i, Position<int> p)
+ PositionImage (
std::shared_ptr<const
Image> i, Position<int> p)
: image (i)
, position (p)
{}
: image (i)
, position (p)
{}
-
boost::shared_ptr<
Image> image;
+
std::shared_ptr<const
Image> image;
Position<int> position;
bool same (PositionImage const & other) const;
};
Position<int> position;
bool same (PositionImage const & other) const;
};
+
#endif
#endif