diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-30 11:55:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-21 16:41:12 +0000 |
| commit | b0849ca5ee5b26e72f78c5b5601a9a9a40177e01 (patch) | |
| tree | 9a5aba33a596270ab772f88ad070f9f5cb56d5f5 /src/lib/jpeg2000_encoder.cc | |
| parent | 11da1ba251863bb17bdfc52ab2b226f0d1929be4 (diff) | |
Fix build.
Diffstat (limited to 'src/lib/jpeg2000_encoder.cc')
| -rw-r--r-- | src/lib/jpeg2000_encoder.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/jpeg2000_encoder.cc b/src/lib/jpeg2000_encoder.cc index c7c39ea0e..fe6959cd5 100644 --- a/src/lib/jpeg2000_encoder.cc +++ b/src/lib/jpeg2000_encoder.cc @@ -45,7 +45,7 @@ JPEG2000Encoder::setup_encoders () try { _encoders.push_back (shared_ptr<JPEG2000Encoder> (new OpenJPEGEncoder ())); } catch (JPEG2000EncoderUnavailableException &) { - + } } @@ -67,11 +67,11 @@ JPEG2000Encoder::from_id (string id) return shared_ptr<JPEG2000Encoder> (); } -shared_ptr<EncodedData> -JPEG2000Encoder::encode (shared_ptr<const dcp::XYZImage> input, int bandwidth, int frame_rate, Resolution resolution, bool threed) +Data +JPEG2000Encoder::encode (shared_ptr<const dcp::OpenJPEGImage> input, int bandwidth, int frame_rate, Resolution resolution, bool threed) { std::cout << "Encoding with " << name() << "\n"; - + if (!_bandwidth || _bandwidth.get() != bandwidth || !_frame_rate || _frame_rate.get() != frame_rate || !_resolution || _resolution.get() != resolution || @@ -81,7 +81,7 @@ JPEG2000Encoder::encode (shared_ptr<const dcp::XYZImage> input, int bandwidth, i _frame_rate = frame_rate; _resolution = resolution; _threed = threed; - + parameters_changed (); } |