Do not use JPEG if not requested by the client.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2374 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/SMsgWriter.cxx b/common/rfb/SMsgWriter.cxx
index 1a02ce34b309601aa0b2d4e11311333819cef778..a8b9c29ef9586e89aeea99ce2b1e9eca26e28a6e 100644 (file)
--- a/common/rfb/SMsgWriter.cxx
+++ b/common/rfb/SMsgWriter.cxx
@@ -105,7 +105,8 @@ void SMsgWriter::setupCurrentEncoder()
 
   encoders[encoding]->setCompressLevel(cp->compressLevel);
   encoders[encoding]->setQualityLevel(cp->qualityLevel);
-  jpegEncoder->setQualityLevel(cp->qualityLevel);
+  if (cp->qualityLevel != -1)
+    jpegEncoder->setQualityLevel(cp->qualityLevel);
 }
 
 int SMsgWriter::getNumRects(const Rect &r)
@@ -175,7 +176,7 @@ bool SMsgWriter::writeRect(const Rect& r, unsigned int encoding,
 
 bool SMsgWriter::canUseJpegEncoder(PixelBuffer *pb) const
 {
-  return jpegEncoder->isPixelFormatSupported(pb);
+  return (cp->qualityLevel != -1 && jpegEncoder->isPixelFormatSupported(pb));
 }
 
 void SMsgWriter::writeJpegRect(PixelBuffer *pb, const Rect& r)