Added ScaleFilters::getFilterIdByName() method and defaultScaleFilter parameter.

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

diff --git a/common/rfb/ScaleFilters.cxx b/common/rfb/ScaleFilters.cxx
index 2e6b88da15e8701426b9027c3aae15cf249be5b5..12984669c96c8b384c1c960f121dcb0f0ab0a00b 100644 (file)
--- a/common/rfb/ScaleFilters.cxx
+++ b/common/rfb/ScaleFilters.cxx
@@ -71,6 +71,13 @@ SFilter &ScaleFilters::operator[](unsigned int filter_id) {
   return filters[filter_id];\r
 }\r
 \r
+int ScaleFilters::getFilterIdByName(char *filterName) {\r
+  for (int i = 0; i <= scaleFilterMaxNumber; i++) {\r
+    if (stricmp(filters[i].name, filterName) == 0) return i;\r
+  }\r
+  return -1;\r
+}\r
+\r
 void ScaleFilters::initFilters() {\r
   filters[scaleFilterNearestNeighbor] = create("Nearest neighbor", 0.5, nearest_neighbor);\r
   filters[scaleFilterBilinear] = create("Bilinear", 1, linear);\r

diff --git a/common/rfb/ScaleFilters.h b/common/rfb/ScaleFilters.h
index 62075d54a64a8f7bbc408dbc542ada2dbb341155..d59cc37d48a89099b180cfcd375929c94ee9b5a5 100644 (file)
--- a/common/rfb/ScaleFilters.h
+++ b/common/rfb/ScaleFilters.h
@@ -34,6 +34,7 @@ namespace rfb {
   const unsigned int scaleFilterSinc = 3;\r
 \r
   const unsigned int scaleFilterMaxNumber = 3;\r
+  const unsigned int defaultScaleFilter = scaleFilterBilinear;\r
 \r
   //\r
   // -=- Scale filters structures and routines\r
@@ -60,6 +61,8 @@ namespace rfb {
 \r
     SFilter &operator[](unsigned int filter_id);\r
 \r
+    int getFilterIdByName(char *filterName);\r
+\r
     void makeWeightTabs(int filter, int src_x, int dst_x, SFilterWeightTab **weightTabs);\r
 \r
   protected:\r