razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

use _WIN32 instead of WIN32

Browse source
This commit is contained in:
Shinya Kitaoka 2016-04-15 14:11:23 +09:00
parent e78c895e35
commit 9f5a1bd760
234 changed files with 525 additions and 525 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/common/tapptools/tcolorutils.cpp
View file

@ -10,7 +10,7 @@
typedef float KEYER_FLOAT;
//------------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
#define ISNAN _isnan
#else
extern "C" int isnan(double);

6
toonz/sources/common/tapptools/tenv.cpp
View file

@ -69,7 +69,7 @@ public:
TFilePath getSystemVarPath(string varName)
{
#ifdef WIN32
#ifdef _WIN32
return m_registryRoot + varName;
#else
QString settingsPath = QString::fromStdString(getApplicationName()) + QString("_") +
@ -90,7 +90,7 @@ public:
string getSystemVarValue(string varName)
{
#ifdef WIN32
#ifdef _WIN32
return TSystem::getSystemValue(getSystemVarPath(varName)).toStdString();
#else
TFilePath systemVarPath = getSystemVarPath(varName);
@ -146,7 +146,7 @@ public:
m_applicationFullName = m_applicationName + " " + m_applicationVersion;
m_moduleName = m_applicationName;
m_rootVarName = toUpper(m_applicationName) + "ROOT";
#ifdef WIN32
#ifdef _WIN32
m_registryRoot = TFilePath("SOFTWARE\\OpenToonz\\") + m_applicationName + m_applicationVersion;
#endif
m_systemVarPrefix = m_applicationName;

2
toonz/sources/common/tapptools/ttimer.cpp
View file

@ -3,7 +3,7 @@
#include "ttimer.h"
#include "texception.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>

18
toonz/sources/common/tcache/timagecache.cpp
View file

@ -41,7 +41,7 @@
#include <deque>
#include <numeric>
#include <sstream>
#ifdef WIN32
#ifdef _WIN32
#include <crtdbg.h>
#endif
@ -121,7 +121,7 @@ public:
bool m_modified;
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<CacheItem>;
#endif
typedef TSmartPointerT<CacheItem> CacheItemP;
@ -368,7 +368,7 @@ public:
TImageP m_image;
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<UncompressedOnMemoryCacheItem>;
template class DVAPI TDerivedSmartPointerT<UncompressedOnMemoryCacheItem, CacheItem>;
#endif
@ -417,7 +417,7 @@ public:
TRasterP m_compressedRas;
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<CompressedOnMemoryCacheItem>;
template class DVAPI TDerivedSmartPointerT<CompressedOnMemoryCacheItem, CacheItem>;
#endif
@ -518,7 +518,7 @@ public:
TFilePath m_fp;
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<CompressedOnDiskCacheItem>;
template class DVAPI TDerivedSmartPointerT<CompressedOnDiskCacheItem, CacheItem>;
#endif
@ -587,7 +587,7 @@ public:
TFilePath m_fp;
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<UncompressedOnDiskCacheItem>;
template class DVAPI TDerivedSmartPointerT<UncompressedOnDiskCacheItem, CacheItem>;
#endif
@ -854,7 +854,7 @@ void TImageCache::Imp::doCompress()
}
string id = it->first;
#ifdef WIN32
#ifdef _WIN32
assert(itu->first == it->second->m_historyCount);
itu = m_itemHistory.erase(itu);
m_itemsByImagePointer.erase(getPointer(item->getImage()));
@ -939,7 +939,7 @@ void TImageCache::Imp::doCompress(string id)
return; // id not found: return
// delete itu from m_itemHistory
#ifdef WIN32
#ifdef _WIN32
assert(itu->first == it->second->m_historyCount);
itu = m_itemHistory.erase(itu);
m_itemsByImagePointer.erase(getPointer(item->getImage()));
@ -1044,7 +1044,7 @@ UCHAR *TImageCache::Imp::compressAndMalloc(TUINT32 size)
m_compressedItems[it->first] = newItem;
}
#ifdef WIN32
#ifdef _WIN32
assert(itu->first == it->second->m_historyCount);
itu = m_itemHistory.erase(itu);
m_itemsByImagePointer.erase(getPointer(item->getImage()));

2
toonz/sources/common/tcontenthistory.cpp
View file

@ -6,7 +6,7 @@
#include <QStringList>
#include <QProcess>
#include <QTextStream>
#ifdef WIN32
#ifdef _WIN32
#include <Windows.h>
#endif
#include <map>

20
toonz/sources/common/tcore/tstopwatch.cpp
View file

@ -17,7 +17,7 @@
#include <time.h>
#ifndef STW_TICKS_PER_SECOND
#ifndef WIN32
#ifndef _WIN32
extern "C" long sysconf(int);
#define STW_TICKS_PER_SECOND sysconf(_SC_CLK_TCK)
#else
@ -36,7 +36,7 @@ enum TimerType { TTUUnknown,
TTUTickCount };
static void determineTimer();
#ifdef WIN32
#ifdef _WIN32
static TimerType timerToUse = TTUUnknown;
@ -150,7 +150,7 @@ static void checkTime(START start, START_USER startUser, START_SYSTEM startSyste
{
assert(timerToUse == TTUTickCount);
#ifdef WIN32
#ifdef _WIN32
DWORD tm_stop;
FILETIME creationTime, exitTime, stopSystem, stopUser;
@ -166,7 +166,7 @@ static void checkTime(START start, START_USER startUser, START_SYSTEM startSyste
tmUser += FileTimeToInt64(&stopUser) - FileTimeToInt64(&startUser); //user elapsed time
tmSystem += FileTimeToInt64(&stopSystem) - FileTimeToInt64(&startSystem); //system elapsed time
#else //WIN32
#else // _WIN32
struct tms clk;
clock_t tm_stop;
@ -176,12 +176,12 @@ static void checkTime(START start, START_USER startUser, START_SYSTEM startSyste
tmUser += clk.tms_utime - startUser;
tmSystem += clk.tms_stime - startSystem;
#endif //WIN32
#endif // _WIN32
}
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
//
// come checkTime, ma usa i timer ad alta risoluzione
@ -255,7 +255,7 @@ void hrCheckTime(LARGE_INTEGER start, START_USER startUser, START_SYSTEM startSy
} //namespace
#endif //WIN32
#endif // _WIN32
//-----------------------------------------------------------
@ -264,7 +264,7 @@ void TStopWatch::stop()
if (!m_isRunning)
return;
m_isRunning = false;
#ifdef WIN32
#ifdef _WIN32
if (timerToUse == TTUTickCount)
checkTime(m_start, m_startUser, m_startSystem, m_tm, m_tmUser, m_tmSystem);
else
@ -283,7 +283,7 @@ void TStopWatch::getElapsedTime(TM_TOTAL &tm, TM_USER &user, TM_SYSTEM &system)
TM_USER cur_tmUser = 0;
TM_SYSTEM cur_tmSystem = 0;
#ifdef WIN32
#ifdef _WIN32
if (timerToUse == TTUTickCount)
checkTime(m_start, m_startUser, m_startSystem, cur_tm, cur_tmUser, cur_tmSystem);
else
@ -390,7 +390,7 @@ void TStopWatch::printGlobals()
}
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
void dummyFunction()
{

10
toonz/sources/common/tcore/tstring.cpp
View file

@ -8,7 +8,7 @@
#include <QString>
#endif
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#include "windows.h"
#endif
@ -206,7 +206,7 @@ wstring toWideString(double v, int p)
string toUpper(string a)
{
#ifdef WIN32
#ifdef _WIN32
return _strupr(const_cast<char *>(a.c_str()));
#else
string ret = a;
@ -218,7 +218,7 @@ string toUpper(string a)
string toLower(string a)
{
#ifdef WIN32
#ifdef _WIN32
return _strlwr(const_cast<char *>(a.c_str()));
#else
string ret = a;
@ -230,7 +230,7 @@ string toLower(string a)
wstring toUpper(wstring a)
{
#ifdef WIN32
#ifdef _WIN32
return _wcsupr(const_cast<wchar_t *>(a.c_str()));
#else
wstring ret;
@ -244,7 +244,7 @@ wstring toUpper(wstring a)
wstring toLower(wstring a)
{
#ifdef WIN32
#ifdef _WIN32
return _wcslwr(const_cast<wchar_t *>(a.c_str()));
#else
wstring ret;

2
toonz/sources/common/tfx/trenderer.cpp
View file

@ -369,7 +369,7 @@ public:
void quitWaitingLoops();
};
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TRendererImp>;
#endif

4
toonz/sources/common/tfx/ttzpimagefx.cpp
View file

@ -11,7 +11,7 @@
void parseIndexes(string indexes, vector<string> &items)
{
#ifdef WIN32
#ifdef _WIN32
char seps[] = " ,;";
char *token;
if (indexes == "all" || indexes == "All" || indexes == "ALL")
@ -39,7 +39,7 @@ void parseIndexes(string indexes, vector<string> &items)
void insertIndexes(vector<string> items, PaletteFilterFxRenderData *t)
{
#ifdef WIN32
#ifdef _WIN32
for (int i = 0; i < (int)items.size(); i++) {
char *starttoken, *endtoken;
char subseps[] = "-";

4
toonz/sources/common/tgl/tgl.cpp
View file

@ -9,7 +9,7 @@
#include "tcurves.h"
#ifndef __sgi
#ifdef WIN32
#ifdef _WIN32
#include <GL/glut.h>
#elif defined(LINUX)
#include <GL/glut.h>
@ -669,7 +669,7 @@ void tglBuildMipmaps(std::vector<TRaster32P> &rasters,
//-----------------------------------------------------------------------------
//Forse si potrebbe togliere l'ifdef ed usare QT
#if defined(WIN32)
#if defined(_WIN32)
TGlContext tglGetCurrentContext()
{

2
toonz/sources/common/tiio/bmp/filebmp.c
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif

2
toonz/sources/common/tiio/bmp/filebmp.h
View file

@ -7,7 +7,7 @@
extern "C" {
#endif
/*
#if defined(WIN32)
#if defined(_WIN32)
typedef struct {unsigned char b,g,r,m;} LPIXEL;
#elif defined(__sgi)
typedef struct { unsigned char m,b,g,r; } LPIXEL;

2
toonz/sources/common/tiio/compatibility/tfile_io.c
View file

@ -2,7 +2,7 @@
#include "tfile_io.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#include <assert.h>

6
toonz/sources/common/tiio/movsettings.cpp
View file

@ -13,8 +13,8 @@
// 32-bit version
//*******************************************************************************
#ifdef WIN32
#ifdef WIN32
#ifdef _WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif
@ -299,7 +299,7 @@ static Boolean QTCmpr_FilterProc
void openMovSettingsPopup(TPropertyGroup *props, bool macBringToFront)
{
#ifdef WIN32
#ifdef _WIN32
if (InitializeQTML(0) != noErr)
return;
#endif

4
toonz/sources/common/tiio/tiio.cpp
View file

@ -13,7 +13,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4786)
#include <io.h>
#endif
@ -205,7 +205,7 @@ void Tiio::defineWriterProperties(const char *ext, TPropertyGroup *prop)
}
/*
#ifdef WIN32
#ifdef _WIN32
int Tiio::openForReading(char *fn)
{
int fd = _open(fn, _O_BINARY|_O_RDONLY);

2
toonz/sources/common/tiio/tiio_bmp.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif

2
toonz/sources/common/tiio/tiio_jpg.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif
//#include "texception.h"

2
toonz/sources/common/tiio/tiio_jpg_util.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif

2
toonz/sources/common/timage_io/timage_io.cpp
View file

@ -16,7 +16,7 @@
#include <boost/range.hpp>
// OS-specific includes
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#include <io.h>
#endif

6
toonz/sources/common/tipc/tipc.cpp
View file

@ -13,7 +13,7 @@
#include <QTimer>
//System-specific includes
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#elif MACOSX
#include <sys/sysctl.h>
@ -270,7 +270,7 @@ QString tipc::applicationSpecificServerName(QString srvName)
bool tipc::startBackgroundProcess(QString cmdline)
{
#ifdef WIN32
#ifdef _WIN32
QProcess *proc = new QProcess;
proc->start(cmdline);
if (proc->state() == QProcess::NotRunning) {
@ -317,7 +317,7 @@ bool tipc::startSlaveServer(QString srvName, QString cmdline)
//Wait up to msecs until the socket is connecting. Wait a small amount of time
//until the server is up and listening to connection (there is no other way to tell).
while (dummySock->state() == QLocalSocket::UnconnectedState) {
#ifdef WIN32
#ifdef _WIN32
Sleep(10);
#else
usleep(10 << 10); //10.24 msecs

6
toonz/sources/common/traster/traster.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#ifndef UNICODE
#define UNICODE
#endif
@ -35,7 +35,7 @@ TRaster::TRaster(int lx, int ly, int pixelSize)
//m_buffer = new UCHAR[lx*ly*pixelSize];
if (!m_buffer) {
#ifdef WIN32
#ifdef _WIN32
static bool firstTime = true;
if (firstTime) {
firstTime = false;
@ -57,7 +57,7 @@ TRaster::TRaster(int lx, int ly, int pixelSize)
m_buffer = BigMemoryManager.getMemoryChunk(lx*ly*pixelSize, this);
//m_buffer = new UCHAR[lx*ly*pixelSize];
m_totalMemory += ((lx*ly*pixelSize)>>10);
#ifdef WIN32
#ifdef _WIN32
MessageBox( NULL, "Run out of contiguos phisical memory: please save all and restart toonz!", "Warning", MB_OK);
#endif
}*/

2
toonz/sources/common/trop/runsmap.h
View file

@ -52,7 +52,7 @@ public:
//---------------------------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DV_EXPORT_API TSmartPointerT<RunsMap>;
#endif

16
toonz/sources/common/trop/tblur.cpp
View file

@ -3,7 +3,7 @@
#include "traster.h"
#include "trop.h"
#include "tpixelgr.h"
#ifdef WIN32
#ifdef _WIN32
#include <emmintrin.h>
#include <malloc.h>
#endif
@ -11,7 +11,7 @@
namespace
{
#ifdef WIN32
#ifdef _WIN32
template <class T>
struct BlurPixel {
T b;
@ -231,7 +231,7 @@ inline void blur_code(
//-------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
//-------------------------------------------------------------------
template <class T, class P>
@ -484,7 +484,7 @@ inline void blur_code_SSE2(
}
}
#endif // WIN32
#endif // _WIN32
//-------------------------------------------------------------------
@ -574,7 +574,7 @@ template <class T, class Q, class P>
void do_filtering_chan(BlurPixel<P> *row1, T *row2, int length,
float coeff, float coeffq, int brad, float diff, bool useSSE)
{
#ifdef WIN32
#ifdef _WIN32
if (useSSE && T::maxChannelValue == 255)
blur_code_SSE2<T, P>(row1, row2, length, coeff, coeffq, brad, diff, 0.5);
else
@ -769,7 +769,7 @@ void do_filtering_floatRgb(T *row1, BlurPixel<P> *row2, int length,
BLUR_CODE(0, unsigned char)
*/
#ifdef WIN32
#ifdef _WIN32
if (useSSE)
blur_code_SSE2<T, P>(row1, row2, length, coeff, coeffq, brad, diff, 0);
else
@ -805,7 +805,7 @@ void doBlurRgb(TRasterPT<T> &dstRas, TRasterPT<T> &srcRas, double blur, int dx,
BlurPixel<P> *row2, *col1, *fbuffer;
TRasterGR8P r1;
#ifdef WIN32
#ifdef _WIN32
if (useSSE) {
fbuffer = (BlurPixel<P> *)_aligned_malloc(llx * ly * sizeof(BlurPixel<P>), 16);
row1 = (T *)_aligned_malloc((llx + 2 * brad) * sizeof(T), 16);
@ -853,7 +853,7 @@ void doBlurRgb(TRasterPT<T> &dstRas, TRasterPT<T> &srcRas, double blur, int dx,
dstRas->clear();
}
#ifdef WIN32
#ifdef _WIN32
if (useSSE) {
_aligned_free(col2);
_aligned_free(col1);

2
toonz/sources/common/trop/toperators.cpp
View file

@ -4,7 +4,7 @@
#include "tpixel.h"
#include "tpixelutils.h"
#ifdef WIN32
#ifdef _WIN32
#include <emmintrin.h> // per SSE2
#endif

6
toonz/sources/common/trop/tover.cpp
View file

@ -7,7 +7,7 @@
#include "tropcm.h"
#include "tpalette.h"
#ifdef WIN32
#ifdef _WIN32
#include <emmintrin.h> // per SSE2
#endif
@ -171,7 +171,7 @@ void do_overT2(TRasterPT<T> rout, const TRasterPT<T> &rup)
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
void do_over_SSE2(TRaster32P rout, const TRaster32P &rup)
{
@ -345,7 +345,7 @@ void TRop::over(const TRasterP &rout, const TRasterP &rup, const TPoint &pos)
// TRaster64P rout64 = rout, rin64 = rin;
if (rout32 && rup32) {
#ifdef WIN32
#ifdef _WIN32
if (TSystem::getCPUExtensions() & TSystem::CpuSupportsSse2)
do_over_SSE2(rout32, rup32);
else

14
toonz/sources/common/trop/tresample.cpp
View file

@ -18,7 +18,7 @@
using namespace TConsts;
#ifdef WIN32
#ifdef _WIN32
#include <emmintrin.h> // per SSE2
#endif
@ -841,7 +841,7 @@ inline void calcValueNoCalc(UINT &calc_value){
//#define PIXVAL_EQ PIXVAL_EQ_EQUAL
template <typename PixType>
#ifdef WIN32
#ifdef _WIN32
__forceinline
#endif
void
@ -1511,7 +1511,7 @@ void resample_main_rgbm(TRasterPT<T> rout, const TRasterPT<T> &rin,
//---------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
namespace
{
@ -1808,7 +1808,7 @@ void inline blendBySSE2(__m128 &pix_out_packed,
} // namespace
#endif // WIN32
#endif // _WIN32
//---------------------------------------------------------------------------
static void get_prow_gr8(const TRasterGR8P &rin,
@ -2747,7 +2747,7 @@ void rop_resample_rgbm(TRasterPT<T> rout, const TRasterPT<T> &rin,
}
}
#ifdef WIN32
#ifdef _WIN32
if ((TSystem::getCPUExtensions() & TSystem::CpuSupportsSse2) && T::maxChannelValue == 255)
resample_main_rgbm_SSE2<T>(rout, rin, aff_xy2uv, aff0_uv2fg,
min_pix_ref_u, min_pix_ref_v,
@ -3651,7 +3651,7 @@ void do_resample(TRasterCM32P rout, const TRasterCM32P &rin, const TAffine &aff)
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template <class T>
void resample_main_cm32_rgbm_SSE2(TRasterPT<T> rout, const TRasterCM32P &rin,
const TAffine &aff_xy2uv,
@ -5082,7 +5082,7 @@ void rop_resample_rgbm_2(TRasterPT<T> rout, const TRasterCM32P &rin,
}
}
#ifdef WIN32
#ifdef _WIN32
TRaster32P rout32 = rout;
if ((TSystem::getCPUExtensions() & TSystem::CpuSupportsSse2) && rout32)
resample_main_cm32_rgbm_SSE2<TPixel32>(rout32, rin, aff_xy2uv, aff0_uv2fg,

6
toonz/sources/common/trop/tropcm.cpp
View file

@ -22,7 +22,7 @@ extern "C" {
#include "toonz4.6/raster.h"
}
#ifdef WIN32
#ifdef _WIN32
#define USE_SSE2
#endif
@ -78,7 +78,7 @@ void TRop::convert(const TRaster32P &rasOut,
rasOut->lock();
rasIn->lock();
#ifdef WIN32
#ifdef _WIN32
if (TSystem::getCPUExtensions() & TSystem::CpuSupportsSse2) {
__m128i zeros = _mm_setzero_si128();
TPixelFloat *paints = (TPixelFloat *)_aligned_malloc(count2 * sizeof(TPixelFloat), 16);
@ -171,7 +171,7 @@ void TRop::convert(const TRaster32P &rasOut,
_aligned_free(inks);
} else // SSE2 not supported
#endif // WIN32
#endif // _WIN32
{
std::vector<TPixel32> paints(count2, TPixel32(255, 0, 0));

6
toonz/sources/common/tsystem/cpuextensions.cpp
View file

@ -1,7 +1,7 @@
#include "tsystem.h"
#ifdef WIN32
#ifdef _WIN32
#include <wtypes.h>
#include <winnt.h>
#include <emmintrin.h>
@ -16,7 +16,7 @@ long TSystem::getCPUExtensions()
}
#else
#ifndef WIN32
#ifndef _WIN32
long TSystem::getCPUExtensions()
{
return TSystem::CPUExtensionsNone;
@ -29,7 +29,7 @@ long CPUExtensionsAvailable = TSystem::CPUExtensionsNone;
bool CPUExtensionsEnabled = true;
bool FistTime = true;
//#ifdef WIN32
//#ifdef _WIN32
//------------------------------------------------------------------------------

12
toonz/sources/common/tsystem/tfilepath.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
//#define UNICODE // per le funzioni di conversione da/a UNC
#include <windows.h>
#include <lm.h>
@ -128,7 +128,7 @@ bool isUncName = false;
pos=2;
if(path.length()==2 || !isSlash(path[pos])) m_path.append(1,slash);
}
#ifdef WIN32
#ifdef _WIN32
else //se si tratta di un path in formato UNC e' del tipo "\\\\MachineName"
//RICONTROLLARE! SE SI HA IP ADDRESS FALLIVA!
if (path.length() >= 3 && path[0] == '\\' && path[1] == '\\' && (isalpha(path[2]) || isdigit(path[2])) )
@ -287,7 +287,7 @@ TFilePath::TFilePath(const QString &path)
bool TFilePath::operator==(const TFilePath &fp) const
{
#ifdef WIN32
#ifdef _WIN32
return _wcsicmp(m_path.c_str(), fp.m_path.c_str()) == 0;
#else
return m_path == fp.m_path;
@ -304,7 +304,7 @@ bool TFilePath::operator<(const TFilePath &fp) const
int i2 = m_path.find(L"\\");
int j2 = fp.m_path.find(L"\\");
if (i2 == j2 && j2 == -1)
#ifdef WIN32
#ifdef _WIN32
return _wcsicmp(m_path.c_str(), fp.m_path.c_str()) < 0;
#else
return m_path < fp.m_path;
@ -323,7 +323,7 @@ bool TFilePath::operator<(const TFilePath &fp) const
jName = (j2 != -1) ? fp.m_path.substr(j1, j2 - j1) : fp.m_path;
//se le due parti di path, conpresi tra slash sono uguali
//itero il processo di confronto altrimenti ritorno
#ifdef WIN32
#ifdef _WIN32
char differ;
differ = _wcsicmp(iName.c_str(), jName.c_str());
if (differ != 0)
@ -340,7 +340,7 @@ bool TFilePath::operator<(const TFilePath &fp) const
iName = m_path.substr(i1, m_path.size() - i1);
jName = fp.m_path.substr(j1, fp.m_path.size() - j1);
#ifdef WIN32
#ifdef _WIN32
return _wcsicmp(iName.c_str(), jName.c_str()) < 0;
#else
return TFilePath(iName) < TFilePath(jName);

2
toonz/sources/common/tsystem/tfilepath_io.cpp
View file

@ -11,7 +11,7 @@
#include <iostream>
using namespace std;
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#include <windows.h>

20
toonz/sources/common/tsystem/tpluginmanager.cpp
View file

@ -5,7 +5,7 @@
#include "tconvert.h"
#include "tlogger.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#else
@ -34,7 +34,7 @@
class TPluginManager::Plugin
{
public:
#ifdef WIN32
#ifdef _WIN32
typedef HINSTANCE Handle;
#else
typedef void *Handle;
@ -65,7 +65,7 @@ typedef const TPluginInfo *TnzLibMainProcType();
namespace
{
const char *TnzLibMainProcName = "TLibMain";
#if !defined(WIN32)
#if !defined(_WIN32)
const char *TnzLibMainProcName2 = "_TLibMain";
#endif
}
@ -107,7 +107,7 @@ void TPluginManager::unloadPlugins()
it != m_pluginTable.end(); ++it) {
Plugin::Handle handle = (*it)->getHandle();
#ifndef LINUX
#ifdef WIN32
#ifdef _WIN32
FreeLibrary(handle);
#else
dlclose(handle);
@ -133,7 +133,7 @@ void TPluginManager::loadPlugin(const TFilePath &fp)
}
TLogger::debug() << "Loading " << fp;
#ifdef WIN32
#ifdef _WIN32
Plugin::Handle handle = LoadLibraryW(fp.getWideString().c_str());
#else
wstring str_fp = fp.getWideString();
@ -142,7 +142,7 @@ void TPluginManager::loadPlugin(const TFilePath &fp)
if (!handle) {
// non riesce a caricare la libreria;
TLogger::warning() << "Unable to load " << fp;
#ifdef WIN32
#ifdef _WIN32
wstring getFormattedMessage(DWORD lastError);
TLogger::warning() << toString(getFormattedMessage(GetLastError()));
#else
@ -154,7 +154,7 @@ void TPluginManager::loadPlugin(const TFilePath &fp)
m_pluginTable.push_back(plugin);
//cout << "loaded" << endl;
TnzLibMainProcType *tnzLibMain = 0;
#ifdef WIN32
#ifdef _WIN32
tnzLibMain = (TnzLibMainProcType *)
GetProcAddress(handle, TnzLibMainProcName);
#else
@ -168,7 +168,7 @@ void TPluginManager::loadPlugin(const TFilePath &fp)
// La libreria non esporta TLibMain;
TLogger::warning() << "Corrupted " << fp;
#ifdef WIN32
#ifdef _WIN32
FreeLibrary(handle);
#else
dlclose(handle);
@ -185,7 +185,7 @@ void TPluginManager::loadPlugin(const TFilePath &fp)
void TPluginManager::loadPlugins(const TFilePath &dir)
{
#if defined(WIN32)
#if defined(_WIN32)
const string extension = "dll";
#elif defined(LINUX) || defined(__sgi)
const string extension = "so";
@ -204,7 +204,7 @@ void TPluginManager::loadPlugins(const TFilePath &dir)
continue;
wstring fullpath = fp.getWideString();
#ifdef WIN32
#ifdef _WIN32
bool isDebugLibrary = (fullpath.find(L".d.") == fullpath.size() - (extension.size() + 3));

10
toonz/sources/common/tsystem/tsystem.cpp
View file

@ -23,7 +23,7 @@ using namespace std;
#include <QCoreApplication>
#include <QUuid>
#ifdef WIN32
#ifdef _WIN32
#include <qdesktopservices>
#include <qhostinfo>
#include <shlobj.h>
@ -165,7 +165,7 @@ QString TSystem::getUserName()
for (j = 0; j < list.size(); j++) {
QString value = list.at(j);
QString user;
#ifdef WIN32
#ifdef _WIN32
if (value.startsWith("USERNAME="))
user = value.right(value.size() - 9);
#else
@ -364,7 +364,7 @@ else
*/
//------------------------------------------------------------
/*
#ifdef WIN32
#ifdef _WIN32
wstring getFormattedMessage(DWORD lastError)
{
@ -446,7 +446,7 @@ void TSystem::deleteFile(const TFilePath &fp)
void TSystem::hideFile(const TFilePath &fp)
{
#ifdef WIN32
#ifdef _WIN32
if (!SetFileAttributesW(fp.getWideString().c_str(), FILE_ATTRIBUTE_HIDDEN))
throw TSystemException(fp, "can't hide file!");
#else // MACOSX, and others
@ -931,7 +931,7 @@ bool TSystem::touchParentDir(const TFilePath &fp)
bool TSystem::showDocument(const TFilePath &path)
{
#ifdef WIN32
#ifdef _WIN32
int ret = (int)
ShellExecuteW(0, L"open", path.getWideString().c_str(), 0, 0, SW_SHOWNORMAL);
if (ret <= 32) {

26
toonz/sources/common/tsystem/tsystempd.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#ifndef UNICODE
#define UNICODE
#endif
@ -21,7 +21,7 @@
#undef PLATFORM
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#define PLATFORM WIN32
#include <process.h>
@ -102,7 +102,7 @@ PLATFORM_NOT_SUPPORTED
using namespace std;
#ifdef WIN32
#ifdef _WIN32
wstring getFormattedMessage(DWORD lastError)
{
@ -138,7 +138,7 @@ wstring getFormattedMessage(DWORD lastError)
void TSystem::outputDebug(string s)
{
#ifdef TNZCORE_LIGHT
#ifdef WIN32
#ifdef _WIN32
OutputDebugString((LPCWSTR)s.c_str());
#else
cerr << s << endl;
@ -159,7 +159,7 @@ int TSystem::getProcessId()
bool TSystem::memoryShortage()
{
#ifdef WIN32
#ifdef _WIN32
MEMORYSTATUSEX memStatus;
memStatus.dwLength = sizeof(MEMORYSTATUSEX);
@ -205,7 +205,7 @@ TINT64 TSystem::getFreeMemorySize(bool onlyPhisicalMemory)
TINT64 totalFree = 0;
#ifdef WIN32
#ifdef _WIN32
MEMORYSTATUSEX buff;
buff.dwLength = sizeof(MEMORYSTATUSEX);
@ -263,7 +263,7 @@ TINT64 TSystem::getFreeMemorySize(bool onlyPhisicalMemory)
@ @ @ERROR : PLATFORM NOT SUPPORTED
#endif
#ifndef WIN32
#ifndef _WIN32
#else
#endif
@ -287,7 +287,7 @@ TINT64 TSystem::getDiskSize(const TFilePath &diskName)
assert(0);
return 0;
}
#ifndef WIN32
#ifndef _WIN32
struct statfs buf;
wstring str_diskname = diskName.getWideString();
#ifdef __sgi
@ -327,7 +327,7 @@ TINT64 TSystem::getFreeDiskSize(const TFilePath &diskName)
assert(0);
return 0;
}
#ifndef WIN32
#ifndef _WIN32
struct statfs buf;
wstring str_diskname = diskName.getWideString();
#ifdef __sgi
@ -361,7 +361,7 @@ TINT64 TSystem::getFreeDiskSize(const TFilePath &diskName)
TINT64 TSystem::getMemorySize(bool onlyPhisicalMemory)
{
#ifdef WIN32
#ifdef _WIN32
MEMORYSTATUS buff;
GlobalMemoryStatus(&buff);
@ -400,7 +400,7 @@ TINT64 TSystem::getMemorySize(bool onlyPhisicalMemory)
@ @ @ERROR : PLATFORM NOT SUPPORTED
#endif
#ifndef WIN32
#ifndef _WIN32
#else
#endif
}
@ -409,7 +409,7 @@ TINT64 TSystem::getMemorySize(bool onlyPhisicalMemory)
void TSystem::moveFileToRecycleBin(const TFilePath &fp)
{
#if defined(WIN32)
#if defined(_WIN32)
//
// from http://msdn.microsoft.com/msdnmag/issues/01/04/c/default.aspx
//
@ -497,7 +497,7 @@ TString TSystemException::getMessage() const
DEFAULT:
msg = L": Unknown error";
#ifndef WIN32
#ifndef _WIN32
CASE ELOOP : msg = L": Too many symbolic links were encountered in translating path.";
#ifndef MACOSX
CASE EMULTIHOP : msg = L": Components of path require hopping to multiple remote machines and the file system does not allow it.";

6
toonz/sources/common/tsystem/uncpath.cpp
View file

@ -3,7 +3,7 @@
#include "tsystem.h"
#include "tconvert.h"
#ifdef WIN32
#ifdef _WIN32
#define UNICODE // per le funzioni di conversione da/a UNC
#include <windows.h>
#include <lm.h>
@ -22,7 +22,7 @@ bool TSystem::isUNC(const TFilePath &path)
TFilePath TSystem::toUNC(const TFilePath &fp)
{
#ifdef WIN32
#ifdef _WIN32
if (QString::fromStdWString(fp.getWideString()).startsWith('+'))
return fp;
if (isUNC(fp))
@ -146,7 +146,7 @@ TFilePath TSystem::toUNC(const TFilePath &fp)
TFilePath TSystem::toLocalPath(const TFilePath &fp)
{
#ifdef WIN32
#ifdef _WIN32
if (!isUNC(fp))
return TFilePath(fp);

2
toonz/sources/common/ttest/ttest.cpp
View file

@ -213,7 +213,7 @@ TFilePath getTestFile(string name)
TFilePath testFile;
TFilePath parentDir = TSystem::getBinDir().getParentDir();
#ifndef WIN32
#ifndef _WIN32
parentDir = parentDir.getParentDir();
#endif

6
toonz/sources/common/tvectorimage/tl2lautocloser.cpp
View file

@ -10,7 +10,7 @@
#include <QDebug>
//=============================================================================
#ifdef WIN32
#ifdef _WIN32
class MyTimer
{
@ -393,7 +393,7 @@ void TL2LAutocloser::Imp::search(
if (strokea == 0 || strokeb == 0)
return;
/*
#ifdef WIN32
#ifdef _WIN32
MyTimer timer;
qDebug() << "search started";
timer.start();
@ -511,7 +511,7 @@ void TL2LAutocloser::Imp::search(
segments.push_back(segment);
}
/*
#ifdef WIN32
#ifdef _WIN32
double elapsed = timer.elapsedSeconds();
qDebug() << "search completed. time=" << elapsed << "s";
#endif

2
toonz/sources/common/tvectorimage/tl2lautocloser.h
View file

@ -15,7 +15,7 @@
#define DVVAR DV_IMPORT_VAR
#endif
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4251)
#endif

2
toonz/sources/common/tvectorimage/tsegmentadjuster.h
View file

@ -16,7 +16,7 @@
#define DVVAR DV_IMPORT_VAR
#endif
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4251)
#endif

4
toonz/sources/common/tvectorimage/tsweepboundary.cpp
View file

@ -12,7 +12,7 @@
//#include "drawutil.h"
#include "tvectorimage.h"
#ifdef WIN32
#ifdef _WIN32
#include <crtdbg.h>
#include <Windows.h>
#endif
@ -317,7 +317,7 @@ void removeFalseHoles(const vector<TStroke *> &strokes);
inline void TraceLinkedQuadraticList(LinkedQuadraticList &quadraticList)
{
#ifdef WIN32
#ifdef _WIN32
_RPT0(_CRT_WARN,
"\n__________________________________________________\n");
LinkedQuadraticList::iterator it = quadraticList.begin();

6
toonz/sources/common/tvrender/qtofflinegl.cpp
View file

@ -6,7 +6,7 @@
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
void swapRedBlueChannels(void *buffer, int bufferSize) // Flips The Red And Blue Bytes (WidthxHeight)
{
@ -127,7 +127,7 @@ void QtOfflineGL::createContext(TDimension rasterSize, std::shared_ptr<TOfflineG
QGLFormat fmt;
#ifdef WIN32
#ifdef _WIN32
fmt.setAlphaBufferSize(8);
fmt.setAlpha(true);
fmt.setRgba(true);
@ -280,7 +280,7 @@ void QtOfflineGLPBuffer::createContext(TDimension rasterSize)
QGLFormat fmt;
#ifdef WIN32
#ifdef _WIN32
fmt.setAlphaBufferSize(8);
fmt.setAlpha(false);
fmt.setRgba(true);

2
toonz/sources/common/tvrender/tglregions.cpp
View file

@ -17,7 +17,7 @@
#include "tcurves.h"
#include "tstrokeoutline.h"
#ifndef WIN32
#ifndef _WIN32
#define CALLBACK
#endif

2
toonz/sources/common/tvrender/tofflinegl.cpp
View file

@ -59,7 +59,7 @@ void TOfflineGL::setContextManager(TGLContextManager *contextManager)
// WIN32Implementation : implementazione offlineGL WIN32
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
namespace
{

2
toonz/sources/common/tvrender/tregionprop.cpp
View file

@ -15,7 +15,7 @@
//#include "tdebugmessage.h"
//#include "tflash.h"
#ifndef WIN32
#ifndef _WIN32
#define CALLBACK
#endif

10
toonz/sources/common/tvrender/tsimplecolorstyles.cpp
View file

@ -28,7 +28,7 @@
#include "tsimplecolorstyles.h"
#ifndef WIN32
#ifndef _WIN32
#define CALLBACK
#endif
@ -119,7 +119,7 @@ void drawAntialiasedOutline(const std::vector<TOutlinePoint> &_v, const TStroke
// DisplayListManager definition
//*************************************************************************************
#ifdef WIN32
#ifdef _WIN32
namespace
{
@ -292,7 +292,7 @@ public:
} // namespace
#endif // WIN32
#endif // _WIN32
//*************************************************************************************
// TSimpleStrokeStyle implementation
@ -1460,7 +1460,7 @@ void TVectorImagePatternStrokeStyle::computeTransformations(vector<TAffine> &tra
void TVectorImagePatternStrokeStyle::clearGlDisplayLists()
{
#ifdef WIN32
#ifdef _WIN32
DisplayListManager *pmgr = DisplayListManager::instance();
assert(pmgr);
pmgr->clearLists();
@ -1590,7 +1590,7 @@ void TVectorImagePatternStrokeStyle::drawStroke(const TVectorRenderData &rd, con
tglMultMatrix(totalTransformation);
CHECK_GL_ERROR
#ifdef WIN32
#ifdef _WIN32
GLuint listId = DisplayListManager::instance()->getDisplayListId(imgPointer, m_name, fid, rd);
if (listId != 0) {

4
toonz/sources/common/tvrender/ttessellator.cpp
View file

@ -12,7 +12,7 @@
//#include "tlevel_io.h"
#ifndef WIN32
#ifndef _WIN32
#define CALLBACK
#endif
// To avoid linking problems with HP ZX2000
@ -93,7 +93,7 @@ extern "C" void CALLBACK myCombine(GLdouble coords[3], GLdouble *d[4],
//-------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
typedef GLvoid(CALLBACK *GluCallback)(void);
#endif

2
toonz/sources/common/twain/ttwain.h
View file

@ -3,7 +3,7 @@
#ifndef __TTWAIN_H__
#define __TTWAIN_H__
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#else
#ifndef _UNIX_

2
toonz/sources/common/twain/ttwainP.h
View file

@ -25,7 +25,7 @@ typedef enum TWAINSTATE {
TWAIN_TRANSFERRING /* image in transit */
} TWAINSTATE;
#ifdef WIN32
#ifdef _WIN32
#ifdef x64
#define DSM_FILENAME "TWAINDSM.DLL"
#else

4
toonz/sources/common/twain/ttwain_error.c
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif
@ -128,7 +128,7 @@ void TTWAIN_RecordError(void)
}
if (TTwainData.ErrRC == TWRC_FAILURE && TTwainData.ErrCC == TWCC_OPERATIONERROR) {
#ifdef WIN32
#ifdef _WIN32
OutputDebugString(Msg_out);
#else
#ifdef TOONZDEBUG

2
toonz/sources/common/twain/ttwain_global_def.h
View file

@ -3,7 +3,7 @@
/*max@home*/
#ifndef __GLOBAL_DEF_H__
#define __GLOBAL_DEF_H__
#ifdef WIN32
#ifdef _WIN32
#define GLOBAL_LOCK(P) GlobalLock(P)
#define GLOBAL_ALLOC(T, S) GlobalAlloc(T, S)
#define GLOBAL_FREE(P) GlobalFree(P)

6
toonz/sources/common/twain/ttwain_state.c
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif
@ -203,7 +203,7 @@ int TTWAIN_MessageHook(void *lpmsg)
//printf("%s\n", __PRETTY_FUNCTION__);
if (TTWAIN_GetState() >= TWAIN_SOURCE_ENABLED) {
/* source enabled */
#ifdef WIN32
#ifdef _WIN32
TW_EVENT twEvent;
twEvent.pEvent = (TW_MEMREF)lpmsg;
twEvent.TWMessage = MSG_NULL;
@ -639,7 +639,7 @@ void *TTWAIN_AcquireNative(void *hwnd)
return hnative;
}
/*---------------------------------------------------------------------------*/
#ifdef WIN32
#ifdef _WIN32
typedef void(MyFun)(HWND);

4
toonz/sources/common/twain/ttwain_util.c
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#endif
@ -782,7 +782,7 @@ l'immagine)
if (!handle)
return TRUE; /*non sono semplicamente riuscito a prendere info riguardo
il pixelFlavor, ma setPixelType e' andato a buon fine */
#ifdef WIN32
#ifdef _WIN32
container = (TW_ENUMERATION *)handle;
#else
container = (TW_ENUMERATION *)GLOBAL_LOCK(handle);

6
toonz/sources/common/twain/twain.h
View file

@ -103,11 +103,11 @@
#endif
/* Microsoft C/C++ Compiler */
#if defined(WIN32) || defined(WIN64) || defined(_WINDOWS)
#if defined(_WIN32) || defined(WIN64) || defined(_WINDOWS)
#define TWH_CMP_MSC
#if defined(_WIN64) || defined(WIN64)
#define TWH_64BIT
#elif defined(WIN32) || defined(_WIN32)
#elif defined(_WIN32) || defined(_WIN32)
#define TWH_32BIT
#endif
@ -1844,7 +1844,7 @@ typedef struct {
* Depreciated Items *
****************************************************************************/
#ifdef _MSWIN_
#if defined(WIN32) || defined(WIN64)
#if defined(_WIN32) || defined(WIN64)
#define TW_HUGE
#elif !defined(TWH_CMP_GNU)
#define TW_HUGE huge

8
toonz/sources/image/avi/tiio_avi.cpp
View file

@ -156,7 +156,7 @@ private:
//
//===========================================================
#ifdef WIN32
#ifdef _WIN32
TLevelWriterAvi::TLevelWriterAvi(const TFilePath &path, TPropertyGroup *winfo)
: TLevelWriter(path, winfo), m_aviFile(0), m_videoStream(0), m_audioStream(0), m_bitmapinfo(0), m_outputFmt(0), m_hic(0), m_initDone(false), IOError(0), m_st(0), m_bpp(32), m_maxDataSize(0), m_buffer(0), m_firstframe(-1)
@ -647,10 +647,10 @@ private:
//
//===========================================================
#ifdef WIN32
#ifdef _WIN32
TLevelReaderAvi::TLevelReaderAvi(const TFilePath &path)
: TLevelReader(path)
#ifdef WIN32
#ifdef _WIN32
,
m_srcBitmapInfo(0), m_dstBitmapInfo(0), m_hic(0), IOError(0), m_prevFrame(-1), m_decompressedBuffer(0)
#endif
@ -1035,7 +1035,7 @@ TImageP TLevelReaderAvi::load(int frameIndex)
//
//===========================================================
#ifdef WIN32
#ifdef _WIN32
Tiio::AviWriterProperties::AviWriterProperties()
: m_codec("Codec")
{

8
toonz/sources/image/avi/tiio_avi.h
View file

@ -3,7 +3,7 @@
#ifndef TIIO_AVI_H
#define TIIO_AVI_H
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#include <vfw.h>
#endif
@ -33,7 +33,7 @@ public:
private:
TThread::Mutex m_mutex;
#ifdef WIN32
#ifdef _WIN32
PAVIFILE m_aviFile;
PAVISTREAM m_videoStream;
PAVISTREAM m_audioStream;
@ -53,7 +53,7 @@ private:
void doSaveSoundTrack();
void searchForCodec();
#ifdef WIN32
#ifdef _WIN32
int compressFrame(BITMAPINFOHEADER *outHeader, void **bufferOut, int frameIndex,
DWORD flagsIn, DWORD &flagsOut);
#endif
@ -80,7 +80,7 @@ public:
TThread::Mutex m_mutex;
void *m_decompressedBuffer;
#ifdef WIN32
#ifdef _WIN32
private:
PAVISTREAM m_videoStream;
BITMAPINFO *m_srcBitmapInfo, *m_dstBitmapInfo;

2
toonz/sources/image/compatibility/tfile_io.c
View file

@ -2,7 +2,7 @@
#include "tfile_io.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#include <assert.h>

6
toonz/sources/image/compatibility/tnz4.h
View file

@ -32,7 +32,7 @@ TNZ_LITTLE_ENDIAN undefined !!
#define TBOOL int
typedef struct LPIXEL {
#ifdef WIN32
#ifdef _WIN32
unsigned char b, g, r, m;
#elif defined(__sgi)
unsigned char m, b, g, r;
@ -46,7 +46,7 @@ TNZ_LITTLE_ENDIAN undefined !!
} LPIXEL;
typedef struct SPIXEL {
#ifdef WIN32
#ifdef _WIN32
unsigned short b, g, r, m;
#elif defined(__sgi)
unsigned short m, b, g, r;
@ -121,7 +121,7 @@ typedef struct IMAGE {
#define CROP(X, MIN, MAX) (X < MIN ? MIN : (X > MAX ? MAX : X))
#ifdef WIN32
#ifdef _WIN32
#define LPIXEL_TO_BGRM(X) (X)
#else
#if TNZ_LITTLE_ENDIAN

2
toonz/sources/image/compatibility/tnz4_cpp.cpp
View file

@ -7,7 +7,7 @@ extern "C" {
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifndef WIN32
#ifndef _WIN32
#include <unistd.h>
#endif

2
toonz/sources/image/mov/tiio_movW.cpp
View file

@ -326,7 +326,7 @@ Tiio::TifWriterProperties::TifWriterProperties()
{
m_byteOrdering.addValue(L"IBM PC");
m_byteOrdering.addValue(L"Mac");
#ifdef WIN32
#ifdef _WIN32
m_byteOrdering.setValue(L"IBM PC");
#else
m_byteOrdering.setValue(L"Mac");

6
toonz/sources/image/pli/pli_io.cpp
View file

@ -19,7 +19,7 @@
#if defined(MACOSX)
#include <architecture/i386/io.h>
#elif defined(WIN32)
#elif defined(_WIN32)
#include <io.h>
#endif
@ -304,7 +304,7 @@ UINT TStyleParam::getSize()
/*=====================================================================*/
#ifdef WIN32
#ifdef _WIN32
#define CHECK_FOR_READ_ERROR(filePath)
#else
#define CHECK_FOR_READ_ERROR(filePath) \
@ -545,7 +545,7 @@ ParsedPliImp::ParsedPliImp(const TFilePath &filename, bool readInfo)
// cerr<<m_filePath<<endl;
//#ifdef WIN32
//#ifdef _WIN32
m_iChan.open(filename);
//m_iChan.exceptions( ios::failbit | ios::badbit);

2
toonz/sources/image/pli/pli_io.h
View file

@ -3,7 +3,7 @@
#ifndef _PLI_IO_H
#define _PLI_IO_H
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4661)
#pragma warning(disable : 4018)
#endif

2
toonz/sources/image/pli/tags.cpp
View file

@ -1,6 +1,6 @@
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4661)
#endif

2
toonz/sources/image/quantel/filequantel.c
View file

@ -16,7 +16,7 @@
#include "filequantel.h"
#include "filequantelP.h"
#ifdef WIN32
#ifdef _WIN32
#define STAT_BUF struct _stat
#else
#define STAT_BUF struct stat

6
toonz/sources/image/sgi/filesgi.cpp
View file

@ -32,7 +32,7 @@
#include <assert.h>
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#include <windows.h>
#else
@ -291,7 +291,7 @@ static IMAGERGB *iopen(int fd, OpenMode openMode,
tablesize = image->ysize * image->zsize * (int)sizeof(TINT32);
lseek(f, 512L, 0);
if (read(f, image->rowstart, tablesize) != tablesize) {
#ifdef WIN32
#ifdef _WIN32
DWORD error;
error = GetLastError();
#endif
@ -302,7 +302,7 @@ static IMAGERGB *iopen(int fd, OpenMode openMode,
if (image->dorev)
cvtTINT32s(image->rowstart, tablesize);
if (read(f, image->rowsize, tablesize) != tablesize) {
#ifdef WIN32
#ifdef _WIN32
DWORD error;
error = GetLastError();
#endif

4
toonz/sources/image/tif/tiio_tif.cpp
View file

@ -25,7 +25,7 @@ extern "C" {
#include "tiio_tif.h"
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#include "windows.h"
#endif
@ -658,7 +658,7 @@ Tiio::TifWriterProperties::TifWriterProperties()
{
m_byteOrdering.addValue(L"IBM PC");
m_byteOrdering.addValue(L"Mac");
#ifdef WIN32
#ifdef _WIN32
m_byteOrdering.setValue(L"IBM PC");
#else
m_byteOrdering.setValue(L"Mac");

10
toonz/sources/image/tiio.cpp
View file

@ -17,7 +17,7 @@
#include <math.h>
//Platform-specific includes
#ifdef WIN32
#ifdef _WIN32
#ifndef x64
#define float_t Float_t
@ -153,14 +153,14 @@ void initImageIo(bool lightVersion)
if (!lightVersion) {
#ifdef WIN32
#ifdef _WIN32
TLevelWriter::define("avi", TLevelWriterAvi::create, true);
TLevelReader::define("avi", TLevelReaderAvi::create);
TFileType::declare("avi", TFileType::RASTER_LEVEL);
Tiio::defineWriterProperties("avi", new Tiio::AviWriterProperties());
#endif // WIN32
#endif // _WIN32
if (IsQuickTimeInstalled()) {
TLevelWriter::define("mov", TLevelWriterMov::create, true);
@ -175,7 +175,7 @@ void initImageIo(bool lightVersion)
}
/*
#if (defined(WIN32) && !defined(x64))
#if (defined(_WIN32) && !defined(x64))
TLevelWriter::define("pct", TLevelWriterPicPct::create, true);
TLevelReader::define("pct", TLevelReaderPicPct::create);
@ -190,7 +190,7 @@ void initImageIo(bool lightVersion)
TFileType::declare("pict", TFileType::RASTER_LEVEL);
Tiio::defineWriterProperties("pict", new Tiio::PctWriterProperties());
#endif // WIN32 && 32-bit
#endif // _WIN32 && 32-bit
*/
}
}

2
toonz/sources/image/tzp/avl.c
View file

@ -8,7 +8,7 @@
| |
*----------------------------------------------------------------------------*/
#ifdef WIN32
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4113)
#pragma warning(disable : 4996)

2
toonz/sources/image/tzp/tiio_plt.cpp
View file

@ -7,7 +7,7 @@
#include "tiffio.h"
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#include "windows.h"
#endif

2
toonz/sources/image/tzp/tiio_tzp.cpp
View file

@ -11,7 +11,7 @@
//#include "tspecialstyleid.h"
#include <set>
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4996)
#include "windows.h"
#endif

4
toonz/sources/include/ext/Potential.h
View file

@ -25,7 +25,7 @@
class TStroke;
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
// to avoid annoying warning
#pragma warning(push)
#pragma warning(disable : 4290)
@ -96,7 +96,7 @@ public:
};
}
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
#pragma warning(pop)
#endif

4
toonz/sources/include/ext/StrokeDeformation.h
View file

@ -30,7 +30,7 @@
class TStroke;
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
// to avoid annoying warning
#pragma warning(push)
#pragma warning(disable : 4251)
@ -197,7 +197,7 @@ public:
};
}
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
#pragma warning(pop)
#endif

4
toonz/sources/include/ext/StrokeDeformationImpl.h
View file

@ -21,7 +21,7 @@
#include "ExtUtil.h"
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
// to avoid annoying warning
#pragma warning(push)
#pragma warning(disable : 4251)
@ -194,7 +194,7 @@ public:
};
}
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
#pragma warning(pop)
#endif

4
toonz/sources/include/ext/StrokeParametricDeformer.h
View file

@ -20,7 +20,7 @@
#define DVVAR DV_IMPORT_VAR
#endif
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
// to avoid annoying warning
#pragma warning(push)
#pragma warning(disable : 4290)
@ -154,7 +154,7 @@ private:
};
}
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
#pragma warning(pop)
#endif

4
toonz/sources/include/ext/Types.h
View file

@ -24,7 +24,7 @@
#include <stdexcept>
#include <iostream>
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
// to avoid annoying warning
#pragma warning(push)
#pragma warning(disable : 4290)
@ -127,7 +127,7 @@ public:
};
}
#if defined(WIN32) && (_MSC_VER <= 1200)
#if defined(_WIN32) && (_MSC_VER <= 1200)
#pragma warning(pop)
#endif

2
toonz/sources/include/ext/plasticskeleton.h
View file

@ -152,7 +152,7 @@ private:
//===============================================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<PlasticSkeleton>;
#endif

2
toonz/sources/include/ext/plasticskeletondeformation.h
View file

@ -251,7 +251,7 @@ typedef PlasticSkeletonDeformation SkD;
//===============================================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<PlasticSkeletonDeformation>;
#endif

6
toonz/sources/include/movsettings.h
View file

@ -15,7 +15,7 @@
#if !(defined(x64) || defined(__LP64__))
#ifdef WIN32
#ifdef _WIN32
#define list List
#define map Map
@ -44,7 +44,7 @@
//#include "tlevel_io.h"
#include "tproperty.h"
#else //WIN32
#else // _WIN32
#define list List
#define map Map
@ -60,7 +60,7 @@
#undef iterator
#undef float_t
#endif //!WIN32
#endif // !_WIN32
void DVAPI fromPropertiesToAtoms(TPropertyGroup &pg, QTAtomContainer &atoms);
void DVAPI fromAtomsToProperties(const QTAtomContainer &atoms, TPropertyGroup &pg);

2
toonz/sources/include/t32bitsrv_wrap.h
View file

@ -44,7 +44,7 @@ static QString srvName()
return name;
}
#ifdef WIN32
#ifdef _WIN32
static QString srvCmdline()
{
static QString cmd("srv/t32bitsrv.exe " + srvName());

10
toonz/sources/include/tatomicvar.h
View file

@ -13,7 +13,7 @@
#define DVVAR DV_IMPORT_VAR
#endif
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#elif defined(__sgi)
#include <sys/atomic_ops.h>
@ -227,7 +227,7 @@ public:
long operator++()
{
#ifdef WIN32
#ifdef _WIN32
return InterlockedIncrement(&m_var);
#elif defined(__sgi)
return ++m_var;
@ -244,7 +244,7 @@ public:
long operator+=(long value)
{
#ifdef WIN32
#ifdef _WIN32
InterlockedExchangeAdd(&m_var, value);
return m_var;
@ -266,7 +266,7 @@ public:
long operator--()
{
#ifdef WIN32
#ifdef _WIN32
return InterlockedDecrement(&m_var);
#elif defined(__sgi)
return --m_var;
@ -300,7 +300,7 @@ public:
#endif
};
#ifdef WIN32
#ifdef _WIN32
long m_var;
#elif defined(__sgi)
long m_var;

4
toonz/sources/include/tcachedlevel.h
View file

@ -7,7 +7,7 @@
PER ORA SI PUO' USARE LA CACHE SOLO CON WINDOWS
*/
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#endif
@ -292,7 +292,7 @@ private:
int m_viewFrameMin,
m_viewFrameMax;
#ifdef WIN32
#ifdef _WIN32
HANDLE m_hFile, m_hMap;
LPVOID m_fileMapAddress;

2
toonz/sources/include/tcolorstyles.h
View file

@ -362,7 +362,7 @@ protected:
//--------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TColorStyle>;
#endif
typedef TSmartPointerT<TColorStyle> TColorStyleP;

2
toonz/sources/include/tcolumnset.h
View file

@ -54,7 +54,7 @@ private:
//---------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TColumnHeader>;
#endif

8
toonz/sources/include/tcommon.h
View file

@ -3,7 +3,7 @@
#ifndef T_COMMON_INCLUDED
#define T_COMMON_INCLUDED
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4786)
#pragma warning(disable : 4251)
#pragma warning(disable : 4146)
@ -137,7 +137,7 @@ typedef unsigned short USHORT;
typedef short SHORT;
typedef unsigned int UINT;
#ifndef WIN32
#ifndef _WIN32
typedef unsigned char BYTE;
#endif
@ -232,7 +232,7 @@ const int c_minint = ~c_maxint;
const unsigned int c_maxuint = (unsigned int)(~0U);
#ifdef WIN32
#ifdef _WIN32
#define DV_EXPORT_API __declspec(dllexport)
#define DV_IMPORT_API __declspec(dllimport)
#define DV_EXPORT_VAR __declspec(dllexport)
@ -244,7 +244,7 @@ const unsigned int c_maxuint = (unsigned int)(~0U);
#define DV_IMPORT_VAR
#endif
#ifdef WIN32
#ifdef _WIN32
#define DV_ALIGNED(val) __declspec(align(val))
#else
#define DV_ALIGNED(val) __attribute__((aligned(val)))

6
toonz/sources/include/tdata.h
View file

@ -19,7 +19,7 @@
//-------------------------------------------------------------------
class TData;
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TData>;
#endif
@ -55,7 +55,7 @@ public:
//-------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4251)
#endif
@ -72,7 +72,7 @@ public:
TFilePath getFilePath(int i) const;
};
#ifdef WIN32
#ifdef _WIN32
#pragma warning(pop)
#endif

2
toonz/sources/include/tdoubleparam.h
View file

@ -40,7 +40,7 @@ class Grammar;
class CalculatorNodeVisitor;
}
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TPersistDeclarationT<TDoubleParam>;
#endif

2
toonz/sources/include/tfarmcontroller.h
View file

@ -18,7 +18,7 @@ class TFilePath;
#undef TFARMAPI
#endif
#ifdef WIN32
#ifdef _WIN32
#ifdef TFARM_EXPORTS
#define TFARMAPI __declspec(dllexport)
#else

2
toonz/sources/include/tfarmserver.h
View file

@ -15,7 +15,7 @@
#undef TFARMAPI
#endif
#ifdef WIN32
#ifdef _WIN32
#ifdef TFARM_EXPORTS
#define TFARMAPI __declspec(dllexport)
#else

2
toonz/sources/include/tfarmtask.h
View file

@ -12,7 +12,7 @@
#undef TFARMAPI
#endif
#ifdef WIN32
#ifdef _WIN32
#ifdef TFARM_EXPORTS
#define TFARMAPI __declspec(dllexport)
#else

2
toonz/sources/include/tfont.h
View file

@ -54,7 +54,7 @@ private:
friend class TFontManager;
Impl *m_pimpl;
#ifdef WIN32
#ifdef _WIN32
TFont(const LOGFONTW &, HDC hdc);
#else
TFont(ATSUFontID, int size);

2
toonz/sources/include/tfx.h
View file

@ -361,7 +361,7 @@ public:
//===================================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TFx>;
#endif
typedef TSmartPointerT<TFx> TFxP;

8
toonz/sources/include/tgeometry.h
View file

@ -105,7 +105,7 @@ inline ostream &operator<<(ostream &out, const TPointT<T> &p)
typedef TPointT<int> TPoint, TPointI;
typedef TPointT<double> TPointD;
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TPointT<int>;
template class DVAPI TPointT<double>;
#endif
@ -330,7 +330,7 @@ inline ostream &operator<<(ostream &out, const T3DPointT<T> &p)
typedef T3DPointT<int> T3DPoint, T3DPointI;
typedef T3DPointT<double> T3DPointD;
#ifdef WIN32
#ifdef _WIN32
template class DVAPI T3DPointT<int>;
template class DVAPI T3DPointT<double>;
#endif
@ -618,7 +618,7 @@ inline ostream &operator<<(ostream &out, const TDimensionT<T> &p)
return out << "(" << p.lx << ", " << p.ly << ")";
}
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TDimensionT<int>;
template class DVAPI TDimensionT<double>;
#endif
@ -786,7 +786,7 @@ public:
typedef TRectT<int> TRect, TRectI;
typedef TRectT<double> TRectD;
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TRectT<int>;
template class DVAPI TRectT<double>;
#endif

4
toonz/sources/include/tgl.h
View file

@ -6,7 +6,7 @@
//#include "tgeometry.h"
#include "tmachine.h"
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
//#endif
@ -247,7 +247,7 @@ void DVAPI tglBuildMipmaps(std::vector<TRaster32P> &rasters,
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
typedef std::pair<HDC, HGLRC> TGlContext;
#else
typedef void *TGlContext;

2
toonz/sources/include/timage.h
View file

@ -86,7 +86,7 @@ private:
//-------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TImage>;
#endif

4
toonz/sources/include/timage_io.h
View file

@ -181,7 +181,7 @@ public:
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TImageReader>;
#endif
@ -248,7 +248,7 @@ public:
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TImageWriter>;
#endif

2
toonz/sources/include/timagecache.h
View file

@ -169,7 +169,7 @@ public:
//-----------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TCachedImage>;
#endif

2
toonz/sources/include/tlevel.h
View file

@ -72,7 +72,7 @@ public:
//-------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TLevel>;
#endif

6
toonz/sources/include/tlevel_io.h
View file

@ -7,7 +7,7 @@
#include "timage_io.h"
#include "tproperty.h"
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4290)
#pragma warning(disable : 4251)
@ -113,7 +113,7 @@ private:
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TLevelReader>;
#endif
@ -221,7 +221,7 @@ public:
//-----------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TLevelWriter>;
#endif

2
toonz/sources/include/tmacrofx.h
View file

@ -15,7 +15,7 @@
#define DVVAR DV_IMPORT_VAR
#endif
#ifdef WIN32
#ifdef _WIN32
#pragma warning(disable : 4251)
#endif

6
toonz/sources/include/tmeshimage.h
View file

@ -145,7 +145,7 @@ public:
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TTextureMesh>;
#endif
@ -204,7 +204,7 @@ public:
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TSmartPointerT<TMeshImage>;
template class DVAPI TDerivedSmartPointerT<TMeshImage, TImage>;
#endif
@ -215,7 +215,7 @@ public:
TMeshImageP() {}
TMeshImageP(TMeshImage *image) : DerivedSmartPointer(image) {}
TMeshImageP(TImageP image) : DerivedSmartPointer(image) {}
#if !defined(WIN32)
#if !defined(_WIN32)
TMeshImageP(TImage *image) : DerivedSmartPointer(TImageP(image))
{
}

14
toonz/sources/include/tnotanimatableparam.h
View file

@ -26,7 +26,7 @@
// TNotAnimatableParamChange
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4251)
#endif
@ -185,7 +185,7 @@ public:
//
//=========================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TNotAnimatableParam<int>;
class TIntParam;
template class DVAPI TPersistDeclarationT<TIntParam>;
@ -220,7 +220,7 @@ DEFINE_PARAM_SMARTPOINTER(TIntParam, int)
//
//=========================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TNotAnimatableParam<bool>;
class TBoolParam;
template class DVAPI TPersistDeclarationT<TBoolParam>;
@ -248,7 +248,7 @@ DEFINE_PARAM_SMARTPOINTER(TBoolParam, bool)
//
//=========================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TNotAnimatableParam<TFilePath>;
class TFilePathParam;
template class DVAPI TPersistDeclarationT<TFilePathParam>;
@ -274,7 +274,7 @@ DEFINE_PARAM_SMARTPOINTER(TFilePathParam, TFilePath)
//
//=========================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TNotAnimatableParam<std::wstring>;
class TStringParam;
template class DVAPI TPersistDeclarationT<TStringParam>;
@ -358,7 +358,7 @@ public:
//
//=========================================================
#ifdef WIN32
#ifdef _WIN32
template class DVAPI TNotAnimatableParam<double>;
class TNADoubleParam;
template class DVAPI TPersistDeclarationT<TNADoubleParam>;
@ -457,7 +457,7 @@ TUndo *TNotAnimatableParamChange<T>::createUndo() const
//-----------------------------------------------------------------------------
#ifdef WIN32
#ifdef _WIN32
#pragma warning(pop)
#endif

2
toonz/sources/include/tnztypes.h
View file

@ -3,7 +3,7 @@
#ifndef TNZTYPES_H
#define TNZTYPES_H
#ifdef WIN32
#ifdef _WIN32
#define TINT32 __int32
typedef unsigned __int32 TUINT32;
typedef __int64 TINT64;

Some files were not shown because too many files have changed in this diff Show more