components/library/libfreehand/patches/01-Wdeprecated-copy.patch

   1 From 28d9b20b58ad5a323c6099e1187c65b656c1ef72 Mon Sep 17 00:00:00 2001
   2 From: Albert Astals Cid <aacid@kde.org>
   3 Date: Thu, 10 Oct 2019 13:12:52 +0200
   4 Subject: [PATCH] Fix -Wdeprecated-copy warning
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 FHCollector.cpp: In member function ‘void libfreehand::FHCollector::collectXform(unsigned int, double, double, double, double, double, double)’:
  10 FHCollector.cpp:285:68: warning: implicitly-declared ‘constexpr libfreehand::FHTransform& libfreehand::FHTransform::operator=(const libfreehand::FHTransform&)’ is deprecated [-Wdeprecated-copy]
  11   285 |   m_transforms[recordId] = FHTransform(m11, m21, m12, m22, m13, m23);
  12       |                                                                    ^
  13 In file included from FHCollector.h:18,
  14                  from FHCollector.cpp:14:
  15 FHTransform.h:22:3: note: because ‘libfreehand::FHTransform’ has user-provided ‘libfreehand::FHTransform::FHTransform(const libfreehand::FHTransform&)’
  16    22 |   FHTransform(const FHTransform &trafo);
  17       |   ^~~~~~~~~~~
  18
  19 Change-Id: I8b3c7e00aff715662af13995aa4c623d33346b3c
  20 Reviewed-on: https://gerrit.libreoffice.org/80602
  21 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
  22 Tested-by: Miklos Vajna <vmiklos@collabora.com>
  23 ---
  24  src/lib/FHTransform.cpp | 6 ++----
  25  src/lib/FHTransform.h   | 1 +
  26  2 files changed, 3 insertions(+), 4 deletions(-)
  27
  28 diff --git a/src/lib/FHTransform.cpp b/src/lib/FHTransform.cpp
  29 index bbe534c..3a5bdbc 100644
  30 --- a/src/lib/FHTransform.cpp
  31 +++ b/src/lib/FHTransform.cpp
  32 @@ -22,10 +22,8 @@ libfreehand::FHTransform::FHTransform(double m11, double m21, double m12, double
  33  {
  34  }
  35
  36 -libfreehand::FHTransform::FHTransform(const FHTransform &trafo)
  37 -  : m_m11(trafo.m_m11), m_m21(trafo.m_m21), m_m12(trafo.m_m12),
  38 -    m_m22(trafo.m_m22), m_m13(trafo.m_m13), m_m23(trafo.m_m23) {}
  39 -
  40 +libfreehand::FHTransform::FHTransform(const FHTransform &trafo) = default;
  41 +libfreehand::FHTransform &libfreehand::FHTransform::operator=(const FHTransform &trafo) = default;
  42
  43  void libfreehand::FHTransform::applyToPoint(double &x, double &y) const
  44  {
  45 diff --git a/src/lib/FHTransform.h b/src/lib/FHTransform.h
  46 index a53e13a..58a7f6b 100644
  47 --- a/src/lib/FHTransform.h
  48 +++ b/src/lib/FHTransform.h
  49 @@ -20,6 +20,7 @@ struct FHTransform
  50    FHTransform();
  51    FHTransform(double m11, double m21, double m12, double m22, double m13, double m23);
  52    FHTransform(const FHTransform &trafo);
  53 +  FHTransform &operator=(const FHTransform &trafo);
  54
  55    void applyToPoint(double &x, double &y) const;
  56    void applyToArc(double &rx, double &ry, double &rotation, bool &sweep, double &endx, double &endy) const;