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

Quiet -Wundef warning

Browse source 
Exposes accidental typos when checking exact values of a define.
This commit is contained in:
Campbell Barton 2016-06-30 12:21:07 +10:00
parent 7aaaec233a
commit d869b5f8e6
31 changed files with 76 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/common/psdlib/psd.cpp
View file

@ -1,6 +1,6 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif

4
toonz/sources/common/psdlib/psdutils.cpp
View file

@ -1,6 +1,4 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1400)
#if _MSC_VER >= 1400
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif

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

@ -187,7 +187,7 @@ Uint32 ElapsedTimeCB(Uint32 interval, void *param) {
} }
} }
#elif __sgi #elif defined(__sgi)
class TTimer::Imp { class TTimer::Imp {
public: public:
Imp(std::string name, UINT timerRes, TTimer::Type type, TTimer *timer) Imp(std::string name, UINT timerRes, TTimer::Type type, TTimer *timer)
@ -219,7 +219,7 @@ public:
TGenericTimerAction *m_action; TGenericTimerAction *m_action;
}; };
#elif MACOSX #elif defined(MACOSX)
class TTimer::Imp { class TTimer::Imp {
public: public:
Imp(std::string name, UINT timerRes, TTimer::Type type, TTimer *timer) Imp(std::string name, UINT timerRes, TTimer::Type type, TTimer *timer)

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

@ -474,13 +474,13 @@ void tglDraw(const TRectD &rect, const TRaster32P &tex, bool blending) {
} else } else
texture = tex; texture = tex;
GLenum fmt = GLenum fmt =
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
GL_BGRA_EXT; GL_BGRA_EXT;
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
GL_ABGR_EXT; GL_ABGR_EXT;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
GL_RGBA; GL_RGBA;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
GL_BGRA; GL_BGRA;
#else #else
// Error PLATFORM NOT SUPPORTED // Error PLATFORM NOT SUPPORTED

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

@ -13,12 +13,12 @@
#include <QTimer> #include <QTimer>
// System-specific includes // System-specific includes
#ifdef _WIN32 #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#elif MACOSX #elif defined(MACOSX)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <unistd.h> #include <unistd.h>
#elif LINUX #elif defined(LINUX)
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#endif #endif

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

@ -7,7 +7,7 @@
#if !defined(OUTLINEAPPROXIMATION_H) #if !defined(OUTLINEAPPROXIMATION_H)
#define OUTLINEAPPROXIMATION_H #define OUTLINEAPPROXIMATION_H
#if _MSC_VER > 1000 #if defined(_MSC_VER) && (_MSC_VER > 1000)
#pragma once #pragma once
#endif // _MSC_VER > 1000 #endif // _MSC_VER > 1000

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

@ -1797,7 +1797,7 @@ void TStroke::reduceControlPoints(double error, vector<int> corners) {
} }
controlPoints.push_back(m_imp->m_centerLineArray.back()->getThickP2()); controlPoints.push_back(m_imp->m_centerLineArray.back()->getThickP2());
#if _DEBUG #ifdef _DEBUG
cpSize = controlPoints.size(); cpSize = controlPoints.size();
for (cp = 1; cp < cpSize; cp++) for (cp = 1; cp < cpSize; cp++)
assert(!(controlPoints[cp - 1] == controlPoints[cp])); assert(!(controlPoints[cp - 1] == controlPoints[cp]));
@ -2341,7 +2341,7 @@ void TStroke::draw(const TVectorRenderData &rd) const
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
TStrokeProp *TStroke::getProp() const { TStrokeProp *TStroke::getProp() const {
#if DISEGNO_OUTLINE == 0 #if !defined(DISEGNO_OUTLINE)
if (!m_imp->m_styleId) return 0; if (!m_imp->m_styleId) return 0;
#endif #endif

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

@ -127,7 +127,7 @@ void QtOfflineGL::createContext(TDimension rasterSize,
QGLFormat fmt; QGLFormat fmt;
#ifdef _WIN32 #if defined(_WIN32)
fmt.setAlphaBufferSize(8); fmt.setAlphaBufferSize(8);
fmt.setAlpha(true); fmt.setAlpha(true);
fmt.setRgba(true); fmt.setRgba(true);
@ -137,7 +137,7 @@ void QtOfflineGL::createContext(TDimension rasterSize,
fmt.setStencil(true); fmt.setStencil(true);
fmt.setAccum(false); fmt.setAccum(false);
fmt.setPlane(0); fmt.setPlane(0);
#elif MACOSX #elif defined(MACOSX)
fmt = QGLFormat::defaultFormat(); fmt = QGLFormat::defaultFormat();
// printf("GL Version: %s\n",glGetString(GL_VERSION)); // printf("GL Version: %s\n",glGetString(GL_VERSION));
fmt.setVersion(2, 1); /* OSX10.8 では 3.2 だめかも */ fmt.setVersion(2, 1); /* OSX10.8 では 3.2 だめかも */
@ -153,7 +153,7 @@ void QtOfflineGL::createContext(TDimension rasterSize,
fmt.setPlane(0); fmt.setPlane(0);
fmt.setDirectRendering(false); fmt.setDirectRendering(false);
#endif #endif
#elif LINUX #elif defined(LINUX)
fmt = QGLFormat::defaultFormat(); fmt = QGLFormat::defaultFormat();
// printf("GL Version: %s\n",glGetString(GL_VERSION)); // printf("GL Version: %s\n",glGetString(GL_VERSION));
fmt.setVersion(2, 1); /* XXX? */ fmt.setVersion(2, 1); /* XXX? */
@ -279,7 +279,7 @@ SPECIFICHE MAC = depth_size 24, stencil_size 8, alpha_size 1
QGLFormat fmt; QGLFormat fmt;
#ifdef _WIN32 #ifdef defined(_WIN32)
fmt.setAlphaBufferSize(8); fmt.setAlphaBufferSize(8);
fmt.setAlpha(false); fmt.setAlpha(false);
fmt.setRgba(true); fmt.setRgba(true);
@ -289,7 +289,7 @@ SPECIFICHE MAC = depth_size 24, stencil_size 8, alpha_size 1
fmt.setStencil(true); fmt.setStencil(true);
fmt.setAccum(false); fmt.setAccum(false);
fmt.setPlane(0); fmt.setPlane(0);
#elif MACOSX #elif defined(MACOSX)
fmt.setAlphaBufferSize(1); fmt.setAlphaBufferSize(1);
fmt.setAlpha(false); fmt.setAlpha(false);
fmt.setRgba(true); fmt.setRgba(true);
@ -299,7 +299,7 @@ SPECIFICHE MAC = depth_size 24, stencil_size 8, alpha_size 1
fmt.setStencil(true); fmt.setStencil(true);
fmt.setAccum(false); fmt.setAccum(false);
fmt.setPlane(0); fmt.setPlane(0);
#elif LINUX #elif defined(LINUX)
fmt.setAlphaBufferSize(1); fmt.setAlphaBufferSize(1);
fmt.setAlpha(false); fmt.setAlpha(false);
fmt.setRgba(true); fmt.setRgba(true);

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

@ -19,7 +19,7 @@
#include "tthread.h" #include "tthread.h"
#elif MACOSX #elif defined(MACOSX)
#include "qtofflinegl.h" #include "qtofflinegl.h"
@ -490,7 +490,7 @@ std::shared_ptr<TOfflineGL::Imp> defaultOfflineGLGenerator(
return std::make_shared<QtOfflineGL>(dim, shared); return std::make_shared<QtOfflineGL>(dim, shared);
} }
#elif MACOSX #elif defined(MACOSX)
std::shared_ptr<TOfflineGL::Imp> defaultOfflineGLGenerator( std::shared_ptr<TOfflineGL::Imp> defaultOfflineGLGenerator(
const TDimension &dim, std::shared_ptr<TOfflineGL::Imp> shared) { const TDimension &dim, std::shared_ptr<TOfflineGL::Imp> shared) {

2
toonz/sources/image/bmp/filebmp.h
View file

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

2
toonz/sources/image/png/tiio_png.cpp
View file

@ -1,4 +1,4 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif

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

@ -1,6 +1,6 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif

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

@ -1,6 +1,6 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif

2
toonz/sources/image/tga/tiio_tga.cpp
View file

@ -1,6 +1,6 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#pragma warning(disable : 4996) #pragma warning(disable : 4996)
#endif #endif

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

@ -1,9 +1,9 @@
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif
#define IS_TIFF_MAIN #define IS_TIFF_MAIN
#if _WIN32 #if defined(_WIN32)
#include <io.h> #include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>

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

@ -18,7 +18,7 @@
#include <math.h> #include <math.h>
// Platform-specific includes // Platform-specific includes
#ifdef _WIN32 #if defined(_WIN32)
#ifndef x64 #ifndef x64
@ -37,11 +37,11 @@
#include "./3gp/tiio_3gp.h" #include "./3gp/tiio_3gp.h"
#include "./zcc/tiio_zcc.h" #include "./zcc/tiio_zcc.h"
#elif MACOSX #elif defined(MACOSX)
#include "./mov/tiio_movM.h" #include "./mov/tiio_movM.h"
#include "./3gp/tiio_3gpM.h" #include "./3gp/tiio_3gpM.h"
#elif LINUX // No more supported by the way... #elif defined(LINUX) // No more supported by the way...
// #include "./mov/tiio_movL.h" // #include "./mov/tiio_movL.h"
#include "./mov/tiio_mov_proxy.h" #include "./mov/tiio_mov_proxy.h"
#include "./3gp/tiio_3gp_proxy.h" #include "./3gp/tiio_3gp_proxy.h"

4
toonz/sources/image/tzp/tmacro.h
View file

@ -15,7 +15,7 @@
//#include "tmacroW.h" //#include "tmacroW.h"
#endif #endif
#if defined(DBMALLOC) && !defined(WIN32) #if defined(DBMALLOC) && !defined(_WIN32)
#include "dbmalloc.h" #include "dbmalloc.h"
#endif #endif
@ -126,7 +126,7 @@ static const char *const TALLOC_MSG_ =
static const char *const TREALLOC_MSG_ = static const char *const TREALLOC_MSG_ =
"Out of memory reallocating %d bytes (%s line %d)"; "Out of memory reallocating %d bytes (%s line %d)";
#if defined(WIN32) && defined(_DEBUG) #if defined(_WIN32) && defined(_DEBUG)
#define WIN32_DBG_NBFL_ , _NORMAL_BLOCK, __FILE__, __LINE__ #define WIN32_DBG_NBFL_ , _NORMAL_BLOCK, __FILE__, __LINE__
#define WIN32_DBG_NB_ , _NORMAL_BLOCK #define WIN32_DBG_NB_ , _NORMAL_BLOCK
#define TMALLOC_FUN_ _malloc_dbg #define TMALLOC_FUN_ _malloc_dbg

6
toonz/sources/include/tcg/hpp/triangulate.hpp
View file

@ -9,12 +9,12 @@
#include "../point_ops.h" #include "../point_ops.h"
// OS-specific includes // OS-specific includes
#ifdef WIN32 #if defined(_WIN32)
#include "windows.h" #include "windows.h"
#include <GL/glu.h> #include <GL/glu.h>
#elif MACOSX #elif defined(MACOSX)
#include <GLUT/glut.h> #include <GLUT/glut.h>
#elif LINUX #elif defined(LINUX)
#include <GL/glut.h> #include <GL/glut.h>
#include <cstring> #include <cstring>
#endif #endif

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

@ -50,13 +50,13 @@ class TCubic;
#endif #endif
#endif #endif
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
#define TGL_FMT GL_BGRA_EXT #define TGL_FMT GL_BGRA_EXT
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
#define TGL_FMt GL_ABGR_EXT #define TGL_FMt GL_ABGR_EXT
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
#define TGL_FMT GL_RGBA #define TGL_FMT GL_RGBA
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
#define TGL_FMT GL_BGRA #define TGL_FMT GL_BGRA
#else #else
@undefined chan order @undefined chan order

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

@ -3,7 +3,7 @@
#ifndef T_MACHINE_INCLUDED #ifndef T_MACHINE_INCLUDED
#define T_MACHINE_INCLUDED #define T_MACHINE_INCLUDED
#if defined(WIN32) || defined(i386) #if defined(_WIN32) || defined(i386)
#define TNZ_LITTLE_ENDIAN 1 #define TNZ_LITTLE_ENDIAN 1
#define TNZ_MACHINE_CHANNEL_ORDER_BGRM 1 #define TNZ_MACHINE_CHANNEL_ORDER_BGRM 1
#elif defined(__sgi) #elif defined(__sgi)

2
toonz/sources/include/toonz4.6/machine.h
View file

@ -20,7 +20,7 @@
#endif #endif
*/ */
#if defined(WIN32) || defined(i386) #if defined(_WIN32) || defined(i386)
#define TNZ_LITTLE_ENDIAN 1 #define TNZ_LITTLE_ENDIAN 1
#define TNZ_MACHINE_CHANNEL_ORDER_BGRM 1 #define TNZ_MACHINE_CHANNEL_ORDER_BGRM 1
#elif defined(__sgi) #elif defined(__sgi)

2
toonz/sources/include/toonz4.6/pixel.h
View file

@ -37,7 +37,7 @@ typedef struct _SPIXEL { unsigned short b, g, r, m; } SPIXEL;
#define LPIXEL_B_SHIFT 24 #define LPIXEL_B_SHIFT 24
#endif #endif
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
typedef struct { unsigned char m, b, g, r; } LPIXEL; typedef struct { unsigned char m, b, g, r; } LPIXEL;
typedef struct { unsigned short m, b, g, r; } SPIXEL; typedef struct { unsigned short m, b, g, r; } SPIXEL;

4
toonz/sources/include/toonz4.6/tmacro.h
View file

@ -15,7 +15,7 @@
//#include "tmacroW.h" //#include "tmacroW.h"
#endif #endif
#if defined(DBMALLOC) && !defined(WIN32) #if defined(DBMALLOC) && !defined(_WIN32)
#include "dbmalloc.h" #include "dbmalloc.h"
#endif #endif
@ -126,7 +126,7 @@ static const char *const TALLOC_MSG_ =
static const char *const TREALLOC_MSG_ = static const char *const TREALLOC_MSG_ =
"Out of memory reallocating %d bytes (%s line %d)"; "Out of memory reallocating %d bytes (%s line %d)";
#if defined(WIN32) && defined(_DEBUG) #if defined(_WIN32) && defined(_DEBUG)
#define WIN32_DBG_NBFL_ , _NORMAL_BLOCK, __FILE__, __LINE__ #define WIN32_DBG_NBFL_ , _NORMAL_BLOCK, __FILE__, __LINE__
#define WIN32_DBG_NB_ , _NORMAL_BLOCK #define WIN32_DBG_NB_ , _NORMAL_BLOCK
#define TMALLOC_FUN_ _malloc_dbg #define TMALLOC_FUN_ _malloc_dbg

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

@ -47,11 +47,11 @@ public:
static const int maxChannelValue; static const int maxChannelValue;
typedef unsigned char Channel; typedef unsigned char Channel;
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
Channel b, g, r, m; Channel b, g, r, m;
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
Channel m, b, g, r; Channel m, b, g, r;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
unsigned char r, g, b, m; unsigned char r, g, b, m;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif TNZ_MACHINE_CHANNEL_ORDER_MRGB
Channel m, r, g, b; Channel m, r, g, b;
@ -164,9 +164,9 @@ public:
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM
Channel b, g, r, m; Channel b, g, r, m;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
Channel m, r, g, b; Channel m, r, g, b;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
Channel r, g, b, m; Channel r, g, b, m;
#else #else
undefined machine order !!!! undefined machine order !!!!

4
toonz/sources/stdfx/pins.cpp
View file

@ -138,7 +138,7 @@ void subCompute(TRasterFxPort &m_input, TTile &tile, double frame,
TRectD clippingRect = TRectD clippingRect =
TRectD(tile.m_pos, TRectD(tile.m_pos,
TDimensionD(tile.getRaster()->getLx(), tile.getRaster()->getLy())); TDimensionD(tile.getRaster()->getLx(), tile.getRaster()->getLy()));
#if CREATE_GL_CONTEXT_ONE_TIME #ifdef CREATE_GL_CONTEXT_ONE_TIME
int ret = wglMakeCurrent(m_offScreenGL.m_offDC, m_offScreenGL.m_hglRC); int ret = wglMakeCurrent(m_offScreenGL.m_offDC, m_offScreenGL.m_hglRC);
assert(ret == TRUE); assert(ret == TRUE);
#else #else
@ -168,7 +168,7 @@ void subCompute(TRasterFxPort &m_input, TTile &tile, double frame,
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
checkErrorsByGL checkErrorsByGL
#if !CREATE_GL_CONTEXT_ONE_TIME #ifndef CREATE_GL_CONTEXT_ONE_TIME
TRaster32P rasaux; TRaster32P rasaux;
if (!wireframe) { if (!wireframe) {
TRaster32P texture(texWidth, texHeight); TRaster32P texture(texWidth, texHeight);

4
toonz/sources/t32bitsrv/t323gpmsg.cpp
View file

@ -13,9 +13,9 @@
#include "tproperty.h" #include "tproperty.h"
#include "tsound.h" #include "tsound.h"
#ifdef WIN32 #if defined(_WIN32)
#include "../image/3gp/tiio_3gp.h" #include "../image/3gp/tiio_3gp.h"
#elif MACOSX #elif defined(MACOSX)
#include "../image/3gp/tiio_3gpM.h" #include "../image/3gp/tiio_3gpM.h"
#endif #endif

4
toonz/sources/t32bitsrv/t32movmsg.cpp
View file

@ -13,9 +13,9 @@
#include "tproperty.h" #include "tproperty.h"
#include "tsound.h" #include "tsound.h"
#ifdef WIN32 #if defined(_WIN32)
#include "../image/mov/tiio_mov.h" #include "../image/mov/tiio_mov.h"
#elif MACOSX #elif defined(MACOSX)
#include "../image/mov/tiio_movM.h" #include "../image/mov/tiio_movM.h"
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#endif #endif

16
toonz/sources/tnztools/stylepicker.cpp
View file

@ -151,13 +151,13 @@ namespace {
TPixel32 getAverageColor(const TRect &rect) { TPixel32 getAverageColor(const TRect &rect) {
GLenum fmt = GLenum fmt =
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
GL_RGBA; GL_RGBA;
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
GL_ABGR_EXT; GL_ABGR_EXT;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
GL_RGBA; GL_RGBA;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
GL_BGRA; GL_BGRA;
#else #else
// Error PLATFORM NOT SUPPORTED // Error PLATFORM NOT SUPPORTED
@ -181,13 +181,13 @@ TPixel32 getAverageColor(const TRect &rect) {
TPixel32 getAverageColor(TStroke *stroke) { TPixel32 getAverageColor(TStroke *stroke) {
GLenum fmt = GLenum fmt =
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
GL_RGBA; GL_RGBA;
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
GL_ABGR_EXT; GL_ABGR_EXT;
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
GL_RGBA; GL_RGBA;
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
GL_BGRA; GL_BGRA;
#else #else
// Error PLATFORM NOT SUPPORTED // Error PLATFORM NOT SUPPORTED

12
toonz/sources/toonzfarm/tnzcore_stuff/tthread.cpp
View file

@ -40,13 +40,13 @@ public:
void join(); void join();
void cancel(); void cancel();
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(disable : 4290) #pragma warning(disable : 4290)
#endif #endif
static void milestone() throw(TThread::Interrupt); static void milestone() throw(TThread::Interrupt);
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(default : 4290) #pragma warning(default : 4290)
#endif #endif
@ -240,7 +240,7 @@ void Thread::cancel() {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// static member function // static member function
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(disable : 4290) #pragma warning(disable : 4290)
#endif #endif
@ -252,7 +252,7 @@ void Thread::milestone() throw(TThread::Interrupt) {
if (Thread::Imp::m_state[key.m_id]) throw TThread::Interrupt(); if (Thread::Imp::m_state[key.m_id]) throw TThread::Interrupt();
} }
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(default : 4290) #pragma warning(default : 4290)
#endif #endif
@ -278,13 +278,13 @@ void ThreadGroup::joinAll() { m_imp->m_boostThreadGroup.join_all(); }
//============================================================================== //==============================================================================
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(disable : 4290) #pragma warning(disable : 4290)
#endif #endif
void TThread::milestone() throw(TThread::Interrupt) { Thread::milestone(); } void TThread::milestone() throw(TThread::Interrupt) { Thread::milestone(); }
#if defined(WIN32) && (_MSC_VER == 1200) #if defined(_WIN32) && (_MSC_VER == 1200)
#pragma warning(default : 4290) #pragma warning(default : 4290)
#endif #endif

2
toonz/sources/toonzlib/sandor_fxs/STColSelPic.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#if _MSC_VER >= 1400 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1
#endif #endif

8
toonz/sources/toonzlib/texturemanager.cpp
View file

@ -92,13 +92,13 @@ TDimension TextureManager::getMaxSize(bool isRGBM) {
void TextureManager::getFmtAndType(bool isRGBM, GLenum &fmt, GLenum &type) { void TextureManager::getFmtAndType(bool isRGBM, GLenum &fmt, GLenum &type) {
if (isRGBM) { if (isRGBM) {
fmt = fmt =
#ifdef TNZ_MACHINE_CHANNEL_ORDER_BGRM #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
GL_BGRA_EXT GL_BGRA_EXT
#elif TNZ_MACHINE_CHANNEL_ORDER_MBGR #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
GL_ABGR_EXT GL_ABGR_EXT
#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM #elif defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM)
GL_RGBA GL_RGBA
#elif TNZ_MACHINE_CHANNEL_ORDER_MRGB #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
GL_BGRA GL_BGRA
#else #else
@undefined chan order @undefined chan order