commit b948a9172f7cc1fd24761221bc1e2d8d10648c10
author Pierre Ossman <ossman@cendio.se> Wed Jan 15 13:23:43 2014 +0100
committer Pierre Ossman <ossman@cendio.se> Mon Jul 07 13:27:09 2014 +0200
tree 050bb91b53744a9d16c4225139e8811f904fcb9a
parent 947b48de71e03df2df7010c5760766b93483c9e5

Make the subsampling setting follow the common style

common/rfb/JpegCompressor.cxx

diff --git a/common/rfb/JpegCompressor.cxx b/common/rfb/JpegCompressor.cxx
index 47f09d8..7dbb7d9 100644
--- a/common/rfb/JpegCompressor.cxx
+++ b/common/rfb/JpegCompressor.cxx
@@ -21,6 +21,7 @@
 #include <rdr/Exception.h>
 #include <rfb/Rect.h>
 #include <rfb/PixelFormat.h>
+#include <rfb/ConnParams.h>
 #include <os/print.h>
 
 #include <stdio.h>
@@ -142,7 +143,7 @@
 }
 
 void JpegCompressor::compress(const rdr::U8 *buf, int pitch, const Rect& r,
-  const PixelFormat& pf, int quality, JPEG_SUBSAMP subsamp)
+  const PixelFormat& pf, int quality, int subsamp)
 {
   int w = r.width();
   int h = r.height();
@@ -217,15 +218,18 @@
   }
 
   switch (subsamp) {
-  case SUBSAMP_420:
+  case subsample16X:
+  case subsample8X:
+    // FIXME (fall through)
+  case subsample4X:
     cinfo->comp_info[0].h_samp_factor = 2;
     cinfo->comp_info[0].v_samp_factor = 2;
     break;
-  case SUBSAMP_422:
+  case subsample2X:
     cinfo->comp_info[0].h_samp_factor = 2;
     cinfo->comp_info[0].v_samp_factor = 1;
     break;
-  case SUBSAMP_GRAY:
+  case subsampleGray:
     jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
   default:
     cinfo->comp_info[0].h_samp_factor = 1;