From 832472030850e59c1023875346bb97c8e6ce2a4a Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Thu, 2 Jun 2016 15:20:56 +0900 Subject: [PATCH 1/3] bugfix: less 32bit dependencies --- toonz/sources/image/CMakeLists.txt | 6 +++++- toonz/sources/image/psd/tiio_psd.cpp | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt index 2bac510a..f73ec7df 100644 --- a/toonz/sources/image/CMakeLists.txt +++ b/toonz/sources/image/CMakeLists.txt @@ -85,7 +85,11 @@ if(WIN32) endif() endif() -_find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib") +if(PLATFORM EQUAL 32) + _find_toonz_library(TNZLIBS "tnzcore;tnzbase") +else() + _find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib") +endif() if(WIN32) set(EXTRA_LIBS diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index 3521f8a6..0805d767 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -1,3 +1,5 @@ +#ifdef __LP64__ + #include "tiio_psd.h" #include "trasterimage.h" #include "timageinfo.h" @@ -215,3 +217,4 @@ TImageWriterP TLevelWriterPsd::getFrameWriter(TFrameId fid) TImageWriterPsd *iwm = new TImageWriterPsd(m_path, layerId, this); return TImageWriterP(iwm); } +#endif From 876ca8276d8e0df8502b72a7f981208a0b6e9d03 Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Thu, 2 Jun 2016 16:13:45 +0900 Subject: [PATCH 2/3] fit to enable to compile 32bit modules --- toonz/sources/image/psd/tiio_psd.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index 0805d767..a5a11254 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 @@ -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 From e6172ddf267b1578c95593fd63f4c8df3f52b49d Mon Sep 17 00:00:00 2001 From: Keisuke Ogaki Date: Thu, 2 Jun 2016 19:28:29 +0900 Subject: [PATCH 3/3] x64 or LP64 --- toonz/sources/image/psd/tiio_psd.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index a5a11254..1d0e064e 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -1,11 +1,10 @@ #include "tiio_psd.h" #include "trasterimage.h" #include "timageinfo.h" -#ifdef __LP64__ +#if (defined(x64) || defined(__LP64__)) #include "toonz/preferences.h" -#endif - #include +#endif // forward declaration //class TImageReaderLayerPsd; @@ -41,16 +40,15 @@ TLevelReaderPsd::TLevelReaderPsd(const TFilePath &path) const QString &layerStr = list.at(1); #ifdef REF_LAYER_BY_NAME + #if (defined(x64) || defined(__LP64__)) 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 + } else { m_layerId = layerStr.toInt(); + } + #endif #else m_layerId = layerName.toInt(); #endif