diff options
| author | mathog <> | 2016-01-27 18:07:29 +0000 |
|---|---|---|
| committer | mathog <> | 2016-01-27 18:07:29 +0000 |
| commit | 6c62bc8a2c267e09cd1057ff51788d92776367cc (patch) | |
| tree | 8fbdd943b0c1908ee4964687f25ab2f3f54bfb88 /src | |
| parent | patch should fix bug 1480651 (diff) | |
| download | inkscape-6c62bc8a2c267e09cd1057ff51788d92776367cc.tar.gz inkscape-6c62bc8a2c267e09cd1057ff51788d92776367cc.zip | |
patch should fix bug 1538361
(bzr r14618)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libuemf/uemf.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libuemf/uemf.h b/src/libuemf/uemf.h index f6ed7da03..1f5255891 100644 --- a/src/libuemf/uemf.h +++ b/src/libuemf/uemf.h @@ -95,11 +95,11 @@ these WMF enumerations is by referencing the following table: /* File: uemf.h -Version: 0.0.32 -Date: 28-APR-2015 +Version: 0.0.33 +Date: 27-JAN-2016 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu -Copyright: 2015 David Mathog and California Institute of Technology (Caltech) +Copyright: 2016 David Mathog and California Institute of Technology (Caltech) */ #ifndef _UEMF_ @@ -2017,6 +2017,7 @@ typedef struct { U_STYLEENTRY elpStyleEntry[1]; //!< Array of StyleEntry (For user specified dot/dash patterns) } U_EXTLOGPEN, *PU_EXTLOGPEN; //!< EMF manual 2.2.20 +#define U_SIZE_EXTLOGPEN (sizeof(U_EXTLOGPEN) - sizeof(U_STYLEENTRY)) // there may not be any style entries /** \brief For U_EMR_* OffBmi* fields @@ -3029,7 +3030,9 @@ typedef struct { //!< Record may include optional DIB bitmap } U_EMREXTCREATEPEN, *PU_EMREXTCREATEPEN; //!< EMF manual 2.3.7.9 -#define U_SIZE_EMREXTCREATEPEN (sizeof(U_EMREXTCREATEPEN)) +/* extlogpen has a field on the end which may or may not be present in a record, so use the predefined size instead +of the struct size */ +#define U_SIZE_EMREXTCREATEPEN (sizeof(U_EMREXTCREATEPEN) - sizeof(U_EXTLOGPEN) + U_SIZE_EXTLOGPEN) /* Index 96.97 */ /** EMF manual 2.3.5.32 |