revert to 59341

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59349 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/cximage/CxImage/ximage.h

@@ -53,9 +53,7 @@
 #endif 
 
 #ifdef _LINUX
-  #pragma once
-
-    #define _XOPEN_SOURCE
+  #define _XOPEN_SOURCE
   #include <unistd.h>
   #include <arpa/inet.h>
 #endif

DesktopEditor/cximage/CxImage/ximainfo.cpp

@@ -13,14 +13,6 @@
     #endif
 #endif
 
-#ifndef _T(x)
-    #ifdef UNICODE
-        #define _T(x) L##x
-    #else
-        #define _T(x) x
-    #endif
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 /**
  * \return the color used for transparency, and/or for background color

DesktopEditor/cximage/CxImage/ximaiter.h

@@ -31,8 +31,6 @@
 
 #include "ximage.h"
 #include "ximadef.h"
-
-#include <algorithm>
 /*
 #ifndef min
 #define min(a,b) (((a)<(b))?(a):(b))
@@ -41,8 +39,6 @@
 #define max(a,b) (((a)>(b))?(a):(b))
 #endif
 */
-
-
 class CImageIterator
 {
 friend class CxImage;

DesktopEditor/cximage/CxImage/ximajpg.cpp

@@ -19,13 +19,6 @@
 
 #include <setjmp.h>
 
-#ifdef UNICODE
-     #define _T(x)      L##x
-#else // UNICODE
-    #define _T(x)      x
-
-#endif // UNICODE
-
 struct jpg_error_mgr {
 	struct jpeg_error_mgr pub;	/* "public" fields */
 	jmp_buf setjmp_buffer;		/* for return to caller */

DesktopEditor/cximage/CxImage/ximapng.cpp

@@ -151,7 +151,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
 			RGBQUAD* pal=GetPalette();
 			if (pal){
 				uint32_t ip;
-                for (ip=0;ip<(std::min)(head.biClrUsed,(uint32_t)info_ptr->num_trans);ip++)
+                for (ip=0;ip<(std::min)((long)head.biClrUsed,(long)info_ptr->num_trans);ip++)
 					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
 					pal[ip].rgbReserved=255;

DesktopEditor/cximage/CxImage/ximaraw.cpp

@@ -20,13 +20,6 @@
 #define max(a,b) (((a)>(b))?(a):(b))
 #endif
 
-#ifdef UNICODE
-     #define _T(x)      L##x
-#else // UNICODE
-    #define _T(x)      x
-
-#endif // UNICODE
-
 #if CXIMAGE_SUPPORT_RAW
 
 ////////////////////////////////////////////////////////////////////////////////

DesktopEditor/cximage/CxImage/xiofile.h

@@ -2,13 +2,16 @@
 #define __xiofile_h
 
 #include "xfile.h"
+#ifndef _WIN32
+#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
+#endif
+//#include <TCHAR.h>
 
-#ifndef TCHAR
-    #ifdef  UNICODE
-#include <wchar.h>
-        #define TCHAR wchar_t
+#ifndef WIN32
+    #ifdef _UNICODE
+        typedef wchar_t TCHAR;
     #else
-        #define TCHAR char
+        typedef char TCHAR;
     #endif
 #endif