diff options
| author | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-03-21 23:03:38 +0000 |
|---|---|---|
| committer | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-03-21 23:03:38 +0000 |
| commit | 75da9ac4eaff6383478a9ec82d8bcd3421963aaa (patch) | |
| tree | 31f71c80ddf9db74a3fe0c40aca0c396dd6dbb42 /src | |
| parent | Update share/templates/README (diff) | |
| download | inkscape-75da9ac4eaff6383478a9ec82d8bcd3421963aaa.tar.gz inkscape-75da9ac4eaff6383478a9ec82d8bcd3421963aaa.zip | |
Sync upstream libUEMF (0.2.6)
Corrects typo, suggested by David Binderman
https://gitlab.com/inkscape/inkscape/issues/150
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libuemf/README | 4 | ||||
| -rw-r--r-- | src/3rdparty/libuemf/upmf.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/libuemf/README b/src/3rdparty/libuemf/README index f65120c30..3e009589e 100644 --- a/src/3rdparty/libuemf/README +++ b/src/3rdparty/libuemf/README @@ -19,7 +19,7 @@ bit Solaris (BE). libUEMF is released under the GPL 2 license, read the file 'COPYING' for more information -Version 0.2.5, released Jan 03, 2017. +Version 0.2.6, released Mar 21, 2019. To report bugs or provide feedback send email to David Mathog, mathog@caltech.edu. @@ -377,6 +377,8 @@ History (Note, version numbers in files represent the libUEMF release where it was last modified, so not all files will show the same version numbers in each release.) +0.2.6 2019-03-21 + Fixed typo in upmf.c discovered by David Binderman. 0.2.5 2017-01-03 Fixed a misplaced paren in uemf.h (thanks to Tavmjong Bah for noticing it) Added more U_SIZE_* definitions in uemf.h for "cores" of record types with final diff --git a/src/3rdparty/libuemf/upmf.c b/src/3rdparty/libuemf/upmf.c index 5cb558ac6..fb4c770bb 100644 --- a/src/3rdparty/libuemf/upmf.c +++ b/src/3rdparty/libuemf/upmf.c @@ -21,11 +21,11 @@ /* File: upmf.c -Version: 0.0.12 -Date: 26-JAN-2016 +Version: 0.0.13 +Date: 21-MAR-2019 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu -Copyright: 2016 David Mathog and California Institute of Technology (Caltech) +Copyright: 2019 David Mathog and California Institute of Technology (Caltech) */ #ifdef __cplusplus @@ -6529,7 +6529,7 @@ int U_PMF_POINTF_get(const char **contents, U_FLOAT *X, U_FLOAT *Y, const char * EMF+ manual 2.2.2.37, Microsoft name: EmfPlusPointR Object */ int U_PMF_POINTR_get(const char **contents, U_FLOAT *X, U_FLOAT *Y, const char *blimit){ - if(!contents || !*contents | !X || !Y || !blimit){ return(0); } + if(!contents || !*contents || !X || !Y || !blimit){ return(0); } int size=0; if( U_PMF_INTEGER7_get( contents, X, blimit)){ size +=1; } |