Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / font_asset.h

diff --git a/src/font_asset.h b/src/font_asset.h
index 6b75af9ecafd8973e702d70daf4e4020ccade732..1d41261957ef8fb12556f4d0d212eea4668a5b52 100644 (file)
--- a/src/font_asset.h
+++ b/src/font_asset.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    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/font_asset.h
@@ -33,8 +47,12 @@ class FontAsset : public Asset
 public:
        FontAsset (std::string id, boost::filesystem::path file);
 
+       static std::string static_pkl_type (Standard standard);
+
 private:
-       std::string pkl_type (Standard standard) const;
+       std::string pkl_type (Standard standard) const {
+               return static_pkl_type (standard);
+       }
 };
 
 }