X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=048cc4ab64e2d7408bc3445cb7580faa0f830c62;hb=9e1343fb30df204811e80bfd1387574b9d383a09;hp=9a3aa8d45b036557fcb6f0297cc92afbf519aeb1;hpb=089b90439e745a218494e76b45e7df6215af01df;p=dcpomatic.git diff --git a/src/lib/image.cc b/src/lib/image.cc index 9a3aa8d45..048cc4ab6 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -155,10 +155,7 @@ Image::post_process (string pp, bool aligned) const shared_ptr Image::crop (Crop crop, bool aligned) const { - libdcp::Size cropped_size = size (); - cropped_size.width -= crop.left + crop.right; - cropped_size.height -= crop.top + crop.bottom; - + libdcp::Size cropped_size = crop.apply (size ()); shared_ptr out (new Image (pixel_format(), cropped_size, aligned)); for (int c = 0; c < components(); ++c) { @@ -300,7 +297,11 @@ Image::make_black () yuv_16_black (sixteen_bit_uv, true); break; - case PIX_FMT_RGB24: + case PIX_FMT_RGB24: + case PIX_FMT_ARGB: + case PIX_FMT_RGBA: + case PIX_FMT_ABGR: + case PIX_FMT_BGRA: memset (data()[0], 0, lines(0) * stride()[0]); break;