diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-06-24 14:35:43 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-06-24 14:35:43 +0200 |
| commit | 1b6d5594e34bf3c96e225eab794943dc1ce6b1de (patch) | |
| tree | 3088799b3e595f2e062e258c515d97970b00402b /common/rfb/HextileEncoder.cxx | |
| parent | 0e9a00e87cf12087b253e0be214c7a7a045c94de (diff) | |
| parent | 02c6a1bf7ec18701a0f1a44bec20fc383b8f3565 (diff) | |
| download | tigervnc-1b6d5594e34bf3c96e225eab794943dc1ce6b1de.tar.gz tigervnc-1b6d5594e34bf3c96e225eab794943dc1ce6b1de.zip | |
Merge branch 'c++11' of github.com:CendioOssman/tigervnc
Diffstat (limited to 'common/rfb/HextileEncoder.cxx')
| -rw-r--r-- | common/rfb/HextileEncoder.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/rfb/HextileEncoder.cxx b/common/rfb/HextileEncoder.cxx index a63cf1fb..0666d02d 100644 --- a/common/rfb/HextileEncoder.cxx +++ b/common/rfb/HextileEncoder.cxx @@ -38,8 +38,8 @@ BoolParameter improvedHextile("ImprovedHextile", "ratios by the cost of using more CPU time", true); -HextileEncoder::HextileEncoder(SConnection* conn) : - Encoder(conn, encodingHextile, EncoderPlain) +HextileEncoder::HextileEncoder(SConnection* conn_) : + Encoder(conn_, encodingHextile, EncoderPlain) { } @@ -365,7 +365,7 @@ class HextileTile { template<class T> HextileTile<T>::HextileTile() - : m_tile(NULL), m_width(0), m_height(0), + : m_tile(nullptr), m_width(0), m_height(0), m_size(0), m_flags(0), m_background(0), m_foreground(0), m_numSubrects(0) { |