From cc57a5b60ba4bdf5ce47803e2554834883cc43b8 Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Mon, 13 Apr 2015 13:11:25 -0400
Subject: [PATCH] Border can be specified in pixels

---
 openbr/plugins/metadata/grid.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openbr/plugins/metadata/grid.cpp b/openbr/plugins/metadata/grid.cpp
index cdc0309..2423a0f 100644
--- a/openbr/plugins/metadata/grid.cpp
+++ b/openbr/plugins/metadata/grid.cpp
@@ -37,10 +37,10 @@ class GridTransform : public UntrainableTransform
     void project(const Template &src, Template &dst) const
     {
         QList<QPointF> landmarks;
-        const float row_step = (src.m().rows-src.m().rows*border*2) / rows;
-        const float column_step = (src.m().cols-src.m().cols*border*2) / columns;
-        for (float y=row_step/2+src.m().rows*border; y<src.m().rows-src.m().rows*border; y+=row_step)
-            for (float x=column_step/2+src.m().cols*border; x<src.m().cols-src.m().cols*border; x+=column_step)
+        const float row_step = (src.m().rows-(border < 1 ? src.m().rows*border*2 : border*2)) / rows;
+        const float column_step = (src.m().cols-(border < 1 ? src.m().cols*border*2 : border*2)) / columns;
+        for (float y=row_step/2+(border < 1 ? src.m().rows*border : border); y<src.m().rows-(border < 1 ? src.m().rows*border : border); y+=row_step)
+            for (float x=column_step/2+(border < 1 ? src.m().cols*border : border); x<src.m().cols-(border < 1 ? src.m().cols*border : border); x+=column_step)
                 landmarks.append(QPointF(x,y));
         dst = src;
         dst.file.setPoints(landmarks);
--
libgit2 0.21.4