From 9b8f633b8747deb796897fb6973e14e89ba5552e Mon Sep 17 00:00:00 2001 From: David Turner Date: Sun, 21 Oct 2001 15:41:11 +0000 Subject: * src/type1/t1load.c: fixed memory leak bugs that appeared with certain synthetized fonts (e.g. CourierBoldOblique, a.k.a. "cobo_____.pfb") * src/pshinter/pshalgo2.c, src/pshinter/pshalgo1.c, src/pshinter/pshglob.c: removing compiler warnings in pedantic modes (in multi-object compilation mode, mainly) --- ChangeLog | 8 + src/cff/cffload.c | 1017 ++++++++++++++++++++++++++++++++++++++++++++++ src/cff/cffload.h | 1022 +---------------------------------------------- src/pshinter/pshalgo1.c | 15 +- src/pshinter/pshalgo2.c | 29 +- src/pshinter/pshglob.c | 2 + src/type1/t1load.c | 2 - 7 files changed, 1061 insertions(+), 1034 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8e6eab1b..0bf708f0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-21 David Turner + + * src/pshinter/pshalgo2.c, src/pshinter/pshalgo1.c, + src/pshinter/pshglob.c: removing compiler warnings in pedantic modes + (in multi-object compilation mode, mainly) + + 2001-10-20 Tom Kacvinsky * src/type1/t1load.c (parse_encoding): Add a test to make sure @@ -12,6 +19,7 @@ objects were not deallocated when the objects were parsed the second time. + 2001-10-19 David Turner * src/smooth/ftgrays.c, src/pshinter/pshglob.h, src/pshinter/pshrec.c, diff --git a/src/cff/cffload.c b/src/cff/cffload.c index e236fdc90..18a7ab61d 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -38,6 +38,1023 @@ #undef FT_COMPONENT #define FT_COMPONENT trace_cffload + + FT_LOCAL_DEF const FT_UShort cff_isoadobe_charset[229] = + { + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + 110, + 111, + 112, + 113, + 114, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 126, + 127, + 128, + 129, + 130, + 131, + 132, + 133, + 134, + 135, + 136, + 137, + 138, + 139, + 140, + 141, + 142, + 143, + 144, + 145, + 146, + 147, + 148, + 149, + 150, + 151, + 152, + 153, + 154, + 155, + 156, + 157, + 158, + 159, + 160, + 161, + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, + 184, + 185, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 209, + 210, + 211, + 212, + 213, + 214, + 215, + 216, + 217, + 218, + 219, + 220, + 221, + 222, + 223, + 224, + 225, + 226, + 227, + 228 + }; + + FT_LOCAL_DEF const FT_UShort cff_expert_charset[166] = + { + 0, + 1, + 229, + 230, + 231, + 232, + 233, + 234, + 235, + 236, + 237, + 238, + 13, + 14, + 15, + 99, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 27, + 28, + 249, + 250, + 251, + 252, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + 109, + 110, + 267, + 268, + 269, + 270, + 271, + 272, + 273, + 274, + 275, + 276, + 277, + 278, + 279, + 280, + 281, + 282, + 283, + 284, + 285, + 286, + 287, + 288, + 289, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 299, + 300, + 301, + 302, + 303, + 304, + 305, + 306, + 307, + 308, + 309, + 310, + 311, + 312, + 313, + 314, + 315, + 316, + 317, + 318, + 158, + 155, + 163, + 319, + 320, + 321, + 322, + 323, + 324, + 325, + 326, + 150, + 164, + 169, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + 342, + 343, + 344, + 345, + 346, + 347, + 348, + 349, + 350, + 351, + 352, + 353, + 354, + 355, + 356, + 357, + 358, + 359, + 360, + 361, + 362, + 363, + 364, + 365, + 366, + 367, + 368, + 369, + 370, + 371, + 372, + 373, + 374, + 375, + 376, + 377, + 378 + }; + + FT_LOCAL_DEF const FT_UShort cff_expertsubset_charset[87] = + { + 0, + 1, + 231, + 232, + 235, + 236, + 237, + 238, + 13, + 14, + 15, + 99, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 27, + 28, + 249, + 250, + 251, + 253, + 254, + 255, + 256, + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + 109, + 110, + 267, + 268, + 269, + 270, + 272, + 300, + 301, + 302, + 305, + 314, + 315, + 158, + 155, + 163, + 320, + 321, + 322, + 323, + 324, + 325, + 326, + 150, + 164, + 169, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + 342, + 343, + 344, + 345, + 346 + }; + + FT_LOCAL_DEF const FT_UShort cff_standard_encoding[256] = + { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57, + 58, + 59, + 60, + 61, + 62, + 63, + 64, + 65, + 66, + 67, + 68, + 69, + 70, + 71, + 72, + 73, + 74, + 75, + 76, + 77, + 78, + 79, + 80, + 81, + 82, + 83, + 84, + 85, + 86, + 87, + 88, + 89, + 90, + 91, + 92, + 93, + 94, + 95, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 96, + 97, + 98, + 99, + 100, + 101, + 102, + 103, + 104, + 105, + 106, + 107, + 108, + 109, + 110, + 0, + 111, + 112, + 113, + 114, + 0, + 115, + 116, + 117, + 118, + 119, + 120, + 121, + 122, + 0, + 123, + 0, + 124, + 125, + 126, + 127, + 128, + 129, + 130, + 131, + 0, + 132, + 133, + 0, + 134, + 135, + 136, + 137, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 138, + 0, + 139, + 0, + 0, + 0, + 0, + 140, + 141, + 142, + 143, + 0, + 0, + 0, + 0, + 0, + 144, + 0, + 0, + 0, + 145, + 0, + 0, + 146, + 147, + 148, + 149, + 0, + 0, + 0, + 0 + }; + + FT_LOCAL_DEF const FT_UShort cff_expert_encoding[256] = + { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 229, + 230, + 0, + 231, + 232, + 233, + 234, + 235, + 236, + 237, + 238, + 13, + 14, + 15, + 99, + 239, + 240, + 241, + 242, + 243, + 244, + 245, + 246, + 247, + 248, + 27, + 28, + 249, + 250, + 251, + 252, + 0, + 253, + 254, + 255, + 256, + 257, + 0, + 0, + 0, + 258, + 0, + 0, + 259, + 260, + 261, + 262, + 0, + 0, + 263, + 264, + 265, + 0, + 266, + 109, + 110, + 267, + 268, + 269, + 0, + 270, + 271, + 272, + 273, + 274, + 275, + 276, + 277, + 278, + 279, + 280, + 281, + 282, + 283, + 284, + 285, + 286, + 287, + 288, + 289, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 299, + 300, + 301, + 302, + 303, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 304, + 305, + 306, + 0, + 0, + 307, + 308, + 309, + 310, + 311, + 0, + 312, + 0, + 0, + 312, + 0, + 0, + 314, + 315, + 0, + 0, + 316, + 317, + 318, + 0, + 0, + 0, + 158, + 155, + 163, + 319, + 320, + 321, + 322, + 323, + 324, + 325, + 0, + 0, + 326, + 150, + 164, + 169, + 327, + 328, + 329, + 330, + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + 342, + 343, + 344, + 345, + 346, + 347, + 348, + 349, + 350, + 351, + 352, + 353, + 354, + 355, + 356, + 357, + 358, + 359, + 360, + 361, + 362, + 363, + 364, + 365, + 366, + 367, + 368, + 369, + 370, + 371, + 372, + 373, + 374, + 375, + 376, + 377, + 378 + }; + + + /* read a CFF offset from memory */ static FT_ULong cff_get_offset( FT_Byte* p, diff --git a/src/cff/cffload.h b/src/cff/cffload.h index 967229d53..311a6cccb 100644 --- a/src/cff/cffload.h +++ b/src/cff/cffload.h @@ -27,1019 +27,15 @@ FT_BEGIN_HEADER - const FT_UShort cff_isoadobe_charset[229] = - { - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 66, - 67, - 68, - 69, - 70, - 71, - 72, - 73, - 74, - 75, - 76, - 77, - 78, - 79, - 80, - 81, - 82, - 83, - 84, - 85, - 86, - 87, - 88, - 89, - 90, - 91, - 92, - 93, - 94, - 95, - 96, - 97, - 98, - 99, - 100, - 101, - 102, - 103, - 104, - 105, - 106, - 107, - 108, - 109, - 110, - 111, - 112, - 113, - 114, - 115, - 116, - 117, - 118, - 119, - 120, - 121, - 122, - 123, - 124, - 125, - 126, - 127, - 128, - 129, - 130, - 131, - 132, - 133, - 134, - 135, - 136, - 137, - 138, - 139, - 140, - 141, - 142, - 143, - 144, - 145, - 146, - 147, - 148, - 149, - 150, - 151, - 152, - 153, - 154, - 155, - 156, - 157, - 158, - 159, - 160, - 161, - 162, - 163, - 164, - 165, - 166, - 167, - 168, - 169, - 170, - 171, - 172, - 173, - 174, - 175, - 176, - 177, - 178, - 179, - 180, - 181, - 182, - 183, - 184, - 185, - 186, - 187, - 188, - 189, - 190, - 191, - 192, - 193, - 194, - 195, - 196, - 197, - 198, - 199, - 200, - 201, - 202, - 203, - 204, - 205, - 206, - 207, - 208, - 209, - 210, - 211, - 212, - 213, - 214, - 215, - 216, - 217, - 218, - 219, - 220, - 221, - 222, - 223, - 224, - 225, - 226, - 227, - 228 - }; - - const FT_UShort cff_expert_charset[166] = - { - 0, - 1, - 229, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 13, - 14, - 15, - 99, - 239, - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 27, - 28, - 249, - 250, - 251, - 252, - 253, - 254, - 255, - 256, - 257, - 258, - 259, - 260, - 261, - 262, - 263, - 264, - 265, - 266, - 109, - 110, - 267, - 268, - 269, - 270, - 271, - 272, - 273, - 274, - 275, - 276, - 277, - 278, - 279, - 280, - 281, - 282, - 283, - 284, - 285, - 286, - 287, - 288, - 289, - 290, - 291, - 292, - 293, - 294, - 295, - 296, - 297, - 298, - 299, - 300, - 301, - 302, - 303, - 304, - 305, - 306, - 307, - 308, - 309, - 310, - 311, - 312, - 313, - 314, - 315, - 316, - 317, - 318, - 158, - 155, - 163, - 319, - 320, - 321, - 322, - 323, - 324, - 325, - 326, - 150, - 164, - 169, - 327, - 328, - 329, - 330, - 331, - 332, - 333, - 334, - 335, - 336, - 337, - 338, - 339, - 340, - 341, - 342, - 343, - 344, - 345, - 346, - 347, - 348, - 349, - 350, - 351, - 352, - 353, - 354, - 355, - 356, - 357, - 358, - 359, - 360, - 361, - 362, - 363, - 364, - 365, - 366, - 367, - 368, - 369, - 370, - 371, - 372, - 373, - 374, - 375, - 376, - 377, - 378 - }; - - const FT_UShort cff_expertsubset_charset[87] = - { - 0, - 1, - 231, - 232, - 235, - 236, - 237, - 238, - 13, - 14, - 15, - 99, - 239, - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 27, - 28, - 249, - 250, - 251, - 253, - 254, - 255, - 256, - 257, - 258, - 259, - 260, - 261, - 262, - 263, - 264, - 265, - 266, - 109, - 110, - 267, - 268, - 269, - 270, - 272, - 300, - 301, - 302, - 305, - 314, - 315, - 158, - 155, - 163, - 320, - 321, - 322, - 323, - 324, - 325, - 326, - 150, - 164, - 169, - 327, - 328, - 329, - 330, - 331, - 332, - 333, - 334, - 335, - 336, - 337, - 338, - 339, - 340, - 341, - 342, - 343, - 344, - 345, - 346 - }; - - const FT_UShort cff_standard_encoding[256] = - { - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 64, - 65, - 66, - 67, - 68, - 69, - 70, - 71, - 72, - 73, - 74, - 75, - 76, - 77, - 78, - 79, - 80, - 81, - 82, - 83, - 84, - 85, - 86, - 87, - 88, - 89, - 90, - 91, - 92, - 93, - 94, - 95, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 96, - 97, - 98, - 99, - 100, - 101, - 102, - 103, - 104, - 105, - 106, - 107, - 108, - 109, - 110, - 0, - 111, - 112, - 113, - 114, - 0, - 115, - 116, - 117, - 118, - 119, - 120, - 121, - 122, - 0, - 123, - 0, - 124, - 125, - 126, - 127, - 128, - 129, - 130, - 131, - 0, - 132, - 133, - 0, - 134, - 135, - 136, - 137, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 138, - 0, - 139, - 0, - 0, - 0, - 0, - 140, - 141, - 142, - 143, - 0, - 0, - 0, - 0, - 0, - 144, - 0, - 0, - 0, - 145, - 0, - 0, - 146, - 147, - 148, - 149, - 0, - 0, - 0, - 0 - }; - - const FT_UShort cff_expert_encoding[256] = - { - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 229, - 230, - 0, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 13, - 14, - 15, - 99, - 239, - 240, - 241, - 242, - 243, - 244, - 245, - 246, - 247, - 248, - 27, - 28, - 249, - 250, - 251, - 252, - 0, - 253, - 254, - 255, - 256, - 257, - 0, - 0, - 0, - 258, - 0, - 0, - 259, - 260, - 261, - 262, - 0, - 0, - 263, - 264, - 265, - 0, - 266, - 109, - 110, - 267, - 268, - 269, - 0, - 270, - 271, - 272, - 273, - 274, - 275, - 276, - 277, - 278, - 279, - 280, - 281, - 282, - 283, - 284, - 285, - 286, - 287, - 288, - 289, - 290, - 291, - 292, - 293, - 294, - 295, - 296, - 297, - 298, - 299, - 300, - 301, - 302, - 303, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 304, - 305, - 306, - 0, - 0, - 307, - 308, - 309, - 310, - 311, - 0, - 312, - 0, - 0, - 312, - 0, - 0, - 314, - 315, - 0, - 0, - 316, - 317, - 318, - 0, - 0, - 0, - 158, - 155, - 163, - 319, - 320, - 321, - 322, - 323, - 324, - 325, - 0, - 0, - 326, - 150, - 164, - 169, - 327, - 328, - 329, - 330, - 331, - 332, - 333, - 334, - 335, - 336, - 337, - 338, - 339, - 340, - 341, - 342, - 343, - 344, - 345, - 346, - 347, - 348, - 349, - 350, - 351, - 352, - 353, - 354, - 355, - 356, - 357, - 358, - 359, - 360, - 361, - 362, - 363, - 364, - 365, - 366, - 367, - 368, - 369, - 370, - 371, - 372, - 373, - 374, - 375, - 376, - 377, - 378 - }; + FT_LOCAL const FT_UShort cff_isoadobe_charset[229]; + + FT_LOCAL const FT_UShort cff_expert_charset[166]; + + FT_LOCAL const FT_UShort cff_expertsubset_charset[87]; + + FT_LOCAL const FT_UShort cff_standard_encoding[256]; + + FT_LOCAL const FT_UShort cff_expert_encoding[256]; FT_LOCAL FT_String* diff --git a/src/pshinter/pshalgo1.c b/src/pshinter/pshalgo1.c index eaa82de3d..e649cdef8 100644 --- a/src/pshinter/pshalgo1.c +++ b/src/pshinter/pshalgo1.c @@ -311,7 +311,7 @@ ps_simple_scale( PSH1_Hint_Table table, FT_Fixed scale, FT_Fixed delta, - FT_Bool vertical ) + FT_Int vertical ) { PSH1_Hint hint; FT_UInt count; @@ -335,12 +335,14 @@ psh1_hint_table_optimize( PSH1_Hint_Table table, PSH_Globals globals, FT_Outline* outline, - FT_Bool vertical ) + FT_Int vertical ) { PSH_Dimension dim = &globals->dimension[vertical]; FT_Fixed scale = dim->scale_mult; FT_Fixed delta = dim->scale_delta; + FT_UNUSED(outline); + #ifdef DEBUG_HINTER if ( ps_debug_no_vert_hints && vertical ) { @@ -385,7 +387,8 @@ hint->cur_len = fit_len; /* check blue zones for horizontal stems */ - align.align = 0; + align.align = 0; + align.align_bot = align.align_top = 0; if (!vertical) { psh_blues_snap_stem( &globals->blues, @@ -627,7 +630,7 @@ psh1_hint_table_tune_outline( PSH1_Hint_Table table, FT_Outline* outline, PSH_Globals globals, - FT_Bool vertical ) + FT_Int vertical ) { FT_UInt count, first, last; @@ -707,8 +710,8 @@ PSH_Globals globals ) { PSH1_Hint_TableRec hints; - FT_Error error; - FT_Int dimension; + FT_Error error = 0; + FT_Int dimension; for ( dimension = 1; dimension >= 0; dimension-- ) { diff --git a/src/pshinter/pshalgo2.c b/src/pshinter/pshalgo2.c index a6e3b98d7..869297b84 100644 --- a/src/pshinter/pshalgo2.c +++ b/src/pshinter/pshalgo2.c @@ -317,7 +317,7 @@ ps_simple_scale( PSH2_Hint_Table table, FT_Fixed scale, FT_Fixed delta, - FT_Bool vertical ) + FT_Int vertical ) { PSH2_Hint hint; FT_UInt count; @@ -339,7 +339,7 @@ static void psh2_hint_align( PSH2_Hint hint, PSH_Globals globals, - FT_Bool vertical ) + FT_Int vertical ) { PSH_Dimension dim = &globals->dimension[vertical]; FT_Fixed scale = dim->scale_mult; @@ -370,6 +370,8 @@ /* check blue zones for horizontal stems */ align.align = 0; + align.align_bot = align.align_top = 0; + if (!vertical) { psh_blues_snap_stem( &globals->blues, @@ -458,7 +460,7 @@ static void psh2_hint_table_align_hints( PSH2_Hint_Table table, PSH_Globals globals, - FT_Bool vertical ) + FT_Int vertical ) { PSH2_Hint hint; FT_UInt count; @@ -616,6 +618,7 @@ } #endif +#if 0 /* tune a single coordinate with the current interpolation zones */ static FT_Pos psh2_hint_table_tune_coord( PSH2_Hint_Table table, @@ -652,7 +655,7 @@ return FT_MulFix( coord, zone->scale ) + zone->delta; } - +#endif #if 0 /* tune a given outline with current interpolation zones */ @@ -661,7 +664,7 @@ psh2_hint_table_tune_outline( PSH2_Hint_Table table, FT_Outline* outline, PSH_Globals globals, - FT_Bool vertical ) + FT_Int vertical ) { FT_UInt count, first, last; @@ -887,12 +890,12 @@ dxi = vec[n].x - vec[n_prev].x; dyi = vec[n].y - vec[n_prev].y; - point->dir_in = psh2_compute_dir( dxi, dyi ); + point->dir_in = (FT_Char) psh2_compute_dir( dxi, dyi ); dxo = vec[n_next].x - vec[n].x; dyo = vec[n_next].y - vec[n].y; - point->dir_out = psh2_compute_dir( dxo, dyo ); + point->dir_out = (FT_Char) psh2_compute_dir( dxo, dyo ); /* detect smooth points */ if ( point->flags & PSH2_POINT_OFF ) @@ -952,7 +955,7 @@ /* load outline point coordinates into hinter glyph */ static void psh2_glyph_load_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { FT_Vector* vec = glyph->outline->points; PSH2_Point point = glyph->points; @@ -978,7 +981,7 @@ /* save hinted point coordinates back to outline */ static void psh2_glyph_save_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { FT_UInt n; PSH2_Point point = glyph->points; @@ -1061,7 +1064,7 @@ /* find strong points in a glyph */ static void psh2_glyph_find_strong_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { /* a point is strong if it is located on a stem */ /* edge and has an "in" or "out" tangent to the hint's direction */ @@ -1128,7 +1131,7 @@ /* interpolate strong points with the help of hinted coordinates */ static void psh2_glyph_interpolate_strong_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { PSH_Dimension dim = &glyph->globals->dimension[vertical]; FT_Fixed scale = dim->scale_mult; @@ -1169,7 +1172,7 @@ static void psh2_glyph_interpolate_normal_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { #if 1 PSH_Dimension dim = &glyph->globals->dimension[vertical]; @@ -1279,7 +1282,7 @@ /* interpolate other points */ static void psh2_glyph_interpolate_other_points( PSH2_Glyph glyph, - FT_Bool vertical ) + FT_Int vertical ) { PSH_Dimension dim = &glyph->globals->dimension[vertical]; FT_Fixed scale = dim->scale_mult; diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c index 3dfdd2400..7557f34db 100644 --- a/src/pshinter/pshglob.c +++ b/src/pshinter/pshglob.c @@ -100,6 +100,8 @@ FT_UInt count_top = top_table->count; FT_UInt count_bot = bot_table->count; FT_Bool first = 1; + + FT_UNUSED(target); for ( ; read_count > 0; read_count -= 2 ) { diff --git a/src/type1/t1load.c b/src/type1/t1load.c index ab9a00fbe..2b097999b 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -959,12 +959,10 @@ FT_Memory memory = parser->root.memory; FT_Error error; - if ( encode->char_index ) /* with synthetic fonts, it's possible we get here twice */ return; - /* read the number of entries in the encoding, should be 256 */ count = T1_ToInt( parser ); if ( parser->root.error ) -- cgit v1.2.1