From 08a75925d86605d63f115e76ad7644ba194812a4 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 22 May 2020 03:08:15 +0300
Subject: libcamera: Rename pixelformats.{cpp,h} to pixel_format.{cpp,h}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The libcamera source files are named after class names, using
snake_case. pixelformats.h and pixelformats.cpp don't comply with that
rule. Fix them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/internal/formats.h          |  2 +-
 include/libcamera/internal/v4l2_pixelformat.h |  2 +-
 include/libcamera/internal/v4l2_videodevice.h |  2 +-
 include/libcamera/meson.build                 |  2 +-
 include/libcamera/pixel_format.h              | 43 +++++++++++++++++++++++++++
 include/libcamera/pixelformats.h              | 43 ---------------------------
 include/libcamera/stream.h                    |  2 +-
 7 files changed, 48 insertions(+), 48 deletions(-)
 create mode 100644 include/libcamera/pixel_format.h
 delete mode 100644 include/libcamera/pixelformats.h

(limited to 'include')

diff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h
index 4092a93e..4455b0f9 100644
--- a/include/libcamera/internal/formats.h
+++ b/include/libcamera/internal/formats.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include <libcamera/geometry.h>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
 
 #include "libcamera/internal/v4l2_pixelformat.h"
 
diff --git a/include/libcamera/internal/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h
index 0fe8a017..4d0e034b 100644
--- a/include/libcamera/internal/v4l2_pixelformat.h
+++ b/include/libcamera/internal/v4l2_pixelformat.h
@@ -13,7 +13,7 @@
 
 #include <linux/videodev2.h>
 
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h
index cbaee614..45c3404c 100644
--- a/include/libcamera/internal/v4l2_videodevice.h
+++ b/include/libcamera/internal/v4l2_videodevice.h
@@ -17,7 +17,7 @@
 
 #include <libcamera/buffer.h>
 #include <libcamera/geometry.h>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
 #include <libcamera/signal.h>
 
 #include "libcamera/internal/formats.h"
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 27760c19..73c5b999 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -13,7 +13,7 @@ libcamera_public_headers = files([
     'geometry.h',
     'logging.h',
     'object.h',
-    'pixelformats.h',
+    'pixel_format.h',
     'request.h',
     'signal.h',
     'span.h',
diff --git a/include/libcamera/pixel_format.h b/include/libcamera/pixel_format.h
new file mode 100644
index 00000000..e3b371ef
--- /dev/null
+++ b/include/libcamera/pixel_format.h
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * pixel_format.h - libcamera Pixel Format
+ */
+#ifndef __LIBCAMERA_PIXEL_FORMAT_H__
+#define __LIBCAMERA_PIXEL_FORMAT_H__
+
+#include <set>
+#include <stdint.h>
+#include <string>
+
+#include <linux/drm_fourcc.h>
+
+namespace libcamera {
+
+class PixelFormat
+{
+public:
+	PixelFormat();
+	explicit PixelFormat(uint32_t fourcc, uint64_t modifier = 0);
+
+	bool operator==(const PixelFormat &other) const;
+	bool operator!=(const PixelFormat &other) const { return !(*this == other); }
+	bool operator<(const PixelFormat &other) const;
+
+	bool isValid() const { return fourcc_ != 0; }
+
+	operator uint32_t() const { return fourcc_; }
+	uint32_t fourcc() const { return fourcc_; }
+	uint64_t modifier() const { return modifier_; }
+
+	std::string toString() const;
+
+private:
+	uint32_t fourcc_;
+	uint64_t modifier_;
+};
+
+} /* namespace libcamera */
+
+#endif /* __LIBCAMERA_PIXEL_FORMAT_H__ */
diff --git a/include/libcamera/pixelformats.h b/include/libcamera/pixelformats.h
deleted file mode 100644
index 89966e5e..00000000
--- a/include/libcamera/pixelformats.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2019, Google Inc.
- *
- * pixelformats.h - libcamera pixel formats
- */
-#ifndef __LIBCAMERA_PIXEL_FORMATS_H__
-#define __LIBCAMERA_PIXEL_FORMATS_H__
-
-#include <set>
-#include <stdint.h>
-#include <string>
-
-#include <linux/drm_fourcc.h>
-
-namespace libcamera {
-
-class PixelFormat
-{
-public:
-	PixelFormat();
-	explicit PixelFormat(uint32_t fourcc, uint64_t modifier = 0);
-
-	bool operator==(const PixelFormat &other) const;
-	bool operator!=(const PixelFormat &other) const { return !(*this == other); }
-	bool operator<(const PixelFormat &other) const;
-
-	bool isValid() const { return fourcc_ != 0; }
-
-	operator uint32_t() const { return fourcc_; }
-	uint32_t fourcc() const { return fourcc_; }
-	uint64_t modifier() const { return modifier_; }
-
-	std::string toString() const;
-
-private:
-	uint32_t fourcc_;
-	uint64_t modifier_;
-};
-
-} /* namespace libcamera */
-
-#endif /* __LIBCAMERA_PIXEL_FORMATS_H__ */
diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h
index b3cbea3d..1a68bd23 100644
--- a/include/libcamera/stream.h
+++ b/include/libcamera/stream.h
@@ -14,7 +14,7 @@
 
 #include <libcamera/buffer.h>
 #include <libcamera/geometry.h>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
 
 namespace libcamera {
 
-- 
cgit v1.2.1