{"id":1400,"url":"https://patchwork.libcamera.org/api/patches/1400/?format=json","web_url":"https://patchwork.libcamera.org/patch/1400/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190612004359.15772-5-niklas.soderlund@ragnatech.se>","date":"2019-06-12T00:43:47","name":"[libcamera-devel,v2,04/16] libcamera: geometry: SizeRange: Add contains()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1c62ad6125762dc9657868015b0671f74dff5c62","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1400/mbox/","series":[{"id":351,"url":"https://patchwork.libcamera.org/api/series/351/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=351","date":"2019-06-12T00:43:43","name":"libcamera: Add support for format information and validation","version":2,"mbox":"https://patchwork.libcamera.org/series/351/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1400/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1400/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8E7D961F6D\n\tfor ;\n\tWed, 12 Jun 2019 02:44:56 +0200 (CEST)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 357e6b64-8cab-11e9-8601-0050569116f7;\n\tWed, 12 Jun 2019 02:44:18 +0200 (CEST)"],"X-Halon-ID":"357e6b64-8cab-11e9-8601-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 12 Jun 2019 02:43:47 +0200","Message-Id":"<20190612004359.15772-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190612004359.15772-1-niklas.soderlund@ragnatech.se>","References":"<20190612004359.15772-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 04/16] libcamera: geometry: SizeRange:\n\tAdd contains()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 12 Jun 2019 00:44:56 -0000"},"content":"Add a method to check if a Size can fit inside a SizeRange. When\ndetermining if a size is containable take step values into account if\nthey are not set to 0.\n\nSigned-off-by: Niklas Söderlund \n---\n include/libcamera/geometry.h | 2 ++\n src/libcamera/geometry.cpp | 17 +++++++++++++++++\n 2 files changed, 19 insertions(+)","diff":"diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h\nindex 03962d7d09fac2b0..52f4d010de76f840 100644\n--- a/include/libcamera/geometry.h\n+++ b/include/libcamera/geometry.h\n@@ -92,6 +92,8 @@ public:\n \t{\n \t}\n \n+\tbool contains(const Size &size) const;\n+\n \tstd::string toString() const;\n \n \tSize min;\ndiff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp\nindex 6a1d1d78870b23ec..a4d472d9fce2e226 100644\n--- a/src/libcamera/geometry.cpp\n+++ b/src/libcamera/geometry.cpp\n@@ -107,6 +107,7 @@ bool operator==(const Rectangle &lhs, const Rectangle &rhs)\n * \\brief The Size height\n */\n \n+\n /**\n * \\brief Assemble and return a string describing the size\n * \\return A string describing the size\n@@ -261,6 +262,22 @@ bool operator<(const Size &lhs, const Size &rhs)\n * \\brief The vertical step\n */\n \n+/**\n+ * \\brief Test if a size can be contained in the range\n+ * \\param[in] size Size to check\n+ * \\returns True if \\a size can be contained\n+ */\n+bool SizeRange::contains(const Size &size) const\n+{\n+\tif (size.width < min.width || size.width > max.width ||\n+\t size.height < min.height || size.height > max.height ||\n+\t (hStep && (size.width - min.width) % hStep) ||\n+\t (vStep && (size.height - min.height) % vStep))\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n /**\n * \\brief Assemble and return a string describing the size range\n * \\return A string describing the SizeRange\n","prefixes":["libcamera-devel","v2","04/16"]}