remove dummy_shaper

include/mapnik/text/dummy_shaper.hpp

@@ -1,93 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2013 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_DUMMY_SHAPER_HPP
-#define MAPNIK_DUMMY_SHAPER_HPP
-
-// mapnik
-#include <mapnik/text/text_properties.hpp>
-#include <mapnik/text/text_line.hpp>
-#include <mapnik/text/face.hpp>
-// stl
-#include <list>
-
-namespace mapnik
-{
-
-struct dummy_shaper
-{
-
-/* Dummy shaping limitations:
- * - LTR text only
- * - Only first font in fontset is used
- * - No kerning
- * - No complex scripts
- */
-
-static void shape_text(text_line & line,
-                       text_itemizer & itemizer,
-                       std::map<unsigned,double> & width_map,
-                       face_manager_freetype & font_manager,
-                       double scale_factor )
-{
-    unsigned start = line.first_char();
-    unsigned end = line.last_char();
-    mapnik::value_unicode_string const& text = itemizer.text();
-    size_t length = end - start;
-    if (!length) return;
-    line.reserve(length);
-    std::list<text_item> const& list = itemizer.itemize(start, end);
-
-    for (auto const& text_item : list)
-    {
-        face_set_ptr face_set = font_manager.get_face_set(text_item.format->face_name, text_item.format->fontset);
-        double size = text_item.format->text_size * scale_factor;
-        face_set->set_unscaled_character_sizes();
-        if (face_set->begin() == face_set->end()) return; // Invalid face set
-        face_ptr face = *(face_set->begin());
-        FT_Face freetype_face = face->get_face();
-
-        for (unsigned i = text_item.start; i < text_item.end; ++i)
-        {
-            UChar32 c = text.char32At(i);
-            glyph_info tmp;
-            tmp.glyph_index = FT_Get_Char_Index(freetype_face, c);
-            if (tmp.glyph_index == 0) continue; // Skip unknown characters
-            face->glyph_dimensions(tmp);
-
-            tmp.char_index = i;
-            tmp.face = face;
-            tmp.format = text_item.format;
-            tmp.scale_multiplier = size / face->get_face()->units_per_EM;
-            tmp.offset.clear();
-            width_map[i] += tmp.advance();
-            line.add_glyph(std::move(tmp), scale_factor);
-        }
-        line.update_max_char_height(face->get_char_height(size));
-    }
-}
-
-};
-
-} // namespace mapnik
-
-#endif // MAPNIK_DUMMY_SHAPER_HPP

include/mapnik/text/layout.hpp

@@ -28,8 +28,6 @@
 #include <mapnik/text/glyph_info.hpp>
 #include <mapnik/text/char_properties_ptr.hpp>
 #include <mapnik/text/harfbuzz_shaper.hpp>
-#include <mapnik/text/icu_shaper.hpp>
-#include <mapnik/text/dummy_shaper.hpp>
 #include <mapnik/text/rotation.hpp>
 
 //stl

src/text/layout.cpp

@@ -220,8 +220,8 @@ void text_layout::clear()
     itemizer_.clear();
     lines_.clear();
     width_map_.clear();
-    width_ = 0.;
+    width_ = 0.0;
-    height_ = 0.;
+    height_ = 0.0;
     child_layout_list_.clear();
 }