From 37958dfd713dd00d4a71a78a6a45f8016ad82e65 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 29 Apr 2022 03:59:45 +0300 Subject: libcamera: Replace toString with operator<<() for geometry classes Now that geometry classes implement the stream formatting operator<<(), use it instead of the toString() function. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- test/camera-sensor.cpp | 3 +-- test/geometry.cpp | 4 +--- test/stream/stream_formats.cpp | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index 372ee4af..9b06a60e 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -86,8 +86,7 @@ protected: const Size &resolution = sensor_->resolution(); if (resolution != Size(4096, 2160)) { - cerr << "Incorrect sensor resolution " - << resolution.toString() << endl; + cerr << "Incorrect sensor resolution " << resolution << endl; return TestFail; } diff --git a/test/geometry.cpp b/test/geometry.cpp index 51256924..008d51ea 100644 --- a/test/geometry.cpp +++ b/test/geometry.cpp @@ -25,9 +25,7 @@ protected: bool result = op(lhs, rhs); if (result != expect) { - cout << lhs.toString() - << opName << " " - << rhs.toString() + cout << lhs << opName << " " << rhs << "test failed" << std::endl; return false; } diff --git a/test/stream/stream_formats.cpp b/test/stream/stream_formats.cpp index 9353d008..99fa0385 100644 --- a/test/stream/stream_formats.cpp +++ b/test/stream/stream_formats.cpp @@ -40,10 +40,10 @@ protected: cout << "Failed " << name << endl; cout << "Sizes to test:" << endl; for (Size &size : test) - cout << size.toString() << endl; + cout << size << endl; cout << "Valid sizes:" << endl; for (Size &size : valid) - cout << size.toString() << endl; + cout << size << endl; return TestFail; } -- cgit v1.2.1