diff --git a/include/mbgl/style/expression/format_expression.hpp b/include/mbgl/style/expression/format_expression.hpp index 180df0139d2..248a3cf6d41 100644 --- a/include/mbgl/style/expression/format_expression.hpp +++ b/include/mbgl/style/expression/format_expression.hpp @@ -8,12 +8,16 @@ namespace style { namespace expression { struct FormatExpressionSection { - FormatExpressionSection(std::unique_ptr text_, - optional> fontScale_, - optional> textFont_, - optional> textColor_); - - std::shared_ptr text; + explicit FormatExpressionSection(std::unique_ptr content_); + + void setTextSectionOptions(optional> fontScale_, + optional> textFont_, + optional> textColor_); + + // Content can be expression that evaluates to String or Image. + std::shared_ptr content; + + // Text related section options. optional> fontScale; optional> textFont; optional> textColor; diff --git a/include/mbgl/style/expression/formatted.hpp b/include/mbgl/style/expression/formatted.hpp index 09edad240fa..d089e12d9de 100644 --- a/include/mbgl/style/expression/formatted.hpp +++ b/include/mbgl/style/expression/formatted.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -17,17 +18,19 @@ extern const char* const kFormattedSectionTextFont; extern const char* const kFormattedSectionTextColor; struct FormattedSection { - FormattedSection(std::string text_, - optional fontScale_, - optional fontStack_, - optional textColor_) - : text(std::move(text_)) - , fontScale(std::move(fontScale_)) - , fontStack(std::move(fontStack_)) - , textColor(std::move(textColor_)) - {} + explicit FormattedSection(std::string text_, + optional fontScale_, + optional fontStack_, + optional textColor_) + : text(std::move(text_)), + fontScale(std::move(fontScale_)), + fontStack(std::move(fontStack_)), + textColor(std::move(textColor_)) {} + + explicit FormattedSection(Image image_) : image(std::move(image_)) {} std::string text; + optional image; optional fontScale; optional fontStack; optional textColor; @@ -50,10 +53,8 @@ class Formatted { std::string toString() const; mbgl::Value toObject() const; - bool empty() const { - return sections.empty() || sections.at(0).text.empty(); - } - + bool empty() const; + std::vector sections; }; diff --git a/mapbox-gl-js b/mapbox-gl-js index cbbbbfc523e..1215bf138dc 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit cbbbbfc523ed78bb0d8d03de2efabe825e55f198 +Subproject commit 1215bf138dc4982d8bcbc9c61dd3995ae4df3c0f diff --git a/metrics/tests/binary-size/linux-clang8/metrics.json b/metrics/tests/binary-size/linux-clang8/metrics.json index 7af3f79ea6d..c7ca8943d0b 100644 --- a/metrics/tests/binary-size/linux-clang8/metrics.json +++ b/metrics/tests/binary-size/linux-clang8/metrics.json @@ -3,17 +3,17 @@ [ "mbgl-glfw", "/src/workspace/next-linux-clang8-release/bin/mbgl-glfw", - 6225032 + 6290568 ], [ "mbgl-offline", "/src/workspace/next-linux-clang8-release/bin/mbgl-offline", - 5532376 + 5597912 ], [ "mbgl-render", "/src/workspace/next-linux-clang8-release/bin/mbgl-render", - 6151096 + 6220728 ] ] } diff --git a/metrics/tests/binary-size/linux-gcc8/metrics.json b/metrics/tests/binary-size/linux-gcc8/metrics.json index 4a1e61f0688..d8238e95f6b 100644 --- a/metrics/tests/binary-size/linux-gcc8/metrics.json +++ b/metrics/tests/binary-size/linux-gcc8/metrics.json @@ -8,7 +8,7 @@ [ "mbgl-offline", "/src/workspace/next-linux-gcc8-release/bin/mbgl-offline", - 6357224 + 6422760 ], [ "mbgl-render", diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index 6ed7b7a12ef..21ef8af5e5f 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -440,6 +440,7 @@ add_library( ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_icon.cpp ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_icon.cpp ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_sdf_text.cpp + ${MBGL_ROOT}/src/mbgl/programs/gl/symbol_text_and_icon.cpp ${MBGL_ROOT}/src/mbgl/programs/heatmap_program.cpp ${MBGL_ROOT}/src/mbgl/programs/heatmap_program.hpp ${MBGL_ROOT}/src/mbgl/programs/heatmap_texture_program.cpp @@ -466,6 +467,7 @@ add_library( ${MBGL_ROOT}/src/mbgl/programs/symbol_program.hpp ${MBGL_ROOT}/src/mbgl/programs/symbol_sdf_icon_program.hpp ${MBGL_ROOT}/src/mbgl/programs/symbol_sdf_text_program.hpp + ${MBGL_ROOT}/src/mbgl/programs/symbol_text_and_icon_program.hpp ${MBGL_ROOT}/src/mbgl/programs/textures.hpp ${MBGL_ROOT}/src/mbgl/programs/uniforms.hpp ${MBGL_ROOT}/src/mbgl/renderer/backend_scope.cpp diff --git a/next/test/CMakeLists.txt b/next/test/CMakeLists.txt index 12a6d8108cc..363e52c95d0 100644 --- a/next/test/CMakeLists.txt +++ b/next/test/CMakeLists.txt @@ -65,6 +65,7 @@ add_library( ${MBGL_ROOT}/test/style/style_parser.test.cpp ${MBGL_ROOT}/test/text/bidi.test.cpp ${MBGL_ROOT}/test/text/cross_tile_symbol_index.test.cpp + ${MBGL_ROOT}/test/text/formatted.test.cpp ${MBGL_ROOT}/test/text/glyph_manager.test.cpp ${MBGL_ROOT}/test/text/glyph_pbf.test.cpp ${MBGL_ROOT}/test/text/language_tag.test.cpp diff --git a/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/segments/metrics.json b/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/segments/metrics.json new file mode 100644 index 00000000000..d3af311705d --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/segments/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 0, + 0 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 2, + 4, + 9, + 1, + [ + 36864, + 36864 + ], + [ + 202, + 202 + ], + [ + 704, + 704 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/zero-gap-width/metrics.json b/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/zero-gap-width/metrics.json new file mode 100644 index 00000000000..d3af311705d --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/line-dasharray/round/zero-gap-width/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 0, + 0 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 2, + 4, + 9, + 1, + [ + 36864, + 36864 + ], + [ + 202, + 202 + ], + [ + 704, + 704 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-constant-size/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-constant-size/metrics.json new file mode 100644 index 00000000000..1ebdc9b0906 --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-constant-size/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 161976 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 2, + 4, + 13, + 1, + [ + 24580, + 24580 + ], + [ + 190, + 190 + ], + [ + 1856, + 1856 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-line/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-line/metrics.json new file mode 100644 index 00000000000..f7f0edc2f03 --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-line/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 120865 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 3, + 4, + 11, + 1, + [ + 28318, + 28318 + ], + [ + 190, + 190 + ], + [ + 1424, + 1424 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-multiline/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-multiline/metrics.json new file mode 100644 index 00000000000..5dfadecdc9e --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-multiline/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 120865 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 2, + 6, + 13, + 1, + [ + 44921, + 44921 + ], + [ + 310, + 310 + ], + [ + 3136, + 3136 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json new file mode 100644 index 00000000000..312dedfbf0f --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-variable-anchors-justification/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 161976 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 1, + 4, + 9, + 1, + [ + 24580, + 24580 + ], + [ + 2290, + 2290 + ], + [ + 24256, + 24256 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-vertical/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-vertical/metrics.json new file mode 100644 index 00000000000..e4a88169672 --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-vertical/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 4, + 255564 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 1, + 4, + 9, + 1, + [ + 35756, + 35756 + ], + [ + 310, + 310 + ], + [ + 3136, + 3136 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json new file mode 100644 index 00000000000..7cf8a26c5d8 --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images-zoom-dependent-size/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 161976 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 2, + 13, + 13, + 1, + [ + 98636, + 98636 + ], + [ + 142, + 142 + ], + [ + 1344, + 1344 + ] + ] + ] +} \ No newline at end of file diff --git a/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images/metrics.json b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images/metrics.json new file mode 100644 index 00000000000..1c7d44f5fa8 --- /dev/null +++ b/render-test/metrics/linux-gcc8/render-tests/text-field/formatted-images/metrics.json @@ -0,0 +1,35 @@ +{ + "network": [ + [ + "probeNetwork - default - end", + 3, + 161976 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 3, + 4, + 17, + 1, + [ + 52510, + 52510 + ], + [ + 166, + 166 + ], + [ + 1600, + 1600 + ] + ] + ] +} \ No newline at end of file diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js index cb0c945f3c6..4816b89d3e4 100755 --- a/scripts/generate-shaders.js +++ b/scripts/generate-shaders.js @@ -98,7 +98,7 @@ struct ShaderSource; `); writeIfModified(path.join(outputPath, 'gl', 'shader_source.cpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include @@ -109,8 +109,7 @@ namespace programs { namespace gl { constexpr const uint8_t compressedShaderSource[] = { - ${compressed} -}; + ${compressed}}; const char* shaderSource() { static std::string decompressed = util::decompress(std::string(reinterpret_cast(compressedShaderSource), sizeof(compressedShaderSource))); @@ -120,6 +119,7 @@ const char* shaderSource() { } // namespace gl } // namespace programs } // namespace mbgl +// clang-format on `); writeIfModified(path.join(outputPath, 'gl', 'preludes.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. @@ -132,7 +132,7 @@ namespace mbgl { namespace programs { namespace gl { -constexpr const uint8_t preludeHash[8] = { ${offsets['prelude'].hash} }; +constexpr const uint8_t preludeHash[8] = {${offsets['prelude'].hash}}; constexpr const auto vertexPreludeOffset = ${offsets['prelude'].vertex}; constexpr const auto fragmentPreludeOffset = ${offsets['prelude'].fragment}; @@ -148,7 +148,7 @@ for (const key in offsets) { const { shaderName, ShaderName, originalKey } = offsets[key]; writeIfModified(path.join(outputPath, 'gl', `${shaderName}.cpp`), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -164,7 +164,7 @@ struct ShaderSource; template <> struct ShaderSource<${ShaderName}Program> { static constexpr const char* name = "${shaderName}"; - static constexpr const uint8_t hash[8] = { ${offsets[key].hash} }; + static constexpr const uint8_t hash[8] = {${offsets[key].hash}}; static constexpr const auto vertexOffset = ${offsets[key].vertex}; static constexpr const auto fragmentOffset = ${offsets[key].fragment}; }; @@ -195,6 +195,6 @@ ${shaders[originalKey].vertexSource} /* ${shaders[originalKey].fragmentSource} */ - +// clang-format on `); } diff --git a/src/core-files.json b/src/core-files.json index b0bf177c2e3..58efba1ee6f 100644 --- a/src/core-files.json +++ b/src/core-files.json @@ -93,6 +93,7 @@ "src/mbgl/programs/gl/symbol_icon.cpp", "src/mbgl/programs/gl/symbol_sdf_icon.cpp", "src/mbgl/programs/gl/symbol_sdf_text.cpp", + "src/mbgl/programs/gl/symbol_text_and_icon.cpp", "src/mbgl/programs/heatmap_program.cpp", "src/mbgl/programs/heatmap_texture_program.cpp", "src/mbgl/programs/hillshade_prepare_program.cpp", @@ -624,6 +625,7 @@ "mbgl/programs/symbol_program.hpp": "src/mbgl/programs/symbol_program.hpp", "mbgl/programs/symbol_sdf_icon_program.hpp": "src/mbgl/programs/symbol_sdf_icon_program.hpp", "mbgl/programs/symbol_sdf_text_program.hpp": "src/mbgl/programs/symbol_sdf_text_program.hpp", + "mbgl/programs/symbol_text_and_icon_program.hpp": "src/mbgl/programs/symbol_text_and_icon_program.hpp", "mbgl/programs/textures.hpp": "src/mbgl/programs/textures.hpp", "mbgl/programs/uniforms.hpp": "src/mbgl/programs/uniforms.hpp", "mbgl/renderer/bucket.hpp": "src/mbgl/renderer/bucket.hpp", diff --git a/src/mbgl/layout/layout.hpp b/src/mbgl/layout/layout.hpp index 91d3e3f596c..4e7c0c7acae 100644 --- a/src/mbgl/layout/layout.hpp +++ b/src/mbgl/layout/layout.hpp @@ -23,8 +23,7 @@ class Layout { const bool, const bool) = 0; - virtual void prepareSymbols(const GlyphMap&, const GlyphPositions&, - const ImageMap&, const ImagePositions&) {}; + virtual void prepareSymbols(const GlyphMap&, const GlyphPositions&, const ImageMap&, const ImagePositions&){}; virtual bool hasSymbolInstances() const { return true; diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index 41a00e01318..094f859830f 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -25,24 +25,28 @@ SymbolInstanceSharedData::SymbolInstanceSharedData(GeometryCoordinates line_, const style::SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType textPlacement, const std::array& textOffset, - const GlyphPositions& positions, - bool allowVerticalPlacement) : line(std::move(line_)) { + const ImageMap& imageMap, + SymbolContent iconType, + bool allowVerticalPlacement) + : line(std::move(line_)) { // Create the quads used for rendering the icon and glyphs. if (shapedIcon) { - iconQuad = getIconQuad(*shapedIcon, getAnyShaping(shapedTextOrientations).writingMode); + iconQuad = getIconQuad(*shapedIcon, getAnyShaping(shapedTextOrientations).writingMode, iconType); if (verticallyShapedIcon) { - verticalIconQuad = getIconQuad(*verticallyShapedIcon, shapedTextOrientations.vertical.writingMode); + verticalIconQuad = + getIconQuad(*verticallyShapedIcon, shapedTextOrientations.vertical.writingMode, iconType); } } bool singleLineInitialized = false; const auto initHorizontalGlyphQuads = [&] (SymbolQuads& quads, const Shaping& shaping) { if (!shapedTextOrientations.singleLine) { - quads = getGlyphQuads(shaping, textOffset, layout, textPlacement, positions, allowVerticalPlacement); + quads = getGlyphQuads(shaping, textOffset, layout, textPlacement, imageMap, allowVerticalPlacement); return; } if (!singleLineInitialized) { - rightJustifiedGlyphQuads = getGlyphQuads(shaping, textOffset, layout, textPlacement, positions, allowVerticalPlacement); + rightJustifiedGlyphQuads = + getGlyphQuads(shaping, textOffset, layout, textPlacement, imageMap, allowVerticalPlacement); singleLineInitialized = true; } }; @@ -60,7 +64,8 @@ SymbolInstanceSharedData::SymbolInstanceSharedData(GeometryCoordinates line_, } if (shapedTextOrientations.vertical) { - verticalGlyphQuads = getGlyphQuads(shapedTextOrientations.vertical, textOffset, layout, textPlacement, positions, allowVerticalPlacement); + verticalGlyphQuads = getGlyphQuads( + shapedTextOrientations.vertical, textOffset, layout, textPlacement, imageMap, allowVerticalPlacement); } } diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp index 4a57b527f7b..e20c05a0abe 100644 --- a/src/mbgl/layout/symbol_instance.hpp +++ b/src/mbgl/layout/symbol_instance.hpp @@ -21,16 +21,19 @@ struct ShapedTextOrientations { bool singleLine = false; }; +enum class SymbolContent : uint8_t { None = 0, Text = 1 << 0, IconRGBA = 1 << 1, IconSDF = 1 << 2 }; + struct SymbolInstanceSharedData { SymbolInstanceSharedData(GeometryCoordinates line, - const ShapedTextOrientations& shapedTextOrientations, - const optional& shapedIcon, - const optional& verticallyShapedIcon, - const style::SymbolLayoutProperties::Evaluated& layout, - const style::SymbolPlacementType textPlacement, - const std::array& textOffset, - const GlyphPositions& positions, - bool allowVerticalPlacement); + const ShapedTextOrientations& shapedTextOrientations, + const optional& shapedIcon, + const optional& verticallyShapedIcon, + const style::SymbolLayoutProperties::Evaluated& layout, + const style::SymbolPlacementType textPlacement, + const std::array& textOffset, + const ImageMap& imageMap, + SymbolContent iconType, + bool allowVerticalPlacement); bool empty() const; GeometryCoordinates line; // Note: When singleLine == true, only `rightJustifiedGlyphQuads` is populated. @@ -42,13 +45,6 @@ struct SymbolInstanceSharedData { optional verticalIconQuad; }; -enum class SymbolContent : uint8_t { - None = 0, - Text = 1 << 0, - IconRGBA = 1 << 1, - IconSDF = 1 << 2 -}; - class SymbolInstance { public: SymbolInstance(Anchor& anchor_, diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index af0b1bd21b4..ca618444172 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -146,27 +146,34 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters, ft.formattedText = TaggedString(); for (const auto & section : formatted.sections) { - std::string u8string = section.text; - if (textTransform == TextTransformType::Uppercase) { - u8string = platform::uppercase(u8string); - } else if (textTransform == TextTransformType::Lowercase) { - u8string = platform::lowercase(u8string); - } + if (!section.image) { + std::string u8string = section.text; + if (textTransform == TextTransformType::Uppercase) { + u8string = platform::uppercase(u8string); + } else if (textTransform == TextTransformType::Lowercase) { + u8string = platform::lowercase(u8string); + } - ft.formattedText->addSection(applyArabicShaping(util::convertUTF8ToUTF16(u8string)), - section.fontScale ? *section.fontScale : 1.0, - section.fontStack ? *section.fontStack : baseFontStack, - section.textColor); + ft.formattedText->addTextSection(applyArabicShaping(util::convertUTF8ToUTF16(u8string)), + section.fontScale ? *section.fontScale : 1.0, + section.fontStack ? *section.fontStack : baseFontStack, + section.textColor); + } else { + layoutParameters.imageDependencies.emplace(section.image->id(), ImageType::Icon); + ft.formattedText->addImageSection(section.image->id()); + } } - const bool canVerticalizeText = layout->get() == AlignmentType::Map && layout->get() != SymbolPlacementType::Point && ft.formattedText->allowsVerticalWritingMode(); // Loop through all characters of this text and collect unique codepoints. for (std::size_t j = 0; j < ft.formattedText->length(); j++) { - const auto& sectionFontStack = formatted.sections[ft.formattedText->getSectionIndex(j)].fontStack; + const auto& section = formatted.sections[ft.formattedText->getSectionIndex(j)]; + if (section.image) continue; + + const auto& sectionFontStack = section.fontStack; GlyphIDs& dependencies = layoutParameters.glyphDependencies[sectionFontStack ? *sectionFontStack : baseFontStack]; char16_t codePoint = ft.formattedText->getCharCodeAt(j); @@ -333,8 +340,10 @@ std::array SymbolLayout::evaluateVariableOffset(style::SymbolAnchorTyp return result; } -void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions& glyphPositions, - const ImageMap& imageMap, const ImagePositions& imagePositions) { +void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, + const GlyphPositions& glyphPositions, + const ImageMap& imageMap, + const ImagePositions& imagePositions) { const bool isPointPlacement = layout->get() == SymbolPlacementType::Point; const bool textAlongLine = layout->get() == AlignmentType::Map && !isPointPlacement; @@ -345,16 +354,23 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions ShapedTextOrientations shapedTextOrientations; optional shapedIcon; std::array textOffset{{0.0f, 0.0f}}; + const float layoutTextSize = layout->evaluate(zoom + 1, feature); + const float layoutTextSizeAtBucketZoomLevel = layout->evaluate(zoom, feature); + const float layoutIconSize = layout->evaluate(zoom + 1, feature); // if feature has text, shape the text if (feature.formattedText) { const float lineHeight = layout->get() * util::ONE_EM; const float spacing = util::i18n::allowsLetterSpacing(feature.formattedText->rawText()) ? layout->evaluate(zoom, feature) * util::ONE_EM : 0.0f; - auto applyShaping = [&] (const TaggedString& formattedText, WritingModeType writingMode, SymbolAnchorType textAnchor, TextJustifyType textJustify) { + auto applyShaping = [&](const TaggedString& formattedText, + WritingModeType writingMode, + SymbolAnchorType textAnchor, + TextJustifyType textJustify) { const Shaping result = getShaping( /* string */ formattedText, - /* maxWidth: ems */ isPointPlacement ? layout->evaluate(zoom, feature) * util::ONE_EM : 0.0f, + /* maxWidth: ems */ + isPointPlacement ? layout->evaluate(zoom, feature) * util::ONE_EM : 0.0f, /* ems */ lineHeight, textAnchor, textJustify, @@ -362,11 +378,16 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions /* translate */ textOffset, /* writingMode */ writingMode, /* bidirectional algorithm object */ bidi, - /* glyphs */ glyphMap, + glyphMap, + /* glyphs */ glyphPositions, + /* images */ imagePositions, + layoutTextSize, + layoutTextSizeAtBucketZoomLevel, allowVerticalPlacement); return result; }; + const std::vector variableTextAnchor = layout->evaluate(zoom, feature); const SymbolAnchorType textAnchor = layout->evaluate(zoom, feature); if (variableTextAnchor.empty()) { @@ -414,7 +435,7 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions Shaping shaping = applyShaping(*feature.formattedText, WritingModeType::Horizontal, SymbolAnchorType::Center, justification); if (shaping) { shapingForJustification = std::move(shaping); - if (shapingForJustification.lineCount == 1u) { + if (shapingForJustification.positionedLines.size() == 1u) { shapedTextOrientations.singleLine = true; break; } @@ -467,8 +488,18 @@ void SymbolLayout::prepareSymbols(const GlyphMap& glyphMap, const GlyphPositions } // if either shapedText or icon position is present, add the feature - if (getDefaultHorizontalShaping(shapedTextOrientations) || shapedIcon) { - addFeature(std::distance(features.begin(), it), feature, shapedTextOrientations, std::move(shapedIcon), glyphPositions, textOffset, iconType); + const Shaping& defaultShaping = getDefaultHorizontalShaping(shapedTextOrientations); + iconsInText = defaultShaping ? defaultShaping.iconsInText : false; + if (defaultShaping || shapedIcon) { + addFeature(std::distance(features.begin(), it), + feature, + shapedTextOrientations, + std::move(shapedIcon), + imageMap, + textOffset, + layoutTextSize, + layoutIconSize, + iconType); } feature.geometry.clear(); @@ -481,15 +512,14 @@ void SymbolLayout::addFeature(const std::size_t layoutFeatureIndex, const SymbolFeature& feature, const ShapedTextOrientations& shapedTextOrientations, optional shapedIcon, - const GlyphPositions& glyphPositions, + const ImageMap& imageMap, std::array textOffset, + float layoutTextSize, + float layoutIconSize, const SymbolContent iconType) { const float minScale = 0.5f; const float glyphSize = 24.0f; - const float layoutTextSize = layout->evaluate(zoom + 1, feature); - const float layoutIconSize = layout->evaluate(zoom + 1, feature); - const std::array iconOffset = layout->evaluate(zoom, feature); // To reduce the number of labels that jump around when zooming we need @@ -562,10 +592,17 @@ void SymbolLayout::addFeature(const std::size_t layoutFeatureIndex, } }; - const auto createSymbolInstanceSharedData = [&] (GeometryCoordinates line) { + const auto createSymbolInstanceSharedData = [&](GeometryCoordinates line) { return std::make_shared(std::move(line), - shapedTextOrientations, shapedIcon, verticallyShapedIcon, evaluatedLayoutProperties, - textPlacement, textOffset, glyphPositions, allowVerticalPlacement); + shapedTextOrientations, + shapedIcon, + verticallyShapedIcon, + evaluatedLayoutProperties, + textPlacement, + textOffset, + imageMap, + iconType, + allowVerticalPlacement); }; const auto& type = feature.getType(); @@ -678,10 +715,19 @@ std::vector CalculateTileDistances(const GeometryCoordinates& line, const } void SymbolLayout::createBucket(const ImagePositions&, std::unique_ptr&, std::unordered_map& renderData, const bool firstLoad, const bool showCollisionBoxes) { - auto bucket = std::make_shared(layout, layerPaintProperties, textSize, iconSize, zoom, iconsNeedLinear, - sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), tilePixelRatio, + auto bucket = std::make_shared(layout, + layerPaintProperties, + textSize, + iconSize, + zoom, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(symbolInstances), + tilePixelRatio, allowVerticalPlacement, - std::move(placementModes)); + std::move(placementModes), + iconsInText); for (SymbolInstance &symbolInstance : bucket->symbolInstances) { const bool hasText = symbolInstance.hasText(); @@ -832,10 +878,14 @@ size_t SymbolLayout::addSymbol(SymbolBucket::Buffer& buffer, uint16_t index = segment.vertexLength; // coordinates (2 triangles) - buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex(labelAnchor.point, tl, symbol.glyphOffset.y, tex.x, tex.y, sizeData)); - buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex(labelAnchor.point, tr, symbol.glyphOffset.y, tex.x + tex.w, tex.y, sizeData)); - buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex(labelAnchor.point, bl, symbol.glyphOffset.y, tex.x, tex.y + tex.h, sizeData)); - buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex(labelAnchor.point, br, symbol.glyphOffset.y, tex.x + tex.w, tex.y + tex.h, sizeData)); + buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex( + labelAnchor.point, tl, symbol.glyphOffset.y, tex.x, tex.y, sizeData, symbol.isSDF)); + buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex( + labelAnchor.point, tr, symbol.glyphOffset.y, tex.x + tex.w, tex.y, sizeData, symbol.isSDF)); + buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex( + labelAnchor.point, bl, symbol.glyphOffset.y, tex.x, tex.y + tex.h, sizeData, symbol.isSDF)); + buffer.vertices.emplace_back(SymbolSDFIconProgram::layoutVertex( + labelAnchor.point, br, symbol.glyphOffset.y, tex.x + tex.w, tex.y + tex.h, sizeData, symbol.isSDF)); // Dynamic/Opacity vertices are initialized so that the vertex count always agrees with // the layout vertex buffer, but they will always be updated before rendering happens diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp index 2b99c2fa24d..8f6e4595e34 100644 --- a/src/mbgl/layout/symbol_layout.hpp +++ b/src/mbgl/layout/symbol_layout.hpp @@ -31,8 +31,10 @@ class SymbolLayout final : public Layout { ~SymbolLayout() final = default; - void prepareSymbols(const GlyphMap&, const GlyphPositions&, - const ImageMap&, const ImagePositions&) override; + void prepareSymbols(const GlyphMap& glyphMap, + const GlyphPositions&, + const ImageMap&, + const ImagePositions&) override; void createBucket(const ImagePositions&, std::unique_ptr&, std::unordered_map&, const bool firstLoad, const bool showCollisionBoxes) override; @@ -60,8 +62,10 @@ class SymbolLayout final : public Layout { const SymbolFeature&, const ShapedTextOrientations& shapedTextOrientations, optional shapedIcon, - const GlyphPositions&, + const ImageMap&, std::array textOffset, + float layoutTextSize, + float layoutIconSize, const SymbolContent iconType); bool anchorIsTooClose(const std::u16string& text, const float repeatDistance, const Anchor&); @@ -105,6 +109,7 @@ class SymbolLayout final : public Layout { bool iconsNeedLinear = false; bool sortFeaturesByY = false; bool allowVerticalPlacement = false; + bool iconsInText = false; std::vector placementModes; style::TextSize::UnevaluatedType textSize; diff --git a/src/mbgl/programs/gl/background.cpp b/src/mbgl/programs/gl/background.cpp index f3d2cdfd901..8ba56c30554 100644 --- a/src/mbgl/programs/gl/background.cpp +++ b/src/mbgl/programs/gl/background.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "background"; - static constexpr const uint8_t hash[8] = { 0x2d, 0xef, 0x97, 0xa2, 0xec, 0xb5, 0x67, 0xef }; + static constexpr const uint8_t hash[8] = {0x2d, 0xef, 0x97, 0xa2, 0xec, 0xb5, 0x67, 0xef}; static constexpr const auto vertexOffset = 1429; static constexpr const auto fragmentOffset = 1525; }; @@ -63,4 +63,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/background_pattern.cpp b/src/mbgl/programs/gl/background_pattern.cpp index 482814cbda0..6a1273458ed 100644 --- a/src/mbgl/programs/gl/background_pattern.cpp +++ b/src/mbgl/programs/gl/background_pattern.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "background_pattern"; - static constexpr const uint8_t hash[8] = { 0x70, 0x13, 0xc8, 0x7e, 0xba, 0x18, 0xf5, 0x19 }; + static constexpr const uint8_t hash[8] = {0x70, 0x13, 0xc8, 0x7e, 0xba, 0x18, 0xf5, 0x19}; static constexpr const auto vertexOffset = 1675; static constexpr const auto fragmentOffset = 2266; }; @@ -94,4 +94,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/circle.cpp b/src/mbgl/programs/gl/circle.cpp index bd86c0385a8..6f987e6e2aa 100644 --- a/src/mbgl/programs/gl/circle.cpp +++ b/src/mbgl/programs/gl/circle.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "circle"; - static constexpr const uint8_t hash[8] = { 0x1d, 0x47, 0x35, 0xbb, 0x94, 0x3d, 0x93, 0xca }; + static constexpr const uint8_t hash[8] = {0x1d, 0x47, 0x35, 0xbb, 0x94, 0x3d, 0x93, 0xca}; static constexpr const auto vertexOffset = 2927; static constexpr const auto fragmentOffset = 6135; }; @@ -317,4 +317,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/clipping_mask.cpp b/src/mbgl/programs/gl/clipping_mask.cpp index 2c53bc60703..717ba4bac45 100644 --- a/src/mbgl/programs/gl/clipping_mask.cpp +++ b/src/mbgl/programs/gl/clipping_mask.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "clipping_mask"; - static constexpr const uint8_t hash[8] = { 0x3e, 0x17, 0xc2, 0x3a, 0x1f, 0xf0, 0xa8, 0xa3 }; + static constexpr const uint8_t hash[8] = {0x3e, 0x17, 0xc2, 0x3a, 0x1f, 0xf0, 0xa8, 0xa3}; static constexpr const auto vertexOffset = 7891; static constexpr const auto fragmentOffset = 7987; }; @@ -56,4 +56,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/collision_box.cpp b/src/mbgl/programs/gl/collision_box.cpp index a3ad030f5c1..a4c06bb5a9e 100644 --- a/src/mbgl/programs/gl/collision_box.cpp +++ b/src/mbgl/programs/gl/collision_box.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "collision_box"; - static constexpr const uint8_t hash[8] = { 0xcb, 0x6a, 0x9b, 0xd1, 0x1f, 0x31, 0xf8, 0x5b }; + static constexpr const uint8_t hash[8] = {0xcb, 0x6a, 0x9b, 0xd1, 0x1f, 0x31, 0xf8, 0x5b}; static constexpr const auto vertexOffset = 10000; static constexpr const auto fragmentOffset = 10679; }; @@ -93,4 +93,4 @@ void main() { } } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/collision_circle.cpp b/src/mbgl/programs/gl/collision_circle.cpp index 3878122f4b1..c715ef9a0a1 100644 --- a/src/mbgl/programs/gl/collision_circle.cpp +++ b/src/mbgl/programs/gl/collision_circle.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "collision_circle"; - static constexpr const uint8_t hash[8] = { 0x99, 0x2e, 0xad, 0x8c, 0xd3, 0x88, 0xae, 0x82 }; + static constexpr const uint8_t hash[8] = {0x99, 0x2e, 0xad, 0x8c, 0xd3, 0x88, 0xae, 0x82}; static constexpr const auto vertexOffset = 10902; static constexpr const auto fragmentOffset = 11818; }; @@ -116,4 +116,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/debug.cpp b/src/mbgl/programs/gl/debug.cpp index 9705fc48011..a2d2169d7c4 100644 --- a/src/mbgl/programs/gl/debug.cpp +++ b/src/mbgl/programs/gl/debug.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "debug"; - static constexpr const uint8_t hash[8] = { 0xa8, 0x7d, 0x87, 0x6e, 0x36, 0xa8, 0x81, 0xe3 }; + static constexpr const uint8_t hash[8] = {0xa8, 0x7d, 0x87, 0x6e, 0x36, 0xa8, 0x81, 0xe3}; static constexpr const auto vertexOffset = 12494; static constexpr const auto fragmentOffset = 12590; }; @@ -58,4 +58,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill.cpp b/src/mbgl/programs/gl/fill.cpp index 77c839850b5..c9a6e00f78d 100644 --- a/src/mbgl/programs/gl/fill.cpp +++ b/src/mbgl/programs/gl/fill.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill"; - static constexpr const uint8_t hash[8] = { 0x87, 0xea, 0x65, 0x7f, 0x0c, 0x9b, 0x97, 0x5d }; + static constexpr const uint8_t hash[8] = {0x87, 0xea, 0x65, 0x7f, 0x0c, 0x9b, 0x97, 0x5d}; static constexpr const auto vertexOffset = 12654; static constexpr const auto fragmentOffset = 13298; }; @@ -120,4 +120,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill_extrusion.cpp b/src/mbgl/programs/gl/fill_extrusion.cpp index 87ef4858fcc..b9f43c68cc2 100644 --- a/src/mbgl/programs/gl/fill_extrusion.cpp +++ b/src/mbgl/programs/gl/fill_extrusion.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill_extrusion"; - static constexpr const uint8_t hash[8] = { 0x9d, 0x76, 0x7f, 0xaa, 0x86, 0x57, 0x56, 0x96 }; + static constexpr const uint8_t hash[8] = {0x9d, 0x76, 0x7f, 0xaa, 0x86, 0x57, 0x56, 0x96}; static constexpr const auto vertexOffset = 21283; static constexpr const auto fragmentOffset = 23214; }; @@ -160,4 +160,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill_extrusion_pattern.cpp b/src/mbgl/programs/gl/fill_extrusion_pattern.cpp index 1d330220e4a..50509ce98f4 100644 --- a/src/mbgl/programs/gl/fill_extrusion_pattern.cpp +++ b/src/mbgl/programs/gl/fill_extrusion_pattern.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill_extrusion_pattern"; - static constexpr const uint8_t hash[8] = { 0x5a, 0x8f, 0x1a, 0xbf, 0x43, 0x62, 0xf0, 0x86 }; + static constexpr const uint8_t hash[8] = {0x5a, 0x8f, 0x1a, 0xbf, 0x43, 0x62, 0xf0, 0x86}; static constexpr const auto vertexOffset = 23330; static constexpr const auto fragmentOffset = 26301; }; @@ -259,4 +259,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill_outline.cpp b/src/mbgl/programs/gl/fill_outline.cpp index efef689f91c..4fd08794be4 100644 --- a/src/mbgl/programs/gl/fill_outline.cpp +++ b/src/mbgl/programs/gl/fill_outline.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill_outline"; - static constexpr const uint8_t hash[8] = { 0x51, 0x25, 0x43, 0x9d, 0x41, 0x73, 0xe1, 0xbb }; + static constexpr const uint8_t hash[8] = {0x51, 0x25, 0x43, 0x9d, 0x41, 0x73, 0xe1, 0xbb}; static constexpr const auto vertexOffset = 13722; static constexpr const auto fragmentOffset = 14547; }; @@ -128,4 +128,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill_outline_pattern.cpp b/src/mbgl/programs/gl/fill_outline_pattern.cpp index d526d5801d1..3b619bbd420 100644 --- a/src/mbgl/programs/gl/fill_outline_pattern.cpp +++ b/src/mbgl/programs/gl/fill_outline_pattern.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill_outline_pattern"; - static constexpr const uint8_t hash[8] = { 0x56, 0x9c, 0x2f, 0x58, 0x6b, 0x31, 0xff, 0x84 }; + static constexpr const uint8_t hash[8] = {0x56, 0x9c, 0x2f, 0x58, 0x6b, 0x31, 0xff, 0x84}; static constexpr const auto vertexOffset = 15137; static constexpr const auto fragmentOffset = 16997; }; @@ -202,4 +202,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/fill_pattern.cpp b/src/mbgl/programs/gl/fill_pattern.cpp index 0f62206f999..01f0a0e2365 100644 --- a/src/mbgl/programs/gl/fill_pattern.cpp +++ b/src/mbgl/programs/gl/fill_pattern.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "fill_pattern"; - static constexpr const uint8_t hash[8] = { 0x74, 0xa9, 0x97, 0x01, 0x96, 0xbd, 0x87, 0x36 }; + static constexpr const uint8_t hash[8] = {0x74, 0xa9, 0x97, 0x01, 0x96, 0xbd, 0x87, 0x36}; static constexpr const auto vertexOffset = 18304; static constexpr const auto fragmentOffset = 20083; }; @@ -190,4 +190,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/heatmap.cpp b/src/mbgl/programs/gl/heatmap.cpp index 41f804a37b5..bf2c663cb7d 100644 --- a/src/mbgl/programs/gl/heatmap.cpp +++ b/src/mbgl/programs/gl/heatmap.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "heatmap"; - static constexpr const uint8_t hash[8] = { 0xe5, 0xa4, 0x9c, 0x31, 0x01, 0xe5, 0x4a, 0xe0 }; + static constexpr const uint8_t hash[8] = {0xe5, 0xa4, 0x9c, 0x31, 0x01, 0xe5, 0x4a, 0xe0}; static constexpr const auto vertexOffset = 8026; static constexpr const auto fragmentOffset = 9074; }; @@ -159,4 +159,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/heatmap_texture.cpp b/src/mbgl/programs/gl/heatmap_texture.cpp index a6583bfbb77..caa7d4652fc 100644 --- a/src/mbgl/programs/gl/heatmap_texture.cpp +++ b/src/mbgl/programs/gl/heatmap_texture.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "heatmap_texture"; - static constexpr const uint8_t hash[8] = { 0x9f, 0xc7, 0x56, 0xb2, 0x9e, 0x8f, 0x15, 0xff }; + static constexpr const uint8_t hash[8] = {0x9f, 0xc7, 0x56, 0xb2, 0x9e, 0x8f, 0x15, 0xff}; static constexpr const auto vertexOffset = 9535; static constexpr const auto fragmentOffset = 9715; }; @@ -71,4 +71,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/hillshade.cpp b/src/mbgl/programs/gl/hillshade.cpp index 18dd5a4caad..b23d7536b6f 100644 --- a/src/mbgl/programs/gl/hillshade.cpp +++ b/src/mbgl/programs/gl/hillshade.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "hillshade"; - static constexpr const uint8_t hash[8] = { 0x8a, 0x11, 0x29, 0x18, 0x52, 0x7f, 0x3b, 0xbb }; + static constexpr const uint8_t hash[8] = {0x8a, 0x11, 0x29, 0x18, 0x52, 0x7f, 0x3b, 0xbb}; static constexpr const auto vertexOffset = 29125; static constexpr const auto fragmentOffset = 29296; }; @@ -109,4 +109,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/hillshade_prepare.cpp b/src/mbgl/programs/gl/hillshade_prepare.cpp index 81f0296763c..1b070677e77 100644 --- a/src/mbgl/programs/gl/hillshade_prepare.cpp +++ b/src/mbgl/programs/gl/hillshade_prepare.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "hillshade_prepare"; - static constexpr const uint8_t hash[8] = { 0xbd, 0xa0, 0x8a, 0x88, 0x91, 0xe3, 0x73, 0x66 }; + static constexpr const uint8_t hash[8] = {0xbd, 0xa0, 0x8a, 0x88, 0x91, 0xe3, 0x73, 0x66}; static constexpr const auto vertexOffset = 27698; static constexpr const auto fragmentOffset = 27991; }; @@ -135,4 +135,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/line.cpp b/src/mbgl/programs/gl/line.cpp index 6bc7eb1fb0a..fd4fa13fbb5 100644 --- a/src/mbgl/programs/gl/line.cpp +++ b/src/mbgl/programs/gl/line.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "line"; - static constexpr const uint8_t hash[8] = { 0x7f, 0x8e, 0xaa, 0x53, 0x75, 0x78, 0xac, 0x2c }; + static constexpr const uint8_t hash[8] = {0x7f, 0x8e, 0xaa, 0x53, 0x75, 0x78, 0xac, 0x2c}; static constexpr const auto vertexOffset = 30370; static constexpr const auto fragmentOffset = 33367; }; @@ -272,4 +272,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/line_gradient.cpp b/src/mbgl/programs/gl/line_gradient.cpp index 776258bcdd3..9b176e47c65 100644 --- a/src/mbgl/programs/gl/line_gradient.cpp +++ b/src/mbgl/programs/gl/line_gradient.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "line_gradient"; - static constexpr const uint8_t hash[8] = { 0x3f, 0xba, 0xc6, 0x33, 0xcd, 0x86, 0xa2, 0xe8 }; + static constexpr const uint8_t hash[8] = {0x3f, 0xba, 0xc6, 0x33, 0xcd, 0x86, 0xa2, 0xe8}; static constexpr const auto vertexOffset = 34236; static constexpr const auto fragmentOffset = 37028; }; @@ -254,4 +254,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/line_pattern.cpp b/src/mbgl/programs/gl/line_pattern.cpp index df34ac572bd..79f677f49e9 100644 --- a/src/mbgl/programs/gl/line_pattern.cpp +++ b/src/mbgl/programs/gl/line_pattern.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "line_pattern"; - static constexpr const uint8_t hash[8] = { 0x38, 0x9c, 0x3d, 0xde, 0xb4, 0xe0, 0xd1, 0x61 }; + static constexpr const uint8_t hash[8] = {0x38, 0x9c, 0x3d, 0xde, 0xb4, 0xe0, 0xd1, 0x61}; static constexpr const auto vertexOffset = 37858; static constexpr const auto fragmentOffset = 41252; }; @@ -342,4 +342,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/line_sdf.cpp b/src/mbgl/programs/gl/line_sdf.cpp index cbf659ef3c3..735eb3038e1 100644 --- a/src/mbgl/programs/gl/line_sdf.cpp +++ b/src/mbgl/programs/gl/line_sdf.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "line_sdf"; - static constexpr const uint8_t hash[8] = { 0x25, 0x94, 0x7f, 0xad, 0x84, 0xfe, 0x96, 0xad }; + static constexpr const uint8_t hash[8] = {0x25, 0x94, 0x7f, 0xad, 0x84, 0xfe, 0x96, 0xad}; static constexpr const auto vertexOffset = 43607; static constexpr const auto fragmentOffset = 47294; }; @@ -335,4 +335,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/preludes.hpp b/src/mbgl/programs/gl/preludes.hpp index e796f1655b5..ddd72b0f06b 100644 --- a/src/mbgl/programs/gl/preludes.hpp +++ b/src/mbgl/programs/gl/preludes.hpp @@ -8,7 +8,7 @@ namespace mbgl { namespace programs { namespace gl { -constexpr const uint8_t preludeHash[8] = { 0x24, 0x91, 0x82, 0x37, 0x02, 0xad, 0x98, 0x0a }; +constexpr const uint8_t preludeHash[8] = {0x24, 0x91, 0x82, 0x37, 0x02, 0xad, 0x98, 0x0a}; constexpr const auto vertexPreludeOffset = 0; constexpr const auto fragmentPreludeOffset = 1252; diff --git a/src/mbgl/programs/gl/raster.cpp b/src/mbgl/programs/gl/raster.cpp index 5743348c9fc..1353a266e26 100644 --- a/src/mbgl/programs/gl/raster.cpp +++ b/src/mbgl/programs/gl/raster.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,7 +15,7 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "raster"; - static constexpr const uint8_t hash[8] = { 0x40, 0x3d, 0x6c, 0xf4, 0xd0, 0x41, 0x51, 0x0e }; + static constexpr const uint8_t hash[8] = {0x40, 0x3d, 0x6c, 0xf4, 0xd0, 0x41, 0x51, 0x0e}; static constexpr const auto vertexOffset = 48839; static constexpr const auto fragmentOffset = 49188; }; @@ -119,4 +119,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/shader_source.cpp b/src/mbgl/programs/gl/shader_source.cpp index 5d0e377d96a..c106cff1f20 100644 --- a/src/mbgl/programs/gl/shader_source.cpp +++ b/src/mbgl/programs/gl/shader_source.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include @@ -10,457 +10,468 @@ namespace programs { namespace gl { constexpr const uint8_t compressedShaderSource[] = { - 0x78, 0xda, 0xed, 0x3d, 0xfd, 0x6f, 0xe3, 0x36, 0xb2, 0xf7, 0x73, 0xfe, 0x0a, 0x17, 0x05, 0x0e, - 0x92, 0x2c, 0x5b, 0xb6, 0x93, 0xec, 0x47, 0x75, 0x7a, 0xc5, 0xa2, 0xbb, 0xed, 0x0b, 0xd0, 0xee, - 0x2e, 0x36, 0xed, 0xbd, 0xc3, 0x15, 0x0b, 0x43, 0xb2, 0x15, 0x47, 0xef, 0x6c, 0xcb, 0xcf, 0x56, - 0x12, 0x3b, 0x87, 0xfd, 0xdf, 0x1f, 0x67, 0xf8, 0x4d, 0x51, 0xf2, 0x47, 0x62, 0x6f, 0x36, 0x67, - 0x14, 0xdd, 0x58, 0xe4, 0x70, 0x38, 0x24, 0x87, 0xc3, 0x99, 0x21, 0x39, 0xfc, 0x3e, 0xbb, 0x1a, - 0xa6, 0x57, 0x8d, 0x5f, 0x7e, 0xed, 0xbf, 0xbb, 0x3c, 0x99, 0xcd, 0xd3, 0x41, 0xb6, 0xc8, 0xf2, - 0x69, 0xe3, 0x3a, 0x1b, 0x5d, 0xcf, 0x1a, 0x57, 0xe3, 0x3c, 0x2e, 0xc2, 0x93, 0xef, 0xd3, 0xf1, - 0x22, 0x3d, 0xf9, 0x3e, 0xbb, 0x6a, 0x7c, 0x47, 0x60, 0xb3, 0x69, 0x3a, 0x74, 0xc6, 0xf9, 0xdd, - 0xcc, 0x3d, 0xf9, 0x9e, 0x7e, 0x36, 0xe0, 0x8b, 0x40, 0x4d, 0x87, 0xd9, 0x95, 0x0e, 0x36, 0x49, - 0x87, 0xd9, 0xcd, 0x44, 0x81, 0x64, 0x09, 0x56, 0x60, 0xac, 0x53, 0x82, 0xe2, 0xa7, 0x00, 0xa4, - 0x7f, 0x6e, 0xd3, 0x41, 0xaf, 0x71, 0x33, 0x9d, 0xc5, 0x83, 0x7f, 0xf5, 0x91, 0x38, 0x67, 0x90, - 0x4f, 0x17, 0x05, 0x25, 0xb4, 0x01, 0xc9, 0xe9, 0xf0, 0xef, 0xf1, 0xf8, 0x26, 0x75, 0x1b, 0xff, - 0xce, 0xa6, 0x3c, 0xe5, 0x62, 0x5a, 0x60, 0x62, 0x44, 0x92, 0x1c, 0x15, 0x28, 0x04, 0x98, 0xdb, - 0x4e, 0xa4, 0x83, 0x05, 0xbd, 0xf3, 0x17, 0xe1, 0x3c, 0x2d, 0x6e, 0xe6, 0xd3, 0x06, 0x54, 0xe8, - 0xdc, 0x76, 0x7c, 0x1d, 0xa2, 0x75, 0xdb, 0xf1, 0x08, 0x90, 0x1b, 0x7e, 0x51, 0x09, 0xca, 0xc9, - 0xbf, 0x59, 0xb1, 0xb2, 0x90, 0xf4, 0x81, 0xe6, 0x30, 0xa2, 0xc8, 0xff, 0x2c, 0x41, 0x21, 0x88, - 0x83, 0x04, 0x3d, 0xad, 0x6a, 0xda, 0x48, 0x59, 0xc2, 0x0d, 0xba, 0xbd, 0x97, 0xed, 0x8e, 0x3f, - 0xc9, 0x87, 0x7a, 0x41, 0xbf, 0xd7, 0xee, 0xb8, 0x94, 0xa0, 0xb3, 0xc6, 0x30, 0x1d, 0xe4, 0xc3, - 0xb4, 0x3f, 0xc8, 0xc7, 0xf9, 0x9c, 0x91, 0x83, 0x84, 0xa6, 0x53, 0x48, 0x1f, 0xfe, 0x04, 0xe9, - 0x84, 0x18, 0x59, 0xd1, 0x99, 0xa3, 0x75, 0xaa, 0x0a, 0xf7, 0x67, 0xe7, 0x33, 0x21, 0xea, 0xfc, - 0x9c, 0x54, 0x5a, 0x0d, 0xd3, 0xe5, 0x30, 0x27, 0x84, 0x04, 0xda, 0x72, 0x06, 0x3c, 0xc9, 0x96, - 0x7d, 0x6c, 0x89, 0x42, 0x86, 0x32, 0x04, 0xbe, 0xda, 0x59, 0x85, 0xa4, 0x89, 0x14, 0x53, 0x47, - 0x8a, 0x10, 0xe1, 0xab, 0x9f, 0xdd, 0xcf, 0x7e, 0xc1, 0x1b, 0xab, 0x54, 0x64, 0x34, 0xf8, 0x8c, - 0xd5, 0x84, 0x34, 0x2e, 0x4a, 0x55, 0x21, 0xc4, 0x24, 0x9b, 0x62, 0x76, 0xa4, 0xf5, 0x19, 0x52, - 0xac, 0x16, 0x96, 0x04, 0xb0, 0x6f, 0xd2, 0x62, 0x37, 0xa4, 0x18, 0xe2, 0xe5, 0x46, 0x18, 0x7a, - 0x06, 0x86, 0x53, 0xc0, 0xa0, 0x34, 0x97, 0x53, 0xe2, 0x73, 0x84, 0xbc, 0x89, 0xbd, 0xc6, 0x28, - 0x2d, 0xfa, 0xb3, 0xb8, 0x28, 0xd2, 0xf9, 0xb4, 0x3f, 0xcb, 0x17, 0x5a, 0x5f, 0x66, 0xcb, 0x74, - 0x4c, 0xea, 0xcc, 0xe7, 0xc3, 0xfe, 0xcd, 0x6c, 0x96, 0xce, 0xfd, 0x8a, 0x4c, 0x32, 0x47, 0x8d, - 0x4c, 0x86, 0x70, 0x91, 0xdd, 0x1b, 0xc3, 0x90, 0x8d, 0xd3, 0xfe, 0xcd, 0x34, 0x2b, 0x16, 0xfd, - 0x22, 0xef, 0x23, 0x8e, 0x85, 0x56, 0x30, 0x5f, 0xd0, 0xde, 0xeb, 0x35, 0xf2, 0xab, 0xab, 0x45, - 0x5a, 0x44, 0xc0, 0x8d, 0xfc, 0xff, 0x32, 0x41, 0x6a, 0x45, 0x2e, 0xcc, 0x9b, 0x76, 0xc7, 0x96, - 0xd6, 0x2c, 0x53, 0xab, 0x41, 0xf1, 0xbe, 0x72, 0x6c, 0xf4, 0x79, 0x84, 0xa8, 0x26, 0xa5, 0xc6, - 0x0d, 0xd4, 0x62, 0xe1, 0x97, 0x93, 0xbf, 0x7c, 0x6f, 0x97, 0x71, 0x4c, 0x16, 0x3d, 0x3d, 0x29, - 0xf7, 0x17, 0x42, 0xff, 0x3c, 0x4b, 0x6e, 0x8a, 0x94, 0x76, 0x78, 0x0c, 0x83, 0x1e, 0x92, 0x16, - 0x5f, 0xe5, 0xf3, 0x09, 0xe1, 0xb7, 0x82, 0x30, 0x7d, 0x9f, 0xfc, 0x99, 0x67, 0xcb, 0xf0, 0x36, - 0xcf, 0x86, 0x24, 0x29, 0x9b, 0x3a, 0x64, 0x4c, 0x46, 0xe3, 0xfe, 0xc7, 0x7c, 0x91, 0x15, 0xa4, - 0x75, 0x11, 0x87, 0xf0, 0x70, 0x7a, 0x23, 0x0a, 0xbf, 0xe3, 0x77, 0x5d, 0xe8, 0x10, 0x8e, 0x8a, - 0xce, 0x1f, 0xca, 0xb1, 0x02, 0x3f, 0x9b, 0xbe, 0x5c, 0x9c, 0x95, 0x6a, 0xf8, 0x79, 0x1e, 0x8f, - 0x28, 0xc3, 0xb3, 0x92, 0x9e, 0x84, 0x3d, 0x61, 0x5d, 0xfd, 0xe1, 0xef, 0xef, 0x3e, 0xbd, 0xfd, - 0xf4, 0xe6, 0x7f, 0xfa, 0x17, 0xef, 0x2f, 0x3f, 0xbe, 0xfb, 0xe9, 0xf7, 0x0f, 0x9f, 0x4e, 0xb4, - 0x92, 0x48, 0x53, 0x97, 0x48, 0xac, 0x90, 0xb7, 0x59, 0xa1, 0x4a, 0x6f, 0xa0, 0x42, 0x2b, 0x91, - 0xb4, 0x7d, 0x75, 0x6c, 0xfb, 0x71, 0x6d, 0x6e, 0x52, 0xca, 0x35, 0x59, 0xb3, 0x0e, 0x00, 0x39, - 0xb0, 0xd4, 0x29, 0x8b, 0x41, 0x3c, 0x56, 0xeb, 0xd5, 0xd3, 0x93, 0x52, 0xba, 0x8d, 0x57, 0x43, - 0xeb, 0xf0, 0xde, 0xc6, 0xf3, 0x55, 0x36, 0x1d, 0xd1, 0xa4, 0x5b, 0x48, 0x22, 0xd5, 0x58, 0x12, - 0x93, 0x1d, 0x86, 0x9c, 0xa1, 0x8b, 0x4c, 0x39, 0x62, 0xe9, 0x12, 0xdf, 0xd2, 0x0b, 0xbe, 0x68, - 0xb7, 0x67, 0x0e, 0x80, 0x6f, 0x6f, 0xa2, 0x8f, 0x95, 0xf3, 0x8a, 0x93, 0x07, 0x57, 0x9c, 0x98, - 0x15, 0x27, 0x6b, 0x2a, 0xd6, 0x99, 0x5c, 0x65, 0x8d, 0x62, 0x5c, 0xcd, 0x36, 0xc9, 0xbc, 0x3a, - 0x8f, 0x94, 0x4b, 0x6a, 0xca, 0x95, 0xf2, 0x8a, 0x74, 0x89, 0xf2, 0xc7, 0xe4, 0x88, 0x89, 0xc2, - 0xd3, 0xe6, 0x54, 0xe3, 0xe9, 0x8b, 0x78, 0x32, 0x1b, 0xa7, 0xf3, 0xde, 0x5b, 0x92, 0x97, 0x4d, - 0xe2, 0x51, 0xba, 0x2b, 0x77, 0x60, 0x0e, 0x62, 0xc0, 0x5e, 0x45, 0x41, 0xcd, 0x4a, 0xfb, 0x38, - 0xfd, 0xb8, 0x40, 0x8f, 0x60, 0x05, 0xd2, 0x3b, 0x29, 0x10, 0x6d, 0xf0, 0xf5, 0x1e, 0x52, 0x32, - 0x24, 0x6a, 0xb6, 0x18, 0xa2, 0x40, 0xe8, 0x46, 0x24, 0x9f, 0xc8, 0xea, 0xb4, 0xf7, 0xd6, 0x61, - 0x0d, 0xf0, 0x29, 0x3b, 0xe8, 0xe4, 0x10, 0xc6, 0x90, 0x04, 0x25, 0x3a, 0x41, 0xbd, 0x32, 0x45, - 0x49, 0x15, 0x45, 0x89, 0x95, 0xa2, 0x7e, 0xa2, 0xd2, 0xd4, 0xb3, 0xd3, 0xd4, 0x73, 0x43, 0x4d, - 0x30, 0x41, 0xa5, 0xb4, 0x0d, 0x3e, 0x2d, 0xe6, 0xe3, 0x88, 0xb9, 0x87, 0x91, 0x71, 0x49, 0x9e, - 0x8f, 0x85, 0x30, 0xb9, 0xcb, 0x8a, 0x6b, 0x02, 0x30, 0x33, 0x73, 0x67, 0x59, 0x31, 0xb8, 0x2e, - 0xe7, 0x32, 0xb6, 0x23, 0x8d, 0x9c, 0xdf, 0x10, 0x2d, 0x04, 0x71, 0x88, 0x4c, 0x58, 0xba, 0x04, - 0xb7, 0x0d, 0xd3, 0xdb, 0x6c, 0x90, 0xb2, 0xd9, 0x36, 0x8f, 0x89, 0xe8, 0x10, 0x70, 0x8a, 0xda, - 0x0f, 0xeb, 0x42, 0x3c, 0x49, 0xe7, 0x31, 0x4c, 0xae, 0x41, 0x3a, 0x25, 0x9d, 0xdd, 0x1f, 0x66, - 0x8b, 0x22, 0x9e, 0x0e, 0xd2, 0xb5, 0x12, 0xec, 0x94, 0xb0, 0xe3, 0x30, 0x2e, 0x62, 0xec, 0xac, - 0x29, 0xf4, 0xd6, 0x7f, 0xbf, 0xb9, 0xec, 0xff, 0xf1, 0xfe, 0xe2, 0xe7, 0x0f, 0x9f, 0x7e, 0xeb, - 0xb3, 0x75, 0xe3, 0xc4, 0x4a, 0x1d, 0x66, 0xf5, 0x0b, 0xa5, 0x0a, 0x4a, 0x14, 0x0e, 0x65, 0xcc, - 0xd6, 0x2a, 0x5e, 0x95, 0x92, 0x45, 0x33, 0xd8, 0x2a, 0xae, 0xb7, 0x47, 0x5b, 0xe6, 0x94, 0x45, - 0xd9, 0x42, 0xd8, 0x3c, 0x26, 0x2b, 0xf7, 0xc2, 0x4e, 0x19, 0xcd, 0xd3, 0x48, 0xe3, 0x2a, 0x04, - 0xeb, 0x05, 0x0a, 0x21, 0xa8, 0xd3, 0x14, 0x8c, 0x06, 0xcb, 0x34, 0x28, 0xd4, 0x61, 0x78, 0x25, - 0x6b, 0xa8, 0x4c, 0xc6, 0x37, 0x15, 0xbd, 0x07, 0x39, 0x1a, 0x85, 0x98, 0xcb, 0xc8, 0x83, 0x4c, - 0x41, 0x9c, 0x52, 0x0c, 0xd3, 0x0d, 0xba, 0x4a, 0x58, 0xd7, 0x90, 0xc4, 0x66, 0x87, 0xbd, 0x3c, - 0xcb, 0xac, 0x24, 0x4c, 0xa8, 0x1a, 0x65, 0xda, 0xe4, 0xac, 0xab, 0x26, 0x4f, 0x81, 0xa9, 0xa1, - 0x70, 0x51, 0xcc, 0xf3, 0x7f, 0xa5, 0x75, 0xac, 0xa7, 0x42, 0x54, 0x73, 0xa0, 0x0a, 0x65, 0x63, - 0x44, 0x2d, 0xbf, 0x8e, 0x1f, 0x4d, 0xc0, 0xf5, 0xb4, 0xdf, 0x65, 0xc3, 0xe2, 0xba, 0x96, 0x76, - 0x84, 0xa8, 0x63, 0x51, 0x15, 0xae, 0x82, 0x51, 0x35, 0x90, 0x35, 0xec, 0x6a, 0xc2, 0xae, 0x6f, - 0x43, 0x2d, 0xa3, 0xe8, 0x30, 0x95, 0xfc, 0xa2, 0x83, 0xd9, 0xd8, 0xc6, 0x80, 0xa8, 0xe3, 0x9e, - 0x32, 0x28, 0x75, 0x35, 0x88, 0x75, 0x14, 0x7e, 0x91, 0xb5, 0xb4, 0x56, 0x94, 0x0d, 0xa8, 0x42, - 0x6c, 0x9a, 0xa2, 0x4c, 0x5e, 0xf9, 0x42, 0xac, 0xb9, 0x9c, 0x14, 0x53, 0x72, 0x45, 0x5b, 0xc9, - 0x27, 0xfa, 0x27, 0x32, 0x6d, 0x6c, 0x2e, 0x81, 0x7c, 0x29, 0xac, 0x44, 0x85, 0x36, 0x61, 0x14, - 0x6d, 0x23, 0x6f, 0xe0, 0x1f, 0x4b, 0x8d, 0x90, 0xec, 0x73, 0xc1, 0x23, 0x6a, 0x33, 0xa4, 0x4b, - 0xb4, 0x95, 0x0c, 0x61, 0x7f, 0x2d, 0x95, 0xb1, 0x1c, 0x5f, 0x11, 0x29, 0xb6, 0x2a, 0x05, 0x82, - 0x5d, 0x44, 0x83, 0xfa, 0x61, 0x1b, 0x51, 0x35, 0xdf, 0x37, 0x85, 0x86, 0x6d, 0x7c, 0x75, 0x84, - 0x3b, 0x4f, 0x7b, 0xf5, 0xc3, 0xd2, 0x35, 0x6a, 0xb6, 0x6f, 0xca, 0x83, 0x0a, 0x2e, 0xd0, 0x51, - 0x3e, 0x60, 0x32, 0xeb, 0x9f, 0xd5, 0xd4, 0xc9, 0xf1, 0x33, 0x67, 0xba, 0x6d, 0x18, 0x4d, 0xac, - 0x95, 0x53, 0x15, 0x7d, 0x5b, 0x54, 0xf1, 0x89, 0xb0, 0x42, 0x50, 0x2b, 0xa9, 0xfd, 0x03, 0x6e, - 0x31, 0x8f, 0xfc, 0xd3, 0x92, 0xda, 0xe5, 0x20, 0x9b, 0x0f, 0x88, 0x7e, 0x45, 0x75, 0x9a, 0x88, - 0x54, 0x85, 0xc3, 0x4a, 0x80, 0xbd, 0x4e, 0xfb, 0xdc, 0x0d, 0x89, 0xb1, 0xee, 0x98, 0x5a, 0x16, - 0x57, 0xa5, 0x07, 0xf9, 0x7c, 0x4a, 0xf4, 0xa0, 0x19, 0xb7, 0xb8, 0x34, 0x54, 0xac, 0xa4, 0xae, - 0xbd, 0x91, 0x92, 0x46, 0xa1, 0x66, 0xc4, 0x48, 0xf5, 0x1c, 0x3a, 0xf9, 0x9a, 0x6a, 0xbf, 0x83, - 0xa6, 0xa9, 0xeb, 0x70, 0x5f, 0x1a, 0xd0, 0x2f, 0xcc, 0x5d, 0x35, 0x9b, 0xe7, 0xff, 0x9b, 0x0e, - 0x8a, 0x74, 0xc8, 0xc9, 0xd7, 0x6d, 0x3e, 0x8d, 0x1e, 0x6a, 0xfb, 0x3d, 0xac, 0x76, 0xcf, 0x31, - 0x6b, 0x6c, 0xdf, 0x05, 0x35, 0x9a, 0x21, 0xb1, 0xbc, 0xaa, 0x2d, 0x52, 0x83, 0x14, 0xe6, 0x8e, - 0x60, 0xcd, 0xab, 0x29, 0x56, 0x6e, 0x54, 0x45, 0x4f, 0x2b, 0x38, 0xda, 0xcb, 0xd5, 0xb6, 0x4d, - 0xad, 0x53, 0x78, 0x2d, 0x54, 0xee, 0x50, 0x83, 0x5a, 0xfa, 0x2e, 0xfc, 0xf2, 0x45, 0xe1, 0xf5, - 0x78, 0x5a, 0x64, 0xf1, 0x38, 0x8b, 0x17, 0x28, 0x2e, 0x09, 0xb3, 0x06, 0x36, 0x45, 0x3d, 0xb0, - 0xd6, 0x13, 0x52, 0x65, 0x1b, 0x58, 0xff, 0xd4, 0x61, 0x35, 0xb6, 0x97, 0x3e, 0xff, 0xb5, 0xf2, - 0x35, 0xe4, 0x68, 0x1c, 0x6f, 0xad, 0xab, 0xef, 0x5b, 0xe3, 0x3e, 0x8c, 0xce, 0xbc, 0x67, 0xe5, - 0xf7, 0x70, 0xfa, 0xeb, 0xd7, 0xd0, 0x3b, 0xbf, 0xa6, 0xb6, 0xb8, 0x67, 0x15, 0x8f, 0xa9, 0x77, - 0x55, 0xcc, 0xbf, 0x89, 0xb2, 0x56, 0xc9, 0xd9, 0x1b, 0x2b, 0x5e, 0x15, 0x3c, 0xbb, 0x5e, 0x95, - 0xaa, 0x66, 0xc8, 0x4d, 0x75, 0xa2, 0x35, 0xdc, 0xb6, 0xbd, 0x32, 0xb3, 0x86, 0x95, 0x76, 0x52, - 0x43, 0xd6, 0x32, 0xc9, 0x83, 0x55, 0x07, 0x94, 0x83, 0x44, 0xae, 0x87, 0x14, 0x09, 0x17, 0xde, - 0xe3, 0x74, 0x3a, 0x22, 0x94, 0xd1, 0x3f, 0x5c, 0xc0, 0xba, 0x61, 0xa5, 0xf4, 0x66, 0x78, 0xee, - 0x43, 0x23, 0x93, 0xac, 0xa1, 0x98, 0xdf, 0x9a, 0xc4, 0x4b, 0x07, 0xf5, 0x66, 0x43, 0x30, 0x6b, - 0x23, 0xd5, 0x2f, 0xa2, 0xc5, 0x24, 0xcf, 0x8b, 0xeb, 0x45, 0x91, 0xce, 0x9c, 0x4e, 0xbb, 0xe3, - 0x9b, 0x88, 0x7c, 0x9d, 0x40, 0xaa, 0xe2, 0x50, 0x1c, 0x4c, 0x1d, 0x8d, 0xd4, 0xbe, 0x6c, 0xfc, - 0xad, 0x41, 0xb0, 0x74, 0x1b, 0x3f, 0xc2, 0x9f, 0xc6, 0x0f, 0x0d, 0x05, 0x7b, 0x09, 0x33, 0x54, - 0x67, 0x60, 0xa7, 0x0c, 0x6b, 0x5f, 0x81, 0x0c, 0x2f, 0x9a, 0x68, 0x81, 0x27, 0xfc, 0x69, 0x1e, - 0x57, 0xfd, 0x54, 0x8e, 0xf1, 0x0c, 0xb5, 0x50, 0x51, 0xa2, 0x1f, 0xe0, 0x63, 0xdb, 0xf7, 0xee, - 0x49, 0xf5, 0x86, 0x88, 0x24, 0x67, 0xad, 0xab, 0x8f, 0x8b, 0x26, 0xbb, 0xbf, 0xae, 0xca, 0x31, - 0xcc, 0xd3, 0x33, 0xa2, 0x9d, 0x4c, 0x17, 0x90, 0xb3, 0xc9, 0x5e, 0x02, 0xab, 0xa3, 0x6a, 0x81, - 0xbf, 0x4b, 0xc9, 0xf4, 0x2e, 0xec, 0x92, 0x93, 0xe6, 0xd9, 0x9d, 0x21, 0x50, 0x1b, 0xcd, 0x37, - 0xdc, 0x20, 0xb4, 0x30, 0xcb, 0xb2, 0xae, 0x44, 0x3a, 0xfa, 0x43, 0xf8, 0xe4, 0xb6, 0x53, 0x21, - 0xe8, 0x6e, 0xa7, 0x4a, 0xeb, 0x3f, 0xdf, 0x7d, 0xfa, 0x80, 0x6a, 0x19, 0x6e, 0x73, 0x07, 0xdd, - 0x17, 0xed, 0x4e, 0x28, 0x36, 0xf1, 0x7e, 0x79, 0xf3, 0xc7, 0xe5, 0x65, 0xff, 0xa7, 0x0f, 0xef, - 0x7e, 0x26, 0x53, 0xeb, 0xf4, 0xf5, 0xab, 0xd7, 0x67, 0xbd, 0xde, 0xab, 0xce, 0x59, 0xa7, 0x7b, - 0x76, 0xda, 0x7b, 0xb9, 0xb1, 0x27, 0x81, 0x8d, 0x03, 0xfd, 0x63, 0xb1, 0xa1, 0x68, 0x86, 0x2f, - 0x07, 0xc5, 0x30, 0x36, 0xd5, 0x6e, 0x8f, 0xb6, 0xeb, 0x5b, 0xfb, 0x1a, 0xf5, 0xe8, 0xde, 0x05, - 0x76, 0x5a, 0x02, 0x79, 0x7d, 0xd8, 0xdf, 0xc8, 0x62, 0xa3, 0x08, 0x2f, 0xa3, 0xc5, 0xff, 0xcd, - 0x0b, 0xa7, 0x45, 0x92, 0xbd, 0x71, 0x3e, 0x72, 0x60, 0x34, 0x02, 0xda, 0xc0, 0x40, 0x99, 0x0d, - 0x81, 0x1c, 0x08, 0xd7, 0x0d, 0x4e, 0xc9, 0x10, 0x09, 0xe6, 0x8f, 0x2e, 0x3d, 0xb3, 0xe2, 0xd0, - 0x10, 0xfe, 0x5c, 0x97, 0xa7, 0x44, 0x97, 0xec, 0x30, 0x6a, 0x7f, 0xe5, 0x0b, 0x3a, 0xcb, 0x4d, - 0xb3, 0xb1, 0xc9, 0x80, 0xa9, 0x94, 0xb0, 0x8a, 0x12, 0x98, 0x99, 0x8a, 0x5c, 0xd0, 0x67, 0x82, - 0x9c, 0xd1, 0x3b, 0x4d, 0xde, 0xc7, 0x9a, 0x80, 0x5b, 0x32, 0x74, 0xa5, 0xde, 0xc4, 0xc8, 0xda, - 0x84, 0x31, 0x69, 0xee, 0x30, 0x6a, 0x91, 0x6e, 0xf4, 0xc8, 0x98, 0xe1, 0xff, 0xc3, 0xbc, 0x70, - 0x44, 0xdb, 0x7d, 0xf1, 0x8b, 0xf3, 0xc3, 0x6d, 0x3c, 0x8e, 0x28, 0x1a, 0x4f, 0xe9, 0x3a, 0x4f, - 0x92, 0xed, 0xa5, 0xcb, 0x99, 0x33, 0x34, 0x96, 0x25, 0x1c, 0x38, 0x52, 0x14, 0x76, 0x9a, 0xf8, - 0xff, 0xee, 0x01, 0xf6, 0xac, 0xef, 0xf2, 0xf9, 0x78, 0xb8, 0xe9, 0xae, 0xef, 0x56, 0x6b, 0x92, - 0xc7, 0x90, 0x2b, 0xdb, 0xbc, 0xed, 0x65, 0x14, 0xd3, 0xbf, 0xec, 0x7b, 0x05, 0x62, 0xab, 0x45, - 0xd3, 0x56, 0x2a, 0x03, 0x96, 0x77, 0x19, 0x6d, 0x39, 0x74, 0x4d, 0x9e, 0x93, 0x94, 0xea, 0x13, - 0x02, 0x6b, 0x1a, 0xc1, 0x8e, 0x95, 0x58, 0x76, 0xe0, 0x10, 0xd8, 0x6d, 0xcf, 0x95, 0x8d, 0x3a, - 0x0d, 0x4a, 0x56, 0xee, 0xa3, 0x94, 0x28, 0x7c, 0x98, 0x6b, 0xc6, 0xb0, 0x3e, 0xe8, 0x10, 0x42, - 0x67, 0x13, 0xe5, 0xa1, 0x94, 0x18, 0x4f, 0x07, 0xd7, 0xf9, 0xdc, 0x9e, 0xc7, 0x27, 0x6c, 0x19, - 0xd3, 0x38, 0x1e, 0xa4, 0x16, 0x3e, 0x58, 0x5c, 0x67, 0x57, 0x45, 0xb8, 0x11, 0x27, 0xd5, 0x6b, - 0x0b, 0xd5, 0xee, 0x0b, 0x3e, 0x42, 0x6c, 0xf6, 0x70, 0x52, 0xcc, 0xe4, 0x69, 0x5e, 0xfc, 0xb1, - 0x80, 0x74, 0x63, 0x0f, 0x59, 0xf1, 0x3b, 0x7d, 0xcc, 0xc9, 0x74, 0x2b, 0xb1, 0xa2, 0xec, 0x0f, - 0xca, 0x89, 0xea, 0xbc, 0x97, 0x54, 0x31, 0x28, 0x4e, 0x55, 0xa4, 0x23, 0x6d, 0xdf, 0xe9, 0xc5, - 0xf2, 0xf1, 0x18, 0xcf, 0xe9, 0xf4, 0x67, 0xe9, 0x7c, 0x31, 0x23, 0x70, 0xd9, 0x6d, 0x4a, 0xbd, - 0x20, 0xd1, 0x60, 0x4c, 0x38, 0x82, 0x0c, 0xdd, 0x79, 0x13, 0x64, 0x86, 0x53, 0xd3, 0xf2, 0xa0, - 0xb2, 0x76, 0x17, 0x75, 0xdc, 0x33, 0x18, 0xfe, 0xb5, 0x8a, 0x1f, 0x17, 0x15, 0xa6, 0xf7, 0xc7, - 0x11, 0xa3, 0xdd, 0x64, 0xc3, 0xb8, 0xc6, 0xe7, 0xe3, 0xd5, 0xb4, 0x2a, 0xe4, 0xc3, 0x12, 0x71, - 0x56, 0xc1, 0x29, 0xcc, 0xc6, 0x44, 0x26, 0xae, 0x54, 0xff, 0xcd, 0x2e, 0x03, 0xca, 0xac, 0x92, - 0xf1, 0xec, 0x3a, 0x8e, 0x48, 0xff, 0x85, 0x56, 0x29, 0x87, 0x8d, 0xe6, 0x0d, 0xf7, 0x10, 0x18, - 0xbd, 0x6e, 0xbc, 0xaa, 0xc6, 0x7f, 0x35, 0x60, 0x2a, 0xda, 0x14, 0x60, 0xa5, 0x24, 0x4e, 0x57, - 0x56, 0xfa, 0x0b, 0x2d, 0xce, 0x48, 0xb2, 0x96, 0xf7, 0xa2, 0x76, 0x37, 0xfc, 0x72, 0x90, 0x59, - 0xf8, 0xa4, 0xa6, 0x9b, 0x91, 0x6e, 0x6c, 0x23, 0x1b, 0x8a, 0x80, 0x3d, 0x99, 0x2b, 0x29, 0xc7, - 0x99, 0x6b, 0x9d, 0xb9, 0x2a, 0x7d, 0xb3, 0x78, 0x38, 0x24, 0x1d, 0xd8, 0xbf, 0x8a, 0x07, 0x45, - 0x0e, 0xbe, 0xd6, 0x5e, 0x69, 0x62, 0x0b, 0xfe, 0x29, 0x4d, 0x67, 0xbd, 0xf0, 0x3e, 0x66, 0x37, - 0x1f, 0xff, 0x28, 0x4e, 0x16, 0x52, 0xc0, 0xb4, 0x57, 0xae, 0xa2, 0xcc, 0x4a, 0xfa, 0x74, 0x7a, - 0x42, 0x83, 0x1f, 0xa2, 0x2d, 0x7c, 0xdc, 0xb5, 0xd4, 0x2b, 0x6a, 0x83, 0x58, 0xfd, 0x6f, 0x09, - 0x14, 0x7a, 0xe0, 0x79, 0xdd, 0x4f, 0x83, 0xeb, 0x4d, 0xf1, 0xa6, 0xa8, 0x16, 0x5b, 0x0b, 0xb7, - 0xc1, 0xae, 0x52, 0x6d, 0xc0, 0xc4, 0x59, 0x8f, 0x1f, 0x87, 0xd6, 0x08, 0x36, 0x3c, 0x4a, 0x46, - 0x73, 0xdc, 0x5a, 0xf7, 0x93, 0xd4, 0x85, 0x3d, 0x1b, 0xce, 0xd0, 0xe2, 0x52, 0xeb, 0x12, 0x8b, - 0xd5, 0x0a, 0x1c, 0x58, 0x46, 0x51, 0xb3, 0xe0, 0xf8, 0xa8, 0xd4, 0x55, 0xc5, 0xf9, 0x07, 0x58, - 0x2a, 0x1d, 0x8e, 0x52, 0xe4, 0x5b, 0xab, 0xef, 0xa8, 0xd6, 0xc1, 0xd5, 0xd2, 0x36, 0x30, 0xa1, - 0xa7, 0x5b, 0x26, 0xe6, 0x4a, 0x2f, 0x13, 0x75, 0x3f, 0x7e, 0x39, 0xdc, 0xc1, 0x59, 0xcb, 0x2e, - 0xc7, 0xda, 0x63, 0xb2, 0x5b, 0xd2, 0xf7, 0xad, 0x9d, 0x9c, 0x7a, 0x4a, 0x07, 0x80, 0x4a, 0x06, - 0xea, 0x57, 0x3f, 0xb7, 0x71, 0x80, 0xa3, 0x0d, 0x9b, 0xf2, 0xf0, 0x57, 0xd9, 0xe5, 0x7b, 0xe4, - 0x1d, 0xb2, 0x3d, 0xef, 0xdc, 0x6c, 0xb5, 0x7d, 0x62, 0xb1, 0x45, 0x1f, 0xe5, 0xa8, 0xe8, 0x16, - 0xb2, 0xc2, 0xea, 0x6f, 0xb0, 0x58, 0xe5, 0x55, 0x83, 0x73, 0x53, 0x8c, 0xb3, 0x69, 0xed, 0xd1, - 0x38, 0x0d, 0xa4, 0x5a, 0xc6, 0x68, 0x60, 0x36, 0x59, 0xa3, 0x03, 0xd4, 0x71, 0x55, 0x09, 0xf2, - 0x19, 0xc9, 0x1e, 0xbd, 0xc3, 0xb5, 0x2f, 0x9b, 0x2c, 0xd2, 0x00, 0xfc, 0xd2, 0x60, 0xd8, 0x64, - 0x93, 0x81, 0x73, 0xa7, 0xde, 0xfc, 0xda, 0xb2, 0x0a, 0x79, 0x36, 0x72, 0x74, 0xdd, 0x3c, 0xd0, - 0x34, 0xee, 0x26, 0x4c, 0x9a, 0x00, 0xbc, 0xc2, 0x9c, 0xeb, 0xf5, 0xb3, 0x0d, 0x5b, 0x31, 0xfe, - 0xc1, 0xd9, 0xf5, 0x70, 0xc2, 0x50, 0x6f, 0xe8, 0x2e, 0x7c, 0xf2, 0x40, 0x21, 0x29, 0x55, 0x45, - 0xa9, 0xc7, 0x92, 0x81, 0x69, 0x09, 0x31, 0x98, 0xcf, 0x89, 0x41, 0xb4, 0xe2, 0x1a, 0x22, 0xd5, - 0xde, 0xc1, 0x6f, 0x69, 0x6c, 0x81, 0x82, 0xf6, 0x0d, 0x58, 0x4c, 0x55, 0x50, 0x25, 0xdb, 0x73, - 0xb0, 0x38, 0x97, 0xc2, 0x87, 0xf3, 0xf0, 0x3e, 0xde, 0x75, 0x23, 0x7e, 0x52, 0x03, 0xad, 0x9b, - 0x87, 0x5e, 0x17, 0xda, 0x7c, 0x3a, 0x3c, 0xf9, 0x33, 0xdc, 0xfc, 0xd2, 0xc7, 0xd5, 0x3c, 0x9f, - 0xd8, 0xf1, 0xa8, 0x10, 0x56, 0x5a, 0x61, 0x99, 0x52, 0x81, 0x74, 0x82, 0xd9, 0xad, 0x51, 0x25, - 0xdb, 0x46, 0x34, 0x1b, 0x1e, 0x13, 0x6e, 0x03, 0xc2, 0x8b, 0xbc, 0x9e, 0x6c, 0x62, 0xe9, 0xac, - 0x23, 0xba, 0xc8, 0x6b, 0x48, 0x26, 0x99, 0x1b, 0x10, 0x4c, 0xa1, 0x36, 0x5f, 0xae, 0xbe, 0xd6, - 0xb9, 0x5c, 0x6d, 0xb8, 0xd5, 0x8f, 0x28, 0xee, 0xdb, 0x06, 0x49, 0xd9, 0xfa, 0xd5, 0x47, 0x31, - 0xda, 0x75, 0xb0, 0xe4, 0xcf, 0x28, 0xee, 0x97, 0x3b, 0xd9, 0x5a, 0x21, 0x81, 0xb5, 0x77, 0xb5, - 0x7a, 0xeb, 0x16, 0x6e, 0x58, 0x45, 0x2a, 0x4d, 0x70, 0xec, 0x44, 0x83, 0x80, 0xab, 0x56, 0x3a, - 0xc4, 0xfd, 0x5d, 0x68, 0xe2, 0x48, 0x22, 0x59, 0x91, 0x0d, 0x83, 0x96, 0x4f, 0xca, 0x33, 0x0f, - 0x18, 0x08, 0x9e, 0x4f, 0xe8, 0x90, 0x63, 0x42, 0xa6, 0xbd, 0x0c, 0xe5, 0xe5, 0x5f, 0x3d, 0x87, - 0x9f, 0x86, 0x01, 0x12, 0x2e, 0x99, 0x53, 0x89, 0xe6, 0xf0, 0x03, 0x2e, 0x45, 0xae, 0xa7, 0xdf, - 0x85, 0x9b, 0xad, 0xef, 0x40, 0x2b, 0x11, 0xe6, 0xb3, 0x71, 0xbc, 0x62, 0xd7, 0x09, 0xe9, 0x5e, - 0xb0, 0xa3, 0x76, 0x41, 0x7b, 0xd9, 0x52, 0xfb, 0xac, 0xbd, 0x74, 0x03, 0x49, 0xbe, 0xaf, 0x83, - 0xae, 0x74, 0xd0, 0x95, 0x0a, 0x6a, 0xab, 0x2f, 0x29, 0xd7, 0x97, 0xe8, 0xf5, 0x25, 0x35, 0xf5, - 0x25, 0x7a, 0x7d, 0x49, 0xa9, 0xbe, 0x07, 0xde, 0xba, 0x14, 0x1d, 0xee, 0xe9, 0x9d, 0xe4, 0x8b, - 0x31, 0x7a, 0xac, 0x6b, 0x96, 0x6c, 0x00, 0xf5, 0x7a, 0x92, 0x8a, 0x7a, 0x76, 0xd0, 0xc8, 0xd6, - 0x5c, 0x8d, 0xac, 0xde, 0x88, 0xe4, 0xe2, 0xf1, 0x2a, 0x1e, 0xa6, 0x7b, 0x5d, 0xf2, 0x0e, 0xb7, - 0x6a, 0x1d, 0x7a, 0xb9, 0xd9, 0xe7, 0x5a, 0xb1, 0x8f, 0x83, 0x87, 0x5a, 0x67, 0xed, 0x22, 0xd0, - 0x6b, 0x7b, 0xe3, 0x9b, 0x13, 0xd8, 0xdb, 0xdd, 0xe0, 0xad, 0xb8, 0xbf, 0xfb, 0x95, 0x6e, 0xef, - 0x56, 0xdc, 0xdd, 0x7d, 0xb4, 0x9b, 0xbb, 0x7b, 0x36, 0x2a, 0x6c, 0x77, 0x81, 0x41, 0x10, 0x31, - 0xd7, 0xbf, 0x77, 0xc0, 0xa0, 0x07, 0x4f, 0xc3, 0x92, 0x38, 0x9a, 0x0d, 0x47, 0xb3, 0xe1, 0x68, - 0x36, 0x1c, 0xcd, 0x86, 0x0a, 0xb3, 0xe1, 0x9f, 0x79, 0x3e, 0x79, 0xb8, 0xe9, 0xf0, 0xdc, 0xad, - 0x82, 0x83, 0x04, 0x6c, 0xa9, 0x35, 0x1d, 0xc4, 0x38, 0x1d, 0xc0, 0x7c, 0x28, 0xd5, 0xb5, 0xde, - 0x1a, 0xd0, 0x74, 0xfe, 0xc7, 0x88, 0x88, 0x72, 0x54, 0xfd, 0x8f, 0xaa, 0xff, 0x51, 0xf5, 0x7f, - 0x5e, 0xaa, 0xff, 0x86, 0x8a, 0xfa, 0x61, 0x54, 0xf4, 0x53, 0x92, 0x3a, 0x86, 0xc3, 0xe8, 0x7a, - 0x20, 0x35, 0x3e, 0xa5, 0x44, 0xb6, 0xba, 0x81, 0xab, 0xc9, 0x12, 0xcc, 0x95, 0x37, 0x00, 0x4c, - 0x49, 0x78, 0x9b, 0xce, 0x8b, 0x8c, 0x48, 0xd8, 0xfe, 0x08, 0xce, 0xd1, 0xa4, 0xd3, 0x22, 0xac, - 0x95, 0x48, 0xeb, 0x0f, 0x4f, 0x82, 0x5e, 0x38, 0x25, 0xe5, 0x09, 0xca, 0x54, 0xdb, 0x28, 0x3e, - 0x23, 0x42, 0x93, 0x6f, 0xfd, 0xd8, 0x6f, 0xd1, 0xc6, 0x95, 0xd7, 0x64, 0x49, 0x4e, 0xf5, 0x3d, - 0x21, 0xc8, 0xad, 0xbf, 0x89, 0xc0, 0x21, 0x6a, 0x44, 0xdb, 0x75, 0xcd, 0x45, 0xa5, 0xeb, 0x35, - 0x17, 0x95, 0xae, 0x37, 0xb8, 0x0c, 0x71, 0xbd, 0xc9, 0x8d, 0x99, 0x87, 0x1e, 0xc0, 0xd9, 0xfc, - 0x24, 0xc5, 0x26, 0x3a, 0x36, 0x8e, 0x87, 0xda, 0x0a, 0x48, 0xb0, 0x45, 0xe9, 0x20, 0xc9, 0x3e, - 0x1f, 0x24, 0xeb, 0xbd, 0x21, 0x5a, 0x70, 0x8b, 0x61, 0x50, 0x0b, 0x5f, 0x57, 0xdd, 0x59, 0xba, - 0xe6, 0x77, 0x96, 0xae, 0xeb, 0xee, 0x2c, 0xf1, 0xe2, 0xdb, 0x8c, 0x40, 0xf9, 0x64, 0xc7, 0x23, - 0x1e, 0xe2, 0xc1, 0x59, 0x4b, 0x67, 0x48, 0xa4, 0x4c, 0x15, 0x22, 0xb5, 0xef, 0x43, 0xec, 0x28, - 0xb8, 0xc1, 0x09, 0xae, 0x03, 0xf8, 0x70, 0x43, 0x46, 0x3f, 0x4f, 0xa4, 0x9f, 0xdc, 0xed, 0x40, - 0xc3, 0x63, 0x52, 0x1c, 0xed, 0x25, 0x5e, 0x6f, 0x5a, 0xab, 0x04, 0x16, 0x78, 0x90, 0xb0, 0xd3, - 0xf8, 0x91, 0x75, 0x4d, 0xe3, 0x07, 0x1c, 0x1f, 0x50, 0x0d, 0x95, 0xfb, 0x9d, 0xb7, 0x18, 0xd4, - 0x16, 0x7f, 0xb6, 0xe7, 0x5e, 0xa7, 0xdd, 0xeb, 0xf6, 0x5e, 0x34, 0xe9, 0xe7, 0x88, 0x7c, 0xbe, - 0xec, 0x9e, 0xf7, 0xd8, 0x67, 0x42, 0x3e, 0x3b, 0x2f, 0x7b, 0xbd, 0x90, 0x4d, 0x6f, 0xfd, 0x48, - 0xa3, 0x38, 0x25, 0x4b, 0x19, 0x75, 0x92, 0x80, 0x8c, 0x41, 0x99, 0x24, 0xe0, 0x4e, 0x7d, 0xf9, - 0x0f, 0x82, 0x22, 0x9a, 0x66, 0xa4, 0x02, 0x0b, 0x7f, 0xcc, 0x1c, 0x8e, 0x8e, 0xe6, 0x53, 0xd2, - 0x77, 0xf4, 0xb8, 0x2f, 0x5c, 0xe6, 0xa1, 0xed, 0x0f, 0xba, 0x2f, 0x4e, 0x5f, 0x9d, 0x41, 0x28, - 0x59, 0x21, 0x11, 0x5d, 0x59, 0xbd, 0x5a, 0x12, 0x64, 0x3a, 0x48, 0xe2, 0x96, 0x29, 0x1d, 0x5d, - 0x88, 0x8f, 0x4a, 0xb3, 0x64, 0x27, 0x34, 0xcb, 0x50, 0x80, 0xd1, 0x57, 0x30, 0xd2, 0xa0, 0x11, - 0x6c, 0x18, 0x56, 0x8d, 0xef, 0x22, 0xb8, 0xf9, 0xd1, 0xf8, 0xb7, 0x02, 0xe1, 0x45, 0xbc, 0xc6, - 0x92, 0xc0, 0x75, 0x9b, 0x8e, 0x25, 0xd5, 0xa3, 0xcd, 0x73, 0x8a, 0x26, 0xb2, 0x81, 0x37, 0xcb, - 0xef, 0x1c, 0x3a, 0x5e, 0x41, 0xf7, 0xbc, 0xc3, 0xce, 0x89, 0xfa, 0xd0, 0x12, 0x32, 0x18, 0xe4, - 0xe3, 0xf5, 0x2b, 0xdf, 0xde, 0x22, 0xa0, 0x15, 0x83, 0xf7, 0xf6, 0xd9, 0x60, 0x36, 0x59, 0xcf, - 0xf1, 0xb1, 0x55, 0xa9, 0x54, 0xd7, 0x9a, 0xf6, 0x9c, 0xa1, 0x87, 0xba, 0x4e, 0x55, 0xec, 0x2c, - 0xdb, 0x65, 0x03, 0xcb, 0x10, 0x8f, 0x74, 0xc4, 0xa3, 0x6a, 0xc4, 0xa3, 0x7a, 0xc4, 0x23, 0x03, - 0x71, 0xa2, 0x23, 0x4e, 0xaa, 0x11, 0x27, 0xf5, 0x88, 0x13, 0x1d, 0xb1, 0xa7, 0xe8, 0x8e, 0xfa, - 0xd1, 0x0e, 0xb9, 0x54, 0xd5, 0xdc, 0xc7, 0x55, 0x16, 0xb3, 0x27, 0xeb, 0xa1, 0x33, 0x56, 0x30, - 0x76, 0x0c, 0xd7, 0xea, 0xbf, 0x7b, 0xa0, 0x62, 0xb0, 0x47, 0x95, 0xe5, 0x01, 0x3a, 0xc7, 0xe6, - 0x7b, 0x39, 0x30, 0xe4, 0xac, 0xde, 0xd1, 0x23, 0x28, 0x28, 0x5a, 0x68, 0x3c, 0x58, 0xf6, 0x6c, - 0xd1, 0x41, 0x2c, 0x7a, 0x4b, 0x09, 0xeb, 0xe3, 0xaa, 0x2d, 0x2a, 0x59, 0xd7, 0xfa, 0xf5, 0x6a, - 0xa5, 0xa8, 0x5d, 0x9f, 0xb1, 0xe0, 0x3e, 0xba, 0x46, 0x9f, 0xa0, 0x6b, 0x14, 0xb9, 0x74, 0x2b, - 0x55, 0xcd, 0xe0, 0xc9, 0xed, 0x34, 0xb5, 0xed, 0xb5, 0xb3, 0x12, 0xa7, 0x45, 0xbb, 0xf0, 0xd3, - 0xd1, 0xf7, 0xfa, 0xed, 0x1c, 0xd9, 0xa8, 0x53, 0x79, 0xd9, 0x7d, 0x94, 0xe1, 0x28, 0x15, 0x37, - 0xc0, 0x54, 0x90, 0xe7, 0xef, 0xb4, 0x7d, 0x0c, 0x9d, 0x9f, 0xe6, 0xdc, 0x47, 0x15, 0xba, 0xfd, - 0x5a, 0x9b, 0xe0, 0x5e, 0x9c, 0x99, 0x01, 0x97, 0x0f, 0xc7, 0x1d, 0xc1, 0x86, 0x66, 0xe3, 0xaf, - 0x7f, 0x6d, 0x70, 0xcd, 0x36, 0x02, 0xc5, 0x56, 0x49, 0xb8, 0x27, 0x10, 0x54, 0xe9, 0x3e, 0xf9, - 0x91, 0xae, 0xcb, 0x27, 0x3f, 0xd0, 0xb7, 0x25, 0xd4, 0xf1, 0xf4, 0xef, 0x3d, 0x43, 0x03, 0x39, - 0xc8, 0xf9, 0x95, 0xc3, 0x9c, 0x5e, 0x61, 0xb5, 0x70, 0xd5, 0xa1, 0xc2, 0xf8, 0xd9, 0xd0, 0x7a, - 0x39, 0x7d, 0x0c, 0xeb, 0x05, 0x2e, 0x40, 0x3e, 0x17, 0x93, 0x85, 0x77, 0x6b, 0x7b, 0x3e, 0x12, - 0x56, 0x40, 0x95, 0xf6, 0x8f, 0x98, 0x31, 0x4c, 0x1d, 0x34, 0xc5, 0x67, 0xbf, 0x4e, 0xdd, 0x92, - 0x1d, 0xc0, 0xf2, 0xb0, 0x16, 0x65, 0xe8, 0x0c, 0x73, 0xe0, 0xd0, 0x3b, 0x09, 0xbb, 0xe8, 0xa2, - 0xfb, 0x55, 0x2a, 0x0f, 0xa5, 0x19, 0x3e, 0xef, 0xad, 0x0b, 0x1c, 0xa8, 0xf5, 0x1a, 0x56, 0xe5, - 0x28, 0x6c, 0xa6, 0x2d, 0x1d, 0x37, 0x3c, 0x8e, 0x1b, 0x1e, 0x3b, 0x6f, 0x78, 0xb0, 0xc7, 0x8a, - 0x96, 0xec, 0xf9, 0xa0, 0xea, 0x3d, 0x8f, 0xd2, 0xd6, 0x08, 0x2b, 0xe1, 0x19, 0xf2, 0x6a, 0xbf, - 0xfe, 0x90, 0x61, 0x36, 0x81, 0x95, 0x22, 0x9f, 0x86, 0x9b, 0x85, 0x72, 0x60, 0xcd, 0x7e, 0x8c, - 0x98, 0x38, 0x6a, 0x1c, 0x03, 0x1a, 0xe1, 0x69, 0xb6, 0xc8, 0xc6, 0x04, 0x96, 0x05, 0x55, 0x15, - 0x94, 0xb1, 0x9b, 0xd2, 0xa8, 0x07, 0x3b, 0x4a, 0x06, 0x51, 0x1b, 0x41, 0x61, 0x0b, 0xb4, 0x24, - 0x7e, 0xf6, 0x55, 0x23, 0x35, 0x78, 0xd5, 0x7d, 0x8d, 0xe1, 0xaa, 0x10, 0x49, 0x93, 0x55, 0x54, - 0xf3, 0xe4, 0x90, 0xf1, 0xac, 0x1a, 0x76, 0xe9, 0x36, 0x0b, 0x53, 0x75, 0x37, 0x9b, 0x6b, 0xde, - 0x7d, 0x4e, 0x24, 0x45, 0xe9, 0xed, 0x91, 0x78, 0xa9, 0xa5, 0x33, 0xa1, 0x49, 0x0d, 0x43, 0xd6, - 0x1f, 0x44, 0x0b, 0x7b, 0x37, 0x4e, 0x6f, 0x41, 0x71, 0x9a, 0x3a, 0x2c, 0xe8, 0x31, 0xe1, 0x53, - 0x9f, 0x49, 0xc6, 0x2c, 0x5e, 0xf0, 0xc8, 0x12, 0x18, 0x73, 0xb6, 0xcc, 0xaf, 0x74, 0x92, 0x79, - 0x18, 0x27, 0x2d, 0xc4, 0x40, 0x88, 0x71, 0x04, 0xb1, 0xbc, 0xf8, 0xfb, 0x4d, 0xa0, 0x4f, 0x41, - 0xb2, 0xcf, 0x2b, 0x76, 0x03, 0xa2, 0x9c, 0x12, 0x4d, 0xa2, 0xf4, 0x70, 0x49, 0xfd, 0xc0, 0xa1, - 0x62, 0xaa, 0x90, 0x0a, 0xfd, 0xd3, 0x44, 0xc5, 0xb6, 0xc5, 0x0a, 0x12, 0xcd, 0x5b, 0xfc, 0x5c, - 0xa1, 0xa6, 0xc6, 0xb5, 0xbc, 0xa4, 0xb2, 0x6c, 0xa7, 0xaa, 0xc8, 0xa0, 0xb2, 0xc8, 0xda, 0xda, - 0x86, 0x9b, 0x50, 0xda, 0xd1, 0x8a, 0xa4, 0x96, 0x22, 0x6a, 0xfe, 0xd5, 0x06, 0xd4, 0xe8, 0x18, - 0x47, 0x9b, 0x10, 0x61, 0xa7, 0xff, 0xba, 0xa6, 0xb7, 0xec, 0x25, 0xb2, 0x0d, 0xc8, 0xb3, 0x97, - 0x4c, 0x97, 0xf1, 0x68, 0x94, 0x62, 0xd0, 0x09, 0x98, 0xdd, 0xc0, 0xae, 0x8d, 0xbf, 0x35, 0x7a, - 0x68, 0x2f, 0x75, 0xda, 0x67, 0xc4, 0x58, 0x12, 0x89, 0x67, 0xed, 0x73, 0x4c, 0x3c, 0x3d, 0x27, - 0xa9, 0xe4, 0x0f, 0xb3, 0x0a, 0xd3, 0x79, 0x76, 0xcb, 0x8c, 0xc1, 0x41, 0xf3, 0x8a, 0xfc, 0x97, - 0xb9, 0x2d, 0x27, 0x6e, 0x0e, 0xc9, 0x7f, 0x23, 0xd7, 0x77, 0x46, 0xcd, 0x6b, 0xf2, 0x1f, 0x4d, - 0x4b, 0xc8, 0x7f, 0x03, 0xd7, 0x0d, 0x1a, 0xa0, 0x06, 0x93, 0x3a, 0x7c, 0x87, 0x22, 0x6f, 0x89, - 0xa9, 0x02, 0x41, 0x16, 0x24, 0x41, 0xcd, 0xee, 0xeb, 0x76, 0xef, 0xfc, 0x45, 0xaf, 0x45, 0xc1, - 0xcc, 0x38, 0x54, 0xa8, 0xfa, 0xa2, 0x20, 0x42, 0x22, 0xda, 0x4b, 0x38, 0x07, 0x0f, 0x81, 0x4e, - 0x7c, 0xfa, 0xbd, 0x12, 0xdf, 0x3c, 0xf8, 0x98, 0xb4, 0x1e, 0xf6, 0x20, 0x92, 0xbf, 0x92, 0xe4, - 0xa5, 0x82, 0xd2, 0x26, 0x27, 0xeb, 0x83, 0x8f, 0xad, 0x97, 0x76, 0x63, 0x52, 0x61, 0x3c, 0x55, - 0xae, 0x07, 0xf0, 0x74, 0xd4, 0xb4, 0x4c, 0x8f, 0xf9, 0x75, 0x3c, 0xcc, 0xef, 0xcc, 0x54, 0x10, - 0xc0, 0x56, 0xf0, 0x78, 0x00, 0xe1, 0x50, 0x64, 0x48, 0xc7, 0x8f, 0x17, 0x8d, 0xd3, 0x76, 0xf7, - 0xac, 0x7b, 0xfe, 0xba, 0xf7, 0xe2, 0xfc, 0xf4, 0xfc, 0xd5, 0xeb, 0x97, 0xaf, 0x4f, 0x4f, 0x2c, - 0xd1, 0x75, 0xc0, 0x1a, 0xad, 0x0c, 0x6c, 0xa6, 0x72, 0xa4, 0x43, 0x5f, 0xc6, 0x23, 0x56, 0x12, - 0x04, 0x37, 0x74, 0xd5, 0xe8, 0x86, 0xb8, 0x7a, 0xfc, 0x4c, 0xa3, 0xd1, 0x0c, 0x88, 0xe1, 0x0b, - 0xb6, 0x5a, 0x3c, 0x5d, 0x38, 0x8e, 0x6c, 0xf2, 0x9f, 0x9d, 0xcf, 0x2d, 0xe5, 0xab, 0xfb, 0xd9, - 0xf5, 0xd0, 0xf0, 0x63, 0x21, 0xde, 0xdc, 0xa6, 0x9e, 0x29, 0x30, 0x8f, 0xf3, 0x59, 0x1a, 0x11, - 0x61, 0x3b, 0x25, 0xd0, 0xbd, 0x73, 0x8f, 0x1d, 0x93, 0x46, 0x8a, 0xdc, 0x40, 0xa9, 0x57, 0x9c, - 0x91, 0xc6, 0xb8, 0x2f, 0x11, 0xe3, 0x5f, 0x6a, 0x72, 0x92, 0x49, 0x86, 0x18, 0x18, 0x13, 0xfb, - 0x2d, 0x96, 0xeb, 0x92, 0x69, 0xf7, 0xf1, 0x02, 0xef, 0x7a, 0xf0, 0x3c, 0xe1, 0xda, 0x00, 0xa7, - 0xc4, 0x0f, 0x6a, 0x1b, 0x85, 0xe9, 0x18, 0xb1, 0xf1, 0x12, 0xee, 0xab, 0xf8, 0x3e, 0x9b, 0xdc, - 0x60, 0xe0, 0x5f, 0x9a, 0xbe, 0x6a, 0x7e, 0xbc, 0x08, 0x15, 0x3d, 0xbc, 0xdb, 0x7e, 0xf5, 0xf2, - 0xbc, 0x25, 0x83, 0xfc, 0x75, 0xdb, 0x2f, 0xcf, 0x59, 0x3e, 0x99, 0xa4, 0xf4, 0x61, 0x4f, 0x08, - 0x26, 0x24, 0x4a, 0xd1, 0x28, 0x8f, 0x97, 0xd8, 0x74, 0x51, 0x0c, 0x9b, 0x02, 0xf2, 0x82, 0x8c, - 0x03, 0x99, 0xec, 0xe8, 0x64, 0xc5, 0xde, 0xa1, 0x23, 0x11, 0xc8, 0x54, 0x8e, 0x94, 0x66, 0xb8, - 0x1e, 0xff, 0x86, 0x88, 0xb9, 0x50, 0x80, 0x93, 0x8d, 0x0c, 0x83, 0xe3, 0xa5, 0x54, 0xc8, 0xf7, - 0x50, 0x31, 0x93, 0xed, 0xb5, 0xe2, 0x40, 0xd1, 0x14, 0x08, 0x0f, 0x46, 0x7f, 0x31, 0x43, 0x5c, - 0x36, 0xab, 0x57, 0xf6, 0x45, 0x00, 0x0b, 0xd3, 0x70, 0x2a, 0xa0, 0x7c, 0x3a, 0x74, 0x6c, 0x9a, - 0xac, 0xbf, 0xdc, 0xe0, 0xe3, 0x05, 0xca, 0x12, 0xc9, 0x4d, 0x34, 0x40, 0x33, 0x14, 0x62, 0x35, - 0xd3, 0x27, 0xb4, 0xe8, 0x4c, 0xf0, 0x15, 0xe6, 0xf7, 0x11, 0x88, 0xa8, 0x2d, 0x84, 0x93, 0x55, - 0xe2, 0xeb, 0x89, 0xd2, 0xe4, 0x90, 0xda, 0x42, 0xca, 0x8a, 0x4a, 0xc5, 0xed, 0xd8, 0x6d, 0x2a, - 0x9f, 0x0f, 0x13, 0x6e, 0x62, 0x4a, 0x22, 0xa5, 0x18, 0xc2, 0xf8, 0xfc, 0xd5, 0xcb, 0xd3, 0x4e, - 0xf7, 0xc5, 0x89, 0x4d, 0xc2, 0x31, 0xbf, 0x64, 0x79, 0xf3, 0x09, 0x63, 0xdc, 0xd7, 0x2b, 0xaf, - 0xe5, 0xa8, 0xb0, 0xea, 0xe3, 0x58, 0x4c, 0xda, 0x98, 0xaf, 0xf9, 0x6d, 0xfa, 0xc6, 0x96, 0x21, - 0xdf, 0x18, 0x99, 0x46, 0x2a, 0x46, 0xbf, 0xe9, 0x95, 0x62, 0x23, 0x8d, 0xe2, 0xc9, 0x24, 0xe6, - 0xc1, 0x8e, 0x2c, 0xa1, 0x3e, 0x41, 0xb7, 0x9f, 0xa6, 0x8b, 0xfc, 0x2a, 0x9e, 0x7f, 0x73, 0x81, - 0x63, 0x8e, 0x8f, 0x59, 0xed, 0x70, 0xae, 0x74, 0x14, 0xcf, 0x6a, 0x1e, 0x83, 0xe2, 0xb9, 0x75, - 0x71, 0x91, 0x39, 0xcc, 0xba, 0xc8, 0xc8, 0x2a, 0x5c, 0x5d, 0x97, 0xe1, 0xdb, 0xab, 0x15, 0x4d, - 0xc2, 0xbc, 0xea, 0x0e, 0xc3, 0xec, 0xfa, 0x4e, 0x11, 0x20, 0x35, 0x24, 0xd4, 0x74, 0xc8, 0xda, - 0xde, 0xd8, 0xa8, 0x2b, 0xf4, 0x7e, 0x78, 0x7a, 0x41, 0x86, 0x9e, 0xfb, 0x33, 0x4d, 0x82, 0xe9, - 0xf5, 0x81, 0xe1, 0xc9, 0x16, 0x42, 0x78, 0x96, 0xaf, 0xce, 0x89, 0x8a, 0xa0, 0xd5, 0x12, 0xcd, - 0x96, 0x3c, 0xaf, 0xb6, 0x88, 0xbe, 0x87, 0x6c, 0xe9, 0x11, 0xcc, 0xf0, 0xe5, 0x5c, 0xb0, 0xf6, - 0x07, 0x2b, 0xbd, 0x0d, 0xbb, 0xeb, 0x6d, 0xa8, 0xea, 0x07, 0xde, 0x09, 0xf5, 0x3d, 0xc0, 0x9b, - 0xaf, 0xb7, 0x9d, 0xe6, 0xbd, 0x79, 0xff, 0xfb, 0xc5, 0x9b, 0x5f, 0x2f, 0xde, 0x5c, 0x5e, 0xbc, - 0xff, 0xa5, 0xfa, 0x79, 0x1a, 0x50, 0xf2, 0xf5, 0x00, 0x9c, 0x51, 0xcc, 0x1f, 0x55, 0x68, 0x75, - 0x7b, 0xaf, 0x48, 0x36, 0xd3, 0x9e, 0xfa, 0x62, 0x8b, 0x20, 0xa2, 0xa1, 0xbf, 0xe9, 0x93, 0x09, - 0x18, 0xd6, 0x11, 0xbd, 0x05, 0xca, 0x92, 0x16, 0x89, 0x68, 0xdb, 0x14, 0x08, 0xfc, 0x05, 0x6e, - 0x93, 0x7d, 0xdd, 0x79, 0x2f, 0xce, 0x58, 0xc4, 0x70, 0xe9, 0x1f, 0x54, 0xa2, 0x73, 0xb3, 0x85, - 0x96, 0xbe, 0xed, 0xa4, 0xcd, 0x7a, 0xb1, 0xd9, 0x29, 0xa1, 0x30, 0xc0, 0x38, 0x58, 0x1e, 0x62, - 0x37, 0x8d, 0xff, 0xe0, 0x11, 0xc9, 0x43, 0xbe, 0x72, 0xb3, 0x9c, 0x50, 0xb0, 0x0d, 0xff, 0x81, - 0x9d, 0xc0, 0x0c, 0xe7, 0x78, 0x7c, 0x45, 0x33, 0x65, 0x0e, 0x1b, 0x64, 0xc0, 0xe5, 0xb1, 0x71, - 0xe6, 0x1a, 0x32, 0xa4, 0x73, 0x2c, 0x4d, 0x87, 0xff, 0x12, 0x3a, 0xb5, 0x3a, 0x04, 0x68, 0xf1, - 0x0a, 0x45, 0x31, 0xbf, 0x29, 0xb4, 0xb2, 0xa2, 0x5e, 0xaf, 0x8c, 0xa5, 0x87, 0x6f, 0x3f, 0x80, - 0x92, 0xd5, 0x74, 0x24, 0x7d, 0x4c, 0xcf, 0xa7, 0x0f, 0x43, 0xa8, 0x15, 0x19, 0x7d, 0x86, 0x97, - 0x2d, 0x69, 0x75, 0x9e, 0x0c, 0x42, 0x49, 0x15, 0x13, 0x43, 0x5c, 0xa2, 0x52, 0xae, 0x8c, 0xb3, - 0x91, 0x5f, 0xd0, 0xb0, 0xd4, 0x44, 0xb9, 0xbd, 0x31, 0xea, 0xa0, 0xbd, 0xd2, 0x8b, 0xe8, 0x5f, - 0xb3, 0x1a, 0x4f, 0x8c, 0x08, 0x51, 0xde, 0x20, 0x22, 0x74, 0xeb, 0xc6, 0xbf, 0x81, 0xa7, 0xd2, - 0x8d, 0xf7, 0xb1, 0x38, 0xff, 0xe9, 0x76, 0x2a, 0xd0, 0x1f, 0x30, 0xc5, 0x8e, 0x6f, 0xff, 0xd5, - 0x1d, 0xc7, 0x94, 0xcf, 0x8a, 0xf7, 0xb4, 0x62, 0xd8, 0x7f, 0xa5, 0xca, 0xac, 0x81, 0x1b, 0xf1, - 0x81, 0x2a, 0xd2, 0x65, 0x6a, 0x54, 0x4d, 0x7e, 0x5f, 0x95, 0xde, 0x3a, 0xad, 0x2c, 0x65, 0x2b, - 0x52, 0xaa, 0xb4, 0x74, 0x05, 0xdf, 0x2b, 0xe9, 0xa8, 0x60, 0x94, 0x2b, 0x2a, 0x64, 0xb4, 0x9e, - 0xc0, 0x60, 0x0d, 0x35, 0x21, 0x57, 0x55, 0xa9, 0xa7, 0x85, 0x72, 0x84, 0x8f, 0x2c, 0xac, 0xdd, - 0xf1, 0xd9, 0x52, 0x29, 0x36, 0xd4, 0x5f, 0xbb, 0xaa, 0x6c, 0x53, 0x8a, 0xbf, 0xce, 0xdb, 0x55, - 0xdf, 0xd0, 0x9b, 0x52, 0x7b, 0x8e, 0x98, 0x77, 0x98, 0x97, 0x8a, 0x6c, 0x17, 0xbe, 0x29, 0x73, - 0xb8, 0x1e, 0x67, 0x9e, 0xf6, 0x22, 0x94, 0x24, 0xf4, 0x22, 0x7c, 0x67, 0xa7, 0x59, 0xb5, 0x60, - 0x41, 0x31, 0x95, 0x8d, 0xd4, 0x8b, 0xe2, 0xd4, 0x16, 0x9e, 0x90, 0x1e, 0x83, 0x0a, 0x5b, 0x8e, - 0xa8, 0xa0, 0x68, 0x21, 0x6a, 0xd7, 0x97, 0x55, 0x62, 0xa8, 0x52, 0x37, 0xc0, 0xf4, 0x0a, 0x83, - 0x79, 0x0f, 0xa1, 0xa9, 0x84, 0x65, 0xfc, 0xdb, 0x9b, 0x7f, 0xf4, 0x7f, 0xbd, 0x78, 0xff, 0xae, - 0xff, 0xf6, 0xe2, 0xf2, 0xf7, 0x37, 0xef, 0x7f, 0x7a, 0xd7, 0x38, 0xed, 0xbd, 0x7c, 0xf1, 0xb2, - 0xdd, 0x79, 0x32, 0xb6, 0xf3, 0xa6, 0x0f, 0x50, 0x57, 0xd8, 0xd8, 0xfb, 0xb7, 0x9d, 0x89, 0x58, - 0x1d, 0xcd, 0xd3, 0x45, 0x65, 0xa0, 0x90, 0xa3, 0x95, 0x7a, 0xb4, 0x52, 0x9f, 0xab, 0x95, 0x7a, - 0xb4, 0x1b, 0x8f, 0x76, 0xe3, 0x33, 0xb3, 0x1b, 0xb9, 0x38, 0xdf, 0xd4, 0x74, 0x0c, 0x4a, 0x4b, - 0xe8, 0xd1, 0x98, 0x3c, 0x1a, 0x93, 0x47, 0x63, 0xf2, 0x9b, 0x32, 0x26, 0x37, 0xde, 0x5b, 0xde, - 0xd9, 0xcc, 0x7c, 0xa0, 0xfe, 0xf8, 0x6c, 0x4c, 0xc5, 0xa3, 0xb9, 0x67, 0x31, 0xf7, 0x2a, 0xde, - 0x30, 0x63, 0x07, 0x02, 0x80, 0xb3, 0x75, 0x56, 0xa9, 0x7e, 0xcb, 0x6c, 0x3f, 0x56, 0x62, 0xd9, - 0x06, 0xe4, 0x39, 0xda, 0xc2, 0xd7, 0xbf, 0xfc, 0xe9, 0xcd, 0xaf, 0xef, 0x40, 0xb4, 0x3f, 0xba, - 0x8d, 0xb8, 0x66, 0x07, 0xf5, 0x61, 0x26, 0xe4, 0x43, 0x6c, 0x44, 0xb9, 0x7b, 0xba, 0x83, 0x93, - 0xe9, 0x68, 0x1a, 0xee, 0x60, 0x1a, 0x3e, 0x01, 0x4b, 0xec, 0xc9, 0x59, 0xa7, 0x07, 0x36, 0x0d, - 0x8f, 0x17, 0x42, 0x9f, 0xd0, 0x85, 0xd0, 0x67, 0x6e, 0x82, 0x7f, 0x5d, 0x93, 0xf7, 0xa9, 0x39, - 0x00, 0x0e, 0x65, 0x82, 0xff, 0x27, 0x5c, 0xd1, 0xfd, 0x4a, 0x6e, 0x06, 0x0e, 0xb7, 0xdd, 0x26, - 0xb5, 0x45, 0xd1, 0x3a, 0xfa, 0x19, 0x8e, 0x7e, 0x86, 0xa3, 0x9f, 0xe1, 0x50, 0x7e, 0x06, 0x39, - 0x5d, 0x63, 0x55, 0xe9, 0x7f, 0x5c, 0xff, 0xc3, 0x36, 0xd7, 0x51, 0x35, 0x59, 0x67, 0xc6, 0x79, - 0x59, 0xeb, 0xc8, 0x38, 0x9c, 0x91, 0xf3, 0x5c, 0x6e, 0x83, 0xfe, 0x27, 0x78, 0x67, 0x9e, 0xd0, - 0xb5, 0xd2, 0xaf, 0xe8, 0x3d, 0x3a, 0xc6, 0x4d, 0x7e, 0x5e, 0xaf, 0xa9, 0xa8, 0x5d, 0xad, 0xb6, - 0x4f, 0x6f, 0x73, 0x7b, 0xe9, 0x89, 0x5e, 0x0b, 0xf4, 0x08, 0xc4, 0x06, 0xe0, 0xca, 0x86, 0x33, - 0xb1, 0xe0, 0x24, 0x54, 0x7b, 0xac, 0xbf, 0xeb, 0x30, 0x02, 0xc5, 0xe1, 0x37, 0xe6, 0xb2, 0xa4, - 0xd8, 0x96, 0xa4, 0x2b, 0xe9, 0xf5, 0x66, 0xb1, 0x44, 0x04, 0x7a, 0x4f, 0xb7, 0x97, 0x3a, 0x7c, - 0x52, 0x0f, 0x9f, 0xe8, 0xf0, 0xab, 0x3e, 0xbe, 0xc4, 0xdc, 0x14, 0x7d, 0x41, 0xf4, 0x20, 0x76, - 0x59, 0x4e, 0xd0, 0x87, 0x34, 0x39, 0x46, 0xad, 0xab, 0x66, 0x8f, 0xbd, 0x26, 0xe3, 0x9a, 0x04, - 0xad, 0x24, 0xf2, 0x64, 0x17, 0xe4, 0x49, 0x35, 0xf2, 0x44, 0xb2, 0x06, 0xc6, 0x3f, 0xd9, 0xfe, - 0xb2, 0x39, 0xf2, 0x10, 0xe9, 0x55, 0x9f, 0xb4, 0xdc, 0x55, 0x70, 0x25, 0x3b, 0x5c, 0x15, 0x67, - 0xb8, 0x12, 0x82, 0x2b, 0x71, 0x35, 0x27, 0x33, 0xe0, 0xb2, 0x5e, 0x17, 0x27, 0x95, 0xfa, 0xf6, - 0x8c, 0xc4, 0xb5, 0x5f, 0x13, 0xa7, 0x6e, 0xe7, 0x47, 0x7c, 0xd6, 0xe2, 0x09, 0x39, 0x9d, 0x1f, - 0xf5, 0x60, 0x12, 0x1b, 0x24, 0xfa, 0x0c, 0x76, 0x5c, 0x52, 0xed, 0x48, 0xaf, 0xf7, 0x57, 0x4a, - 0xba, 0xad, 0x54, 0x52, 0x51, 0x2a, 0xd9, 0xc7, 0x21, 0x28, 0x96, 0x0a, 0x35, 0xc4, 0xb6, 0xc4, - 0x64, 0xf7, 0x53, 0x95, 0xc7, 0xab, 0x44, 0xc7, 0x43, 0x5a, 0xc7, 0x43, 0x5a, 0x55, 0x9e, 0x78, - 0x3e, 0x64, 0x16, 0x37, 0xdd, 0x63, 0x78, 0xe9, 0xd1, 0x57, 0x54, 0x43, 0xa5, 0xcc, 0xaf, 0xec, - 0x2b, 0x09, 0x62, 0xe3, 0x2f, 0x25, 0xb7, 0xae, 0x37, 0x75, 0xb0, 0xe3, 0xbd, 0xa8, 0xe3, 0xf9, - 0xb6, 0x27, 0x72, 0xbe, 0xed, 0x70, 0xee, 0x74, 0x65, 0x2a, 0xca, 0x9f, 0x96, 0x9a, 0x65, 0xa6, - 0xaf, 0xcf, 0x4f, 0x5b, 0x93, 0x55, 0x4c, 0xb6, 0x49, 0x76, 0xf4, 0x7a, 0x1f, 0xbd, 0xde, 0x47, - 0xaf, 0xf7, 0xd1, 0xeb, 0xbd, 0x99, 0xd7, 0x1b, 0xd5, 0xff, 0x88, 0xc9, 0x21, 0x31, 0x77, 0x3d, - 0xd3, 0x9c, 0x69, 0x2f, 0x03, 0x45, 0x48, 0x89, 0xc1, 0x2b, 0x81, 0xad, 0x9a, 0xc2, 0xd2, 0x71, - 0x19, 0xf6, 0x64, 0x2d, 0xf6, 0x64, 0x33, 0xec, 0x89, 0x82, 0x1d, 0x42, 0xa3, 0xed, 0xfb, 0x64, - 0xa0, 0x69, 0x8b, 0x2d, 0x86, 0x57, 0xd8, 0xfd, 0xe5, 0xd8, 0x59, 0xc4, 0xa4, 0x7c, 0x62, 0x16, - 0xd8, 0xf1, 0x5e, 0x5b, 0xbd, 0x0e, 0x70, 0x38, 0x1d, 0x7c, 0xbf, 0x0a, 0xf4, 0xb7, 0x78, 0x55, - 0xcf, 0x8a, 0xa1, 0xe6, 0xdc, 0x43, 0xb9, 0xc7, 0x6b, 0x3b, 0x7c, 0x6b, 0x55, 0xe9, 0x1b, 0x73, - 0xc9, 0x12, 0x31, 0x04, 0xb9, 0xfd, 0xd8, 0x1a, 0x5b, 0x0a, 0x85, 0x89, 0xdb, 0x8e, 0x0d, 0xe0, - 0xa4, 0x12, 0x38, 0x29, 0x01, 0xa3, 0xf7, 0x50, 0xd4, 0xe2, 0x0b, 0x14, 0x3e, 0x4a, 0x3a, 0x37, - 0xa4, 0xbe, 0xc0, 0x48, 0x7b, 0x29, 0xf7, 0xbc, 0x25, 0xe5, 0xa3, 0x2a, 0xcb, 0x69, 0x34, 0x63, - 0x5b, 0x0e, 0x43, 0xbb, 0xff, 0x43, 0xae, 0x1b, 0x9d, 0x3b, 0x2d, 0xc6, 0x64, 0xad, 0x99, 0xab, - 0xcf, 0x64, 0x08, 0xa9, 0x8f, 0x6b, 0x4f, 0x45, 0x66, 0x72, 0x73, 0x75, 0x95, 0xce, 0xeb, 0x9e, - 0xd0, 0xdd, 0x32, 0xa8, 0x5a, 0xc7, 0x92, 0xd6, 0xdd, 0x35, 0xd2, 0x5a, 0x27, 0x72, 0x1c, 0x7b, - 0x54, 0xca, 0x16, 0xe8, 0xd1, 0x81, 0x4e, 0x7f, 0xc3, 0x85, 0x98, 0x51, 0xb4, 0x64, 0x37, 0xa2, - 0x81, 0xf9, 0xe0, 0xa9, 0x76, 0xb5, 0x03, 0x20, 0x98, 0x98, 0xec, 0x2a, 0xa5, 0x73, 0xd5, 0x0d, - 0xec, 0x7e, 0xb9, 0x9f, 0xcc, 0x67, 0x46, 0x4a, 0x8b, 0x6d, 0xa7, 0x3a, 0xab, 0xbb, 0x71, 0x37, - 0x95, 0x46, 0x67, 0x0e, 0x11, 0xad, 0x88, 0xd2, 0xb1, 0x80, 0x70, 0xe0, 0x75, 0xd9, 0x20, 0x2e, - 0xcb, 0x23, 0x1f, 0x93, 0x6e, 0xc3, 0xe0, 0x7e, 0xe6, 0xcb, 0x2b, 0xd2, 0xa5, 0x39, 0x2d, 0xe6, - 0xf1, 0xc2, 0xf6, 0x32, 0x0b, 0x3c, 0x93, 0xb2, 0x98, 0x65, 0xd3, 0xfe, 0x1d, 0x06, 0xfb, 0x35, - 0xa2, 0xe5, 0x49, 0xc1, 0xdc, 0x29, 0x4f, 0xcc, 0x0e, 0x0d, 0x11, 0xd7, 0x59, 0x13, 0x8d, 0xb6, - 0x4b, 0xc1, 0xba, 0x34, 0x14, 0x38, 0x45, 0xd6, 0x8e, 0xa9, 0x85, 0x40, 0xaa, 0x60, 0x09, 0xf3, - 0x51, 0x12, 0xc9, 0x9f, 0x01, 0x07, 0x0b, 0xbf, 0x88, 0x42, 0x5d, 0xb3, 0x50, 0x57, 0x16, 0xea, - 0xca, 0x42, 0x5d, 0x28, 0x64, 0x6c, 0x31, 0x50, 0x6c, 0x3e, 0x0b, 0x36, 0xcb, 0x47, 0x9f, 0xbd, - 0x00, 0xd5, 0x8e, 0xd5, 0x90, 0xdc, 0xd8, 0x25, 0x02, 0x2f, 0xa0, 0x0d, 0xe1, 0x0b, 0x43, 0x79, - 0x43, 0xd8, 0x4f, 0xf2, 0xe1, 0xeb, 0x3d, 0x06, 0xcf, 0x0b, 0xb8, 0x7e, 0x45, 0xde, 0xfd, 0x72, - 0x55, 0x99, 0xb7, 0xba, 0x5f, 0x8a, 0x28, 0x77, 0xf1, 0x6d, 0x4a, 0xa4, 0x43, 0x1a, 0xf1, 0xe7, - 0x92, 0xf8, 0x1b, 0x58, 0xfc, 0xf1, 0x2b, 0x37, 0x38, 0x85, 0xf0, 0xa3, 0x10, 0x9e, 0xdc, 0x61, - 0xb0, 0x2d, 0xf2, 0x05, 0xc1, 0xd8, 0xca, 0xc3, 0x0f, 0x04, 0x43, 0x85, 0x38, 0x7b, 0xbc, 0xd2, - 0xf0, 0xd3, 0xe9, 0x43, 0x87, 0x1e, 0x18, 0x0a, 0xac, 0x7b, 0xda, 0x40, 0x93, 0x15, 0xfd, 0xb5, - 0x09, 0x2e, 0x47, 0x44, 0x7e, 0x57, 0xe0, 0x81, 0x2a, 0xfc, 0x0d, 0x52, 0x0c, 0x09, 0x8b, 0x92, - 0x82, 0x46, 0x7f, 0xe3, 0x44, 0xfa, 0xa2, 0x1a, 0x1f, 0xdb, 0xce, 0x86, 0xcf, 0xe7, 0x01, 0xdb, - 0x1e, 0x26, 0x7f, 0x49, 0x2f, 0x2d, 0x0a, 0x36, 0x65, 0x3e, 0x5e, 0x44, 0xa5, 0xd0, 0x89, 0xe5, - 0x9d, 0x1b, 0xb0, 0xe4, 0x99, 0x51, 0x6d, 0xdf, 0xd5, 0xd1, 0x52, 0x4f, 0xa1, 0x84, 0x30, 0xa7, - 0x74, 0x99, 0xcb, 0x9d, 0x12, 0xc8, 0x98, 0xa6, 0x10, 0x4a, 0xf2, 0x7c, 0x0c, 0x42, 0x66, 0x41, - 0xf7, 0xf6, 0x20, 0x6c, 0x67, 0x1f, 0x89, 0x8d, 0x15, 0x49, 0x6f, 0x00, 0x5d, 0xa5, 0x31, 0xca, - 0xd2, 0x12, 0x9c, 0xfe, 0x5c, 0x20, 0xc2, 0xd6, 0x65, 0x56, 0x64, 0x0d, 0xe2, 0x09, 0xe1, 0x41, - 0x30, 0xf9, 0x20, 0x84, 0x1e, 0x91, 0xcc, 0xfc, 0x11, 0x86, 0x0a, 0xf8, 0x59, 0x56, 0x0c, 0xae, - 0x4d, 0x5a, 0xe7, 0x79, 0x11, 0x17, 0x69, 0x7f, 0xb1, 0x9a, 0x24, 0xf9, 0xb8, 0xa2, 0x20, 0x0d, - 0x18, 0x68, 0x98, 0x40, 0x9a, 0x10, 0x1f, 0x5c, 0x6b, 0xf1, 0x34, 0x2b, 0x36, 0xd0, 0x68, 0xea, - 0x38, 0x4e, 0x88, 0x06, 0x34, 0x1b, 0xc7, 0xd3, 0xb4, 0x02, 0x82, 0x06, 0xb4, 0x36, 0xf2, 0x64, - 0xdf, 0x82, 0x70, 0x33, 0x93, 0xb1, 0x6d, 0xd4, 0x64, 0x9d, 0xc4, 0xb3, 0xaa, 0x13, 0x54, 0x65, - 0xb3, 0xa9, 0x64, 0x34, 0x69, 0x83, 0xff, 0x0d, 0xec, 0xc5, 0x3c, 0x91, 0x07, 0xd4, 0xa5, 0x12, - 0x13, 0xa9, 0x53, 0x52, 0x9c, 0x6d, 0xe1, 0x1e, 0x5a, 0x3d, 0x97, 0x9f, 0x8c, 0x41, 0xb5, 0x43, - 0x3a, 0x13, 0x79, 0x22, 0x8c, 0x19, 0x4f, 0x25, 0xa0, 0x2a, 0x53, 0x2e, 0xd2, 0xd1, 0x04, 0xe2, - 0x46, 0x12, 0xb6, 0x1b, 0xa7, 0x51, 0xcb, 0x98, 0xd4, 0x7f, 0xf6, 0x3e, 0x73, 0x2d, 0x15, 0x86, - 0x1d, 0x56, 0xaf, 0xef, 0x2a, 0xe6, 0x2e, 0xbc, 0x70, 0xf2, 0x5d, 0xf5, 0x94, 0x25, 0x9d, 0x8a, - 0x54, 0x80, 0x0c, 0xa4, 0x04, 0xfd, 0xd9, 0xf9, 0xec, 0xb3, 0x5f, 0xdd, 0xcf, 0x3e, 0x9f, 0xbd, - 0x6e, 0xd0, 0x3b, 0x7f, 0x01, 0x91, 0x69, 0x1b, 0xd0, 0x67, 0x0d, 0xa8, 0xf1, 0x61, 0x15, 0x8a, - 0xca, 0xca, 0x88, 0xeb, 0x9a, 0xb2, 0x1e, 0x31, 0x13, 0x29, 0x0c, 0x9f, 0x9e, 0xa6, 0xfb, 0xd3, - 0x3e, 0xe6, 0xd9, 0xb4, 0x58, 0x17, 0x19, 0x9d, 0x05, 0xb5, 0x16, 0xa2, 0x88, 0xc8, 0x9f, 0xeb, - 0x5c, 0x8a, 0xa2, 0x48, 0xc7, 0xd6, 0xd6, 0x47, 0x91, 0x43, 0x51, 0xd1, 0x12, 0x99, 0xd3, 0xb8, - 0xf1, 0xe3, 0x49, 0x25, 0xe2, 0xa0, 0x46, 0xfe, 0x35, 0x7e, 0x38, 0xa9, 0xc9, 0x0d, 0x2a, 0x71, - 0x6a, 0xb4, 0x29, 0x9e, 0x2f, 0x46, 0x1e, 0xb5, 0xc9, 0xc0, 0x48, 0x01, 0x37, 0xa7, 0x4e, 0x3b, - 0xda, 0x5d, 0xe0, 0xa4, 0x0e, 0xa1, 0x27, 0xbd, 0xa8, 0x54, 0x9a, 0x9f, 0xc4, 0x22, 0x5a, 0x00, - 0x3f, 0x71, 0xc5, 0x44, 0x59, 0xe3, 0x47, 0xe4, 0xd2, 0xa0, 0x77, 0x86, 0x9e, 0x58, 0x1c, 0x09, - 0x8d, 0xd5, 0x51, 0x34, 0x53, 0x41, 0x0d, 0x6a, 0x3c, 0xa9, 0x29, 0xa4, 0xfc, 0xa5, 0xc9, 0x6e, - 0xae, 0x28, 0xd2, 0xa9, 0xf5, 0x71, 0xed, 0x20, 0xd2, 0x30, 0xda, 0x5d, 0x8c, 0xee, 0x2d, 0x5e, - 0x04, 0x8a, 0xcd, 0xf1, 0x5a, 0xae, 0x82, 0xd2, 0x08, 0x22, 0x64, 0x12, 0xd9, 0x2a, 0x02, 0x78, - 0x6b, 0xfa, 0x5d, 0x68, 0x36, 0x03, 0x43, 0x01, 0x3b, 0x70, 0x5a, 0x0b, 0x8f, 0x84, 0xe9, 0xab, - 0x8c, 0x0f, 0x07, 0xbe, 0xe0, 0x54, 0x59, 0xf8, 0x45, 0xed, 0x0a, 0x9c, 0xed, 0x84, 0x57, 0xa7, - 0x11, 0x46, 0x9c, 0x55, 0x65, 0x40, 0xd3, 0xc0, 0xaf, 0xf3, 0x27, 0x2d, 0x38, 0x20, 0xd2, 0x09, - 0xe3, 0xec, 0xd6, 0x17, 0x04, 0x27, 0x73, 0x83, 0x7f, 0xb2, 0x8e, 0x8b, 0xd0, 0xf3, 0x2c, 0xd0, - 0xf8, 0xe8, 0xcb, 0x17, 0xe4, 0xf8, 0xe6, 0xaf, 0x01, 0x0b, 0xda, 0xac, 0x7a, 0xa7, 0x41, 0x36, - 0xda, 0x56, 0x3f, 0x31, 0x26, 0x2a, 0x24, 0xe9, 0x48, 0x2d, 0xfe, 0x8f, 0x62, 0xc4, 0xa9, 0xab, - 0x23, 0xf3, 0x58, 0x1b, 0x25, 0x03, 0x3d, 0xe1, 0xae, 0x69, 0x34, 0xc6, 0x13, 0x1b, 0x66, 0xc1, - 0x29, 0xec, 0x7e, 0x08, 0xa6, 0x54, 0xe2, 0x88, 0xdf, 0x32, 0x91, 0x4c, 0xfe, 0x0d, 0x94, 0x05, - 0x14, 0x86, 0x5e, 0x5d, 0x22, 0xf9, 0x5a, 0xc2, 0x3e, 0x1d, 0x5d, 0x7b, 0x12, 0x51, 0xe6, 0xa5, - 0x8e, 0x10, 0xa9, 0xf9, 0x44, 0x82, 0xa2, 0x35, 0x01, 0xf1, 0x94, 0x35, 0x4d, 0xa2, 0xf1, 0x43, - 0x4b, 0xd7, 0x2c, 0xf4, 0x85, 0x59, 0xbc, 0x96, 0x05, 0x0e, 0x12, 0x88, 0x81, 0xae, 0x21, 0xed, - 0x7c, 0x6e, 0x2a, 0x45, 0x5d, 0xb7, 0x2a, 0x5c, 0x38, 0x33, 0x92, 0x1e, 0x5b, 0x2b, 0x38, 0xdc, - 0xf9, 0xdc, 0xad, 0x1c, 0x69, 0x0a, 0x10, 0x75, 0x31, 0x31, 0x00, 0xcf, 0x68, 0x9d, 0xa6, 0xa3, - 0xab, 0x76, 0x24, 0xfb, 0x4d, 0x3d, 0x41, 0x2e, 0x3d, 0xe4, 0x75, 0x54, 0xf6, 0xf7, 0xa7, 0xec, - 0x3f, 0x19, 0x25, 0x7a, 0x9f, 0x56, 0xc4, 0xb6, 0x16, 0x4d, 0x9d, 0xd5, 0x51, 0xaf, 0xec, 0x03, - 0x7b, 0x68, 0x9e, 0xa0, 0x53, 0x96, 0xd8, 0xad, 0x9a, 0xd0, 0x57, 0xd9, 0x78, 0x5c, 0x77, 0x46, - 0x4d, 0xe6, 0x57, 0x1f, 0x54, 0x93, 0x30, 0xb6, 0xd3, 0x6a, 0x4a, 0x6e, 0xdd, 0x56, 0x8b, 0x0e, - 0x56, 0xf7, 0x98, 0x57, 0x3c, 0xce, 0xeb, 0x28, 0x96, 0xf9, 0xd5, 0x14, 0x4b, 0x18, 0x1b, 0xc5, - 0x4a, 0x6e, 0x1d, 0xc5, 0x3a, 0xd8, 0x37, 0x7d, 0xac, 0x0d, 0x9b, 0x52, 0x73, 0x42, 0x4a, 0xe6, - 0x57, 0xbf, 0xbe, 0x2b, 0x40, 0xac, 0x2f, 0xf0, 0xca, 0xdc, 0xda, 0xb7, 0xd6, 0x34, 0xb0, 0x75, - 0x04, 0x57, 0x9f, 0x60, 0x14, 0xd9, 0xf5, 0xe4, 0x56, 0x9d, 0x65, 0x94, 0x99, 0x6b, 0x89, 0xd5, - 0x76, 0x82, 0x36, 0xb1, 0x53, 0x95, 0x09, 0x27, 0x7f, 0xda, 0xce, 0x75, 0xc9, 0x5c, 0x5f, 0x9f, - 0x86, 0xb6, 0x13, 0x5e, 0x2a, 0xaa, 0x9d, 0xa6, 0x92, 0xfc, 0x69, 0xa3, 0x45, 0xe6, 0xfa, 0xfa, - 0x04, 0xb3, 0xd1, 0xa2, 0xa2, 0xda, 0x7e, 0x92, 0x1c, 0xfc, 0x40, 0x98, 0xc2, 0xfb, 0xf2, 0xa7, - 0xed, 0xfd, 0x5f, 0x91, 0xe9, 0xeb, 0x13, 0xc2, 0xfa, 0x0e, 0xb0, 0x82, 0x69, 0x17, 0xae, 0x16, - 0xbf, 0xaa, 0x08, 0x61, 0x47, 0xf1, 0x14, 0x46, 0xaf, 0x24, 0x83, 0xed, 0x59, 0x5a, 0xd8, 0xf5, - 0xe8, 0xcf, 0x38, 0xfa, 0x33, 0x8e, 0xfe, 0x8c, 0xa3, 0x3f, 0xe3, 0xe8, 0xcf, 0x78, 0x1e, 0xfe, - 0x0c, 0x7e, 0x06, 0x59, 0x9e, 0x88, 0xd3, 0x0e, 0xd0, 0x51, 0x26, 0x78, 0x52, 0x2e, 0x0f, 0xf9, - 0xde, 0xd5, 0x7c, 0x96, 0x8f, 0x63, 0x68, 0xfd, 0x03, 0x7c, 0x20, 0xcc, 0x00, 0xa2, 0xe7, 0xdf, - 0x48, 0xdb, 0xda, 0x4b, 0xb8, 0xda, 0x85, 0x37, 0xd4, 0xa8, 0x15, 0x44, 0x37, 0x0d, 0x95, 0x0e, - 0xf2, 0xe9, 0x0b, 0xa3, 0x55, 0xf5, 0xa3, 0x5b, 0x85, 0xdf, 0xc1, 0xba, 0x7c, 0xfb, 0x73, 0xff, - 0xe3, 0x3f, 0x1a, 0xaf, 0xda, 0x9d, 0x93, 0xb2, 0xa9, 0x09, 0xab, 0x6b, 0x58, 0xe7, 0x80, 0xb1, - 0x1b, 0x83, 0xea, 0xd1, 0x98, 0x6d, 0xcf, 0xe7, 0x19, 0x76, 0xee, 0x63, 0x9a, 0x82, 0x87, 0x35, - 0xe3, 0x0e, 0x68, 0x82, 0x1d, 0xca, 0x8a, 0x3a, 0xa8, 0x09, 0xb4, 0x4f, 0x0b, 0xa6, 0x96, 0x4d, - 0xb6, 0x33, 0x40, 0xea, 0xed, 0x8f, 0xad, 0xec, 0x87, 0x7d, 0x9c, 0xb7, 0x53, 0x46, 0x6f, 0x3b, - 0x45, 0xbe, 0x6e, 0x68, 0x36, 0xd6, 0xc5, 0x29, 0xcc, 0xbb, 0xb7, 0xbf, 0xbc, 0xeb, 0xff, 0xf2, - 0xe6, 0xb7, 0xdf, 0xde, 0x10, 0x8d, 0xa1, 0xdb, 0x39, 0x0f, 0xec, 0xc1, 0xfb, 0xb8, 0x18, 0x67, - 0xb3, 0x1c, 0xb4, 0xef, 0xb2, 0xe8, 0x67, 0xb3, 0x5d, 0xdc, 0x9e, 0x47, 0xa5, 0x91, 0x27, 0xae, - 0x54, 0x09, 0xce, 0x3b, 0x8a, 0x65, 0x4a, 0x45, 0x7c, 0x43, 0xc5, 0x47, 0x46, 0x91, 0xa0, 0xa3, - 0xa6, 0x0c, 0xbf, 0x2a, 0xed, 0x90, 0xb8, 0x48, 0x36, 0x31, 0x70, 0x04, 0x7e, 0x4f, 0x93, 0x84, - 0x6e, 0xa8, 0x9e, 0xb8, 0xbc, 0xb9, 0xba, 0x8a, 0x1c, 0xd4, 0xa7, 0x5b, 0x78, 0x43, 0x82, 0xe9, - 0xd6, 0x42, 0x5b, 0x87, 0xbe, 0xe4, 0x07, 0x75, 0x22, 0x85, 0x5d, 0x68, 0x75, 0x8e, 0xe8, 0x6a, - 0xaf, 0xdb, 0xee, 0xbe, 0x0e, 0xa8, 0x10, 0x6f, 0x4a, 0x2a, 0xdc, 0x1a, 0x32, 0x68, 0xdd, 0x50, - 0xb3, 0x1c, 0xf9, 0x40, 0x2e, 0xbc, 0x0c, 0x59, 0xf8, 0x45, 0x21, 0x17, 0x8f, 0x0b, 0xda, 0x3c, - 0xca, 0xe0, 0x4f, 0x6e, 0xc7, 0xe5, 0x0e, 0xa1, 0x75, 0x0d, 0x23, 0xfc, 0xf0, 0xd4, 0xf5, 0x40, - 0xd3, 0x85, 0xd0, 0x9b, 0xad, 0x1c, 0x30, 0x04, 0xd2, 0x5a, 0x2a, 0x02, 0x1f, 0x52, 0x9a, 0x5a, - 0xca, 0x86, 0xa7, 0x09, 0x3d, 0x7d, 0xc5, 0x7b, 0x90, 0xb7, 0xfb, 0xff, 0x01, 0x20, 0xfc, 0x89, - 0x13 -}; + 0x78, 0xda, 0xed, 0x3d, 0x6b, 0x6f, 0xe3, 0x38, 0x92, 0xfb, 0x39, 0xbf, 0xc2, 0x83, 0x01, 0x16, + 0x92, 0x2c, 0x5b, 0xb6, 0x93, 0xf4, 0x4b, 0xab, 0x1b, 0x34, 0xba, 0x33, 0x73, 0x01, 0x66, 0xba, + 0x1b, 0x9d, 0x99, 0xbd, 0xc5, 0x0e, 0x1a, 0x86, 0x64, 0x2b, 0x8e, 0x6e, 0x6d, 0xcb, 0x67, 0x2b, + 0x89, 0x9d, 0x45, 0xfe, 0xfb, 0xb1, 0xf8, 0x26, 0x45, 0xca, 0x8f, 0xc4, 0x4e, 0x3a, 0x2b, 0x0c, + 0xa6, 0x63, 0x91, 0xc5, 0x62, 0x91, 0x2c, 0x16, 0xab, 0x8a, 0x64, 0xf1, 0xc7, 0xec, 0x72, 0x98, + 0x5e, 0x36, 0x7e, 0xf9, 0xb5, 0x7f, 0x76, 0x71, 0x34, 0x9b, 0xa7, 0x83, 0x6c, 0x91, 0xe5, 0xd3, + 0xc6, 0x55, 0x36, 0xba, 0x9a, 0x35, 0x2e, 0xc7, 0x79, 0x5c, 0x84, 0x47, 0x3f, 0xa6, 0xe3, 0x45, + 0x7a, 0xf4, 0x63, 0x76, 0xd9, 0xf8, 0x01, 0xc1, 0x66, 0xd3, 0x74, 0xe8, 0x8c, 0xf3, 0xdb, 0x99, + 0x7b, 0xf4, 0x23, 0xf9, 0x6c, 0xc0, 0x17, 0x82, 0x9a, 0x0e, 0xb3, 0x4b, 0x15, 0x6c, 0x92, 0x0e, + 0xb3, 0xeb, 0x89, 0x04, 0x49, 0x13, 0x8c, 0xc0, 0xb8, 0x4e, 0x01, 0x8a, 0x3f, 0x39, 0x20, 0xf9, + 0x73, 0x93, 0x0e, 0x7a, 0x8d, 0xeb, 0xe9, 0x2c, 0x1e, 0xfc, 0xab, 0x8f, 0x89, 0x73, 0x06, 0xf9, + 0x74, 0x51, 0x10, 0x42, 0x1b, 0x90, 0x9c, 0x0e, 0xff, 0x1e, 0x8f, 0xaf, 0x53, 0xb7, 0xf1, 0xef, + 0x6c, 0xca, 0x52, 0xce, 0xa7, 0x05, 0x4e, 0x8c, 0x50, 0x92, 0x23, 0x03, 0x85, 0x00, 0x73, 0xd3, + 0x89, 0x54, 0xb0, 0xa0, 0x77, 0xfa, 0x2a, 0x9c, 0xa7, 0xc5, 0xf5, 0x7c, 0xda, 0x80, 0x0a, 0x9d, + 0x9b, 0x8e, 0xaf, 0x42, 0xb4, 0x6e, 0x3a, 0x1e, 0x02, 0x72, 0xc3, 0x7b, 0x99, 0xa0, 0x1c, 0xfd, + 0x9b, 0x15, 0x2b, 0x03, 0x49, 0x9f, 0x49, 0x0e, 0x25, 0x0a, 0xfd, 0x4f, 0x13, 0x24, 0x82, 0x18, + 0x48, 0xd0, 0x53, 0xaa, 0x26, 0x8d, 0x14, 0x25, 0xdc, 0xa0, 0xdb, 0x7b, 0xdd, 0xee, 0xf8, 0x93, + 0x7c, 0xa8, 0x16, 0xf4, 0x7b, 0xed, 0x8e, 0x4b, 0x08, 0x3a, 0x69, 0x0c, 0xd3, 0x41, 0x3e, 0x4c, + 0xfb, 0x83, 0x7c, 0x9c, 0xcf, 0x29, 0x39, 0x98, 0xd0, 0x74, 0x0a, 0xe9, 0xc3, 0x0f, 0x90, 0x8e, + 0x88, 0x11, 0x15, 0x9d, 0x38, 0x4a, 0xa7, 0xca, 0x70, 0x7f, 0x76, 0xbe, 0x21, 0xa2, 0x4e, 0x4f, + 0x51, 0xa5, 0x76, 0x98, 0x2e, 0x83, 0x39, 0x42, 0x24, 0x90, 0x96, 0x53, 0xe0, 0x49, 0xb6, 0xec, + 0xe3, 0x96, 0x48, 0x64, 0x48, 0x43, 0xe0, 0xcb, 0x9d, 0x55, 0x08, 0x9a, 0x50, 0x31, 0x79, 0xa4, + 0x10, 0x11, 0xbe, 0xfc, 0xd9, 0xfd, 0xe6, 0x17, 0xac, 0xb1, 0x52, 0x45, 0x5a, 0x83, 0x4f, 0x68, + 0x4d, 0x98, 0xc6, 0x45, 0xa9, 0x2a, 0x0c, 0x31, 0xc9, 0xa6, 0x38, 0x3b, 0x52, 0xfa, 0x0c, 0x53, + 0x2c, 0x17, 0x16, 0x04, 0xd0, 0x6f, 0xd4, 0x62, 0x37, 0x24, 0x18, 0xe2, 0xe5, 0x46, 0x18, 0x7a, + 0x1a, 0x86, 0x63, 0xc0, 0x20, 0x35, 0x97, 0x51, 0xe2, 0x33, 0x84, 0xac, 0x89, 0xbd, 0xc6, 0x28, + 0x2d, 0xfa, 0xb3, 0xb8, 0x28, 0xd2, 0xf9, 0xb4, 0x3f, 0xcb, 0x17, 0x4a, 0x5f, 0x66, 0xcb, 0x74, + 0x8c, 0xea, 0xcc, 0xe7, 0xc3, 0xfe, 0xf5, 0x6c, 0x96, 0xce, 0x7d, 0x4b, 0x26, 0x9a, 0xa3, 0x5a, + 0x26, 0x45, 0xb8, 0xc8, 0xee, 0xb4, 0x61, 0xc8, 0xc6, 0x69, 0xff, 0x7a, 0x9a, 0x15, 0x8b, 0x7e, + 0x91, 0xf7, 0x31, 0x8e, 0x85, 0x52, 0x30, 0x5f, 0x90, 0xde, 0xeb, 0x35, 0xf2, 0xcb, 0xcb, 0x45, + 0x5a, 0x44, 0xc0, 0x8d, 0xec, 0xff, 0x32, 0x41, 0x72, 0x45, 0x2e, 0xcc, 0x9b, 0x76, 0xc7, 0x94, + 0xd6, 0x2c, 0x53, 0xab, 0x40, 0xb1, 0xbe, 0x72, 0x4c, 0xf4, 0x79, 0x88, 0xa8, 0x26, 0xa1, 0xc6, + 0x0d, 0xe4, 0x62, 0xe1, 0xfd, 0xd1, 0x5f, 0x7e, 0x34, 0xcb, 0x38, 0x2a, 0x8b, 0x9e, 0x9f, 0x94, + 0xfb, 0x0b, 0xa2, 0x7f, 0x9e, 0x25, 0xd7, 0x45, 0x4a, 0x3a, 0x3c, 0x86, 0x41, 0x0f, 0x51, 0x8b, + 0x2f, 0xf3, 0xf9, 0x04, 0xf1, 0x5b, 0x81, 0x98, 0xbe, 0x8f, 0xfe, 0xcc, 0xb3, 0x65, 0x78, 0x93, + 0x67, 0x43, 0x94, 0x94, 0x4d, 0x1d, 0x34, 0x26, 0xa3, 0x71, 0xff, 0x4b, 0xbe, 0xc8, 0x0a, 0xd4, + 0xba, 0x88, 0x41, 0x78, 0x78, 0x7a, 0x63, 0x14, 0x7e, 0xc7, 0xef, 0xba, 0xd0, 0x21, 0x0c, 0x15, + 0x99, 0x3f, 0x84, 0x63, 0x39, 0x7e, 0x3a, 0x7d, 0x99, 0x38, 0x2b, 0xd5, 0xf0, 0xf3, 0x3c, 0x1e, + 0x11, 0x86, 0xa7, 0x25, 0x3d, 0x01, 0x7b, 0x44, 0xbb, 0xfa, 0xf3, 0xdf, 0xcf, 0xbe, 0x7e, 0xfc, + 0xfa, 0xfe, 0x7f, 0xfa, 0xe7, 0x9f, 0x2e, 0xbe, 0x9c, 0x7d, 0xf8, 0xfd, 0xf3, 0xd7, 0x23, 0xa5, + 0x24, 0xa6, 0xa9, 0x8b, 0x24, 0x56, 0xc8, 0xda, 0x2c, 0x51, 0xa5, 0x36, 0x50, 0xa2, 0x15, 0x49, + 0xda, 0xbe, 0x3c, 0xb6, 0xfd, 0xb8, 0x32, 0x37, 0x29, 0xe5, 0xea, 0xac, 0x59, 0x05, 0x80, 0x39, + 0xb0, 0xd4, 0x29, 0x8b, 0x41, 0x3c, 0x96, 0xeb, 0x55, 0xd3, 0x93, 0x52, 0xba, 0x89, 0x57, 0x43, + 0xe3, 0xf0, 0xde, 0xc4, 0xf3, 0x55, 0x36, 0x1d, 0x91, 0xa4, 0x1b, 0x48, 0x42, 0xd5, 0x18, 0x12, + 0x93, 0x1d, 0x86, 0x9c, 0xa2, 0x8b, 0x74, 0x39, 0x62, 0xe8, 0x12, 0xdf, 0xd0, 0x0b, 0x3e, 0x6f, + 0xb7, 0xa7, 0x0f, 0x80, 0x6f, 0x6e, 0xa2, 0x8f, 0x2b, 0x67, 0x15, 0x27, 0x0f, 0xae, 0x38, 0xd1, + 0x2b, 0x4e, 0xd6, 0x54, 0xac, 0x32, 0xb9, 0xcc, 0x1a, 0xc5, 0xd8, 0xce, 0x36, 0xc9, 0xdc, 0x9e, + 0x87, 0xca, 0x25, 0x15, 0xe5, 0x4a, 0x79, 0x45, 0xba, 0xc4, 0xf2, 0x47, 0xe7, 0x88, 0x89, 0xc4, + 0xd3, 0xfa, 0x54, 0x63, 0xe9, 0x8b, 0x78, 0x32, 0x1b, 0xa7, 0xf3, 0xde, 0x47, 0x94, 0x97, 0x4d, + 0xe2, 0x51, 0xba, 0x2b, 0x77, 0xe0, 0x1c, 0x8c, 0x01, 0xf7, 0x2a, 0x16, 0xd4, 0xb4, 0xb4, 0x8f, + 0xa7, 0x1f, 0x13, 0xe8, 0x11, 0xac, 0x40, 0x6a, 0x27, 0x05, 0xbc, 0x0d, 0xbe, 0xda, 0x43, 0x52, + 0x86, 0x40, 0x4d, 0x17, 0x43, 0x2c, 0x10, 0xba, 0x11, 0xca, 0x47, 0xb2, 0x3a, 0xed, 0x7d, 0x74, + 0x68, 0x03, 0x7c, 0xc2, 0x0e, 0x2a, 0x39, 0x88, 0x31, 0x04, 0x41, 0x89, 0x4a, 0x50, 0xaf, 0x4c, + 0x51, 0x62, 0xa3, 0x28, 0x31, 0x52, 0xd4, 0x4f, 0x64, 0x9a, 0x7a, 0x66, 0x9a, 0x7a, 0x6e, 0xa8, + 0x08, 0x26, 0xa8, 0x94, 0xb4, 0xc1, 0x27, 0xc5, 0x7c, 0x3c, 0x62, 0xee, 0x61, 0x64, 0x5c, 0x92, + 0xe7, 0x63, 0x2e, 0x4c, 0x6e, 0xb3, 0xe2, 0x0a, 0x01, 0xcc, 0xf4, 0xdc, 0x59, 0x56, 0x0c, 0xae, + 0xca, 0xb9, 0x94, 0xed, 0x50, 0x23, 0xe7, 0xd7, 0x48, 0x0b, 0xc1, 0x38, 0x78, 0x26, 0x2c, 0x5d, + 0x9c, 0xdb, 0x86, 0xe9, 0x4d, 0x36, 0x48, 0xe9, 0x6c, 0x9b, 0xc7, 0x48, 0x74, 0x70, 0x38, 0x49, + 0xed, 0x87, 0x75, 0x21, 0x9e, 0xa4, 0xf3, 0x18, 0x26, 0xd7, 0x20, 0x9d, 0xa2, 0xce, 0xee, 0x0f, + 0xb3, 0x45, 0x11, 0x4f, 0x07, 0xe9, 0x5a, 0x09, 0x76, 0x8c, 0xd8, 0x71, 0x18, 0x17, 0x31, 0xee, + 0xac, 0x29, 0xf4, 0xd6, 0x7f, 0xbf, 0xbf, 0xe8, 0xff, 0xf1, 0xe9, 0xfc, 0xe7, 0xcf, 0x5f, 0x7f, + 0xeb, 0xd3, 0x75, 0xe3, 0xc8, 0x48, 0x1d, 0xce, 0xea, 0x17, 0x52, 0x15, 0x84, 0x28, 0x3c, 0x94, + 0x31, 0x5d, 0xab, 0x58, 0x55, 0x52, 0x16, 0xc9, 0xa0, 0xab, 0xb8, 0xda, 0x1e, 0x65, 0x99, 0x93, + 0x16, 0x65, 0x03, 0x61, 0xf3, 0x18, 0xad, 0xdc, 0x0b, 0x33, 0x65, 0x24, 0x4f, 0x21, 0x8d, 0xa9, + 0x10, 0xb4, 0x17, 0x08, 0x04, 0xa7, 0x4e, 0x51, 0x30, 0x1a, 0x34, 0x53, 0xa3, 0x50, 0x85, 0x61, + 0x95, 0xac, 0xa1, 0x32, 0x19, 0x5f, 0x5b, 0x7a, 0x0f, 0x72, 0x14, 0x0a, 0x71, 0x2e, 0x25, 0x0f, + 0x32, 0x39, 0x71, 0x52, 0x31, 0x9c, 0xae, 0xd1, 0x55, 0xc2, 0xba, 0x86, 0x24, 0x3a, 0x3b, 0xcc, + 0xe5, 0x69, 0xa6, 0x95, 0x30, 0xae, 0x6a, 0x94, 0x69, 0x13, 0xb3, 0xce, 0x4e, 0x9e, 0x04, 0x53, + 0x41, 0xe1, 0xa2, 0x98, 0xe7, 0xff, 0x4a, 0xab, 0x58, 0x4f, 0x86, 0xb0, 0x73, 0xa0, 0x0c, 0x65, + 0x62, 0x44, 0x25, 0xbf, 0x8a, 0x1f, 0x75, 0xc0, 0xf5, 0xb4, 0xdf, 0x66, 0xc3, 0xe2, 0xaa, 0x92, + 0x76, 0x0c, 0x51, 0xc5, 0xa2, 0x32, 0x9c, 0x85, 0x51, 0x15, 0x90, 0x35, 0xec, 0xaa, 0xc3, 0xae, + 0x6f, 0x43, 0x25, 0xa3, 0xa8, 0x30, 0x56, 0x7e, 0x51, 0xc1, 0x4c, 0x6c, 0xa3, 0x41, 0x54, 0x71, + 0x4f, 0x19, 0x94, 0xb8, 0x1a, 0xf8, 0x3a, 0x0a, 0xbf, 0xd0, 0x5a, 0x5a, 0x29, 0xca, 0x06, 0x44, + 0x21, 0xd6, 0x4d, 0x51, 0x2a, 0xaf, 0x7c, 0x2e, 0xd6, 0x5c, 0x46, 0x8a, 0x2e, 0xb9, 0xa2, 0xad, + 0xe4, 0x13, 0xf9, 0x13, 0xe9, 0x36, 0x36, 0x93, 0x40, 0xbe, 0x10, 0x56, 0xbc, 0x42, 0x93, 0x30, + 0x8a, 0xb6, 0x91, 0x37, 0xf0, 0x8f, 0xa1, 0x46, 0x48, 0xf6, 0x99, 0xe0, 0xe1, 0xb5, 0x69, 0xd2, + 0x25, 0xda, 0x4a, 0x86, 0xd0, 0xbf, 0x86, 0xca, 0x68, 0x8e, 0x2f, 0x89, 0x14, 0x53, 0x95, 0x1c, + 0xc1, 0x2e, 0xa2, 0x41, 0xfe, 0x30, 0x8d, 0xa8, 0x9c, 0xef, 0xeb, 0x42, 0xc3, 0x34, 0xbe, 0x2a, + 0xc2, 0x9d, 0xa7, 0xbd, 0xfc, 0x61, 0xe8, 0x1a, 0x39, 0xdb, 0xd7, 0xe5, 0x81, 0x85, 0x0b, 0x54, + 0x94, 0x0f, 0x98, 0xcc, 0xea, 0xa7, 0x9d, 0x3a, 0x31, 0x7e, 0xfa, 0x4c, 0x37, 0x0d, 0xa3, 0x8e, + 0xd5, 0x3a, 0x55, 0xb1, 0x6f, 0x8b, 0x28, 0x3e, 0x11, 0xae, 0x10, 0xd4, 0x4a, 0x62, 0xff, 0x80, + 0x5b, 0xcc, 0x43, 0xff, 0xb4, 0x84, 0x76, 0x39, 0xc8, 0xe6, 0x03, 0xa4, 0x5f, 0x11, 0x9d, 0x26, + 0x42, 0x55, 0xe1, 0x61, 0x45, 0xc0, 0x5e, 0xa7, 0x7d, 0xea, 0x86, 0xc8, 0x58, 0x77, 0x74, 0x2d, + 0x8b, 0xa9, 0xd2, 0x83, 0x7c, 0x3e, 0x45, 0x7a, 0xd0, 0x8c, 0x59, 0x5c, 0x0a, 0x2a, 0x5a, 0x52, + 0xd5, 0xde, 0x50, 0x49, 0xad, 0x50, 0x33, 0xa2, 0xa4, 0x7a, 0x0e, 0x99, 0x7c, 0x4d, 0xb9, 0xdf, + 0x41, 0xd3, 0x54, 0x75, 0xb8, 0xfb, 0x06, 0xf4, 0x0b, 0x75, 0x57, 0xcd, 0xe6, 0xf9, 0xff, 0xa6, + 0x83, 0x22, 0x1d, 0x32, 0xf2, 0x55, 0x9b, 0x4f, 0xa1, 0x87, 0xd8, 0x7e, 0x0f, 0xab, 0xdd, 0x73, + 0xf4, 0x1a, 0xdb, 0xb7, 0x41, 0x85, 0x66, 0x88, 0x2c, 0x2f, 0xbb, 0x45, 0xaa, 0x91, 0x42, 0xdd, + 0x11, 0xb4, 0x79, 0x15, 0xc5, 0xca, 0x8d, 0xb2, 0xf4, 0xb4, 0x84, 0xa3, 0xbd, 0x5c, 0x6d, 0xdb, + 0xd4, 0x2a, 0x85, 0xd7, 0x40, 0xe5, 0x0e, 0x35, 0xc8, 0xa5, 0x6f, 0xc3, 0xfb, 0x7b, 0x89, 0xd7, + 0xe3, 0x69, 0x91, 0xc5, 0xe3, 0x2c, 0x5e, 0x60, 0x71, 0x89, 0x98, 0x35, 0x30, 0x29, 0xea, 0x81, + 0xb1, 0x9e, 0x90, 0x28, 0xdb, 0xc0, 0xfa, 0xc7, 0x0e, 0xad, 0xb1, 0xbd, 0xf4, 0xd9, 0xaf, 0x95, + 0xaf, 0x20, 0xc7, 0xc6, 0xf1, 0xd6, 0xba, 0xfa, 0xbe, 0x35, 0xee, 0xc3, 0xe8, 0xcc, 0x7b, 0x56, + 0x7e, 0x0f, 0xa7, 0xbf, 0x3e, 0x85, 0xde, 0xf9, 0x94, 0xda, 0xe2, 0x9e, 0x55, 0x3c, 0xaa, 0xde, + 0xd9, 0x98, 0x7f, 0x13, 0x65, 0xcd, 0xca, 0xd9, 0x1b, 0x2b, 0x5e, 0x16, 0x9e, 0x5d, 0xaf, 0x4a, + 0xd9, 0x19, 0x72, 0x53, 0x9d, 0x68, 0x0d, 0xb7, 0x6d, 0xaf, 0xcc, 0xac, 0x61, 0xa5, 0x9d, 0xd4, + 0x90, 0xb5, 0x4c, 0xf2, 0x60, 0xd5, 0x01, 0xcb, 0x41, 0x24, 0xd7, 0x43, 0x82, 0x84, 0x09, 0xef, + 0x71, 0x3a, 0x1d, 0x21, 0xca, 0xc8, 0x1f, 0x26, 0x60, 0xdd, 0xd0, 0x2a, 0xbd, 0x29, 0x9e, 0xbb, + 0x50, 0xcb, 0x44, 0x6b, 0x28, 0xce, 0x6f, 0x4d, 0xe2, 0xa5, 0x83, 0xf5, 0x66, 0x4d, 0x30, 0x2b, + 0x23, 0xd5, 0x2f, 0xa2, 0xc5, 0x24, 0xcf, 0x8b, 0xab, 0x45, 0x91, 0xce, 0x9c, 0x4e, 0xbb, 0xe3, + 0xeb, 0x88, 0x7c, 0x95, 0x40, 0xa2, 0xe2, 0x10, 0x1c, 0x54, 0x1d, 0x8d, 0xe4, 0xbe, 0x6c, 0xfc, + 0xad, 0x81, 0xb0, 0x74, 0x1b, 0x3f, 0xc1, 0x9f, 0xc6, 0xbb, 0x86, 0x84, 0xbd, 0x84, 0x19, 0xaa, + 0xd3, 0xb0, 0x13, 0x86, 0x35, 0xaf, 0x40, 0x9a, 0x17, 0x8d, 0xb7, 0xc0, 0xe3, 0xfe, 0x34, 0x8f, + 0xa9, 0x7e, 0x32, 0xc7, 0x78, 0x9a, 0x5a, 0x28, 0x29, 0xd1, 0x0f, 0xf0, 0xb1, 0xed, 0x7b, 0xf7, + 0xc4, 0xbe, 0x21, 0x22, 0xc8, 0x59, 0xeb, 0xea, 0x63, 0xa2, 0xc9, 0xec, 0xaf, 0xb3, 0x39, 0x86, + 0x59, 0x7a, 0x86, 0xb4, 0x93, 0xe9, 0x02, 0x72, 0x36, 0xd9, 0x4b, 0xa0, 0x75, 0xd8, 0x16, 0xf8, + 0xdb, 0x14, 0x4d, 0xef, 0xc2, 0x2c, 0x39, 0x49, 0x9e, 0xd9, 0x19, 0x02, 0xb5, 0x91, 0x7c, 0xcd, + 0x0d, 0x42, 0x0a, 0xd3, 0x2c, 0xe3, 0x4a, 0xa4, 0xa2, 0x3f, 0x84, 0x4f, 0x6e, 0x3b, 0x15, 0x82, + 0xec, 0x76, 0xca, 0xb4, 0xfe, 0xf3, 0xec, 0xeb, 0x67, 0xac, 0x96, 0xe1, 0x6d, 0xee, 0xa0, 0xfb, + 0xaa, 0xdd, 0x09, 0xf9, 0x26, 0xde, 0x2f, 0xef, 0xff, 0xb8, 0xb8, 0xe8, 0x7f, 0xf8, 0x7c, 0xf6, + 0x33, 0x9a, 0x5a, 0xc7, 0x6f, 0xdf, 0xbc, 0x3d, 0xe9, 0xf5, 0xde, 0x74, 0x4e, 0x3a, 0xdd, 0x93, + 0xe3, 0xde, 0xeb, 0x8d, 0x3d, 0x09, 0x74, 0x1c, 0xc8, 0x1f, 0x83, 0x0d, 0x45, 0x32, 0x7c, 0x31, + 0x28, 0x9a, 0xb1, 0x29, 0x77, 0x7b, 0xb4, 0x5d, 0xdf, 0x9a, 0xd7, 0xa8, 0x47, 0xf7, 0x2e, 0xd0, + 0xd3, 0x12, 0x98, 0xd7, 0x87, 0xfd, 0x8d, 0x2c, 0x36, 0x82, 0xf0, 0x22, 0x5a, 0xfc, 0xdf, 0xbc, + 0x70, 0x5a, 0x28, 0xd9, 0x1b, 0xe7, 0x23, 0x07, 0x46, 0x23, 0x20, 0x0d, 0x0c, 0xa4, 0xd9, 0x10, + 0x88, 0x81, 0x70, 0xdd, 0xe0, 0x18, 0x0d, 0x11, 0x67, 0xfe, 0xe8, 0xc2, 0xd3, 0x2b, 0x0e, 0x35, + 0xe1, 0xcf, 0x74, 0x79, 0x42, 0x74, 0xc9, 0x0e, 0x23, 0xf6, 0x57, 0xbe, 0x20, 0xb3, 0x5c, 0x37, + 0x1b, 0x9b, 0x14, 0x98, 0x48, 0x09, 0xa3, 0x28, 0x81, 0x99, 0x29, 0xc9, 0x05, 0x75, 0x26, 0x88, + 0x19, 0xbd, 0xd3, 0xe4, 0x7d, 0xac, 0x09, 0xb8, 0x25, 0x43, 0x5b, 0xf5, 0x26, 0x4a, 0xd6, 0x26, + 0x8c, 0x49, 0x72, 0x87, 0x51, 0x0b, 0x75, 0xa3, 0x87, 0xc6, 0x0c, 0xff, 0x3f, 0xcc, 0x0b, 0x87, + 0xb7, 0xdd, 0xe7, 0xbf, 0x18, 0x3f, 0xdc, 0xc4, 0xe3, 0x88, 0xa0, 0xf1, 0xa4, 0xae, 0xf3, 0x04, + 0xd9, 0x5e, 0xba, 0x9c, 0x39, 0x43, 0x6d, 0x59, 0xc2, 0x03, 0x87, 0x8a, 0xc2, 0x4e, 0x13, 0xfb, + 0xdf, 0x3d, 0xc0, 0x9e, 0xf5, 0x6d, 0x3e, 0x1f, 0x0f, 0x37, 0xdd, 0xf5, 0xdd, 0x6a, 0x4d, 0xf2, + 0x28, 0x72, 0x69, 0x9b, 0xb7, 0xbd, 0x8c, 0x62, 0xf2, 0x97, 0x7e, 0xaf, 0x40, 0x6c, 0xb5, 0x48, + 0xda, 0x4a, 0x66, 0xc0, 0xf2, 0x2e, 0xa3, 0x29, 0x87, 0xac, 0xc9, 0x73, 0x94, 0x62, 0x3f, 0x21, + 0xb0, 0xa6, 0x11, 0xf4, 0x58, 0x89, 0x61, 0x07, 0x0e, 0x03, 0xbb, 0xed, 0xb9, 0xb4, 0x51, 0xa7, + 0x40, 0x89, 0xca, 0x7d, 0x2c, 0x25, 0x0a, 0x1f, 0xe6, 0x9a, 0x36, 0xac, 0x0f, 0x3a, 0x84, 0xd0, + 0xd9, 0x44, 0x79, 0x28, 0x25, 0xc6, 0xd3, 0xc1, 0x55, 0x3e, 0x37, 0xe7, 0xb1, 0x09, 0x5b, 0xc6, + 0x34, 0x8e, 0x07, 0xa9, 0x81, 0x0f, 0x16, 0x57, 0xd9, 0x65, 0x11, 0x6e, 0xc4, 0x49, 0xd5, 0xda, + 0x82, 0xdd, 0x7d, 0xc1, 0x46, 0x88, 0xce, 0x1e, 0x46, 0x8a, 0x9e, 0x3c, 0xcd, 0x8b, 0x3f, 0x16, + 0x90, 0xae, 0xed, 0x21, 0x4b, 0x7e, 0xa7, 0x2f, 0x39, 0x9a, 0x6e, 0x25, 0x56, 0x14, 0xfd, 0x41, + 0x38, 0x51, 0x9e, 0xf7, 0x82, 0x2a, 0x0a, 0xc5, 0xa8, 0x8a, 0x54, 0xa4, 0xed, 0x5b, 0xb5, 0x58, + 0x3e, 0x1e, 0xe3, 0x73, 0x3a, 0xfd, 0x59, 0x3a, 0x5f, 0xcc, 0x10, 0x5c, 0x76, 0x93, 0x12, 0x2f, + 0x48, 0x34, 0x18, 0x23, 0x8e, 0x40, 0x43, 0x77, 0xda, 0x04, 0x99, 0xe1, 0x54, 0xb4, 0x3c, 0xb0, + 0xd6, 0xee, 0x62, 0x1d, 0xf7, 0x04, 0x86, 0x7f, 0xad, 0xe2, 0xc7, 0x44, 0x85, 0xee, 0xfd, 0x71, + 0xf8, 0x68, 0x37, 0xe9, 0x30, 0xae, 0xf1, 0xf9, 0x78, 0x15, 0xad, 0x0a, 0xd9, 0xb0, 0x44, 0x8c, + 0x55, 0xf0, 0x14, 0xa6, 0x63, 0x22, 0x12, 0x57, 0xb2, 0xff, 0x66, 0x97, 0x01, 0xa5, 0x56, 0xc9, + 0x78, 0x76, 0x15, 0x47, 0xa8, 0xff, 0x42, 0xa3, 0x94, 0xc3, 0x8d, 0x66, 0x0d, 0xf7, 0x30, 0x30, + 0xf6, 0xba, 0xb1, 0xaa, 0x1a, 0xff, 0xd5, 0x80, 0xa9, 0x68, 0x52, 0x80, 0xa5, 0x92, 0x78, 0xba, + 0xd2, 0xd2, 0xf7, 0xa4, 0x38, 0x25, 0xc9, 0x58, 0xde, 0x8b, 0xda, 0xdd, 0xf0, 0xfe, 0x20, 0xb3, + 0xf0, 0x59, 0x4d, 0x37, 0x2d, 0x5d, 0xdb, 0x46, 0xd6, 0x14, 0x01, 0x73, 0x32, 0x53, 0x52, 0xea, + 0x99, 0x6b, 0x9c, 0xb9, 0x32, 0x7d, 0xb3, 0x78, 0x38, 0x44, 0x1d, 0xd8, 0xbf, 0x8c, 0x07, 0x45, + 0x0e, 0xbe, 0xd6, 0x5e, 0x69, 0x62, 0x73, 0xfe, 0x29, 0x4d, 0x67, 0xb5, 0xf0, 0x3e, 0x66, 0x37, + 0x1b, 0xff, 0x28, 0x4e, 0x16, 0x42, 0xc0, 0xb4, 0x57, 0xae, 0xa4, 0xcc, 0x0a, 0xfa, 0x54, 0x7a, + 0x42, 0x8d, 0x1f, 0xa2, 0x2d, 0x7c, 0xdc, 0x95, 0xd4, 0x4b, 0x6a, 0x03, 0x5f, 0xfd, 0x6f, 0x10, + 0x14, 0xf6, 0xc0, 0xb3, 0xba, 0x9f, 0x07, 0xd7, 0xeb, 0xe2, 0x4d, 0x52, 0x2d, 0xb6, 0x16, 0x6e, + 0x83, 0x5d, 0xa5, 0xda, 0x80, 0x8a, 0xb3, 0x1e, 0x3b, 0x0e, 0xad, 0x10, 0xac, 0x79, 0x94, 0xb4, + 0xe6, 0xb8, 0x95, 0xee, 0x27, 0xa1, 0x0b, 0x7b, 0x26, 0x9c, 0xa1, 0xc1, 0xa5, 0xd6, 0x45, 0x16, + 0xab, 0x11, 0x38, 0x30, 0x8c, 0xa2, 0x62, 0xc1, 0xb1, 0x51, 0xa9, 0xaa, 0x8a, 0xf1, 0x0f, 0xb0, + 0x54, 0x3a, 0x1c, 0xa5, 0x98, 0x6f, 0x8d, 0xbe, 0xa3, 0x4a, 0x07, 0x57, 0x4b, 0xd9, 0xc0, 0x84, + 0x9e, 0x6e, 0xe9, 0x98, 0xad, 0x5e, 0x26, 0xe2, 0x7e, 0xbc, 0x3f, 0xdc, 0xc1, 0x59, 0xc3, 0x2e, + 0xc7, 0xda, 0x63, 0xb2, 0x5b, 0xd2, 0xf7, 0xbd, 0x9d, 0x9c, 0x7a, 0x4e, 0x07, 0x80, 0x4a, 0x06, + 0xea, 0x93, 0x9f, 0xdb, 0x38, 0xc0, 0xd1, 0x86, 0x4d, 0x79, 0xf8, 0x49, 0x76, 0xf9, 0x1e, 0x79, + 0x87, 0x6c, 0xcf, 0x3b, 0x37, 0x5b, 0x6d, 0x9f, 0x18, 0x6c, 0xd1, 0x47, 0x39, 0x2a, 0xba, 0x85, + 0xac, 0x30, 0xfa, 0x1b, 0x0c, 0x56, 0xb9, 0x6d, 0x70, 0xae, 0x8b, 0x71, 0x36, 0xad, 0x3c, 0x1a, + 0xa7, 0x80, 0xd8, 0x65, 0x8c, 0x02, 0x66, 0x92, 0x35, 0x2a, 0x40, 0x15, 0x57, 0x95, 0x20, 0x5f, + 0x90, 0xec, 0x51, 0x3b, 0x5c, 0xf9, 0x32, 0xc9, 0x22, 0x05, 0xc0, 0x2f, 0x0d, 0x86, 0x49, 0x36, + 0x69, 0x38, 0x77, 0xea, 0xcd, 0xa7, 0x96, 0x55, 0x98, 0x67, 0x23, 0x47, 0xd5, 0xcd, 0x03, 0x45, + 0xe3, 0x6e, 0xc2, 0xa4, 0x09, 0xc0, 0x2b, 0xcc, 0xb8, 0x5e, 0x3d, 0xdb, 0xb0, 0x15, 0xe3, 0x1f, + 0x9c, 0x5d, 0x0f, 0x27, 0x0c, 0xd5, 0x86, 0xee, 0xc2, 0x27, 0x0f, 0x14, 0x92, 0x42, 0x55, 0x14, + 0x7a, 0x2c, 0x1a, 0x98, 0x16, 0x17, 0x83, 0xf9, 0x1c, 0x19, 0x44, 0x2b, 0xa6, 0x21, 0x12, 0xed, + 0x1d, 0xfc, 0x96, 0xda, 0x16, 0x28, 0x68, 0xdf, 0x80, 0x45, 0x57, 0x05, 0x65, 0xb2, 0x3d, 0x07, + 0x17, 0x67, 0x52, 0xf8, 0x70, 0x1e, 0xde, 0xc7, 0xbb, 0x6e, 0xc4, 0x4e, 0x6a, 0x60, 0xeb, 0xe6, + 0xa1, 0xd7, 0x85, 0x36, 0x9f, 0x0e, 0xcf, 0xfe, 0x0c, 0x37, 0xbb, 0xf4, 0x71, 0x39, 0xcf, 0x27, + 0x66, 0x3c, 0x32, 0x84, 0x91, 0x56, 0x58, 0xa6, 0x64, 0x20, 0x95, 0x60, 0x7a, 0x6b, 0x54, 0xca, + 0x36, 0x11, 0x4d, 0x87, 0x47, 0x87, 0xdb, 0x80, 0xf0, 0x22, 0xaf, 0x26, 0x1b, 0x59, 0x3a, 0xeb, + 0x88, 0x2e, 0xf2, 0x0a, 0x92, 0x51, 0xe6, 0x06, 0x04, 0x13, 0xa8, 0xcd, 0x97, 0xab, 0xa7, 0x3a, + 0x97, 0xab, 0x0c, 0xb7, 0xfc, 0x11, 0xc5, 0x7d, 0xd3, 0x20, 0x49, 0x5b, 0xbf, 0xea, 0x28, 0x46, + 0xbb, 0x0e, 0x96, 0xf8, 0x19, 0xc5, 0xfd, 0x72, 0x27, 0x1b, 0x2b, 0x44, 0xb0, 0xe6, 0xae, 0x96, + 0x6f, 0xdd, 0xc2, 0x0d, 0xab, 0x48, 0xa6, 0x09, 0x8e, 0x9d, 0x28, 0x10, 0x70, 0xd5, 0x4a, 0x85, + 0xb8, 0xbb, 0x0d, 0x75, 0x1c, 0x49, 0x24, 0x2a, 0x32, 0x61, 0x50, 0xf2, 0x51, 0x79, 0xea, 0x01, + 0x03, 0xc1, 0xf3, 0x15, 0x3b, 0xe4, 0xa8, 0x90, 0x69, 0x2f, 0x43, 0x71, 0xf9, 0x57, 0xcd, 0x61, + 0xa7, 0x61, 0x80, 0x84, 0x0b, 0xea, 0x54, 0x22, 0x39, 0xec, 0x80, 0x4b, 0x91, 0xab, 0xe9, 0xb7, + 0xe1, 0x66, 0xeb, 0x3b, 0xd0, 0x8a, 0x84, 0xf9, 0x6c, 0x1c, 0xaf, 0xe8, 0x75, 0x42, 0xb2, 0x17, + 0xec, 0xc8, 0x5d, 0xd0, 0x5e, 0xb6, 0xe4, 0x3e, 0x6b, 0x2f, 0xdd, 0x40, 0x90, 0xef, 0xab, 0xa0, + 0x2b, 0x15, 0x74, 0x25, 0x83, 0x9a, 0xea, 0x4b, 0xca, 0xf5, 0x25, 0x6a, 0x7d, 0x49, 0x45, 0x7d, + 0x89, 0x5a, 0x5f, 0x52, 0xaa, 0xef, 0x81, 0xb7, 0x2e, 0x79, 0x87, 0x7b, 0x6a, 0x27, 0xf9, 0x7c, + 0x8c, 0x1e, 0xeb, 0x9a, 0x25, 0x1d, 0x40, 0xb5, 0x9e, 0xc4, 0x52, 0xcf, 0x0e, 0x1a, 0xd9, 0x9a, + 0xab, 0x91, 0xf6, 0x8d, 0x48, 0x26, 0x1e, 0x2f, 0xe3, 0x61, 0xba, 0xd7, 0x25, 0xef, 0x70, 0xab, + 0xd6, 0xa1, 0x97, 0x9b, 0x7d, 0xae, 0x15, 0xfb, 0x38, 0x78, 0xa8, 0x74, 0xd6, 0x2e, 0x02, 0xbd, + 0xb2, 0x37, 0xbe, 0x3b, 0x81, 0xbd, 0xdd, 0x0d, 0x5e, 0xcb, 0xfd, 0xdd, 0x27, 0xba, 0xbd, 0x6b, + 0xb9, 0xbb, 0xfb, 0x68, 0x37, 0x77, 0xf7, 0x6c, 0x54, 0x98, 0xee, 0x02, 0x83, 0x20, 0xa2, 0xae, + 0x7f, 0xef, 0x80, 0x41, 0x0f, 0x9e, 0x87, 0x25, 0x51, 0x9b, 0x0d, 0xb5, 0xd9, 0x50, 0x9b, 0x0d, + 0xb5, 0xd9, 0x60, 0x31, 0x1b, 0xfe, 0x99, 0xe7, 0x93, 0x87, 0x9b, 0x0e, 0x2f, 0xdd, 0x2a, 0x38, + 0x48, 0xc0, 0x96, 0x4a, 0xd3, 0x81, 0x8f, 0xd3, 0x01, 0xcc, 0x87, 0x52, 0x5d, 0xeb, 0xad, 0x01, + 0x45, 0xe7, 0x7f, 0x8c, 0x88, 0x28, 0xb5, 0xea, 0x5f, 0xab, 0xfe, 0xb5, 0xea, 0xff, 0xb2, 0x54, + 0xff, 0x0d, 0x15, 0xf5, 0xc3, 0xa8, 0xe8, 0xc7, 0x28, 0x75, 0x0c, 0x87, 0xd1, 0xd5, 0x40, 0x6a, + 0x6c, 0x4a, 0xf1, 0x6c, 0x79, 0x03, 0x57, 0x91, 0x25, 0x38, 0x57, 0xdc, 0x00, 0xd0, 0x25, 0xe1, + 0x4d, 0x3a, 0x2f, 0x32, 0x24, 0x61, 0xfb, 0x23, 0x38, 0x47, 0x93, 0x4e, 0x8b, 0xb0, 0x52, 0x22, + 0xad, 0x3f, 0x3c, 0x09, 0x7a, 0xe1, 0x14, 0x95, 0x47, 0x28, 0x53, 0x65, 0xa3, 0xf8, 0x04, 0x09, + 0x4d, 0xb6, 0xf5, 0x63, 0xbe, 0x45, 0x1b, 0x5b, 0xaf, 0xc9, 0xa2, 0x1c, 0xfb, 0x3d, 0x21, 0xc8, + 0xad, 0xbe, 0x89, 0xc0, 0x20, 0x2a, 0x44, 0xdb, 0x55, 0xc5, 0x45, 0xa5, 0xab, 0x35, 0x17, 0x95, + 0xae, 0x36, 0xb8, 0x0c, 0x71, 0xb5, 0xc9, 0x8d, 0x99, 0x87, 0x1e, 0xc0, 0xd9, 0xfc, 0x24, 0xc5, + 0x26, 0x3a, 0x36, 0x1e, 0x0f, 0xb9, 0x15, 0x90, 0x60, 0x8a, 0xd2, 0x81, 0x92, 0x7d, 0x36, 0x48, + 0xc6, 0x7b, 0x43, 0xa4, 0xe0, 0x16, 0xc3, 0x20, 0x17, 0xbe, 0xb2, 0xdd, 0x59, 0xba, 0x62, 0x77, + 0x96, 0xae, 0xaa, 0xee, 0x2c, 0xb1, 0xe2, 0xdb, 0x8c, 0x40, 0xf9, 0x64, 0xc7, 0x23, 0x1e, 0xe2, + 0xc1, 0xb3, 0x96, 0xcc, 0x90, 0x48, 0x9a, 0x2a, 0x48, 0x6a, 0xdf, 0x85, 0xb8, 0xa3, 0xe0, 0x06, + 0x27, 0xb8, 0x0e, 0xe0, 0xc3, 0x0d, 0x29, 0xfd, 0x2c, 0x91, 0x7c, 0x32, 0xb7, 0x03, 0x09, 0x8f, + 0x49, 0x70, 0xb4, 0x97, 0xf8, 0x7a, 0xd3, 0x5a, 0x25, 0xb0, 0xc0, 0x07, 0x09, 0x3b, 0x8d, 0x9f, + 0x68, 0xd7, 0x34, 0xde, 0xe1, 0xf1, 0x01, 0xd5, 0x50, 0xba, 0xdf, 0x79, 0x83, 0x83, 0xda, 0xe2, + 0x9f, 0xed, 0xb9, 0xd7, 0x69, 0xf7, 0xba, 0xbd, 0x57, 0x4d, 0xf2, 0x39, 0x42, 0x9f, 0xaf, 0xbb, + 0xa7, 0x3d, 0xfa, 0x99, 0xa0, 0xcf, 0xce, 0xeb, 0x5e, 0x2f, 0xa4, 0xd3, 0x5b, 0x3d, 0xd2, 0xc8, + 0x4f, 0xc9, 0x12, 0x46, 0x9d, 0x24, 0x20, 0x63, 0xb0, 0x4c, 0xe2, 0x70, 0xc7, 0xbe, 0xf8, 0x07, + 0x83, 0x62, 0x34, 0xcd, 0x48, 0x06, 0xe6, 0xfe, 0x98, 0x39, 0x1c, 0x1d, 0xcd, 0xa7, 0xa8, 0xef, + 0xc8, 0x71, 0x5f, 0xb8, 0xcc, 0x43, 0xda, 0x1f, 0x74, 0x5f, 0x1d, 0xbf, 0x39, 0x81, 0x50, 0xb2, + 0x5c, 0x22, 0xba, 0xa2, 0x7a, 0xb9, 0x24, 0xc8, 0x74, 0x90, 0xc4, 0x2d, 0x5d, 0x3a, 0xba, 0x10, + 0x1f, 0x95, 0x64, 0x89, 0x4e, 0x68, 0x96, 0xa1, 0x00, 0xa3, 0x2f, 0x61, 0x24, 0x41, 0x23, 0xe8, + 0x30, 0xac, 0x1a, 0x3f, 0x44, 0x70, 0xf3, 0xa3, 0xf1, 0x6f, 0x09, 0xc2, 0x8b, 0x58, 0x8d, 0x25, + 0x81, 0xeb, 0x36, 0x1d, 0x43, 0xaa, 0x47, 0x9a, 0xe7, 0x14, 0x4d, 0xcc, 0x06, 0xde, 0x2c, 0xbf, + 0x75, 0xc8, 0x78, 0x05, 0xdd, 0xd3, 0x0e, 0x3d, 0x27, 0xea, 0x43, 0x4b, 0xd0, 0x60, 0xa0, 0x8f, + 0xb7, 0x6f, 0x7c, 0x73, 0x8b, 0x80, 0x56, 0x1c, 0xbc, 0xb7, 0x4f, 0x07, 0xb3, 0x49, 0x7b, 0x8e, + 0x8d, 0xad, 0x4c, 0xa5, 0xbc, 0xd6, 0xb4, 0xe7, 0x14, 0x3d, 0xd4, 0x75, 0x2c, 0x63, 0xa7, 0xd9, + 0x2e, 0x1d, 0x58, 0x8a, 0x78, 0xa4, 0x22, 0x1e, 0xd9, 0x11, 0x8f, 0xaa, 0x11, 0x8f, 0x34, 0xc4, + 0x89, 0x8a, 0x38, 0xb1, 0x23, 0x4e, 0xaa, 0x11, 0x27, 0x2a, 0x62, 0x4f, 0xd2, 0x1d, 0xd5, 0xa3, + 0x1d, 0x62, 0xa9, 0xaa, 0xb8, 0x8f, 0x2b, 0x2d, 0x66, 0xcf, 0xd6, 0x43, 0xa7, 0xad, 0x60, 0xf4, + 0x18, 0xae, 0xd1, 0x7f, 0xf7, 0x40, 0xc5, 0x60, 0x8f, 0x2a, 0xcb, 0x03, 0x74, 0x8e, 0xcd, 0xf7, + 0x72, 0x60, 0xc8, 0x69, 0xbd, 0xa3, 0x47, 0x50, 0x50, 0x94, 0xd0, 0x78, 0xb0, 0xec, 0x99, 0xa2, + 0x83, 0x18, 0xf4, 0x96, 0x12, 0xd6, 0xc7, 0x55, 0x5b, 0x64, 0xb2, 0xae, 0xd4, 0xeb, 0xd5, 0x52, + 0x51, 0xb3, 0x3e, 0x63, 0xc0, 0x5d, 0xbb, 0x46, 0x9f, 0xa1, 0x6b, 0x14, 0x73, 0xe9, 0x56, 0xaa, + 0x9a, 0xc6, 0x93, 0xdb, 0x69, 0x6a, 0xdb, 0x6b, 0x67, 0x25, 0x4e, 0x8b, 0x76, 0xe1, 0xa7, 0xda, + 0xf7, 0xfa, 0xfd, 0x1c, 0xd9, 0xa8, 0x52, 0x79, 0xe9, 0x7d, 0x94, 0xe1, 0x28, 0xe5, 0x37, 0xc0, + 0x64, 0x90, 0x97, 0xef, 0xb4, 0x7d, 0x0c, 0x9d, 0x9f, 0xe4, 0xdc, 0x45, 0x16, 0xdd, 0x7e, 0xad, + 0x4d, 0x70, 0xc7, 0xcf, 0xcc, 0x80, 0xcb, 0x87, 0xe1, 0x8e, 0x60, 0x43, 0xb3, 0xf1, 0xd7, 0xbf, + 0x36, 0x98, 0x66, 0x1b, 0x81, 0x62, 0x2b, 0x25, 0xdc, 0x21, 0x08, 0xa2, 0x74, 0x1f, 0xfd, 0x44, + 0xd6, 0xe5, 0xa3, 0x77, 0xe4, 0x6d, 0x09, 0x79, 0x3c, 0xfd, 0x3b, 0x4f, 0xd3, 0x40, 0x0e, 0x72, + 0x7e, 0xe5, 0x30, 0xa7, 0x57, 0x68, 0x2d, 0x4c, 0x75, 0xb0, 0x18, 0x3f, 0x1b, 0x5a, 0x2f, 0xc7, + 0x8f, 0x61, 0xbd, 0xc0, 0x05, 0xc8, 0x97, 0x62, 0xb2, 0xb0, 0x6e, 0x6d, 0xcf, 0x47, 0xdc, 0x0a, + 0xb0, 0x69, 0xff, 0x18, 0x33, 0x0e, 0x53, 0x07, 0x4d, 0xf1, 0xe9, 0xaf, 0x63, 0xb7, 0x64, 0x07, + 0xd0, 0x3c, 0x5c, 0x8b, 0x34, 0x74, 0x9a, 0x39, 0x70, 0xe8, 0x9d, 0x84, 0x5d, 0x74, 0xd1, 0xfd, + 0x2a, 0x95, 0x87, 0xd2, 0x0c, 0x5f, 0xf6, 0xd6, 0x05, 0x1e, 0xa8, 0xf5, 0x1a, 0x96, 0x75, 0x14, + 0x36, 0xd3, 0x96, 0xea, 0x0d, 0x8f, 0x7a, 0xc3, 0x63, 0xe7, 0x0d, 0x0f, 0xfa, 0x58, 0xd1, 0x92, + 0x3e, 0x1f, 0x64, 0xdf, 0xf3, 0x28, 0x6d, 0x8d, 0xd0, 0x12, 0x9e, 0x26, 0xaf, 0xf6, 0xeb, 0x0f, + 0x19, 0x66, 0x13, 0x58, 0x29, 0xf2, 0x69, 0xb8, 0x59, 0x28, 0x07, 0xda, 0xec, 0xc7, 0x88, 0x89, + 0x23, 0xc7, 0x31, 0x20, 0x11, 0x9e, 0x66, 0x8b, 0x6c, 0x8c, 0x60, 0x69, 0x50, 0x55, 0x4e, 0x19, + 0xbd, 0x29, 0x8d, 0xf5, 0x60, 0x47, 0xca, 0x40, 0x6a, 0x23, 0x28, 0x6c, 0x81, 0x92, 0xc4, 0xce, + 0xbe, 0x2a, 0xa4, 0x06, 0x6f, 0xba, 0x6f, 0x71, 0xb8, 0x2a, 0x8c, 0xa4, 0x49, 0x2b, 0xaa, 0x78, + 0x72, 0x48, 0x7b, 0x56, 0x0d, 0x77, 0xe9, 0x36, 0x0b, 0x93, 0xbd, 0x9b, 0xf5, 0x35, 0xef, 0x2e, + 0x47, 0x92, 0xa2, 0xf4, 0xf6, 0x48, 0xbc, 0x54, 0xd2, 0xa9, 0xd0, 0x24, 0x86, 0x21, 0xed, 0x0f, + 0xa4, 0x85, 0x9d, 0x8d, 0xd3, 0x1b, 0x50, 0x9c, 0xa6, 0x0e, 0x0d, 0x7a, 0x8c, 0xf8, 0xd4, 0xa7, + 0x92, 0x31, 0x8b, 0x17, 0x2c, 0xb2, 0x04, 0x8e, 0x39, 0x5b, 0xe6, 0x57, 0x32, 0xc9, 0x3c, 0x1c, + 0x27, 0x2d, 0xc4, 0x81, 0x10, 0xe3, 0x08, 0x62, 0x79, 0xb1, 0xf7, 0x9b, 0x40, 0x9f, 0x82, 0x64, + 0x9f, 0x55, 0xec, 0x06, 0x48, 0x39, 0x45, 0x9a, 0x44, 0xe9, 0xe1, 0x92, 0xea, 0x81, 0xc3, 0x8a, + 0xa9, 0x44, 0x2a, 0xf4, 0x4f, 0x13, 0x2b, 0xb6, 0x2d, 0x5a, 0x10, 0x69, 0xde, 0xfc, 0xe7, 0x0a, + 0x6b, 0x6a, 0x4c, 0xcb, 0x4b, 0xac, 0x65, 0x3b, 0xb6, 0x22, 0x03, 0x6b, 0x91, 0xb5, 0xb5, 0x0d, + 0x37, 0xa1, 0xb4, 0xa3, 0x14, 0x49, 0x0d, 0x45, 0xe4, 0xfc, 0xcb, 0x0d, 0xa8, 0x51, 0x31, 0x8e, + 0x36, 0x21, 0xc2, 0x4c, 0xff, 0x55, 0x45, 0x6f, 0x99, 0x4b, 0x64, 0x1b, 0x90, 0x67, 0x2e, 0x99, + 0x2e, 0xe3, 0xd1, 0x28, 0xc5, 0x41, 0x27, 0x60, 0x76, 0x03, 0xbb, 0x36, 0xfe, 0xd6, 0xe8, 0x61, + 0x7b, 0xa9, 0xd3, 0x3e, 0x41, 0xc6, 0x12, 0x4f, 0x3c, 0x69, 0x9f, 0xe2, 0xc4, 0xe3, 0x53, 0x94, + 0x8a, 0xfe, 0x50, 0xab, 0x30, 0x9d, 0x67, 0x37, 0xd4, 0x18, 0x1c, 0x34, 0x2f, 0xd1, 0x7f, 0x99, + 0xdb, 0x72, 0xe2, 0xe6, 0x10, 0xfd, 0x37, 0x72, 0x7d, 0x67, 0xd4, 0xbc, 0x42, 0xff, 0x91, 0xb4, + 0x04, 0xfd, 0x37, 0x70, 0xdd, 0xa0, 0x01, 0x6a, 0x30, 0xaa, 0xc3, 0x77, 0x08, 0xf2, 0x16, 0x9f, + 0x2a, 0x10, 0x64, 0x41, 0x10, 0xd4, 0xec, 0xbe, 0x6d, 0xf7, 0x4e, 0x5f, 0xf5, 0x5a, 0x04, 0x4c, + 0x8f, 0x43, 0x85, 0x55, 0x5f, 0x2c, 0x88, 0x30, 0x11, 0xed, 0x25, 0x9c, 0x83, 0x87, 0x40, 0x27, + 0x3e, 0xf9, 0x5e, 0xf1, 0x6f, 0x16, 0x7c, 0x4c, 0x58, 0x0f, 0x7b, 0x10, 0xc9, 0x4f, 0x24, 0x79, + 0x89, 0xa0, 0x34, 0xc9, 0xc9, 0xea, 0xe0, 0x63, 0xeb, 0xa5, 0xdd, 0x18, 0x55, 0x18, 0x4f, 0xa5, + 0xeb, 0x01, 0x2c, 0x1d, 0x6b, 0x5a, 0xba, 0xc7, 0xfc, 0x2a, 0x1e, 0xe6, 0xb7, 0x7a, 0x2a, 0x08, + 0x60, 0x23, 0x78, 0x3c, 0x80, 0x70, 0x28, 0x22, 0xa4, 0xe3, 0x97, 0xf3, 0xc6, 0x71, 0xbb, 0x7b, + 0xd2, 0x3d, 0x7d, 0xdb, 0x7b, 0x75, 0x7a, 0x7c, 0xfa, 0xe6, 0xed, 0xeb, 0xb7, 0xc7, 0x47, 0x86, + 0xe8, 0x3a, 0x60, 0x8d, 0x5a, 0x03, 0x9b, 0xc9, 0x1c, 0xe9, 0x90, 0x97, 0xf1, 0x90, 0x95, 0x04, + 0xc1, 0x0d, 0x5d, 0x39, 0xba, 0x21, 0x5e, 0x3d, 0x7e, 0x26, 0xd1, 0x68, 0x06, 0xc8, 0xf0, 0x05, + 0x5b, 0x2d, 0x9e, 0x2e, 0x1c, 0x47, 0x34, 0xf9, 0xcf, 0xce, 0xb7, 0x96, 0xf4, 0xd5, 0xfd, 0xe6, + 0x7a, 0xd8, 0xf0, 0xa3, 0x21, 0xde, 0xdc, 0xa6, 0x9a, 0xc9, 0x31, 0x8f, 0xf3, 0x59, 0x1a, 0x21, + 0x61, 0x3b, 0x45, 0xd0, 0xbd, 0x53, 0x8f, 0x1e, 0x93, 0xc6, 0x14, 0xb9, 0x81, 0x54, 0x2f, 0x3f, + 0x23, 0x8d, 0xe3, 0xbe, 0x44, 0x94, 0x7f, 0x89, 0xc9, 0x89, 0x26, 0x19, 0xc6, 0x40, 0x99, 0xd8, + 0x6f, 0xd1, 0x5c, 0x17, 0x4d, 0xbb, 0x2f, 0xe7, 0xf8, 0xae, 0x07, 0xcb, 0xe3, 0xae, 0x0d, 0x70, + 0x4a, 0xbc, 0x93, 0xdb, 0xc8, 0x4d, 0xc7, 0x88, 0x8e, 0x17, 0x77, 0x5f, 0xc5, 0x77, 0xd9, 0xe4, + 0x1a, 0x07, 0xfe, 0x25, 0xe9, 0xab, 0xe6, 0x97, 0xf3, 0x50, 0xd2, 0xc3, 0xbb, 0xed, 0x37, 0xaf, + 0x4f, 0x5b, 0x22, 0xc8, 0x5f, 0xb7, 0xfd, 0xfa, 0x94, 0xe6, 0xa3, 0x49, 0x4a, 0x1e, 0xf6, 0x84, + 0x60, 0x42, 0xbc, 0x14, 0x89, 0xf2, 0x78, 0x81, 0x9b, 0xce, 0x8b, 0xe1, 0xa6, 0x80, 0xbc, 0x40, + 0xe3, 0x80, 0x26, 0x3b, 0x76, 0xb2, 0xe2, 0xde, 0x21, 0x23, 0x11, 0x88, 0x54, 0x86, 0x94, 0x64, + 0xb8, 0x1e, 0xfb, 0x86, 0x88, 0xb9, 0x50, 0x80, 0x91, 0x8d, 0x19, 0x06, 0x8f, 0x97, 0x54, 0x21, + 0xdb, 0x43, 0xc5, 0x99, 0x74, 0xaf, 0x15, 0x0f, 0x14, 0x49, 0x81, 0xf0, 0x60, 0xe4, 0x17, 0x35, + 0xc4, 0x45, 0xb3, 0x7a, 0x65, 0x5f, 0x04, 0xb0, 0x30, 0x09, 0xa7, 0x02, 0xca, 0xa7, 0x43, 0xc6, + 0xa6, 0x49, 0xfb, 0xcb, 0x0d, 0xbe, 0x9c, 0x63, 0x59, 0x22, 0xb8, 0x89, 0x04, 0x68, 0x86, 0x42, + 0xb4, 0x66, 0xf2, 0x84, 0x16, 0x99, 0x09, 0xbe, 0xc4, 0xfc, 0x3e, 0x06, 0x42, 0x6a, 0x0b, 0xe2, + 0x64, 0x99, 0xf8, 0x6a, 0xa2, 0x14, 0x39, 0x24, 0xb7, 0x90, 0xb0, 0xa2, 0x54, 0x71, 0x3b, 0x76, + 0x9b, 0xd2, 0xe7, 0xc3, 0x84, 0x1b, 0x9f, 0x92, 0x98, 0x52, 0x1c, 0xc2, 0xf8, 0xf4, 0xcd, 0xeb, + 0xe3, 0x4e, 0xf7, 0xd5, 0x91, 0x49, 0xc2, 0x51, 0xbf, 0x64, 0x79, 0xf3, 0x09, 0xc7, 0xb8, 0xaf, + 0x56, 0x5e, 0xcb, 0x51, 0x61, 0xe5, 0xc7, 0xb1, 0xa8, 0xb4, 0xd1, 0x5f, 0xf3, 0xdb, 0xf4, 0x8d, + 0x2d, 0x4d, 0xbe, 0x51, 0x32, 0xb5, 0x54, 0x1c, 0xfd, 0xa6, 0x57, 0x8a, 0x8d, 0x34, 0x8a, 0x27, + 0x93, 0x98, 0x05, 0x3b, 0x32, 0x84, 0xfa, 0x04, 0xdd, 0x7e, 0x9a, 0x2e, 0xf2, 0xcb, 0x78, 0xfe, + 0xdd, 0x05, 0x8e, 0xa9, 0x1f, 0xb3, 0xda, 0xe1, 0x5c, 0xe9, 0x28, 0x9e, 0x55, 0x3c, 0x06, 0xc5, + 0x72, 0xab, 0xe2, 0x22, 0x33, 0x98, 0x75, 0x91, 0x91, 0x65, 0xb8, 0xaa, 0x2e, 0xc3, 0x6f, 0xaf, + 0x5a, 0x9a, 0x84, 0xf3, 0xec, 0x1d, 0x86, 0xb3, 0xab, 0x3b, 0x85, 0x83, 0x54, 0x90, 0x50, 0xd1, + 0x21, 0x6b, 0x7b, 0x63, 0xa3, 0xae, 0x50, 0xfb, 0xe1, 0xf9, 0x05, 0x19, 0x7a, 0xe9, 0xcf, 0x34, + 0x71, 0xa6, 0x57, 0x07, 0x86, 0x25, 0x1b, 0x08, 0x61, 0x59, 0xbe, 0x3c, 0x27, 0x2c, 0x41, 0xab, + 0x05, 0x9a, 0x2d, 0x79, 0x5e, 0x6e, 0x11, 0x79, 0x0f, 0xd9, 0xd0, 0x23, 0x38, 0xc3, 0x17, 0x73, + 0xc1, 0xd8, 0x1f, 0xb4, 0xf4, 0x36, 0xec, 0xae, 0xb6, 0xc1, 0xd6, 0x0f, 0xac, 0x13, 0xaa, 0x7b, + 0x80, 0x35, 0x5f, 0x6d, 0x3b, 0xc9, 0x7b, 0xff, 0xe9, 0xf7, 0xf3, 0xf7, 0xbf, 0x9e, 0xbf, 0xbf, + 0x38, 0xff, 0xf4, 0x8b, 0xfd, 0x79, 0x1a, 0x50, 0xf2, 0xd5, 0x00, 0x9c, 0x51, 0xcc, 0x1e, 0x55, + 0x68, 0x75, 0x7b, 0x6f, 0x50, 0x36, 0xd5, 0x9e, 0xfa, 0x7c, 0x8b, 0x20, 0x22, 0xa1, 0xbf, 0xc9, + 0x93, 0x09, 0x38, 0xac, 0x23, 0xf6, 0x16, 0x48, 0x4b, 0x5a, 0xc4, 0xa3, 0x6d, 0x13, 0x20, 0xf0, + 0x17, 0xb8, 0x4d, 0xfa, 0x75, 0xeb, 0xbd, 0x3a, 0xa1, 0x11, 0xc3, 0x85, 0x7f, 0x50, 0x8a, 0xce, + 0x4d, 0x17, 0x5a, 0xf2, 0xb6, 0x93, 0x32, 0xeb, 0xf9, 0x66, 0xa7, 0x80, 0xc2, 0x01, 0xc6, 0xc1, + 0xf2, 0xe0, 0xbb, 0x69, 0xec, 0x07, 0x8b, 0x48, 0x1e, 0xb2, 0x95, 0x9b, 0xe6, 0x84, 0x9c, 0x6d, + 0xd8, 0x0f, 0xdc, 0x09, 0xd4, 0x70, 0x8e, 0xc7, 0x97, 0x24, 0x53, 0xe4, 0xd0, 0x41, 0x06, 0x5c, + 0x1e, 0x1d, 0x67, 0xa6, 0x21, 0x43, 0x3a, 0xc3, 0xd2, 0x74, 0xd8, 0x2f, 0xae, 0x53, 0xcb, 0x43, + 0x80, 0x2d, 0x5e, 0xae, 0x28, 0xe6, 0xd7, 0x85, 0x52, 0x96, 0xd7, 0xeb, 0x95, 0xb1, 0xf4, 0xf0, + 0xdb, 0x0f, 0xa0, 0x64, 0x35, 0x1d, 0x41, 0x1f, 0xd5, 0xf3, 0xc9, 0xc3, 0x10, 0x72, 0x45, 0x5a, + 0x9f, 0xe1, 0xcb, 0x96, 0xa4, 0x3a, 0x4f, 0x04, 0xa1, 0x24, 0x8a, 0x89, 0x26, 0x2e, 0xb1, 0x52, + 0x2e, 0x8d, 0xb3, 0x96, 0x5f, 0x90, 0xb0, 0xd4, 0x48, 0xb9, 0xbd, 0xd6, 0xea, 0x20, 0xbd, 0xd2, + 0x8b, 0xc8, 0x5f, 0xbd, 0x1a, 0x8f, 0x8f, 0x08, 0x52, 0xde, 0x20, 0x22, 0x74, 0xeb, 0xda, 0xbf, + 0x86, 0xa7, 0xd2, 0xb5, 0xf7, 0xb1, 0x18, 0xff, 0xa9, 0x76, 0x2a, 0xd0, 0x1f, 0x50, 0xc5, 0x8e, + 0x6d, 0xff, 0x55, 0x1d, 0xc7, 0x14, 0xcf, 0x8a, 0xf7, 0x94, 0x62, 0xb8, 0xff, 0x4a, 0x95, 0x19, + 0x03, 0x37, 0xe2, 0x07, 0xaa, 0x50, 0x97, 0xc9, 0x51, 0x35, 0xd9, 0x7d, 0x55, 0x72, 0xeb, 0xd4, + 0x5a, 0xca, 0x54, 0xa4, 0x54, 0x69, 0xe9, 0x0a, 0xbe, 0x57, 0xd2, 0x51, 0xc1, 0x28, 0x97, 0x54, + 0xc8, 0x68, 0x3d, 0x81, 0xc1, 0x1a, 0x6a, 0x42, 0xa6, 0xaa, 0x12, 0x4f, 0x0b, 0xe1, 0x08, 0x1f, + 0xb3, 0xb0, 0x72, 0xc7, 0x67, 0x4b, 0xa5, 0x58, 0x53, 0x7f, 0xcd, 0xaa, 0xb2, 0x49, 0x29, 0x7e, + 0x9a, 0xb7, 0xab, 0xbe, 0xa3, 0x37, 0xa5, 0xf6, 0x1c, 0x31, 0xef, 0x30, 0x2f, 0x15, 0x99, 0x2e, + 0x7c, 0x13, 0xe6, 0x70, 0x3d, 0xc6, 0x3c, 0xed, 0x45, 0x28, 0x48, 0xe8, 0x45, 0xf8, 0x9d, 0x9d, + 0xa6, 0x6d, 0xc1, 0x82, 0x62, 0x32, 0x1b, 0xc9, 0x17, 0xc5, 0x89, 0x2d, 0x3c, 0x41, 0x3d, 0x06, + 0x15, 0xb6, 0x1c, 0x5e, 0x41, 0xd1, 0xc2, 0xa8, 0x5d, 0x5f, 0x54, 0x89, 0x43, 0x95, 0xba, 0x01, + 0x4e, 0xb7, 0x18, 0xcc, 0x7b, 0x08, 0x4d, 0xc5, 0x2d, 0xe3, 0xdf, 0xde, 0xff, 0xa3, 0xff, 0xeb, + 0xf9, 0xa7, 0xb3, 0xfe, 0xc7, 0xf3, 0x8b, 0xdf, 0xdf, 0x7f, 0xfa, 0x70, 0xd6, 0x38, 0xee, 0xbd, + 0x7e, 0xf5, 0xba, 0xdd, 0x79, 0x36, 0xb6, 0xf3, 0xa6, 0x0f, 0x50, 0x5b, 0x6c, 0xec, 0xfd, 0xdb, + 0xce, 0x48, 0xac, 0x8e, 0xe6, 0xe9, 0xc2, 0x1a, 0x28, 0xa4, 0xb6, 0x52, 0x6b, 0x2b, 0xf5, 0xa5, + 0x5a, 0xa9, 0xb5, 0xdd, 0x58, 0xdb, 0x8d, 0x2f, 0xcc, 0x6e, 0x64, 0xe2, 0x7c, 0x53, 0xd3, 0x31, + 0x28, 0x2d, 0xa1, 0xb5, 0x31, 0x59, 0x1b, 0x93, 0xb5, 0x31, 0xf9, 0x5d, 0x19, 0x93, 0x1b, 0xef, + 0x2d, 0xef, 0x6c, 0x66, 0x3e, 0x50, 0x7f, 0x7c, 0x31, 0xa6, 0x62, 0x6d, 0xee, 0x19, 0xcc, 0x3d, + 0xcb, 0x1b, 0x66, 0xf4, 0x40, 0x00, 0x70, 0xb6, 0xca, 0x2a, 0xf6, 0xb7, 0xcc, 0xf6, 0x63, 0x25, + 0x96, 0x6d, 0x40, 0x96, 0xa3, 0x2c, 0x7c, 0xfd, 0x8b, 0x0f, 0xef, 0x7f, 0x3d, 0x03, 0xd1, 0xfe, + 0xe8, 0x36, 0xe2, 0x9a, 0x1d, 0xd4, 0x87, 0x99, 0x90, 0x0f, 0xb1, 0x11, 0xc5, 0xee, 0xe9, 0x0e, + 0x4e, 0xa6, 0xda, 0x34, 0xdc, 0xc1, 0x34, 0x7c, 0x06, 0x96, 0xd8, 0xb3, 0xb3, 0x4e, 0x0f, 0x6c, + 0x1a, 0xd6, 0x17, 0x42, 0x9f, 0xd1, 0x85, 0xd0, 0x17, 0x6e, 0x82, 0x3f, 0xad, 0xc9, 0xfb, 0xdc, + 0x1c, 0x00, 0x87, 0x32, 0xc1, 0xff, 0x13, 0xae, 0xe8, 0x3e, 0x91, 0x9b, 0x81, 0xc1, 0x6d, 0xb7, + 0x49, 0x6d, 0x50, 0xb4, 0x6a, 0x3f, 0x43, 0xed, 0x67, 0xa8, 0xfd, 0x0c, 0x87, 0xf2, 0x33, 0x88, + 0xe9, 0x1a, 0xcb, 0x4a, 0xff, 0xe3, 0xfa, 0x1f, 0xb6, 0xb9, 0x8e, 0xaa, 0xc8, 0x3a, 0x3d, 0xce, + 0xcb, 0x5a, 0x47, 0xc6, 0xe1, 0x8c, 0x9c, 0x97, 0x72, 0x1b, 0xf4, 0x3f, 0xc1, 0x3b, 0xf3, 0x8c, + 0xae, 0x95, 0x3e, 0xa1, 0xf7, 0xa8, 0x8e, 0x9b, 0xfc, 0xb2, 0x5e, 0x53, 0x91, 0xbb, 0x5a, 0x6e, + 0x9f, 0xda, 0xe6, 0xf6, 0xd2, 0xe3, 0xbd, 0x16, 0xa8, 0x11, 0x88, 0x35, 0xc0, 0x95, 0x09, 0x67, + 0x62, 0xc0, 0x89, 0xa8, 0xf6, 0x68, 0x7f, 0x57, 0x61, 0x04, 0x8a, 0xc3, 0xef, 0xcc, 0x65, 0x49, + 0xb0, 0x2d, 0x51, 0x57, 0x92, 0xeb, 0xcd, 0x7c, 0x89, 0x08, 0xd4, 0x9e, 0x6e, 0x2f, 0x55, 0xf8, + 0xa4, 0x1a, 0x3e, 0x51, 0xe1, 0x57, 0x7d, 0xfc, 0x12, 0x73, 0x93, 0xf7, 0x05, 0xd2, 0x83, 0xe8, + 0x65, 0x39, 0x4e, 0x1f, 0xa6, 0xc9, 0xd1, 0x6a, 0x5d, 0x35, 0x7b, 0xf4, 0x35, 0x19, 0x57, 0x27, + 0x68, 0x25, 0x90, 0x27, 0xbb, 0x20, 0x4f, 0xec, 0xc8, 0x13, 0xc1, 0x1a, 0x38, 0xfe, 0xc9, 0xf6, + 0x97, 0xcd, 0x31, 0x0f, 0xa1, 0x5e, 0xf5, 0x51, 0xcb, 0x5d, 0x09, 0x57, 0xb2, 0xc3, 0x55, 0x71, + 0x8a, 0x2b, 0x41, 0xb8, 0x12, 0x57, 0x71, 0x32, 0x03, 0x2e, 0xe3, 0x75, 0x71, 0x54, 0xa9, 0x6f, + 0xce, 0x48, 0x5c, 0xf3, 0x35, 0x71, 0xe2, 0x76, 0x7e, 0xc4, 0x67, 0x2d, 0x9e, 0x91, 0xd3, 0xf9, + 0x51, 0x0f, 0x26, 0xd1, 0x41, 0x22, 0xcf, 0x60, 0xc7, 0x25, 0xd5, 0x0e, 0xf5, 0x7a, 0x7f, 0x25, + 0xa5, 0x9b, 0x4a, 0x25, 0x96, 0x52, 0xc9, 0x3e, 0x0e, 0x41, 0xd1, 0x54, 0xa8, 0x21, 0x36, 0x25, + 0x26, 0xbb, 0x9f, 0xaa, 0xac, 0xaf, 0x12, 0xd5, 0x87, 0xb4, 0xea, 0x43, 0x5a, 0x36, 0x4f, 0x3c, + 0x1b, 0x32, 0x83, 0x9b, 0xee, 0x31, 0xbc, 0xf4, 0xd8, 0x57, 0x54, 0x41, 0xa5, 0xc8, 0xb7, 0xf6, + 0x95, 0x00, 0x31, 0xf1, 0x97, 0x94, 0x5b, 0xd5, 0x9b, 0x2a, 0x58, 0x7d, 0x2f, 0xaa, 0x3e, 0xdf, + 0xf6, 0x4c, 0xce, 0xb7, 0x1d, 0xce, 0x9d, 0x2e, 0x4d, 0x45, 0xf1, 0xd3, 0x50, 0xb3, 0xc8, 0xf4, + 0xd5, 0xf9, 0x69, 0x6a, 0xb2, 0x8c, 0xc9, 0x34, 0xc9, 0x6a, 0xaf, 0x77, 0xed, 0xf5, 0xae, 0xbd, + 0xde, 0xb5, 0xd7, 0x7b, 0x33, 0xaf, 0x37, 0x56, 0xff, 0x23, 0x2a, 0x87, 0xf8, 0xdc, 0xf5, 0x74, + 0x73, 0xa6, 0xbd, 0x0c, 0x24, 0x21, 0xc5, 0x07, 0xaf, 0x04, 0xb6, 0x6a, 0x72, 0x4b, 0xc7, 0xa5, + 0xd8, 0x93, 0xb5, 0xd8, 0x93, 0xcd, 0xb0, 0x27, 0x12, 0x76, 0x08, 0x8d, 0xb6, 0xef, 0x93, 0x81, + 0xba, 0x2d, 0xb6, 0x18, 0x5e, 0xe2, 0xee, 0x2f, 0xc7, 0xce, 0x42, 0x26, 0xe5, 0x33, 0xb3, 0xc0, + 0xea, 0x7b, 0x6d, 0xd5, 0x3a, 0xc0, 0xe1, 0x74, 0xf0, 0xfd, 0x2a, 0xd0, 0xdf, 0xe3, 0x55, 0x3d, + 0x23, 0x86, 0x8a, 0x73, 0x0f, 0xe5, 0x1e, 0xaf, 0xec, 0xf0, 0xad, 0x55, 0xa5, 0xef, 0xcc, 0x25, + 0x8b, 0xc4, 0x10, 0xe4, 0xf6, 0x63, 0x63, 0x6c, 0x29, 0x2c, 0x4c, 0xdc, 0x76, 0xac, 0x01, 0x27, + 0x56, 0xe0, 0xa4, 0x04, 0x8c, 0xbd, 0x87, 0xbc, 0x16, 0x9f, 0xa3, 0xf0, 0xb1, 0xa4, 0x73, 0x43, + 0xe2, 0x0b, 0x8c, 0x94, 0x97, 0x72, 0x4f, 0x5b, 0x42, 0x3e, 0xca, 0xb2, 0x9c, 0x44, 0x33, 0x36, + 0xe5, 0x50, 0xb4, 0xfb, 0x3f, 0xe4, 0xba, 0xd1, 0xb9, 0xd3, 0x62, 0x8c, 0xd6, 0x9a, 0xb9, 0xfc, + 0x4c, 0x06, 0x97, 0xfa, 0x78, 0xed, 0xb1, 0x64, 0x26, 0xd7, 0x97, 0x97, 0xe9, 0xbc, 0xea, 0x09, + 0xdd, 0x2d, 0x83, 0xaa, 0x75, 0x0c, 0x69, 0xdd, 0x5d, 0x23, 0xad, 0x75, 0x22, 0xc7, 0x31, 0x47, + 0xa5, 0x6c, 0x81, 0x1e, 0x1d, 0xa8, 0xf4, 0x37, 0x5c, 0x88, 0x19, 0x45, 0x4a, 0x76, 0x23, 0x12, + 0x98, 0x0f, 0x9e, 0x6a, 0x97, 0x3b, 0x00, 0x82, 0x89, 0x89, 0xae, 0x92, 0x3a, 0x57, 0xde, 0xc0, + 0xee, 0x97, 0xfb, 0x49, 0x7f, 0x66, 0xa4, 0xb4, 0xd8, 0x76, 0xec, 0x59, 0xdd, 0x8d, 0xbb, 0xa9, + 0x34, 0x3a, 0x73, 0x88, 0x68, 0x85, 0x94, 0x8e, 0x05, 0x84, 0x03, 0xaf, 0xca, 0x06, 0x71, 0x59, + 0x1e, 0xf9, 0x18, 0x75, 0x1b, 0x0e, 0xee, 0xa7, 0xbf, 0xbc, 0x22, 0x5c, 0x9a, 0xd3, 0x62, 0x1e, + 0x2f, 0x4c, 0x2f, 0xb3, 0xc0, 0x33, 0x29, 0x8b, 0x59, 0x36, 0xed, 0xdf, 0xe2, 0x60, 0xbf, 0x5a, + 0xb4, 0x3c, 0x21, 0x98, 0x3b, 0xe5, 0x89, 0xd9, 0x21, 0x21, 0xe2, 0x3a, 0x6b, 0xa2, 0xd1, 0x76, + 0x09, 0x58, 0x97, 0x84, 0x02, 0x27, 0xc8, 0xda, 0x31, 0xb1, 0x10, 0x50, 0x15, 0x34, 0x61, 0x3e, + 0x4a, 0x22, 0xf1, 0x33, 0x60, 0x60, 0xe1, 0x3d, 0x2f, 0xd4, 0xd5, 0x0b, 0x75, 0x45, 0xa1, 0xae, + 0x28, 0xd4, 0x85, 0x42, 0xda, 0x16, 0x03, 0xc1, 0xe6, 0xd3, 0x60, 0xb3, 0x6c, 0xf4, 0xe9, 0x0b, + 0x50, 0xed, 0x58, 0x0e, 0xc9, 0x8d, 0xbb, 0x84, 0xe3, 0x05, 0xb4, 0x21, 0x7c, 0xe1, 0x50, 0xde, + 0x10, 0xf6, 0x13, 0x7d, 0xf8, 0x6a, 0x8f, 0xc1, 0xf3, 0x02, 0xae, 0x6f, 0xc9, 0xbb, 0x5b, 0xae, + 0xac, 0x79, 0xab, 0xbb, 0x25, 0x8f, 0x72, 0x17, 0xdf, 0xa4, 0x48, 0x3a, 0xa4, 0x11, 0x7b, 0x2e, + 0x89, 0xbd, 0x81, 0xc5, 0x1e, 0xbf, 0x72, 0x83, 0x63, 0x08, 0x3f, 0x0a, 0xe1, 0xc9, 0x1d, 0x0a, + 0xdb, 0x42, 0x5f, 0x10, 0x8c, 0xad, 0x3c, 0xfc, 0x40, 0x30, 0x54, 0x88, 0x67, 0x8f, 0x57, 0x1a, + 0x7e, 0x32, 0x7d, 0xc8, 0xd0, 0x03, 0x43, 0x81, 0x75, 0x4f, 0x1a, 0xa8, 0xb3, 0xa2, 0xbf, 0x36, + 0xc1, 0x65, 0x88, 0xd0, 0x6f, 0x0b, 0x1e, 0xa8, 0xc2, 0xdf, 0x20, 0x45, 0x93, 0xb0, 0x58, 0x52, + 0x90, 0xe8, 0x6f, 0x8c, 0x48, 0x9f, 0x57, 0xe3, 0xe3, 0xb6, 0xd3, 0xe1, 0xf3, 0x59, 0xc0, 0xb6, + 0x87, 0xc9, 0x5f, 0xd4, 0x4b, 0x8b, 0x82, 0x4e, 0x99, 0x2f, 0xe7, 0x51, 0x29, 0x74, 0x62, 0x79, + 0xe7, 0x06, 0x2c, 0x79, 0x6a, 0x54, 0x9b, 0x77, 0x75, 0x94, 0xd4, 0x63, 0x28, 0xc1, 0xcd, 0x29, + 0x55, 0xe6, 0x32, 0xa7, 0x04, 0x66, 0x4c, 0x5d, 0x08, 0x25, 0x79, 0x3e, 0x06, 0x21, 0xb3, 0x20, + 0x7b, 0x7b, 0x10, 0xb6, 0xb3, 0x8f, 0x89, 0x8d, 0x25, 0x49, 0xaf, 0x01, 0x5d, 0xa6, 0x31, 0x96, + 0xa5, 0x25, 0x38, 0xf5, 0xb9, 0x40, 0x0c, 0x5b, 0x95, 0x69, 0xc9, 0x1a, 0xc4, 0x13, 0xc4, 0x83, + 0x60, 0xf2, 0x41, 0x08, 0x3d, 0x24, 0x99, 0xd9, 0x23, 0x0c, 0x16, 0xf8, 0x59, 0x56, 0x0c, 0xae, + 0x74, 0x5a, 0xe7, 0x79, 0x11, 0x17, 0x69, 0x7f, 0xb1, 0x9a, 0x24, 0xf9, 0xd8, 0x52, 0x90, 0x04, + 0x0c, 0xd4, 0x4c, 0x20, 0x45, 0x88, 0x0f, 0xae, 0x94, 0x78, 0x9a, 0x96, 0x0d, 0x34, 0x92, 0x3a, + 0x8e, 0x13, 0xa4, 0x01, 0xcd, 0xc6, 0xf1, 0x34, 0xb5, 0x40, 0x90, 0x80, 0xd6, 0x5a, 0x9e, 0xe8, + 0x5b, 0x10, 0x6e, 0x7a, 0x32, 0x6e, 0x1b, 0x31, 0x59, 0x27, 0xf1, 0xcc, 0x76, 0x82, 0xaa, 0x6c, + 0x36, 0x95, 0x8c, 0x26, 0x65, 0xf0, 0xbf, 0x83, 0xbd, 0x98, 0x67, 0xf2, 0x80, 0xba, 0x50, 0x62, + 0x22, 0x79, 0x4a, 0xf2, 0xb3, 0x2d, 0xcc, 0x43, 0xab, 0xe6, 0xb2, 0x93, 0x31, 0x58, 0xed, 0x10, + 0xce, 0x44, 0x96, 0x08, 0x63, 0xc6, 0x52, 0xf9, 0x21, 0x18, 0x92, 0x8c, 0x88, 0x9f, 0x72, 0x97, + 0x1f, 0x24, 0xfc, 0xd9, 0xf9, 0x46, 0xfc, 0x7d, 0x32, 0xeb, 0x2e, 0xd2, 0xd1, 0x04, 0xa2, 0x4b, + 0x22, 0xe6, 0x1c, 0xa7, 0x51, 0x4b, 0x9b, 0xfa, 0x7f, 0xf6, 0xbe, 0x31, 0x5d, 0x16, 0x98, 0x03, + 0xd6, 0xb8, 0x1f, 0x2c, 0x33, 0x1c, 0xde, 0x41, 0xf9, 0xc1, 0x3e, 0xb1, 0x51, 0xd7, 0x63, 0x5a, + 0x41, 0x52, 0x0a, 0xfa, 0x7c, 0x4a, 0x59, 0xf7, 0x9b, 0xcf, 0x26, 0xb9, 0x1b, 0x10, 0x3f, 0xe9, + 0x7d, 0x03, 0xba, 0xb6, 0x01, 0x55, 0x3e, 0xac, 0x46, 0x51, 0x9b, 0x8a, 0x99, 0xe4, 0x52, 0xf1, + 0x71, 0xaf, 0xfa, 0xc9, 0xbe, 0xe4, 0xd9, 0xb4, 0x58, 0x17, 0xf1, 0x9c, 0x06, 0xab, 0xe6, 0x22, + 0x06, 0xc9, 0x95, 0xab, 0x5c, 0x88, 0x98, 0x48, 0xc5, 0xd6, 0xbe, 0x55, 0x8a, 0x31, 0x28, 0x22, + 0x32, 0x22, 0x7d, 0x7a, 0x36, 0x7e, 0x3a, 0xb2, 0x22, 0x0e, 0x2a, 0xe4, 0x5a, 0xe3, 0xdd, 0x51, + 0x45, 0x6e, 0x60, 0xc5, 0xa9, 0xd0, 0x26, 0x79, 0xb4, 0x28, 0x79, 0xc4, 0xd6, 0x02, 0xe3, 0x03, + 0xdc, 0x97, 0x2a, 0xed, 0xd8, 0x9e, 0x02, 0xe7, 0x73, 0x08, 0x3d, 0xe9, 0x45, 0xa5, 0xd2, 0xec, + 0x84, 0x15, 0x5a, 0xdd, 0xd9, 0x49, 0x2a, 0x2a, 0xa2, 0x1a, 0x3f, 0x61, 0xbe, 0x0a, 0x7a, 0x27, + 0xd8, 0xc3, 0x8a, 0x47, 0x42, 0x61, 0x4e, 0x2c, 0x72, 0x89, 0x00, 0x06, 0xf5, 0x1c, 0xd5, 0x14, + 0x12, 0x86, 0x50, 0x64, 0x32, 0x53, 0x00, 0xc9, 0x94, 0xf9, 0xb2, 0x76, 0x10, 0x49, 0x78, 0xec, + 0x2e, 0x8e, 0xda, 0xcd, 0x5f, 0xfa, 0x89, 0xf5, 0xf1, 0x5a, 0xae, 0x82, 0xd2, 0x08, 0x62, 0xc8, + 0x24, 0x32, 0x55, 0x04, 0xf0, 0xc6, 0xf4, 0xdb, 0x50, 0x6f, 0x06, 0x0e, 0xf1, 0xeb, 0xc0, 0x29, + 0x2c, 0x7c, 0xd4, 0x4b, 0x5d, 0x3d, 0x7c, 0x38, 0xc8, 0x05, 0xa7, 0xc5, 0xc2, 0x7b, 0xb9, 0x2b, + 0xf0, 0xfc, 0x44, 0xbc, 0x3a, 0x8d, 0x70, 0x24, 0x59, 0x79, 0xd6, 0x36, 0x35, 0xfc, 0x2a, 0x7f, + 0x92, 0x82, 0x03, 0x24, 0x75, 0x70, 0xfc, 0xdc, 0xea, 0x82, 0xe0, 0x3c, 0x6e, 0xb0, 0x4f, 0xda, + 0x71, 0x11, 0xf6, 0x28, 0x73, 0x34, 0x3e, 0xf6, 0xd1, 0x73, 0x72, 0x7c, 0xfd, 0xd7, 0x80, 0x06, + 0x63, 0x96, 0xbd, 0xce, 0x20, 0xf3, 0x4c, 0xab, 0x1a, 0x1f, 0x13, 0x19, 0x12, 0x75, 0xa4, 0x12, + 0xd7, 0x47, 0x32, 0xce, 0xe4, 0x55, 0x8f, 0x7a, 0xa2, 0xb5, 0x92, 0x81, 0x9a, 0x70, 0xdb, 0xd4, + 0x1a, 0xe3, 0xf1, 0x8d, 0xb0, 0xe0, 0x18, 0x76, 0x35, 0x38, 0x53, 0x4a, 0xf1, 0xc1, 0x6f, 0xa8, + 0xa8, 0x45, 0xff, 0x06, 0xd2, 0xc2, 0x08, 0x43, 0x2f, 0x2f, 0x7d, 0x6c, 0x8d, 0xa0, 0x9f, 0x8e, + 0xaa, 0x15, 0xf1, 0xe8, 0xf1, 0x62, 0xed, 0x8f, 0xe4, 0x7c, 0x24, 0xf2, 0xb0, 0x95, 0x00, 0x71, + 0x92, 0x15, 0x0d, 0xa1, 0xf1, 0xae, 0xa5, 0x6a, 0x0c, 0xea, 0x82, 0xcb, 0x5f, 0xc1, 0x02, 0xc7, + 0x07, 0xc4, 0x36, 0x57, 0x90, 0x76, 0xbe, 0x35, 0xa5, 0xa2, 0xae, 0x6b, 0x0b, 0x03, 0x4e, 0x8d, + 0x9f, 0xc7, 0x5e, 0xed, 0x0f, 0x77, 0xee, 0x76, 0x2b, 0x07, 0x99, 0x04, 0x44, 0x5c, 0x47, 0x14, + 0xc0, 0xd3, 0x5a, 0xa7, 0xe8, 0xde, 0xb2, 0x7d, 0x48, 0x7f, 0x13, 0x0f, 0x8f, 0x4b, 0x0e, 0x6f, + 0xd5, 0x4a, 0xfc, 0xfe, 0x94, 0xf8, 0x67, 0xa3, 0x1c, 0xef, 0xd3, 0x3a, 0xd8, 0xd6, 0x52, 0xa9, + 0xb2, 0x26, 0xaa, 0x95, 0x78, 0x60, 0x0f, 0xc5, 0xc3, 0x73, 0x4c, 0x13, 0xbb, 0xb6, 0x09, 0x7d, + 0x99, 0x8d, 0xc7, 0x55, 0x67, 0xcf, 0x44, 0xbe, 0xfd, 0x00, 0x9a, 0x80, 0x31, 0x9d, 0x42, 0x93, + 0x72, 0xab, 0xb6, 0x50, 0x54, 0xb0, 0xaa, 0x47, 0xba, 0xe2, 0x71, 0x5e, 0x45, 0xb1, 0xc8, 0xb7, + 0x53, 0x2c, 0x60, 0x4c, 0x14, 0x4b, 0xb9, 0x55, 0x14, 0xab, 0x60, 0xdf, 0xf5, 0x71, 0x35, 0xdc, + 0x94, 0x8a, 0x93, 0x4f, 0x22, 0xdf, 0xfe, 0xaa, 0x2e, 0x07, 0x31, 0xbe, 0xac, 0x2b, 0x72, 0x2b, + 0xdf, 0x50, 0x53, 0xc0, 0xd6, 0x11, 0x6c, 0x3f, 0x99, 0xc8, 0xb3, 0xab, 0xc9, 0xb5, 0x9d, 0x51, + 0x14, 0x99, 0x6b, 0x89, 0x55, 0x76, 0x78, 0x36, 0xb1, 0x3f, 0xa5, 0x09, 0x27, 0x7e, 0x9a, 0xce, + 0x6b, 0x89, 0x5c, 0x5f, 0x9d, 0x86, 0xa6, 0x93, 0x5b, 0x32, 0xaa, 0x9d, 0xa6, 0x92, 0xf8, 0x69, + 0xa2, 0x45, 0xe4, 0xfa, 0xea, 0x04, 0x33, 0xd1, 0x22, 0xa3, 0xda, 0x7e, 0x92, 0x1c, 0xfc, 0xa0, + 0x97, 0xc4, 0xfb, 0xe2, 0xa7, 0xe9, 0x5d, 0x5f, 0x9e, 0xe9, 0xab, 0x13, 0xc2, 0xf8, 0xbe, 0xaf, + 0x84, 0x69, 0x17, 0xae, 0xe6, 0xbf, 0x6c, 0x84, 0xd0, 0x23, 0x76, 0x12, 0xa3, 0x5b, 0xc9, 0xa0, + 0x7b, 0x91, 0x06, 0x76, 0xad, 0xfd, 0x14, 0xb5, 0x9f, 0xa2, 0xf6, 0x53, 0xd4, 0x7e, 0x8a, 0xda, + 0x4f, 0xf1, 0xbc, 0xfd, 0x14, 0xec, 0xcc, 0xb0, 0x38, 0xc1, 0xa6, 0x1c, 0x78, 0x7b, 0x3a, 0x8f, + 0x85, 0x78, 0x86, 0x6a, 0x3e, 0xcb, 0xc7, 0x31, 0x34, 0xf2, 0x01, 0x2e, 0x0c, 0x6a, 0xbf, 0x94, + 0x1d, 0x32, 0xc4, 0x84, 0x21, 0x3b, 0x79, 0x52, 0x2f, 0xf8, 0xe4, 0xd9, 0x4f, 0x5b, 0xed, 0xd8, + 0x27, 0xc2, 0x2e, 0x46, 0x5d, 0x7c, 0xfc, 0xb9, 0xff, 0xe5, 0x1f, 0x0d, 0x24, 0x6d, 0x8f, 0xca, + 0x76, 0x22, 0x2c, 0x8d, 0x61, 0x95, 0xf7, 0xc4, 0x6c, 0xc9, 0xc9, 0xe7, 0x55, 0xb6, 0x3d, 0x34, + 0xa7, 0x19, 0xa9, 0x8f, 0x69, 0xc7, 0x1d, 0xd6, 0x06, 0x3b, 0xa0, 0xfd, 0x74, 0x28, 0x13, 0xe8, + 0xa0, 0xf6, 0xcb, 0x3e, 0xcd, 0x8f, 0x4a, 0x36, 0xd9, 0xce, 0x7a, 0xa8, 0x36, 0x1e, 0xb6, 0x52, + 0xfe, 0xf7, 0x71, 0x08, 0x4e, 0x1a, 0xbd, 0xed, 0xb4, 0xf0, 0xaa, 0xa1, 0xd9, 0x58, 0x91, 0x26, + 0x30, 0x67, 0x1f, 0x7f, 0x39, 0xeb, 0xff, 0xf2, 0xfe, 0xb7, 0xdf, 0xde, 0x23, 0xb5, 0xa0, 0xdb, + 0x39, 0x0d, 0xcc, 0x11, 0xf5, 0x60, 0x86, 0x83, 0xe6, 0x4c, 0x67, 0x39, 0xa8, 0xce, 0x65, 0xf9, + 0x4e, 0x67, 0x3b, 0xbf, 0xd2, 0x8e, 0x35, 0x43, 0x96, 0xb8, 0x92, 0xe5, 0x37, 0xeb, 0x28, 0x9a, + 0x29, 0xf4, 0xe3, 0x0d, 0xb5, 0x1b, 0x11, 0xda, 0x81, 0x8c, 0x9a, 0x34, 0xfc, 0xb2, 0xb4, 0xc3, + 0xc4, 0x45, 0xa2, 0x89, 0x81, 0xc3, 0xf1, 0x7b, 0x8a, 0x24, 0x74, 0x43, 0xf9, 0x18, 0xe4, 0xf5, + 0xe5, 0x65, 0xe4, 0xf4, 0x4e, 0x5f, 0xb5, 0x3b, 0x2d, 0x7c, 0x6d, 0x21, 0xc0, 0xbf, 0x43, 0xae, + 0x43, 0x43, 0x5f, 0xb2, 0xd3, 0x33, 0x91, 0xc4, 0x2e, 0xa4, 0x3a, 0x87, 0x77, 0xb5, 0xd7, 0x6d, + 0x77, 0xdf, 0x06, 0x44, 0x88, 0x37, 0x05, 0x15, 0x6e, 0x05, 0x19, 0xa4, 0x6e, 0xa8, 0x59, 0x8c, + 0x7c, 0x20, 0x56, 0x57, 0x8a, 0x2c, 0xbc, 0x97, 0xc8, 0xc5, 0x67, 0xf8, 0x4c, 0xee, 0x60, 0x70, + 0x06, 0xb7, 0xe3, 0x72, 0x87, 0x90, 0xba, 0x86, 0x11, 0xfe, 0xf0, 0xe4, 0xf5, 0x40, 0x51, 0x78, + 0xb0, 0x2b, 0x5a, 0x3a, 0xf5, 0x07, 0xa4, 0xb5, 0x64, 0x04, 0x3e, 0xa4, 0x34, 0x95, 0x94, 0x0d, + 0x8f, 0xf8, 0x79, 0xea, 0x8a, 0x57, 0xbb, 0xaa, 0x6b, 0x57, 0xf5, 0x33, 0x75, 0x55, 0x9b, 0x93, + 0xfb, 0x19, 0x1a, 0x20, 0x59, 0xd3, 0x39, 0x31, 0xa9, 0x3f, 0x27, 0xb5, 0x1b, 0xbb, 0x76, 0x63, + 0xd7, 0x6e, 0xec, 0xda, 0x8d, 0x5d, 0xbb, 0xb1, 0x6b, 0x37, 0xf6, 0xf3, 0x75, 0x63, 0x53, 0x77, + 0xc8, 0x02, 0xae, 0x6d, 0x44, 0x3c, 0x0f, 0x5f, 0xaa, 0x15, 0x45, 0x6b, 0x67, 0x77, 0xed, 0xec, + 0x7e, 0x52, 0x67, 0x37, 0x37, 0x01, 0x6b, 0xcf, 0x76, 0xed, 0xd9, 0xae, 0x3d, 0xdb, 0x07, 0xf4, + 0x6c, 0xa3, 0x4e, 0xb3, 0x38, 0xb7, 0x3b, 0x68, 0x91, 0xd1, 0xb3, 0xa8, 0x69, 0x24, 0x9c, 0xdf, + 0x27, 0x5b, 0x38, 0xbf, 0x7d, 0xb2, 0x0a, 0xd9, 0x7c, 0xe0, 0x52, 0x12, 0xc4, 0x42, 0xe0, 0xdf, + 0xe7, 0x1f, 0x3e, 0x7f, 0x82, 0x1b, 0x4d, 0x0f, 0x71, 0x92, 0x1b, 0xf2, 0x48, 0x53, 0x1e, 0xcf, + 0x8b, 0xfe, 0x98, 0xf6, 0x62, 0xed, 0x2e, 0xaf, 0xdd, 0xe5, 0xb5, 0xbb, 0xfc, 0xf0, 0xee, 0x72, + 0x9b, 0xf7, 0x1a, 0x94, 0x0e, 0xe6, 0xe9, 0xbe, 0x8d, 0x22, 0x90, 0x48, 0x44, 0xe9, 0xc0, 0x6e, + 0x73, 0x2c, 0x49, 0x22, 0x21, 0x34, 0x43, 0xeb, 0x91, 0xdf, 0xad, 0x0e, 0xfc, 0x62, 0xb4, 0x3e, + 0xc3, 0xff, 0xf0, 0x83, 0xbf, 0xf3, 0x14, 0x61, 0x9d, 0x62, 0xbd, 0xd6, 0xe2, 0xed, 0xdf, 0x6c, + 0xb7, 0x60, 0xd7, 0x9d, 0x01, 0x83, 0xb2, 0x57, 0x3b, 0xfa, 0x6b, 0x47, 0x3f, 0x75, 0xf4, 0xff, + 0x3f, 0x32, 0x8d, 0x17, 0xbd}; const char* shaderSource() { static std::string decompressed = util::decompress(std::string(reinterpret_cast(compressedShaderSource), sizeof(compressedShaderSource))); @@ -470,3 +481,4 @@ const char* shaderSource() { } // namespace gl } // namespace programs } // namespace mbgl +// clang-format on diff --git a/src/mbgl/programs/gl/symbol_icon.cpp b/src/mbgl/programs/gl/symbol_icon.cpp index 49c7654cf8a..c4b359a18a3 100644 --- a/src/mbgl/programs/gl/symbol_icon.cpp +++ b/src/mbgl/programs/gl/symbol_icon.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,9 +15,9 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "symbol_icon"; - static constexpr const uint8_t hash[8] = { 0xf3, 0x81, 0x62, 0xe8, 0x24, 0x49, 0xc6, 0x8f }; + static constexpr const uint8_t hash[8] = {0x98, 0x20, 0xb6, 0xc1, 0x6d, 0x2e, 0x97, 0x8d}; static constexpr const auto vertexOffset = 50247; - static constexpr const auto fragmentOffset = 52895; + static constexpr const auto fragmentOffset = 52855; }; constexpr const char* ShaderSource::name; @@ -93,15 +93,14 @@ void main() { vec2 a_tex = a_data.xy; vec2 a_size = a_data.zw; + float a_size_min = floor(a_size[0] * 0.5); highp float segment_angle = -a_projected_pos[2]; - float size; + if (!u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = mix(a_size[0], a_size[1], u_size_t) / 256.0; + size = mix(a_size_min, a_size[1], u_size_t) / 128.0; } else if (u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = a_size[0] / 256.0; - } else if (!u_is_size_zoom_constant && u_is_size_feature_constant) { - size = u_size; + size = a_size_min / 128.0; } else { size = u_size; } @@ -178,4 +177,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/symbol_sdf_icon.cpp b/src/mbgl/programs/gl/symbol_sdf_icon.cpp index 661fc7d2985..9ab54cbdd3c 100644 --- a/src/mbgl/programs/gl/symbol_sdf_icon.cpp +++ b/src/mbgl/programs/gl/symbol_sdf_icon.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,9 +15,9 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "symbol_sdf_icon"; - static constexpr const uint8_t hash[8] = { 0x4b, 0x0b, 0x5f, 0x6b, 0xa9, 0xec, 0x84, 0x19 }; - static constexpr const auto vertexOffset = 53300; - static constexpr const auto fragmentOffset = 57334; + static constexpr const uint8_t hash[8] = {0x8e, 0xbe, 0xa0, 0x1c, 0x9f, 0x81, 0x4d, 0x39}; + static constexpr const auto vertexOffset = 53260; + static constexpr const auto fragmentOffset = 57227; }; constexpr const char* ShaderSource::name; @@ -161,15 +161,14 @@ void main() { vec2 a_tex = a_data.xy; vec2 a_size = a_data.zw; + float a_size_min = floor(a_size[0] * 0.5); highp float segment_angle = -a_projected_pos[2]; float size; if (!u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = mix(a_size[0], a_size[1], u_size_t) / 256.0; + size = mix(a_size_min, a_size[1], u_size_t) / 128.0; } else if (u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = a_size[0] / 256.0; - } else if (!u_is_size_zoom_constant && u_is_size_feature_constant) { - size = u_size; + size = a_size_min / 128.0; } else { size = u_size; } @@ -215,12 +214,11 @@ void main() { gl_Position = u_coord_matrix * vec4(projected_pos.xy / projected_pos.w + rotation_matrix * (a_offset / 32.0 * fontScale), 0.0, 1.0); float gamma_scale = gl_Position.w; - vec2 tex = a_tex / u_texsize; vec2 fade_opacity = unpack_opacity(a_fade_opacity); float fade_change = fade_opacity[1] > 0.5 ? u_fade_change : -u_fade_change; float interpolated_fade_opacity = max(0.0, min(1.0, fade_opacity[0] + fade_change)); - v_data0 = vec2(tex.x, tex.y); + v_data0 = a_tex / u_texsize; v_data1 = vec3(gamma_scale, size, interpolated_fade_opacity); } @@ -332,4 +330,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/symbol_sdf_text.cpp b/src/mbgl/programs/gl/symbol_sdf_text.cpp index 7eb0dbabed1..eb757469039 100644 --- a/src/mbgl/programs/gl/symbol_sdf_text.cpp +++ b/src/mbgl/programs/gl/symbol_sdf_text.cpp @@ -1,5 +1,5 @@ // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. - +// clang-format off #include #include #include @@ -15,9 +15,9 @@ struct ShaderSource; template <> struct ShaderSource { static constexpr const char* name = "symbol_sdf_text"; - static constexpr const uint8_t hash[8] = { 0x4b, 0x0b, 0x5f, 0x6b, 0xa9, 0xec, 0x84, 0x19 }; - static constexpr const auto vertexOffset = 53300; - static constexpr const auto fragmentOffset = 57334; + static constexpr const uint8_t hash[8] = {0x8e, 0xbe, 0xa0, 0x1c, 0x9f, 0x81, 0x4d, 0x39}; + static constexpr const auto vertexOffset = 53260; + static constexpr const auto fragmentOffset = 57227; }; constexpr const char* ShaderSource::name; @@ -161,15 +161,14 @@ void main() { vec2 a_tex = a_data.xy; vec2 a_size = a_data.zw; + float a_size_min = floor(a_size[0] * 0.5); highp float segment_angle = -a_projected_pos[2]; float size; if (!u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = mix(a_size[0], a_size[1], u_size_t) / 256.0; + size = mix(a_size_min, a_size[1], u_size_t) / 128.0; } else if (u_is_size_zoom_constant && !u_is_size_feature_constant) { - size = a_size[0] / 256.0; - } else if (!u_is_size_zoom_constant && u_is_size_feature_constant) { - size = u_size; + size = a_size_min / 128.0; } else { size = u_size; } @@ -215,12 +214,11 @@ void main() { gl_Position = u_coord_matrix * vec4(projected_pos.xy / projected_pos.w + rotation_matrix * (a_offset / 32.0 * fontScale), 0.0, 1.0); float gamma_scale = gl_Position.w; - vec2 tex = a_tex / u_texsize; vec2 fade_opacity = unpack_opacity(a_fade_opacity); float fade_change = fade_opacity[1] > 0.5 ? u_fade_change : -u_fade_change; float interpolated_fade_opacity = max(0.0, min(1.0, fade_opacity[0] + fade_change)); - v_data0 = vec2(tex.x, tex.y); + v_data0 = a_tex / u_texsize; v_data1 = vec3(gamma_scale, size, interpolated_fade_opacity); } @@ -332,4 +330,4 @@ void main() { } */ - +// clang-format on diff --git a/src/mbgl/programs/gl/symbol_text_and_icon.cpp b/src/mbgl/programs/gl/symbol_text_and_icon.cpp new file mode 100644 index 00000000000..bff5f3ce7a9 --- /dev/null +++ b/src/mbgl/programs/gl/symbol_text_and_icon.cpp @@ -0,0 +1,353 @@ +// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED. +// clang-format off +#include +#include +#include +#include + +namespace mbgl { +namespace programs { +namespace gl { + +template +struct ShaderSource; + +template <> +struct ShaderSource { + static constexpr const char* name = "symbol_text_and_icon"; + static constexpr const uint8_t hash[8] = {0x7e, 0xbe, 0x72, 0x43, 0x55, 0x8e, 0xb5, 0xeb}; + static constexpr const auto vertexOffset = 59063; + static constexpr const auto fragmentOffset = 63119; +}; + +constexpr const char* ShaderSource::name; +constexpr const uint8_t ShaderSource::hash[8]; + +} // namespace gl +} // namespace programs + +namespace gfx { + +template <> +std::unique_ptr> +Backend::Create(const ProgramParameters& programParameters) { + return std::make_unique>(programParameters); +} + +} // namespace gfx +} // namespace mbgl + +// Uncompressed source of symbol_text_and_icon.vertex.glsl: +/* +const float PI = 3.141592653589793; + +attribute vec4 a_pos_offset; +attribute vec4 a_data; +attribute vec3 a_projected_pos; +attribute float a_fade_opacity; + +// contents of a_size vary based on the type of property value +// used for {text,icon}-size. +// For constants, a_size is disabled. +// For source functions, we bind only one value per vertex: the value of {text,icon}-size evaluated for the current feature. +// For composite functions: +// [ text-size(lowerZoomStop, feature), +// text-size(upperZoomStop, feature) ] +uniform bool u_is_size_zoom_constant; +uniform bool u_is_size_feature_constant; +uniform highp float u_size_t; // used to interpolate between zoom stops when size is a composite function +uniform highp float u_size; // used when size is both zoom and feature constant +uniform mat4 u_matrix; +uniform mat4 u_label_plane_matrix; +uniform mat4 u_coord_matrix; +uniform bool u_is_text; +uniform bool u_pitch_with_map; +uniform highp float u_pitch; +uniform bool u_rotate_symbol; +uniform highp float u_aspect_ratio; +uniform highp float u_camera_to_center_distance; +uniform float u_fade_change; +uniform vec2 u_texsize; +uniform vec2 u_texsize_icon; + +varying vec4 v_data0; +varying vec4 v_data1; + + +#ifndef HAS_UNIFORM_u_fill_color +uniform lowp float u_fill_color_t; +attribute highp vec4 a_fill_color; +varying highp vec4 fill_color; +#else +uniform highp vec4 u_fill_color; +#endif + + +#ifndef HAS_UNIFORM_u_halo_color +uniform lowp float u_halo_color_t; +attribute highp vec4 a_halo_color; +varying highp vec4 halo_color; +#else +uniform highp vec4 u_halo_color; +#endif + + +#ifndef HAS_UNIFORM_u_opacity +uniform lowp float u_opacity_t; +attribute lowp vec2 a_opacity; +varying lowp float opacity; +#else +uniform lowp float u_opacity; +#endif + + +#ifndef HAS_UNIFORM_u_halo_width +uniform lowp float u_halo_width_t; +attribute lowp vec2 a_halo_width; +varying lowp float halo_width; +#else +uniform lowp float u_halo_width; +#endif + + +#ifndef HAS_UNIFORM_u_halo_blur +uniform lowp float u_halo_blur_t; +attribute lowp vec2 a_halo_blur; +varying lowp float halo_blur; +#else +uniform lowp float u_halo_blur; +#endif + + +void main() { + +#ifndef HAS_UNIFORM_u_fill_color + fill_color = unpack_mix_color(a_fill_color, u_fill_color_t); +#else + highp vec4 fill_color = u_fill_color; +#endif + + +#ifndef HAS_UNIFORM_u_halo_color + halo_color = unpack_mix_color(a_halo_color, u_halo_color_t); +#else + highp vec4 halo_color = u_halo_color; +#endif + + +#ifndef HAS_UNIFORM_u_opacity + opacity = unpack_mix_vec2(a_opacity, u_opacity_t); +#else + lowp float opacity = u_opacity; +#endif + + +#ifndef HAS_UNIFORM_u_halo_width + halo_width = unpack_mix_vec2(a_halo_width, u_halo_width_t); +#else + lowp float halo_width = u_halo_width; +#endif + + +#ifndef HAS_UNIFORM_u_halo_blur + halo_blur = unpack_mix_vec2(a_halo_blur, u_halo_blur_t); +#else + lowp float halo_blur = u_halo_blur; +#endif + + + vec2 a_pos = a_pos_offset.xy; + vec2 a_offset = a_pos_offset.zw; + + vec2 a_tex = a_data.xy; + vec2 a_size = a_data.zw; + + float a_size_min = floor(a_size[0] * 0.5); + float is_sdf = a_size[0] - 2.0 * a_size_min; + + highp float segment_angle = -a_projected_pos[2]; + float size; + + if (!u_is_size_zoom_constant && !u_is_size_feature_constant) { + size = mix(a_size_min, a_size[1], u_size_t) / 128.0; + } else if (u_is_size_zoom_constant && !u_is_size_feature_constant) { + size = a_size_min / 128.0; + } else { + size = u_size; + } + + vec4 projectedPoint = u_matrix * vec4(a_pos, 0, 1); + highp float camera_to_anchor_distance = projectedPoint.w; + // If the label is pitched with the map, layout is done in pitched space, + // which makes labels in the distance smaller relative to viewport space. + // We counteract part of that effect by multiplying by the perspective ratio. + // If the label isn't pitched with the map, we do layout in viewport space, + // which makes labels in the distance larger relative to the features around + // them. We counteract part of that effect by dividing by the perspective ratio. + highp float distance_ratio = u_pitch_with_map ? + camera_to_anchor_distance / u_camera_to_center_distance : + u_camera_to_center_distance / camera_to_anchor_distance; + highp float perspective_ratio = clamp( + 0.5 + 0.5 * distance_ratio, + 0.0, // Prevents oversized near-field symbols in pitched/overzoomed tiles + 4.0); + + size *= perspective_ratio; + + float fontScale = size / 24.0; + + highp float symbol_rotation = 0.0; + if (u_rotate_symbol) { + // Point labels with 'rotation-alignment: map' are horizontal with respect to tile units + // To figure out that angle in projected space, we draw a short horizontal line in tile + // space, project it, and measure its angle in projected space. + vec4 offsetProjectedPoint = u_matrix * vec4(a_pos + vec2(1, 0), 0, 1); + + vec2 a = projectedPoint.xy / projectedPoint.w; + vec2 b = offsetProjectedPoint.xy / offsetProjectedPoint.w; + + symbol_rotation = atan((b.y - a.y) / u_aspect_ratio, b.x - a.x); + } + + highp float angle_sin = sin(segment_angle + symbol_rotation); + highp float angle_cos = cos(segment_angle + symbol_rotation); + mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos); + + vec4 projected_pos = u_label_plane_matrix * vec4(a_projected_pos.xy, 0.0, 1.0); + gl_Position = u_coord_matrix * vec4(projected_pos.xy / projected_pos.w + rotation_matrix * (a_offset / 32.0 * fontScale), 0.0, 1.0); + float gamma_scale = gl_Position.w; + + vec2 fade_opacity = unpack_opacity(a_fade_opacity); + float fade_change = fade_opacity[1] > 0.5 ? u_fade_change : -u_fade_change; + float interpolated_fade_opacity = max(0.0, min(1.0, fade_opacity[0] + fade_change)); + + v_data0.xy = a_tex / u_texsize; + v_data0.zw = a_tex / u_texsize_icon; + v_data1 = vec4(gamma_scale, size, interpolated_fade_opacity, is_sdf); +} + +*/ + +// Uncompressed source of symbol_text_and_icon.fragment.glsl: +/* +#define SDF_PX 8.0 + +#define SDF 1.0 +#define ICON 0.0 + +uniform bool u_is_halo; +uniform sampler2D u_texture; +uniform sampler2D u_texture_icon; +uniform highp float u_gamma_scale; +uniform lowp float u_device_pixel_ratio; + +varying vec4 v_data0; +varying vec4 v_data1; + + +#ifndef HAS_UNIFORM_u_fill_color +varying highp vec4 fill_color; +#else +uniform highp vec4 u_fill_color; +#endif + + +#ifndef HAS_UNIFORM_u_halo_color +varying highp vec4 halo_color; +#else +uniform highp vec4 u_halo_color; +#endif + + +#ifndef HAS_UNIFORM_u_opacity +varying lowp float opacity; +#else +uniform lowp float u_opacity; +#endif + + +#ifndef HAS_UNIFORM_u_halo_width +varying lowp float halo_width; +#else +uniform lowp float u_halo_width; +#endif + + +#ifndef HAS_UNIFORM_u_halo_blur +varying lowp float halo_blur; +#else +uniform lowp float u_halo_blur; +#endif + + +void main() { + +#ifdef HAS_UNIFORM_u_fill_color + highp vec4 fill_color = u_fill_color; +#endif + + +#ifdef HAS_UNIFORM_u_halo_color + highp vec4 halo_color = u_halo_color; +#endif + + +#ifdef HAS_UNIFORM_u_opacity + lowp float opacity = u_opacity; +#endif + + +#ifdef HAS_UNIFORM_u_halo_width + lowp float halo_width = u_halo_width; +#endif + + +#ifdef HAS_UNIFORM_u_halo_blur + lowp float halo_blur = u_halo_blur; +#endif + + + float fade_opacity = v_data1[2]; + + if (v_data1.w == ICON) { + vec2 tex_icon = v_data0.zw; + lowp float alpha = opacity * fade_opacity; + gl_FragColor = texture2D(u_texture_icon, tex_icon) * alpha; + +#ifdef OVERDRAW_INSPECTOR + gl_FragColor = vec4(1.0); +#endif + return; + } + + vec2 tex = v_data0.xy; + + float EDGE_GAMMA = 0.105 / u_device_pixel_ratio; + + float gamma_scale = v_data1.x; + float size = v_data1.y; + + float fontScale = size / 24.0; + + lowp vec4 color = fill_color; + highp float gamma = EDGE_GAMMA / (fontScale * u_gamma_scale); + lowp float buff = (256.0 - 64.0) / 256.0; + if (u_is_halo) { + color = halo_color; + gamma = (halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (fontScale * u_gamma_scale); + buff = (6.0 - halo_width / fontScale) / SDF_PX; + } + + lowp float dist = texture2D(u_texture, tex).a; + highp float gamma_scaled = gamma * gamma_scale; + highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist); + + gl_FragColor = color * (alpha * opacity * fade_opacity); + +#ifdef OVERDRAW_INSPECTOR + gl_FragColor = vec4(1.0); +#endif +} + +*/ +// clang-format on diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp index bfc01336768..1f1bbd49b5f 100644 --- a/src/mbgl/programs/symbol_program.cpp +++ b/src/mbgl/programs/symbol_program.cpp @@ -156,6 +156,33 @@ SymbolSDFProgram::layoutUniformValues(const bool isText, ); } +SymbolTextAndIconProgram::LayoutUniformValues SymbolTextAndIconProgram::layoutUniformValues( + const bool hasVariablePacement, + const style::SymbolPropertyValues& values, + const Size& texsize, + const Size& texsize_icon, + const std::array& pixelsToGLUnits, + const float pixelRatio, + const bool alongLine, + const RenderTile& tile, + const TransformState& state, + const float symbolFadeChange, + const SymbolSDFPart part) { + return SymbolTextAndIconProgram::LayoutUniformValues( + SymbolSDFProgram::layoutUniformValues(true, + hasVariablePacement, + values, + texsize, + pixelsToGLUnits, + pixelRatio, + alongLine, + tile, + state, + symbolFadeChange, + part) + .concat(gfx::UniformValues(uniforms::texsize::Value(texsize_icon)))); +} + template class SymbolSDFProgram; template class SymbolSDFProgram; diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 80e6245a034..1bbd7685038 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -14,12 +14,15 @@ #include #include - #include #include namespace mbgl { +const uint16_t MAX_GLYPH_ICON_SIZE = 255; +const uint16_t SIZE_PACK_FACTOR = 128; +const uint16_t MAX_PACKED_SIZE = MAX_GLYPH_ICON_SIZE * SIZE_PACK_FACTOR; + namespace style { class SymbolPropertyValues; } // namespace style @@ -197,26 +200,22 @@ class CompositeFunctionSymbolSizeBinder final : public SymbolSizeBinder { class SymbolProgramBase { public: static gfx::Vertex layoutVertex(Point labelAnchor, - Point o, - float glyphOffsetY, - uint16_t tx, - uint16_t ty, - const Range& sizeData) { + Point o, + float glyphOffsetY, + uint16_t tx, + uint16_t ty, + const Range& sizeData, + bool isSDF) { + const uint16_t aSizeMin = + (std::min(MAX_PACKED_SIZE, static_cast(sizeData.min * SIZE_PACK_FACTOR)) << 1) + uint16_t(isSDF); + const uint16_t aSizeMax = std::min(MAX_PACKED_SIZE, static_cast(sizeData.max * SIZE_PACK_FACTOR)); return { // combining pos and offset to reduce number of vertex attributes passed to shader (8 max for some devices) - {{ - static_cast(labelAnchor.x), - static_cast(labelAnchor.y), - static_cast(::round(o.x * 32)), // use 1/32 pixels for placement - static_cast(::round((o.y + glyphOffsetY) * 32)) - }}, - {{ - tx, - ty, - static_cast(sizeData.min * 256), - static_cast(sizeData.max * 256) - }} - }; + {{static_cast(labelAnchor.x), + static_cast(labelAnchor.y), + static_cast(::round(o.x * 32)), // use 1/32 pixels for placement + static_cast(::round((o.y + glyphOffsetY) * 32))}}, + {{tx, ty, aSizeMin, aSizeMax}}}; } static gfx::Vertex dynamicLayoutVertex(Point anchorPoint, float labelAngle) { @@ -418,60 +417,39 @@ enum class SymbolSDFPart { Halo = 0 }; +using SymbolSDFProgramUniforms = TypeList; + template -class SymbolSDFProgram : public SymbolProgram< - Name, - gfx::PrimitiveType::Triangle, - SymbolLayoutAttributes, - TypeList< - uniforms::matrix, - uniforms::label_plane_matrix, - uniforms::coord_matrix, - uniforms::extrude_scale, - uniforms::texsize, - uniforms::fade_change, - uniforms::is_text, - uniforms::camera_to_center_distance, - uniforms::pitch, - uniforms::pitch_with_map, - uniforms::rotate_symbol, - uniforms::aspect_ratio, - uniforms::gamma_scale, - uniforms::device_pixel_ratio, - uniforms::is_halo>, - TypeList< - textures::texture>, - PaintProperties> -{ +class SymbolSDFProgram : public SymbolProgram, + PaintProperties> { public: - using BaseProgram = SymbolProgram< - Name, - gfx::PrimitiveType::Triangle, - SymbolLayoutAttributes, - TypeList< - uniforms::matrix, - uniforms::label_plane_matrix, - uniforms::coord_matrix, - uniforms::extrude_scale, - uniforms::texsize, - uniforms::fade_change, - uniforms::is_text, - uniforms::camera_to_center_distance, - uniforms::pitch, - uniforms::pitch_with_map, - uniforms::rotate_symbol, - uniforms::aspect_ratio, - uniforms::gamma_scale, - uniforms::device_pixel_ratio, - uniforms::is_halo>, - TypeList< - textures::texture>, - PaintProperties>; + using BaseProgram = SymbolProgram, + PaintProperties>; using LayoutUniformValues = typename BaseProgram::LayoutUniformValues; - - using BaseProgram::BaseProgram; static LayoutUniformValues layoutUniformValues(const bool isText, @@ -487,6 +465,40 @@ class SymbolSDFProgram : public SymbolProgram< const SymbolSDFPart); }; +using SymbolTextAndIconProgramUniforms = TypeList; + +class SymbolTextAndIconProgram + : public SymbolProgram, + TypeList, + style::TextPaintProperties> { +public: + using BaseProgram = SymbolProgram, + TypeList, + style::TextPaintProperties>; + + using LayoutUniformValues = typename BaseProgram::LayoutUniformValues; + + using BaseProgram::BaseProgram; + + static LayoutUniformValues layoutUniformValues(const bool hasVariablePacement, + const style::SymbolPropertyValues&, + const Size& texsize, + const Size& texsize_icon, + const std::array& pixelsToGLUnits, + const float pixelRatio, + const bool alongLine, + const RenderTile&, + const TransformState&, + const float SymbolFadeChange, + const SymbolSDFPart); +}; + class SymbolSDFIconProgram : public SymbolSDFProgram { public: using SymbolSDFProgram::SymbolSDFProgram; @@ -507,11 +519,13 @@ class SymbolLayerPrograms final : public LayerTypePrograms { : symbolIcon(context, programParameters), symbolIconSDF(context, programParameters), symbolGlyph(context, programParameters), + symbolTextAndIcon(context, programParameters), collisionBox(context, programParameters), collisionCircle(context, programParameters) {} SymbolIconProgram symbolIcon; SymbolSDFIconProgram symbolIconSDF; SymbolSDFTextProgram symbolGlyph; + SymbolTextAndIconProgram symbolTextAndIcon; CollisionBoxProgram collisionBox; CollisionCircleProgram collisionCircle; }; diff --git a/src/mbgl/programs/symbol_text_and_icon_program.hpp b/src/mbgl/programs/symbol_text_and_icon_program.hpp new file mode 100644 index 00000000000..57f27518d19 --- /dev/null +++ b/src/mbgl/programs/symbol_text_and_icon_program.hpp @@ -0,0 +1,4 @@ +#pragma once + +// Alias +#include diff --git a/src/mbgl/programs/textures.hpp b/src/mbgl/programs/textures.hpp index 4c9de533667..7d53b447b10 100644 --- a/src/mbgl/programs/textures.hpp +++ b/src/mbgl/programs/textures.hpp @@ -10,6 +10,7 @@ MBGL_DEFINE_TEXTURE(image0); MBGL_DEFINE_TEXTURE(image1); MBGL_DEFINE_TEXTURE(color_ramp); MBGL_DEFINE_TEXTURE(texture); +MBGL_DEFINE_TEXTURE(texture_icon); } // namespace textures } // namespace mbgl diff --git a/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp index 79dcfa56fb5..bf928cde5e0 100644 --- a/src/mbgl/programs/uniforms.hpp +++ b/src/mbgl/programs/uniforms.hpp @@ -35,6 +35,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, gapwidth); MBGL_DEFINE_UNIFORM_SCALAR(float, offset); MBGL_DEFINE_UNIFORM_SCALAR(Size, world); MBGL_DEFINE_UNIFORM_SCALAR(Size, texsize); +MBGL_DEFINE_UNIFORM_SCALAR(Size, texsize_icon); MBGL_DEFINE_UNIFORM_SCALAR(bool, pitch_with_map); MBGL_DEFINE_UNIFORM_SCALAR(float, camera_to_center_distance); MBGL_DEFINE_UNIFORM_SCALAR(float, device_pixel_ratio); diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 03ab1c87d15..7efd81053ed 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -24,7 +24,8 @@ SymbolBucket::SymbolBucket(Immutable&& symbolInstances_, float tilePixelRatio_, bool allowVerticalPlacement_, - std::vector placementModes_) + std::vector placementModes_, + bool iconsInText_) : layout(std::move(layout_)), bucketLeaderID(bucketName_), iconsNeedLinear(iconsNeedLinear_ || iconSize.isDataDriven() || !iconSize.isZoomConstant()), @@ -33,6 +34,7 @@ SymbolBucket::SymbolBucket(Immutable&&, const float tilePixelRatio, bool allowVerticalPlacement, - std::vector placementModes); + std::vector placementModes, + bool iconsInText); ~SymbolBucket() override; void upload(gfx::UploadPass&) override; @@ -95,6 +96,7 @@ class SymbolBucket final : public Bucket { bool placementChangesUploaded : 1; bool dynamicUploaded : 1; bool sortUploaded : 1; + bool iconsInText : 1; // Set and used by placement. mutable bool justReloaded : 1; bool hasVariablePlacement : 1; diff --git a/src/mbgl/renderer/image_atlas.hpp b/src/mbgl/renderer/image_atlas.hpp index 56d7406a0ab..e4d7d0f009e 100644 --- a/src/mbgl/renderer/image_atlas.hpp +++ b/src/mbgl/renderer/image_atlas.hpp @@ -20,6 +20,7 @@ class ImagePosition { public: ImagePosition(const mapbox::Bin&, const style::Image::Impl&, uint32_t version = 0); + static constexpr const uint16_t padding = 1u; float pixelRatio; Rect textureRect; uint32_t version; @@ -50,6 +51,13 @@ class ImagePosition { textureRect.h / pixelRatio, }}; } + + Rect paddedTextureRect() const { + return {static_cast(textureRect.x - padding), + static_cast(textureRect.y - padding), + static_cast(textureRect.w + padding * 2), + static_cast(textureRect.h + padding * 2)}; + } }; using ImagePositions = std::map; diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index a4a73d3fe5b..17376fd8644 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -188,43 +188,105 @@ void drawText(const DrawFn& draw, const auto& evaluated = getEvaluated(renderData.layerProperties); const auto& layout = *bucket.layout; - const gfx::TextureBinding textureBinding{ tile.getGlyphAtlasTexture().getResource(), - gfx::TextureFilterType::Linear }; - auto values = textPropertyValues(evaluated, layout); const auto& paintPropertyValues = RenderSymbolLayer::textPaintProperties(evaluated); const bool alongLine = layout.get() != SymbolPlacementType::Point && layout.get() == AlignmentType::Map; - const Size& texsize = tile.getGlyphAtlasTexture().size; + const Size& glyphTexSize = tile.getGlyphAtlasTexture().size; + const gfx::TextureBinding glyphTextureBinding{tile.getGlyphAtlasTexture().getResource(), + gfx::TextureFilterType::Linear}; + + const auto drawGlyphs = [&](auto& program, const auto& uniforms, const auto& textures, SymbolSDFPart part) { + draw(program, + uniforms, + bucket.text, + textSegments, + bucket.textSizeBinder, + bucketPaintProperties.textBinders, + paintPropertyValues, + textures, + (part == SymbolSDFPart::Halo) ? "halo" : "fill"); + }; - if (values.hasHalo) { - draw(parameters.programs.getSymbolLayerPrograms().symbolGlyph, - SymbolSDFTextProgram::layoutUniformValues(true, bucket.hasVariablePlacement, values, texsize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Halo), - bucket.text, - textSegments, - bucket.textSizeBinder, - bucketPaintProperties.textBinders, - paintPropertyValues, - SymbolSDFTextProgram::TextureBindings{ - textureBinding - }, - "halo"); - } + if (bucket.iconsInText) { + const ZoomEvaluatedSize partiallyEvaluatedTextSize = + bucket.textSizeBinder->evaluateForZoom(parameters.state.getZoom()); + const bool transformed = values.rotationAlignment == AlignmentType::Map || parameters.state.getPitch() != 0; + const Size& iconTexSize = tile.getIconAtlasTexture().size; + const gfx::TextureBinding iconTextureBinding{ + tile.getIconAtlasTexture().getResource(), + parameters.state.isChanging() || transformed || !partiallyEvaluatedTextSize.isZoomConstant + ? gfx::TextureFilterType::Linear + : gfx::TextureFilterType::Nearest}; + if (values.hasHalo) { + drawGlyphs(parameters.programs.getSymbolLayerPrograms().symbolTextAndIcon, + SymbolTextAndIconProgram::layoutUniformValues(bucket.hasVariablePlacement, + values, + glyphTexSize, + iconTexSize, + parameters.pixelsToGLUnits, + parameters.pixelRatio, + alongLine, + tile, + parameters.state, + parameters.symbolFadeChange, + SymbolSDFPart::Halo), + SymbolTextAndIconProgram::TextureBindings{glyphTextureBinding, iconTextureBinding}, + SymbolSDFPart::Halo); + } - if (values.hasFill) { - draw(parameters.programs.getSymbolLayerPrograms().symbolGlyph, - SymbolSDFTextProgram::layoutUniformValues(true, bucket.hasVariablePlacement, values, texsize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Fill), - bucket.text, - textSegments, - bucket.textSizeBinder, - bucketPaintProperties.textBinders, - paintPropertyValues, - SymbolSDFTextProgram::TextureBindings{ - textureBinding - }, - "fill"); + if (values.hasFill) { + drawGlyphs(parameters.programs.getSymbolLayerPrograms().symbolTextAndIcon, + SymbolTextAndIconProgram::layoutUniformValues(bucket.hasVariablePlacement, + values, + glyphTexSize, + iconTexSize, + parameters.pixelsToGLUnits, + parameters.pixelRatio, + alongLine, + tile, + parameters.state, + parameters.symbolFadeChange, + SymbolSDFPart::Fill), + SymbolTextAndIconProgram::TextureBindings{glyphTextureBinding, iconTextureBinding}, + SymbolSDFPart::Fill); + } + } else { + if (values.hasHalo) { + drawGlyphs(parameters.programs.getSymbolLayerPrograms().symbolGlyph, + SymbolSDFTextProgram::layoutUniformValues(true, + bucket.hasVariablePlacement, + values, + glyphTexSize, + parameters.pixelsToGLUnits, + parameters.pixelRatio, + alongLine, + tile, + parameters.state, + parameters.symbolFadeChange, + SymbolSDFPart::Halo), + SymbolSDFTextProgram::TextureBindings{glyphTextureBinding}, + SymbolSDFPart::Halo); + } + + if (values.hasFill) { + drawGlyphs(parameters.programs.getSymbolLayerPrograms().symbolGlyph, + SymbolSDFTextProgram::layoutUniformValues(true, + bucket.hasVariablePlacement, + values, + glyphTexSize, + parameters.pixelsToGLUnits, + parameters.pixelRatio, + alongLine, + tile, + parameters.state, + parameters.symbolFadeChange, + SymbolSDFPart::Fill), + SymbolSDFTextProgram::TextureBindings{glyphTextureBinding}, + SymbolSDFPart::Fill); + } } } diff --git a/src/mbgl/style/conversion/function.cpp b/src/mbgl/style/conversion/function.cpp index 4b3b8f6c6a8..e3beb44d226 100644 --- a/src/mbgl/style/conversion/function.cpp +++ b/src/mbgl/style/conversion/function.cpp @@ -42,9 +42,8 @@ bool hasTokens(const std::string& source) { std::unique_ptr convertTokenStringToFormatExpression(const std::string& source) { auto textExpression = convertTokenStringToExpression(source); - std::vector sections; - sections.emplace_back(std::move(textExpression), nullopt, nullopt, nullopt); - return std::make_unique(sections); + std::vector sections{FormatExpressionSection(std::move(textExpression))}; + return std::make_unique(std::move(sections)); } std::unique_ptr convertTokenStringToImageExpression(const std::string& source) { diff --git a/src/mbgl/style/expression/dsl.cpp b/src/mbgl/style/expression/dsl.cpp index 6405149fe9b..c8d98e61a45 100644 --- a/src/mbgl/style/expression/dsl.cpp +++ b/src/mbgl/style/expression/dsl.cpp @@ -237,9 +237,8 @@ std::unique_ptr format(const char* value) { } std::unique_ptr format(std::unique_ptr input) { - std::vector sections; - sections.emplace_back(std::move(input), nullopt, nullopt, nullopt); - return std::make_unique(sections); + std::vector sections{FormatExpressionSection(std::move(input))}; + return std::make_unique(std::move(sections)); } std::unique_ptr image(const char* value) { diff --git a/src/mbgl/style/expression/format_expression.cpp b/src/mbgl/style/expression/format_expression.cpp index 743942c7695..201e189f41b 100644 --- a/src/mbgl/style/expression/format_expression.cpp +++ b/src/mbgl/style/expression/format_expression.cpp @@ -6,21 +6,23 @@ namespace mbgl { namespace style { namespace expression { -FormatExpressionSection::FormatExpressionSection(std::unique_ptr text_, - optional> fontScale_, - optional> textFont_, - optional> textColor_) - : text(std::move(text_)) -{ +FormatExpressionSection::FormatExpressionSection(std::unique_ptr content_) : content(std::move(content_)) {} + +void FormatExpressionSection::setTextSectionOptions(optional> fontScale_, + optional> textFont_, + optional> textColor_) { if (fontScale_) { + assert(*fontScale_); fontScale = std::shared_ptr(std::move(*fontScale_)); } if (textFont_) { + assert(*textFont_); textFont = std::shared_ptr(std::move(*textFont_)); } if (textColor_) { + assert(*textColor_); textColor = std::shared_ptr(std::move(*textColor_)); } } @@ -34,68 +36,69 @@ using namespace mbgl::style::conversion; ParseResult FormatExpression::parse(const Convertible& value, ParsingContext& ctx) { std::size_t argsLength = arrayLength(value); - if (argsLength < 3) { - ctx.error("Expected at least two arguments."); + if (argsLength < 2) { + ctx.error("Expected at least one argument."); return ParseResult(); } - - if ((argsLength - 1) % 2 != 0) { - ctx.error("Expected an even number of arguments."); + + if (isObject(arrayMember(value, 1))) { + ctx.error("First argument must be an image or text section."); return ParseResult(); } - + std::vector sections; - for (std::size_t i = 1; i < argsLength - 1; i += 2) { - auto textArg = arrayMember(value, i); - ParseResult text = ctx.parse(textArg, 1, {type::Value}); - if (!text) { - return ParseResult(); - } - auto options = arrayMember(value, i + 1); - if (!isObject(options)) { - ctx.error("Format options argument must be an object."); - return ParseResult(); - } - - const optional fontScaleOption = objectMember(options, kFormattedSectionFontScale); - ParseResult fontScale; - if (fontScaleOption) { - fontScale = ctx.parse(*fontScaleOption, 1, {type::Number}); - if (!fontScale) { - return ParseResult(); + bool nextTokenMayBeObject = false; + for (std::size_t i = 1; i <= argsLength - 1; ++i) { + auto arg = arrayMember(value, i); + + if (nextTokenMayBeObject && isObject(arg)) { + nextTokenMayBeObject = false; + + const optional fontScaleOption = objectMember(arg, kFormattedSectionFontScale); + ParseResult fontScale; + if (fontScaleOption) { + fontScale = ctx.parse(*fontScaleOption, 1, {type::Number}); + if (!fontScale) { + return ParseResult(); + } } - } - - const optional textFontOption = objectMember(options, kFormattedSectionTextFont); - ParseResult textFont; - if (textFontOption) { - textFont = ctx.parse(*textFontOption, 1, {type::Array(type::String)}); - if (!textFont) { - return ParseResult(); + + const optional textFontOption = objectMember(arg, kFormattedSectionTextFont); + ParseResult textFont; + if (textFontOption) { + textFont = ctx.parse(*textFontOption, 1, {type::Array(type::String)}); + if (!textFont) { + return ParseResult(); + } + } + const optional textColorOption = objectMember(arg, kFormattedSectionTextColor); + ParseResult textColor; + if (textColorOption) { + textColor = ctx.parse(*textColorOption, 1, {type::Color}); + if (!textColor) { + return ParseResult(); + } } - } - const optional textColorOption = objectMember(options, kFormattedSectionTextColor); - ParseResult textColor; - if (textColorOption) { - textColor = ctx.parse(*textColorOption, 1, {type::Color}); - if (!textColor) { + sections.back().setTextSectionOptions(std::move(fontScale), std::move(textFont), std::move(textColor)); + } else { + ParseResult parsedArg = ctx.parse(arg, 1, {type::Value}); + if (!parsedArg) { + ctx.error("Cannot parse formatted section."); return ParseResult(); } - } - sections.emplace_back(std::move(*text), - std::move(fontScale), - std::move(textFont), - std::move(textColor)); + nextTokenMayBeObject = true; + sections.emplace_back(std::move(*parsedArg)); + } } - + return ParseResult(std::make_unique(std::move(sections))); } void FormatExpression::eachChild(const std::function& fn) const { for (auto& section : sections) { - fn(*section.text); + fn(*section.content); if (section.fontScale) { fn(**section.fontScale); } @@ -117,7 +120,7 @@ bool FormatExpression::operator==(const Expression& e) const { for (std::size_t i = 0; i < sections.size(); i++) { const auto& lhsSection = sections.at(i); const auto& rhsSection = rhs->sections.at(i); - if (*lhsSection.text != *rhsSection.text) { + if (*lhsSection.content != *rhsSection.content) { return false; } if ((lhsSection.fontScale && (!rhsSection.fontScale || **lhsSection.fontScale != **rhsSection.fontScale)) || @@ -141,7 +144,7 @@ bool FormatExpression::operator==(const Expression& e) const { mbgl::Value FormatExpression::serialize() const { std::vector serialized{{ getOperator() }}; for (const auto& section : sections) { - serialized.push_back(section.text->serialize()); + serialized.push_back(section.content->serialize()); std::unordered_map options; if (section.fontScale) { options.emplace(kFormattedSectionFontScale, (*section.fontScale)->serialize()); @@ -160,14 +163,25 @@ mbgl::Value FormatExpression::serialize() const { EvaluationResult FormatExpression::evaluate(const EvaluationContext& params) const { std::vector evaluatedSections; for (const auto& section : sections) { - auto textResult = section.text->evaluate(params); - if (!textResult) { - return textResult.error(); + auto contentResult = section.content->evaluate(params); + if (!contentResult) { + return contentResult.error(); } - - optional evaluatedText = toString(*textResult); - if (!evaluatedText) { - return EvaluationError({ "Could not coerce format expression text input to string." }); + + optional evaluatedText; + if (typeOf(*contentResult) == type::Image) { + const auto& image = contentResult->get(); + // Omit sections with empty image ids. + if (!image.id().empty()) { + evaluatedSections.emplace_back(image); + } + // Continue evaluation of a next section, as the image section does not have section options. + continue; + } else { + evaluatedText = toString(*contentResult); + if (!evaluatedText) { + return EvaluationError({"Could not coerce format expression text input to string."}); + } } optional evaluatedFontScale; diff --git a/src/mbgl/style/expression/formatted.cpp b/src/mbgl/style/expression/formatted.cpp index 4591a50ed15..9041bb3121b 100644 --- a/src/mbgl/style/expression/formatted.cpp +++ b/src/mbgl/style/expression/formatted.cpp @@ -17,9 +17,8 @@ bool Formatted::operator==(const Formatted& other) const { for (std::size_t i = 0; i < sections.size(); i++) { const auto& thisSection = sections.at(i); const auto& otherSection = other.sections.at(i); - if (thisSection.text != otherSection.text || - thisSection.fontScale != otherSection.fontScale || - thisSection.fontStack != otherSection.fontStack || + if (thisSection.text != otherSection.text || thisSection.image != otherSection.image || + thisSection.fontScale != otherSection.fontScale || thisSection.fontStack != otherSection.fontStack || thisSection.textColor != otherSection.textColor) { return false; } @@ -35,6 +34,16 @@ std::string Formatted::toString() const { return result; } +bool Formatted::empty() const { + if (sections.empty()) { + return true; + } + + return !std::any_of(sections.begin(), sections.end(), [](const FormattedSection& section) { + return !section.text.empty() || (section.image && !section.image->empty()); + }); +} + mbgl::Value Formatted::toObject() const { mapbox::base::ValueObject result; mapbox::base::ValueArray sectionValues; @@ -58,6 +67,7 @@ mbgl::Value Formatted::toObject() const { } else { serializedSection.emplace("textColor", NullValue()); } + serializedSection.emplace("image", section.image ? section.image->toValue() : NullValue()); sectionValues.emplace_back(serializedSection); } result.emplace("sections", std::move(sectionValues)); @@ -76,14 +86,37 @@ optional Converter::operator()(const Convertible& value, E if (isArray(value)) { std::vector sections; for (std::size_t i = 0; i < arrayLength(value); ++i) { - Convertible section = arrayMember(value, i); + const Convertible& section = arrayMember(value, i); std::size_t sectionLength = arrayLength(section); if (sectionLength < 1) { - error.message = "Section has to contain a text and optional parameters."; + error.message = "Section has to contain a text and optional parameters or an image."; return nullopt; } - optional sectionText = toString(arrayMember(section, 0)); + const Convertible& firstElement = arrayMember(section, 0); + if (isArray(firstElement)) { + if (arrayLength(firstElement) < 2) { + error.message = "Image section has to contain image name."; + return nullopt; + } + + optional imageOp = toString(arrayMember(firstElement, 0)); + if (!imageOp || *imageOp != "image") { + error.message = "Serialized image section has to contain 'image' operator."; + return nullopt; + } + + optional imageArg = toString(arrayMember(firstElement, 1)); + if (!imageArg) { + error.message = "Serialized image section agument has to be of a String type."; + return nullopt; + } + + sections.emplace_back(Image(*imageArg)); + continue; + } + + optional sectionText = toString(firstElement); if (!sectionText) { error.message = "Section has to contain a text."; return nullopt; @@ -93,7 +126,7 @@ optional Converter::operator()(const Convertible& value, E optional textFont; optional textColor; if (sectionLength > 1) { - Convertible sectionParams = arrayMember(section, 1); + const Convertible& sectionParams = arrayMember(section, 1); if (!isObject(sectionParams)) { error.message = "Parameters have to be enclosed in an object."; return nullopt; diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp index 7609230b52f..aac1c616550 100644 --- a/src/mbgl/style/expression/value.cpp +++ b/src/mbgl/style/expression/value.cpp @@ -149,13 +149,18 @@ mbgl::Value ValueConverter::fromExpressionValue(const Value& value) static std::string formatOperator("format"); serialized.emplace_back(formatOperator); for (const auto& section : formatted.sections) { + if (section.image) { + serialized.emplace_back(std::vector{std::string("image"), section.image->id()}); + continue; + } + serialized.emplace_back(section.text); std::unordered_map options; if (section.fontScale) { options.emplace("font-scale", *section.fontScale); } - + if (section.fontStack) { std::vector fontStack; for (const auto& font : *section.fontStack) { diff --git a/src/mbgl/text/glyph.hpp b/src/mbgl/text/glyph.hpp index ba9c521f77b..f3f28828ef6 100644 --- a/src/mbgl/text/glyph.hpp +++ b/src/mbgl/text/glyph.hpp @@ -60,38 +60,67 @@ using GlyphMap = std::map; class PositionedGlyph { public: - explicit PositionedGlyph(GlyphID glyph_, float x_, float y_, bool vertical_, FontStackHash font_, float scale_, std::size_t sectionIndex_ = 0) - : glyph(glyph_), x(x_), y(y_), vertical(vertical_), font(font_), scale(scale_), sectionIndex(sectionIndex_) - {} + explicit PositionedGlyph(GlyphID glyph_, + float x_, + float y_, + bool vertical_, + FontStackHash font_, + float scale_, + Rect rect_, + GlyphMetrics metrics_, + optional imageID_, + std::size_t sectionIndex_ = 0) + : glyph(glyph_), + x(x_), + y(y_), + vertical(vertical_), + font(font_), + scale(scale_), + rect(std::move(rect_)), + metrics(std::move(metrics_)), + imageID(std::move(imageID_)), + sectionIndex(sectionIndex_) {} GlyphID glyph = 0; float x = 0; float y = 0; bool vertical = false; - FontStackHash font = 0; float scale = 0.0; + Rect rect; + GlyphMetrics metrics; + optional imageID; // Maps positioned glyph to TaggedString section std::size_t sectionIndex; }; enum class WritingModeType : uint8_t; +struct PositionedLine { + std::vector positionedGlyphs; + float lineOffset = 0.0; +}; + class Shaping { public: Shaping() = default; - explicit Shaping(float x, float y, WritingModeType writingMode_, std::size_t lineCount_) - : top(y), bottom(y), left(x), right(x), writingMode(writingMode_), lineCount(lineCount_) {} - std::vector positionedGlyphs; + explicit Shaping(float x, float y, WritingModeType writingMode_) + : top(y), bottom(y), left(x), right(x), writingMode(writingMode_) {} + std::vector positionedLines; float top = 0; float bottom = 0; float left = 0; float right = 0; WritingModeType writingMode; - std::size_t lineCount = 0u; - explicit operator bool() const { return !positionedGlyphs.empty(); } + explicit operator bool() const { + return std::any_of(positionedLines.begin(), positionedLines.end(), [](const auto& line) { + return !line.positionedGlyphs.empty(); + }); + } // The y offset *should* be part of the font metadata. static constexpr int32_t yOffset = -17; + bool verticalizable = false; + bool iconsInText = false; }; enum class WritingModeType : uint8_t { diff --git a/src/mbgl/text/quads.cpp b/src/mbgl/text/quads.cpp index a94bfee336c..480bcd79a99 100644 --- a/src/mbgl/text/quads.cpp +++ b/src/mbgl/text/quads.cpp @@ -1,10 +1,11 @@ +#include +#include +#include #include #include #include -#include -#include -#include #include +#include #include #include @@ -13,14 +14,13 @@ namespace mbgl { using namespace style; -SymbolQuad getIconQuad(const PositionedIcon& shapedIcon, - WritingModeType writingMode) { +SymbolQuad getIconQuad(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType) { const ImagePosition& image = shapedIcon.image(); // If you have a 10px icon that isn't perfectly aligned to the pixel grid it will cover 11 actual // pixels. The quad needs to be padded to account for this, otherwise they'll look slightly clipped // on one edge in some cases. - constexpr const float border = 1.0f; + const float border = ImagePosition::padding; // Expand the box to respect the 1 pixel border in the atlas image. We're using `image.paddedRect - border` // instead of image.displaySize because we only pad with one pixel for retina images as well, and the @@ -70,103 +70,120 @@ SymbolQuad getIconQuad(const PositionedIcon& shapedIcon, static_cast(image.textureRect.h + border * 2) }; - return SymbolQuad { tl, tr, bl, br, textureRect, writingMode, { 0.0f, 0.0f } }; + return SymbolQuad{tl, tr, bl, br, textureRect, writingMode, {0.0f, 0.0f}, iconType == SymbolContent::IconSDF}; } SymbolQuads getGlyphQuads(const Shaping& shapedText, const std::array textOffset, const SymbolLayoutProperties::Evaluated& layout, const style::SymbolPlacementType placement, - const GlyphPositions& positions, + const ImageMap& imageMap, bool allowVerticalPlacement) { const float textRotate = layout.get() * util::DEG2RAD; const bool alongLine = layout.get() == AlignmentType::Map && placement != SymbolPlacementType::Point; SymbolQuads quads; - for (const PositionedGlyph &positionedGlyph: shapedText.positionedGlyphs) { - auto fontPositions = positions.find(positionedGlyph.font); - if (fontPositions == positions.end()) - continue; - - auto positionsIt = fontPositions->second.find(positionedGlyph.glyph); - if (positionsIt == fontPositions->second.end()) - continue; - - const GlyphPosition& glyph = positionsIt->second; - const Rect& rect = glyph.rect; - - // The rects have an addditional buffer that is not included in their size; - const float glyphPadding = 1.0f; - const float rectBuffer = 3.0f + glyphPadding; - - const float halfAdvance = glyph.metrics.advance * positionedGlyph.scale / 2.0; - - const Point glyphOffset = alongLine ? - Point{ positionedGlyph.x + halfAdvance, positionedGlyph.y } : - Point{ 0.0f, 0.0f }; - - Point builtInOffset = alongLine ? - Point{ 0.0f, 0.0f } : - Point{ positionedGlyph.x + halfAdvance + textOffset[0], positionedGlyph.y + textOffset[1] }; - - Point verticalizedLabelOffset = { 0.0f, 0.0f }; - const bool rotateVerticalGlyph = (alongLine || allowVerticalPlacement) && positionedGlyph.vertical; - if (rotateVerticalGlyph) { - // Vertical POI labels, that are rotated 90deg CW and whose glyphs must preserve upright orientation - // need to be rotated 90deg CCW. After quad is rotated, it is translated to the original built-in offset. - verticalizedLabelOffset = builtInOffset; - builtInOffset = { 0.0f, 0.0f }; + for (const auto& line : shapedText.positionedLines) { + for (const auto& positionedGlyph : line.positionedGlyphs) { + if (!positionedGlyph.rect.hasArea()) continue; + + // The rects have an addditional buffer that is not included in their size; + const float glyphPadding = 1.0f; + float rectBuffer = 3.0f + glyphPadding; + float pixelRatio = 1.0f; + float lineOffset = 0.0f; + const bool rotateVerticalGlyph = (alongLine || allowVerticalPlacement) && positionedGlyph.vertical; + const float halfAdvance = positionedGlyph.metrics.advance * positionedGlyph.scale / 2.0; + const Rect& rect = positionedGlyph.rect; + bool isSDF = true; + + // Align images and scaled glyphs in the middle of a vertical line. + if (allowVerticalPlacement && shapedText.verticalizable) { + const float scaledGlyphOffset = (positionedGlyph.scale - 1) * util::ONE_EM; + const float imageOffset = (util::ONE_EM - positionedGlyph.metrics.width * positionedGlyph.scale) / 2.0f; + lineOffset = line.lineOffset / 2.0f - (positionedGlyph.imageID ? -imageOffset : scaledGlyphOffset); + } + + if (positionedGlyph.imageID) { + auto image = imageMap.find(*positionedGlyph.imageID); + if (image == imageMap.end()) { + continue; + } + pixelRatio = image->second->pixelRatio; + rectBuffer = ImagePosition::padding / pixelRatio; + isSDF = image->second->sdf; + } + + const Point glyphOffset = + alongLine ? Point{positionedGlyph.x + halfAdvance, positionedGlyph.y} : Point{0.0f, 0.0f}; + + Point builtInOffset = alongLine ? Point{0.0f, 0.0f} + : Point{positionedGlyph.x + halfAdvance + textOffset[0], + positionedGlyph.y + textOffset[1] - lineOffset}; + + Point verticalizedLabelOffset = {0.0f, 0.0f}; + if (rotateVerticalGlyph) { + // Vertical POI labels, that are rotated 90deg CW and whose glyphs must preserve upright orientation + // need to be rotated 90deg CCW. After quad is rotated, it is translated to the original built-in + // offset. + verticalizedLabelOffset = builtInOffset; + builtInOffset = {0.0f, 0.0f}; + } + + const float x1 = + (positionedGlyph.metrics.left - rectBuffer) * positionedGlyph.scale - halfAdvance + builtInOffset.x; + const float y1 = (-positionedGlyph.metrics.top - rectBuffer) * positionedGlyph.scale + builtInOffset.y; + const float x2 = x1 + rect.w * positionedGlyph.scale / pixelRatio; + const float y2 = y1 + rect.h * positionedGlyph.scale / pixelRatio; + + Point tl{x1, y1}; + Point tr{x2, y1}; + Point bl{x1, y2}; + Point br{x2, y2}; + + if (rotateVerticalGlyph) { + // Vertical-supporting glyphs are laid out in 24x24 point boxes (1 square em) + // In horizontal orientation, the y values for glyphs are below the midline + // and we use a "yOffset" of -17 to pull them up to the middle. + // By rotating counter-clockwise around the point at the center of the left + // edge of a 24x24 layout box centered below the midline, we align the center + // of the glyphs with the horizontal midline, so the yOffset is no longer + // necessary, but we also pull the glyph to the left along the x axis. + // The y coordinate includes baseline yOffset, therefore, needs to be accounted + // for when glyph is rotated and translated. + + const Point center{-halfAdvance, halfAdvance - Shaping::yOffset}; + const float verticalRotation = -M_PI_2; + + // xHalfWidhtOffsetcorrection is a difference between full-width and half-width + // advance, should be 0 for full-width glyphs and will pull up half-width glyphs. + const float xHalfWidhtOffsetcorrection = util::ONE_EM / 2 - halfAdvance; + const float yImageOffsetCorrection = positionedGlyph.imageID ? xHalfWidhtOffsetcorrection : 0.0f; + const Point xOffsetCorrection{5.0f - Shaping::yOffset - xHalfWidhtOffsetcorrection, + -yImageOffsetCorrection}; + + tl = util::rotate(tl - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; + tr = util::rotate(tr - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; + bl = util::rotate(bl - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; + br = util::rotate(br - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; + } + + if (textRotate) { + // Compute the transformation matrix. + float angle_sin = std::sin(textRotate); + float angle_cos = std::cos(textRotate); + std::array matrix = {{angle_cos, -angle_sin, angle_sin, angle_cos}}; + + tl = util::matrixMultiply(matrix, tl); + tr = util::matrixMultiply(matrix, tr); + bl = util::matrixMultiply(matrix, bl); + br = util::matrixMultiply(matrix, br); + } + + quads.emplace_back( + tl, tr, bl, br, rect, shapedText.writingMode, glyphOffset, isSDF, positionedGlyph.sectionIndex); } - - const float x1 = (glyph.metrics.left - rectBuffer) * positionedGlyph.scale - halfAdvance + builtInOffset.x; - const float y1 = (-glyph.metrics.top - rectBuffer) * positionedGlyph.scale + builtInOffset.y; - const float x2 = x1 + rect.w * positionedGlyph.scale; - const float y2 = y1 + rect.h * positionedGlyph.scale; - - Point tl{x1, y1}; - Point tr{x2, y1}; - Point bl{x1, y2}; - Point br{x2, y2}; - - if (rotateVerticalGlyph) { - // Vertical-supporting glyphs are laid out in 24x24 point boxes (1 square em) - // In horizontal orientation, the y values for glyphs are below the midline - // and we use a "yOffset" of -17 to pull them up to the middle. - // By rotating counter-clockwise around the point at the center of the left - // edge of a 24x24 layout box centered below the midline, we align the center - // of the glyphs with the horizontal midline, so the yOffset is no longer - // necessary, but we also pull the glyph to the left along the x axis. - // The y coordinate includes baseline yOffset, therefore, needs to be accounted - // for when glyph is rotated and translated. - - const Point center{ -halfAdvance, halfAdvance - Shaping::yOffset }; - const float verticalRotation = -M_PI_2; - - // xHalfWidhtOffsetcorrection is a difference between full-width and half-width - // advance, should be 0 for full-width glyphs and will pull up half-width glyphs. - const float xHalfWidhtOffsetcorrection = util::ONE_EM / 2 - halfAdvance; - const Point xOffsetCorrection{ 5.0f - Shaping::yOffset - xHalfWidhtOffsetcorrection, 0.0f }; - - tl = util::rotate(tl - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; - tr = util::rotate(tr - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; - bl = util::rotate(bl - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; - br = util::rotate(br - center, verticalRotation) + center + xOffsetCorrection + verticalizedLabelOffset; - } - - if (textRotate) { - // Compute the transformation matrix. - float angle_sin = std::sin(textRotate); - float angle_cos = std::cos(textRotate); - std::array matrix = {{angle_cos, -angle_sin, angle_sin, angle_cos}}; - - tl = util::matrixMultiply(matrix, tl); - tr = util::matrixMultiply(matrix, tr); - bl = util::matrixMultiply(matrix, bl); - br = util::matrixMultiply(matrix, br); - } - - quads.emplace_back(tl, tr, bl, br, rect, shapedText.writingMode, glyphOffset, positionedGlyph.sectionIndex); } return quads; diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index 4435c9aab82..29f798ba0d2 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -1,8 +1,9 @@ #pragma once -#include -#include +#include #include +#include +#include #include #include @@ -11,6 +12,7 @@ namespace mbgl { class Anchor; class PositionedIcon; +enum class SymbolContent : uint8_t; class SymbolQuad { public: @@ -21,6 +23,7 @@ class SymbolQuad { Rect tex_, WritingModeType writingMode_, Point glyphOffset_, + bool isSDF_, size_t sectionIndex_ = 0) : tl(tl_), tr(tr_), @@ -29,6 +32,7 @@ class SymbolQuad { tex(tex_), writingMode(writingMode_), glyphOffset(glyphOffset_), + isSDF(isSDF_), sectionIndex(sectionIndex_) {} Point tl; @@ -38,19 +42,19 @@ class SymbolQuad { Rect tex; WritingModeType writingMode; Point glyphOffset; + bool isSDF; size_t sectionIndex; }; using SymbolQuads = std::vector; -SymbolQuad getIconQuad(const PositionedIcon& shapedIcon, - WritingModeType writingMode); +SymbolQuad getIconQuad(const PositionedIcon& shapedIcon, WritingModeType writingMode, SymbolContent iconType); SymbolQuads getGlyphQuads(const Shaping& shapedText, const std::array textOffset, const style::SymbolLayoutProperties::Evaluated&, style::SymbolPlacementType placement, - const GlyphPositions& positions, + const ImageMap& imageMap, bool allowVerticalPlacement); } // namespace mbgl diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index 8eb885af5d5..fb1aa04346c 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -122,66 +122,83 @@ void PositionedIcon::fitIconToText(const Shaping& shapedText, } void align(Shaping& shaping, - const float justify, - const float horizontalAlign, - const float verticalAlign, - const float maxLineLength, - const float lineHeight, - const std::size_t lineCount) { + float justify, + float horizontalAlign, + float verticalAlign, + float maxLineLength, + float maxLineHeight, + float lineHeight, + float blockHeight, + std::size_t lineCount) { const float shiftX = (justify - horizontalAlign) * maxLineLength; - const float shiftY = (-verticalAlign * lineCount + 0.5) * lineHeight; - - for (auto& glyph : shaping.positionedGlyphs) { - glyph.x += shiftX; - glyph.y += shiftY; + float shiftY = 0.0f; + + if (maxLineHeight != lineHeight) { + shiftY = -blockHeight * verticalAlign - Shaping::yOffset; + } else { + shiftY = (-verticalAlign * lineCount + 0.5) * lineHeight; + } + + for (auto& line : shaping.positionedLines) { + for (auto& positionedGlyph : line.positionedGlyphs) { + positionedGlyph.x += shiftX; + positionedGlyph.y += shiftY; + } } } // justify left = 0, right = 1, center = .5 -void justifyLine(std::vector& positionedGlyphs, - const GlyphMap& glyphMap, - std::size_t start, - std::size_t end, - float justify) { - if (!justify) { +void justifyLine(std::vector& positionedGlyphs, float justify, float lineOffset) { + if (!justify && !lineOffset) { return; } - - PositionedGlyph& glyph = positionedGlyphs[end]; - auto glyphs = glyphMap.find(glyph.font); - if (glyphs == glyphMap.end()) { - return; + + PositionedGlyph& lastGlyph = positionedGlyphs.back(); + const float lastAdvance = lastGlyph.metrics.advance * lastGlyph.scale; + const float lineIndent = float(lastGlyph.x + lastAdvance) * justify; + for (auto& positionedGlyph : positionedGlyphs) { + positionedGlyph.x -= lineIndent; + positionedGlyph.y += lineOffset; } - auto it = glyphs->second.find(glyph.glyph); - if (it != glyphs->second.end() && it->second) { - const float lastAdvance = (*it->second)->metrics.advance * glyph.scale; - const float lineIndent = float(glyph.x + lastAdvance) * justify; - - for (std::size_t j = start; j <= end; j++) { - positionedGlyphs[j].x -= lineIndent; +} + +float getGlyphAdvance(char16_t codePoint, + const SectionOptions& section, + const GlyphMap& glyphMap, + const ImagePositions& imagePositions, + float layoutTextSize, + float spacing) { + if (!section.imageID) { + auto glyphs = glyphMap.find(section.fontStackHash); + if (glyphs == glyphMap.end()) { + return 0.0f; } + auto it = glyphs->second.find(codePoint); + if (it == glyphs->second.end() || !it->second) { + return 0.0f; + } + return (*it->second)->metrics.advance * section.scale + spacing; + } else { + auto image = imagePositions.find(*section.imageID); + if (image == imagePositions.end()) { + return 0.0f; + } + return image->second.displaySize()[0] * section.scale * util::ONE_EM / layoutTextSize + spacing; } } float determineAverageLineWidth(const TaggedString& logicalInput, - const float spacing, + float spacing, float maxWidth, - const GlyphMap& glyphMap) { + const GlyphMap& glyphMap, + const ImagePositions& imagePositions, + float layoutTextSize) { float totalWidth = 0; for (std::size_t i = 0; i < logicalInput.length(); i++) { const SectionOptions& section = logicalInput.getSection(i); char16_t codePoint = logicalInput.getCharCodeAt(i); - auto glyphs = glyphMap.find(section.fontStackHash); - if (glyphs == glyphMap.end()) { - continue; - } - auto it = glyphs->second.find(codePoint); - if (it == glyphs->second.end() || !it->second) { - continue; - } - - totalWidth += (*it->second)->metrics.advance * section.scale + spacing; + totalWidth += getGlyphAdvance(codePoint, section, glyphMap, imagePositions, layoutTextSize, spacing); } int32_t targetLineCount = ::fmax(1, std::ceil(totalWidth / maxWidth)); @@ -279,7 +296,9 @@ std::set leastBadBreaks(const PotentialBreak& lastLineBreak) { std::set determineLineBreaks(const TaggedString& logicalInput, const float spacing, float maxWidth, - const GlyphMap& glyphMap) { + const GlyphMap& glyphMap, + const ImagePositions& imagePositions, + float layoutTextSize) { if (!maxWidth) { return {}; } @@ -287,9 +306,10 @@ std::set determineLineBreaks(const TaggedString& logicalInput, if (logicalInput.empty()) { return {}; } - - const float targetWidth = determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap); - + + const float targetWidth = + determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap, imagePositions, layoutTextSize); + std::list potentialBreaks; float currentX = 0; // Find first occurance of zero width space (ZWSP) character. @@ -298,20 +318,15 @@ std::set determineLineBreaks(const TaggedString& logicalInput, for (std::size_t i = 0; i < logicalInput.length(); i++) { const SectionOptions& section = logicalInput.getSection(i); char16_t codePoint = logicalInput.getCharCodeAt(i); - auto glyphs = glyphMap.find(section.fontStackHash); - if (glyphs == glyphMap.end()) { - continue; + if (!util::i18n::isWhitespace(codePoint)) { + currentX += getGlyphAdvance(codePoint, section, glyphMap, imagePositions, layoutTextSize, spacing); } - auto it = glyphs->second.find(codePoint); - if (it != glyphs->second.end() && it->second && !util::i18n::isWhitespace(codePoint)) { - currentX += (*it->second)->metrics.advance * section.scale + spacing; - } - + // Ideographic characters, spaces, and word-breaking punctuation that often appear without // surrounding spaces. if (i < logicalInput.length() - 1) { const bool allowsIdeographicBreak = util::i18n::allowsIdeographicBreaking(codePoint); - if (allowsIdeographicBreak || util::i18n::allowsWordBreaking(codePoint)) { + if (section.imageID || allowsIdeographicBreak || util::i18n::allowsWordBreaking(codePoint)) { const bool penalizableIdeographicBreak = allowsIdeographicBreak && hasServerSuggestedBreaks; const std::size_t nextIndex = i + 1; potentialBreaks.push_back(evaluateBreak(nextIndex, currentX, targetWidth, potentialBreaks, @@ -332,81 +347,170 @@ void shapeLines(Shaping& shaping, const style::TextJustifyType textJustify, const WritingModeType writingMode, const GlyphMap& glyphMap, + const GlyphPositions& glyphPositions, + const ImagePositions& imagePositions, + float layoutTextSize, bool allowVerticalPlacement) { - float x = 0; + float x = 0.0f; float y = Shaping::yOffset; - - float maxLineLength = 0; + float maxLineLength = 0.0f; + double maxLineHeight = 0.0f; + + const float justify = + textJustify == style::TextJustifyType::Right ? 1.0f : textJustify == style::TextJustifyType::Left ? 0.0f : 0.5f; - const float justify = textJustify == style::TextJustifyType::Right ? 1 : - textJustify == style::TextJustifyType::Left ? 0 : - 0.5; - for (TaggedString& line : lines) { // Collapse whitespace so it doesn't throw off justification line.trim(); const double lineMaxScale = line.getMaxScale(); - + const double maxLineOffset = (lineMaxScale - 1.0) * util::ONE_EM; + double lineOffset = 0.0; + shaping.positionedLines.emplace_back(); + auto& positionedLine = shaping.positionedLines.back(); + auto& positionedGlyphs = positionedLine.positionedGlyphs; + if (line.empty()) { y += lineHeight; // Still need a line feed after empty line continue; } - std::size_t lineStartIndex = shaping.positionedGlyphs.size(); for (std::size_t i = 0; i < line.length(); i++) { const std::size_t sectionIndex = line.getSectionIndex(i); const SectionOptions& section = line.sectionAt(sectionIndex); char16_t codePoint = line.getCharCodeAt(i); - auto glyphs = glyphMap.find(section.fontStackHash); - if (glyphs == glyphMap.end()) { - continue; - } - auto it = glyphs->second.find(codePoint); - if (it == glyphs->second.end() || !it->second) { - continue; + double baselineOffset = 0.0; + Rect rect; + GlyphMetrics metrics; + float advance = 0.0f; + float verticalAdvance = util::ONE_EM; + double sectionScale = section.scale; + assert(sectionScale); + + const bool vertical = + !(writingMode == WritingModeType::Horizontal || + // Don't verticalize glyphs that have no upright orientation if vertical placement is disabled. + (!allowVerticalPlacement && !util::i18n::hasUprightVerticalOrientation(codePoint)) || + // If vertical placement is ebabled, don't verticalize glyphs that + // are from complex text layout script, or whitespaces. + (allowVerticalPlacement && + (util::i18n::isWhitespace(codePoint) || util::i18n::isCharInComplexShapingScript(codePoint)))); + + if (!section.imageID) { + auto glyphPositionMap = glyphPositions.find(section.fontStackHash); + if (glyphPositionMap == glyphPositions.end()) { + continue; + } + + auto glyphPosition = glyphPositionMap->second.find(codePoint); + if (glyphPosition != glyphPositionMap->second.end()) { + rect = glyphPosition->second.rect; + metrics = glyphPosition->second.metrics; + } else { + auto glyphs = glyphMap.find(section.fontStackHash); + if (glyphs == glyphMap.end()) { + continue; + } + + auto glyph = glyphs->second.find(codePoint); + if (glyph == glyphs->second.end() || !glyph->second) { + continue; + } + metrics = (*glyph->second)->metrics; + } + advance = metrics.advance; + // We don't know the baseline, but since we're laying out + // at 24 points, we can calculate how much it will move when + // we scale up or down. + baselineOffset = (lineMaxScale - sectionScale) * util::ONE_EM; + } else { + auto image = imagePositions.find(*section.imageID); + if (image == imagePositions.end()) { + continue; + } + shaping.iconsInText |= true; + const auto& displaySize = image->second.displaySize(); + metrics.width = displaySize[0]; + metrics.height = displaySize[1]; + metrics.left = ImagePosition::padding; + metrics.top = -Glyph::borderSize; + metrics.advance = vertical ? displaySize[1] : displaySize[0]; + rect = image->second.paddedTextureRect(); + + // If needed, allow to set scale factor for an image using + // alias "image-scale" that could be alias for "font-scale" + // when FormattedSection is an image section. + sectionScale = sectionScale * util::ONE_EM / layoutTextSize; + + // Difference between one EM and an image size. + // Aligns bottom of an image to a baseline level. + float imageOffset = util::ONE_EM - displaySize[1] * sectionScale; + baselineOffset = maxLineOffset + imageOffset; + advance = verticalAdvance = metrics.advance; + + // Difference between height of an image and one EM at max line scale. + // Pushes current line down if an image size is over 1 EM at max line scale. + double offset = + (vertical ? displaySize[0] : displaySize[1]) * sectionScale - util::ONE_EM * lineMaxScale; + if (offset > 0.0 && offset > lineOffset) { + lineOffset = offset; + } } - - // We don't know the baseline, but since we're laying out - // at 24 points, we can calculate how much it will move when - // we scale up or down. - const double baselineOffset = (lineMaxScale - section.scale) * util::ONE_EM; - - const Glyph& glyph = **it->second; - - if (writingMode == WritingModeType::Horizontal || - // Don't verticalize glyphs that have no upright orientation if vertical placement is disabled. - (!allowVerticalPlacement && !util::i18n::hasUprightVerticalOrientation(codePoint)) || - // If vertical placement is ebabled, don't verticalize glyphs that - // are from complex text layout script, or whitespaces. - (allowVerticalPlacement && (util::i18n::isWhitespace(codePoint) || util::i18n::isCharInComplexShapingScript(codePoint)))) { - shaping.positionedGlyphs.emplace_back(codePoint, x, y + baselineOffset, false, section.fontStackHash, section.scale, sectionIndex); - x += glyph.metrics.advance * section.scale + spacing; + + if (!vertical) { + positionedGlyphs.emplace_back(codePoint, + x, + y + baselineOffset, + vertical, + section.fontStackHash, + sectionScale, + rect, + metrics, + section.imageID, + sectionIndex); + x += advance * sectionScale + spacing; } else { - shaping.positionedGlyphs.emplace_back(codePoint, x, y + baselineOffset, true, section.fontStackHash, section.scale, sectionIndex); - x += util::ONE_EM * section.scale + spacing; + positionedGlyphs.emplace_back(codePoint, + x, + y + baselineOffset, + vertical, + section.fontStackHash, + sectionScale, + rect, + metrics, + section.imageID, + sectionIndex); + x += verticalAdvance * sectionScale + spacing; + shaping.verticalizable |= true; } } - + // Only justify if we placed at least one glyph - if (shaping.positionedGlyphs.size() != lineStartIndex) { + if (positionedGlyphs.size() != 0) { float lineLength = x - spacing; // Don't count trailing spacing maxLineLength = util::max(lineLength, maxLineLength); - - justifyLine(shaping.positionedGlyphs, glyphMap, lineStartIndex, - shaping.positionedGlyphs.size() - 1, justify); + justifyLine(positionedGlyphs, justify, lineOffset); } - - x = 0; - y += lineHeight * lineMaxScale; + + double currentLineHeight = lineHeight * lineMaxScale + lineOffset; + x = 0.0f; + y += currentLineHeight; + positionedLine.lineOffset = std::max(lineOffset, maxLineOffset); + maxLineHeight = std::max(currentLineHeight, maxLineHeight); } auto anchorAlign = AnchorAlignment::getAnchorAlignment(textAnchor); - - align(shaping, justify, anchorAlign.horizontalAlign, anchorAlign.verticalAlign, maxLineLength, - lineHeight, lines.size()); const float height = y - Shaping::yOffset; + align(shaping, + justify, + anchorAlign.horizontalAlign, + anchorAlign.verticalAlign, + maxLineLength, + maxLineHeight, + lineHeight, + height, + lines.size()); // Calculate the bounding box shaping.top += -anchorAlign.verticalAlign * height; @@ -424,28 +528,44 @@ const Shaping getShaping(const TaggedString& formattedString, const std::array& translate, const WritingModeType writingMode, BiDi& bidi, - const GlyphMap& glyphs, + const GlyphMap& glyphMap, + const GlyphPositions& glyphPositions, + const ImagePositions& imagePositions, + float layoutTextSize, + float layoutTextSizeAtBucketZoomLevel, bool allowVerticalPlacement) { + assert(layoutTextSize); std::vector reorderedLines; if (formattedString.sectionCount() == 1) { - auto untaggedLines = bidi.processText(formattedString.rawText(), - determineLineBreaks(formattedString, spacing, maxWidth, glyphs)); + auto untaggedLines = bidi.processText( + formattedString.rawText(), + determineLineBreaks(formattedString, spacing, maxWidth, glyphMap, imagePositions, layoutTextSize)); for (const auto& line : untaggedLines) { reorderedLines.emplace_back(line, formattedString.sectionAt(0)); } } else { - auto processedLines = bidi.processStyledText(formattedString.getStyledText(), - determineLineBreaks(formattedString, spacing, maxWidth, glyphs)); + auto processedLines = bidi.processStyledText( + formattedString.getStyledText(), + determineLineBreaks(formattedString, spacing, maxWidth, glyphMap, imagePositions, layoutTextSize)); for (const auto& line : processedLines) { reorderedLines.emplace_back(line, formattedString.getSections()); } } - Shaping shaping(translate[0], translate[1], writingMode, reorderedLines.size()); - shapeLines(shaping, reorderedLines, spacing, lineHeight, textAnchor, - textJustify, writingMode, glyphs, allowVerticalPlacement); - + Shaping shaping(translate[0], translate[1], writingMode); + shapeLines(shaping, + reorderedLines, + spacing, + lineHeight, + textAnchor, + textJustify, + writingMode, + glyphMap, + glyphPositions, + imagePositions, + layoutTextSizeAtBucketZoomLevel, + allowVerticalPlacement); + return shaping; } - } // namespace mbgl diff --git a/src/mbgl/text/shaping.hpp b/src/mbgl/text/shaping.hpp index 6ed1b5cb0e6..1f62f38521f 100644 --- a/src/mbgl/text/shaping.hpp +++ b/src/mbgl/text/shaping.hpp @@ -1,10 +1,11 @@ #pragma once -#include -#include #include -#include #include +#include +#include +#include +#include namespace mbgl { @@ -68,7 +69,11 @@ const Shaping getShaping(const TaggedString& string, const std::array& translate, const WritingModeType, BiDi& bidi, - const GlyphMap& glyphs, + const GlyphMap& glyphMap, + const GlyphPositions& glyphPositions, + const ImagePositions& imagePositions, + float layoutTextSize, + float layoutTextSizeAtBucketZoomLevel, bool allowVerticalPlacement); } // namespace mbgl diff --git a/src/mbgl/text/tagged_string.cpp b/src/mbgl/text/tagged_string.cpp index e8a1c6f51fa..83ccd610c27 100644 --- a/src/mbgl/text/tagged_string.cpp +++ b/src/mbgl/text/tagged_string.cpp @@ -1,16 +1,50 @@ -#include #include +#include #include +#include + +namespace { +char16_t PUAbegin = u'\uE000'; +char16_t PUAend = u'\uF8FF'; +} // namespace namespace mbgl { - -void TaggedString::addSection(const std::u16string& sectionText, double scale, FontStack fontStack, optional textColor) { + +void TaggedString::addTextSection(const std::u16string& sectionText, + double scale, + FontStack fontStack, + optional textColor) { styledText.first += sectionText; sections.emplace_back(scale, fontStack, std::move(textColor)); styledText.second.resize(styledText.first.size(), sections.size() - 1); supportsVerticalWritingMode = nullopt; } +void TaggedString::addImageSection(const std::string& imageID) { + const auto& nextImageSectionCharCode = getNextImageSectionCharCode(); + if (!nextImageSectionCharCode) { + Log::Warning(Event::Style, "Exceeded maximum number of images in a label."); + return; + } + + styledText.first += *nextImageSectionCharCode; + sections.emplace_back(imageID); + styledText.second.resize(styledText.first.size(), sections.size() - 1); +} + +optional TaggedString::getNextImageSectionCharCode() { + if (imageSectionID == 0u) { + imageSectionID = PUAbegin; + return imageSectionID; + } + + if (++imageSectionID > PUAend) { + return nullopt; + } + + return imageSectionID; +} + void TaggedString::trim() { std::size_t beginningWhitespace = styledText.first.find_first_not_of(u" \t\n\v\f\r"); if (beginningWhitespace == std::u16string::npos) { diff --git a/src/mbgl/text/tagged_string.hpp b/src/mbgl/text/tagged_string.hpp index 698e539a455..fba3bbf4127 100644 --- a/src/mbgl/text/tagged_string.hpp +++ b/src/mbgl/text/tagged_string.hpp @@ -13,11 +13,14 @@ struct SectionOptions { fontStack(std::move(fontStack_)), textColor(std::move(textColor_)) {} - + + explicit SectionOptions(std::string imageID_) : scale(1.0), imageID(std::move(imageID_)) {} + double scale; FontStackHash fontStackHash; FontStack fontStack; optional textColor; + optional imageID; }; /** @@ -76,11 +79,13 @@ struct TaggedString { const StyledText& getStyledText() const { return styledText; } - - void addSection(const std::u16string& text, - double scale, - FontStack fontStack, - optional textColor_ = nullopt); + + void addTextSection(const std::u16string& text, + double scale, + FontStack fontStack, + optional textColor_ = nullopt); + + void addImageSection(const std::string& imageID); const SectionOptions& sectionAt(std::size_t index) const { return sections.at(index); @@ -100,10 +105,16 @@ struct TaggedString { void verticalizePunctuation(); bool allowsVerticalWritingMode(); +private: + optional getNextImageSectionCharCode(); + private: StyledText styledText; std::vector sections; optional supportsVerticalWritingMode; + // Max number of images within a text is 6400 U+E000–U+F8FF + // that covers Basic Multilingual Plane Unicode Private Use Area (PUA). + char16_t imageSectionID = 0u; }; } // namespace mbgl diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index a61321b3636..c38464bb04f 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -460,8 +460,7 @@ void GeometryTileWorker::finalizeLayout() { return; } - layout->prepareSymbols(glyphMap, glyphAtlas.positions, - imageMap, iconAtlas.iconPositions); + layout->prepareSymbols(glyphMap, glyphAtlas.positions, imageMap, iconAtlas.iconPositions); if (!layout->hasSymbolInstances()) { continue; diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index 13b30eb75d3..9f8af4e469b 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -125,7 +125,19 @@ TEST(Buckets, SymbolBucket) { std::vector symbolInstances; gl::Context context{ backend }; - SymbolBucket bucket { std::move(layout), {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), 1.0f, false, {}}; + SymbolBucket bucket{std::move(layout), + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(symbolInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; ASSERT_FALSE(bucket.hasIconData()); ASSERT_FALSE(bucket.hasSdfIconData()); ASSERT_FALSE(bucket.hasTextData()); diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp index 2d6ef5881a3..1d60197c2de 100644 --- a/test/style/style_layer.test.cpp +++ b/test/style/style_layer.test.cpp @@ -343,7 +343,8 @@ void testHasOverrides(LayoutType& layout) { EXPECT_FALSE(MockOverrides::hasOverrides(layout.template get())); // Expression, overridden text-color. - FormatExpressionSection section(literal(""), nullopt, nullopt, toColor(literal("red"))); + FormatExpressionSection section(literal("")); + section.setTextSectionOptions(nullopt, nullopt, toColor(literal("red"))); auto formatExprOverride = std::make_unique(std::vector{section}); PropertyExpression propExprOverride(std::move(formatExprOverride)); layout.template get() = PropertyValueType(std::move(propExprOverride)); @@ -351,7 +352,9 @@ void testHasOverrides(LayoutType& layout) { // Nested expressions, overridden text-color. auto formattedExpr1 = format("first paragraph"); - std::vector sections{ { literal("second paragraph"), nullopt, nullopt, toColor(literal("blue")) } }; + FormatExpressionSection secondParagraph(literal("second paragraph")); + secondParagraph.setTextSectionOptions(nullopt, nullopt, toColor(literal("blue"))); + std::vector sections{{std::move(secondParagraph)}}; auto formattedExpr2 = std::make_unique(std::move(sections)); std::unordered_map> branches{ { "1st", std::move(formattedExpr1) }, { "2nd", std::move(formattedExpr2) } }; diff --git a/test/test-files.json b/test/test-files.json index 1d220f579d1..d3887882122 100644 --- a/test/test-files.json +++ b/test/test-files.json @@ -67,6 +67,7 @@ "test/style/style_parser.test.cpp", "test/text/bidi.test.cpp", "test/text/cross_tile_symbol_index.test.cpp", + "test/text/formatted.test.cpp", "test/text/glyph_manager.test.cpp", "test/text/glyph_pbf.test.cpp", "test/text/language_tag.test.cpp", diff --git a/test/text/cross_tile_symbol_index.test.cpp b/test/text/cross_tile_symbol_index.test.cpp index 4ff84063f9b..422102d3894 100644 --- a/test/text/cross_tile_symbol_index.test.cpp +++ b/test/text/cross_tile_symbol_index.test.cpp @@ -6,7 +6,7 @@ using namespace mbgl; SymbolInstance makeSymbolInstance(float x, float y, std::u16string key) { GeometryCoordinates line; - GlyphPositions positions; + ImageMap imageMap; const ShapedTextOrientations shaping{}; style::SymbolLayoutProperties::Evaluated layout_; IndexedSubfeature subfeature(0, "", "", 0); @@ -17,8 +17,15 @@ SymbolInstance makeSymbolInstance(float x, float y, std::u16string key) { style::SymbolPlacementType placementType = style::SymbolPlacementType::Point; auto sharedData = std::make_shared(std::move(line), - shaping, nullopt, nullopt, layout_, placementType, - textOffset, positions, false); + shaping, + nullopt, + nullopt, + layout_, + placementType, + textOffset, + imageMap, + SymbolContent::IconSDF, + false); return SymbolInstance(anchor, std::move(sharedData), shaping, nullopt, nullopt, 0, 0, placementType, textOffset, 0, 0, iconOffset, subfeature, 0, 0, key, 0.0f, 0.0f, 0.0f, variableTextOffset, false); } @@ -39,7 +46,19 @@ TEST(CrossTileSymbolLayerIndex, addBucket) { std::vector mainInstances; mainInstances.push_back(makeSymbolInstance(1000, 1000, u"Detroit")); mainInstances.push_back(makeSymbolInstance(2000, 2000, u"Toronto")); - SymbolBucket mainBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(mainInstances), 1.0f, false, {} }; + SymbolBucket mainBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(mainInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; mainBucket.bucketInstanceId = ++maxBucketInstanceId; index.addBucket(mainID, mainBucket, maxCrossTileID); @@ -54,7 +73,19 @@ TEST(CrossTileSymbolLayerIndex, addBucket) { childInstances.push_back(makeSymbolInstance(2000, 2000, u"Windsor")); childInstances.push_back(makeSymbolInstance(3000, 3000, u"Toronto")); childInstances.push_back(makeSymbolInstance(4001, 4001, u"Toronto")); - SymbolBucket childBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(childInstances), 1.0f, false, {} }; + SymbolBucket childBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(childInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; childBucket.bucketInstanceId = ++maxBucketInstanceId; index.addBucket(childID, childBucket, maxCrossTileID); @@ -70,7 +101,19 @@ TEST(CrossTileSymbolLayerIndex, addBucket) { OverscaledTileID parentID(5, 0, 5, 4, 4); std::vector parentInstances; parentInstances.push_back(makeSymbolInstance(500, 500, u"Detroit")); - SymbolBucket parentBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(parentInstances), 1.0f, false, {} }; + SymbolBucket parentBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(parentInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; parentBucket.bucketInstanceId = ++maxBucketInstanceId; index.addBucket(parentID, parentBucket, maxCrossTileID); @@ -86,7 +129,19 @@ TEST(CrossTileSymbolLayerIndex, addBucket) { std::vector grandchildInstances; grandchildInstances.push_back(makeSymbolInstance(4000, 4000, u"Detroit")); grandchildInstances.push_back(makeSymbolInstance(4000, 4000, u"Windsor")); - SymbolBucket grandchildBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(grandchildInstances), 1.0f, false, {} }; + SymbolBucket grandchildBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(grandchildInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; grandchildBucket.bucketInstanceId = ++maxBucketInstanceId; index.addBucket(grandchildID, grandchildBucket, maxCrossTileID); @@ -112,13 +167,37 @@ TEST(CrossTileSymbolLayerIndex, resetIDs) { OverscaledTileID mainID(6, 0, 6, 8, 8); std::vector mainInstances; mainInstances.push_back(makeSymbolInstance(1000, 1000, u"Detroit")); - SymbolBucket mainBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(mainInstances), 1.0f, false, {} }; + SymbolBucket mainBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(mainInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; mainBucket.bucketInstanceId = ++maxBucketInstanceId; OverscaledTileID childID(7, 0, 7, 16, 16); std::vector childInstances; childInstances.push_back(makeSymbolInstance(2000, 2000, u"Detroit")); - SymbolBucket childBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(childInstances), 1.0f, false, {} }; + SymbolBucket childBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(childInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; childBucket.bucketInstanceId = ++maxBucketInstanceId; // assigns a new id @@ -153,7 +232,19 @@ TEST(CrossTileSymbolLayerIndex, noDuplicatesWithinZoomLevel) { std::vector mainInstances; mainInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // A mainInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // B - SymbolBucket mainBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(mainInstances), 1.0f, false, {} }; + SymbolBucket mainBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(mainInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; mainBucket.bucketInstanceId = ++maxBucketInstanceId; OverscaledTileID childID(7, 0, 7, 16, 16); @@ -161,7 +252,19 @@ TEST(CrossTileSymbolLayerIndex, noDuplicatesWithinZoomLevel) { childInstances.push_back(makeSymbolInstance(2000, 2000, u"")); // A' childInstances.push_back(makeSymbolInstance(2000, 2000, u"")); // B' childInstances.push_back(makeSymbolInstance(2000, 2000, u"")); // C' - SymbolBucket childBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(childInstances), 1.0f, false, {} }; + SymbolBucket childBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(childInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; childBucket.bucketInstanceId = ++maxBucketInstanceId; // assigns new ids @@ -191,14 +294,38 @@ TEST(CrossTileSymbolLayerIndex, bucketReplacement) { std::vector firstInstances; firstInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // A firstInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // B - SymbolBucket firstBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(firstInstances), 1.0f, false, {} }; + SymbolBucket firstBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(firstInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; firstBucket.bucketInstanceId = ++maxBucketInstanceId; std::vector secondInstances; secondInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // A' secondInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // B' secondInstances.push_back(makeSymbolInstance(1000, 1000, u"")); // C' - SymbolBucket secondBucket { layout, {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(secondInstances), 1.0f, false, {} }; + SymbolBucket secondBucket{layout, + {}, + 16.0f, + 1.0f, + 0, + iconsNeedLinear, + sortFeaturesByY, + bucketLeaderID, + std::move(secondInstances), + 1.0f, + false, + {}, + false /*iconsInText*/}; secondBucket.bucketInstanceId = ++maxBucketInstanceId; // assigns new ids diff --git a/test/text/formatted.test.cpp b/test/text/formatted.test.cpp new file mode 100644 index 00000000000..70e743f5c8d --- /dev/null +++ b/test/text/formatted.test.cpp @@ -0,0 +1,51 @@ + +#include +#include +#include + +using namespace mbgl; +using namespace mbgl::style::expression; + +TEST(Formatted, Equality) { + Formatted text{"Formatted"}; + auto emptyImage = FormattedSection{style::expression::Image("Formatted")}; + Formatted image{std::vector{emptyImage}}; + EXPECT_FALSE(text == image); + EXPECT_EQ(text, text); + EXPECT_EQ(image, image); +} + +TEST(Formatted, Empty) { + Formatted emptyFormatted{""}; + EXPECT_TRUE(emptyFormatted.empty()); + + auto emptyText = FormattedSection{"", nullopt, nullopt, nullopt}; + auto emptyImage = FormattedSection{style::expression::Image()}; + Formatted multipleEmptySections{std::vector{emptyText, emptyText, emptyText}}; + EXPECT_TRUE(multipleEmptySections.empty()); + + Formatted multipleEmptySectionsWithImage{std::vector{emptyText, emptyImage, emptyText}}; + EXPECT_TRUE(multipleEmptySectionsWithImage.empty()); + + auto text = FormattedSection{"Formatted", nullopt, nullopt, nullopt}; + auto image = FormattedSection{style::expression::Image("Image")}; + + Formatted multipleSections{std::vector{emptyText, text, emptyText}}; + EXPECT_FALSE(multipleSections.empty()); + + Formatted multipleSectionsWithImage{std::vector{emptyText, image, text}}; + EXPECT_FALSE(multipleSectionsWithImage.empty()); +} + +TEST(Formatted, ToString) { + Formatted emptyFormatted{""}; + EXPECT_EQ(emptyFormatted.toString(), ""); + + auto text = FormattedSection{"Formatted", nullopt, nullopt, nullopt}; + Formatted multipleSections{std::vector{text, text}}; + EXPECT_EQ(multipleSections.toString(), "FormattedFormatted"); + + auto image = FormattedSection{style::expression::Image("Image")}; + Formatted multipleEmptySectionsWithImage{std::vector{text, image}}; + EXPECT_EQ(multipleEmptySectionsWithImage.toString(), "Formatted"); +} diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp index b04617a40b5..64255c72db0 100644 --- a/test/text/quads.test.cpp +++ b/test/text/quads.test.cpp @@ -1,10 +1,11 @@ #include +#include #include +#include #include +#include #include #include -#include -#include using namespace mbgl; using namespace mbgl::style; @@ -21,8 +22,7 @@ TEST(getIconQuads, normal) { GeometryCoordinates line; - SymbolQuad quad = - getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_EQ(quad.tl.x, -14); EXPECT_EQ(quad.tl.y, -10); @@ -45,7 +45,10 @@ TEST(getIconQuads, style) { shapedText.bottom = 30.0f; shapedText.left = -60.0f; shapedText.right = 20.0f; - shapedText.positionedGlyphs.emplace_back(PositionedGlyph(32, 0.0f, 0.0f, false, 0, 1.0)); + // shapedText.positionedGlyphs.emplace_back(PositionedGlyph(32, 0.0f, 0.0f, false, 0, 1.0)); + shapedText.positionedLines.emplace_back(); + shapedText.positionedLines.back().positionedGlyphs.emplace_back( + PositionedGlyph(32, 0.0f, 0.0f, false, 0, 1.0, /*texRect*/ {}, /*metrics*/ {}, /*imageID*/ nullopt)); // none { @@ -57,7 +60,7 @@ TEST(getIconQuads, style) { EXPECT_FLOAT_EQ(-18.5f, shapedIcon.left()); SymbolLayoutProperties::Evaluated layout; - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -19.5); EXPECT_FLOAT_EQ(quad.tl.y, -19.5); @@ -73,7 +76,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -64.4444427); EXPECT_FLOAT_EQ(quad.tl.y, 0); @@ -89,7 +92,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -32.2222214); EXPECT_FLOAT_EQ(quad.tl.y, -5); @@ -105,7 +108,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Width, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -43.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -5); @@ -121,7 +124,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -30); EXPECT_FLOAT_EQ(quad.tl.y, -12.2222214); @@ -138,7 +141,7 @@ TEST(getIconQuads, style) { SymbolLayoutProperties::Evaluated layout; auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -20); EXPECT_FLOAT_EQ(quad.tl.y, -6.11111069); @@ -154,7 +157,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Height, {{5, 10, 5, 20}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -20); EXPECT_FLOAT_EQ(quad.tl.y, -11.666666); @@ -170,7 +173,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 24.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -64.4444427); EXPECT_FLOAT_EQ(quad.tl.y, -12.2222214); @@ -186,7 +189,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 0, 0, 0}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -32.2222214); EXPECT_FLOAT_EQ(quad.tl.y, -6.11111069); @@ -202,7 +205,7 @@ TEST(getIconQuads, style) { { auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{5, 10, 5, 10}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -43.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -11.666666); @@ -220,7 +223,7 @@ TEST(getIconQuads, style) { layout.get() = 12.0f; auto shapedIcon = PositionedIcon::shapeIcon(image, {{-9.5f, -9.5f}}, SymbolAnchorType::Center, 0); shapedIcon.fitIconToText(shapedText, IconTextFitType::Both, {{0, 5, 10, 15}}, {{0, 0}}, 12.0f / 24.0f); - SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal); + SymbolQuad quad = getIconQuad(shapedIcon, WritingModeType::Horizontal, SymbolContent::IconRGBA); EXPECT_FLOAT_EQ(quad.tl.x, -48.3333321); EXPECT_FLOAT_EQ(quad.tl.y, -6.66666603); diff --git a/test/text/shaping.test.cpp b/test/text/shaping.test.cpp index b22cd7da369..d86bf30eb98 100644 --- a/test/text/shaping.test.cpp +++ b/test/text/shaping.test.cpp @@ -10,33 +10,44 @@ using namespace mbgl; using namespace util; TEST(Shaping, ZWSP) { + GlyphPosition glyphPosition; + glyphPosition.metrics.width = 18; + glyphPosition.metrics.height = 18; + glyphPosition.metrics.left = 2; + glyphPosition.metrics.top = -8; + glyphPosition.metrics.advance = 21; + Glyph glyph; glyph.id = u'中'; - glyph.metrics.width = 18; - glyph.metrics.height = 18; - glyph.metrics.left = 2; - glyph.metrics.top = -8; - glyph.metrics.advance = 21; + glyph.metrics = glyphPosition.metrics; BiDi bidi; auto immutableGlyph = Immutable(makeMutable(std::move(glyph))); const std::vector fontStack{{"font-stack"}}; const SectionOptions sectionOptions(1.0f, fontStack); + const float layoutTextSize = 16.0f; + const float layoutTextSizeAtBucketZoomLevel = 16.0f; GlyphMap glyphs = { { FontStackHasher()(fontStack), {{u'中', std::move(immutableGlyph)}} } }; + GlyphPositions glyphPositions = {{FontStackHasher()(fontStack), {{u'中', std::move(glyphPosition)}}}}; + ImagePositions imagePositions; - const auto testGetShaping = [&] (const TaggedString& string, unsigned maxWidthInChars) { + const auto testGetShaping = [&](const TaggedString& string, unsigned maxWidthInChars) { return getShaping(string, maxWidthInChars * ONE_EM, - ONE_EM, // lineHeight + ONE_EM, // lineHeight style::SymbolAnchorType::Center, style::TextJustifyType::Center, - 0, // spacing + 0, // spacing {{0.0f, 0.0f}}, // translate WritingModeType::Horizontal, bidi, glyphs, + glyphPositions, + imagePositions, + layoutTextSize, + layoutTextSizeAtBucketZoomLevel, /*allowVerticalPlacement*/ false); }; @@ -47,7 +58,7 @@ TEST(Shaping, ZWSP) { { TaggedString string(u"中中\u200b中中\u200b中中\u200b中中中中中中\u200b中中", sectionOptions); auto shaping = testGetShaping(string, 5); - ASSERT_EQ(shaping.lineCount, 3); + ASSERT_EQ(shaping.positionedLines.size(), 3); ASSERT_EQ(shaping.top, -36); ASSERT_EQ(shaping.bottom, 36); ASSERT_EQ(shaping.left, -63); @@ -61,7 +72,7 @@ TEST(Shaping, ZWSP) { { TaggedString string(u"中中\u200b中", sectionOptions); auto shaping = testGetShaping(string, 1); - ASSERT_EQ(shaping.lineCount, 2); + ASSERT_EQ(shaping.positionedLines.size(), 2); ASSERT_EQ(shaping.top, -24); ASSERT_EQ(shaping.bottom, 24); ASSERT_EQ(shaping.left, -21); @@ -74,7 +85,7 @@ TEST(Shaping, ZWSP) { { TaggedString string(u"中中\u200b", sectionOptions); auto shaping = testGetShaping(string, 2); - ASSERT_EQ(shaping.lineCount, 1); + ASSERT_EQ(shaping.positionedLines.size(), 1); ASSERT_EQ(shaping.top, -12); ASSERT_EQ(shaping.bottom, 12); ASSERT_EQ(shaping.left, -21); @@ -86,7 +97,7 @@ TEST(Shaping, ZWSP) { { TaggedString string(u"\u200b\u200b\u200b\u200b\u200b", sectionOptions); auto shaping = testGetShaping(string, 1); - ASSERT_EQ(shaping.lineCount, 5); + ASSERT_EQ(shaping.positionedLines.size(), 5); ASSERT_EQ(shaping.top, -60); ASSERT_EQ(shaping.bottom, 60); ASSERT_EQ(shaping.left, 0); diff --git a/test/text/tagged_string.test.cpp b/test/text/tagged_string.test.cpp index da1141f00b5..e22284541cb 100644 --- a/test/text/tagged_string.test.cpp +++ b/test/text/tagged_string.test.cpp @@ -11,9 +11,9 @@ TEST(TaggedString, Trim) { EXPECT_EQ(basic.rawText(), u"trim that and not this"); TaggedString twoSections; - twoSections.addSection(u" \t\ntrim that", 1.5f, {}); - twoSections.addSection(u" and not this \n\t", 0.5f, {}); - + twoSections.addTextSection(u" \t\ntrim that", 1.5f, {}); + twoSections.addTextSection(u" and not this \n\t", 0.5f, {}); + twoSections.trim(); EXPECT_EQ(twoSections.rawText(), u"trim that and not this"); @@ -25,3 +25,20 @@ TEST(TaggedString, Trim) { noTrim.trim(); EXPECT_EQ(noTrim.rawText(), u"no trim!"); } + +TEST(TaggedString, ImageSections) { + TaggedString string; + string.addImageSection("image_name"); + EXPECT_EQ(string.rawText(), u"\uE000"); + EXPECT_TRUE(string.getSection(0).imageID); + EXPECT_EQ(*string.getSection(0).imageID, "image_name"); + + TaggedString maxSections; + for (std::size_t i = 0; i < 6401; ++i) { + maxSections.addImageSection(util::toString(i)); + } + + EXPECT_EQ(maxSections.getSections().size(), 6400u); + EXPECT_EQ(maxSections.getCharCodeAt(0), u'\uE000'); + EXPECT_EQ(maxSections.getCharCodeAt(6399), u'\uF8FF'); +} \ No newline at end of file