X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffiletiff.C;h=fb1449f1c7b4d7b9e5eeeca73f535af86321e1b4;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=7a2f393bccf434ba3138f9c13d7d01440b5ad4f4;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filetiff.C b/cinelerra-5.1/cinelerra/filetiff.C
index 7a2f393b..fb1449f1 100644
--- a/cinelerra-5.1/cinelerra/filetiff.C
+++ b/cinelerra-5.1/cinelerra/filetiff.C
@@ -46,10 +46,8 @@ FileTIFF::~FileTIFF()
 
 
 void FileTIFF::get_parameters(BC_WindowBase *parent_window,
-	Asset *asset,
-	BC_WindowBase* &format_window,
-	int audio_options,
-	int video_options)
+	Asset *asset, BC_WindowBase* &format_window,
+	int audio_options, int video_options, EDL *edl)
 {
 	if(video_options)
 	{
@@ -74,6 +72,10 @@ int FileTIFF::check_sig(Asset *asset)
 
 		if(test[0] == 'I' && test[1] == 'I')
 		{
+			// Reject cr2, libtiff fails with it
+			if( test[4] == 0x10 && !test[5] && !test[6] && !test[7] &&
+					test[8] == 'C' && test[9] == 'R' )
+				return 0;
 			return 1;
 		}
 		else
@@ -508,12 +510,8 @@ int FileTIFF::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
 		}
 		if(!tiff_unit->temp)
 		{
-			tiff_unit->temp = new VFrame(0,
-				-1,
-				asset->width,
-				asset->height,
-				color_model,
-				-1);
+			tiff_unit->temp =
+				new VFrame(asset->width, asset->height, color_model, 0);
 		}
 
 		BC_CModels::transfer(tiff_unit->temp->get_rows(),
@@ -601,7 +599,7 @@ TIFFConfigVideo::~TIFFConfigVideo()
 
 void TIFFConfigVideo::create_objects()
 {
-	lock_window("TIFFConfigVideo::create_objects()");
+	lock_window("TIFFConfigVideo::create_objects");
 	int x = 10, y = 10;
 
 	add_subwindow(new BC_Title(x, y, _("Colorspace:")));