_MSC_VER >= 1900 build

DesktopEditor/cximage/raw/dcr.c

@@ -63,7 +63,9 @@
 #include <sys/utime.h>
 #include <winsock2.h>
 #pragma comment(lib, "ws2_32.lib")
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 typedef __int64 INT64;

DesktopEditor/cximage/raw/dcraw.c

@@ -68,7 +68,9 @@
 #include <sys/utime.h>
 #include <winsock2.h>
 #pragma comment(lib, "ws2_32.lib")
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 typedef __int64 INT64;

DesktopEditor/cximage/raw/libdcr.c

@@ -113,7 +113,9 @@ static dcr_stream_ops dcr_stream_fileops = {
 #include <sys/utime.h>
 #include <winsock2.h>
 #pragma comment(lib, "ws2_32.lib")
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 	typedef __int64 INT64;

DesktopEditor/doctrenderer/doctrenderer.cpp

@@ -599,6 +599,8 @@ namespace NSDoctRenderer
 
         bool ExecuteScript(const std::string& strScript, const std::wstring& sCachePath, std::wstring& strError, std::wstring& strReturnParams)
         {
+            LOGGER_SPEED_START
+
             bool bIsBreak = false;
             v8::Isolate* isolate = CV8Worker::getInitializer()->CreateNew();
             if (true)
@@ -619,6 +621,8 @@ namespace NSDoctRenderer
                 v8::Local<v8::String> source = v8::String::NewFromUtf8(isolate, strScript.c_str());
                 v8::Local<v8::Script> script;
 
+                LOGGER_SPEED_LAP("pre_compile")
+
                 CCacheDataScript oCachedScript(sCachePath);
                 if (sCachePath.empty())
                     script = v8::Script::Compile(source);
@@ -627,6 +631,8 @@ namespace NSDoctRenderer
                     script = oCachedScript.Compile(context, source);
                 }
 
+                LOGGER_SPEED_LAP("compile")
+
                 // COMPILE
                 if (try_catch.HasCaught())
                 {
@@ -658,6 +664,8 @@ namespace NSDoctRenderer
                     }
                 }
 
+                LOGGER_SPEED_LAP("run")
+
                 if (!bIsBreak && m_oParams.m_bIsRetina)
                 {
                     v8::Local<v8::String> sourceParams = v8::String::NewFromUtf8(isolate,
@@ -761,6 +769,8 @@ namespace NSDoctRenderer
                     }
                 }
 
+                LOGGER_SPEED_LAP("open")
+
                 // CHANGES
                 if (!bIsBreak)
                 {
@@ -823,6 +833,8 @@ namespace NSDoctRenderer
                     }
                 }
 
+                LOGGER_SPEED_LAP("changes")
+
                 bool bIsMailMerge = false;
                 if (!m_oParams.m_strMailMergeDatabasePath.empty() &&
                         m_oParams.m_nMailMergeIndexEnd >= m_oParams.m_nMailMergeIndexStart &&
@@ -997,6 +1009,8 @@ namespace NSDoctRenderer
                 {
                     bIsBreak = Doct_renderer_SaveFile(&m_oParams, pNative, isolate, global_js, args, try_catch, strError);
                 }
+
+                LOGGER_SPEED_LAP("save")
             }
 
             isolate->Dispose();

DesktopEditor/raster/JBig2/source/LeptonLib/environ.h

@@ -269,7 +269,7 @@ enum {
 /*------------------------------------------------------------------------*
  *                        snprintf() renamed in MSVC                      *
  *------------------------------------------------------------------------*/
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
 

DesktopEditor/xml/build/qt/config.h

@@ -129,7 +129,9 @@ int isnan (double d) {
 
 #if defined(_MSC_VER)
 #define mkdir(p,m) _mkdir(p)
+#if _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #if _MSC_VER < 1500
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
 #endif

DesktopEditor/xml/build/vs2013/config.h

@@ -127,7 +127,9 @@ static int isnan (double d) {
 
 #if defined(_MSC_VER)
 #define mkdir(p,m) _mkdir(p)
+#if _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #if _MSC_VER < 1500
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
 #endif

DesktopEditor/xml/libxml2/win32/wince/wincecompat.h

@@ -43,7 +43,9 @@ char *strerror(int errnum);
 	Macro'ed inexistant funtion names
 
 */
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
 #define perror(_t) MessageBox(NULL, _T("_t"), _T("Error/Warning"), MB_OK)