activeSegmentation: fix compilation with yarp devel

robotology · Jan 9, 2018 · 9b63377 · 9b63377
1 parent 71338d1
commit 9b63377
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/activeSegmentation/src/library/src/activeSeg.cpp b/src/activeSegmentation/src/library/src/activeSeg.cpp
@@ -36,7 +36,7 @@ bool ActiveSeg::configure(ResourceFinder &rf)
 /**********************************************************/
 ActiveSeg::Error ActiveSeg::getSegWithFixation( const IplImage *img, IplImage* &seg, SegInfo &info )
 {
-    YARP_ASSERT (img);
+    yAssert(img);
 
     if (info.fix_x >= img->width || info.fix_x <= 0 || info.fix_y >=img->height || info.fix_y <= 0)
     {
@@ -132,8 +132,8 @@ inline void ActiveSeg::segmentWithFixation(IplImage *img_in, double x, double y)
 /**********************************************************/
 ActiveSeg::Error  ActiveSeg::getTemplateFromSeg(const IplImage *img, IplImage* seg, IplImage* &tpl, SegInfo &info)
 {
-    YARP_ASSERT (img);
-    YARP_ASSERT (seg);
+    yAssert(img);
+    yAssert(seg);
 
     int top = -1;
     int left = -1;
@@ -210,7 +210,7 @@ ActiveSeg::Error  ActiveSeg::getTemplateFromSeg(const IplImage *img, IplImage* s
 
 ActiveSeg::Error ActiveSeg::getTemplate( const IplImage *img, IplImage* &tpl, SegInfo &info )
 {
-    YARP_ASSERT (img);
+    yAssert(img);
     IplImage* seg = cvCloneImage(img);
     ActiveSeg::Error ret;
 

diff --git a/src/activeSegmentation/src/module/activeParticleTracker/include/iCub/targetContainer.h b/src/activeSegmentation/src/module/activeParticleTracker/include/iCub/targetContainer.h
@@ -61,7 +61,7 @@ class TargetObjectRecord {
 
     bool add(TargetObject *obj)
     {
-        YARP_ASSERT(obj);
+        yAssert(obj);
         TargetObjectRecord::iterator itr = findOwner(obj->owner);
         if(itr != targets.end())
             targets.erase(itr);