PixelFormatList::operator[] must return the pointer to

PixelFormatListElement structure.

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

diff --git a/rfbplayer/PixelFormatList.cxx b/rfbplayer/PixelFormatList.cxx
index b2d7ab22e4e50290f642dcac0dd127059443531a..25996f657f53b98443baae43a16bdc60f22aba59 100644 (file)
--- a/rfbplayer/PixelFormatList.cxx
+++ b/rfbplayer/PixelFormatList.cxx
@@ -59,8 +59,8 @@ PixelFormatList::PixelFormatList() {
   PF_DEFAULT_COUNT = PFList.size();
 }
 
-PixelFormatListElement PixelFormatList::operator[](int index) {
-  return *getIterator(index);
+PixelFormatListElement *PixelFormatList::operator[](int index) {
+  return &(*getIterator(index));
 }
 
 void PixelFormatList::add(char *format_name, PixelFormat PF) {
@@ -146,14 +146,14 @@ void PixelFormatList::writeUserDefinedPF(HKEY root, const char *keypath) {
   for (i = 0; i < getUserPFCount(); i++) {
     char upf_name[20] = "\0";
     sprintf(upf_name, "%s%i", "Upf", i);
-    regKey.setBinary(upf_name, (void *)&operator[](i+getDefaultPFCount()), 
+    regKey.setBinary(upf_name, (void *)operator[](i+getDefaultPFCount()), 
       sizeof(PixelFormatListElement));
   }
 }
 
 int PixelFormatList::getIndexByPFName(const char *format_name) {
   for (int i = 0; i < PixelFormatList::count(); i++) {
-    if (_stricmp(operator[](i).format_name, format_name) == 0) return i;
+    if (_stricmp(operator[](i)->format_name, format_name) == 0) return i;
   }
   return -1;
 }
\ No newline at end of file

diff --git a/rfbplayer/PixelFormatList.h b/rfbplayer/PixelFormatList.h
index f3b4e1fa9b13b243a99ec7a43fa9db0c913f7eb2..cd7c50aa66db3610f989890b9cab22c0b03450fe 100644 (file)
--- a/rfbplayer/PixelFormatList.h
+++ b/rfbplayer/PixelFormatList.h
@@ -64,7 +64,7 @@ class PixelFormatList {
 public:
   PixelFormatList();
 
-  PixelFormatListElement operator[](int index);
+  PixelFormatListElement* operator[](int index);
   void add(char *format_name, PixelFormat PF);
   void insert(int index, char *format_name, PixelFormat PF);
   void remove(int index);