OpenToonz - An open-source full-featured 2D animation creation software
C
Fix palette loss when caching images
manongjohnfe92dec421e0
diff --git a/toonz/sources/common/tcache/timagecache.cpp b/toonz/sources/common/tcache/timagecache.cppindex 9320a52dd..9b93c4fe8 100644--- a/toonz/sources/common/tcache/timagecache.cpp+++ b/toonz/sources/common/tcache/timagecache.cpp@@ -31,6 +31,7 @@#include "tsystem.h"#include "traster.h"+#include "tpalette.h"//#include "tstopwatch.h"#include "tbigmemorymanager.h"@@ -95,14 +96,16 @@ public:: m_cantCompress(false), m_builder(0), m_imageInfo(0)- , m_modified(false) {}+ , m_modified(false)+ , m_palette(0) {}- CacheItem(ImageBuilder *builder, ImageInfo *imageInfo)+ CacheItem(ImageBuilder *builder, ImageInfo *imageInfo, TPalette *palette): m_cantCompress(false), m_builder(builder), m_imageInfo(imageInfo), m_historyCount(0)- , m_modified(false) {}+ , m_modified(false)+ , m_palette(palette) {}virtual ~CacheItem() {}@@ -117,6 +120,7 @@ public:std::string m_id;TUINT32 m_historyCount;bool m_modified;+ TPalette *m_palette;};#ifdef _WIN32@@ -144,7 +148,8 @@ class ImageBuilder {public:virtual ~ImageBuilder() {}virtual ImageBuilder *clone() = 0;- virtual TImageP build(ImageInfo *info, const TRasterP &ras) = 0;+ virtual TImageP build(ImageInfo *info, const TRasterP &ras,+ TPalette *palette) = 0;};//------------------------------------------------------------------------------@@ -244,10 +249,12 @@ class RasterImageBuilder final : public ImageBuilder {public:ImageBuilder *clone() override { return new RasterImageBuilder(*this); }- TImageP build(ImageInfo *info, const TRasterP &ras) override;+ TImageP build(ImageInfo *info, const TRasterP &ras,+ TPalette *palette) override;};-TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras) {+TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras,+ TPalette *palette) {RasterImageInfo *riInfo = dynamic_cast<RasterImageInfo *>(info);assert(riInfo);@@ -257,6 +264,7 @@ TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras) {ras->m_cashed = true;#endifri->setRaster(ras);+ ri->setPalette(palette);riInfo->setInfo(ri);assert(ras->getRefCount() > rcount);return ri;@@ -270,10 +278,12 @@ class ToonzImageBuilder final : public ImageBuilder {public:ImageBuilder *clone() override { return new ToonzImageBuilder(*this); }- TImageP build(ImageInfo *info, const TRasterP &ras) override;+ TImageP build(ImageInfo *info, const TRasterP &ras,+ TPalette *palette) override;};-TImageP ToonzImageBuilder::build(ImageInfo *info, const TRasterP &ras) {+TImageP ToonzImageBuilder::build(ImageInfo *info, const TRasterP &ras,+ TPalette *palette) {ToonzImageInfo *tiInfo = dynamic_cast<ToonzImageInfo *>(info);assert(tiInfo);@@ -298,6 +308,7 @@ TImageP ToonzImageBuilder::build(ImageInfo *info, const TRasterP &ras) {imgRasCM32->m_cashed = true;#endifTToonzImageP ti = new TToonzImage(imgRasCM32, tiInfo->m_savebox);+ ti->setPalette(palette);tiInfo->setInfo(ti);return ti;}@@ -373,7 +384,8 @@ public:CompressedOnMemoryCacheItem(const TImageP &img);CompressedOnMemoryCacheItem(const TRasterP &compressedRas,- ImageBuilder *builder, ImageInfo *info);+ ImageBuilder *builder, ImageInfo *info,+ TPalette *palette);~CompressedOnMemoryCacheItem();@@ -402,6 +414,7 @@ CompressedOnMemoryCacheItem::CompressedOnMemoryCacheItem(const TImageP &img)TINT32 buffSize = 0;m_compressedRas =TheCodec::instance()->compress(ri->getRaster(), 1, buffSize);+ m_palette = img->getPalette();}#ifndef TNZCORE_LIGHTelse {@@ -412,6 +425,7 @@ CompressedOnMemoryCacheItem::CompressedOnMemoryCacheItem(const TImageP &img)TRasterCM32P rasCM32 = ti->getRaster();TINT32 buffSize = 0;m_compressedRas = TheCodec::instance()->compress(rasCM32, 1, buffSize);+ m_palette = ti->getPalette();} elseassert(false);}@@ -425,8 +439,9 @@ CompressedOnMemoryCacheItem::CompressedOnMemoryCacheItem(const TImageP &img)CompressedOnMemoryCacheItem::CompressedOnMemoryCacheItem(const TRasterP &ras,ImageBuilder *builder,- ImageInfo *info)- : CacheItem(builder, info), m_compressedRas(ras) {}+ ImageInfo *info,+ TPalette *palette)+ : CacheItem(builder, info, palette), m_compressedRas(ras) {}//------------------------------------------------------------------------------@@ -458,10 +473,10 @@ TImageP CompressedOnMemoryCacheItem::getImage() const {#ifndef TNZCORE_LIGHTToonzImageBuilder *tibuilder = dynamic_cast<ToonzImageBuilder *>(m_builder);if (tibuilder)- return tibuilder->build(m_imageInfo, ras);+ return tibuilder->build(m_imageInfo, ras, m_palette);else#endif- return m_builder->build(m_imageInfo, ras);+ return m_builder->build(m_imageInfo, ras, m_palette);}//------------------------------------------------------------------------------@@ -469,7 +484,8 @@ TImageP CompressedOnMemoryCacheItem::getImage() const {class CompressedOnDiskCacheItem final : public CacheItem {public:CompressedOnDiskCacheItem(const TFilePath &fp, const TRasterP &compressedRas,- ImageBuilder *builder, ImageInfo *info);+ ImageBuilder *builder, ImageInfo *info,+ TPalette *palette);~CompressedOnDiskCacheItem();@@ -490,8 +506,8 @@ typedef TDerivedSmartPointerT<CompressedOnDiskCacheItem, CacheItem>CompressedOnDiskCacheItem::CompressedOnDiskCacheItem(const TFilePath &fp, const TRasterP &compressedRas, ImageBuilder *builder,- ImageInfo *info)- : CacheItem(builder, info), m_fp(fp) {+ ImageInfo *info, TPalette *palette)+ : CacheItem(builder, info, palette), m_fp(fp) {compressedRas->lock();Tofstream oss(m_fp);@@ -524,7 +540,7 @@ TImageP CompressedOnDiskCacheItem::getImage() const {assert(!is.fail());ras->unlock();CompressedOnMemoryCacheItem item(ras, m_builder->clone(),- m_imageInfo->clone());+ m_imageInfo->clone(), m_palette);return item.getImage();}@@ -534,7 +550,8 @@ class UncompressedOnDiskCacheItem final : public CacheItem {int m_pixelsize;public:- UncompressedOnDiskCacheItem(const TFilePath &fp, const TImageP &img);+ UncompressedOnDiskCacheItem(const TFilePath &fp, const TImageP &img,+ TPalette *palette);~UncompressedOnDiskCacheItem();@@ -555,14 +572,16 @@ typedef TDerivedSmartPointerT<UncompressedOnDiskCacheItem, CacheItem>//------------------------------------------------------------------------------UncompressedOnDiskCacheItem::UncompressedOnDiskCacheItem(const TFilePath &fp,- const TImageP &image)- : CacheItem(0, 0), m_fp(fp) {+ const TImageP &image,+ TPalette *palette)+ : CacheItem(0, 0, 0), m_fp(fp) {TRasterImageP ri = image;TRasterP ras;if (ri) {m_imageInfo = new RasterImageInfo(ri);ras = ri->getRaster();+ m_palette = palette;}#ifndef TNZCORE_LIGHTelse {@@ -570,6 +589,7 @@ UncompressedOnDiskCacheItem::UncompressedOnDiskCacheItem(const TFilePath &fp,if (ti) {m_imageInfo = new ToonzImageInfo(ti);ras = ti->getRaster();+ m_palette = palette;} elseassert(false);}@@ -644,7 +664,7 @@ TImageP UncompressedOnDiskCacheItem::getImage() const {ras->m_cashed = true;#endif- return RasterImageBuilder().build(m_imageInfo, ras);+ return RasterImageBuilder().build(m_imageInfo, ras, m_palette);}#ifndef TNZCORE_LIGHTelse {@@ -659,7 +679,7 @@ TImageP UncompressedOnDiskCacheItem::getImage() const {ras->m_cashed = true;#endif- return ToonzImageBuilder().build(m_imageInfo, ras);+ return ToonzImageBuilder().build(m_imageInfo, ras, m_palette);} else {assert(false);return 0;@@ -833,7 +853,8 @@ void TImageCache::Imp::doCompress() {assert(m_rootDir != TFilePath());TFilePath fp =m_rootDir + TFilePath(std::to_string(TImageCache::Imp::m_fileid++));- newItem = new UncompressedOnDiskCacheItem(fp, item->getImage());+ newItem = new UncompressedOnDiskCacheItem(+ fp, item->getImage(), item->getImage()->getPalette());}m_compressedItems[id] = newItem;item = CacheItemP();@@ -865,7 +886,7 @@ void TImageCache::Imp::doCompress() {CacheItemP newItem = new CompressedOnDiskCacheItem(fp, citem->m_compressedRas, citem->m_builder->clone(),- citem->m_imageInfo->clone());+ citem->m_imageInfo->clone(), citem->m_palette);itc->second = 0;m_compressedItems[itc->first] = newItem;@@ -924,7 +945,8 @@ void TImageCache::Imp::doCompress(std::string id) {assert(m_rootDir != TFilePath());TFilePath fp =m_rootDir + TFilePath(std::to_string(TImageCache::Imp::m_fileid++));- newItem = new UncompressedOnDiskCacheItem(fp, item->getImage());+ newItem = new UncompressedOnDiskCacheItem(fp, item->getImage(),+ item->getImage()->getPalette());}m_compressedItems[id] = newItem;item = CacheItemP();@@ -1005,7 +1027,8 @@ UCHAR *TImageCache::Imp::compressAndMalloc(TUINT32 size) {assert(m_rootDir != TFilePath());TFilePath fp =m_rootDir + TFilePath(std::to_string(TImageCache::Imp::m_fileid++));- newItem = new UncompressedOnDiskCacheItem(fp, item->getImage());+ newItem = new UncompressedOnDiskCacheItem(fp, item->getImage(),+ item->getImage()->getPalette());// }m_compressedItems[it->first] = newItem;@@ -1042,7 +1065,7 @@ UCHAR *TImageCache::Imp::compressAndMalloc(TUINT32 size) {CacheItemP newItem = new CompressedOnDiskCacheItem(fp, citem->m_compressedRas, citem->m_builder->clone(),- citem->m_imageInfo->clone());+ citem->m_imageInfo->clone(), citem->m_palette);itc->second = 0;m_compressedItems[itc->first] = newItem;