razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix "Lempel-Ziv & Welch encoding" so that the tnz scene can be loaded into other programs

Browse source
This commit is contained in:
Михалыч 2020-11-22 21:46:58 +05:00 committed by manongjohn
parent 0f3cccb8f2
commit be4d0ba3e0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/image/tif/tiio_tif.cpp
View file

@ -902,7 +902,7 @@ void TifWriter::open(FILE *file, const TImageInfo &info) {
std::wstring compressionType = std::wstring compressionType =
((TEnumProperty *)(m_properties->getProperty("Compression Type"))) ((TEnumProperty *)(m_properties->getProperty("Compression Type")))
->getValue(); ->getValue();
if (compressionType == TNZ_INFO_COMPRESS_LZW) if (compressionType == TNZ_INFO_COMPRESS_LZW || compressionType == TNZ_INFO_COMPRESS_LZW_LEG)
TIFFSetField(m_tiff, TIFFTAG_COMPRESSION, COMPRESSION_LZW); TIFFSetField(m_tiff, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
else if (compressionType == TNZ_INFO_COMPRESS_PACKBITS) else if (compressionType == TNZ_INFO_COMPRESS_PACKBITS)
TIFFSetField(m_tiff, TIFFTAG_COMPRESSION, COMPRESSION_PACKBITS); TIFFSetField(m_tiff, TIFFTAG_COMPRESSION, COMPRESSION_PACKBITS);

3
toonz/sources/image/tif/tiio_tif.h
View file

@ -14,7 +14,8 @@
#define TNZ_INFO_COMPRESS_CCITTRLE L"CCITT modified Huffman Run-length encoding" #define TNZ_INFO_COMPRESS_CCITTRLE L"CCITT modified Huffman Run-length encoding"
#define TNZ_INFO_COMPRESS_CCITTFAX3 L"CCITT Group 3 fax encoding" #define TNZ_INFO_COMPRESS_CCITTFAX3 L"CCITT Group 3 fax encoding"
#define TNZ_INFO_COMPRESS_CCITTFAX4 L"CCITT Group 4 fax encoding" #define TNZ_INFO_COMPRESS_CCITTFAX4 L"CCITT Group 4 fax encoding"
#define TNZ_INFO_COMPRESS_LZW L"Lempel-Ziv & Welch encoding" #define TNZ_INFO_COMPRESS_LZW L"Lempel-Ziv and Welch encoding"
#define TNZ_INFO_COMPRESS_LZW_LEG L"Lempel-Ziv & Welch encoding"
#define TNZ_INFO_COMPRESS_PACKBITS L"Macintosh Run-length encoding" #define TNZ_INFO_COMPRESS_PACKBITS L"Macintosh Run-length encoding"
#define TNZ_INFO_COMPRESS_THUNDERSCAN L"ThunderScan Run-length encoding" #define TNZ_INFO_COMPRESS_THUNDERSCAN L"ThunderScan Run-length encoding"
#define TNZ_INFO_COMPRESS_RLE L"Run-length compression" #define TNZ_INFO_COMPRESS_RLE L"Run-length compression"