diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-29 02:47:26 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-29 02:47:26 +0000 |
| commit | cac7cd66a4a2e2e97663399dd2335a06ab9da562 (patch) | |
| tree | d27be44a4c4c68142e949ef7790d53b017b96ce7 /src/libuemf | |
| parent | Update to trunk and fix issues (diff) | |
| parent | Improved support for clipping on EMF/WMF import, see bug 1302857 (diff) | |
| download | inkscape-cac7cd66a4a2e2e97663399dd2335a06ab9da562.tar.gz inkscape-cac7cd66a4a2e2e97663399dd2335a06ab9da562.zip | |
Update to trunk
(bzr r13090.1.68)
Diffstat (limited to 'src/libuemf')
| -rw-r--r-- | src/libuemf/uemf.c | 6 | ||||
| -rw-r--r-- | src/libuemf/uemf.h | 5 | ||||
| -rw-r--r-- | src/libuemf/uwmf.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/libuemf/uemf.c b/src/libuemf/uemf.c index 069cf901b..1d417dece 100644 --- a/src/libuemf/uemf.c +++ b/src/libuemf/uemf.c @@ -16,8 +16,8 @@ /* File: uemf.c -Version: 0.0.26 -Date: 24-MAR-2014 +Version: 0.0.28 +Date: 04-APR-2014 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu Copyright: 2014 David Mathog and California Institute of Technology (Caltech) @@ -417,7 +417,7 @@ uint32_t emr_properties(uint32_t type){ table[ 64] = 0x90; // U_EMRSTROKEPATH 1 0 0 1 0 0 0 0 table[ 65] = 0xA0; // U_EMRFLATTENPATH 1 0 1 0 0 0 0 0 table[ 66] = 0xA0; // U_EMRWIDENPATH 1 0 1 0 0 0 0 0 - table[ 67] = 0xA0; // U_EMRSELECTCLIPPATH 1 0 1 0 0 0 0 0 + table[ 67] = 0x80; // U_EMRSELECTCLIPPATH 1 0 0 0 0 0 0 0 consumes the path, draws nothing table[ 68] = 0xA0; // U_EMRABORTPATH 1 0 1 0 0 0 0 0 table[ 69] = 0xA0; // U_EMRUNDEF69 1 0 1 0 0 0 0 0 table[ 70] = 0x00; // U_EMRCOMMENT 0 0 0 0 0 0 0 0 diff --git a/src/libuemf/uemf.h b/src/libuemf/uemf.h index cde1b6c85..a792a65de 100644 --- a/src/libuemf/uemf.h +++ b/src/libuemf/uemf.h @@ -95,8 +95,8 @@ these WMF enumerations is by referencing the following table: /* File: uemf.h -Version: 0.0.26 -Date: 27-MAR-2014 +Version: 0.0.27 +Date: 28-MAR-2014 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu Copyright: 2014 David Mathog and California Institute of Technology (Caltech) @@ -1167,6 +1167,7 @@ typedef struct { EMF manual 2.1.29 @{ */ +#define U_RGN_NONE 0 //!< not part of EMF standard, may be used by others #define U_RGN_AND 1 //!< Region becomes intersection of existing region and new region. #define U_RGN_OR 2 //!< Region becomes union of existing region and new region. #define U_RGN_XOR 3 //!< Region becomes XOR of existing and new regions. diff --git a/src/libuemf/uwmf.c b/src/libuemf/uwmf.c index b4a1dfc52..b378e587f 100644 --- a/src/libuemf/uwmf.c +++ b/src/libuemf/uwmf.c @@ -19,8 +19,8 @@ /* File: uwmf.c -Version: 0.0.14 -Date: 24-MAR-2014 +Version: 0.0.15 +Date: 11-APR-2014 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu Copyright: 2014 David Mathog and California Institute of Technology (Caltech) @@ -3019,7 +3019,7 @@ char *U_WMRESCAPE_set(uint16_t Escape, uint16_t Length, const void *Data){ \param DC Drawing Context to restore. (negative is relative to current, positive is absolute) */ char *U_WMRRESTOREDC_set(int16_t DC){ - return U_WMRCORE_1U16_set(U_WMR_SETMAPMODE, DC); + return U_WMRCORE_1U16_set(U_WMR_RESTOREDC, DC); } /** |