X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fmotion%2Fmotion.C;h=4661b144ebd9e7dcae0c89fb8dc2b08d9257756d;hb=a88121d876acc81c5a28dbd2cc71e7c6856e2ac0;hp=b1eb5b8e38b6e9550b8df0d364cbf0daa59b9d1e;hpb=e0fc7bf81ed20c8fb98de25151a8e3b6aaedc55a;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/motion/motion.C b/cinelerra-5.1/plugins/motion/motion.C
index b1eb5b8e..4661b144 100644
--- a/cinelerra-5.1/plugins/motion/motion.C
+++ b/cinelerra-5.1/plugins/motion/motion.C
@@ -364,7 +364,7 @@ void MotionMain::allocate_temp(int w, int h, int color_model)
 		temp_frame = 0;
 	}
 	if( !temp_frame )
-		temp_frame = new VFrame(w, h, color_model);
+		temp_frame = new VFrame(w, h, color_model, 0);
 }
 
 void MotionMain::process_global()
@@ -701,7 +701,7 @@ printf("MotionMain::process_buffer %d start_position=%jd\n", __LINE__, start_pos
 	    config.tracking_type == MotionScan::SAVE ) {
 		reset_cache_file();
 		char save_file[BCTEXTLEN];
-		sprintf(save_file,"%s.bak", config.tracking_file);
+		snprintf(save_file, sizeof(save_file), "%s.bak", config.tracking_file);
 #ifdef DEBUG
 printf("MotionMain::process_buffer 2 rename tracking file: %s to %s\n",
  config.tracking_file, save_file);
@@ -733,16 +733,16 @@ printf("MotionMain::process_buffer 2 rename tracking file: %s to %s\n",
 // The center of the search area is fixed in compensate mode or
 // the user value + the accumulation vector in track mode.
 		if( !prev_global_ref )
-			prev_global_ref = new VFrame(w, h, color_model);
+			prev_global_ref = new VFrame(w, h, color_model, 0);
 		if( !current_global_ref )
-			current_global_ref = new VFrame(w, h, color_model);
+			current_global_ref = new VFrame(w, h, color_model, 0);
 
 // Global loads the current target frame into the src and
 // writes it to the dst frame with desired translation.
 		if( !global_target_src )
-			global_target_src = new VFrame(w, h, color_model);
+			global_target_src = new VFrame(w, h, color_model, 0);
 		if( !global_target_dst )
-			global_target_dst = new VFrame(w, h, color_model);
+			global_target_dst = new VFrame(w, h, color_model, 0);
 
 // Load the global frames
 		if( need_reload ) {
@@ -762,10 +762,10 @@ printf("MotionMain::process_buffer 2 rename tracking file: %s to %s\n",
 // The center of the search area is always the user value + the accumulation
 // vector.
 			if( !prev_rotate_ref )
-				prev_rotate_ref = new VFrame(w, h, color_model);
+				prev_rotate_ref = new VFrame(w, h, color_model, 0);
 // The current global reference is the current rotation reference.
 			if( !current_rotate_ref )
-				current_rotate_ref = new VFrame(w, h, color_model);
+				current_rotate_ref = new VFrame(w, h, color_model, 0);
 			current_rotate_ref->copy_from(current_global_ref);
 
 // The global target destination is copied to the rotation target source
@@ -774,9 +774,9 @@ printf("MotionMain::process_buffer 2 rename tracking file: %s to %s\n",
 // if we're tracking.
 // The pivot is fixed to the user position if we're compensating.
 			if( !rotate_target_src )
-				rotate_target_src = new VFrame(w, h, color_model);
+				rotate_target_src = new VFrame(w, h, color_model, 0);
 			if( !rotate_target_dst )
-				rotate_target_dst = new VFrame(w, h, color_model);
+				rotate_target_dst = new VFrame(w, h, color_model, 0);
 		}
 	}
 // Rotation only
@@ -784,16 +784,16 @@ printf("MotionMain::process_buffer 2 rename tracking file: %s to %s\n",
 // Rotation reads the previous reference frame and compares it with current
 // reference frame.
 		if( !prev_rotate_ref )
-			prev_rotate_ref = new VFrame(w, h, color_model);
+			prev_rotate_ref = new VFrame(w, h, color_model, 0);
 		if( !current_rotate_ref )
-			current_rotate_ref = new VFrame(w, h, color_model);
+			current_rotate_ref = new VFrame(w, h, color_model, 0);
 
 // Rotation loads target frame to temporary, rotates it, and writes it to the
 // target frame.  The pivot is always fixed.
 		if( !rotate_target_src )
-			rotate_target_src = new VFrame(w, h, color_model);
+			rotate_target_src = new VFrame(w, h, color_model, 0);
 		if( !rotate_target_dst )
-			rotate_target_dst = new VFrame(w, h, color_model);
+			rotate_target_dst = new VFrame(w, h, color_model, 0);
 
 
 // Load the rotate frames
@@ -1181,7 +1181,7 @@ int MotionMain::put_cache_line(const char *line)
 	if( key == active_key ) return 1;
 	if( !active_fp ) {
 		close_cache_file();
-		sprintf(cache_file, "%s.bak", config.tracking_file);
+		snprintf(cache_file, sizeof(cache_file), "%s.bak", config.tracking_file);
 		::rename(config.tracking_file, cache_file);
 		if( !(active_fp = fopen(config.tracking_file, "w")) ) {
 			perror(config.tracking_file);
@@ -1255,12 +1255,11 @@ void RotateScanUnit::process_package(LoadPackage *package)
 
 		if( !rotater )
 			rotater = new AffineEngine(1, 1);
-		if( !temp ) temp = new VFrame(0,
-			-1,
-			server->previous_frame->get_w(),
-			server->previous_frame->get_h(),
-			color_model,
-			-1);
+		if( !temp )
+			temp = new VFrame(
+				server->previous_frame->get_w(),
+				server->previous_frame->get_h(),
+				color_model, 0);
 //printf("RotateScanUnit::process_package %d\n", __LINE__);