X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Faffine.C;h=2842e062c1c991906f9ea0bfde745ae7e183e3e1;hb=22c6251d37911a11e322bf7518e6a992ea0bb6c7;hp=a59d6e3ee9997372f5b9c4eede18f44ac0d96a17;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/affine.C b/cinelerra-5.1/cinelerra/affine.C
index a59d6e3e..2842e062 100644
--- a/cinelerra-5.1/cinelerra/affine.C
+++ b/cinelerra-5.1/cinelerra/affine.C
@@ -242,8 +242,8 @@ void AffineUnit::process_package(LoadPackage *package)
 	AffinePackage *pkg = (AffinePackage*)package;
 	int min_in_x = server->in_x;
 	int min_in_y = server->in_y;
-	int max_in_x = server->in_x + server->in_w - 1;
-	int max_in_y = server->in_y + server->in_h - 1;
+	int max_in_x = server->in_x + server->in_w;
+	int max_in_y = server->in_y + server->in_h;
 
 
 // printf("AffineUnit::process_package %d %d %d %d %d\n",
@@ -690,7 +690,7 @@ AffineEngine::AffineEngine(int total_clients, int total_packages)
 
 void AffineEngine::init_packages()
 {
-	int y1 = 0, npkgs = get_total_packages();
+	int y1 = out_y, npkgs = get_total_packages();
 	for( int i=0; i<npkgs; ) {
 		AffinePackage *package = (AffinePackage*)get_package(i);
 		int y2 = out_y + (out_h * ++i / npkgs);
@@ -811,10 +811,10 @@ void AffineEngine::rotate(VFrame *output,
 
 // All subscripts are clockwise around the quadrangle
 	angle = angle * 2 * M_PI / 360;
-	double angle1 = atan((double)(in_pivot_y - in_y) / (double)(in_pivot_x - in_x)) + angle;
-	double angle2 = atan((double)(in_x + in_w - in_pivot_x) / (double)(in_pivot_y - in_y)) + angle;
-	double angle3 = atan((double)(in_y + in_h - in_pivot_y) / (double)(in_x + in_w - in_pivot_x)) + angle;
-	double angle4 = atan((double)(in_pivot_x - in_x) / (double)(in_y + in_h - in_pivot_y)) + angle;
+	double angle1 = atan2((double)(in_pivot_y - in_y), (double)(in_pivot_x - in_x)) + angle;
+	double angle2 = atan2((double)(in_x + in_w - in_pivot_x), (double)(in_pivot_y - in_y)) + angle;
+	double angle3 = atan2((double)(in_y + in_h - in_pivot_y), (double)(in_x + in_w - in_pivot_x)) + angle;
+	double angle4 = atan2((double)(in_pivot_x - in_x), (double)(in_y + in_h - in_pivot_y)) + angle;
 	double radius1 = DISTANCE(in_x, in_y, in_pivot_x, in_pivot_y);
 	double radius2 = DISTANCE(in_x + in_w, in_y, in_pivot_x, in_pivot_y);
 	double radius3 = DISTANCE(in_x + in_w, in_y + in_h, in_pivot_x, in_pivot_y);