diff options
| author | Ari Hausman-Cohen <arihc@google.com> | 2018-10-31 18:34:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-31 18:34:16 +0000 |
| commit | 8f89886dad673add460c586c9c5772ac28fdd4ba (patch) | |
| tree | 31f823da858bde903949a117fd3fccf3fad2d4b6 | |
| parent | 92111e7392736afcbecb91d0d88f4d5430d99b35 (diff) | |
| parent | 16d91350888a75a3237fae8af81cf88a69449378 (diff) | |
| download | libhardware-nougat-iot-release.tar.gz | |
Merge "camera: initialize smart pointer before usage"android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-release
| -rw-r--r-- | modules/camera/3_4/arc/cached_frame.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/camera/3_4/arc/cached_frame.cpp b/modules/camera/3_4/arc/cached_frame.cpp index 0489be82..71375053 100644 --- a/modules/camera/3_4/arc/cached_frame.cpp +++ b/modules/camera/3_4/arc/cached_frame.cpp @@ -18,7 +18,8 @@ using android::CameraMetadata; CachedFrame::CachedFrame() : source_frame_(nullptr), cropped_buffer_capacity_(0), - yu12_frame_(new AllocatedFrameBuffer(0)) {} + yu12_frame_(new AllocatedFrameBuffer(0)), + scaled_frame_(new AllocatedFrameBuffer(0)) {} CachedFrame::~CachedFrame() { UnsetSource(); } |