load files search box, avoid segv in get_prev_keyframe, fix titles only handles,...

[goodguy/history.git] / cinelerra-5.1 / plugins / moveobj / moveobj.C

diff --git a/cinelerra-5.1/plugins/moveobj/moveobj.C b/cinelerra-5.1/plugins/moveobj/moveobj.C
index 4f5fd0fd36dcf0b6fad250308a466606cd251e6c..77a80a3bbd59f8cbeb6ae77de38f115e75a0f6b9 100644 (file)
--- a/cinelerra-5.1/plugins/moveobj/moveobj.C
+++ b/cinelerra-5.1/plugins/moveobj/moveobj.C
@@ -255,7 +255,7 @@ int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
        goodFeaturesToTrack(next_mat,
                *next_corners, corner_count, 0.01,        // quality_level
                min_distance, noArray(), block_size,
-               0,           // use_harris
+               false,       // use_harris
                0.04);       // k
 
        ptV pt1, pt2;
@@ -334,7 +334,7 @@ int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
 // interpolate with identity matrix
                accum_matrix = w0*identity + w1*accum_matrix;
 
-               AffineMatrix matrix;
+               AffineMatrix &matrix = affine->matrix;
                for( int i=0,k=0; i<3; ++i )
                        for( int j=0; j<3; ++j )
                                matrix.values[i][j] = amat[k++];
@@ -342,7 +342,6 @@ int MoveObj::process_buffer(VFrame *frame, int64_t start_position, double frame_
 //printf("MoveObj::process_buffer %d %jd matrix=\n", __LINE__, start_position);
 //matrix.dump();
 
-               affine->set_matrix(&matrix);
 // iframe is always temp, if we get here
                output->clear_frame();
                affine->process(output, iframe, 0, AffineEngine::TRANSFORM,