Change ut.X and ut.Y to int32_t for BBs outside the image

Austin Blanton
1 parent c65e1074
Showing 3 changed files with 10 additions and 9 deletions
openbr/plugins/gallery/binary.cpp
openbr/universal_template.cpp
openbr/universal_template.h
@@ -247,7 +247,8 @@ class utGallery : public BinaryGallery
         const int32_t algorithmID = (t.isEmpty() || t.file.fte) ? 0 : t.file.get<int32_t>("AlgorithmID");
         const QByteArray url = t.file.get<QString>("URL", t.file.name).toLatin1();
-        uint32_t x = 0, y = 0, width = 0, height = 0;
+        int32_t x = 0, y = 0;
+        uint32_t width = 0, height = 0;
         QByteArray header;
         if ((algorithmID <= -1) && (algorithmID >= -3)) {
             const QRectF frontalFace = t.file.get<QRectF>("FrontalFace");
@@ -268,8 +269,8 @@ class utGallery : public BinaryGallery
             header.append((const char*)&leftEyeX , sizeof(uint32_t));
             header.append((const char*)&leftEyeY , sizeof(uint32_t));
         } else {
-            x = t.file.get<uint32_t>("X", 0);
-            y = t.file.get<uint32_t>("Y", 0);
+            x = t.file.get<int32_t>("X", 0);
+            y = t.file.get<int32_t>("Y", 0);
             width = t.file.get<uint32_t>("Width", 0);
             height = t.file.get<uint32_t>("Height", 0);
         }
@@ -277,8 +278,8 @@ class utGallery : public BinaryGallery
         gallery.write(imageID);
         gallery.write((const char*) &algorithmID, sizeof(int32_t));
-        gallery.write((const char*) &x          , sizeof(uint32_t));
-        gallery.write((const char*) &y          , sizeof(uint32_t));
+        gallery.write((const char*) &x          , sizeof(int32_t));
+        gallery.write((const char*) &y          , sizeof(int32_t));
         gallery.write((const char*) &width      , sizeof(uint32_t));
         gallery.write((const char*) &height     , sizeof(uint32_t));
         gallery.write((const char*) &label      , sizeof(uint32_t));
@@ -8,7 +8,7 @@
 #include "universal_template.h"
-br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize)
+br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize)
 {
     const uint32_t urlSize = strlen(url) + 1;
     br_utemplate utemplate = (br_utemplate) malloc(sizeof(br_universal_template) + urlSize + fvSize);
@@ -37,8 +37,8 @@ struct br_universal_template
 {
     unsigned char imageID[16]; /*!< MD5 hash of the undecoded origin file. */
     int32_t  algorithmID; /*!< interpretation of _data_ after _urlSize_. */
-    uint32_t x;      /*!< region of interest horizontal offset (pixels). */
-    uint32_t y;      /*!< region of interest vertical offset (pixels). */
+    int32_t x;      /*!< region of interest horizontal offset (pixels). */
+    int32_t y;      /*!< region of interest vertical offset (pixels). */
     uint32_t width;  /*!< region of interest horizontal size (pixels). */
     uint32_t height; /*!< region of interest vertical size (pixels). */
     uint32_t label; /*!< supervised training class or manually annotated ground truth. */
@@ -57,7 +57,7 @@ typedef const struct br_universal_template *br_const_utemplate;
  * \brief br_universal_template constructor.
  * \see br_free_utemplate
  */
-BR_EXPORT br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize);
+BR_EXPORT br_utemplate br_new_utemplate(const char *imageID, int32_t algorithmID, int32_t x, int32_t y, uint32_t width, uint32_t height, uint32_t label, const char *url, const char *fv, uint32_t fvSize);
 /*!
  * \brief br_universal_template destructor.