Make the subsampling setting follow the common style
diff --git a/common/rfb/ConnParams.h b/common/rfb/ConnParams.h
index 47ec14a..68e2075 100644
--- a/common/rfb/ConnParams.h
+++ b/common/rfb/ConnParams.h
@@ -1,4 +1,5 @@
/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ * Copyright 2014 Pierre Ossman for Cendio AB
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,12 +26,19 @@
#include <rdr/types.h>
#include <rfb/PixelFormat.h>
#include <rfb/ScreenSet.h>
-#include <rfb/JpegCompressor.h>
namespace rdr { class InStream; }
namespace rfb {
+ const int subsampleUndefined = -1;
+ const int subsampleNone = 0;
+ const int subsampleGray = 1;
+ const int subsample2X = 2;
+ const int subsample4X = 3;
+ const int subsample8X = 4;
+ const int subsample16X = 5;
+
class ConnParams {
public:
ConnParams();
@@ -88,7 +96,7 @@
bool noJpeg;
int qualityLevel;
int fineQualityLevel;
- JPEG_SUBSAMP subsampling;
+ int subsampling;
private: