diff options
| author | arthurhsu <arthurhsu@google.com> | 2011-09-26 17:58:32 +0000 |
|---|---|---|
| committer | arthurhsu <arthurhsu@google.com> | 2011-09-26 17:58:32 +0000 |
| commit | b4e699e152543000a5825791e1c26826924a256f (patch) | |
| tree | 20f41e691affe415c9c630becf98761866c6335a /cpp | |
| parent | 8fe532f537da5ce46cf273c6a857a741ea2ff287 (diff) | |
| download | sfntly-b4e699e152543000a5825791e1c26826924a256f.tar.gz | |
Temporary disable CMap and Bitmap processing by default.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cpp/src/sfntly/table/table.cc | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 91b6d30..ef3f2db 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -26,7 +26,10 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX) # Use STL for TinyXML library - add_definitions(-DTIXML_USE_STL) + add_definitions(-DTIXML_USE_STL) + +# Enable CMap and Bitmap handling + add_definitions(-DSFNTLY_ENABLE_CMAP_HANDLING -DSFNTLY_ENABLE_BITMAP_HANDLING) # VC specific flags if(MSVC10 OR MSVC90) diff --git a/cpp/src/sfntly/table/table.cc b/cpp/src/sfntly/table/table.cc index 8f4571e..6cfe1f8 100644 --- a/cpp/src/sfntly/table/table.cc +++ b/cpp/src/sfntly/table/table.cc @@ -78,12 +78,14 @@ Table::Builder* Table::Builder::GetBuilder(Header* header, // Note: Tables are commented out when they are not used/ported. // TODO(arthurhsu): IMPLEMENT: finish tables that are not ported. - if (tag == Tag::cmap) { - builder_raw = static_cast<Table::Builder*>( - CMapTable::Builder::CreateBuilder(header, table_data)); - } else if (tag == Tag::head) { + if (tag == Tag::head) { builder_raw = static_cast<Table::Builder*>( FontHeaderTable::Builder::CreateBuilder(header, table_data)); +#if defined (SFNTLY_ENABLE_CMAP_HANDLING) + } else if (tag == Tag::cmap) { + builder_raw = static_cast<Table::Builder*>( + CMapTable::Builder::CreateBuilder(header, table_data)); +#endif // SFNTLY_ENABLE_CMAP_HANDLING } else if (tag == Tag::hhea) { builder_raw = static_cast<Table::Builder*>( HorizontalHeaderTable::Builder::CreateBuilder(header, table_data)); @@ -111,18 +113,21 @@ Table::Builder* Table::Builder::GetBuilder(Header* header, } else if (tag == Tag::loca) { builder_raw = static_cast<Table::Builder*>( LocaTable::Builder::CreateBuilder(header, table_data)); - }/* else if (tag == Tag::prep) { - builder_raw = static_cast<Table::Builder*>( - ControlProgramTable::Builder::CreateBuilder(header, table_data)); - }*/ else if (tag == Tag::EBDT || tag == Tag::bdat) { +#if defined (SFNTLY_ENABLE_BITMAP_HANDLING) + } else if (tag == Tag::EBDT || tag == Tag::bdat) { builder_raw = static_cast<Table::Builder*>( EbdtTable::Builder::CreateBuilder(header, table_data)); } else if (tag == Tag::EBLC || tag == Tag::bloc) { builder_raw = static_cast<Table::Builder*>( EblcTable::Builder::CreateBuilder(header, table_data)); - }/* else if (tag == Tag::EBSC) { +#endif // SFNTLY_ENABLE_BITMAP_HANDLING + } /* else if (tag == Tag::EBSC) { builder_raw = static_cast<Table::Builder*>( EbscTable::Builder::CreateBuilder(header, table_data)); + }*/ + /* else if (tag == Tag::prep) { + builder_raw = static_cast<Table::Builder*>( + ControlProgramTable::Builder::CreateBuilder(header, table_data)); }*/ else if (tag == Tag::bhed) { builder_raw = static_cast<Table::Builder*>( FontHeaderTable::Builder::CreateBuilder(header, table_data)); |