diff --git a/services/camera_service/src/hstream_capture.cpp b/services/camera_service/src/hstream_capture.cpp index 7819ce315873f8c3c0eb668618d3d390b3c50499..e4e561a58afb46bec09c55f10144ee918a7a2462 100644 --- a/services/camera_service/src/hstream_capture.cpp +++ b/services/camera_service/src/hstream_capture.cpp @@ -693,7 +693,7 @@ int32_t HStreamCapture::Capture(const std::shared_ptr captureMetadataSetting_ = nullptr; OHOS::Camera::MetadataUtils::ConvertVecToMetadata(captureInfoPhoto.captureSetting_, captureMetadataSetting_); - if (captureMetadataSetting_ == nullptr) { + if (!captureMetadataSetting_) { captureMetadataSetting_ = std::make_shared(0, 0); } DfxCaptureInfo captureInfo; @@ -724,7 +724,7 @@ int32_t HStreamCapture::Capture(const std::shared_ptr lock(cameraAbilityLock_); - CHECK_RETURN_RET_ELOG(cameraAbility_ == nullptr, CAMERA_INVALID_STATE, + CHECK_RETURN_RET_ELOG(!cameraAbility_, CAMERA_INVALID_STATE, "HStreamCapture::cameraAbility_ is null"); int32_t result = OHOS::Camera::FindCameraMetadataItem(cameraAbility_->get(), OHOS_ABILITY_CAMERA_POSITION, &item);