projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interp bilinear fix
[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 c5f3f7a6c7197251c537a901dd02542d07f364a7..b7891ac7ad1f5ec1a757774938376f3160600e9b 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;
}