Add convenience variant of getImage()

diff --git a/common/rfb/PixelBuffer.cxx b/common/rfb/PixelBuffer.cxx
index ed74a874da6c93edbc84df2a5a59426e19657a4c..3f7f301988840d980476e8b929264c984c56435e 100644 (file)
--- a/common/rfb/PixelBuffer.cxx
+++ b/common/rfb/PixelBuffer.cxx
@@ -60,6 +60,26 @@ PixelBuffer::getImage(void* imageBuf, const Rect& r, int outStride) {
   }
 }
 
+void PixelBuffer::getImage(const PixelFormat& pf, void* imageBuf,
+                           const Rect& r, int stride)
+{
+  const rdr::U8* srcBuffer;
+  int srcStride;
+
+  if (format.equal(pf)) {
+    getImage(imageBuf, r, stride);
+    return;
+  }
+
+  if (stride == 0)
+    stride = r.width();
+
+  srcBuffer = getBuffer(r, &srcStride);
+
+  pf.bufferFromBuffer((U8*)imageBuf, format, srcBuffer, r.width(), r.height(),
+                      stride, srcStride);
+}
+
 // -=- Modifiable generic pixel buffer class
 
 ModifiablePixelBuffer::ModifiablePixelBuffer(const PixelFormat& pf,

diff --git a/common/rfb/PixelBuffer.h b/common/rfb/PixelBuffer.h
index 7060a014cf677f7f5b243ecbe4a00425e337a400..5bc06c297f5ea6a534757b4e7c6900c4daee3911 100644 (file)
--- a/common/rfb/PixelBuffer.h
+++ b/common/rfb/PixelBuffer.h
@@ -72,6 +72,11 @@ namespace rfb {
     //   stride. Try to avoid using this though as getBuffer() will in
     //   most cases avoid the extra memory copy.
     void getImage(void* imageBuf, const Rect& r, int stride=0);
+    // Get pixel data in a given format
+    //   Works just the same as getImage(), but guaranteed to be in a
+    //   specific format.
+    void getImage(const PixelFormat& pf, void* imageBuf,
+                  const Rect& r, int stride=0);
 
     ///////////////////////////////////////////////
     // Framebuffer update methods