Skip to content

Merge conflicts - #21

Merged
pmeems merged 3 commits into
developmentfrom
merge-conflicts
Oct 28, 2026
Merged

pmeems merged 3 commits into
developmentfrom
merge-conflicts

Conversation

@pmeems

@pmeems pmeems commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

No description provided.

pmeems and others added 2 commits October 28, 2026 08:46
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 Needs a closer look

Scaled draw targets can be only partially covered by an unscaled bitmap, while some initialization failures retain generic diagnostics and context-failure recovery lacks deterministic regression coverage.

No open issues 🎉

What changed in this PR

Adds OpenGL rendering with GDI fallback to the ActiveX layer while keeping Core rendering data independent of graphics APIs.

Changes:

  • Introduces backend selection, rendering diagnostics, target limits, and context recovery.
  • Exposes rendering preferences through a derived COM interface and adds renderer and host checks.
  • Avoids forced feature counting during indexing and updates architecture guidance and development tooling.

Builds and tests were not run during this review.

File Description
tests/​MapWinGIS.Core.Tests/​VectorLayerRendererTests.cpp Adds rendering, fallback, geometry-validation, and target-limit tests.
tests/​MapWinGIS.Core.Tests/​MapWinGIS.Core.Tests.vcxproj Includes renderer sources and tests.
tests/​MapWinGIS.Core.Tests/​ActiveXActivationTests.cpp Checks original and extended COM interfaces and rendering properties.
src/​MapWinGIS.Core/​src/​vector/​VectorDataset.cpp Avoids forced feature counting before indexing.
src/​MapWinGIS.ActiveX/​VectorRenderBackend.h Defines the internal rendering backend contract.
src/​MapWinGIS.ActiveX/​VectorLayerRenderer.h Declares backend preferences and diagnostics.
src/​MapWinGIS.ActiveX/​VectorLayerRenderer.cpp Coordinates OpenGL rendering and GDI fallback.
src/​MapWinGIS.ActiveX/​OpenGlVectorLayerRenderer.h Declares OpenGL resources and target-limit checks.
src/​MapWinGIS.ActiveX/​OpenGlVectorLayerRenderer.cpp Implements framebuffer rendering, readback, limits, and recovery.
src/​MapWinGIS.ActiveX/​MapWinGISControl.h Adds the extended COM interface and renderer ownership.
src/​MapWinGIS.ActiveX/​MapWinGISControl.cpp Implements rendering properties and delegates drawing.
src/​MapWinGIS.ActiveX/​MapWinGIS.ActiveX.vcxproj Registers new backend sources and headers.
src/​MapWinGIS.ActiveX/​MapWinGIS.ActiveX.idl Adds rendering automation through IMapWinGISControl2.
src/​MapWinGIS.ActiveX/​GdiVectorLayerRenderer.h Declares the GDI fallback backend.
src/​MapWinGIS.ActiveX/​GdiVectorLayerRenderer.cpp Extracts GDI drawing and adds coordinate validation.
samples/​CSharp/​ActiveXTestHost/​MainForm.cs Displays rendering status and checks GDI selection.
README.md Updates ActiveX status and compatibility goals.
msbuild-extractor.json Configures compilation-database generation.
docs/​TESTING.md Documents renderer validation and interactive-host limitations.
docs/​PORTING.md Clarifies selective compatibility and modernization priorities.
docs/​ARCHITECTURE.md Describes backend responsibilities and rendering policies.
AGENTS.md Updates project status and development priorities.
.gitignore Excludes generated compilation-database output.
.github/​copilot-instructions.md Aligns guidance with implemented ActiveX support and modernization goals.

Review effort: Balanced

@pmeems
pmeems merged commit 8317378 into development Oct 28, 2026
1 check passed
@pmeems
pmeems deleted the merge-conflicts branch October 28, 2026 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants