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.
This commit is contained in:
Andy Dennie 2018-03-29 20:13:25 -04:00 committed by Abdelrahman Mahmoud
parent 055967d7d3
commit 42af109c30

View file

@ -12,8 +12,6 @@
#include "Visualizer.h" #include "Visualizer.h"
#include "ImageListener.h" #include "ImageListener.h"
#include "typedefs.h"
using namespace affdex; using namespace affdex;
@ -209,7 +207,7 @@ public:
cv::Scalar clr = cv::Scalar(0, 0, 255); cv::Scalar clr = cv::Scalar(0, 0, 255);
cv::Scalar header_clr = cv::Scalar(255, 0, 0); cv::Scalar header_clr = cv::Scalar(255, 0, 0);
std::shared_ptr<byte> imgdata = image.getBGRByteArray(); std::shared_ptr<unsigned char> imgdata = image.getBGRByteArray();
cv::Mat img = cv::Mat(image.getHeight(), image.getWidth(), CV_8UC3, imgdata.get()); cv::Mat img = cv::Mat(image.getHeight(), image.getWidth(), CV_8UC3, imgdata.get());
viz.updateImage(img); viz.updateImage(img);