[dia: 24/24] Merge branch 'cairo-port' into 'master'



commit a31108180eeb20c7a2bd05beb007b200d53b0113
Merge: 24c91435 07971282
Author: Zander <zbrown gnome org>
Date:   Sat May 11 15:53:32 2019 +0000

    Merge branch 'cairo-port' into 'master'
    
    Cairo port
    
    See merge request GNOME/dia!31

 app/app_procs.c                                    |   34 +-
 app/color_area.c                                   |  149 +-
 app/color_area.h                                   |    2 +-
 app/diapagelayout.c                                |  133 +-
 app/display.c                                      |  236 +---
 app/display.h                                      |    5 -
 app/gtkhwrapbox.c                                  |    8 +-
 app/gtkvwrapbox.c                                  |    8 +-
 app/interface.c                                    |   67 +-
 app/linewidth_area.c                               |   57 +-
 app/magnify.c                                      |   28 +-
 app/menus.c                                        |    3 +
 app/meson.build                                    |    1 -
 app/modify_tool.c                                  |  101 +-
 app/navigation.c                                   |  130 +-
 app/pixmaps/default.xpm                            |    2 +-
 app/pixmaps/swap.xpm                               |    2 +-
 app/render_gdk.c                                   |  313 -----
 app/render_gdk.h                                   |   25 -
 app/toolbox.c                                      |    8 +-
 config.h.win32                                     |    7 -
 lib/Doxyfile                                       |    2 -
 lib/diaarrowchooser.c                              |   36 +-
 lib/diagdkrenderer.c                               |  953 -------------
 lib/diagdkrenderer.h                               |   65 -
 lib/diainteractiverenderer.c                       |   33 +-
 lib/dialinechooser.c                               |   45 +-
 lib/diarenderer.h                                  |   51 +-
 lib/diatypes.h                                     |    4 -
 lib/meson.build                                    |    6 +-
 lib/object.c                                       |    2 +
 lib/object.h                                       |   28 +-
 lib/render_pixmap.c                                |   99 --
 lib/render_pixmap.h                                |   30 -
 .../cairo => lib/renderer}/diacairo-interactive.c  |  271 ++--
 {plug-ins/cairo => lib/renderer}/diacairo-print.c  |    0
 {plug-ins/cairo => lib/renderer}/diacairo-print.h  |    0
 .../cairo => lib/renderer}/diacairo-renderer.c     |   57 +-
 lib/renderer/diacairo.c                            |  338 +++++
 {plug-ins/cairo => lib/renderer}/diacairo.h        |   21 +
 objects/standard/image.c                           |    2 +-
 objects/standard/outline.c                         |   13 +-
 objects/standard/standard.c                        |    2 -
 plug-ins/cairo/diacairo.c                          |  339 +----
 plug-ins/cairo/meson.build                         |    5 +-
 plug-ins/layout/dia-graph.cpp                      |    4 +-
 plug-ins/layout/layout.cpp                         |   21 +-
 plug-ins/libart/dialibart.c                        |   71 -
 plug-ins/libart/dialibartrenderer.c                | 1417 --------------------
 plug-ins/libart/dialibartrenderer.h                |   62 -
 plug-ins/libart/export_png.c                       |  391 ------
 plug-ins/libart/meson.build                        |   11 -
 plug-ins/libart/render_libart.c                    |  510 -------
 plug-ins/libart/render_libart.h                    |   26 -
 plug-ins/meson.build                               |    1 -
 plug-ins/pixbuf/pixbuf.c                           |   51 +-
 plug-ins/python/pydia-properties.c                 |   26 +-
 plug-ins/python/pydia-property.c                   |   89 +-
 plug-ins/shape/shape-export.c                      |    6 +-
 plug-ins/wmf/wmf.cpp                               |  165 +--
 po/POTFILES.in                                     |    9 +-
 61 files changed, 1184 insertions(+), 5397 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]