Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
8b7057e4
Commit
8b7057e4
authored
Nov 02, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug with disable hinting after first symbol
parent
1ffc2893
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
112 deletions
+16
-112
DesktopEditor/AllFontsGen/AllFontsGen.pro
DesktopEditor/AllFontsGen/AllFontsGen.pro
+14
-110
DesktopEditor/fontengine/FontFile.cpp
DesktopEditor/fontengine/FontFile.cpp
+2
-2
No files found.
DesktopEditor/AllFontsGen/AllFontsGen.pro
View file @
8b7057e4
...
...
@@ -3,122 +3,26 @@ CONFIG += console
CONFIG
-=
app_bundle
CONFIG
-=
qt
CONFIG
+=
c
++
11
CORE_ROOT_DIR
=
$$
PWD
/../..
PWD_ROOT_DIR
=
$$
PWD
include
(
$$
CORE_ROOT_DIR
/
Common
/
base
.
pri
)
###############
destination
path
###############
DESTDIR
=
$$
PWD
/../../
build
/
bin
/
AllFontsGen
#
WINDOWS
win32
:
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
TARGET
=
win_64
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
TARGET
=
win_32
}
linux
-
g
++
{
linux
-
g
++:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
TARGET
=
linux_64
}
linux
-
g
++:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
TARGET
=
linux_32
}
}
linux
-
g
++-
64
{
TARGET
=
linux_64
}
linux
-
g
++-
32
{
TARGET
=
linux_32
}
mac
{
TARGET
=
mac_64
}
################################################
#################
dependencies
#################
DESTINATION_SDK_PATH
=
$$
PWD
/../../
build
/
lib
win32
:
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
win_64
/
DEBUG
}
else
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
win_64
}
}
win32
:
!
contains
(
QMAKE_TARGET
.
arch
,
x86_64
)
:
{
CONFIG
(
debug
,
debug
|
release
)
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
win_32
/
DEBUG
}
else
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
win_32
}
}
linux
-
g
++
{
linux
-
g
++:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_64
}
linux
-
g
++:
!
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_32
}
}
linux
-
g
++-
64
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_64
}
linux
-
g
++-
32
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_32
}
TARGET
=
$$
CORE_BUILDS_PLATFORM_PREFIX
mac
{
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
mac_64
}
LIBS
+=
-
L
$$
DESTINATION_SDK_PATH
-
lgraphics
LIBS
+=
-
L
$$
DESTINATION_SDK_PATH
-
lOfficeUtils
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
{
LIBS
+=
-
lz
}
################################################
LIBS
+=
-
L
$$
CORE_BUILDS_LIBRARIES_PATH
-
lgraphics
-
lOfficeUtils
DEFINES
+=
\
_QT
\
FT2_BUILD_LIBRARY
\
EXCLUDE_JPG_SUPPORT
\
MNG_SUPPORT_DISPLAY
\
MNG_SUPPORT_READ
\
MNG_SUPPORT_WRITE
\
MNG_ACCESS_CHUNKS
\
MNG_STORE_CHUNKS
\
MNG_ERROR_TELLTALE
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
{
DEFINES
+=
\
HAVE_UNISTD_H
\
LINUX
\
_LINUX
\
_LINUX_QT
message
(
linux
)
FT2_BUILD_LIBRARY
QMAKE_CXXFLAGS
+=
-
std
=
c
++
0
x
-
pthread
LIBS
+=
-
pthread
}
mac
{
DEFINES
+=
\
HAVE_UNISTD_H
\
_LINUX
\
_LINUX_QT
\
_MAC
\
QT_MAC
message
(
mac
)
}
INCLUDEPATH
+=
\
..
/
agg
-
2.4
/
include
\
..
/
freetype
-
2.5
.
2
/
include
win32
{
core_windows
{
DEFINES
+=
\
JAS_WIN_MSVC_BUILD
\
WIN32
...
...
@@ -134,8 +38,8 @@ win32 {
LIBS
+=
-
lUser32
}
SOURCES
+=
main
.
cpp
core_linux
{
LIBS
+=
-
lz
}
INCLUDEPATH
+=
\
..
/
agg
-
2.4
/
include
\
..
/
freetype
-
2.5
.
2
/
include
SOURCES
+=
main
.
cpp
DesktopEditor/fontengine/FontFile.cpp
View file @
8b7057e4
...
...
@@ -47,7 +47,7 @@ FT_Error FT_Load_Glyph_Wrapper( FT_Face face,
FT_UInt
glyph_index
,
FT_Int32
&
load_flags
,
INT
&
bHintsSupport
)
{
int
nErr
=
FT_Load_Glyph
(
face
,
glyph_index
,
load_flags
);
int
nErr
=
FT_Load_Glyph
(
face
,
glyph_index
,
load_flags
);
/*
FT_Err_Invalid_Glyph_Index = 0x10;
...
...
@@ -70,7 +70,7 @@ FT_Error FT_Load_Glyph_Wrapper( FT_Face face,
FT_Err_Invalid_Stream_Handle = 0x28;
*/
if
((
bHintsSupport
==
TRUE
)
&&
(
nErr
<
0x10
||
nErr
>
0x28
))
if
((
bHintsSupport
==
TRUE
)
&&
(
nErr
>
0x10
&&
nErr
<
0x28
))
{
int
nErr2
=
FT_Load_Glyph
(
face
,
glyph_index
,
40970
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment