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
511a9d02
Commit
511a9d02
authored
Jul 13, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X2t version up
parent
46130bca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
4 deletions
+27
-4
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
+26
-3
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+1
-1
No files found.
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
View file @
511a9d02
...
...
@@ -67,18 +67,41 @@ typedef struct
namespace
DocFileFormat
{
Global
::
BlipType
GetFormatPict
(
unsigned
char
*
data
,
int
size
)
struct
__BITMAPINFOHEADER
{
DWORD
biSize
;
LONG
biWidth
;
LONG
biHeight
;
WORD
biPlanes
;
WORD
biBitCount
;
DWORD
biCompression
;
DWORD
biSizeImage
;
LONG
biXPelsPerMeter
;
LONG
biYPelsPerMeter
;
DWORD
biClrUsed
;
DWORD
biClrImportant
;
};
struct
__BITMAPCOREHEADER
{
DWORD
bcSize
;
/* used to get to color table */
WORD
bcWidth
;
WORD
bcHeight
;
WORD
bcPlanes
;
WORD
bcBitCount
;
};
Global
::
BlipType
GetFormatPict
(
unsigned
char
*
data
,
int
size
)
{
Global
::
BlipType
btWin32
=
Global
::
msoblipDIB
;
int
offset
=
0
,
biSizeImage
=
0
;
BITMAPINFOHEADER
*
header
=
(
BITMAPINFOHEADER
*
)
data
;
__BITMAPINFOHEADER
*
header
=
(
__
BITMAPINFOHEADER
*
)
data
;
if
(
!
header
)
return
btWin32
;
if
(
header
->
biWidth
>
100000
||
header
->
biHeight
>
100000
||
header
->
biSize
!=
40
)
{
BITMAPCOREHEADER
*
header_core
=
(
BITMAPCOREHEADER
*
)
data
;
__BITMAPCOREHEADER
*
header_core
=
(
__BITMAPCOREHEADER
*
)
data
;
if
(
header_core
->
bcSize
!=
12
)
{
...
...
X2tConverter/build/Qt/X2tConverter.pro
View file @
511a9d02
...
...
@@ -7,7 +7,7 @@
QT
-=
core
QT
-=
gui
VERSION
=
2.0
.
2.3
78
VERSION
=
2.0
.
2.3
80
DEFINES
+=
INTVER
=
$$
VERSION
mac
{
...
...
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