From patchwork Tue Oct 20 05:29:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10116 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id AD14ABDB13 for ; Tue, 20 Oct 2020 05:29:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 77E306052F; Tue, 20 Oct 2020 07:29:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="aoo/RTFP"; dkim-atps=neutral Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 36EEE60351 for ; Tue, 20 Oct 2020 07:29:23 +0200 (CEST) Received: by mail-pl1-x62c.google.com with SMTP id h2so396482pll.11 for ; Mon, 19 Oct 2020 22:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DahGBmqF9ZibJSYRWi32xAezOhzN/k4+lLgqqvwqQwc=; b=aoo/RTFPyrRekVFxwxZruNDnEf6MMox0u3w3bG/jl1X/i+5yknXbko61AzdTtI5sXI JAEf/HSR3F4ZmtqXV7JYzbDdBCoeU6AmW4thYWg0D8sQo69dpjX/OudfiHx3m674IIdC fluDcZ/U2uXCIj+ZlJ9TBBa3bA8DAB1K/Wzi4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DahGBmqF9ZibJSYRWi32xAezOhzN/k4+lLgqqvwqQwc=; b=E7hWlCynZsQgeYYX0ebhVt1TEbrIZpqy69nTsFHZfa3svtjTeZs/SC5t9Y5oyryU/J vPdt1EWvcNJj4WDOPReeQN4EJIYS0ivcbXzWdkWH/o8DYXwC0u2+Ye3iwOjHgJalxpf9 pdcIyoLndMTEBljgrprv585t1Dy7zwzB0iitzadH8+RQ3vhXHj3CfegKZVHYoK2mFVwf sUtUU6NlQxjiHaQ9pZXue5aCNw8LoEb52V6I5jwl+gfHixEQYdPoCKcJygf2Tua1KOxo w/2PlciVOSq2hhUgTXb/MzQjtp7tEPljVHVL0lum7ViLbOh/7zvZ111KMFaPe6Oidad+ AblA== X-Gm-Message-State: AOAM533x7Lanz2SLEbrjmDn0ym3sG3vr+aCXdIFBQvdJKf1ryztwYXJ8 pATLVUPySoCDdO55mrgBlhbw6o0D4ux9YQ== X-Google-Smtp-Source: ABdhPJwQSdYSFIJ8xDknYxjx6uNRca+mSmksCdmvOcikyWZzkaWVlcOvFBVA6+wM2FK3rjIVre8QSg== X-Received: by 2002:a17:90a:d345:: with SMTP id i5mr1294119pjx.150.1603171761646; Mon, 19 Oct 2020 22:29:21 -0700 (PDT) Received: from hiroh.tok.corp.google.com ([2401:fa00:8f:2:de4a:3eff:fe7d:f78f]) by smtp.gmail.com with ESMTPSA id j4sm779043pfd.101.2020.10.19.22.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 22:29:21 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 20 Oct 2020 14:29:01 +0900 Message-Id: <20201020052905.89267-5-hiroh@chromium.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201020052905.89267-1-hiroh@chromium.org> References: <20201020052905.89267-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/8] android: Omit extra semicolons X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The end semicolons with LOG_DECLARE_CATEGORY and LOG_DEFINE_CATEGORY are unnecessary. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 2 +- src/android/camera_hal_manager.cpp | 2 +- src/android/camera_metadata.cpp | 2 +- src/android/camera_stream.cpp | 2 +- src/android/camera_worker.cpp | 2 +- src/android/jpeg/encoder.h | 2 +- src/android/jpeg/encoder_libjpeg.cpp | 2 +- src/android/jpeg/post_processor_jpeg.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index d706cf4..e9404c2 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -129,7 +129,7 @@ const std::map camera3FormatsMap = { } /* namespace */ -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags) diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 2a33f9b..189eda2 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -16,7 +16,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CameraHalManager diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index f0da9ea..edea48f 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -11,7 +11,7 @@ using namespace libcamera; -LOG_DEFINE_CATEGORY(CameraMetadata); +LOG_DEFINE_CATEGORY(CameraMetadata) CameraMetadata::CameraMetadata(size_t entryCapacity, size_t dataCapacity) { diff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp index 1b8afa8..eae451e 100644 --- a/src/android/camera_stream.cpp +++ b/src/android/camera_stream.cpp @@ -15,7 +15,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CameraStream diff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp index ff09b75..df43646 100644 --- a/src/android/camera_worker.cpp +++ b/src/android/camera_worker.cpp @@ -15,7 +15,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(HAL); +LOG_DECLARE_CATEGORY(HAL) /* * \class CaptureRequest diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h index 4483153..4e85996 100644 --- a/src/android/jpeg/encoder.h +++ b/src/android/jpeg/encoder.h @@ -14,7 +14,7 @@ class Encoder { public: - virtual ~Encoder() {}; + virtual ~Encoder() {} virtual int configure(const libcamera::StreamConfiguration &cfg) = 0; virtual int encode(const libcamera::FrameBuffer *source, diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index 8995ba5..f11e004 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -25,7 +25,7 @@ using namespace libcamera; -LOG_DECLARE_CATEGORY(JPEG); +LOG_DECLARE_CATEGORY(JPEG) namespace { diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index 753c28e..9d452b7 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -18,7 +18,7 @@ using namespace libcamera; -LOG_DEFINE_CATEGORY(JPEG); +LOG_DEFINE_CATEGORY(JPEG) PostProcessorJpeg::PostProcessorJpeg(CameraDevice *device) : cameraDevice_(device)