pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

graphics qt_build windows

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57263 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Oleg.Korshul
2014-07-10 07:31:27 +00:00
committed by Alexander Trofimov
parent 7587bee945
commit 846d19acfb
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DesktopEditor/Qt_build/graphics/project/graphics.pro
View File

@ -13,7 +13,6 @@ DEFINES += \
_QT \
FT2_BUILD_LIBRARY \
EXCLUDE_JPG_SUPPORT \
HAVE_UNISTD_H \
MNG_SUPPORT_DISPLAY \
MNG_SUPPORT_READ \
MNG_SUPPORT_WRITE \
@ -23,21 +22,32 @@ DEFINES += \
linux-g++ | linux-g++-64 | linux-g++-32 {
DEFINES += \
HAVE_UNISTD_H \
_LINUX \
_LINUX_QT
message(linux)
}
mac {
DEFINES += \
HAVE_UNISTD_H \
_LINUX \
_LINUX_QT \
_MAC \
QT_MAC
message(mac)
}
win32 {
DEFINES += \
JAS_WIN_MSVC_BUILD \
WIN32
DEFINES -= UNICODE
message(windows)
}
INCLUDEPATH += \

18
DesktopEditor/cximage/CxImage/stdint.h
View File

@ -46,7 +46,7 @@
// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
// or compiler give many errors like this:
// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
/*
/*
#ifdef __cplusplus
extern "C" {
#endif
@ -54,7 +54,7 @@ extern "C" {
#ifdef __cplusplus
}
#endif
*/
*/
// Define _W64 macros to mark types changing their size, like intptr_t.
#ifndef _W64
@ -104,6 +104,19 @@ typedef uint64_t uint_least64_t;
// 7.18.1.3 Fastest minimum-width integer types
typedef int8_t int_fast8_t;
#ifdef _QT
#ifndef WIN32
typedef int16_t int_fast16_t;
#endif
typedef int32_t int_fast32_t;
typedef int64_t int_fast64_t;
typedef uint8_t uint_fast8_t;
#ifndef WIN32
typedef uint16_t uint_fast16_t;
#endif
typedef uint32_t uint_fast32_t;
typedef uint64_t uint_fast64_t;
#else
typedef int16_t int_fast16_t;
typedef int32_t int_fast32_t;
typedef int64_t int_fast64_t;
@ -111,6 +124,7 @@ typedef uint8_t uint_fast8_t;
typedef uint16_t uint_fast16_t;
typedef uint32_t uint_fast32_t;
typedef uint64_t uint_fast64_t;
#endif
// 7.18.1.4 Integer types capable of holding object pointers
#ifdef _WIN64 // [

6
DesktopEditor/cximage/jpeg/jquant2.c
View File

@ -264,9 +264,9 @@ typedef struct {
INT32 volume;
/* The number of nonzero histogram cells within this box */
long colorcount;
} __box;
} __jpg_box;
typedef __box * boxptr;
typedef __jpg_box * boxptr;
LOCAL(boxptr)
@ -545,7 +545,7 @@ select_colors (j_decompress_ptr cinfo, int desired_colors)
/* Allocate workspace for box list */
boxlist = (boxptr) (*cinfo->mem->alloc_small)
((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(__box));
((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(__jpg_box));
/* Initialize one box containing whole space */
numboxes = 1;
boxlist[0].c0min = 0;