Blend2D: ifdef to support older and newer API versions

gwaldron · Jul 16, 2024 · 4c561c8 · 4c561c8
1 parent f691f11
commit 4c561c8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/osgEarth/Capabilities.cpp b/src/osgEarth/Capabilities.cpp
@@ -28,6 +28,9 @@
 #include <gdal.h>
 #include <sstream>
 #include <osgEarth/Notify>
+#ifdef OSGEARTH_HAVE_BLEND2D
+#include <blend2d.h>
+#endif
 
 using namespace osgEarth;
 
@@ -267,6 +270,10 @@ Capabilities::Capabilities() :
         OE_INFO << LC << "GL_VERSION:        " << _version << std::endl;
         //OE_INFO << LC << "GLSL:             " << getGLSLVersionInt() << std::endl;
 
+#ifdef OSGEARTH_HAVE_BLEND2D
+        //OE_INFO << LC << "Blend2D version:   " << std::to_string(BL_VERSION) << std::endl;
+#endif
+
 #if 0
         // assemble the driver version if possible.
         std::vector<std::string> version_tokens;

diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp
@@ -488,7 +488,12 @@ namespace osgEarth {
                     ctx.scale(scale);
                     ctx.blitImage(BLPoint((double)g->left - GLYPH_PADDING, (double)(-g->top) - GLYPH_PADDING), sprite, glyphRect);
                     //ctx.blitImage(BLPoint(0, 0), sprite, glyphRect);
+
+#if BL_VERSION >= 2820
                     ctx.resetTransform();
+#else
+                    ctx.resetMatrix();
+#endif
 
 #if 0
                     // Draw the text bounding box
@@ -573,7 +578,12 @@ namespace osgEarth {
                                             ctx.translate(x, y);
                                             ctx.scale(scale);
                                             ctx.blitImage(BLPoint(-iconRect.w / 2.0, -iconRect.h / 2.0), sprite, iconRect);
+
+#if BL_VERSION >= 2820
                                             ctx.resetTransform();
+#else
+                                            ctx.resetMatrix();
+#endif
                                         }
                                     });
                             }