diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-07 10:23:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-07 10:23:47 +0000 |
| commit | 765a960ea8bb9d829d625901662f54c60f954f3d (patch) | |
| tree | 76678428e6e5f4532d525e4847ff903a9aa79a8a | |
| parent | 02279f7c2a7ab8ec8cc416da528bc53dcc8f2c9f (diff) | |
| parent | 038ae17545335e5d1b33746b0193e85ee9f584fe (diff) | |
Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
| -rw-r--r-- | src/transfer_function.cc | 4 | ||||
| -rw-r--r-- | src/transfer_function.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/transfer_function.cc b/src/transfer_function.cc index d889cbbc..8a844d9b 100644 --- a/src/transfer_function.cc +++ b/src/transfer_function.cc @@ -33,6 +33,8 @@ TransferFunction::TransferFunction (bool inverse) TransferFunction::~TransferFunction () { + boost::mutex::scoped_lock lm (_mutex); + for (map<int, double*>::const_iterator i = _luts.begin(); i != _luts.end(); ++i) { delete[] i->second; } @@ -43,6 +45,8 @@ TransferFunction::~TransferFunction () double const * TransferFunction::lut (int bit_depth) const { + boost::mutex::scoped_lock lm (_mutex); + map<int, double*>::const_iterator i = _luts.find (bit_depth); if (i != _luts.end ()) { return i->second; diff --git a/src/transfer_function.h b/src/transfer_function.h index 16d00c1a..4105f3d4 100644 --- a/src/transfer_function.h +++ b/src/transfer_function.h @@ -22,6 +22,7 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> +#include <boost/thread/mutex.hpp> #include <map> namespace dcp { @@ -43,8 +44,10 @@ protected: bool _inverse; -private: +private: mutable std::map<int, double*> _luts; + /** mutex to protect _luts */ + mutable boost::mutex _mutex; }; } |