From ab47d36b7cfa21591b96f993ee383e6731a76f93 Mon Sep 17 00:00:00 2001
From: Antoine Lorence <antoine.lorence@insa-rennes.fr>
Date: Wed, 5 Nov 2014 15:23:22 +0100
Subject: [PATCH] Plugin module can't be used for the moment, disable it
---
app/Services/OpSetService.h | 2 +-
app/Services/PluginManager.cpp | 4 ++--
plugins/Segmentation/segmentation.cpp | 14 +++++++-------
plugins/plugin.cpp | 12 ++++++------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app/Services/OpSetService.h b/app/Services/OpSetService.h
index 7e9d264..2a48b5d 100644
--- a/app/Services/OpSetService.h
+++ b/app/Services/OpSetService.h
@@ -21,7 +21,7 @@
#define OPSETSERVICE_H
#include <Service.h>
-#include <Plugin.h>
+//#include <Plugin.h>
#include "OperationService.h"
#include <Services/AlgorithmService.h>
diff --git a/app/Services/PluginManager.cpp b/app/Services/PluginManager.cpp
index bda6322..d46c11f 100644
--- a/app/Services/PluginManager.cpp
+++ b/app/Services/PluginManager.cpp
@@ -177,9 +177,9 @@ bool PluginManager::loadPlugin(QString file, bool silent) {
std::cout << file.toStdString() << " loaded" << std::endl;
- void* ptr = library->resolve("loadPlugin");
+ QFunctionPointer ptr = library->resolve("loadPlugin");
- if(ptr==0) {
+ if(ptr == 0) {
if(!silent) {
QMessageBox::critical (_gi, tr("Error loading plugin"), tr("Could not find the plugin's entry point \"loadPlugin\""));
}
diff --git a/plugins/Segmentation/segmentation.cpp b/plugins/Segmentation/segmentation.cpp
index 36b8a3f..fc00be8 100644
--- a/plugins/Segmentation/segmentation.cpp
+++ b/plugins/Segmentation/segmentation.cpp
@@ -1,18 +1,18 @@
/*
* Copyright 2011-2012 INSA Rennes
- *
+ *
* This file is part of EIImage.
- *
+ *
* EIImage is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* EIImage is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with EIImage. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40,7 +40,7 @@ class Thresholding : public PlugOperation {
addParam(CurrentImg(), &Thresholding::img);
addParam(IntParam("Entier", 0, 255, 127), &Thresholding::threshold);
}
-
+
void operation() {
algorithm::Binarization_t<depth_default_t> thresholding(threshold);
GrayscaleImage* grayImg = imagein::Converter<GrayscaleImage>::convert(img);
@@ -57,7 +57,7 @@ class Otsu : public PlugOperation {
Otsu() : PlugOperation("Otsu") {
this->addParam(CurrentImg(), &Otsu::img);
}
-
+
void operation() {
algorithm::Otsu_t<depth_default_t> otsu;
GrayscaleImage* grayImg = imagein::Converter<GrayscaleImage>::convert(img);
@@ -74,7 +74,7 @@ class Dithering : public PlugOperation {
this->addParam(CurrentImg(), &Dithering::img);
// this->addParam(ImgParam("Image"), &Dithering::img);
}
-
+
void operation() {
algorithm::Dithering_t<depth_default_t> dithering;
Image* result = dithering(&img);
diff --git a/plugins/plugin.cpp b/plugins/plugin.cpp
index 8188ed3..44cdd42 100644
--- a/plugins/plugin.cpp
+++ b/plugins/plugin.cpp
@@ -22,11 +22,11 @@
#include "Image.h"
-#include "../ImageEIICore/Operation.h"
-#include "../ImageEIICore/Plugin.h"
-#include "../ImageEIICore/ImgParam.h"
-#include "../ImageEIICore/IntParam.h"
-#include "../ImageEIICore/ImgOutput.h"
+#include "Operation.h"
+#include "Plugin.h"
+#include "ImgParam.h"
+#include "IntParam.h"
+#include "ImgOutput.h"
using namespace std;
using namespace imagein;
@@ -122,4 +122,4 @@ class MyPlugin : public Plugin {
extern "C" Plugin* getPlugin() {
Plugin* myPlugin = new MyPlugin("ImageRef");
return myPlugin;
-}
\ No newline at end of file
+}
--
GitLab