Merge lp://qastaging/~inkscape.dev/inkscape/emf-support into lp://qastaging/~inkscape.dev/inkscape/trunk
Proposed by
Martin Owens
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 12488 | ||||||||||||
| Proposed branch: | lp://qastaging/~inkscape.dev/inkscape/emf-support | ||||||||||||
| Merge into: | lp://qastaging/~inkscape.dev/inkscape/trunk | ||||||||||||
| Diff against target: |
49457 lines (+44253/-3969) 64 files modified
configure.ac (+1/-0) po/POTFILES.in (+2/-1) share/extensions/Makefile.am (+1/-0) share/extensions/fontfix.conf (+55/-0) src/2geom/generic-rect.h (+1/-1) src/Makefile.am (+5/-4) src/attributes-test.h (+3/-0) src/attributes.cpp (+3/-0) src/attributes.h (+4/-1) src/display/drawing-context.h (+15/-0) src/display/drawing-text.cpp (+286/-16) src/display/drawing-text.h (+12/-3) src/display/nr-style.cpp (+58/-0) src/display/nr-style.h (+37/-0) src/extension/CMakeLists.txt (+8/-4) src/extension/init.cpp (+9/-9) src/extension/internal/Makefile_insert (+20/-4) src/extension/internal/emf-inout.cpp (+3549/-0) src/extension/internal/emf-inout.h (+211/-0) src/extension/internal/emf-print.cpp (+2202/-0) src/extension/internal/emf-print.h (+138/-0) src/extension/internal/emf-win32-inout.cpp (+0/-2582) src/extension/internal/emf-win32-inout.h (+0/-57) src/extension/internal/emf-win32-print.cpp (+0/-928) src/extension/internal/emf-win32-print.h (+0/-113) src/extension/internal/text_reassemble.c (+2884/-0) src/extension/internal/text_reassemble.h (+386/-0) src/extension/internal/uemf.c (+5523/-0) src/extension/internal/uemf.h (+2889/-0) src/extension/internal/uemf_endian.c (+1783/-0) src/extension/internal/uemf_endian.h (+37/-0) src/extension/internal/uemf_print.c (+2358/-0) src/extension/internal/uemf_print.h (+169/-0) src/extension/internal/uemf_utf.c (+552/-0) src/extension/internal/uemf_utf.h (+53/-0) src/extension/internal/uwmf.c (+6880/-0) src/extension/internal/uwmf.h (+2492/-0) src/extension/internal/uwmf_endian.c (+1772/-0) src/extension/internal/uwmf_endian.h (+39/-0) src/extension/internal/uwmf_print.c (+1616/-0) src/extension/internal/uwmf_print.h (+48/-0) src/extension/internal/wmf-inout.cpp (+3235/-0) src/extension/internal/wmf-inout.h (+213/-0) src/extension/internal/wmf-print.cpp (+1994/-0) src/extension/internal/wmf-print.h (+147/-0) src/helper/geom.cpp (+310/-0) src/helper/geom.h (+5/-0) src/libnrtype/FontInstance.cpp (+35/-0) src/libnrtype/Layout-TNG-Compute.cpp (+172/-62) src/libnrtype/Layout-TNG-Output.cpp (+264/-50) src/libnrtype/Layout-TNG.h (+4/-0) src/libnrtype/font-instance.h (+2/-0) src/libunicode-convert/Makefile_insert (+5/-0) src/libunicode-convert/README (+1/-0) src/libunicode-convert/makefile.in (+17/-0) src/libunicode-convert/unicode-convert.c (+1008/-0) src/libunicode-convert/unicode-convert.h (+51/-0) src/splivarot.cpp (+217/-3) src/splivarot.h (+2/-0) src/style.cpp (+303/-94) src/style.h (+49/-6) src/text-editing.cpp (+38/-20) src/widgets/dash-selector.cpp (+75/-11) src/widgets/dash-selector.h (+5/-0) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~inkscape.dev/inkscape/emf-support | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Krzysztof Kosinski | Needs Fixing | ||
| Martin Owens | Pending | ||
|
Review via email:
|
|||
Description of the change
Merge the code now fixed by suv
To post a comment you must log in.
Revision history for this message
| Martin Owens (doctormo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Some code cleanups are definitely needed.
1. The directory libunicode-convert is misleadingly named. This is not a 'library' and has little to do with Unicode. It is a set of functions to handle non-Unicode symbol fonts such as Symbol, Wingdings and Dingbats. The functions have nonstandard names.
http://
2. None of the new code adheres to the Inkscape coding style. Most of the problems related to whitespace can probably be fixed by running the code through 'astyle', but naming problems need manual resolution.
3. libuemf should be in a separate directory, like other in-tree libraries, rather than stored in src/extension/