commit 60444775fb98d45b88f70aaed8c0440704f7325c
author Peter Åstrand <astrand@cendio.se> Sun Dec 12 13:17:30 2004 +0000
committer Peter Åstrand <astrand@cendio.se> Sun Dec 12 13:17:30 2004 +0000
tree 7f2990ff8b29aa35e980f2d8489797f14061d7d8
parent 1154ebf151f8e741917f2861551ef5f152aa76b7

colour -> color
Always using new scope after for/if/else.


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

rfb/tightDecode.h

diff --git a/rfb/tightDecode.h b/rfb/tightDecode.h
index a6b36f8..aa4b973 100644
--- a/rfb/tightDecode.h
+++ b/rfb/tightDecode.h
@@ -23,7 +23,7 @@
 // This file is #included after having set the following macros:
 // BPP                - 8, 16 or 32
 // EXTRA_ARGS         - optional extra arguments
-// FILL_RECT          - fill a rectangle with a single colour
+// FILL_RECT          - fill a rectangle with a single color
 // IMAGE_RECT         - draw a rectangle of pixel data from a buffer
 
 #include <rdr/InStream.h>
@@ -100,8 +100,9 @@
     case rfbTightFilterPalette: 
       palSize = is->readU8() + 1;
       {
-        for (int i = 0; i < palSize; i++)
+	for (int i = 0; i < palSize; i++) {
           palette[i] = is->READ_PIXEL();
+	}
       }
       break;
     case rfbTightFilterGradient: 
@@ -150,8 +151,9 @@
       for (y = 0; y < r.height(); y++) {
         for (x = 0; x < r.width() / 8; x++) {
           bits = input->readU8();
-          for (b = 7; b >= 0; b--)
+          for (b = 7; b >= 0; b--) {
             *ptr++ = palette[bits >> b & 1];
+	  }
         }
         if (r.width() % 8 != 0) {
           bits = input->readU8();
@@ -162,9 +164,11 @@
       }
     } else {
       // 256-color palette
-      for (y = 0; y < r.height(); y++)
-        for (x = 0; x < r.width(); x++)
+      for (y = 0; y < r.height(); y++) {
+        for (x = 0; x < r.width(); x++) {
           *ptr++ = palette[input->readU8()];
+	}
+      }
     }
   }
 
@@ -188,8 +192,9 @@
 
   // Allocate netbuf and read in data
   rdr::U8* netbuf = new rdr::U8[compressedLen];
-  if (!netbuf)
+  if (!netbuf) {
     throw Exception("rfb::tightDecode unable to allocate buffer");
+  }
   is->readBytes(netbuf, compressedLen);
 
   // Set up JPEG decompression
@@ -226,8 +231,9 @@
 
   IMAGE_RECT(r, buf);
 
-  if (!jpegError)
+  if (!jpegError) {
     jpeg_finish_decompress(&cinfo);
+  }
 
   jpeg_destroy_decompress(&cinfo);
 
@@ -253,8 +259,9 @@
 
   // Allocate netbuf and read in data
   PIXEL_T *netbuf = (PIXEL_T*)new rdr::U8[dataSize];
-  if (!netbuf)
+  if (!netbuf) {
     throw Exception("rfb::tightDecode unable to allocate buffer");
+  }
   is->readBytes(netbuf, dataSize);
 
   // Set up shortcut variables