[pan: 15/22] Merge branch 'master' of https://gitlab.gnome.org/GNOME/pan into cppcheck




commit e59471a5ec03554f49d459c2a60ddb9b620abeb2
Merge: b675907 d2fc86d
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sat Jul 9 17:05:05 2022 +0100

    Merge branch 'master' of https://gitlab.gnome.org/GNOME/pan into cppcheck
    
    # Conflicts:
    #       pan/tasks/decoder.cc
    #       pan/tasks/encoder.cc

 pan/tasks/encoder.cc |  7 ++++---
 po/sv.po             | 51 ++++++++++++++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 28 deletions(-)
---
diff --cc pan/tasks/encoder.cc
index 0c1775d,c77ae6c..154dbd8
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@@ -48,15 -47,9 +48,16 @@@ namespace pan 
  
  
  Encoder :: Encoder (WorkerPool& pool):
--  health(OK),
 +  parts(0),
 +  task(nullptr),
 +  bpf(0),
 +  cache(nullptr),
 +  needed(nullptr),
 +  article(nullptr),
-   percent(0.0),  _worker_pool (pool),
-   _gsourceid (-1)
++  percent(0.0),
+   _worker_pool (pool),
 -  _gsourceid (-1)
++  _gsourceid (-1),
++  health(OK),
  {}
  
  


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