From 876ca8276d8e0df8502b72a7f981208a0b6e9d03 Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki <keisuke_ogaki@dwango.co.jp> Date: Jun 02 2016 07:13:45 +0000 Subject: fit to enable to compile 32bit modules --- diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index 0805d76..a5a1125 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -1,9 +1,9 @@ -#ifdef __LP64__ - #include "tiio_psd.h" #include "trasterimage.h" #include "timageinfo.h" +#ifdef __LP64__ #include "toonz/preferences.h" +#endif #include <QtCore> @@ -42,7 +42,11 @@ TLevelReaderPsd::TLevelReaderPsd(const TFilePath &path) #ifdef REF_LAYER_BY_NAME if (layerStr != "frames") { + #ifdef __LP64__ QTextCodec* layerNameCodec = QTextCodec::codecForName( Preferences::instance()->getLayerNameEncoding().c_str() ); + #else + QTextCodec* layerNameCodec = QTextCodec::codecForName( "SJIS" ); + #endif TPSDParser psdparser(m_path); m_layerId = psdparser.getLevelIdByName(layerNameCodec->fromUnicode(layerStr).toStdString()); } else @@ -217,4 +221,3 @@ TImageWriterP TLevelWriterPsd::getFrameWriter(TFrameId fid) TImageWriterPsd *iwm = new TImageWriterPsd(m_path, layerId, this); return TImageWriterP(iwm); } -#endif