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
98285c22
Commit
98285c22
authored
Jun 28, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v4.4.1' of
https://github.com/ONLYOFFICE/core
into release/v4.4.1
parents
bab6e40c
64d6c3c8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
+7
-4
No files found.
DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
View file @
98285c22
...
@@ -195,6 +195,9 @@ static const struct ActionNamesEmf
...
@@ -195,6 +195,9 @@ static const struct ActionNamesEmf
m_oStream
>>
ulType
;
m_oStream
>>
ulType
;
m_oStream
>>
ulSize
;
m_oStream
>>
ulSize
;
if
(
ulSize
<
1
)
continue
;
m_ulRecordPos
=
m_oStream
.
Tell
();
m_ulRecordPos
=
m_oStream
.
Tell
();
m_ulRecordSize
=
ulSize
-
8
;
m_ulRecordSize
=
ulSize
-
8
;
...
@@ -1074,7 +1077,7 @@ static const struct ActionNamesEmf
...
@@ -1074,7 +1077,7 @@ static const struct ActionNamesEmf
m_oStream
.
Skip
(
4
);
// offBits
m_oStream
.
Skip
(
4
);
// offBits
m_oStream
.
Skip
(
4
);
// cbBits
m_oStream
.
Skip
(
4
);
// cbBits
m_ulRecordSize
-=
20
;
unsigned
int
current_size
=
m_ulRecordSize
-
20
;
CEmfLogPen
*
pPen
=
new
CEmfLogPen
();
CEmfLogPen
*
pPen
=
new
CEmfLogPen
();
if
(
!
pPen
)
if
(
!
pPen
)
...
@@ -1088,10 +1091,10 @@ static const struct ActionNamesEmf
...
@@ -1088,10 +1091,10 @@ static const struct ActionNamesEmf
m_oStream
.
Skip
(
4
);
// BrushHatch
m_oStream
.
Skip
(
4
);
// BrushHatch
m_oStream
>>
pPen
->
NumStyleEntries
;
m_oStream
>>
pPen
->
NumStyleEntries
;
m_ulRecordS
ize
-=
24
;
current_s
ize
-=
24
;
if
(
pPen
->
NumStyleEntries
>
0
)
if
(
pPen
->
NumStyleEntries
>
0
)
{
{
m_ulRecordS
ize
-=
pPen
->
NumStyleEntries
*
4
;
current_s
ize
-=
pPen
->
NumStyleEntries
*
4
;
pPen
->
StyleEntry
=
new
unsigned
int
[
pPen
->
NumStyleEntries
];
pPen
->
StyleEntry
=
new
unsigned
int
[
pPen
->
NumStyleEntries
];
if
(
!
pPen
->
StyleEntry
)
if
(
!
pPen
->
StyleEntry
)
{
{
...
@@ -1110,7 +1113,7 @@ static const struct ActionNamesEmf
...
@@ -1110,7 +1113,7 @@ static const struct ActionNamesEmf
}
}
// Пропускаем часть с картинкой, если она была
// Пропускаем часть с картинкой, если она была
m_oStream
.
Skip
(
m_ulRecordS
ize
);
m_oStream
.
Skip
(
current_s
ize
);
m_oPlayer
.
RegisterObject
(
ulPenIndex
,
(
CEmfObjectBase
*
)
pPen
);
m_oPlayer
.
RegisterObject
(
ulPenIndex
,
(
CEmfObjectBase
*
)
pPen
);
}
}
...
...
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