From 42af109c304a99942c13ac337ce6678fb7447413 Mon Sep 17 00:00:00 2001 From: Andy Dennie Date: Thu, 29 Mar 2018 20:13:25 -0400 Subject: [PATCH] use affdex::byte to avoid ambiguity; remove #include typedefs.h (#41) * use affdex::byte to avoid ambiguity; remove #include typedefs.h * PlottingImageListener.hpp: use unsigned char with Frame::getBGRByteArray the typedef affdex::byte was not added until Affdex SDK 4.0, so unsigned char provides further-back SDK version compatibility. --- common/PlottingImageListener.hpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/PlottingImageListener.hpp b/common/PlottingImageListener.hpp index 535b54e..2d8add4 100644 --- a/common/PlottingImageListener.hpp +++ b/common/PlottingImageListener.hpp @@ -12,8 +12,6 @@ #include "Visualizer.h" #include "ImageListener.h" -#include "typedefs.h" - using namespace affdex; @@ -209,7 +207,7 @@ public: cv::Scalar clr = cv::Scalar(0, 0, 255); cv::Scalar header_clr = cv::Scalar(255, 0, 0); - std::shared_ptr imgdata = image.getBGRByteArray(); + std::shared_ptr imgdata = image.getBGRByteArray(); cv::Mat img = cv::Mat(image.getHeight(), image.getWidth(), CV_8UC3, imgdata.get()); viz.updateImage(img);