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
774f9c42
Commit
774f9c42
authored
Feb 01, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PDF bugs
parent
10964d32
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
DesktopEditor/fontengine/fontconverter/FontFileBase.h
DesktopEditor/fontengine/fontconverter/FontFileBase.h
+8
-8
HtmlRenderer/src/HTMLRenderer3.cpp
HtmlRenderer/src/HTMLRenderer3.cpp
+4
-0
No files found.
DesktopEditor/fontengine/fontconverter/FontFileBase.h
View file @
774f9c42
...
@@ -96,7 +96,7 @@ namespace NSFontConverter
...
@@ -96,7 +96,7 @@ namespace NSFontConverter
// BE = big endian
// BE = big endian
int
GetS8
(
int
nPos
,
bool
*
pbSuccess
)
int
GetS8
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
>=
m_nLen
)
{
{
...
@@ -111,7 +111,7 @@ namespace NSFontConverter
...
@@ -111,7 +111,7 @@ namespace NSFontConverter
int
GetU8
(
int
nPos
,
bool
*
pbSuccess
)
int
GetU8
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
>=
m_nLen
)
{
{
*
pbSuccess
=
false
;
*
pbSuccess
=
false
;
...
@@ -122,7 +122,7 @@ namespace NSFontConverter
...
@@ -122,7 +122,7 @@ namespace NSFontConverter
int
GetS16BE
(
int
nPos
,
bool
*
pbSuccess
)
int
GetS16BE
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
1
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
+
1
>=
m_nLen
)
{
{
...
@@ -138,7 +138,7 @@ namespace NSFontConverter
...
@@ -138,7 +138,7 @@ namespace NSFontConverter
int
GetU16BE
(
int
nPos
,
bool
*
pbSuccess
)
int
GetU16BE
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
1
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
+
1
>=
m_nLen
)
{
{
...
@@ -152,7 +152,7 @@ namespace NSFontConverter
...
@@ -152,7 +152,7 @@ namespace NSFontConverter
int
GetS32BE
(
int
nPos
,
bool
*
pbSuccess
)
int
GetS32BE
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
{
{
...
@@ -171,7 +171,7 @@ namespace NSFontConverter
...
@@ -171,7 +171,7 @@ namespace NSFontConverter
unsigned
int
GetU32BE
(
int
nPos
,
bool
*
pbSuccess
)
unsigned
int
GetU32BE
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
{
{
...
@@ -186,7 +186,7 @@ namespace NSFontConverter
...
@@ -186,7 +186,7 @@ namespace NSFontConverter
}
}
unsigned
int
GetU32LE
(
int
nPos
,
bool
*
pbSuccess
)
unsigned
int
GetU32LE
(
int
nPos
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
if
(
nPos
<
0
||
nPos
+
3
>=
m_nLen
)
{
{
...
@@ -201,7 +201,7 @@ namespace NSFontConverter
...
@@ -201,7 +201,7 @@ namespace NSFontConverter
}
}
unsigned
int
GetUVarBE
(
int
nPos
,
int
nSize
,
bool
*
pbSuccess
)
unsigned
int
GetUVarBE
(
int
nPos
,
int
nSize
,
bool
*
pbSuccess
)
{
{
*
pbSuccess
=
true
;
//
*pbSuccess = true;
if
(
nPos
<
0
||
nPos
+
nSize
>
m_nLen
)
if
(
nPos
<
0
||
nPos
+
nSize
>
m_nLen
)
{
{
...
...
HtmlRenderer/src/HTMLRenderer3.cpp
View file @
774f9c42
...
@@ -1261,6 +1261,10 @@ namespace NSHtmlRenderer
...
@@ -1261,6 +1261,10 @@ namespace NSHtmlRenderer
m_pInternal
->
m_bPageOpened
=
false
;
m_pInternal
->
m_bPageOpened
=
false
;
m_pInternal
->
m_pFontManager
=
m_pInternal
->
m_oApplicationFonts
.
GenerateFontManager
();
m_pInternal
->
m_pFontManager
=
m_pInternal
->
m_oApplicationFonts
.
GenerateFontManager
();
CFontsCache
*
pGraphicsFontCache
=
new
CFontsCache
();
pGraphicsFontCache
->
SetStreams
(
m_pInternal
->
m_oApplicationFonts
.
GetStreams
());
pGraphicsFontCache
->
SetCacheSize
(
16
);
m_pInternal
->
m_pFontManager
->
SetOwnerCache
(
pGraphicsFontCache
);
m_pInternal
->
m_oFont
.
SetDefaultParams
();
m_pInternal
->
m_oFont
.
SetDefaultParams
();
m_pInternal
->
m_oInstalledFont
.
SetDefaultParams
();
m_pInternal
->
m_oInstalledFont
.
SetDefaultParams
();
...
...
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