diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:43:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:43:19 +0200 |
| commit | 952084c4221c5708e02c783284cf0f7239c6b4c4 (patch) | |
| tree | c1521dab0586b6c33e02c9338c94abdc6b4c2ea9 /src/lib/text_decoder.cc | |
| parent | 6e3e984162ca7a181bc7c98d90c295e88e4e7f6c (diff) | |
| parent | 81b9ea804cb9953bb1a4074f208f63374adbf09b (diff) | |
Merge branch 'better-gl' into v2.15.x
This changes the GL video view to use more modern GL (GLSL etc.) It
also special-cases JPEG2000 video playback and does scaling and
colourspace conversion on the GPU.
Diffstat (limited to 'src/lib/text_decoder.cc')
| -rw-r--r-- | src/lib/text_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 6ee6ed079..8111154e3 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -61,7 +61,7 @@ TextDecoder::TextDecoder ( * of the video frame) */ void -TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<Image> image, dcpomatic::Rect<double> rect) +TextDecoder::emit_bitmap_start (ContentTime from, shared_ptr<const Image> image, dcpomatic::Rect<double> rect) { BitmapStart (ContentBitmapText (from, image, rect)); _position = from; @@ -286,7 +286,7 @@ TextDecoder::emit_plain (ContentTimePeriod period, sub::Subtitle const & s) * of the video frame) */ void -TextDecoder::emit_bitmap (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect) +TextDecoder::emit_bitmap (ContentTimePeriod period, shared_ptr<const Image> image, dcpomatic::Rect<double> rect) { emit_bitmap_start (period.from, image, rect); emit_stop (period.to); |