[libcvd-members] libcvd build/vc2005/libcvd.vcproj cvd_src/mono....

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      08/06/12 16:45:40

Modified files:
        build/vc2005   : libcvd.vcproj 
        cvd_src        : mono.h sans.h serif.h 

Log message:
        updated VC2005 build files and fixed font data to avoid warnings in VC

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2005/libcvd.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/mono.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/sans.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/serif.h?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: build/vc2005/libcvd.vcproj
===================================================================
RCS file: /cvsroot/libcvd/libcvd/build/vc2005/libcvd.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2005/libcvd.vcproj  12 Jun 2008 13:04:15 -0000      1.1
+++ build/vc2005/libcvd.vcproj  12 Jun 2008 16:45:39 -0000      1.2
@@ -229,6 +229,10 @@
                                >
                        </File>
                        <File
+                               RelativePath="..\..\cvd_src\gltext.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\cvd_src\half_sample.cc"
                                >
                        </File>

Index: cvd_src/mono.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/mono.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/mono.h      12 Jun 2008 15:22:39 -0000      1.1
+++ cvd_src/mono.h      12 Jun 2008 16:45:40 -0000      1.2
@@ -307,102 +307,102 @@
 };
 
 Font::Char mono_chars[] = {
-{ 0, 0, 0, 0, 0, 0.8333},
-{ 0, 0, 0, 330, 216, 0.8333},
-{ 108, 330, 216, 96, 68, 0.8333},
-{ 142, 426, 284, 12, 12, 0.8333},
-{ 148, 438, 296, 282, 192, 0.8333},
-{ 244, 720, 488, 42, 28, 0.8333},
-{ 258, 762, 516, 390, 256, 0.8333},
-{ 386, 1152, 772, 15, 14, 0.8333},
-{ 393, 1167, 786, 399, 266, 0.8333},
-{ 526, 1566, 1052, 114, 76, 0.8333},
-{ 564, 1680, 1128, 30, 24, 0.8333},
-{ 576, 1710, 1152, 12, 12, 0.8333},
-{ 582, 1722, 1164, 120, 80, 0.8333},
-{ 622, 1842, 1244, 18, 16, 0.8333},
-{ 630, 1860, 1260, 30, 24, 0.8333},
-{ 642, 1890, 1284, 6, 8, 0.8333},
-{ 646, 1896, 1292, 6, 8, 0.8333},
-{ 650, 1902, 1300, 207, 138, 0.8333},
-{ 719, 2109, 1438, 114, 80, 0.8333},
-{ 759, 2223, 1518, 66, 48, 0.8333},
-{ 783, 2289, 1566, 207, 138, 0.8333},
-{ 852, 2496, 1704, 84, 60, 0.8333},
-{ 882, 2580, 1764, 30, 24, 0.8333},
-{ 894, 2610, 1788, 6, 8, 0.8333},
-{ 898, 2616, 1796, 96, 64, 0.8333},
-{ 930, 2712, 1860, 6, 8, 0.8333},
-{ 934, 2718, 1868, 30, 24, 0.8333},
-{ 946, 2748, 1892, 6, 8, 0.8333},
-{ 950, 2754, 1900, 297, 202, 0.8333},
-{ 1051, 3051, 2102, 15, 14, 0.8333},
-{ 1058, 3066, 2116, 18, 20, 0.8333},
-{ 1068, 3084, 2136, 213, 150, 0.8333},
-{ 1143, 3297, 2286, 192, 132, 0.8333},
-{ 1209, 3489, 2418, 204, 140, 0.8333},
-{ 1279, 3693, 2558, 30, 24, 0.8333},
-{ 1291, 3723, 2582, 192, 128, 0.8333},
-{ 1355, 3915, 2710, 294, 200, 0.8333},
-{ 1455, 4209, 2910, 33, 26, 0.8333},
-{ 1468, 4242, 2936, 18, 16, 0.8333},
-{ 1476, 4260, 2952, 6, 8, 0.8333},
-{ 1480, 4266, 2960, 192, 132, 0.8333},
-{ 1546, 4458, 3092, 306, 204, 0.8333},
-{ 1648, 4764, 3296, 30, 24, 0.8333},
-{ 1660, 4794, 3320, 192, 128, 0.8333},
-{ 1724, 4986, 3448, 285, 194, 0.8333},
-{ 1821, 5271, 3642, 33, 26, 0.8333},
-{ 1834, 5304, 3668, 225, 154, 0.8333},
-{ 1911, 5529, 3822, 12, 16, 0.8333},
-{ 1919, 5541, 3838, 399, 266, 0.8333},
-{ 2052, 5940, 4104, 48, 36, 0.8333},
-{ 2070, 5988, 4140, 6, 8, 0.8333},
-{ 2074, 5994, 4148, 201, 138, 0.8333},
-{ 2143, 6195, 4286, 291, 194, 0.8333},
-{ 2240, 6486, 4480, 12, 16, 0.8333},
-{ 2248, 6498, 4496, 15, 14, 0.8333},
-{ 2255, 6513, 4510, 225, 146, 0.8333},
-{ 2328, 6738, 4656, 24, 20, 0.8333},
-{ 2338, 6762, 4676, 108, 76, 0.8333},
-{ 2376, 6870, 4752, 24, 20, 0.8333},
-{ 2386, 6894, 4772, 177, 118, 0.8333},
-{ 2445, 7071, 4890, 15, 14, 0.8333},
-{ 2452, 7086, 4904, 24, 20, 0.8333},
-{ 2462, 7110, 4924, 15, 14, 0.8333},
-{ 2469, 7125, 4938, 207, 138, 0.8333},
-{ 2538, 7332, 5076, 84, 60, 0.8333},
-{ 2568, 7416, 5136, 72, 56, 0.8333},
-{ 2596, 7488, 5192, 114, 80, 0.8333},
-{ 2636, 7602, 5272, 108, 76, 0.8333},
-{ 2674, 7710, 5348, 15, 14, 0.8333},
-{ 2681, 7725, 5362, 24, 20, 0.8333},
-{ 2691, 7749, 5382, 192, 132, 0.8333},
-{ 2757, 7941, 5514, 0, 0, 3.3333},
-{ 2757, 7941, 5514, 18, 20, 0.8333},
-{ 2767, 7959, 5534, 438, 296, 0.8333},
-{ 2915, 8397, 5830, 96, 68, 0.8333},
-{ 2949, 8493, 5898, 6, 8, 0.8333},
-{ 2953, 8499, 5906, 27, 22, 0.8333},
-{ 2964, 8526, 5928, 204, 140, 0.8333},
-{ 3034, 8730, 6068, 291, 194, 0.8333},
-{ 3131, 9021, 6262, 12, 16, 0.8333},
-{ 3139, 9033, 6278, 33, 22, 0.8333},
-{ 3150, 9066, 6300, 30, 24, 0.8333},
-{ 3162, 9096, 6324, 30, 24, 0.8333},
-{ 3174, 9126, 6348, 33, 26, 0.8333},
-{ 3187, 9159, 6374, 225, 150, 0.8333},
-{ 3262, 9384, 6524, 207, 142, 0.8333},
-{ 3333, 9591, 6666, 21, 18, 0.8333},
-{ 3342, 9612, 6684, 18, 16, 0.8333},
-{ 3350, 9630, 6700, 291, 194, 0.8333},
-{ 3447, 9921, 6894, 207, 138, 0.8333},
-{ 3516, 10128, 7032, 30, 28, 0.8333},
-{ 3530, 10158, 7060, 219, 150, 0.8333},
-{ 3605, 10377, 7210, 207, 138, 0.8333},
-{ 3674, 10584, 7348, 114, 80, 0.8333},
-{ 3714, 10698, 7428, 93, 66, 0.8333},
-{ 3747, 10791, 7494, 225, 154, 0.8333},
+{ 0, 0, 0, 0, 0, 0.8333f},
+{ 0, 0, 0, 330, 216, 0.8333f},
+{ 108, 330, 216, 96, 68, 0.8333f},
+{ 142, 426, 284, 12, 12, 0.8333f},
+{ 148, 438, 296, 282, 192, 0.8333f},
+{ 244, 720, 488, 42, 28, 0.8333f},
+{ 258, 762, 516, 390, 256, 0.8333f},
+{ 386, 1152, 772, 15, 14, 0.8333f},
+{ 393, 1167, 786, 399, 266, 0.8333f},
+{ 526, 1566, 1052, 114, 76, 0.8333f},
+{ 564, 1680, 1128, 30, 24, 0.8333f},
+{ 576, 1710, 1152, 12, 12, 0.8333f},
+{ 582, 1722, 1164, 120, 80, 0.8333f},
+{ 622, 1842, 1244, 18, 16, 0.8333f},
+{ 630, 1860, 1260, 30, 24, 0.8333f},
+{ 642, 1890, 1284, 6, 8, 0.8333f},
+{ 646, 1896, 1292, 6, 8, 0.8333f},
+{ 650, 1902, 1300, 207, 138, 0.8333f},
+{ 719, 2109, 1438, 114, 80, 0.8333f},
+{ 759, 2223, 1518, 66, 48, 0.8333f},
+{ 783, 2289, 1566, 207, 138, 0.8333f},
+{ 852, 2496, 1704, 84, 60, 0.8333f},
+{ 882, 2580, 1764, 30, 24, 0.8333f},
+{ 894, 2610, 1788, 6, 8, 0.8333f},
+{ 898, 2616, 1796, 96, 64, 0.8333f},
+{ 930, 2712, 1860, 6, 8, 0.8333f},
+{ 934, 2718, 1868, 30, 24, 0.8333f},
+{ 946, 2748, 1892, 6, 8, 0.8333f},
+{ 950, 2754, 1900, 297, 202, 0.8333f},
+{ 1051, 3051, 2102, 15, 14, 0.8333f},
+{ 1058, 3066, 2116, 18, 20, 0.8333f},
+{ 1068, 3084, 2136, 213, 150, 0.8333f},
+{ 1143, 3297, 2286, 192, 132, 0.8333f},
+{ 1209, 3489, 2418, 204, 140, 0.8333f},
+{ 1279, 3693, 2558, 30, 24, 0.8333f},
+{ 1291, 3723, 2582, 192, 128, 0.8333f},
+{ 1355, 3915, 2710, 294, 200, 0.8333f},
+{ 1455, 4209, 2910, 33, 26, 0.8333f},
+{ 1468, 4242, 2936, 18, 16, 0.8333f},
+{ 1476, 4260, 2952, 6, 8, 0.8333f},
+{ 1480, 4266, 2960, 192, 132, 0.8333f},
+{ 1546, 4458, 3092, 306, 204, 0.8333f},
+{ 1648, 4764, 3296, 30, 24, 0.8333f},
+{ 1660, 4794, 3320, 192, 128, 0.8333f},
+{ 1724, 4986, 3448, 285, 194, 0.8333f},
+{ 1821, 5271, 3642, 33, 26, 0.8333f},
+{ 1834, 5304, 3668, 225, 154, 0.8333f},
+{ 1911, 5529, 3822, 12, 16, 0.8333f},
+{ 1919, 5541, 3838, 399, 266, 0.8333f},
+{ 2052, 5940, 4104, 48, 36, 0.8333f},
+{ 2070, 5988, 4140, 6, 8, 0.8333f},
+{ 2074, 5994, 4148, 201, 138, 0.8333f},
+{ 2143, 6195, 4286, 291, 194, 0.8333f},
+{ 2240, 6486, 4480, 12, 16, 0.8333f},
+{ 2248, 6498, 4496, 15, 14, 0.8333f},
+{ 2255, 6513, 4510, 225, 146, 0.8333f},
+{ 2328, 6738, 4656, 24, 20, 0.8333f},
+{ 2338, 6762, 4676, 108, 76, 0.8333f},
+{ 2376, 6870, 4752, 24, 20, 0.8333f},
+{ 2386, 6894, 4772, 177, 118, 0.8333f},
+{ 2445, 7071, 4890, 15, 14, 0.8333f},
+{ 2452, 7086, 4904, 24, 20, 0.8333f},
+{ 2462, 7110, 4924, 15, 14, 0.8333f},
+{ 2469, 7125, 4938, 207, 138, 0.8333f},
+{ 2538, 7332, 5076, 84, 60, 0.8333f},
+{ 2568, 7416, 5136, 72, 56, 0.8333f},
+{ 2596, 7488, 5192, 114, 80, 0.8333f},
+{ 2636, 7602, 5272, 108, 76, 0.8333f},
+{ 2674, 7710, 5348, 15, 14, 0.8333f},
+{ 2681, 7725, 5362, 24, 20, 0.8333f},
+{ 2691, 7749, 5382, 192, 132, 0.8333f},
+{ 2757, 7941, 5514, 0, 0, 3.3333f},
+{ 2757, 7941, 5514, 18, 20, 0.8333f},
+{ 2767, 7959, 5534, 438, 296, 0.8333f},
+{ 2915, 8397, 5830, 96, 68, 0.8333f},
+{ 2949, 8493, 5898, 6, 8, 0.8333f},
+{ 2953, 8499, 5906, 27, 22, 0.8333f},
+{ 2964, 8526, 5928, 204, 140, 0.8333f},
+{ 3034, 8730, 6068, 291, 194, 0.8333f},
+{ 3131, 9021, 6262, 12, 16, 0.8333f},
+{ 3139, 9033, 6278, 33, 22, 0.8333f},
+{ 3150, 9066, 6300, 30, 24, 0.8333f},
+{ 3162, 9096, 6324, 30, 24, 0.8333f},
+{ 3174, 9126, 6348, 33, 26, 0.8333f},
+{ 3187, 9159, 6374, 225, 150, 0.8333f},
+{ 3262, 9384, 6524, 207, 142, 0.8333f},
+{ 3333, 9591, 6666, 21, 18, 0.8333f},
+{ 3342, 9612, 6684, 18, 16, 0.8333f},
+{ 3350, 9630, 6700, 291, 194, 0.8333f},
+{ 3447, 9921, 6894, 207, 138, 0.8333f},
+{ 3516, 10128, 7032, 30, 28, 0.8333f},
+{ 3530, 10158, 7060, 219, 150, 0.8333f},
+{ 3605, 10377, 7210, 207, 138, 0.8333f},
+{ 3674, 10584, 7348, 114, 80, 0.8333f},
+{ 3714, 10698, 7428, 93, 66, 0.8333f},
+{ 3747, 10791, 7494, 225, 154, 0.8333f},
 };
 
 Font mono_font = { mono_vertices, mono_triangles, mono_lines, mono_chars, " 
$(,048<@DHLPTX\\`dhlptx|#'+/37;?CGKOSW[_cgkosw{\"&*.26:>BFJNRVZ^bfjnrvz~\t!%)-159=AEIMQUY]aeimquy}"
 };

Index: cvd_src/sans.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/sans.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/sans.h      12 Jun 2008 15:22:40 -0000      1.1
+++ cvd_src/sans.h      12 Jun 2008 16:45:40 -0000      1.2
@@ -307,102 +307,102 @@
 };
 
 Font::Char sans_chars[] = {
-{ 0, 0, 0, 0, 0, 0.7118},
-{ 0, 0, 0, 330, 216, 0.7266},
-{ 108, 330, 216, 96, 68, 0.3984},
-{ 142, 426, 284, 12, 12, 0.2932},
-{ 148, 438, 296, 192, 128, 0.7667},
-{ 212, 630, 424, 42, 28, 0.7667},
-{ 226, 672, 452, 390, 256, 0.7667},
-{ 354, 1062, 708, 15, 14, 0.9667},
-{ 361, 1077, 722, 591, 394, 1.2615},
-{ 558, 1668, 1116, 114, 76, 0.9266},
-{ 596, 1782, 1192, 30, 24, 0.8667},
-{ 608, 1812, 1216, 12, 12, 0.7333},
-{ 614, 1824, 1228, 120, 80, 0.7599},
-{ 654, 1944, 1308, 18, 16, 0.8333},
-{ 662, 1962, 1324, 30, 24, 0.8719},
-{ 674, 1992, 1348, 6, 8, 0.4495},
-{ 678, 1998, 1356, 6, 8, 0.4224},
-{ 682, 2004, 1364, 207, 138, 0.7266},
-{ 751, 2211, 1502, 114, 80, 0.7599},
-{ 791, 2325, 1582, 6, 8, 0.2599},
-{ 795, 2331, 1590, 207, 138, 0.7932},
-{ 864, 2538, 1728, 84, 60, 0.5000},
-{ 894, 2622, 1788, 30, 24, 0.7453},
-{ 906, 2652, 1812, 6, 8, 0.2932},
-{ 910, 2658, 1820, 96, 64, 1.0000},
-{ 942, 2754, 1884, 6, 8, 0.2599},
-{ 946, 2760, 1892, 30, 24, 0.9667},
-{ 958, 2790, 1916, 6, 8, 0.4495},
-{ 962, 2796, 1924, 297, 202, 0.7599},
-{ 1063, 3093, 2126, 15, 14, 0.7333},
-{ 1070, 3108, 2140, 18, 20, 0.2932},
-{ 1080, 3126, 2160, 234, 164, 0.6266},
-{ 1162, 3360, 2324, 192, 132, 0.8500},
-{ 1228, 3552, 2456, 204, 140, 0.9266},
-{ 1298, 3756, 2596, 27, 22, 0.9000},
-{ 1309, 3783, 2618, 192, 128, 0.9599},
-{ 1373, 3975, 2746, 294, 200, 0.7667},
-{ 1473, 4269, 2946, 33, 26, 1.2750},
-{ 1486, 4302, 2972, 18, 16, 0.3833},
-{ 1494, 4320, 2988, 6, 8, 0.7000},
-{ 1498, 4326, 2996, 192, 132, 0.6500},
-{ 1564, 4518, 3128, 303, 202, 0.7266},
-{ 1665, 4821, 3330, 27, 22, 0.7865},
-{ 1676, 4848, 3352, 192, 128, 0.7333},
-{ 1740, 5040, 3480, 294, 200, 0.6266},
-{ 1840, 5334, 3680, 33, 26, 1.0344},
-{ 1853, 5367, 3706, 225, 154, 0.6833},
-{ 1930, 5592, 3860, 12, 16, 0.5000},
-{ 1938, 5604, 3876, 357, 238, 1.0187},
-{ 2057, 5961, 4114, 48, 36, 0.6286},
-{ 2075, 6009, 4150, 6, 8, 0.2599},
-{ 2079, 6015, 4158, 201, 138, 0.6932},
-{ 2148, 6216, 4296, 291, 194, 0.7667},
-{ 2245, 6507, 4490, 12, 16, 0.2932},
-{ 2253, 6519, 4506, 15, 14, 0.9667},
-{ 2260, 6534, 4520, 225, 146, 0.8266},
-{ 2333, 6759, 4666, 24, 20, 0.7000},
-{ 2343, 6783, 4686, 60, 44, 0.2599},
-{ 2365, 6843, 4730, 24, 20, 0.8667},
-{ 2375, 6867, 4750, 177, 118, 0.8896},
-{ 2434, 7044, 4868, 15, 14, 0.9010},
-{ 2441, 7059, 4882, 24, 20, 0.8667},
-{ 2451, 7083, 4902, 15, 14, 0.9760},
-{ 2458, 7098, 4916, 207, 138, 0.7932},
-{ 2527, 7305, 5054, 84, 60, 0.5000},
-{ 2557, 7389, 5114, 66, 52, 0.2599},
-{ 2583, 7455, 5166, 114, 80, 0.7599},
-{ 2623, 7569, 5246, 108, 76, 0.5667},
-{ 2661, 7677, 5322, 15, 14, 0.7495},
-{ 2668, 7692, 5336, 24, 20, 0.6667},
-{ 2678, 7716, 5356, 192, 132, 0.9667},
-{ 2744, 7908, 5488, 0, 0, 2.8471},
-{ 2744, 7908, 5488, 18, 20, 0.3266},
-{ 2754, 7926, 5508, 390, 264, 1.2000},
-{ 2886, 8316, 5772, 96, 68, 0.3932},
-{ 2920, 8412, 5840, 6, 8, 0.4333},
-{ 2924, 8418, 5848, 27, 22, 0.7333},
-{ 2935, 8445, 5870, 204, 140, 0.7266},
-{ 3005, 8649, 6010, 291, 194, 0.7667},
-{ 3102, 8940, 6204, 12, 16, 0.9667},
-{ 3110, 8952, 6220, 33, 22, 0.9010},
-{ 3121, 8985, 6242, 30, 24, 0.7667},
-{ 3133, 9015, 6266, 6, 8, 0.2599},
-{ 3137, 9021, 6274, 33, 26, 1.0266},
-{ 3150, 9054, 6300, 225, 150, 0.9599},
-{ 3225, 9279, 6450, 108, 76, 0.8333},
-{ 3263, 9387, 6526, 21, 18, 0.8036},
-{ 3272, 9408, 6544, 18, 16, 0.3932},
-{ 3280, 9426, 6560, 264, 176, 0.6932},
-{ 3368, 9690, 6736, 204, 136, 0.7333},
-{ 3436, 9894, 6872, 12, 16, 0.2599},
-{ 3444, 9906, 6888, 219, 150, 1.1932},
-{ 3519, 10125, 7038, 207, 138, 0.7266},
-{ 3588, 10332, 7176, 114, 80, 0.7266},
-{ 3628, 10446, 7256, 72, 52, 0.7437},
-{ 3654, 10518, 7308, 225, 154, 0.6833},
+{ 0, 0, 0, 0, 0, 0.7118f},
+{ 0, 0, 0, 330, 216, 0.7266f},
+{ 108, 330, 216, 96, 68, 0.3984f},
+{ 142, 426, 284, 12, 12, 0.2932f},
+{ 148, 438, 296, 192, 128, 0.7667f},
+{ 212, 630, 424, 42, 28, 0.7667f},
+{ 226, 672, 452, 390, 256, 0.7667f},
+{ 354, 1062, 708, 15, 14, 0.9667f},
+{ 361, 1077, 722, 591, 394, 1.2615f},
+{ 558, 1668, 1116, 114, 76, 0.9266f},
+{ 596, 1782, 1192, 30, 24, 0.8667f},
+{ 608, 1812, 1216, 12, 12, 0.7333f},
+{ 614, 1824, 1228, 120, 80, 0.7599f},
+{ 654, 1944, 1308, 18, 16, 0.8333f},
+{ 662, 1962, 1324, 30, 24, 0.8719f},
+{ 674, 1992, 1348, 6, 8, 0.4495f},
+{ 678, 1998, 1356, 6, 8, 0.4224f},
+{ 682, 2004, 1364, 207, 138, 0.7266f},
+{ 751, 2211, 1502, 114, 80, 0.7599f},
+{ 791, 2325, 1582, 6, 8, 0.2599f},
+{ 795, 2331, 1590, 207, 138, 0.7932f},
+{ 864, 2538, 1728, 84, 60, 0.5000f},
+{ 894, 2622, 1788, 30, 24, 0.7453f},
+{ 906, 2652, 1812, 6, 8, 0.2932f},
+{ 910, 2658, 1820, 96, 64, 1.0000f},
+{ 942, 2754, 1884, 6, 8, 0.2599f},
+{ 946, 2760, 1892, 30, 24, 0.9667f},
+{ 958, 2790, 1916, 6, 8, 0.4495f},
+{ 962, 2796, 1924, 297, 202, 0.7599f},
+{ 1063, 3093, 2126, 15, 14, 0.7333f},
+{ 1070, 3108, 2140, 18, 20, 0.2932f},
+{ 1080, 3126, 2160, 234, 164, 0.6266f},
+{ 1162, 3360, 2324, 192, 132, 0.8500f},
+{ 1228, 3552, 2456, 204, 140, 0.9266f},
+{ 1298, 3756, 2596, 27, 22, 0.9000f},
+{ 1309, 3783, 2618, 192, 128, 0.9599f},
+{ 1373, 3975, 2746, 294, 200, 0.7667f},
+{ 1473, 4269, 2946, 33, 26, 1.2750f},
+{ 1486, 4302, 2972, 18, 16, 0.3833f},
+{ 1494, 4320, 2988, 6, 8, 0.7000f},
+{ 1498, 4326, 2996, 192, 132, 0.6500f},
+{ 1564, 4518, 3128, 303, 202, 0.7266f},
+{ 1665, 4821, 3330, 27, 22, 0.7865f},
+{ 1676, 4848, 3352, 192, 128, 0.7333f},
+{ 1740, 5040, 3480, 294, 200, 0.6266f},
+{ 1840, 5334, 3680, 33, 26, 1.0344f},
+{ 1853, 5367, 3706, 225, 154, 0.6833f},
+{ 1930, 5592, 3860, 12, 16, 0.5000f},
+{ 1938, 5604, 3876, 357, 238, 1.0187f},
+{ 2057, 5961, 4114, 48, 36, 0.6286f},
+{ 2075, 6009, 4150, 6, 8, 0.2599f},
+{ 2079, 6015, 4158, 201, 138, 0.6932f},
+{ 2148, 6216, 4296, 291, 194, 0.7667f},
+{ 2245, 6507, 4490, 12, 16, 0.2932f},
+{ 2253, 6519, 4506, 15, 14, 0.9667f},
+{ 2260, 6534, 4520, 225, 146, 0.8266f},
+{ 2333, 6759, 4666, 24, 20, 0.7000f},
+{ 2343, 6783, 4686, 60, 44, 0.2599f},
+{ 2365, 6843, 4730, 24, 20, 0.8667f},
+{ 2375, 6867, 4750, 177, 118, 0.8896f},
+{ 2434, 7044, 4868, 15, 14, 0.9010f},
+{ 2441, 7059, 4882, 24, 20, 0.8667f},
+{ 2451, 7083, 4902, 15, 14, 0.9760f},
+{ 2458, 7098, 4916, 207, 138, 0.7932f},
+{ 2527, 7305, 5054, 84, 60, 0.5000f},
+{ 2557, 7389, 5114, 66, 52, 0.2599f},
+{ 2583, 7455, 5166, 114, 80, 0.7599f},
+{ 2623, 7569, 5246, 108, 76, 0.5667f},
+{ 2661, 7677, 5322, 15, 14, 0.7495f},
+{ 2668, 7692, 5336, 24, 20, 0.6667f},
+{ 2678, 7716, 5356, 192, 132, 0.9667f},
+{ 2744, 7908, 5488, 0, 0, 2.8471f},
+{ 2744, 7908, 5488, 18, 20, 0.3266f},
+{ 2754, 7926, 5508, 390, 264, 1.2000f},
+{ 2886, 8316, 5772, 96, 68, 0.3932f},
+{ 2920, 8412, 5840, 6, 8, 0.4333f},
+{ 2924, 8418, 5848, 27, 22, 0.7333f},
+{ 2935, 8445, 5870, 204, 140, 0.7266f},
+{ 3005, 8649, 6010, 291, 194, 0.7667f},
+{ 3102, 8940, 6204, 12, 16, 0.9667f},
+{ 3110, 8952, 6220, 33, 22, 0.9010f},
+{ 3121, 8985, 6242, 30, 24, 0.7667f},
+{ 3133, 9015, 6266, 6, 8, 0.2599f},
+{ 3137, 9021, 6274, 33, 26, 1.0266f},
+{ 3150, 9054, 6300, 225, 150, 0.9599f},
+{ 3225, 9279, 6450, 108, 76, 0.8333f},
+{ 3263, 9387, 6526, 21, 18, 0.8036f},
+{ 3272, 9408, 6544, 18, 16, 0.3932f},
+{ 3280, 9426, 6560, 264, 176, 0.6932f},
+{ 3368, 9690, 6736, 204, 136, 0.7333f},
+{ 3436, 9894, 6872, 12, 16, 0.2599f},
+{ 3444, 9906, 6888, 219, 150, 1.1932f},
+{ 3519, 10125, 7038, 207, 138, 0.7266f},
+{ 3588, 10332, 7176, 114, 80, 0.7266f},
+{ 3628, 10446, 7256, 72, 52, 0.7437f},
+{ 3654, 10518, 7308, 225, 154, 0.6833f},
 };
 
 Font sans_font = { sans_vertices, sans_triangles, sans_lines, sans_chars, " 
$(,048<@DHLPTX\\`dhlptx|#'+/37;?CGKOSW[_cgkosw{\"&*.26:>BFJNRVZ^bfjnrvz~\t!%)-159=AEIMQUY]aeimquy}"
 };

Index: cvd_src/serif.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/serif.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/serif.h     12 Jun 2008 15:22:40 -0000      1.1
+++ cvd_src/serif.h     12 Jun 2008 16:45:40 -0000      1.2
@@ -307,102 +307,102 @@
 };
 
 Font::Char serif_chars[] = {
-{ 0, 0, 0, 0, 0, 0.7578},
-{ 0, 0, 0, 336, 220, 0.7333},
-{ 110, 336, 220, 96, 68, 0.4167},
-{ 144, 432, 288, 51, 38, 0.3068},
-{ 163, 483, 326, 192, 128, 0.7734},
-{ 227, 675, 454, 54, 36, 0.7667},
-{ 245, 729, 490, 390, 256, 0.7734},
-{ 373, 1119, 746, 15, 14, 0.9667},
-{ 380, 1134, 760, 594, 396, 1.2620},
-{ 578, 1728, 1156, 126, 84, 1.0000},
-{ 620, 1854, 1240, 78, 56, 1.0667},
-{ 648, 1932, 1296, 36, 28, 0.8385},
-{ 662, 1968, 1324, 138, 92, 0.8401},
-{ 708, 2106, 1416, 42, 32, 0.9000},
-{ 724, 2148, 1448, 78, 56, 0.9667},
-{ 752, 2226, 1504, 6, 8, 0.4495},
-{ 756, 2232, 1512, 6, 8, 0.4083},
-{ 760, 2238, 1520, 222, 148, 0.8167},
-{ 834, 2460, 1668, 144, 100, 0.8333},
-{ 884, 2604, 1768, 24, 20, 0.3667},
-{ 894, 2628, 1788, 228, 152, 0.7734},
-{ 970, 2856, 1940, 126, 88, 0.5281},
-{ 1014, 2982, 2028, 78, 56, 0.7667},
-{ 1042, 3060, 2084, 6, 8, 0.2667},
-{ 1046, 3066, 2092, 96, 64, 1.0000},
-{ 1078, 3162, 2156, 6, 8, 0.2333},
-{ 1082, 3168, 2164, 30, 24, 0.9667},
-{ 1094, 3198, 2188, 6, 8, 0.4495},
-{ 1098, 3204, 2196, 303, 206, 0.7401},
-{ 1201, 3507, 2402, 21, 18, 0.7333},
-{ 1210, 3528, 2420, 141, 102, 0.3000},
-{ 1261, 3669, 2522, 243, 170, 0.6401},
-{ 1346, 3912, 2692, 219, 150, 0.9266},
-{ 1421, 4131, 2842, 207, 142, 0.9667},
-{ 1492, 4338, 2984, 69, 50, 1.0167},
-{ 1517, 4407, 3034, 264, 176, 1.0068},
-{ 1605, 4671, 3210, 300, 204, 0.8068},
-{ 1707, 4971, 3414, 57, 42, 1.4000},
-{ 1728, 5028, 3456, 18, 16, 0.4000},
-{ 1736, 5046, 3472, 6, 8, 0.6667},
-{ 1740, 5052, 3480, 195, 134, 0.6891},
-{ 1807, 5247, 3614, 315, 210, 0.8167},
-{ 1912, 5562, 3824, 72, 52, 0.8000},
-{ 1938, 5634, 3876, 192, 128, 0.7333},
-{ 2002, 5826, 4004, 300, 204, 0.6000},
-{ 2104, 6126, 4208, 57, 42, 1.1333},
-{ 2125, 6183, 4250, 225, 154, 0.6833},
-{ 2202, 6408, 4404, 12, 16, 0.5000},
-{ 2210, 6420, 4420, 378, 252, 1.1333},
-{ 2336, 6798, 4672, 48, 36, 0.6443},
-{ 2354, 6846, 4708, 90, 64, 0.3000},
-{ 2386, 6936, 4772, 168, 116, 0.7068},
-{ 2444, 7104, 4888, 294, 196, 0.7734},
-{ 2542, 7398, 5084, 180, 128, 0.3000},
-{ 2606, 7578, 5212, 15, 14, 0.9667},
-{ 2613, 7593, 5226, 237, 154, 0.9000},
-{ 2690, 7830, 5380, 60, 44, 0.8667},
-{ 2712, 7890, 5424, 117, 82, 0.4667},
-{ 2753, 8007, 5506, 54, 40, 1.1000},
-{ 2773, 8061, 5546, 201, 134, 1.0333},
-{ 2840, 8262, 5680, 39, 30, 1.0000},
-{ 2855, 8301, 5710, 36, 28, 0.8667},
-{ 2869, 8337, 5738, 15, 14, 0.9760},
-{ 2876, 8352, 5752, 222, 148, 0.8000},
-{ 2950, 8574, 5900, 141, 98, 0.5635},
-{ 2999, 8715, 5998, 201, 142, 0.3000},
-{ 3070, 8916, 6140, 144, 100, 0.8333},
-{ 3120, 9060, 6240, 129, 90, 0.6375},
-{ 3165, 9189, 6330, 39, 30, 0.7667},
-{ 3180, 9228, 6360, 36, 28, 0.6365},
-{ 3194, 9264, 6388, 174, 120, 0.9667},
-{ 3254, 9438, 6508, 0, 0, 3.0314},
-{ 3254, 9438, 6508, 102, 76, 0.3333},
-{ 3292, 9540, 6584, 390, 264, 1.2000},
-{ 3424, 9930, 6848, 96, 68, 0.4068},
-{ 3458, 10026, 6916, 6, 8, 0.4000},
-{ 3462, 10032, 6924, 27, 22, 0.6667},
-{ 3473, 10059, 6946, 210, 144, 0.7333},
-{ 3545, 10269, 7090, 294, 196, 0.7734},
-{ 3643, 10563, 7286, 12, 16, 0.9667},
-{ 3651, 10575, 7302, 57, 38, 1.0000},
-{ 3670, 10632, 7340, 66, 48, 0.8667},
-{ 3694, 10698, 7388, 30, 24, 0.4333},
-{ 3706, 10728, 7412, 69, 50, 1.3000},
-{ 3731, 10797, 7462, 270, 180, 1.0068},
-{ 3821, 11067, 7642, 132, 92, 1.0667},
-{ 3867, 11199, 7734, 57, 42, 0.9000},
-{ 3888, 11256, 7776, 18, 16, 0.4401},
-{ 3896, 11274, 7792, 273, 182, 0.7599},
-{ 3987, 11547, 7974, 204, 136, 0.7333},
-{ 4055, 11751, 8110, 114, 84, 0.3667},
-{ 4097, 11865, 8194, 261, 178, 1.2667},
-{ 4186, 12126, 8372, 228, 152, 0.8000},
-{ 4262, 12354, 8524, 132, 92, 0.8000},
-{ 4308, 12486, 8616, 141, 98, 0.7667},
-{ 4357, 12627, 8714, 225, 154, 0.6833},
+{ 0, 0, 0, 0, 0, 0.7578f},
+{ 0, 0, 0, 336, 220, 0.7333f},
+{ 110, 336, 220, 96, 68, 0.4167f},
+{ 144, 432, 288, 51, 38, 0.3068f},
+{ 163, 483, 326, 192, 128, 0.7734f},
+{ 227, 675, 454, 54, 36, 0.7667f},
+{ 245, 729, 490, 390, 256, 0.7734f},
+{ 373, 1119, 746, 15, 14, 0.9667f},
+{ 380, 1134, 760, 594, 396, 1.2620f},
+{ 578, 1728, 1156, 126, 84, 1.0000f},
+{ 620, 1854, 1240, 78, 56, 1.0667f},
+{ 648, 1932, 1296, 36, 28, 0.8385f},
+{ 662, 1968, 1324, 138, 92, 0.8401f},
+{ 708, 2106, 1416, 42, 32, 0.9000f},
+{ 724, 2148, 1448, 78, 56, 0.9667f},
+{ 752, 2226, 1504, 6, 8, 0.4495f},
+{ 756, 2232, 1512, 6, 8, 0.4083f},
+{ 760, 2238, 1520, 222, 148, 0.8167f},
+{ 834, 2460, 1668, 144, 100, 0.8333f},
+{ 884, 2604, 1768, 24, 20, 0.3667f},
+{ 894, 2628, 1788, 228, 152, 0.7734f},
+{ 970, 2856, 1940, 126, 88, 0.5281f},
+{ 1014, 2982, 2028, 78, 56, 0.7667f},
+{ 1042, 3060, 2084, 6, 8, 0.2667f},
+{ 1046, 3066, 2092, 96, 64, 1.0000f},
+{ 1078, 3162, 2156, 6, 8, 0.2333f},
+{ 1082, 3168, 2164, 30, 24, 0.9667f},
+{ 1094, 3198, 2188, 6, 8, 0.4495f},
+{ 1098, 3204, 2196, 303, 206, 0.7401f},
+{ 1201, 3507, 2402, 21, 18, 0.7333f},
+{ 1210, 3528, 2420, 141, 102, 0.3000f},
+{ 1261, 3669, 2522, 243, 170, 0.6401f},
+{ 1346, 3912, 2692, 219, 150, 0.9266f},
+{ 1421, 4131, 2842, 207, 142, 0.9667f},
+{ 1492, 4338, 2984, 69, 50, 1.0167f},
+{ 1517, 4407, 3034, 264, 176, 1.0068f},
+{ 1605, 4671, 3210, 300, 204, 0.8068f},
+{ 1707, 4971, 3414, 57, 42, 1.4000f},
+{ 1728, 5028, 3456, 18, 16, 0.4000f},
+{ 1736, 5046, 3472, 6, 8, 0.6667f},
+{ 1740, 5052, 3480, 195, 134, 0.6891f},
+{ 1807, 5247, 3614, 315, 210, 0.8167f},
+{ 1912, 5562, 3824, 72, 52, 0.8000f},
+{ 1938, 5634, 3876, 192, 128, 0.7333f},
+{ 2002, 5826, 4004, 300, 204, 0.6000f},
+{ 2104, 6126, 4208, 57, 42, 1.1333f},
+{ 2125, 6183, 4250, 225, 154, 0.6833f},
+{ 2202, 6408, 4404, 12, 16, 0.5000f},
+{ 2210, 6420, 4420, 378, 252, 1.1333f},
+{ 2336, 6798, 4672, 48, 36, 0.6443f},
+{ 2354, 6846, 4708, 90, 64, 0.3000f},
+{ 2386, 6936, 4772, 168, 116, 0.7068f},
+{ 2444, 7104, 4888, 294, 196, 0.7734f},
+{ 2542, 7398, 5084, 180, 128, 0.3000f},
+{ 2606, 7578, 5212, 15, 14, 0.9667f},
+{ 2613, 7593, 5226, 237, 154, 0.9000f},
+{ 2690, 7830, 5380, 60, 44, 0.8667f},
+{ 2712, 7890, 5424, 117, 82, 0.4667f},
+{ 2753, 8007, 5506, 54, 40, 1.1000f},
+{ 2773, 8061, 5546, 201, 134, 1.0333f},
+{ 2840, 8262, 5680, 39, 30, 1.0000f},
+{ 2855, 8301, 5710, 36, 28, 0.8667f},
+{ 2869, 8337, 5738, 15, 14, 0.9760f},
+{ 2876, 8352, 5752, 222, 148, 0.8000f},
+{ 2950, 8574, 5900, 141, 98, 0.5635f},
+{ 2999, 8715, 5998, 201, 142, 0.3000f},
+{ 3070, 8916, 6140, 144, 100, 0.8333f},
+{ 3120, 9060, 6240, 129, 90, 0.6375f},
+{ 3165, 9189, 6330, 39, 30, 0.7667f},
+{ 3180, 9228, 6360, 36, 28, 0.6365f},
+{ 3194, 9264, 6388, 174, 120, 0.9667f},
+{ 3254, 9438, 6508, 0, 0, 3.0314f},
+{ 3254, 9438, 6508, 102, 76, 0.3333f},
+{ 3292, 9540, 6584, 390, 264, 1.2000f},
+{ 3424, 9930, 6848, 96, 68, 0.4068f},
+{ 3458, 10026, 6916, 6, 8, 0.4000f},
+{ 3462, 10032, 6924, 27, 22, 0.6667f},
+{ 3473, 10059, 6946, 210, 144, 0.7333f},
+{ 3545, 10269, 7090, 294, 196, 0.7734f},
+{ 3643, 10563, 7286, 12, 16, 0.9667f},
+{ 3651, 10575, 7302, 57, 38, 1.0000f},
+{ 3670, 10632, 7340, 66, 48, 0.8667f},
+{ 3694, 10698, 7388, 30, 24, 0.4333f},
+{ 3706, 10728, 7412, 69, 50, 1.3000f},
+{ 3731, 10797, 7462, 270, 180, 1.0068f},
+{ 3821, 11067, 7642, 132, 92, 1.0667f},
+{ 3867, 11199, 7734, 57, 42, 0.9000f},
+{ 3888, 11256, 7776, 18, 16, 0.4401f},
+{ 3896, 11274, 7792, 273, 182, 0.7599f},
+{ 3987, 11547, 7974, 204, 136, 0.7333f},
+{ 4055, 11751, 8110, 114, 84, 0.3667f},
+{ 4097, 11865, 8194, 261, 178, 1.2667f},
+{ 4186, 12126, 8372, 228, 152, 0.8000f},
+{ 4262, 12354, 8524, 132, 92, 0.8000f},
+{ 4308, 12486, 8616, 141, 98, 0.7667f},
+{ 4357, 12627, 8714, 225, 154, 0.6833f},
 };
 
 Font serif_font = { serif_vertices, serif_triangles, serif_lines, serif_chars, 
" 
$(,048<@DHLPTX\\`dhlptx|#'+/37;?CGKOSW[_cgkosw{\"&*.26:>BFJNRVZ^bfjnrvz~\t!%)-159=AEIMQUY]aeimquy}"
 };