X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fposition_image.h;h=b78effbd53715f4277f37a76b47f7ec80c3d62fb;hb=7981eefcfebb563ccf5627f132abdfdef22e0c23;hp=dbd3c600e46ffcf8183a20ad9bf5b227947c0df6;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git diff --git a/src/lib/position_image.h b/src/lib/position_image.h index dbd3c600e..b78effbd5 100644 --- a/src/lib/position_image.h +++ b/src/lib/position_image.h @@ -1,26 +1,30 @@ /* Copyright (C) 2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #ifndef DCPOMATIC_POSITION_IMAGE_H #define DCPOMATIC_POSITION_IMAGE_H + #include "position.h" +#include + class Image; @@ -28,14 +32,16 @@ class PositionImage { public: PositionImage () {} - - PositionImage (boost::shared_ptr i, Position p) + + PositionImage (std::shared_ptr i, Position p) : image (i) , position (p) {} - - boost::shared_ptr image; + + std::shared_ptr image; Position position; + + bool same (PositionImage const & other) const; }; #endif