diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-06-01 09:46:21 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-06-01 09:46:21 +0000 |
| commit | 038293f7984fa8bfd89a0451d3d77fce3f62610c (patch) | |
| tree | 4f7c3bb723e12796c38a4ae5f820f5ee43f9fabd /src | |
| parent | Use uniform name for input and output (and PDF is an ISO standard and no long... (diff) | |
| download | inkscape-038293f7984fa8bfd89a0451d3d77fce3f62610c.tar.gz inkscape-038293f7984fa8bfd89a0451d3d77fce3f62610c.zip | |
Avoid name conflict with libwmf (wmf_free).
(bzr r15724)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/wmf-print.cpp | 2 | ||||
| -rw-r--r-- | src/libuemf/uwmf.c | 3 | ||||
| -rw-r--r-- | src/libuemf/uwmf.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 6dd9d895e..29dfa2716 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -312,7 +312,7 @@ unsigned int PrintWmf::finish(Inkscape::Extension::Print * /*mod*/) g_error("Fatal programming error in PrintWmf::finish"); } (void) wmf_finish(wt); // Finalize and write out the WMF - wmf_free(&wt); // clean up + uwmf_free(&wt); // clean up wmf_htable_free(&wht); // clean up return 0; diff --git a/src/libuemf/uwmf.c b/src/libuemf/uwmf.c index 62e3d3c06..50e4075d8 100644 --- a/src/libuemf/uwmf.c +++ b/src/libuemf/uwmf.c @@ -1517,8 +1517,9 @@ int wmf_start( \brief Release memory for an wmf structure in memory. Call this after wmf_finish(). \return 0 on success, >=1 on failure \param wt WMF in memory + Renamed to uwmf_free to avoid conflict with libwmf */ -int wmf_free( +int uwmf_free( WMFTRACK **wt ){ WMFTRACK *wtl; diff --git a/src/libuemf/uwmf.h b/src/libuemf/uwmf.h index 138ffab37..529232ca9 100644 --- a/src/libuemf/uwmf.h +++ b/src/libuemf/uwmf.h @@ -2078,7 +2078,7 @@ typedef struct { // Prototypes (_set first, then _get) char *wmr_dup(const char *wmr); int wmf_start(const char *name, uint32_t initsize, uint32_t chunksize, WMFTRACK **wt); -int wmf_free(WMFTRACK **wt); +int uwmf_free(WMFTRACK **wt); int wmf_finish(WMFTRACK *wt); int wmf_append(U_METARECORD *rec, WMFTRACK *wt, int freerec); int wmf_header_append(U_METARECORD *rec,WMFTRACK *et, int freerec); |