From e6172ddf267b1578c95593fd63f4c8df3f52b49d Mon Sep 17 00:00:00 2001
From: Keisuke Ogaki <keisuke_ogaki@dwango.co.jp>
Date: Jun 02 2016 10:28:29 +0000
Subject: x64 or LP64


---

diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp
index a5a1125..1d0e064 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 <QtCore>
+#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