[libcamera-devel,v6,2/7] libcamera: utils: Add method to remove non-ASCII characters

Message ID 20200929144648.429397-3-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: Allow for user-friendly names in
Related show

Commit Message

Niklas Söderlund Sept. 29, 2020, 2:46 p.m. UTC
Add method that removes non-ASCII characters from a string.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <email@uajain.com>
---
* Changes since v5
- Update documentation.

* Changes since v4
- Update documentation.

* Changes since v3
- Fix spelling in comment.
- Rename to toAscii()
---
 include/libcamera/internal/utils.h |  2 ++
 src/libcamera/utils.cpp            | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

Patch

diff --git a/include/libcamera/internal/utils.h b/include/libcamera/internal/utils.h
index a1b644b0345bdb48..ebb2c4038e196f05 100644
--- a/include/libcamera/internal/utils.h
+++ b/include/libcamera/internal/utils.h
@@ -190,6 +190,8 @@  private:
 
 details::StringSplitter split(const std::string &str, const std::string &delim);
 
+std::string toAscii(const std::string &str);
+
 std::string libcameraBuildPath();
 std::string libcameraSourcePath();
 
diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp
index a5232902191eec85..da85c9c24340ae3b 100644
--- a/src/libcamera/utils.cpp
+++ b/src/libcamera/utils.cpp
@@ -334,6 +334,23 @@  details::StringSplitter split(const std::string &str, const std::string &delim)
 	return details::StringSplitter(str, delim);
 }
 
+/**
+ * \brief Remove any non-ASCII characters from a string
+ * \param[in] str The string to strip
+ *
+ * Remove all non-ASCII characters from a string.
+ *
+ * \return A string equal to \a str stripped out of all non-ASCII characters
+ */
+std::string toAscii(const std::string &str)
+{
+	std::string ret;
+	for (const char &c : str)
+		if (!(c & 0x80))
+			ret += c;
+	return ret;
+}
+
 /**
  * \brief Check if libcamera is installed or not
  *