commit 8635062c071d23bf75dc4d9be598ee39a735d891
author Pierre Ossman <ossman@cendio.se> Tue Nov 10 13:02:12 2015 +0100
committer Pierre Ossman <ossman@cendio.se> Fri Nov 27 10:57:41 2015 +0100
tree 974a2256c37ef5b3fbcd9d8dac77ff39e4fe6201
parent f22d350e75e798863927c54031fc5dc5e84ae3c4

Decouple decoders from CConnection

common/rfb/CopyRectDecoder.cxx

diff --git a/common/rfb/CopyRectDecoder.cxx b/common/rfb/CopyRectDecoder.cxx
index 4b10418..4690b5e 100644
--- a/common/rfb/CopyRectDecoder.cxx
+++ b/common/rfb/CopyRectDecoder.cxx
@@ -16,13 +16,12 @@
  * USA.
  */
 #include <rdr/InStream.h>
-#include <rfb/CConnection.h>
 #include <rfb/PixelBuffer.h>
 #include <rfb/CopyRectDecoder.h>
 
 using namespace rfb;
 
-CopyRectDecoder::CopyRectDecoder(CConnection* conn) : Decoder(conn)
+CopyRectDecoder::CopyRectDecoder()
 {
 }
 
@@ -30,9 +29,11 @@
 {
 }
 
-void CopyRectDecoder::readRect(const Rect& r, ModifiablePixelBuffer* pb)
+void CopyRectDecoder::readRect(const Rect& r, rdr::InStream* is,
+                               const ConnParams& cp,
+                               ModifiablePixelBuffer* pb)
 {
-  int srcX = conn->getInStream()->readU16();
-  int srcY = conn->getInStream()->readU16();
+  int srcX = is->readU16();
+  int srcY = is->readU16();
   pb->copyRect(r, Point(r.tl.x-srcX, r.tl.y-srcY));
 }