[shotwell/shotwell-0.30: 2/2] Merge branch 'opencv4-for-0.30' into 'shotwell-0.30'

[Jens Georg <jensgeorg src gnome org>]

commit 7e5dfd9593447d2ee10dbc3b333b8a65988d1586
Merge: cfd42493 a8fc1328
Author: Jens Georg <mail jensge org>
Date:   Tue Apr 5 07:20:04 2022 +0000

    Merge branch 'opencv4-for-0.30' into 'shotwell-0.30'
    
    shotwell-0.30: Fix compatibility with OpenCV 4
    
    See merge request GNOME/shotwell!54

 facedetect/meson.build             | 5 ++++-
 facedetect/shotwell-facedetect.cpp | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)
---