X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsmpte_load_font_node.h;h=c310246d5d3983917a42c0b4b8bb3988a9d4519a;hb=3034388f30732db8d748da96ee66fcdde0626c52;hp=ff6b752310261be0e3034e5ce1429725b87c4ab7;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git diff --git a/src/smpte_load_font_node.h b/src/smpte_load_font_node.h index ff6b7523..c310246d 100644 --- a/src/smpte_load_font_node.h +++ b/src/smpte_load_font_node.h @@ -15,6 +15,20 @@ You should have received a copy of the GNU General Public License along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/smpte_load_font_node.h @@ -22,7 +36,7 @@ */ #include "load_font_node.h" -#include +#include #include namespace cxml { @@ -39,7 +53,7 @@ class SMPTELoadFontNode : public LoadFontNode public: SMPTELoadFontNode () {} SMPTELoadFontNode (std::string id, std::string urn); - SMPTELoadFontNode (boost::shared_ptr node); + explicit SMPTELoadFontNode (std::shared_ptr node); std::string urn; };