X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ffindobj%2Ffindobj.h;h=4a29b3c98c6689f5296ce4ede9452954b06e5c54;hp=8c291b28ba701f903a706948fe245dd0ecffd091;hb=9a16c85641dee9f15136f40c8a3195d88d45513f;hpb=9f682a609a1817808682efa68cb96a296815bf80

diff --git a/cinelerra-5.1/plugins/findobj/findobj.h b/cinelerra-5.1/plugins/findobj/findobj.h
index 8c291b28..4a29b3c9 100644
--- a/cinelerra-5.1/plugins/findobj/findobj.h
+++ b/cinelerra-5.1/plugins/findobj/findobj.h
@@ -45,6 +45,7 @@
 #include "pluginvclient.h"
 #include "vframe.inc"
 
+#define Mutex CvMutex
 #include "opencv2/core/types.hpp"
 #include "opencv2/core/mat.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
@@ -52,6 +53,7 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/flann/defines.h"
 #include "opencv2/flann/params.h"
+#undef Mutex
 
 #include <vector>
 
@@ -100,11 +102,12 @@ public:
 	void boundaries();
 
 	int algorithm, use_flann;
+	int drag_object, drag_scene;
 	float object_x, object_y, object_w, object_h;
-	float scene_x, scene_y,   scene_w, scene_h;
+	float scene_x, scene_y, scene_w, scene_h;
 
 	int draw_keypoints;
-	int draw_border;
+	int draw_scene_border;
 	int replace_object;
 	int draw_object_border;