Cleanup: fix more comments/guards (and add check script).

[libdcp.git] / src / asset_reader.h

diff --git a/src/asset_reader.h b/src/asset_reader.h
index aa8157458497aacbe87e29e080da56bc19ef78e1..3bf9b8b9f858616b3ecabf71c41c84992abb514c 100644 (file)
--- a/src/asset_reader.h
+++ b/src/asset_reader.h
@@ -53,9 +53,9 @@ namespace dcp {
 
 
 class AtmosAsset;
-class MonoPictureAsset;
+class MonoJ2KPictureAsset;
 class SoundAsset;
-class StereoPictureAsset;
+class StereoJ2KPictureAsset;
 
 
 template <class R, class F>
@@ -90,11 +90,11 @@ protected:
 
 private:
        friend class AtmosAsset;
-       friend class MonoPictureAsset;
+       friend class MonoJ2KPictureAsset;
        friend class SoundAsset;
-       friend class StereoPictureAsset;
+       friend class StereoJ2KPictureAsset;
 
-       explicit AssetReader (Asset const * asset, boost::optional<Key> key, Standard standard)
+       AssetReader(Asset const * asset, boost::optional<Key> key, Standard standard)
                : _crypto_context (new DecryptionContext(key, standard))
        {
                Kumu::FileReaderFactory factory;