diff options
author | arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> | 2011-08-01 17:26:13 +0000 |
---|---|---|
committer | arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> | 2011-08-01 17:26:13 +0000 |
commit | 246300f7fab1f2539c3207ce5ec28cc355465be8 (patch) | |
tree | 115a17ca44d4c4c3633db72c7e9e51cb19f698f4 /sample | |
parent | 2538405b412d47c3772cb2bebfe96fb96217b1f1 (diff) | |
download | src-246300f7fab1f2539c3207ce5ec28cc355465be8.tar.gz |
Readability clean up. The code conforms to Google C++ Coding Style.
git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@30 672e30a5-4c29-85ac-ac6d-611c735e0a51
Diffstat (limited to 'sample')
-rw-r--r-- | sample/subsetter/main.cc | 2 | ||||
-rw-r--r-- | sample/subsetter/subset_util.cc | 18 | ||||
-rw-r--r-- | sample/subsetter/subset_util.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sample/subsetter/main.cc b/sample/subsetter/main.cc index a9e1524..19a3e0e 100644 --- a/sample/subsetter/main.cc +++ b/sample/subsetter/main.cc @@ -34,7 +34,7 @@ int main(int argc, char** argv) { } sfntly::SubsetUtil subset_util; - subset_util.subset(argv[1], argv[2]); + subset_util.Subset(argv[1], argv[2]); #ifdef _CRTDBG_MAP_ALLOC _CrtDumpMemoryLeaks(); diff --git a/sample/subsetter/subset_util.cc b/sample/subsetter/subset_util.cc index 013a903..9e4e652 100644 --- a/sample/subsetter/subset_util.cc +++ b/sample/subsetter/subset_util.cc @@ -37,7 +37,7 @@ SubsetUtil::SubsetUtil() { SubsetUtil::~SubsetUtil() { } -void SubsetUtil::subset(const char *input_file_path, +void SubsetUtil::Subset(const char *input_file_path, const char *output_file_path) { UNREFERENCED_PARAMETER(output_file_path); ByteVector input_buffer; @@ -56,10 +56,10 @@ void SubsetUtil::subset(const char *input_file_path, ByteArrayPtr ba = new MemoryByteArray(&(input_buffer[0]), file_size); FontFactoryPtr factory; - factory.attach(FontFactory::getInstance()); + factory.Attach(FontFactory::GetInstance()); FontArray font_array; - factory->loadFonts(ba, &font_array); + factory->LoadFonts(ba, &font_array); if (font_array.empty() || font_array[0] == NULL) return; @@ -71,25 +71,25 @@ void SubsetUtil::subset(const char *input_file_path, glyphs.push_back(10); Ptr<Subsetter> subsetter = new Subsetter(font_array[0], factory); - subsetter->setGlyphs(&glyphs); + subsetter->SetGlyphs(&glyphs); IntegerSet remove_tables; remove_tables.insert(Tag::DSIG); - subsetter->setRemoveTables(&remove_tables); + subsetter->SetRemoveTables(&remove_tables); FontBuilderPtr font_builder; - font_builder.attach(subsetter->subset()); + font_builder.Attach(subsetter->Subset()); FontPtr new_font; - new_font.attach(font_builder->build()); + new_font.Attach(font_builder->Build()); // TODO(arthurhsu): glyph renumbering/Loca table // TODO(arthurhsu): alter CMaps MemoryOutputStream output_stream; - factory->serializeFont(new_font, &output_stream); + factory->SerializeFont(new_font, &output_stream); FILE* output_file = fopen(output_file_path, "wb"); - fwrite(output_stream.get(), 1, output_stream.size(), output_file); + fwrite(output_stream.Get(), 1, output_stream.Size(), output_file); fflush(output_file); fclose(output_file); } diff --git a/sample/subsetter/subset_util.h b/sample/subsetter/subset_util.h index bea28b8..109d63a 100644 --- a/sample/subsetter/subset_util.h +++ b/sample/subsetter/subset_util.h @@ -24,7 +24,7 @@ class SubsetUtil { SubsetUtil(); virtual ~SubsetUtil(); - void subset(const char* input_file_path, const char* output_file_path); + void Subset(const char* input_file_path, const char* output_file_path); }; } // namespace sfntly |