Skip to content

Commit 82995e6

Browse files
committed
Fixed crach bug in CMapView::ChooseZoom().
Update version to 5.5.0.6
1 parent 3b09e7b commit 82995e6

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/MapControl/Map_Tiles.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ int CMapView::ChooseZoom(BaseProvider* provider, Extent ext, double scalingRatio
8888

8989
#if BIG_TILE_SIZE
9090
auto tileImageSize = 512;
91-
auto customProvider = reinterpret_cast<WmsCustomProvider*>(provider);
91+
auto customProvider = dynamic_cast<WmsCustomProvider*>(provider);
9292
if (customProvider != nullptr)
93-
tileImageSize = static_cast<int>(customProvider->get_TileSize());
94-
int minSize = (int)(tileImageSize * scalingRatio * ratio);
93+
tileImageSize = customProvider->get_TileSize();
94+
int minSize = static_cast<int>(tileImageSize * scalingRatio * ratio);
9595
#else
9696
int minSize = (int)(256 * scalingRatio * ratio);
9797
#endif

src/MapWinGIS.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ END
113113
//
114114

115115
VS_VERSION_INFO VERSIONINFO
116-
FILEVERSION 5,5,0,5
117-
PRODUCTVERSION 5,5,0,5
116+
FILEVERSION 5,5,0,6
117+
PRODUCTVERSION 5,5,0,6
118118
FILEFLAGSMASK 0x3fL
119119
#ifdef _DEBUG
120120
FILEFLAGS 0x1L
@@ -132,13 +132,13 @@ BEGIN
132132
VALUE "Comments", "This control includes a mapping component and objects for reading and writing shapefiles and various triangulated irregular network and grid files. It also has extensive label and chart options and includes projection routines."
133133
VALUE "CompanyName", "MapWindow OSS Team - www.mapwindow.org"
134134
VALUE "FileDescription", "MapWinGIS ActiveX Control"
135-
VALUE "FileVersion", "5.5.0.5"
135+
VALUE "FileVersion", "5.5.0.6"
136136
VALUE "InternalName", "MapWinGIS ActiveX Control"
137137
VALUE "LegalCopyright", "Copyright (C) 2004-2022 MapWindow OSS Team"
138138
VALUE "LegalTrademarks", "MapWindow GIS is a trademark of Daniel P. Ames, 2005-2022"
139139
VALUE "OriginalFilename", "MapWinGIS.ocx"
140140
VALUE "ProductName", "MapWinGIS ActiveX Control"
141-
VALUE "ProductVersion", "5.5.0.5"
141+
VALUE "ProductVersion", "5.5.0.6"
142142
END
143143
END
144144
BLOCK "VarFileInfo"

src/MapWinGIS.vcxproj.user

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
13-
<LocalDebuggerCommand>"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\dotnet\net8.0\runtime\dotnet.exe"</LocalDebuggerCommand>
13+
<LocalDebuggerCommand>"C:\Projects\Arkeologerna_Intrasis4\Intrasis\Applications\IntrasisApp\bin\x64\Debug\net10.0-windows8.0\Intrasis.exe"</LocalDebuggerCommand>
1414
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
15-
<LocalDebuggerCommandArguments>test MapWinGisTests.csproj --no-build --configuration Release -p:Platform=x64</LocalDebuggerCommandArguments>
15+
<LocalDebuggerCommandArguments>C:\Intrasis\Database\KHM2018_Dilling216873_220314\KHM2018_Dilling216873_220314.idf admin admin</LocalDebuggerCommandArguments>
1616
<LocalDebuggerDebuggerType>NativeWithManagedCore</LocalDebuggerDebuggerType>
17-
<LocalDebuggerWorkingDirectory>C:\Projects\Lib\Sweco_MapWinGIS\MapWinGisTests-net6\MapWinGisTests</LocalDebuggerWorkingDirectory>
17+
<LocalDebuggerWorkingDirectory>C:\Intrasis\Database\KHM2018_Dilling216873_220314\</LocalDebuggerWorkingDirectory>
1818
<LocalDebuggerAttach>false</LocalDebuggerAttach>
1919
</PropertyGroup>
2020
</Project>

0 commit comments

Comments
 (0)