Fix regression caused by r4841. That patch assumed that JPEG encoding always uses the raw buffer, which is not true. If pixel translation is necessary, then JPEG images will sometimes be encoded from the translated (intermediate) buffer instead.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4852 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/TightEncoder.h b/common/rfb/TightEncoder.h
index 10ca761..4fff083 100644
--- a/common/rfb/TightEncoder.h
+++ b/common/rfb/TightEncoder.h
@@ -100,9 +100,9 @@
int paletteInsert(rdr::U32 rgb, int numPixels, int bpp);
void paletteReset(void);
- void fastFillPalette8(const rdr::U8 *buffer, int stride, const Rect &r);
- void fastFillPalette16(const rdr::U8 *buffer, int stride, const Rect &r);
- void fastFillPalette32(const rdr::U8 *buffer, int stride, const Rect &r);
+ void fastFillPalette8(const rdr::U8 *data, int stride, const Rect &r);
+ void fastFillPalette16(const rdr::U16 *data, int stride, const Rect &r);
+ void fastFillPalette32(const rdr::U32 *data, int stride, const Rect &r);
void fillPalette8(rdr::U8 *data, int count);
void fillPalette16(rdr::U16 *data, int count);
@@ -135,7 +135,10 @@
void encodeIndexedRect16(rdr::U16 *buf, const Rect& r, rdr::OutStream *os);
void encodeIndexedRect32(rdr::U32 *buf, const Rect& r, rdr::OutStream *os);
- void encodeJpegRect(const Rect& r, rdr::OutStream *os);
+ void encodeJpegRect16(rdr::U16 *buf, int stride, const Rect& r,
+ rdr::OutStream *os);
+ void encodeJpegRect32(rdr::U32 *buf, int stride, const Rect& r,
+ rdr::OutStream *os);
SMsgWriter* writer;
rdr::MemOutStream mos;