X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffiletiff.C;h=fb1449f1c7b4d7b9e5eeeca73f535af86321e1b4;hb=d60a59baa6cfe24c0fb153ed9e150a834ba29feb;hp=ae0c276c3b93dbe205d2d5be8121d259ad969f97;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filetiff.C b/cinelerra-5.1/cinelerra/filetiff.C
index ae0c276c..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
@@ -198,7 +200,7 @@ int FileTIFF::read_frame_header(char *path)
 //printf("FileTIFF::read_frame_header %d %d %d\n", bitspersample, components, asset->tiff_cmodel);
 	TIFFClose(stream);
 
-	asset->interlace_mode = BC_ILACE_MODE_NOTINTERLACED;
+	asset->interlace_mode = ILACE_MODE_NOTINTERLACED;
 	return result;
 }
 
@@ -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(),
@@ -585,7 +583,7 @@ FileTIFFUnit::~FileTIFFUnit()
 
 
 TIFFConfigVideo::TIFFConfigVideo(BC_WindowBase *parent_window, Asset *asset)
- : BC_Window(PROGRAM_NAME ": Video Compression",
+ : BC_Window(_(PROGRAM_NAME ": Video Compression"),
  	parent_window->get_abs_cursor_x(1),
  	parent_window->get_abs_cursor_y(1),
 	400,
@@ -601,15 +599,15 @@ 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:"));
+	add_subwindow(new BC_Title(x, y, _("Colorspace:")));
 	TIFFColorspace *menu1;
 	add_subwindow(menu1 = new TIFFColorspace(this, x + 150, y, 200));
 	menu1->create_objects();
 	y += 40;
-	add_subwindow(new BC_Title(x, y, "Compression:"));
+	add_subwindow(new BC_Title(x, y, _("Compression:")));
 	TIFFCompression *menu2;
 	add_subwindow(menu2 = new TIFFCompression(this, x + 150, y, 200));
 	menu2->create_objects();