X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvLandmarksGlyph.cxx;h=d3d80c288ec0264cb326d81409d6f0d770361637;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=626515df85c5d5c7d5e502dc284fd01a6dcf8024;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvLandmarksGlyph.cxx b/vv/vvLandmarksGlyph.cxx
index 626515d..d3d80c2 100644
--- a/vv/vvLandmarksGlyph.cxx
+++ b/vv/vvLandmarksGlyph.cxx
@@ -1,9 +1,9 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #include "vvLandmarksGlyph.h"
 
 #include "vtkCellArray.h"
@@ -36,536 +36,517 @@ vtkStandardNewMacro(vvLandmarksGlyph);
 #define vtkfont_height 15
 //#define vtkfont_height 20
 static unsigned char vtkfont_bits[] = {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0xe0,0x00,0x10,0x90,0x00,0x00,0x40,0x88,0x03,0x1c,0x10,0x08,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x20,0x1c,0x10,0xf8,0xf8,0x03,0xe2,0x0f,0x8f,0x3f,
-    0x3e,0x7c,0x00,0x00,0x00,0x02,0x80,0x00,0x1f,0x3e,0x10,0xfc,0xf0,0xf1,0xe3,
-    0xcf,0x1f,0x1f,0x41,0x7c,0xe0,0x09,0x12,0x20,0x48,0x10,0x1f,0x3f,0x7c,0xfc,
-    0xf0,0xf1,0x27,0x48,0x90,0x20,0x41,0x82,0xfc,0xe1,0x11,0xc0,0x03,0x02,0x00,
-    0x0e,0x00,0x04,0x00,0x00,0x04,0x00,0x0e,0x00,0x01,0x00,0x00,0x08,0xc0,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x80,0x83,0xe0,0x80,0x11,0xe0,0x00,0x10,0x90,0x90,0x80,0xa0,0x44,0x04,0x0c,
-    0x08,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x22,0x18,0x04,0x01,0x02,0x23,
-    0x80,0x00,0x20,0x41,0x82,0x00,0x00,0x00,0x01,0x00,0x81,0x20,0x41,0x28,0x08,
-    0x09,0x22,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x08,0x11,0x20,0x48,0x90,0x20,
-    0x41,0x82,0x04,0x09,0x82,0x20,0x48,0x90,0x20,0x41,0x82,0x00,0x21,0x20,0x00,
-    0x02,0x05,0x00,0x0c,0x00,0x04,0x00,0x00,0x04,0x00,0x11,0x00,0x01,0x10,0x80,
-    0x08,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x40,0x80,0x00,0x41,0x12,0xe0,0x00,0x10,0x90,0x90,0xe0,0xa3,
-    0x44,0x04,0x02,0x08,0x10,0x00,0x40,0x00,0x00,0x00,0x00,0x10,0x41,0x14,0x04,
-    0x01,0x81,0x22,0x40,0x00,0x20,0x41,0x82,0x00,0x00,0x80,0x00,0x00,0x82,0x20,
-    0x41,0x44,0x08,0x09,0x20,0x44,0x80,0x80,0x00,0x41,0x10,0x80,0x88,0x10,0x60,
-    0xcc,0x90,0x20,0x41,0x82,0x04,0x09,0x80,0x20,0x48,0x90,0x20,0x22,0x44,0x80,
-    0x20,0x20,0x00,0x82,0x08,0x00,0x10,0x00,0x04,0x00,0x00,0x04,0x00,0x11,0x00,
-    0x01,0x00,0x00,0x08,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x00,0x41,0x0c,0xe0,0x00,0x10,0x00,
-    0xf8,0x91,0x40,0x42,0x04,0x00,0x04,0x20,0x88,0x40,0x00,0x00,0x00,0x00,0x08,
-    0x41,0x10,0x00,0x81,0x40,0xa2,0x47,0x00,0x10,0x41,0x82,0x20,0x40,0x40,0x00,
-    0x00,0x04,0x20,0x79,0x82,0x08,0x09,0x20,0x44,0x80,0x80,0x00,0x41,0x10,0x80,
-    0x48,0x10,0xa0,0x4a,0x91,0x20,0x41,0x82,0x04,0x09,0x80,0x20,0x88,0x88,0x20,
-    0x14,0x28,0x40,0x20,0x40,0x00,0x42,0x10,0x00,0x00,0x7c,0xf4,0xf0,0xe1,0xc5,
-    0x07,0x01,0x2f,0x3d,0x18,0xe0,0x08,0x82,0xe0,0x46,0x0f,0x1f,0x3d,0xbc,0xe4,
-    0xf0,0xf1,0x23,0x44,0x90,0x20,0x41,0x42,0xfc,0x81,0x80,0x80,0x00,0x00,0xe0,
-    0x00,0x10,0x00,0x90,0x90,0x00,0x81,0x03,0x00,0x04,0x20,0x50,0x40,0x00,0x00,
-    0x00,0x00,0x04,0x41,0x10,0x80,0xc0,0x21,0x62,0x48,0x0f,0x08,0x3e,0xc2,0x70,
-    0xe0,0x20,0xe0,0x0f,0x08,0x10,0x45,0x82,0xf8,0x08,0x20,0xc4,0x83,0x87,0x00,
-    0x7f,0x10,0x80,0x38,0x10,0xa0,0x4a,0x92,0x20,0x3f,0x82,0xfc,0xf0,0x81,0x20,
-    0x88,0x88,0x24,0x08,0x10,0x20,0x20,0x80,0x00,0x02,0x00,0x00,0x00,0x80,0x0c,
-    0x09,0x12,0x26,0x08,0x81,0x10,0x43,0x10,0x80,0x88,0x81,0x20,0xc9,0x90,0x20,
-    0x43,0xc2,0x18,0x09,0x42,0x20,0x44,0x90,0x20,0x22,0x42,0x80,0x60,0x80,0x00,
-    0x03,0x00,0xe0,0x00,0x10,0x00,0x90,0xe0,0x03,0x41,0x04,0x00,0x04,0x20,0xfc,
-    0xf9,0x03,0xe0,0x0f,0x00,0x04,0x41,0x10,0x40,0x00,0x12,0x02,0xc8,0x10,0x04,
-    0x41,0xbc,0x20,0x40,0x20,0x00,0x00,0x08,0x08,0x65,0x82,0x08,0x09,0x20,0x44,
-    0x80,0x80,0x38,0x41,0x10,0x80,0x28,0x10,0x20,0x49,0x94,0x20,0x01,0x82,0x24,
-    0x00,0x82,0x20,0x88,0x88,0x24,0x08,0x10,0x10,0x20,0x80,0x00,0x02,0x00,0x00,
-    0x00,0x80,0x04,0x09,0x10,0x24,0xc8,0x87,0x10,0x41,0x10,0x80,0x68,0x80,0x20,
-    0x49,0x90,0x20,0x41,0x82,0x08,0x09,0x40,0x20,0x84,0x88,0x24,0x14,0x42,0x40,
-    0x60,0x80,0x00,0x03,0x00,0xe0,0x00,0x10,0x00,0xf8,0x81,0x84,0x44,0x14,0x00,
-    0x04,0x20,0x50,0x40,0x00,0x00,0x00,0x00,0x02,0x41,0x10,0x30,0x00,0xf2,0x07,
-    0x48,0x10,0x02,0x41,0x80,0x00,0x00,0x40,0x00,0x00,0x04,0x04,0x59,0xfe,0x08,
-    0x09,0x20,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x48,0x10,0x20,0x49,0x98,0x20,
-    0x01,0x82,0x44,0x00,0x82,0x20,0x08,0x85,0x24,0x14,0x10,0x08,0x20,0x00,0x01,
-    0x02,0x00,0x00,0x00,0xfc,0x04,0x09,0x10,0xe4,0x0f,0x81,0x10,0x41,0x10,0x80,
-    0x18,0x80,0x20,0x49,0x90,0x20,0x41,0x82,0x08,0xf0,0x41,0x20,0x84,0x88,0x24,
-    0x08,0x42,0x20,0x80,0x80,0x80,0x00,0x00,0xe0,0x00,0x10,0x00,0x90,0x80,0x44,
-    0x4a,0x08,0x00,0x08,0x10,0x88,0x40,0x00,0x00,0x00,0x00,0x01,0x41,0x10,0x08,
-    0x00,0x02,0x02,0x48,0x10,0x02,0x41,0x80,0x00,0x00,0x80,0xe0,0x0f,0x02,0x04,
-    0x01,0x82,0x08,0x09,0x20,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x88,0x10,0x20,
-    0x48,0x90,0x20,0x01,0x92,0x84,0x00,0x82,0x20,0x08,0x85,0x24,0x22,0x10,0x04,
-    0x20,0x00,0x02,0x02,0x00,0x00,0x00,0x82,0x04,0x09,0x10,0x24,0x00,0x01,0x0f,
-    0x41,0x10,0x80,0x68,0x80,0x20,0x49,0x90,0x20,0x41,0x82,0x08,0x00,0x42,0x20,
-    0x04,0x85,0x24,0x14,0x42,0x10,0x40,0x80,0x00,0x01,0x00,0xe0,0x00,0x00,0x00,
-    0x90,0xe0,0x43,0x4a,0x0c,0x00,0x08,0x10,0x00,0x40,0xc0,0x01,0x00,0x02,0x01,
-    0x22,0x10,0x04,0x08,0x02,0x22,0x48,0x10,0x01,0x41,0x40,0x20,0xe0,0x00,0x01,
-    0x00,0x01,0x00,0x01,0x82,0x08,0x09,0x22,0x44,0x80,0x80,0x20,0x41,0x10,0x84,
-    0x08,0x11,0x20,0x48,0x90,0x20,0x01,0xa2,0x04,0x09,0x82,0x20,0x08,0x85,0x2a,
-    0x41,0x10,0x04,0x20,0x00,0x02,0x02,0x00,0x00,0x00,0xc2,0x0c,0x09,0x12,0x26,
-    0x00,0x81,0x00,0x41,0x10,0x80,0x88,0x81,0x20,0x49,0x90,0x20,0x43,0xc2,0x08,
-    0x08,0x42,0x24,0x04,0x85,0x2a,0x22,0x62,0x08,0x40,0x80,0x00,0x01,0x00,0xe0,
-    0x00,0x10,0x00,0x00,0x80,0x20,0x84,0x13,0x00,0x10,0x08,0x00,0x00,0xc0,0x00,
-    0x00,0x87,0x00,0x1c,0x7c,0xfc,0xf1,0x01,0xc2,0x87,0x0f,0x01,0x3e,0x3c,0x70,
-    0x60,0x00,0x02,0x80,0x00,0x04,0x3e,0x82,0xfc,0xf0,0xf1,0xe3,0x8f,0x00,0x1f,
-    0x41,0x7c,0x78,0x08,0xf2,0x27,0x48,0x10,0x1f,0x01,0x7c,0x04,0xf1,0x81,0xc0,
-    0x07,0x02,0x11,0x41,0x10,0xfc,0xe1,0x01,0xc4,0x03,0x00,0x00,0x00,0xbc,0xf4,
-    0xf0,0xe1,0xc5,0x07,0x01,0x1f,0x41,0x7c,0x84,0x08,0xe2,0x23,0x48,0x10,0x1f,
-    0x3d,0xbc,0x08,0xf0,0x81,0xc3,0x0b,0x02,0x11,0x41,0x5c,0xfc,0x81,0x83,0xe0,
-    0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x20,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x3f,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x84,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
-    0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x84,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,
-    0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0xe0,0x00,0x10,0x90,0x00,0x00,0x40,0x88,0x03,0x1c,0x10,0x08,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x20,0x1c,0x10,0xf8,0xf8,0x03,0xe2,0x0f,0x8f,0x3f,
+  0x3e,0x7c,0x00,0x00,0x00,0x02,0x80,0x00,0x1f,0x3e,0x10,0xfc,0xf0,0xf1,0xe3,
+  0xcf,0x1f,0x1f,0x41,0x7c,0xe0,0x09,0x12,0x20,0x48,0x10,0x1f,0x3f,0x7c,0xfc,
+  0xf0,0xf1,0x27,0x48,0x90,0x20,0x41,0x82,0xfc,0xe1,0x11,0xc0,0x03,0x02,0x00,
+  0x0e,0x00,0x04,0x00,0x00,0x04,0x00,0x0e,0x00,0x01,0x00,0x00,0x08,0xc0,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x80,0x83,0xe0,0x80,0x11,0xe0,0x00,0x10,0x90,0x90,0x80,0xa0,0x44,0x04,0x0c,
+  0x08,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x22,0x18,0x04,0x01,0x02,0x23,
+  0x80,0x00,0x20,0x41,0x82,0x00,0x00,0x00,0x01,0x00,0x81,0x20,0x41,0x28,0x08,
+  0x09,0x22,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x08,0x11,0x20,0x48,0x90,0x20,
+  0x41,0x82,0x04,0x09,0x82,0x20,0x48,0x90,0x20,0x41,0x82,0x00,0x21,0x20,0x00,
+  0x02,0x05,0x00,0x0c,0x00,0x04,0x00,0x00,0x04,0x00,0x11,0x00,0x01,0x10,0x80,
+  0x08,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x40,0x80,0x00,0x41,0x12,0xe0,0x00,0x10,0x90,0x90,0xe0,0xa3,
+  0x44,0x04,0x02,0x08,0x10,0x00,0x40,0x00,0x00,0x00,0x00,0x10,0x41,0x14,0x04,
+  0x01,0x81,0x22,0x40,0x00,0x20,0x41,0x82,0x00,0x00,0x80,0x00,0x00,0x82,0x20,
+  0x41,0x44,0x08,0x09,0x20,0x44,0x80,0x80,0x00,0x41,0x10,0x80,0x88,0x10,0x60,
+  0xcc,0x90,0x20,0x41,0x82,0x04,0x09,0x80,0x20,0x48,0x90,0x20,0x22,0x44,0x80,
+  0x20,0x20,0x00,0x82,0x08,0x00,0x10,0x00,0x04,0x00,0x00,0x04,0x00,0x11,0x00,
+  0x01,0x00,0x00,0x08,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x00,0x41,0x0c,0xe0,0x00,0x10,0x00,
+  0xf8,0x91,0x40,0x42,0x04,0x00,0x04,0x20,0x88,0x40,0x00,0x00,0x00,0x00,0x08,
+  0x41,0x10,0x00,0x81,0x40,0xa2,0x47,0x00,0x10,0x41,0x82,0x20,0x40,0x40,0x00,
+  0x00,0x04,0x20,0x79,0x82,0x08,0x09,0x20,0x44,0x80,0x80,0x00,0x41,0x10,0x80,
+  0x48,0x10,0xa0,0x4a,0x91,0x20,0x41,0x82,0x04,0x09,0x80,0x20,0x88,0x88,0x20,
+  0x14,0x28,0x40,0x20,0x40,0x00,0x42,0x10,0x00,0x00,0x7c,0xf4,0xf0,0xe1,0xc5,
+  0x07,0x01,0x2f,0x3d,0x18,0xe0,0x08,0x82,0xe0,0x46,0x0f,0x1f,0x3d,0xbc,0xe4,
+  0xf0,0xf1,0x23,0x44,0x90,0x20,0x41,0x42,0xfc,0x81,0x80,0x80,0x00,0x00,0xe0,
+  0x00,0x10,0x00,0x90,0x90,0x00,0x81,0x03,0x00,0x04,0x20,0x50,0x40,0x00,0x00,
+  0x00,0x00,0x04,0x41,0x10,0x80,0xc0,0x21,0x62,0x48,0x0f,0x08,0x3e,0xc2,0x70,
+  0xe0,0x20,0xe0,0x0f,0x08,0x10,0x45,0x82,0xf8,0x08,0x20,0xc4,0x83,0x87,0x00,
+  0x7f,0x10,0x80,0x38,0x10,0xa0,0x4a,0x92,0x20,0x3f,0x82,0xfc,0xf0,0x81,0x20,
+  0x88,0x88,0x24,0x08,0x10,0x20,0x20,0x80,0x00,0x02,0x00,0x00,0x00,0x80,0x0c,
+  0x09,0x12,0x26,0x08,0x81,0x10,0x43,0x10,0x80,0x88,0x81,0x20,0xc9,0x90,0x20,
+  0x43,0xc2,0x18,0x09,0x42,0x20,0x44,0x90,0x20,0x22,0x42,0x80,0x60,0x80,0x00,
+  0x03,0x00,0xe0,0x00,0x10,0x00,0x90,0xe0,0x03,0x41,0x04,0x00,0x04,0x20,0xfc,
+  0xf9,0x03,0xe0,0x0f,0x00,0x04,0x41,0x10,0x40,0x00,0x12,0x02,0xc8,0x10,0x04,
+  0x41,0xbc,0x20,0x40,0x20,0x00,0x00,0x08,0x08,0x65,0x82,0x08,0x09,0x20,0x44,
+  0x80,0x80,0x38,0x41,0x10,0x80,0x28,0x10,0x20,0x49,0x94,0x20,0x01,0x82,0x24,
+  0x00,0x82,0x20,0x88,0x88,0x24,0x08,0x10,0x10,0x20,0x80,0x00,0x02,0x00,0x00,
+  0x00,0x80,0x04,0x09,0x10,0x24,0xc8,0x87,0x10,0x41,0x10,0x80,0x68,0x80,0x20,
+  0x49,0x90,0x20,0x41,0x82,0x08,0x09,0x40,0x20,0x84,0x88,0x24,0x14,0x42,0x40,
+  0x60,0x80,0x00,0x03,0x00,0xe0,0x00,0x10,0x00,0xf8,0x81,0x84,0x44,0x14,0x00,
+  0x04,0x20,0x50,0x40,0x00,0x00,0x00,0x00,0x02,0x41,0x10,0x30,0x00,0xf2,0x07,
+  0x48,0x10,0x02,0x41,0x80,0x00,0x00,0x40,0x00,0x00,0x04,0x04,0x59,0xfe,0x08,
+  0x09,0x20,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x48,0x10,0x20,0x49,0x98,0x20,
+  0x01,0x82,0x44,0x00,0x82,0x20,0x08,0x85,0x24,0x14,0x10,0x08,0x20,0x00,0x01,
+  0x02,0x00,0x00,0x00,0xfc,0x04,0x09,0x10,0xe4,0x0f,0x81,0x10,0x41,0x10,0x80,
+  0x18,0x80,0x20,0x49,0x90,0x20,0x41,0x82,0x08,0xf0,0x41,0x20,0x84,0x88,0x24,
+  0x08,0x42,0x20,0x80,0x80,0x80,0x00,0x00,0xe0,0x00,0x10,0x00,0x90,0x80,0x44,
+  0x4a,0x08,0x00,0x08,0x10,0x88,0x40,0x00,0x00,0x00,0x00,0x01,0x41,0x10,0x08,
+  0x00,0x02,0x02,0x48,0x10,0x02,0x41,0x80,0x00,0x00,0x80,0xe0,0x0f,0x02,0x04,
+  0x01,0x82,0x08,0x09,0x20,0x44,0x80,0x80,0x20,0x41,0x10,0x80,0x88,0x10,0x20,
+  0x48,0x90,0x20,0x01,0x92,0x84,0x00,0x82,0x20,0x08,0x85,0x24,0x22,0x10,0x04,
+  0x20,0x00,0x02,0x02,0x00,0x00,0x00,0x82,0x04,0x09,0x10,0x24,0x00,0x01,0x0f,
+  0x41,0x10,0x80,0x68,0x80,0x20,0x49,0x90,0x20,0x41,0x82,0x08,0x00,0x42,0x20,
+  0x04,0x85,0x24,0x14,0x42,0x10,0x40,0x80,0x00,0x01,0x00,0xe0,0x00,0x00,0x00,
+  0x90,0xe0,0x43,0x4a,0x0c,0x00,0x08,0x10,0x00,0x40,0xc0,0x01,0x00,0x02,0x01,
+  0x22,0x10,0x04,0x08,0x02,0x22,0x48,0x10,0x01,0x41,0x40,0x20,0xe0,0x00,0x01,
+  0x00,0x01,0x00,0x01,0x82,0x08,0x09,0x22,0x44,0x80,0x80,0x20,0x41,0x10,0x84,
+  0x08,0x11,0x20,0x48,0x90,0x20,0x01,0xa2,0x04,0x09,0x82,0x20,0x08,0x85,0x2a,
+  0x41,0x10,0x04,0x20,0x00,0x02,0x02,0x00,0x00,0x00,0xc2,0x0c,0x09,0x12,0x26,
+  0x00,0x81,0x00,0x41,0x10,0x80,0x88,0x81,0x20,0x49,0x90,0x20,0x43,0xc2,0x08,
+  0x08,0x42,0x24,0x04,0x85,0x2a,0x22,0x62,0x08,0x40,0x80,0x00,0x01,0x00,0xe0,
+  0x00,0x10,0x00,0x00,0x80,0x20,0x84,0x13,0x00,0x10,0x08,0x00,0x00,0xc0,0x00,
+  0x00,0x87,0x00,0x1c,0x7c,0xfc,0xf1,0x01,0xc2,0x87,0x0f,0x01,0x3e,0x3c,0x70,
+  0x60,0x00,0x02,0x80,0x00,0x04,0x3e,0x82,0xfc,0xf0,0xf1,0xe3,0x8f,0x00,0x1f,
+  0x41,0x7c,0x78,0x08,0xf2,0x27,0x48,0x10,0x1f,0x01,0x7c,0x04,0xf1,0x81,0xc0,
+  0x07,0x02,0x11,0x41,0x10,0xfc,0xe1,0x01,0xc4,0x03,0x00,0x00,0x00,0xbc,0xf4,
+  0xf0,0xe1,0xc5,0x07,0x01,0x1f,0x41,0x7c,0x84,0x08,0xe2,0x23,0x48,0x10,0x1f,
+  0x3d,0xbc,0x08,0xf0,0x81,0xc3,0x0b,0x02,0x11,0x41,0x5c,0xfc,0x81,0x83,0xe0,
+  0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x20,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0,0x3f,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x84,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,
+  0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x84,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,
+  0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x80,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0
 };
 
 // Construct object with no string set and backing enabled.
 vvLandmarksGlyph::vvLandmarksGlyph()
 {
-    this->Text = NULL;
-    this->Backing = 1;
-    this->ForegroundColor[0] = 1.0;
-    this->ForegroundColor[1] = 1.0;
-    this->ForegroundColor[2] = 1.0;
-    this->ForegroundColor[3] = 1.0;
-    this->BackgroundColor[0] = 0.0;
-    this->BackgroundColor[1] = 0.0;
-    this->BackgroundColor[2] = 0.0;
-    this->BackgroundColor[3] = 1.0;
-
-    this->SetNumberOfInputPorts(0);
+  this->Text = NULL;
+  this->Backing = 1;
+  this->ForegroundColor[0] = 1.0;
+  this->ForegroundColor[1] = 1.0;
+  this->ForegroundColor[2] = 1.0;
+  this->ForegroundColor[3] = 1.0;
+  this->BackgroundColor[0] = 0.0;
+  this->BackgroundColor[1] = 0.0;
+  this->BackgroundColor[2] = 0.0;
+  this->BackgroundColor[3] = 1.0;
+
+  this->SetNumberOfInputPorts(0);
 }
 
 vvLandmarksGlyph::~vvLandmarksGlyph()
 {
-    if (this->Text)
-    {
-        delete [] this->Text;
-    }
+  if (this->Text) {
+    delete [] this->Text;
+  }
 }
 
 int vvLandmarksGlyph::RequestData(
-    vtkInformation *vtkNotUsed(request),
-    vtkInformationVector **vtkNotUsed(inputVector),
-    vtkInformationVector *outputVector)
+  vtkInformation *vtkNotUsed(request),
+  vtkInformationVector **vtkNotUsed(inputVector),
+  vtkInformationVector *outputVector)
 {
-    // get the info object
-    vtkInformation *outInfo = outputVector->GetInformationObject(0);
+  // get the info object
+  vtkInformation *outInfo = outputVector->GetInformationObject(0);
 
-    // get the ouptut
-    vtkPolyData *output = vtkPolyData::SafeDownCast(
-                              outInfo->Get(vtkDataObject::DATA_OBJECT()));
+  // get the ouptut
+  vtkPolyData *output = vtkPolyData::SafeDownCast(
+                          outInfo->Get(vtkDataObject::DATA_OBJECT()));
 
-    vtkPoints *newPoints;
-    vtkCellArray *newPolys;
-    vtkCellArray *newLines;
-    vtkUnsignedCharArray *newScalars;
+  vtkPoints *newPoints;
+  vtkCellArray *newPolys;
+  vtkCellArray *newLines;
+  vtkUnsignedCharArray *newScalars;
 
-    newPoints = vtkPoints::New();
-    newPolys = vtkCellArray::New();
-    newScalars = vtkUnsignedCharArray::New();
-    newScalars->SetNumberOfComponents(4);
-    newLines = vtkCellArray::New();
-    newLines->Allocate(newLines->EstimateSize(3,2));
+  newPoints = vtkPoints::New();
+  newPolys = vtkCellArray::New();
+  newScalars = vtkUnsignedCharArray::New();
+  newScalars->SetNumberOfComponents(4);
+  newLines = vtkCellArray::New();
+  newLines->Allocate(newLines->EstimateSize(3,2));
 
-    AddTextGlyph(newPoints,newScalars,newPolys,0);
-    AddTextGlyph(newPoints,newScalars,newPolys,1);
-    AddTextGlyph(newPoints,newScalars,newPolys,2);
+  AddTextGlyph(newPoints,newScalars,newPolys,0);
+  AddTextGlyph(newPoints,newScalars,newPolys,1);
+  AddTextGlyph(newPoints,newScalars,newPolys,2);
 
-    AddCrossGlyph(newPoints, newLines);
+  AddCrossGlyph(newPoints, newLines);
 
-    output->SetPoints(newPoints);
-    newPoints->Delete();
+  output->SetPoints(newPoints);
+  newPoints->Delete();
 
-    output->SetLines(newLines);
-    newLines->Delete();
+  output->SetLines(newLines);
+  newLines->Delete();
 
-    output->GetPointData()->SetScalars(newScalars);
-    newScalars->Delete();
+  output->GetPointData()->SetScalars(newScalars);
+  newScalars->Delete();
 
-    output->SetPolys(newPolys);
-    newPolys->Delete();
+  output->SetPolys(newPolys);
+  newPolys->Delete();
 
-    return 1;
+  return 1;
 }
 
 void vvLandmarksGlyph::AddTextGlyph(vtkPoints* newPoints,vtkUnsignedCharArray* newScalars, vtkCellArray *newPolys, int orientation)
 {
-    int row, col;
-    int pos = 0;
-    int pixelPos;
-    vtkIdType pts[5];
-    vtkIdType numPolys = 0;
-    double x[3];
-    int acol;
-    int drawingWhite = 0;
-    int drawingBlack = 0;
-    unsigned char white[4];
-    unsigned char black[4];
-    std::cout << "AddTextGlyph(output," << orientation << ")" << std::endl;
-
-    if (this->Text == NULL)
-    {
-        vtkErrorMacro (<< "Text is not set!");
-        return;
-    }
-
-    // convert colors to unsigned char
-    for (int i = 0; i < 4; i++)
-    {
-        white[i] = (unsigned char) (this->ForegroundColor[i] * 255.0);
-        black[i] = (unsigned char) (this->BackgroundColor[i] * 255.0);
-    }
-
-    std::cout << "Create Text" << std::endl;
-    // Create Text
-    while (this->Text[pos])
-    {
-        if (this->Text[pos] != 32)
-        {
-            for (col = 0; col < vtkfont_width; col++)
-            {
-                acol = (this->Text[pos] - 32)*vtkfont_width + col - 1;
-                for (row = 0; row < vtkfont_height; row++)
-                {
-                    pixelPos = acol + row*vtkfont_row_width;
-                    if (vtkfont_bits[pixelPos/8] & (0x01 << pixelPos%8))
-                    {
-                        if (drawingBlack)
-                        {
-                            x[0] = pos*vtkfont_width + col + 1;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(black[0]);
-                            newScalars->InsertNextValue(black[1]);
-                            newScalars->InsertNextValue(black[2]);
-                            newScalars->InsertNextValue(black[3]);
-
-                            x[0] = pos*vtkfont_width + col;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(black[0]);
-                            newScalars->InsertNextValue(black[1]);
-                            newScalars->InsertNextValue(black[2]);
-                            newScalars->InsertNextValue(black[3]);
-
-                            pts[0] = numPolys*4;
-                            pts[1] = numPolys*4 + 1;
-                            pts[2] = numPolys*4 + 2;
-                            pts[3] = numPolys*4 + 3;
-                            newPolys->InsertNextCell(4,pts);
-                            numPolys++;
-                            drawingBlack = 0;
-                        }
-                        if (!drawingWhite)
-                        {
-                            x[0] = pos*vtkfont_width + col;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(white[0]);
-                            newScalars->InsertNextValue(white[1]);
-                            newScalars->InsertNextValue(white[2]);
-                            newScalars->InsertNextValue(white[3]);
-
-                            x[0] = pos*vtkfont_width + col + 1;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(white[0]);
-                            newScalars->InsertNextValue(white[1]);
-                            newScalars->InsertNextValue(white[2]);
-                            newScalars->InsertNextValue(white[3]);
-                            drawingWhite = 1;
-                        }
-                    }
-                    // if the pixel is not set the close up the rectangle
-                    else
-                    {
-                        if (drawingWhite)
-                        {
-                            x[0] = pos*vtkfont_width + col + 1;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(white[0]);
-                            newScalars->InsertNextValue(white[1]);
-                            newScalars->InsertNextValue(white[2]);
-                            newScalars->InsertNextValue(white[3]);
-
-                            x[0] = pos*vtkfont_width + col;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(white[0]);
-                            newScalars->InsertNextValue(white[1]);
-                            newScalars->InsertNextValue(white[2]);
-                            newScalars->InsertNextValue(white[3]);
-
-                            pts[0] = numPolys*4;
-                            pts[1] = numPolys*4 + 1;
-                            pts[2] = numPolys*4 + 2;
-                            pts[3] = numPolys*4 + 3;
-                            newPolys->InsertNextCell(4,pts);
-                            numPolys++;
-                            drawingWhite = 0;
-                        }
-                        if (!drawingBlack && this->Backing)
-                        {
-                            x[0] = pos*vtkfont_width + col;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(black[0]);
-                            newScalars->InsertNextValue(black[1]);
-                            newScalars->InsertNextValue(black[2]);
-                            newScalars->InsertNextValue(black[3]);
-
-                            x[0] = pos*vtkfont_width + col + 1;
-                            x[1] = vtkfont_height - row;
-                            x[2] = 0;
-                            ChangeOrientation(x,orientation);
-                            newPoints->InsertNextPoint(x);
-                            newScalars->InsertNextValue(black[0]);
-                            newScalars->InsertNextValue(black[1]);
-                            newScalars->InsertNextValue(black[2]);
-                            newScalars->InsertNextValue(black[3]);
-                            drawingBlack = 1;
-                        }
-                    }
-                }
-                // if we finished up a row but are still drawing close it up
-                if (drawingWhite)
-                {
-                    x[0] = pos*vtkfont_width + col + 1;
-                    x[1] = 0;
-                    x[2] = 0;
-                    ChangeOrientation(x,orientation);
-                    newPoints->InsertNextPoint(x);
-                    newScalars->InsertNextValue(white[0]);
-                    newScalars->InsertNextValue(white[1]);
-                    newScalars->InsertNextValue(white[2]);
-                    newScalars->InsertNextValue(white[3]);
-
-                    x[0] = pos*vtkfont_width + col;
-                    x[1] = 0;
-                    x[2] = 0;
-                    ChangeOrientation(x,orientation);
-                    newPoints->InsertNextPoint(x);
-                    newScalars->InsertNextValue(white[0]);
-                    newScalars->InsertNextValue(white[1]);
-                    newScalars->InsertNextValue(white[2]);
-                    newScalars->InsertNextValue(white[3]);
-
-                    pts[0] = numPolys*4;
-                    pts[1] = numPolys*4 + 1;
-                    pts[2] = numPolys*4 + 2;
-                    pts[3] = numPolys*4 + 3;
-                    newPolys->InsertNextCell(4,pts);
-                    numPolys++;
-                    drawingWhite = 0;
-                }
-                if (drawingBlack)
-                {
-                    x[0] = pos*vtkfont_width + col + 1;
-                    x[1] = 0;
-                    x[2] = 0;
-                    ChangeOrientation(x,orientation);
-                    newPoints->InsertNextPoint(x);
-                    newScalars->InsertNextValue(black[0]);
-                    newScalars->InsertNextValue(black[1]);
-                    newScalars->InsertNextValue(black[2]);
-                    newScalars->InsertNextValue(black[3]);
-
-                    x[0] = pos*vtkfont_width + col;
-                    x[1] = 0;
-                    x[2] = 0;
-                    ChangeOrientation(x,orientation);
-                    newPoints->InsertNextPoint(x);
-                    newScalars->InsertNextValue(black[0]);
-                    newScalars->InsertNextValue(black[1]);
-                    newScalars->InsertNextValue(black[2]);
-                    newScalars->InsertNextValue(black[3]);
-
-                    pts[0] = numPolys*4;
-                    pts[1] = numPolys*4 + 1;
-                    pts[2] = numPolys*4 + 2;
-                    pts[3] = numPolys*4 + 3;
-                    newPolys->InsertNextCell(4,pts);
-                    numPolys++;
-                    drawingBlack = 0;
-                }
+  int row, col;
+  int pos = 0;
+  int pixelPos;
+  vtkIdType pts[5];
+  vtkIdType numPolys = 0;
+  double x[3];
+  int acol;
+  int drawingWhite = 0;
+  int drawingBlack = 0;
+  unsigned char white[4];
+  unsigned char black[4];
+  std::cout << "AddTextGlyph(output," << orientation << ")" << std::endl;
+
+  if (this->Text == NULL) {
+    vtkErrorMacro (<< "Text is not set!");
+    return;
+  }
+
+  // convert colors to unsigned char
+  for (int i = 0; i < 4; i++) {
+    white[i] = (unsigned char) (this->ForegroundColor[i] * 255.0);
+    black[i] = (unsigned char) (this->BackgroundColor[i] * 255.0);
+  }
+
+  std::cout << "Create Text" << std::endl;
+  // Create Text
+  while (this->Text[pos]) {
+    if (this->Text[pos] != 32) {
+      for (col = 0; col < vtkfont_width; col++) {
+        acol = (this->Text[pos] - 32)*vtkfont_width + col - 1;
+        for (row = 0; row < vtkfont_height; row++) {
+          pixelPos = acol + row*vtkfont_row_width;
+          if (vtkfont_bits[pixelPos/8] & (0x01 << pixelPos%8)) {
+            if (drawingBlack) {
+              x[0] = pos*vtkfont_width + col + 1;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(black[0]);
+              newScalars->InsertNextValue(black[1]);
+              newScalars->InsertNextValue(black[2]);
+              newScalars->InsertNextValue(black[3]);
+
+              x[0] = pos*vtkfont_width + col;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(black[0]);
+              newScalars->InsertNextValue(black[1]);
+              newScalars->InsertNextValue(black[2]);
+              newScalars->InsertNextValue(black[3]);
+
+              pts[0] = numPolys*4;
+              pts[1] = numPolys*4 + 1;
+              pts[2] = numPolys*4 + 2;
+              pts[3] = numPolys*4 + 3;
+              newPolys->InsertNextCell(4,pts);
+              numPolys++;
+              drawingBlack = 0;
             }
-        }
-        else
-        {
-            // draw a black square for a space
-            if (this->Backing)
-            {
-                x[0] = pos*vtkfont_width;
-                x[1] = vtkfont_height;
-                x[2] = 0;
-                ChangeOrientation(x,orientation);
-                newPoints->InsertNextPoint(x);
-                newScalars->InsertNextValue(black[0]);
-                newScalars->InsertNextValue(black[1]);
-                newScalars->InsertNextValue(black[2]);
-                newScalars->InsertNextValue(black[3]);
-
-                x[0] = pos*vtkfont_width + vtkfont_width;
-                x[1] = vtkfont_height;
-                x[2] = 0;
-                ChangeOrientation(x,orientation);
-                newPoints->InsertNextPoint(x);
-                newScalars->InsertNextValue(black[0]);
-                newScalars->InsertNextValue(black[1]);
-                newScalars->InsertNextValue(black[2]);
-                newScalars->InsertNextValue(black[3]);
-
-                x[0] = pos*vtkfont_width + vtkfont_width;
-                x[1] = 0;
-                x[2] = 0;
-                ChangeOrientation(x,orientation);
-                newPoints->InsertNextPoint(x);
-                newScalars->InsertNextValue(black[0]);
-                newScalars->InsertNextValue(black[1]);
-                newScalars->InsertNextValue(black[2]);
-                newScalars->InsertNextValue(black[3]);
-
-                x[0] = pos*vtkfont_width;
-                x[1] = 0;
-                x[2] = 0;
-                ChangeOrientation(x,orientation);
-                newPoints->InsertNextPoint(x);
-                newScalars->InsertNextValue(black[0]);
-                newScalars->InsertNextValue(black[1]);
-                newScalars->InsertNextValue(black[2]);
-                newScalars->InsertNextValue(black[3]);
-
-                pts[0] = numPolys*4;
-                pts[1] = numPolys*4 + 1;
-                pts[2] = numPolys*4 + 2;
-                pts[3] = numPolys*4 + 3;
-                newPolys->InsertNextCell(4,pts);
-                numPolys++;
+            if (!drawingWhite) {
+              x[0] = pos*vtkfont_width + col;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(white[0]);
+              newScalars->InsertNextValue(white[1]);
+              newScalars->InsertNextValue(white[2]);
+              newScalars->InsertNextValue(white[3]);
+
+              x[0] = pos*vtkfont_width + col + 1;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(white[0]);
+              newScalars->InsertNextValue(white[1]);
+              newScalars->InsertNextValue(white[2]);
+              newScalars->InsertNextValue(white[3]);
+              drawingWhite = 1;
             }
+          }
+          // if the pixel is not set the close up the rectangle
+          else {
+            if (drawingWhite) {
+              x[0] = pos*vtkfont_width + col + 1;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(white[0]);
+              newScalars->InsertNextValue(white[1]);
+              newScalars->InsertNextValue(white[2]);
+              newScalars->InsertNextValue(white[3]);
+
+              x[0] = pos*vtkfont_width + col;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(white[0]);
+              newScalars->InsertNextValue(white[1]);
+              newScalars->InsertNextValue(white[2]);
+              newScalars->InsertNextValue(white[3]);
+
+              pts[0] = numPolys*4;
+              pts[1] = numPolys*4 + 1;
+              pts[2] = numPolys*4 + 2;
+              pts[3] = numPolys*4 + 3;
+              newPolys->InsertNextCell(4,pts);
+              numPolys++;
+              drawingWhite = 0;
+            }
+            if (!drawingBlack && this->Backing) {
+              x[0] = pos*vtkfont_width + col;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(black[0]);
+              newScalars->InsertNextValue(black[1]);
+              newScalars->InsertNextValue(black[2]);
+              newScalars->InsertNextValue(black[3]);
+
+              x[0] = pos*vtkfont_width + col + 1;
+              x[1] = vtkfont_height - row;
+              x[2] = 0;
+              ChangeOrientation(x,orientation);
+              newPoints->InsertNextPoint(x);
+              newScalars->InsertNextValue(black[0]);
+              newScalars->InsertNextValue(black[1]);
+              newScalars->InsertNextValue(black[2]);
+              newScalars->InsertNextValue(black[3]);
+              drawingBlack = 1;
+            }
+          }
+        }
+        // if we finished up a row but are still drawing close it up
+        if (drawingWhite) {
+          x[0] = pos*vtkfont_width + col + 1;
+          x[1] = 0;
+          x[2] = 0;
+          ChangeOrientation(x,orientation);
+          newPoints->InsertNextPoint(x);
+          newScalars->InsertNextValue(white[0]);
+          newScalars->InsertNextValue(white[1]);
+          newScalars->InsertNextValue(white[2]);
+          newScalars->InsertNextValue(white[3]);
+
+          x[0] = pos*vtkfont_width + col;
+          x[1] = 0;
+          x[2] = 0;
+          ChangeOrientation(x,orientation);
+          newPoints->InsertNextPoint(x);
+          newScalars->InsertNextValue(white[0]);
+          newScalars->InsertNextValue(white[1]);
+          newScalars->InsertNextValue(white[2]);
+          newScalars->InsertNextValue(white[3]);
+
+          pts[0] = numPolys*4;
+          pts[1] = numPolys*4 + 1;
+          pts[2] = numPolys*4 + 2;
+          pts[3] = numPolys*4 + 3;
+          newPolys->InsertNextCell(4,pts);
+          numPolys++;
+          drawingWhite = 0;
         }
-        pos++;
+        if (drawingBlack) {
+          x[0] = pos*vtkfont_width + col + 1;
+          x[1] = 0;
+          x[2] = 0;
+          ChangeOrientation(x,orientation);
+          newPoints->InsertNextPoint(x);
+          newScalars->InsertNextValue(black[0]);
+          newScalars->InsertNextValue(black[1]);
+          newScalars->InsertNextValue(black[2]);
+          newScalars->InsertNextValue(black[3]);
+
+          x[0] = pos*vtkfont_width + col;
+          x[1] = 0;
+          x[2] = 0;
+          ChangeOrientation(x,orientation);
+          newPoints->InsertNextPoint(x);
+          newScalars->InsertNextValue(black[0]);
+          newScalars->InsertNextValue(black[1]);
+          newScalars->InsertNextValue(black[2]);
+          newScalars->InsertNextValue(black[3]);
+
+          pts[0] = numPolys*4;
+          pts[1] = numPolys*4 + 1;
+          pts[2] = numPolys*4 + 2;
+          pts[3] = numPolys*4 + 3;
+          newPolys->InsertNextCell(4,pts);
+          numPolys++;
+          drawingBlack = 0;
+        }
+      }
+    } else {
+      // draw a black square for a space
+      if (this->Backing) {
+        x[0] = pos*vtkfont_width;
+        x[1] = vtkfont_height;
+        x[2] = 0;
+        ChangeOrientation(x,orientation);
+        newPoints->InsertNextPoint(x);
+        newScalars->InsertNextValue(black[0]);
+        newScalars->InsertNextValue(black[1]);
+        newScalars->InsertNextValue(black[2]);
+        newScalars->InsertNextValue(black[3]);
+
+        x[0] = pos*vtkfont_width + vtkfont_width;
+        x[1] = vtkfont_height;
+        x[2] = 0;
+        ChangeOrientation(x,orientation);
+        newPoints->InsertNextPoint(x);
+        newScalars->InsertNextValue(black[0]);
+        newScalars->InsertNextValue(black[1]);
+        newScalars->InsertNextValue(black[2]);
+        newScalars->InsertNextValue(black[3]);
+
+        x[0] = pos*vtkfont_width + vtkfont_width;
+        x[1] = 0;
+        x[2] = 0;
+        ChangeOrientation(x,orientation);
+        newPoints->InsertNextPoint(x);
+        newScalars->InsertNextValue(black[0]);
+        newScalars->InsertNextValue(black[1]);
+        newScalars->InsertNextValue(black[2]);
+        newScalars->InsertNextValue(black[3]);
+
+        x[0] = pos*vtkfont_width;
+        x[1] = 0;
+        x[2] = 0;
+        ChangeOrientation(x,orientation);
+        newPoints->InsertNextPoint(x);
+        newScalars->InsertNextValue(black[0]);
+        newScalars->InsertNextValue(black[1]);
+        newScalars->InsertNextValue(black[2]);
+        newScalars->InsertNextValue(black[3]);
+
+        pts[0] = numPolys*4;
+        pts[1] = numPolys*4 + 1;
+        pts[2] = numPolys*4 + 2;
+        pts[3] = numPolys*4 + 3;
+        newPolys->InsertNextCell(4,pts);
+        numPolys++;
+      }
     }
+    pos++;
+  }
 }
 
 void vvLandmarksGlyph::AddCrossGlyph(vtkPoints* newPts,vtkCellArray* newLines)
 {
-    vtkIdType ptIds[2];
-    double x[3];
-    std::cout << "AddCross" << std::endl;
-    x[0] = -10;
-    x[1] = 0;
-    x[2] = 0;
-    ptIds[0] = newPts->InsertNextPoint(x);
-
-    x[0] = 10;
-    x[1] = 0;
-    x[2] = 0;
-    ptIds[1] = newPts->InsertNextPoint(x);
-    newLines->InsertNextCell(2,ptIds);
-
-    x[0] = 0;
-    x[1] = -10;
-    x[2] = 0;
-    ptIds[0] = newPts->InsertNextPoint(x);
-
-    x[0] = 0;
-    x[1] = 10;
-    x[2] = 0;
-    ptIds[1] = newPts->InsertNextPoint(x);
-    newLines->InsertNextCell(2,ptIds);
-
-    x[0] = 0;
-    x[1] = 0;
-    x[2] = -10;
-    ptIds[0] = newPts->InsertNextPoint(x);
-
-    x[0] = 0;
-    x[1] = 0;
-    x[2] = 10;
-    ptIds[1] = newPts->InsertNextPoint(x);
-    newLines->InsertNextCell(2,ptIds);
+  vtkIdType ptIds[2];
+  double x[3];
+  std::cout << "AddCross" << std::endl;
+  x[0] = -10;
+  x[1] = 0;
+  x[2] = 0;
+  ptIds[0] = newPts->InsertNextPoint(x);
+
+  x[0] = 10;
+  x[1] = 0;
+  x[2] = 0;
+  ptIds[1] = newPts->InsertNextPoint(x);
+  newLines->InsertNextCell(2,ptIds);
+
+  x[0] = 0;
+  x[1] = -10;
+  x[2] = 0;
+  ptIds[0] = newPts->InsertNextPoint(x);
+
+  x[0] = 0;
+  x[1] = 10;
+  x[2] = 0;
+  ptIds[1] = newPts->InsertNextPoint(x);
+  newLines->InsertNextCell(2,ptIds);
+
+  x[0] = 0;
+  x[1] = 0;
+  x[2] = -10;
+  ptIds[0] = newPts->InsertNextPoint(x);
+
+  x[0] = 0;
+  x[1] = 0;
+  x[2] = 10;
+  ptIds[1] = newPts->InsertNextPoint(x);
+  newLines->InsertNextCell(2,ptIds);
 }
 
 
 void vvLandmarksGlyph::ChangeOrientation(double v[3],int orientation)
 {
-    double x=0,y=0,z=0;
-    switch (orientation)
-    {
-    case 0:
-        x = v[1];
-        y = v[2];
-        z = v[0];
-        break;
-    case 1:
-        x = v[2];
-        y = v[0];
-        z = v[1];
-        break;
-    case 2:
-        x = v[0];
-        y = v[1];
-        z = v[2];
-        break;
-    default:
-        assert(false); //This definitely shouldn't happen
-    }
-    v[0] = x;
-    v[1] = y;
-    v[2] = z;
+  double x=0,y=0,z=0;
+  switch (orientation) {
+  case 0:
+    x = v[1];
+    y = v[2];
+    z = v[0];
+    break;
+  case 1:
+    x = v[2];
+    y = v[0];
+    z = v[1];
+    break;
+  case 2:
+    x = v[0];
+    y = v[1];
+    z = v[2];
+    break;
+  default:
+    assert(false); //This definitely shouldn't happen
+  }
+  v[0] = x;
+  v[1] = y;
+  v[2] = z;
 }
 
 void vvLandmarksGlyph::PrintSelf(ostream& os, vtkIndent indent)
 {
-    this->Superclass::PrintSelf(os,indent);
-
-    os << indent << "Text: " << (this->Text ? this->Text : "(none)") << "\n";
-    os << indent << "Background Drawn: " << (this->Backing ? "On\n" : "Off\n");
-    os << indent << "ForegroundColor: (" << this->ForegroundColor[0] << ", "
-    << this->ForegroundColor[1] << ", " << this->ForegroundColor[2]  << ")\n";
-    os << indent << "BackgroundColor: (" << this->BackgroundColor[0] << ", "
-    << this->BackgroundColor[1] << ", " << this->BackgroundColor[2] << ")\n";
+  this->Superclass::PrintSelf(os,indent);
+
+  os << indent << "Text: " << (this->Text ? this->Text : "(none)") << "\n";
+  os << indent << "Background Drawn: " << (this->Backing ? "On\n" : "Off\n");
+  os << indent << "ForegroundColor: (" << this->ForegroundColor[0] << ", "
+     << this->ForegroundColor[1] << ", " << this->ForegroundColor[2]  << ")\n";
+  os << indent << "BackgroundColor: (" << this->BackgroundColor[0] << ", "
+     << this->BackgroundColor[1] << ", " << this->BackgroundColor[2] << ")\n";
 }