opencv v4 breaks findobj - no upgrade, sketcher tweaks

[goodguy/cinelerra.git] / cinelerra-5.1 / plugins / sketcher / sketcher.h

diff --git a/cinelerra-5.1/plugins/sketcher/sketcher.h b/cinelerra-5.1/plugins/sketcher/sketcher.h
index 443e8e9134abc8f25826566236a713233d7735a9..1ddd5a478635d795b1dc3d441e861cce29078100 100644 (file)
--- a/cinelerra-5.1/plugins/sketcher/sketcher.h
+++ b/cinelerra-5.1/plugins/sketcher/sketcher.h
@@ -34,9 +34,10 @@ class Sketcher;
 #define CV_COLOR WHITE
 
 enum { PT_ID, PT_TY, PT_X, PT_Y, PT_SZ };
-enum { CV_ID, CV_RAD, CV_PEN, CV_CLR, CV_SZ };
-enum { PTY_OFF, PTY_LINE, PTY_CURVE, PTY_FILL, PTY_SZ };
+enum { CV_ID, CV_RAD, CV_PEN, CV_CLR, CV_ALP, CV_SZ };
+enum { ARC_OFF, ARC_LINE, ARC_CURVE, ARC_FILL, ARC_SZ };
 enum { PEN_OFF, PEN_SQUARE, PEN_PLUS, PEN_SLANT, PEN_XLANT, PEN_SZ };
+typedef float coord;
 
 class SketcherVPen : public VFrame
 {
@@ -56,6 +57,14 @@ public:
        }
        ~SketcherVPen() { delete [] msk; }
 
+       void draw_line(float x1, float y1, float x2, float y2) {
+               VFrame::draw_line(int(x1+.5f),int(y1+.5f), int(x2+.5f),int(y2+.5f));
+       }
+       void draw_smooth(float x1, float y1, float x2, float y2, float x3, float y3) {
+               VFrame::draw_smooth(int(x1+.5f),int(y1+.5f),
+                       int(x2+.5f),int(y2+.5f), int(x3+.5f),int(y3+.5f));
+       }
+
        virtual int draw_pixel(int x, int y) = 0;
 };
 
@@ -88,11 +97,11 @@ public:
 class SketcherPoint
 {
 public:
-       int id, pty;
-       int x, y;
+       int id, arc;
+       coord x, y;
 
-       void init(int id, int pty, int x, int y);
-       SketcherPoint(int id, int pty, int x, int y);
+       void init(int id, int arc, coord x, coord y);
+       SketcherPoint(int id, int arc, coord x, coord y);
        SketcherPoint(int id=-1);
        SketcherPoint(SketcherPoint &pt);
        ~SketcherPoint();
@@ -100,7 +109,7 @@ public:
        void copy_from(SketcherPoint &that);
        void save_data(FileXML &output);
        void read_data(FileXML &input);
-       static const char *types[PTY_SZ];
+       static const char *types[ARC_SZ];
 };
 class SketcherPoints : public ArrayList<SketcherPoint *>
 {
@@ -114,13 +123,13 @@ public:
 class SketcherCurve
 {
 public:
-       int id, pen, radius, color;
+       int id, pen, width, color;
        static const char *pens[PEN_SZ];
 
        SketcherPoints points;
 
-       void init(int id, int pen, int radius, int color);
-       SketcherCurve(int id, int pen, int radius, int color);
+       void init(int id, int pen, int width, int color);
+       SketcherCurve(int id, int pen, int width, int color);
        SketcherCurve(int id=-1);
        ~SketcherCurve();
        SketcherCurve(SketcherCurve &cv);
@@ -128,7 +137,7 @@ public:
        void copy_from(SketcherCurve &that);
        void save_data(FileXML &output);
        void read_data(FileXML &input);
-       double nearest_point(int &pi, float x, float y);
+       double nearest_point(int &pi, coord x, coord y);
 
        SketcherVPen *new_vpen(VFrame *out);
        void draw(VFrame *img);
@@ -152,7 +161,7 @@ public:
        void copy_from(SketcherConfig &that);
        void interpolate(SketcherConfig &prev, SketcherConfig &next,
                long prev_frame, long next_frame, long current_frame);
-       double nearest_point(int &ci, int &pi, float x, float y);
+       double nearest_point(int &ci, int &pi, coord x, coord y);
        void limits();
        void dump();
 
@@ -167,13 +176,14 @@ public:
        ~Sketcher();
        PLUGIN_CLASS_MEMBERS2(SketcherConfig)
        int is_realtime();
+       int is_synthesis();
        void update_gui();
        void save_data(KeyFrame *keyframe);
        void read_data(KeyFrame *keyframe);
-       int new_curve(int pen, int radius, int color);
+       int new_curve(int pen, int width, int color);
        int new_curve();
-       int new_point(SketcherCurve *cv, int pty, int x, int y, int idx=-1);
-       int new_point(int idx=-1);
+       int new_point(SketcherCurve *cv, int arc, coord x, coord y, int idx=-1);
+       int new_point(int idx, int arc);
        int process_realtime(VFrame *input, VFrame *output);
        static void draw_point(VFrame *vfrm, SketcherPoint *pt, int color, int d);
        void draw_point(VFrame *vfrm, SketcherPoint *pt, int color);