NxWM: Cleaned up a couple of icon images

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4697 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 73 insertions, 158 deletions

diff --git a/NxWidgets/nxwm/images/minimize.png b/NxWidgets/nxwm/images/minimize.png
index 7671547f8..7080533dd 100755
--- a/NxWidgets/nxwm/images/minimize.png
+++ b/NxWidgets/nxwm/images/minimize.png
diff --git a/NxWidgets/nxwm/images/stop.png b/NxWidgets/nxwm/images/stop.png
index e33cec921..365068b4a 100755
--- a/NxWidgets/nxwm/images/stop.png
+++ b/NxWidgets/nxwm/images/stop.png
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index 99383fe02..8ac45fc72 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -209,7 +209,7 @@
 #endif
 
 /**
- * At present, all icons are 25 pixels in "widgth" and, hence require a
+ * At present, all icons are 25 pixels in "width" and, hence require a
  * task bar of at least that size.
  */
 
@@ -224,11 +224,12 @@
 /* Tool Bar Configuration ***************************************************/
 /**
  * CONFIG_NXWM_TOOLBAR_HEIGHT.  The height of the tool bar in each
- *   application window.  Default:  Same as the thickness of the task bar.
+ *   application window. At present, all icons are 21 pixels in height and,
+ *   hence require a task bar of at least that size.
  */
 
 #ifndef CONFIG_NXWM_TOOLBAR_HEIGHT
-#  define CONFIG_NXWM_TOOLBAR_HEIGHT CONFIG_NXWM_TASKBAR_WIDTH
+#    define CONFIG_NXWM_TOOLBAR_HEIGHT (21+2*CONFIG_NXWM_TASKBAR_HSPACING)
 #endif
 
 /* Background Image **********************************************************/
diff --git a/NxWidgets/nxwm/src/glyph_minimize.cxx b/NxWidgets/nxwm/src/glyph_minimize.cxx
index 1029ec0b3..1f375ab13 100644
--- a/NxWidgets/nxwm/src/glyph_minimize.cxx
+++ b/NxWidgets/nxwm/src/glyph_minimize.cxx
@@ -56,9 +56,9 @@
  * Pre-Processor Definitions
  ********************************************************************************************/
 
-#define BITMAP_NROWS     25
-#define BITMAP_NCOLUMNS  25
-#define BITMAP_NLUTCODES 25
+#define BITMAP_NROWS     21
+#define BITMAP_NCOLUMNS  21
+#define BITMAP_NLUTCODES 8
 
 /********************************************************************************************
  * Private Bitmap Data
@@ -72,10 +72,7 @@ using namespace NxWM;
 
 static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 9 */
-  0x2449b6, 0x24496d, 0x244992, 0x242492, 0x496ddb, 0x0024db, 0x0024b6, 0x002492,  /* Codes 1-8 */
-  0x0000b6, 0x2424b6, 0x0024ff, 0x0000db, 0x4949db, 0x496db6, 0x246db6, 0x4949b6,  /* Codes 9-17 */
-  0x2449db, 0xb6dbff, 0xb6b6db, 0xdbdbff, 0xdbffff, 0x496dff, 0x246dff, 0x4949ff   /* Codes 17-24 */
+  0x2448b4, 0x486cd8, 0x0024b4, 0x0024d8, 0x242490, 0x0000b4, 0xfcfcfc, 0xd8fcfc  /* Codes 0-7 */
 };
 
 /* RGB16 (565) Colors (four of the colors in this map are duplicates) */
@@ -84,10 +81,7 @@ static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] =
 
 static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0x2256, 0x224d, 0x2252, 0x2132, 0x4b7b, 0x013b, 0x0136, 0x0132, 0x0016, 0x2136,  /* Codes 1-10 */
-  0x013f, 0x001b, 0x4a5b, 0x4b76, 0x2376, 0x4a56, 0x225b, 0xb6df, 0xb5bb, 0xdedf,  /* Codes 11-20 */
-  0xdfff, 0x4b7f, 0x237f, 0x4a5f                                                   /* Codes 21-24 */
+  0x2256, 0x4b7b, 0x0136, 0x013b, 0x2132, 0x0016, 0xffff, 0xdfff  /* Codes 0-7 */
 };
 
 /* 8-bit color lookups.  NOTE:  This is really dumb!  The lookup index is 8-bits and it used
@@ -104,9 +98,7 @@ static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] =
 
 static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0x4a, 0x42, 0x46, 0x30, 0x6e, 0x2e, 0x29, 0x25, 0x14, 0x34, 0x32, 0x18, 0x59,    /* Codes 1-13 */
-  0x6a, 0x5f, 0x55, 0x4e, 0xd4, 0xba, 0xdf, 0xf4, 0x72, 0x67, 0x5d                 /* Codes 14-24 */
+  0x49, 0x6d, 0x29, 0x2d, 0x30, 0x14, 0xfc, 0xf1  /* Codes 0-7 */
 };
 
 #  else /* CONFIG_NXWIDGETS_GREYSCALE */
@@ -115,9 +107,7 @@ static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] =
 
 static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0x2a, 0x29, 0x2a, 0x26, 0x4f, 0x07, 0x06, 0x06, 0x02, 0x26, 0x07, 0x03, 0x4b,    /* Codes 1-13 */
-  0x4e, 0x2e, 0x4a, 0x2b, 0xbb, 0xb7, 0xdb, 0xdf, 0x4f, 0x2f, 0x4b                 /* Codes 14-24 */
+  0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf  /* Codes 0-7 */
 };
 
 #  endif
@@ -127,47 +117,27 @@ static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] =
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] =
 {
-  { 25,   0},                                                                                      /* Row 0 */
-  { 25,   0},                                                                                      /* Row 1 */
-  {  2,   0}, {  1,   1}, {  3,   2}, {  1,   3}, {  1,   4}, {  3,   3}, {  2,   4}, {  4,   3},  /* Row 2 */
-  {  1,   4}, {  1,   3}, {  2,   2}, {  1,   1}, {  1,   5}, {  2,   0},
-  {  2,   0}, {  1,   2}, {  3,   6}, {  8,   7}, {  2,   8}, {  3,   7}, {  2,   8}, {  1,   4},  /* Row 3 */
-  {  1,   1}, {  2,   0},
-  {  2,   0}, {  1,   4}, { 11,   6}, {  3,   7}, {  1,   6}, {  4,   7}, {  1,   2}, {  2,   0},  /* Row 4 */
-  {  2,   0}, {  1,   7}, { 11,   6}, {  3,   7}, {  1,   6}, {  4,   7}, {  1,   3}, {  2,   0},  /* Row 5 */
-  {  2,   0}, {  1,   4}, {  9,   6}, { 10,   7}, {  1,   1}, {  2,   0},                          /* Row 6 */
-  {  2,   0}, {  1,   4}, {  9,   6}, {  2,   7}, {  1,   8}, {  7,   7}, {  1,   1}, {  2,   0},  /* Row 7 */
-  {  2,   0}, {  1,   4}, {  8,   6}, {  4,   7}, {  1,   8}, {  6,   7}, {  1,   1}, {  2,   0},  /* Row 8 */
-  {  2,   0}, {  1,   4}, {  9,   6}, {  8,   7}, {  1,   9}, {  1,   7}, {  1,   1}, {  2,   0},  /* Row 9 */
-  {  2,   0}, {  1,  10}, {  9,   6}, {  1,   7}, {  1,   6}, {  6,   7}, {  1,   9}, {  1,   7},  /* Row 10 */
-  {  1,   1}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  7,   6}, {  1,   7}, {  2,   6}, {  6,   7}, {  2,   9}, {  1,   7},  /* Row 11 */
-  {  1,  10}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  6,   6}, {  3,   7}, {  1,   6}, {  6,   7}, {  3,   9}, {  1,  10},  /* Row 12 */
-  {  2,   0},
-  {  2,   0}, {  1,  10}, {  4,   6}, {  8,   7}, {  3,   9}, {  1,   7}, {  3,   9}, {  1,  10},  /* Row 13 */
-  {  2,   0},
-  {  2,   0}, {  1,   4}, {  1,   7}, {  1,   6}, {  1,   7}, {  2,   6}, {  2,   7}, {  3,   9},  /* Row 14 */
-  {  1,   7}, {  6,   9}, {  1,   7}, {  1,   9}, {  1,   4}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  2,   6}, {  1,   7}, {  1,   6}, {  3,   7}, {  2,   9}, {  1,   7},  /* Row 15 */
-  {  6,   9}, {  1,   7}, {  1,   6}, {  1,   9}, {  1,  10}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  1,  11}, {  2,   6}, {  5,   7}, {  1,   6}, {  3,   7}, {  3,   9},  /* Row 16 */
-  {  2,   7}, {  2,   9}, {  1,  10}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  3,  11}, {  5,   6}, {  3,   9}, {  5,   7}, {  1,   6}, {  1,   7},  /* Row 17 */
-  {  1,   9}, {  1,  10}, {  2,   0},
-  {  2,   0}, {  1,  10}, {  1,   6}, {  1,  12}, {  1,  13}, {  1,  14}, {  1,   1}, {  2,  15},  /* Row 18 */
-  {  1,   1}, {  1,  14}, {  2,  16}, {  3,  14}, {  1,   1}, {  1,  15}, {  1,  17}, {  2,   9},
-  {  1,   4}, {  2,   0},
-  {  2,   0}, {  1,   4}, {  2,  10}, {  1,  18}, { 13,   0}, {  1,  18}, {  1,  10}, {  1,   4},  /* Row 19 */
-  {  1,   2}, {  2,   0},
-  {  2,   0}, {  1,   4}, {  1,  10}, {  1,   9}, {  1,  19}, {  3,  20}, {  2,  21}, {  7,  20},  /* Row 20 */
-  {  1,  21}, {  1,  18}, {  1,  13}, {  1,   4}, {  1,   2}, {  2,   0},
-  {  2,   0}, {  1,   1}, {  3,   6}, {  1,  17}, {  2,  22}, {  1,   5}, {  1,  23}, {  2,  22},  /* Row 21 */
-  {  3,   5}, {  2,  22}, {  1,   5}, {  1,  22}, {  1,  24}, {  1,   7}, {  1,   1}, {  2,   0},
-  {  2,   0}, {  1,   5}, {  1,   1}, {  1,   6}, {  1,   7}, {  2,  10}, {  3,   7}, {  2,   6},  /* Row 22 */
-  {  6,   7}, {  2,  10}, {  1,   1}, {  1,   5}, {  2,   0},
-  { 25,   0},                                                                                      /* Row 23 */
-  { 25,   0}                                                                                       /* Row 24 */
+  {  1,   0}, { 20,   1},  /* Row 0 */
+  {  1,   1}, {  5,   2}, {  5,   3}, {  8,   2}, {  1,   4}, {  1,   0},  /* Row 1 */
+  {  1,   1}, {  3,   2}, {  8,   3}, {  8,   2}, {  1,   4},              /* Row 2 */
+  {  1,   1}, {  2,   2}, { 10,   3}, {  7,   2}, {  1,   4},              /* Row 3 */
+  {  1,   1}, {  1,   2}, { 10,   3}, {  8,   2}, {  1,   4},              /* Row 4 */
+  {  1,   1}, {  1,   2}, {  9,   3}, {  9,   2}, {  1,   4},              /* Row 5 */
+  {  1,   1}, {  9,   3}, {  9,   2}, {  1,   5}, {  1,   4},              /* Row 6 */
+  {  1,   1}, {  8,   3}, { 10,   2}, {  1,   5}, {  1,   4},              /* Row 7 */
+  {  1,   1}, {  7,   3}, { 11,   2}, {  1,   5}, {  1,   4},              /* Row 8 */
+  {  1,   1}, {  1,   2}, {  4,   3}, { 12,   2}, {  2,   5}, {  1,   4},  /* Row 9 */
+  {  1,   1}, {  2,   2}, {  1,   3}, { 14,   2}, {  2,   5}, {  1,   4},  /* Row 10 */
+  {  1,   1}, { 16,   2}, {  3,   5}, {  1,   4},                          /* Row 11 */
+  {  1,   1}, { 15,   2}, {  4,   5}, {  1,   4},                          /* Row 12 */
+  {  1,   1}, { 13,   2}, {  6,   5}, {  1,   4},                          /* Row 13 */
+  {  1,   1}, { 11,   2}, {  8,   5}, {  1,   4},                          /* Row 14 */
+  {  1,   1}, {  8,   2}, { 11,   5}, {  1,   4},                          /* Row 15 */
+  {  1,   1}, {  4,   2}, { 15,   5}, {  1,   4},                          /* Row 16 */
+  {  1,   1}, {  2,   2}, { 14,   6}, {  1,   7}, {  2,   5}, {  1,   4},  /* Row 17 */
+  {  1,   1}, {  1,   2}, {  1,   5}, { 15,   7}, {  2,   5}, {  1,   4},  /* Row 18 */
+  {  1,   1}, { 19,   5}, {  1,   0},                                      /* Row 19 */
+  {  1,   1}, {  1,   0}, { 17,   4}, {  1,   0}, {  1,   1},              /* Row 20 */
 };
 
 /********************************************************************************************
diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx
index 828e5266c..9081b48a2 100644
--- a/NxWidgets/nxwm/src/glyph_stop.cxx
+++ b/NxWidgets/nxwm/src/glyph_stop.cxx
@@ -56,9 +56,9 @@
  * Pre-Processor Definitions
  ********************************************************************************************/
 
-#define BITMAP_NROWS     25
-#define BITMAP_NCOLUMNS  25
-#define BITMAP_NLUTCODES 66
+#define BITMAP_NROWS     21
+#define BITMAP_NCOLUMNS  21
+#define BITMAP_NLUTCODES 11
 
 /********************************************************************************************
  * Private Bitmap Data
@@ -72,16 +72,8 @@ using namespace NxWM;
 
 static const uint32_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0xdbdbdb, 0xdbb6db, 0xdbb6b6, 0xdb9292, 0xdb926d, 0xdb6d6d, 0xb66d6d, 0xb64949,  /* Codes 1-8 */
-  0xb62449, 0xdb246d, 0xdb4949, 0xff496d, 0xffb6b6, 0xffdbff, 0xffdbdb, 0xff9292,  /* Codes 9-16 */
-  0xff6d6d, 0xdb6d49, 0xff2449, 0xff246d, 0xdb2449, 0xdbdbb6, 0xff4949, 0xff2424,  /* Codes 17-24 */
-  0xffffdb, 0xdbb692, 0xdb2424, 0xff4924, 0xffb6db, 0xffdbb6, 0xff6d49, 0xffb692,  /* Codes 25-32 */
-  0xdb4924, 0xb64924, 0xdbdb92, 0xb69292, 0xb62424, 0xdb496d, 0xb6926d, 0xdbffff,  /* Codes 33-40 */
-  0xdbffdb, 0xb6496d, 0xdb0024, 0xdb6d92, 0xff2400, 0xb66d49, 0xdb2400, 0xb62400,  /* Codes 41-48 */
-  0x922424, 0xb60000, 0x922449, 0xff92b6, 0x920000, 0xdb0049, 0xb60024, 0xdb0000,  /* Codes 49-56 */
-  0x922400, 0x924949, 0x924924, 0x920024, 0xff6d92, 0x6d4924, 0x6d2400, 0x6d2424,  /* Codes 57-64 */
-  0x6d0000                                                                         /* Code 65 */
+  0xd8d8d8, 0xfc6c6c, 0xfcb4b4, 0xd80000, 0xfc0000, 0x902424, 0xfcfcfc, 0xd8fcfc,  /* Codes 0-7 */
+  0xb40000, 0xb40024, 0xfcd8d8                                                     /* Codes 8-10 */
 };
 
 /* RGB16 (565) Colors (four of the colors in this map are duplicates) */
@@ -90,14 +82,8 @@ static const uint32_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const uint16_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0xdedb, 0xddbb, 0xddb6, 0xdc92, 0xdc8d, 0xdb6d, 0xb36d, 0xb249, 0xb129, 0xd92d,  /* Codes 1-10 */
-  0xda49, 0xfa4d, 0xfdb6, 0xfedf, 0xfedb, 0xfc92, 0xfb6d, 0xdb69, 0xf929, 0xf92d,  /* Codes 11-20 */
-  0xd929, 0xded6, 0xfa49, 0xf924, 0xfffb, 0xddb2, 0xd924, 0xfa44, 0xfdbb, 0xfed6,  /* Codes 21-30 */
-  0xfb69, 0xfdb2, 0xda44, 0xb244, 0xded2, 0xb492, 0xb124, 0xda4d, 0xb48d, 0xdfff,  /* Codes 31-40 */
-  0xdffb, 0xb24d, 0xd804, 0xdb72, 0xf920, 0xb369, 0xd920, 0xb120, 0x9124, 0xb000,  /* Codes 41-50 */
-  0x9129, 0xfc96, 0x9000, 0xd809, 0xb004, 0xd800, 0x9120, 0x9249, 0x9244, 0x9004,  /* Codes 51-60 */
-  0xfb72, 0x6a44, 0x6920, 0x6924, 0x6800                                           /* Codes 61-65 */
+  0xdedb, 0xfb6d, 0xfdb6, 0xd800, 0xf800, 0x9124, 0xffff, 0xdfff, 0xb000, 0xb004,  /* Codes 0-9 */
+  0xfedb                                                                           /* Codes 10-10 */
 };
 
 /* 8-bit color lookups.  NOTE:  This is really dumb!  The lookup index is 8-bits and it used
@@ -114,12 +100,7 @@ static const uint16_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const uint8_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0xdb, 0xc5, 0xc1, 0xa7, 0xa3, 0x8d, 0x82, 0x69, 0x53, 0x63, 0x74, 0x83, 0xcb,    /* Codes 1-13 */
-  0xe9, 0xe5, 0xb2, 0x98, 0x89, 0x69, 0x6d, 0x5e, 0xd6, 0x7f, 0x65, 0xfa, 0xbc,    /* Codes 14-26 */
-  0x5a, 0x7b, 0xd0, 0xe1, 0x94, 0xc7, 0x70, 0x65, 0xd2, 0x9c, 0x4f, 0x78, 0x98,    /* Codes 27-39 */
-  0xf4, 0xf0, 0x6d, 0x45, 0x92, 0x61, 0x7e, 0x56, 0x4b, 0x44, 0x36, 0x49, 0xb6,    /* Codes 40-52 */
-  0x2b, 0x49, 0x3a, 0x41, 0x40, 0x5e, 0x5a, 0x2f, 0x9c, 0x4f, 0x35, 0x39, 0x20     /* Codes 53-65 */
+  0xd8, 0x97, 0xc9, 0x40, 0x4b, 0x44, 0xfc, 0xf1, 0x35, 0x39, 0xe2   /* Codes 0-10 */
 
 };
 
@@ -129,12 +110,7 @@ static const uint8_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const nxgl_mxpixel_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  CONFIG_NXTK_BORDERCOLOR1,                                                        /* Code 0 */
-  0xdb, 0xd7, 0xd6, 0xd2, 0xd1, 0xcd, 0xad, 0xa9, 0xa5, 0xc5, 0xc9, 0xe9, 0xf6,    /* Codes 1-13 */
-  0xfb, 0xfb, 0xf2, 0xed, 0xcd, 0xe5, 0xe5, 0xc5, 0xda, 0xe9, 0xe4, 0xff, 0xd6,    /* Codes 14-26 */
-  0xc4, 0xe8, 0xf7, 0xfa, 0xed, 0xf6, 0xc8, 0xa8, 0xda, 0xb2, 0xa4, 0xc9, 0xb1,    /* Codes 27-39 */
-  0xdf, 0xdf, 0xa9, 0xc0, 0xce, 0xe4, 0xad, 0xc4, 0xa4, 0x84, 0xa0, 0x85, 0xf2,    /* Codes 40-52 */
-  0x80, 0xc1, 0xa0, 0xc0, 0x84, 0x89, 0x88, 0x80, 0xee, 0x68, 0x64, 0x64, 0x60     /* Codes 53-65 */
+  0xdb, 0xed, 0xf6, 0xc0, 0xe0, 0x84, 0xff, 0xdf, 0xa0, 0xa0, 0xfb   /* Codes 0-10 */
 };
 
 #  endif
@@ -144,70 +120,38 @@ static const nxgl_mxpixel_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const struct NXWidgets::SRlePaletteBitmapEntry g_stopRleEntries[] =
 {
-  { 25,   0},                                                                                      /* Row 0 */
-  { 25,   0},                                                                                      /* Row 1 */
-  {  2,   0}, {  1,   1}, {  1,   2}, {  1,   3}, {  1,   2}, {  2,   3}, {  2,   4}, {  1,   5},  /* Row 2 */
-  {  2,   6}, {  1,   7}, {  2,   8}, {  1,   9}, {  1,  10}, {  1,  11}, {  1,   8}, {  1,  11},
-  {  1,  12}, {  1,  13}, {  2,   0},
-  {  2,   0}, {  1,   1}, {  1,  14}, {  2,  15}, {  1,   1}, {  1,   3}, {  1,  13}, {  2,  16},  /* Row 3 */
-  {  2,  17}, {  1,  18}, {  1,  11}, {  2,  19}, {  1,  20}, {  1,  19}, {  1,  21}, {  2,  19},
-  {  1,  17}, {  2,   0},
-  {  2,   0}, {  1,   2}, {  1,  14}, {  2,  15}, {  1,  22}, {  1,   3}, {  1,   4}, {  2,  17},  /* Row 4 */
-  {  3,  23}, {  3,  24}, {  2,  21}, {  1,  23}, {  1,  19}, {  1,  24}, {  1,   8}, {  2,   0},
-  {  2,   0}, {  1,   3}, {  2,  15}, {  1,   0}, {  2,  25}, {  1,  26}, {  1,   6}, {  1,  11},  /* Row 5 */
-  {  2,  23}, {  1,  24}, {  2,  27}, {  1,  28}, {  2,  15}, {  1,   0}, {  1,  17}, {  1,  23},
-  {  1,   8}, {  2,   0},
-  {  2,   0}, {  1,   3}, {  1,  29}, {  1,  13}, {  1,  30}, {  1,   0}, {  1,  25}, {  1,  22},  /* Row 6 */
-  {  1,   5}, {  1,  11}, {  2,  27}, {  1,  24}, {  1,  27}, {  1,  31}, {  1,  32}, {  1,  25},
-  {  1,   0}, {  1,  26}, {  1,  33}, {  1,  27}, {  1,  34}, {  2,   0},
-  {  2,   0}, {  1,   3}, {  1,  13}, {  2,  16}, {  1,  30}, {  1,   0}, {  1,  25}, {  1,  26},  /* Row 7 */
-  {  1,   8}, {  2,  21}, {  1,  27}, {  1,  11}, {  1,  26}, {  1,  25}, {  1,   0}, {  1,  35},
-  {  1,  34}, {  1,  33}, {  1,  27}, {  1,   8}, {  2,   0},
-  {  2,   0}, {  1,  36}, {  2,  16}, {  2,   6}, {  1,  13}, {  1,   0}, {  1,  25}, {  1,   4},  /* Row 8 */
-  {  3,   8}, {  1,   4}, {  1,  25}, {  1,   0}, {  1,  13}, {  1,   8}, {  1,  37}, {  2,  24},
-  {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,  36}, {  1,   4}, {  1,  17}, {  1,  12}, {  1,  11}, {  1,  38}, {  1,  15},  /* Row 9 */
-  {  2,   0}, {  2,  36}, {  1,   7}, {  1,  15}, {  1,   0}, {  1,  15}, {  1,  23}, {  1,  27},
-  {  3,  24}, {  1,  27}, {  2,   0},
-  {  2,   0}, {  1,  39}, {  1,   6}, {  2,  23}, {  1,  19}, {  1,  37}, {  1,  38}, {  1,  15},  /* Row 10 */
-  {  1,   0}, {  2,  40}, {  1,  41}, {  1,   0}, {  1,  29}, {  1,  42}, {  1,  43}, {  1,  27},
-  {  3,  24}, {  1,  27}, {  2,   0},
-  {  2,   0}, {  1,   7}, {  1,  18}, {  1,  21}, {  2,  24}, {  1,  21}, {  1,   9}, {  1,  44},  /* Row 11 */
-  {  1,   0}, {  3,  40}, {  1,   0}, {  1,  44}, {  1,   9}, {  3,  27}, {  1,  45}, {  1,  24},
-  {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,   7}, {  1,  18}, {  1,  21}, {  2,  24}, {  1,  21}, {  1,   9}, {  1,  44},  /* Row 12 */
-  {  1,   0}, {  3,  40}, {  1,   0}, {  1,  44}, {  1,   9}, {  3,  27}, {  1,  45}, {  1,  24},
-  {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,  46}, {  1,  11}, {  4,  27}, {  1,   9}, {  1,  44}, {  5,   0}, {  1,  44},  /* Row 13 */
-  {  1,   9}, {  1,  27}, {  2,  37}, {  1,  47}, {  1,  27}, {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,   8}, {  3,  27}, {  1,  48}, {  1,  37}, {  1,   6}, {  1,  15}, {  1,   0},  /* Row 14 */
-  {  3,  15}, {  1,   0}, {  1,  15}, {  1,   7}, {  1,  37}, {  1,  49}, {  1,  37}, {  1,  48},
-  {  1,  27}, {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,   8}, {  1,  37}, {  1,  27}, {  2,  48}, {  1,  46}, {  1,  15}, {  1,   0},  /* Row 15 */
-  {  1,  15}, {  3,   7}, {  1,  15}, {  1,   0}, {  1,  30}, {  1,  23}, {  1,  37}, {  2,  48},
-  {  1,  27}, {  1,  37}, {  2,   0},
-  {  2,   0}, {  1,  49}, {  1,  37}, {  1,  27}, {  1,  50}, {  1,  34}, {  1,  30}, {  1,   0},  /* Row 16 */
-  {  1,  25}, {  1,   7}, {  2,  51}, {  1,   9}, {  1,   7}, {  1,  25}, {  1,   0}, {  1,  52},
-  {  1,  27}, {  1,  53}, {  1,  47}, {  1,  27}, {  1,  49}, {  2,   0},
-  {  2,   0}, {  1,  37}, {  1,  54}, {  1,  55}, {  1,   9}, {  1,  30}, {  1,   0}, {  1,  15},  /* Row 17 */
-  {  1,  17}, {  1,  56}, {  2,  43}, {  1,  37}, {  1,  57}, {  1,  17}, {  1,  15}, {  1,   0},
-  {  1,  30}, {  1,  58}, {  1,  53}, {  1,  37}, {  1,  58}, {  2,   0},
-  {  2,   0}, {  1,   9}, {  1,  53}, {  1,  37}, {  1,  32}, {  1,   0}, {  1,  25}, {  1,   5},  /* Row 18 */
-  {  1,  37}, {  1,  55}, {  2,  50}, {  1,  53}, {  1,  49}, {  1,  59}, {  1,   5}, {  1,  25},
-  {  1,   0}, {  1,  16}, {  1,   9}, {  1,  60}, {  1,  49}, {  2,   0},
-  {  2,   0}, {  1,  49}, {  1,  60}, {  1,  61}, {  1,   0}, {  1,  25}, {  1,  30}, {  1,  62},  /* Row 19 */
-  {  1,  57}, {  1,  53}, {  2,  50}, {  1,  57}, {  1,  63}, {  1,  57}, {  1,  49}, {  1,  30},
-  {  1,  15}, {  1,   0}, {  1,  61}, {  1,  37}, {  1,  49}, {  2,   0},
-  {  2,   0}, {  1,  49}, {  1,  55}, {  1,  11}, {  1,   8}, {  1,  58}, {  1,  64}, {  1,  65},  /* Row 20 */
-  {  1,  55}, {  1,  50}, {  2,  55}, {  1,  37}, {  1,  53}, {  1,  37}, {  1,  53}, {  1,  64},
-  {  1,   8}, {  1,  11}, {  1,  21}, {  1,  60}, {  1,  51}, {  2,   0},
-  {  2,   0}, {  1,  38}, {  1,  55}, {  1,  60}, {  2,  49}, {  1,  65}, {  1,  60}, {  1,  50},  /* Row 21 */
-  {  1,  43}, {  3,  50}, {  1,  55}, {  2,  50}, {  1,  64}, {  1,  49}, {  2,  60}, {  1,  37},
-  {  1,  38}, {  2,   0},
-  {  2,   0}, {  1,  29}, {  1,  38}, {  2,  49}, {  2,  64}, {  1,  49}, {  2,  55}, {  2,  37},  /* Row 22 */
-  {  3,  49}, {  1,  37}, {  1,  64}, {  1,  58}, {  2,  49}, {  1,   6}, {  1,  13}, {  2,   0},
-  { 25,   0},                                                                                      /* Row 23 */
-  { 25,   0}                                                                                       /* Row 24 */
+  {  1,   0}, {  1,   1}, { 17,   2}, {  1,   1}, {  1,   2},                                      /* Row 0 */
+  {  1,   1}, {  4,   3}, {  6,   4}, {  9,   3}, {  1,   1},                                      /* Row 1 */
+  {  1,   2}, {  2,   3}, {  9,   4}, {  8,   3}, {  1,   5},                                      /* Row 2 */
+  {  1,   2}, {  1,   3}, {  1,   4}, {  2,   6}, {  1,   7}, {  7,   4}, {  2,   3}, {  2,   6},  /* Row 3 */
+  {  1,   7}, {  2,   3}, {  1,   5},
+  {  1,   2}, {  1,   3}, {  1,   4}, {  3,   6}, {  1,   7}, {  5,   4}, {  2,   3}, {  3,   6},  /* Row 4 */
+  {  1,   7}, {  2,   3}, {  1,   5},
+  {  1,   2}, {  3,   4}, {  3,   6}, {  1,   7}, {  4,   4}, {  1,   3}, {  3,   6}, {  1,   7},  /* Row 5 */
+  {  3,   3}, {  1,   5},
+  {  1,   2}, {  4,   4}, {  3,   6}, {  1,   7}, {  2,   4}, {  1,   3}, {  3,   6}, {  1,   7},  /* Row 6 */
+  {  4,   3}, {  1,   5},
+  {  1,   2}, {  5,   4}, {  3,   6}, {  1,   7}, {  1,   3}, {  3,   6}, {  1,   7}, {  4,   3},  /* Row 7 */
+  {  1,   8}, {  1,   5},
+  {  1,   2}, {  6,   4}, {  6,   6}, {  1,   7}, {  5,   3}, {  1,   8}, {  1,   5},              /* Row 8 */
+  {  1,   2}, {  1,   3}, {  4,   4}, {  2,   3}, {  2,   6}, {  3,   7}, {  6,   3}, {  1,   8},  /* Row 9 */
+  {  1,   5},
+  {  1,   2}, {  2,   3}, {  1,   4}, {  4,   3}, {  2,   6}, {  3,   7}, {  5,   3}, {  2,   8},  /* Row 10 */
+  {  1,   5},
+  {  1,   2}, {  7,   3}, {  4,   6}, {  1,   7}, {  5,   3}, {  2,   8}, {  1,   5},              /* Row 11 */
+  {  1,   2}, {  6,   3}, {  6,   6}, {  1,   7}, {  3,   3}, {  3,   8}, {  1,   5},              /* Row 12 */
+  {  1,   2}, {  5,   3}, {  2,   6}, {  2,   7}, {  1,   3}, {  2,   6}, {  2,   7}, {  1,   3},  /* Row 13 */
+  {  4,   8}, {  1,   5},
+  {  1,   2}, {  4,   3}, {  3,   6}, {  1,   7}, {  3,   3}, {  3,   6}, {  1,   7}, {  4,   8},  /* Row 14 */
+  {  1,   5},
+  {  1,   2}, {  3,   3}, {  3,   6}, {  1,   7}, {  5,   3}, {  3,   6}, {  1,   7}, {  3,   8},  /* Row 15 */
+  {  1,   5},
+  {  1,   2}, {  2,   3}, {  3,   6}, {  1,   7}, {  4,   3}, {  3,   8}, {  3,   6}, {  1,   7},  /* Row 16 */
+  {  2,   8}, {  1,   5},
+  {  1,   2}, {  2,   3}, {  3,   7}, {  3,   3}, {  6,   8}, {  3,   7}, {  2,   8}, {  1,   5},  /* Row 17 */
+  {  1,   2}, {  6,   3}, {  2,   8}, {  1,   9}, { 10,   8}, {  1,   5},                          /* Row 18 */
+  {  1,   1}, {  1,   3}, { 10,   8}, {  1,   9}, {  8,   8},                                      /* Row 19 */
+  {  1,  10}, {  1,   1}, { 17,   5}, {  1,   8}, {  1,   1},                                      /* Row 20 */
 };
 
 /********************************************************************************************