dcpomatic/src/lib/bitmap_text.h, branch 2670-againDCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=2670-again2024-03-03T23:43:28ZMore correctly calculate bitmap subtitle scaling (#2670).2024-03-03T23:43:28ZCarl Hetheringtoncth@carlh.net2024-03-03T23:41:01Zurn:sha1:17f8f22b07bd32d57edada0acde6fd9fffe3baf3
This was partially fixed before in
6ac468554c7fea0dfaefde85fb6cdd0fceaf5cad
The last try accounted for cropping, but not for cases where the
source video (after crop) does not precisely fit the DCP container.
In those cases the x scale for the subtitles could be different
to the y scale, squashing or stretching them.
Cleanup: use some better variable names.2024-03-03T23:43:03ZCarl Hetheringtoncth@carlh.net2024-03-03T19:37:49Zurn:sha1:7c00e7a8c5f0e543000dd62ce8c66fdb8da6ee34Some const correctness.2021-09-27T11:41:46ZCarl Hetheringtoncth@carlh.net2021-09-14T22:42:15Zurn:sha1:c59981ce92898f6be6987f10ebb29161e36e6766std::shared_ptr2021-01-07T21:48:29ZCarl Hetheringtoncth@carlh.net2021-01-04T20:16:53Zurn:sha1:dd9be86db6cde0afa5da0d1d1ac43b42e05dca26More automated renaming.2018-07-23T10:20:12ZCarl Hetheringtoncth@carlh.net2018-07-23T10:20:12Zurn:sha1:df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc
ActiveCaptions -> ActiveText
BitmapCaption -> BitmapText
ContentCaption -> ContentText
ContentTextCaption -> ContentStringText
TextCaptionFileContent -> StringTextFileContent
TextCaptionFileDecoder -> StringTextFileDecoder
TextCaptionFile -> StringTextFile
TextCaption -> StringText
PlayerCaption -> PlayerText
CaptionContent -> TextContent
CaptionDecoder -> TextDecoder
CaptionPanel -> TextPanel
CaptionView -> TextView
CaptionAppearanceDialog -> SubtitleAppearanceDialog
CaptionType -> TextType
Clean up after previous commit.2018-07-19T22:45:23ZCarl Hetheringtoncth@carlh.net2018-07-19T21:44:53Zurn:sha1:27b83475435dda4e84a90cf59a52f150905c4ab1More renaming.2018-07-19T22:36:56ZCarl Hetheringtoncth@carlh.net2018-07-18T23:42:56Zurn:sha1:d3c009991a782fa51e85828c7600994a9dd91559
sed -i "s/emit_text/emit_plain/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_image_start/emit_bitmap_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/emit_text_start/emit_plain_start/g" src/lib/*.cc src/lib/*.h
sed -i "s/render_subtitles/render_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript test/*.cc
sed -i "s/ImageStart/BitmapStart/g" src/lib/*.cc src/lib/*.h
sed -i "s/TextStart/PlainStart/g" src/lib/*.cc src/lib/*.h test/*.cc src/wx/*.cc
sed -i "s/ImageSubtitle/BitmapText/g" src/lib/*.cc src/lib/*.h
sed -i "s/text_subtitle/plain_text/g" src/lib/*.cc src/lib/*.h src/lib/wscript src/wx/*.cc src/wx/*.h test/*.cc
sed -i "s/image_subtitle/bitmap_text/g" src/lib/*.cc src/lib/*.h
mv src/lib/render_subtitles.cc src/lib/render_text.cc
mv src/lib/render_subtitles.h src/lib/render_text.h
mv src/lib/text_subtitle.cc src/lib/plain_text.cc
mv src/lib/text_subtitle.h src/lib/plain_text.h