Merge remote-tracking branch 'backup/cge/msvc10_porting' into cge/msvc10_porting

diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
index 9ac38a334261302c175db431c53848e9138fb270..1f7ff49d5936c75726bcec415461b81a46c556d1 100644 (file)
--- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
+++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
@@ -83,12 +83,6 @@ enum{
   LINES
 };
 
-enum {
-  RADIO_BUTTONS,
-  MSG,
-  PUSH_BUTTON,
-};
-
 enum {
   KERNEL_SIZE,
   FIND_CONTOURS_METHOD,
@@ -859,11 +853,11 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
                 double u_v_det = (it->x - it_previous->x) * (it_next->y - it->y) - 
                                  (it->y - it_previous->y) * (it_next->x - it->x);
                                           
-                double norme_u = sqrt ( (it->x - it_previous->x)*(it->x - it_previous->x) +
-                                        (it->y - it_previous->y)*(it->y - it_previous->y) );
+                double norme_u = sqrt ( double(it->x - it_previous->x) * double(it->x - it_previous->x) +
+                                        double(it->y - it_previous->y) * double(it->y - it_previous->y) );
                 
-                double norme_v = sqrt ( (it->x - it_next->x)*(it->x - it_next->x) +
-                                        (it->y - it_next->y)*(it->y - it_next->y) );
+                double norme_v = sqrt ( double(it->x - it_next->x) * double(it->x - it_next->x) +
+                                        double(it->y - it_next->y) * double(it->y - it_next->y) );
                                                                                                 
                 double u_v_sinus = u_v_det / (norme_u * norme_v);
                 

diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
index b683c7c6958bb8e8f549f16c828cb4e6dc20f648..bb0a44ddb088496b491b83466905d08bda24aacb 100644 (file)
--- a/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
+++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
@@ -32,7 +32,17 @@
 // Qt
 #include <QRect>
 
-class ShapeRec_Parameters
+#ifdef WIN32
+  #if defined GEOM_SHAPEREC_EXPORTS || defined GEOMShapeRec_EXPORTS
+    #define GEOM_SHAPEREC_EXPORT __declspec( dllexport )
+  #else
+    #define GEOM_SHAPEREC_EXPORT __declspec( dllimport )
+  #endif
+#else
+   #define GEOM_SHAPEREC_EXPORT
+#endif
+
+class GEOM_SHAPEREC_EXPORT ShapeRec_Parameters
 {
 public:
   ShapeRec_Parameters();
@@ -42,7 +52,7 @@ public:
   int findContoursMethod;
 };
 
-class ShapeRec_CornersParameters : public ShapeRec_Parameters
+class GEOM_SHAPEREC_EXPORT ShapeRec_CornersParameters : public ShapeRec_Parameters
 {
 public:
   ShapeRec_CornersParameters();
@@ -55,7 +65,7 @@ public:
   double epsilon;
 };
 
-class ShapeRec_CannyParameters : public ShapeRec_Parameters
+class GEOM_SHAPEREC_EXPORT ShapeRec_CannyParameters : public ShapeRec_Parameters
 {
 public:
   ShapeRec_CannyParameters();
@@ -66,7 +76,7 @@ public:
   bool L2gradient;
 };
 
-class ShapeRec_ColorFilterParameters : public ShapeRec_Parameters
+class GEOM_SHAPEREC_EXPORT ShapeRec_ColorFilterParameters : public ShapeRec_Parameters
 {
 public:
   ShapeRec_ColorFilterParameters();
@@ -79,7 +89,7 @@ public:
   double maxThreshold;
 };
 
-class ShapeRec_FeatureDetector
+class GEOM_SHAPEREC_EXPORT ShapeRec_FeatureDetector
 {
 public: