Changeset 338 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Oct 17, 2019, 2:49:35 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

remove opencv dep

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/FlairCore/src/Image.cpp (copied) (copied from branches/sanscv/lib/FlairCore/src/Image.cpp )
• lib/FlairCore/src/Image.h (copied) (copied from branches/sanscv/lib/FlairCore/src/Image.h )
• lib/FlairCore/src/Picture.cpp (modified) (2 diffs)
• lib/FlairCore/src/Picture.h (modified) (3 diffs)
• lib/FlairCore/src/cvimage.cpp (deleted)
• lib/FlairCore/src/cvimage.h (deleted)

trunk/lib/FlairCore/src/Picture.cpp

@@ -17 +17 @@
 
 #include "Picture.h"
-#include "cvimage.h"
+#include "Image.h"
 #include "Layout.h"
 #include "LayoutPosition.h"
@@ -30 +30 @@
 
 Picture::Picture(const LayoutPosition *position, string name,
-                 const cvimage *image)
+                 const Image *image)
     : SendData(position, name, "Picture", 200) {
   this->image = image;

trunk/lib/FlairCore/src/Picture.h

@@ -18 +18 @@
 namespace flair {
 namespace core {
-class cvimage;
+class Image;
 }
 
@@ -45 +45 @@
   */
   Picture(const LayoutPosition *position, std::string name,
-          const core::cvimage *image);
+          const core::Image *image);
 
   /*!
@@ -70 +70 @@
   void ExtraXmlEvent(void){};
 
-  const core::cvimage *image;
+  const core::Image *image;
 };