Commit 511a9d02 authored by ElenaSubbotina's avatar ElenaSubbotina

X2t version up

parent 46130bca
...@@ -67,18 +67,41 @@ typedef struct ...@@ -67,18 +67,41 @@ typedef struct
namespace DocFileFormat 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; Global::BlipType btWin32 = Global::msoblipDIB;
int offset = 0, biSizeImage = 0; int offset = 0, biSizeImage = 0;
BITMAPINFOHEADER * header = (BITMAPINFOHEADER*)data; __BITMAPINFOHEADER * header = (__BITMAPINFOHEADER*)data;
if (!header) return btWin32; if (!header) return btWin32;
if (header->biWidth > 100000 || header->biHeight > 100000 || header->biSize != 40) 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) if (header_core->bcSize != 12)
{ {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.378 VERSION = 2.0.2.380
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
mac { mac {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment