X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_asset.h;h=d212579f280ca736f59cfa52855a6c8168221b7d;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=06b144f152e5c594daae0b234c5f8d0b781b773a;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index 06b144f1..d212579f 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.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. */ #ifndef LIBDCP_SUBTITLE_ASSET_H @@ -56,7 +70,7 @@ class SubtitleAsset : public Asset { public: SubtitleAsset (); - SubtitleAsset (boost::filesystem::path file); + explicit SubtitleAsset (boost::filesystem::path file); bool equals ( boost::shared_ptr,