X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fvframe.C;h=fdd24ce02a35f85e8a6b46552961c9272a203057;hb=61d95f04b83c2f7f1fa6b44ff64ed9c83a7d8abb;hp=25dd05eca6fd90334899ebe46a6024535e8bbe66;hpb=17e433a6e5021cc080101fd88ac3236dacb9f2e8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/vframe.C b/cinelerra-5.1/guicast/vframe.C
index 25dd05ec..fdd24ce0 100644
--- a/cinelerra-5.1/guicast/vframe.C
+++ b/cinelerra-5.1/guicast/vframe.C
@@ -304,6 +304,11 @@ int VFrame::clear_objects(int do_opengl)
 		pbuffer = 0;
 	}
 
+#ifdef LEAKER
+if( memory_type != VFrame::SHARED )
+  printf("==del %p from %p\n", data, __builtin_return_address(0));
+#endif
+
 // Delete data
 	switch(memory_type)
 	{
@@ -522,6 +527,9 @@ int VFrame::allocate_data(unsigned char *data, int shmid,
 
 		if(!this->data)
 			printf("VFrame::allocate_data %dx%d: memory exhausted.\n", this->w, this->h);
+#ifdef LEAKER
+printf("==new %p from %p sz %d\n", this->data, __builtin_return_address(0), size);
+#endif
 
 //printf("VFrame::allocate_data %d %p data=%p %d %d\n", __LINE__, this, this->data, this->w, this->h);
 //if(size > 1000000) printf("VFrame::allocate_data %d\n", size);
@@ -930,12 +938,9 @@ int VFrame::clear_frame()
 void VFrame::rotate90()
 {
 // Allocate new frame
-	int new_w = h, new_h = w, new_bytes_per_line = bytes_per_pixel * new_w;
-	unsigned char *new_data = new unsigned char[calculate_data_size(new_w, new_h, new_bytes_per_line, color_model)];
-	unsigned char **new_rows = new unsigned char*[new_h];
-	for(int i = 0; i < new_h; i++)
-		new_rows[i] = &new_data[new_bytes_per_line * i];
-
+	int new_w = h, new_h = w;
+	VFrame new_frame(new_w, new_h, color_model);
+	unsigned char **new_rows = new_frame.get_rows();
 // Copy data
 	for(int in_y = 0, out_x = new_w - 1; in_y < h; in_y++, out_x--)
 	{
@@ -950,23 +955,34 @@ void VFrame::rotate90()
 	}
 
 // Swap frames
-	clear_objects(0);
+// swap memory
+	unsigned char *new_data = new_frame.data;
+	new_frame.data = data;
 	data = new_data;
+// swap rows
+	new_rows = new_frame.rows;
+	new_frame.rows = rows;
 	rows = new_rows;
-	bytes_per_line = new_bytes_per_line;
-	w = new_w;
-	h = new_h;
+// swap shmid
+	int new_shmid = new_frame.shmid;
+	new_frame.shmid = shmid;
+	shmid = new_shmid;
+// swap bytes_per_line
+	int new_bpl = new_frame.bytes_per_line;
+	new_frame.bytes_per_line = bytes_per_line;
+	bytes_per_line = new_bpl;
+	new_frame.clear_objects(0);
+
+	w = new_frame.w;
+	h = new_frame.h;
 }
 
 void VFrame::rotate270()
 {
 // Allocate new frame
-	int new_w = h, new_h = w, new_bytes_per_line = bytes_per_pixel * new_w;
-	unsigned char *new_data = new unsigned char[calculate_data_size(new_w, new_h, new_bytes_per_line, color_model)];
-	unsigned char **new_rows = new unsigned char*[new_h];
-	for(int i = 0; i < new_h; i++)
-		new_rows[i] = &new_data[new_bytes_per_line * i];
-
+	int new_w = h, new_h = w;
+	VFrame new_frame(new_w, new_h, color_model);
+	unsigned char **new_rows = new_frame.get_rows();
 // Copy data
 	for(int in_y = 0, out_x = 0; in_y < h; in_y++, out_x++)
 	{
@@ -981,12 +997,26 @@ void VFrame::rotate270()
 	}
 
 // Swap frames
-	clear_objects(0);
+// swap memory
+	unsigned char *new_data = new_frame.data;
+	new_frame.data = data;
 	data = new_data;
+// swap rows
+	new_rows = new_frame.rows;
+	new_frame.rows = rows;
 	rows = new_rows;
-	bytes_per_line = new_bytes_per_line;
-	w = new_w;
-	h = new_h;
+// swap shmid
+	int new_shmid = new_frame.shmid;
+	new_frame.shmid = shmid;
+	shmid = new_shmid;
+// swap bytes_per_line
+	int new_bpl = new_frame.bytes_per_line;
+	new_frame.bytes_per_line = bytes_per_line;
+	bytes_per_line = new_bpl;
+	new_frame.clear_objects(0);
+
+	w = new_frame.w;
+	h = new_frame.h;
 }
 
 void VFrame::flip_vert()