Move Chromium subsetter code to sample, update CMakeLists accordingly.

Remove unused const in font.h.

8 files changed, 12 insertions, 16 deletions

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 92aa2d1..85932bc 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -76,8 +76,13 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
   add_library(tinyxml
               ${TINYXML})
   file(GLOB TEST_CASES src/test/*.cc src/test/autogenerated/*.cc)
+  file(GLOB CHROME_SUBSETTER_LIB
+    src/sample/chromium/subsetter_impl.h
+    src/sample/chromium/subsetter_impl.cc
+    src/sample/chromium/font_subsetter.cc
+    src/sample/chromium/font_subsetter.h)
   add_executable(unit_test
-    ${TEST_CASES}
+    ${TEST_CASES} ${CHROME_SUBSETTER_LIB}
     ext/gtest/src/gtest-all.cc
     ext/gtest/src/gtest_main.cc)
   target_link_libraries(unit_test sfntly icuuc tinyxml)
@@ -109,10 +114,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   target_link_libraries(subtly_debug pthread)
 endif(CMAKE_COMPILER_IS_GNUCXX)
    add_executable(chrome_subsetter
-     src/test/subsetter_impl.h
-     src/test/subsetter_impl.cc
-     src/test/font_subsetter.cc
-     src/test/font_subsetter.h
+     ${CHROME_SUBSETTER_LIB}
      src/sample/chromium/chrome_subsetter.cc
    )
    target_link_libraries(chrome_subsetter sfntly icuuc)
diff --git a/cpp/src/sample/chromium/chrome_subsetter.cc b/cpp/src/sample/chromium/chrome_subsetter.cc
index 6f5788e..df15c18 100644
--- a/cpp/src/sample/chromium/chrome_subsetter.cc
+++ b/cpp/src/sample/chromium/chrome_subsetter.cc
@@ -21,7 +21,7 @@
 #include <sstream>
 
 #include "sfntly/port/type.h"
-#include "test/font_subsetter.h"
+#include "font_subsetter.h"
 
 template <typename T>
 class HexTo {
diff --git a/cpp/src/test/font_subsetter.cc b/cpp/src/sample/chromium/font_subsetter.cc
index 401c9f5..14f5494 100644
--- a/cpp/src/test/font_subsetter.cc
+++ b/cpp/src/sample/chromium/font_subsetter.cc
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// File is originally from Chromium third_party/sfntly/src/subsetter.
-// Use as test case in sfntly so that problems can be caught in upstream early.
 
-#include "test/font_subsetter.h"
+#include "font_subsetter.h"
 
-#include "test/subsetter_impl.h"
+#include "subsetter_impl.h"
 
 int SfntlyWrapper::SubsetFont(const char* font_name,
                               const unsigned char* original_font,
diff --git a/cpp/src/test/font_subsetter.h b/cpp/src/sample/chromium/font_subsetter.h
index 07b1b5b..07b1b5b 100644
--- a/cpp/src/test/font_subsetter.h
+++ b/cpp/src/sample/chromium/font_subsetter.h
diff --git a/cpp/src/test/subsetter_impl.cc b/cpp/src/sample/chromium/subsetter_impl.cc
index 4786f7f..7e7cf61 100644
--- a/cpp/src/test/subsetter_impl.cc
+++ b/cpp/src/sample/chromium/subsetter_impl.cc
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// File is originally from Chromium third_party/sfntly/src/subsetter.
-// Use as test case in sfntly so that problems can be caught in upstream early.
 
-#include "test/subsetter_impl.h"
+#include "subsetter_impl.h"
 
 #include <string.h>
 
diff --git a/cpp/src/test/subsetter_impl.h b/cpp/src/sample/chromium/subsetter_impl.h
index ffbf408..ffbf408 100644
--- a/cpp/src/test/subsetter_impl.h
+++ b/cpp/src/sample/chromium/subsetter_impl.h
diff --git a/cpp/src/sfntly/font.h b/cpp/src/sfntly/font.h
index dd31c13..975e8cc 100644
--- a/cpp/src/sfntly/font.h
+++ b/cpp/src/sfntly/font.h
@@ -117,8 +117,6 @@ struct MacintoshEncodingId {
   };
 };
 
-extern const int32_t SFNTVERSION_1;
-
 class FontFactory;
 
 // An sfnt container font object. This object is immutable and thread safe. To
diff --git a/cpp/src/test/chrome_subsetter.cc b/cpp/src/test/chrome_subsetter.cc
index 0c5c9ca..9563ab1 100644
--- a/cpp/src/test/chrome_subsetter.cc
+++ b/cpp/src/test/chrome_subsetter.cc
@@ -15,7 +15,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "test/font_subsetter.h"
+#include "sample/chromium/font_subsetter.h"
 #include "test/test_data.h"
 #include "test/test_font_utils.h"