projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
youtube formats, make race conditions, capture colormodel for ffmpeg
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
filetiff.C
diff --git
a/cinelerra-5.1/cinelerra/filetiff.C
b/cinelerra-5.1/cinelerra/filetiff.C
index ae0c276c3b93dbe205d2d5be8121d259ad969f97..994fd6d0a8e7b995af97532a8ecc53b4a4620a43 100644
(file)
--- a/
cinelerra-5.1/cinelerra/filetiff.C
+++ b/
cinelerra-5.1/cinelerra/filetiff.C
@@
-74,6
+74,10
@@
int FileTIFF::check_sig(Asset *asset)
if(test[0] == 'I' && test[1] == 'I')
{
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
return 1;
}
else
@@
-198,7
+202,7
@@
int FileTIFF::read_frame_header(char *path)
//printf("FileTIFF::read_frame_header %d %d %d\n", bitspersample, components, asset->tiff_cmodel);
TIFFClose(stream);
//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;
}
return result;
}
@@
-508,12
+512,8
@@
int FileTIFF::write_frame(VFrame *frame, VFrame *data, FrameWriterUnit *unit)
}
if(!tiff_unit->temp)
{
}
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(),
}
BC_CModels::transfer(tiff_unit->temp->get_rows(),
@@
-585,7
+585,7
@@
FileTIFFUnit::~FileTIFFUnit()
TIFFConfigVideo::TIFFConfigVideo(BC_WindowBase *parent_window, Asset *asset)
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,
parent_window->get_abs_cursor_x(1),
parent_window->get_abs_cursor_y(1),
400,
@@
-604,12
+604,12
@@
void TIFFConfigVideo::create_objects()
lock_window("TIFFConfigVideo::create_objects()");
int x = 10, y = 10;
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;
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();
TIFFCompression *menu2;
add_subwindow(menu2 = new TIFFCompression(this, x + 150, y, 200));
menu2->create_objects();