diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-27 12:01:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-27 12:01:17 +0000 |
| commit | 2cc2026701c9e8268ba154ec9330c5d56cbdc240 (patch) | |
| tree | 92ea2ca6ebd67eed3f5c87b30220bc5fb71dba3f /src | |
| parent | f4e360fd709a789980201ebb1162eec6fac229fe (diff) | |
Some tidying up.
Diffstat (limited to 'src')
50 files changed, 130 insertions, 232 deletions
diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc index 19243d4d..72f952c3 100644 --- a/src/colour_matrix.cc +++ b/src/colour_matrix.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/colour_matrix.h b/src/colour_matrix.h index 010ac3b9..ce15051c 100644 --- a/src/colour_matrix.h +++ b/src/colour_matrix.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,17 +20,17 @@ #ifndef LIBDCP_CPL_H #define LIBDCP_CPL_H -#include <list> +#include "types.h" +#include "certificates.h" +#include "key.h" +#include "asset.h" +#include <libxml++/libxml++.h> #include <boost/shared_ptr.hpp> #include <boost/function.hpp> #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/optional.hpp> #include <boost/filesystem.hpp> -#include <libxml++/libxml++.h> -#include "types.h" -#include "certificates.h" -#include "key.h" -#include "asset.h" +#include <list> namespace dcp { diff --git a/src/dcp_time.cc b/src/dcp_time.cc index 605c4a40..5376b972 100644 --- a/src/dcp_time.cc +++ b/src/dcp_time.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,16 +18,16 @@ */ /** @file src/dcp_time.cc - * @brief A representation of time within a DCP. + * @brief Time class. */ -#include <iostream> -#include <vector> +#include "dcp_time.h" +#include "exceptions.h" #include <boost/algorithm/string.hpp> #include <boost/lexical_cast.hpp> +#include <iostream> +#include <vector> #include <cmath> -#include "dcp_time.h" -#include "exceptions.h" using namespace std; using namespace boost; diff --git a/src/dcp_time.h b/src/dcp_time.h index 885393c1..697ca230 100644 --- a/src/dcp_time.h +++ b/src/dcp_time.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,15 +18,15 @@ */ /** @file src/dcp_time.h - * @brief A representation of time within a DCP. + * @brief Time class. */ #ifndef LIBDCP_TIME_H #define LIBDCP_TIME_H +#include <stdint.h> #include <string> #include <iostream> -#include <stdint.h> namespace dcp { diff --git a/src/gamma_lut.cc b/src/gamma_lut.cc index 1a954914..b994aacc 100644 --- a/src/gamma_lut.cc +++ b/src/gamma_lut.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/image.cc b/src/image.cc index 2cb5a7a4..f12ceea2 100644 --- a/src/image.cc +++ b/src/image.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/image.h b/src/image.h index a8786b77..069534ea 100644 --- a/src/image.h +++ b/src/image.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,13 +17,17 @@ */ -#include <sstream> -#include <string> -#include <iomanip> +/** @file src/key.cc + * @brief Key class. + */ + +#include "key.h" #include "AS_DCP.h" #include "KM_prng.h" #include "KM_util.h" -#include "key.h" +#include <sstream> +#include <string> +#include <iomanip> using std::string; using std::stringstream; @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ */ /** @file src/key.h - * @brief Class to hold a key for encrypting MXFs. + * @brief Key class. */ #ifndef LIBDCP_KEY_H @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ #ifndef LIBDCP_LUT_H #define LIBDCP_LUT_H -#include <cmath> #include <boost/utility.hpp> +#include <cmath> namespace dcp { diff --git a/src/lut_cache.h b/src/lut_cache.h index b60ee109..0985a0c0 100644 --- a/src/lut_cache.h +++ b/src/lut_cache.h @@ -1,3 +1,22 @@ +/* + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + + This program 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, + 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. + +*/ + #ifndef LIBDCP_LUT_CACHE_H #define LIBDCP_LUT_CACHE_H diff --git a/src/metadata.cc b/src/metadata.cc index d2357a1f..e3382613 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,17 +18,17 @@ */ /** @file src/metadata.cc - * @brief Metadata for writing to the DCP. + * @brief XMLMetadata and MXFMetadata classes. */ -#include <sstream> -#include <iomanip> -#include <time.h> +#include "metadata.h" +#include "util.h" #ifdef LIBDCP_WINDOWS #include <windows.h> #endif -#include "metadata.h" -#include "util.h" +#include <sstream> +#include <iomanip> +#include <time.h> using namespace std; using namespace dcp; diff --git a/src/metadata.h b/src/metadata.h index 0a707534..e1ce6986 100644 --- a/src/metadata.h +++ b/src/metadata.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ #define LIBDCP_METADATA_H /** @file src/metadata.h - * @brief Metadata for writing to the DCP. + * @brief XMLMetadata and MXFMetadata classes. */ #include <string> diff --git a/src/mono_picture_mxf.cc b/src/mono_picture_mxf.cc index e33454dc..699cfc23 100644 --- a/src/mono_picture_mxf.cc +++ b/src/mono_picture_mxf.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/mono_picture_mxf.h b/src/mono_picture_mxf.h index 9f0a2eea..c742ae37 100644 --- a/src/mono_picture_mxf.h +++ b/src/mono_picture_mxf.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/mono_picture_mxf_writer.cc b/src/mono_picture_mxf_writer.cc index 619d298e..96c054d7 100644 --- a/src/mono_picture_mxf_writer.cc +++ b/src/mono_picture_mxf_writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/mono_picture_mxf_writer.h b/src/mono_picture_mxf_writer.h index 7ff87a5d..727fc688 100644 --- a/src/mono_picture_mxf_writer.h +++ b/src/mono_picture_mxf_writer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ */ -#ifndef LIBDCP_MXF_ASSET_H -#define LIBDCP_MXF_ASSET_H +#ifndef LIBDCP_MXF_H +#define LIBDCP_MXF_H #include "content.h" #include "key.h" diff --git a/src/picture_mxf.cc b/src/picture_mxf.cc index 7634493d..e5955047 100644 --- a/src/picture_mxf.cc +++ b/src/picture_mxf.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,21 +17,21 @@ */ -#include <list> -#include <stdexcept> -#include <iostream> -#include <sstream> -#include <boost/filesystem.hpp> -#include <boost/lexical_cast.hpp> -#include <openjpeg.h> -#include <libxml++/nodes/element.h> -#include "AS_DCP.h" -#include "KM_fileio.h" #include "picture_mxf.h" #include "util.h" #include "exceptions.h" #include "xyz_frame.h" #include "picture_mxf_writer.h" +#include "AS_DCP.h" +#include "KM_fileio.h" +#include <libxml++/nodes/element.h> +#include <openjpeg.h> +#include <boost/filesystem.hpp> +#include <boost/lexical_cast.hpp> +#include <list> +#include <stdexcept> +#include <iostream> +#include <sstream> using std::string; using std::ostream; diff --git a/src/picture_mxf.h b/src/picture_mxf.h index df75625c..4653196d 100644 --- a/src/picture_mxf.h +++ b/src/picture_mxf.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/picture_mxf_writer_common.cc b/src/picture_mxf_writer_common.cc index 9836f03e..d2073f77 100644 --- a/src/picture_mxf_writer_common.cc +++ b/src/picture_mxf_writer_common.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/rec709_linearised_gamma_lut.cc b/src/rec709_linearised_gamma_lut.cc deleted file mode 100644 index 29f39ac0..00000000 --- a/src/rec709_linearised_gamma_lut.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> - - This program 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, - 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. - -*/ - -#include "rec709_linearised_gamma_lut.h" - -using namespace dcp; - -LUTCache<Rec709LinearisedGammaLUT> Rec709LinearisedGammaLUT::cache; - -Rec709LinearisedGammaLUT::Rec709LinearisedGammaLUT (int bits, float gamma) - : LUT (bits, gamma) -{ - int const bit_length = pow (2, bits); - for (int i = 0; i < bit_length; ++i) { - float const p = static_cast<float> (i) / (bit_length - 1); - if (p > 0.08125) { - _lut[i] = pow ((p + 0.099) / 1.099, gamma); - } else { - _lut[i] = p / 4.5; - } - } -} diff --git a/src/rec709_linearised_gamma_lut.h b/src/rec709_linearised_gamma_lut.h deleted file mode 100644 index e7130ef3..00000000 --- a/src/rec709_linearised_gamma_lut.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> - - This program 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, - 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. - -*/ - -#include "lut.h" -#include "lut_cache.h" - -namespace dcp { - -class Rec709LinearisedGammaLUT : public LUT -{ -public: - Rec709LinearisedGammaLUT (int bit_length, float gamma); - static LUTCache<Rec709LinearisedGammaLUT> cache; -}; - -} diff --git a/src/reel.cc b/src/reel.cc index 27fc0329..8326c197 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h index 7b17b8a9..429c9859 100644 --- a/src/reel_subtitle_asset.h +++ b/src/reel_subtitle_asset.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index 7d30d32e..6fc28e3d 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h index f4c8b686..6b0f1842 100644 --- a/src/rgb_xyz.h +++ b/src/rgb_xyz.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/signer.h b/src/signer.h index c57c73cf..9ee5852b 100644 --- a/src/signer.h +++ b/src/signer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/sound_frame.cc b/src/sound_frame.cc index 06d2b88e..6471ee0a 100644 --- a/src/sound_frame.cc +++ b/src/sound_frame.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +17,10 @@ */ -#include "AS_DCP.h" -#include "KM_fileio.h" #include "sound_frame.h" #include "exceptions.h" +#include "AS_DCP.h" +#include "KM_fileio.h" using namespace std; using namespace dcp; diff --git a/src/sound_frame.h b/src/sound_frame.h index bc46b53a..eedfc477 100644 --- a/src/sound_frame.h +++ b/src/sound_frame.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/sound_mxf.cc b/src/sound_mxf.cc index 82ab0823..b97da94a 100644 --- a/src/sound_mxf.cc +++ b/src/sound_mxf.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/srgb_linearised_gamma_lut.cc b/src/srgb_linearised_gamma_lut.cc deleted file mode 100644 index bab36cb1..00000000 --- a/src/srgb_linearised_gamma_lut.cc +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> - - This program 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, - 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. - -*/ - -#include "srgb_linearised_gamma_lut.h" - -using namespace dcp; - -LUTCache<SRGBLinearisedGammaLUT> SRGBLinearisedGammaLUT::cache; - -SRGBLinearisedGammaLUT::SRGBLinearisedGammaLUT (int bits, float gamma) - : LUT (bits, gamma) -{ - int const bit_length = pow (2, bits); - for (int i = 0; i < bit_length; ++i) { - float const p = static_cast<float> (i) / (bit_length - 1); - if (p > 0.04045) { - _lut[i] = pow ((p + 0.055) / 1.055, gamma); - } else { - _lut[i] = p / 12.92; - } - } -} diff --git a/src/srgb_linearised_gamma_lut.h b/src/srgb_linearised_gamma_lut.h deleted file mode 100644 index 68030610..00000000 --- a/src/srgb_linearised_gamma_lut.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> - - This program 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, - 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. - -*/ - -#include "lut.h" -#include "lut_cache.h" - -namespace dcp { - -class SRGBLinearisedGammaLUT : public LUT -{ -public: - SRGBLinearisedGammaLUT (int bit_length, float gamma); - static LUTCache<SRGBLinearisedGammaLUT> cache; -}; - -} diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index 790fcc1a..b21c7902 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h index 40c2a441..fa7620fb 100644 --- a/src/stereo_picture_frame.h +++ b/src/stereo_picture_frame.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/stereo_picture_mxf.cc b/src/stereo_picture_mxf.cc index 980c6ad5..59f16c93 100644 --- a/src/stereo_picture_mxf.cc +++ b/src/stereo_picture_mxf.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/stereo_picture_mxf.h b/src/stereo_picture_mxf.h index eb527a1e..f4a4771a 100644 --- a/src/stereo_picture_mxf.h +++ b/src/stereo_picture_mxf.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/stereo_picture_mxf_writer.cc b/src/stereo_picture_mxf_writer.cc index 4ea65e05..5c503098 100644 --- a/src/stereo_picture_mxf_writer.cc +++ b/src/stereo_picture_mxf_writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/stereo_picture_mxf_writer.h b/src/stereo_picture_mxf_writer.h index 8773eccd..ebd9dbec 100644 --- a/src/stereo_picture_mxf_writer.h +++ b/src/stereo_picture_mxf_writer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/types.cc b/src/types.cc index 113fc85f..106fb44c 100644 --- a/src/types.cc +++ b/src/types.cc @@ -1,10 +1,29 @@ +/* + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> + + This program 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, + 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. + +*/ + +#include "types.h" +#include "exceptions.h" +#include <boost/lexical_cast.hpp> +#include <boost/algorithm/string.hpp> #include <vector> #include <cstdio> #include <iomanip> -#include <boost/lexical_cast.hpp> -#include <boost/algorithm/string.hpp> -#include "types.h" -#include "exceptions.h" using namespace std; using namespace dcp; diff --git a/src/types.h b/src/types.h index 85dc8362..1397dfdc 100644 --- a/src/types.h +++ b/src/types.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/wscript b/src/wscript index 60d442fe..9ad37fc5 100644 --- a/src/wscript +++ b/src/wscript @@ -37,7 +37,6 @@ def build(bld): object.cc picture_mxf.cc picture_mxf_writer.cc - rec709_linearised_gamma_lut.cc reel.cc reel_asset.cc reel_mono_picture_asset.cc @@ -51,7 +50,6 @@ def build(bld): sound_mxf.cc sound_mxf_writer.cc sound_frame.cc - srgb_linearised_gamma_lut.cc stereo_picture_mxf.cc stereo_picture_mxf_writer.cc stereo_picture_frame.cc @@ -87,14 +85,12 @@ def build(bld): picture_mxf.h picture_mxf_writer.h rgb_xyz.h - rec709_linearised_gamma_lut.h reel.h argb_frame.h signer.h signer_chain.h sound_mxf.h sound_frame.h - srgb_linearised_gamma_lut.h stereo_picture_mxf.h stereo_picture_frame.h subtitle_asset.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/xyz_frame.cc b/src/xyz_frame.cc index e75a43bc..4c793f22 100644 --- a/src/xyz_frame.cc +++ b/src/xyz_frame.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +17,9 @@ */ +#include "xyz_frame.h" #include <cassert> #include <stdexcept> -#include "xyz_frame.h" using namespace dcp; diff --git a/src/xyz_frame.h b/src/xyz_frame.h index 2118331c..e825b0a9 100644 --- a/src/xyz_frame.h +++ b/src/xyz_frame.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |