More support

Author: kunitoki

examples/graphics/data/svg/pulpitrock.svg

@@ -99,10 +99,59 @@ class SvgDemo : public yup::Component
             demoFont = std::move (font);
     }
 
+    std::optional<yup::Image> fetchHttpImage (const yup::String& href)
+    {
+        if (! href.startsWithIgnoreCase ("http:") && ! href.startsWithIgnoreCase ("https:"))
+            return std::nullopt;
+
+        if (httpImageCache.contains (href))
+            return httpImageCache[href];
+
+        yup::MemoryBlock imageData;
+        int statusCode = 0;
+
+        auto streamOptions = yup::URL::InputStreamOptions (yup::URL::ParameterHandling::inAddress)
+                                 .withConnectionTimeoutMs (5000)
+                                 .withNumRedirectsToFollow (5)
+                                 .withStatusCode (&statusCode)
+                                 .withExtraHeaders ("User-Agent: YUP SVG Demo\r\nAccept: image/*\r\n");
+
+        auto stream = yup::URL (href).createInputStream (streamOptions);
+        if (stream == nullptr)
+        {
+            YUP_DBG ("Unable to fetch SVG image href: " << href);
+            return std::nullopt;
+        }
+
+        stream->readIntoMemoryBlock (imageData);
+
+        if ((statusCode != 0 && (statusCode < 200 || statusCode >= 300)) || imageData.isEmpty())
+        {
+            YUP_DBG ("Unable to fetch SVG image href: " << href << " status: " << statusCode);
+            return std::nullopt;
+        }
+
+        auto imageResult = yup::Image::loadFromData (imageData.asBytes());
+        if (imageResult.failed())
+        {
+            YUP_DBG ("Unable to decode SVG image href: " << href << " error: " << imageResult.getErrorMessage());
+            return std::nullopt;
+        }
+
+        auto image = imageResult.getValue();
+        httpImageCache.set (href, image);
+        return image;
+    }
+
     yup::Drawable::ParseOptions createParseOptions (const yup::File& svgFile)
     {
         yup::Drawable::ParseOptions options;
         options.baseDirectory = svgFile.getParentDirectory();
+        options.imageResolver = [this] (yup::StringRef href, const yup::File&) -> std::optional<yup::Image>
+        {
+            return fetchHttpImage (yup::String (href.text));
+        };
+
         options.fontResolver = [this] (yup::StringRef, float fontSize, int weight, bool italic) -> std::optional<yup::Font>
         {
             if (demoFont)
@@ -129,5 +178,6 @@ class SvgDemo : public yup::Component
     yup::Array<yup::File> svgFiles;
     yup::File dataDirectory;
     std::optional<yup::Font> demoFont;
+    yup::HashMap<yup::String, yup::Image> httpImageCache;
     int currentSvgFileIndex = 0;
 };

examples/graphics/source/examples/Svg.h

@@ -1054,10 +1054,10 @@ void Drawable::paintDebugElement (Graphics& g, const SVGElement& element)
 Font Drawable::resolveFont (const SVGElement& element) const
 {
     if (document == nullptr)
-        return Font().withHeight (element.fontSize.value_or (12.0f));
+        return Font().withHeight (element.fontSize.value_or (16.0f));
 
     const auto& options = document->getParseOptions();
-    const auto fontSize = element.fontSize.value_or (12.0f);
+    const auto fontSize = element.fontSize.value_or (16.0f);
     const auto fontWeight = element.fontWeight.value_or (400);
     const auto fontItalic = element.fontItalic.value_or (false);
 
@@ -1089,7 +1089,7 @@ void Drawable::renderTextElement (Graphics& g, const SVGElement& element)
         position.setY (position.getY() + element.textDy->getFirst());
 
     const auto font = resolveFont (element);
-    const auto fontSize = element.fontSize.value_or (12.0f);
+    const auto fontSize = element.fontSize.value_or (16.0f);
 
     StyledText styledText;
     {
@@ -1134,9 +1134,26 @@ void Drawable::renderImageElement (Graphics& g, const SVGElement& element)
     if (! element.imageBounds)
         return;
 
+    auto drawImage = [this, &g, &element] (const Image& image)
+    {
+        if (! image.isValid())
+            return;
+
+        const Rectangle<float> imageSourceBounds (0.0f, 0.0f, static_cast<float> (image.getWidth()), static_cast<float> (image.getHeight()));
+        const auto imageTransform = calculateTransformForTarget (imageSourceBounds,
+                                                                 *element.imageBounds,
+                                                                 element.preserveAspectRatioFitting,
+                                                                 element.preserveAspectRatioJustification);
+        const auto fittedImageBounds = imageSourceBounds.transformed (imageTransform);
+
+        const auto savedState = g.saveState();
+        g.setClipPath (*element.imageBounds);
+        g.drawImage (image, fittedImageBounds);
+    };
+
     if (element.image)
     {
-        g.drawImage (*element.image, *element.imageBounds);
+        drawImage (*element.image);
         return;
     }
 
@@ -1145,7 +1162,7 @@ void Drawable::renderImageElement (Graphics& g, const SVGElement& element)
         if (document != nullptr)
         {
             if (auto image = SVGParser::loadImageFromHref (document->getParseOptions(), *element.imageHref))
-                g.drawImage (*image, *element.imageBounds);
+                drawImage (*image);
         }
     }
 }

modules/yup_graphics/drawables/yup_Drawable.cpp

@@ -471,6 +471,12 @@ bool SVGParser::parseElement (const XmlElement& element, bool parentIsRoot, Affi
 
         e->imageBounds = Rectangle<float> (x, y, width, height);
 
+        if (auto preserveAspectRatio = element.getStringAttribute ("preserveAspectRatio"); preserveAspectRatio.isNotEmpty())
+        {
+            e->preserveAspectRatioFitting = parsePreserveAspectRatio (preserveAspectRatio);
+            e->preserveAspectRatioJustification = parseAspectRatioAlignment (preserveAspectRatio);
+        }
+
         String href = element.getStringAttribute ("href");
         if (href.isEmpty())
             href = element.getStringAttribute ("xlink:href");

modules/yup_graphics/svg/yup_SVGParser.cpp

@@ -655,6 +655,37 @@ TEST (SVGParserTests, ParseImageWithMissingHref)
     EXPECT_TRUE (d.parseSVG ("<svg><image x=\"0\" y=\"0\" width=\"50\" height=\"50\" /></svg>"));
 }
 
+TEST (SVGParserTests, ParseImageDefaultsToPreservingAspectRatio)
+{
+    auto doc = SVGParser::parse ("<svg><image x=\"0\" y=\"0\" width=\"50\" height=\"25\" /></svg>");
+    ASSERT_NE (nullptr, doc);
+
+    doc->visit ([] (const SVGData& data)
+    {
+        ASSERT_EQ (1u, data.elements.size());
+
+        const auto& image = *data.elements.front();
+        EXPECT_EQ (Fitting::scaleToFit, image.preserveAspectRatioFitting);
+        EXPECT_TRUE (image.preserveAspectRatioJustification.testFlags (Justification::center));
+    });
+}
+
+TEST (SVGParserTests, ParseImagePreserveAspectRatioAttribute)
+{
+    auto doc = SVGParser::parse ("<svg><image x=\"0\" y=\"0\" width=\"50\" height=\"25\" preserveAspectRatio=\"xMaxYMin slice\" /></svg>");
+    ASSERT_NE (nullptr, doc);
+
+    doc->visit ([] (const SVGData& data)
+    {
+        ASSERT_EQ (1u, data.elements.size());
+
+        const auto& image = *data.elements.front();
+        EXPECT_EQ (Fitting::scaleToFill, image.preserveAspectRatioFitting);
+        EXPECT_TRUE (image.preserveAspectRatioJustification.testFlags (Justification::right));
+        EXPECT_TRUE (image.preserveAspectRatioJustification.testFlags (Justification::top));
+    });
+}
+
 // ==============================================================================
 // Gradients
 // ==============================================================================