Update per code review comments from previous check-in

git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@108 672e30a5-4c29-85ac-ac6d-611c735e0a51

3 files changed, 14 insertions, 17 deletions

diff --git a/sfntly/table/bitmap/big_glyph_metrics.cc b/sfntly/table/bitmap/big_glyph_metrics.cc
index 2a30829..d853212 100644
--- a/sfntly/table/bitmap/big_glyph_metrics.cc
+++ b/sfntly/table/bitmap/big_glyph_metrics.cc
@@ -137,18 +137,6 @@ void BigGlyphMetrics::Builder::SetVertAdvance(byte_t advance) {
   InternalWriteData()->WriteByte(Offset::kVertAdvance, advance);
 }
 
-// Note: C++ port only
-void BigGlyphMetrics::Builder::CopyFrom(BigGlyphMetrics::Builder* source) {
-  SetHeight(static_cast<byte_t>(source->Height()));
-  SetWidth(static_cast<byte_t>(source->Width()));
-  SetHoriBearingX(static_cast<byte_t>(source->HoriBearingX()));
-  SetHoriBearingY(static_cast<byte_t>(source->HoriBearingY()));
-  SetHoriAdvance(static_cast<byte_t>(source->HoriAdvance()));
-  SetVertBearingX(static_cast<byte_t>(source->VertBearingX()));
-  SetVertBearingY(static_cast<byte_t>(source->VertBearingY()));
-  SetVertAdvance(static_cast<byte_t>(source->VertAdvance()));
-}
-
 CALLER_ATTACH FontDataTable*
     BigGlyphMetrics::Builder::SubBuildTable(ReadableFontData* data) {
   BigGlyphMetricsPtr output = new BigGlyphMetrics(data);
diff --git a/sfntly/table/bitmap/big_glyph_metrics.h b/sfntly/table/bitmap/big_glyph_metrics.h
index b62aada..a91601c 100644
--- a/sfntly/table/bitmap/big_glyph_metrics.h
+++ b/sfntly/table/bitmap/big_glyph_metrics.h
@@ -66,9 +66,6 @@ class BigGlyphMetrics : public GlyphMetrics,
     int32_t VertAdvance();
     void SetVertAdvance(byte_t advance);
 
-    // Note: C++ port only
-    void CopyFrom(Builder* source);
-
     virtual CALLER_ATTACH FontDataTable* SubBuildTable(ReadableFontData* data);
     virtual void SubDataSet();
     virtual int32_t SubDataSizeToSerialize();
diff --git a/test/subsetter_impl.cc b/test/subsetter_impl.cc
index f36fcd2..d475d21 100644
--- a/test/subsetter_impl.cc
+++ b/test/subsetter_impl.cc
@@ -372,6 +372,18 @@ bool ShallSubset(EbdtTable::Builder* ebdt, EblcTable::Builder* eblc,
   return true;
 }
 
+void CopyBigGlyphMetrics(BigGlyphMetrics::Builder* source,
+                         BigGlyphMetrics::Builder* target) {
+  target->SetHeight(static_cast<byte_t>(source->Height()));
+  target->SetWidth(static_cast<byte_t>(source->Width()));
+  target->SetHoriBearingX(static_cast<byte_t>(source->HoriBearingX()));
+  target->SetHoriBearingY(static_cast<byte_t>(source->HoriBearingY()));
+  target->SetHoriAdvance(static_cast<byte_t>(source->HoriAdvance()));
+  target->SetVertBearingX(static_cast<byte_t>(source->VertBearingX()));
+  target->SetVertBearingY(static_cast<byte_t>(source->VertBearingY()));
+  target->SetVertAdvance(static_cast<byte_t>(source->VertAdvance()));
+}
+
 CALLER_ATTACH IndexSubTable::Builder*
 ConstructIndexFormat4(IndexSubTable::Builder* b, const BitmapGlyphInfoMap& loca,
                       int32_t* image_data_offset) {
@@ -433,13 +445,13 @@ ConstructIndexFormat5(IndexSubTable::Builder* b, const BitmapGlyphInfoMap& loca,
   if (b->index_format() == IndexSubTable::Format::FORMAT_2) {
     IndexSubTableFormat2BuilderPtr builder2 =
       down_cast<IndexSubTableFormat2::Builder*>(b);
-    new_builder->BigMetrics()->CopyFrom(builder2->BigMetrics());
+    CopyBigGlyphMetrics(builder2->BigMetrics(), new_builder->BigMetrics());
     image_size = builder2->ImageSize();
   } else {
     IndexSubTableFormat5BuilderPtr builder5 =
       down_cast<IndexSubTableFormat5::Builder*>(b);
     BigGlyphMetricsBuilderPtr metrics_builder;
-    new_builder->BigMetrics()->CopyFrom(builder5->BigMetrics());
+    CopyBigGlyphMetrics(builder5->BigMetrics(), new_builder->BigMetrics());
     image_size = builder5->ImageSize();
   }