From fe7dd3b14f8934849f3f587edacfeebff3a90f5e Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: Mon, 18 Apr 2016 22:59:56 +0900 Subject: [PATCH] fix convert image bug --- toonz/sources/common/tstream/tstream.cpp | 2 +- toonz/sources/toonzlib/convert2tlv.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toonz/sources/common/tstream/tstream.cpp b/toonz/sources/common/tstream/tstream.cpp index d677eaee..ac70b7f4 100644 --- a/toonz/sources/common/tstream/tstream.cpp +++ b/toonz/sources/common/tstream/tstream.cpp @@ -260,7 +260,7 @@ TOStream::TOStream(const TFilePath &fp, bool compressed) TOStream::TOStream(std::shared_ptr imp) : m_imp(std::move(imp)) { - assert(!imp->m_tagStack.empty()); + assert(!m_imp->m_tagStack.empty()); ostream &os = *m_imp->m_os; if (m_imp->m_justStarted == false) cr(); diff --git a/toonz/sources/toonzlib/convert2tlv.cpp b/toonz/sources/toonzlib/convert2tlv.cpp index 9755dcc7..25b9758e 100644 --- a/toonz/sources/toonzlib/convert2tlv.cpp +++ b/toonz/sources/toonzlib/convert2tlv.cpp @@ -344,8 +344,8 @@ void Convert2Tlv::buildInksForNAAImage(TRasterCM32P &rout, const TRaster32P &rin for (j = 0; j < rin->getLx(); j++, pixin++, pixout++) { TPixel colorIn; - /*-白ピクセルを透明として扱う-*/ - if (*pixin == TPixel(255, 255, 255)) { + /*- treat white/transparent pixels as transparent -*/ + if (*pixin == TPixel(255, 255, 255) || *pixin == TPixel::Transparent) { *pixout = TPixelCM32(0, 0, 255); continue; }