affine + perspective plugin rework, info popup tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / affine.h

diff --git a/cinelerra-5.1/cinelerra/affine.h b/cinelerra-5.1/cinelerra/affine.h
index 46119e2b1e202b0128b175cdc5e8d9f3da7aa920..339c8cbb5c1b931e304a0be656df2b20b9e26bc6 100644 (file)
--- a/cinelerra-5.1/cinelerra/affine.h
+++ b/cinelerra-5.1/cinelerra/affine.h
@@ -74,11 +74,7 @@ public:
                double out_x4,
                double out_y4,
                AffineMatrix *result);
-       float transform_cubic(float dx,
-       float jm1,
-       float j,
-       float jp1,
-       float jp2);
+//     float transform_cubic(float dx, float jm1, float j, float jp1, float jp2);
        AffineEngine *server;
 };
 
@@ -90,24 +86,13 @@ public:
 
 // Range of coords is 0 to 100 for coordinates in the image.
 // The coordinate locations are clockwise around the image.
-       void process(VFrame *output,
-               VFrame *input,
-               VFrame *temp,
-               int mode,
-               float x1,
-               float y1,
-               float x2,
-               float y2,
-               float x3,
-               float y3,
-               float x4,
-               float y4,
+       void process(VFrame *output, VFrame *input, VFrame *temp, int mode,
+               float x1, float y1, float x2, float y2,
+               float x3, float y3, float x4, float y4,
                int forward);
 // Do rotation with the affine/perspective transform.
 // This removes some of the extremely faint artifacts in the trig rotation.
-       void rotate(VFrame *output,
-               VFrame *input,
-               float angle);
+       void rotate(VFrame *output, VFrame *input, float angle);
        void set_matrix(AffineMatrix *matrix);
 // Set the viewport to transform.  The transform is based on the input viewport.
 // The output viewport clips the transformed output.
@@ -131,6 +116,8 @@ public:
 // Never used
        void unset_pivot();
        void unset_viewport();
+// default: AF_CUBIC
+       void set_interpolation(int type);
 // To use OpenGL for the processing, set to 1
        void set_opengl(int value);
        void init_packages();
@@ -140,8 +127,7 @@ public:
 
        VFrame *input, *output, *temp;
        int mode;
-       enum
-       {
+       enum {
                PERSPECTIVE,
                SHEER,
                STRETCH,
@@ -149,6 +135,14 @@ public:
 // multiply directly by a matrix.
                TRANSFORM
        };
+       int interpolation;
+       enum {
+               AF_DEFAULT,
+               AF_NEAREST,
+               AF_LINEAR,
+               AF_CUBIC,
+               AF_MODES
+       };
 
 // arbitrary matrix
        AffineMatrix matrix;