kc3-lang/freetype/src/otlayout/otljstf.c
-
Show log
Commit
-
Hash : ec39a8a3
Author :
Date : 2004-08-12T12:22:28
Make otlayout module compile (without actually working). * src/otlayout/*: s/OTL_Valid/OTL_Validator/. s/NULL/0/. * src/otlayout/otlayout.h: Fix various typos. (OTL_Bool): New typedef. (OTL_Int, OTL_Long, OTL_Int16, OTL_Int32): Use `signed' keyword. (OTL_Err_InvalidArgument): Removed. (OTL_Err_InvalidData, OTL_Err_InvalidSize): New enum values. (OTL_MAKE_TAG): Add missing parenthesis. (OTL_INVALID_DATA): Use OTL_Err_InvalidData. (OTL_INVALID_TOO_SHORT): Use OTL_Err_InvalidSize. (OTL_INVALID_FORMAT, OTL_INVALID_OFFSET): New macros. * src/otlayout/otlgpos.c: s/FT_/OTL_/. s/OTL_Short/OTL_Int16/. (otl_gpos_pairset_validate): Add return type. (otl_base_array_validate): Fix call to otl_anchor_validate. (otl_liga_array_validate): Fix call to otl_liga_attach_validate. (otl_gpos_lookup5_validate): Fix typos. (otl_gpos_lookup6_validate): Fix call to otl_mark2_array_validate. (otl_gpos_lookup7_validate): Comment out unfinished code. Fix typos. * src/otlayout/otlgsub.c: Add forward declaration for otl_gsub_validate_funcs. (otl_gsub_lookup1_apply, otl_gsub_lookup2_apply, otl_gsub_lookup3_apply): Fix call to otl_parser_check_property. s/otl_coverage_lookup/otl_coverage_get_index/. (otl_ligature_validate): Add missing variable declaration. (otl_sub_rule_validate): Fix typo. (otl_sub_class_rule_validate): Add missing variable declaration. Fix typo. (otl_gsub_lookup5_validate): Fix typo. (otl_gsub_lookup6_validate): Fix call to otl_chain_sub_class_set_validate. (otl_gsub_validate_funcs): Don't use `const'. * src/otlayout/otlcommn.c (otl_class_definition_get_value, otl_device_table_validate, otl_device_table_get_delta, otl_lookup_validate, otl_script_validate): Add missing variable declarations. (otl_lookup_list_validate): Comment out first definition. (otl_lookup_list_foreach, otl_feature_list_foreach): Comment out. (otl_feature_list_validate): s/otl_feature_table_validate/otl_feature_validate/. (otl_script_list_validate): s/otl_script_table_validate/otl_script_validate/. * src/otlayout/otlcommn.h: Comment out first declaration. (otl_lookup_list_foreach, otl_feature_list_foreach): Comment out. * src/otlayout/otlbase.c (otl_base_coord_validate): Fix call to otl_device_table_validate. (otl_base_scsript_validate): Add missing variable declarations. (otl_base_script_list_validate): Fix call to otl_base_script_validate. (otl_axis_table_validate): Fix calls to otl_base_tag_list_validate and otl_base_script_list_validate. (otl_base_validate): Fix calls to otl_axis_table_validate. * src/otlayout/otlgdef.c (otl_attach_list_validate): Fix call to otl_attach_point_validate. (otl_caret_value_validate): Add missing variable declaration. Fix call to otl_device_table_validate. (otl_ligature_glyph_validate): Fix call to otl_caret_value_validate. (otl_ligature_caret_list_validate): Fix call to otl_ligature_glyph_validate. (otl_gdef_validate): Fix calls to otl_class_definition_validate, otl_attach_list_validate, otl_ligature_caret_list_validate, and otl_class_definition_validate. * src/otlayout/otltable.h (otl_table_validate, otl_table_init, otl_table_set_script): Comment out. * src/otlayout/otlparse.h (OTL_ParserRec): s/OTL_Alternate/OTL_GSUB_Alternate/. (OTL_ParseError): Add OTL_Err_Parser_Memory and OTL_Err_Parser_Internal. (otl_parser_error): Fix typo. (otl_parser_check_property): Remove third argument. * src/otlayout/otlparse.c (otl_string_ensure): s/OTL_Parse_Err_Memory/OTL_Err_Parser_Memory/. (OTL_STRING_ENSURE, otl_parser_error, otl_parser_get_index, otl_parser_replace_1, otl_parser_replace_n): Fix typos. (OTL_PARSER_UNCOVERED): Removed. (otl_parser_check_property): Remove third argument. * src/otlayout/otljstf.c (otl_jstf_priority_validate): Add missing variable declaration. * src/otlayout/otlutils.h (OTL_MEM_REALLOC): Fix typo.
-
src/otlayout/otljstf.c
-
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
#include "otljstf.h" #include "otlcommn.h" #include "otlgpos.h" static void otl_jstf_extender_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 2 ); count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*2 ); } static void otl_jstf_gsub_mods_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 2 ); count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*2 ); /* XXX: check GSUB lookup indices */ } static void otl_jstf_gpos_mods_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 2 ); count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*2 ); /* XXX: check GPOS lookup indices */ } static void otl_jstf_max_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 2 ); count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*2 ); for ( ; count > 0; count-- ) otl_gpos_subtable_check( table + OTL_NEXT_USHORT( p ), valid ); } static void otl_jstf_priority_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt offset, val; OTL_CHECK( 20 ); /* shrinkage GSUB enable/disable */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gsub_mods_validate( table + val, valid ); val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gsub_mods_validate( table + val, valid ); /* shrinkage GPOS enable/disable */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gpos_mods_validate( table + val, valid ); val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gpos_mods_validate( table + val, valid ); /* shrinkage JSTF max */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_max_validate( table + val, valid ); /* extension GSUB enable/disable */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gsub_mods_validate( table + val, valid ); val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gsub_mods_validate( table + val, valid ); /* extension GPOS enable/disable */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gpos_mods_validate( table + val, valid ); val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_gpos_mods_validate( table + val, valid ); /* extension JSTF max */ val = OTL_NEXT_USHORT( p ); if ( val ) otl_jstf_max_validate( table + val, valid ); } static void otl_jstf_lang_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 2 ); count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*2 ); for ( ; count > 0; count-- ) otl_jstf_priority_validate( table + OTL_NEXT_USHORT( p ), valid ); } static void otl_jstf_script_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count, extender, default_lang; OTL_CHECK( 6 ); extender = OTL_NEXT_USHORT( p ); default_lang = OTL_NEXT_USHORT( p ); count = OTL_NEXT_USHORT( p ); if ( extender ) otl_jstf_extender_validate( table + extender, valid ); if ( default_lang ) otl_jstf_lang_validate( table + default_lang, valid ); OTL_CHECK( 6*count ); for ( ; count > 0; count-- ) { p += 4; /* ignore tag */ otl_jstf_lang_validate( table + OTL_NEXT_USHORT( p ), valid ); } } OTL_LOCALDEF( void ) otl_jstf_validate( OTL_Bytes table, OTL_Validator valid ) { OTL_Bytes p = table; OTL_UInt count; OTL_CHECK( 4 ); if ( OTL_NEXT_ULONG( p ) != 0x10000UL ) OTL_INVALID_DATA; count = OTL_NEXT_USHORT( p ); OTL_CHECK( count*6 ); for ( ; count > 0; count++ ) { p += 4; /* ignore tag */ otl_jstf_script_validate( table + OTL_NEXT_USHORT( p ), valid ); } }