Merge branch 'release/v5.1'

# Conflicts:
#	src/Tiles/Providers/BaseProvider.cpp

Author: pmeems

demo/MWLite.GUI/MWLite.GUI.csproj

@@ -239,17 +239,17 @@
   <ItemGroup>
     <COMReference Include="AxMapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>aximp</WrapperTool>
       <Isolated>False</Isolated>
       <Private>True</Private>
     </COMReference>
     <COMReference Include="MapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>tlbimp</WrapperTool>
       <Isolated>False</Isolated>

demo/MWLite.Symbology/Controls/ImageCombo.cs

@@ -449,7 +449,7 @@ public void RefreshImageList()
                         }
 
                         IntPtr ptr = g.GetHdc();
-                        sdo.DrawPoint(ptr, 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));
+                        sdo.DrawPoint(ptr.ToInt32(), 0.0f, 0.0f, _imgWidth, _imgHeight, Colors.ColorToUInteger(this.BackColor));
                         g.ReleaseHdc(ptr);
                         break;
                     }

demo/MWLite.Symbology/Controls/ListControls/LinePatternControl.cs

@@ -244,7 +244,7 @@ void Control_OnDrawItem(Graphics graphics, RectangleF rect, int itemIndex, bool
         {
             IntPtr ptr = graphics.GetHdc();
             MapWinGIS.LinePattern pattern = _patterns[itemIndex];
-            pattern.Draw(ptr, rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));
+            pattern.Draw(ptr.ToInt32(), rect.X + 1.0f, rect.Y + 1.0f, (int)rect.Width - 2, (int)rect.Height - 2, Colors.ColorToUInteger(this.BackColor));
             graphics.ReleaseHdc();
         }
         #endregion

demo/MWLite.Symbology/Controls/ListControls/SymbolControl.cs

@@ -75,7 +75,7 @@ void PointSymbolControl_OnDrawItem(System.Drawing.Graphics graphics, System.Draw
         {
             IntPtr ptr = graphics.GetHdc();
             MapWinGIS.ShapeDrawingOptions sdo = _icons[itemIndex];
-            sdo.DrawPoint(ptr, rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));
+            sdo.DrawPoint(ptr.ToInt32(), rect.X + 1.0f, rect.Y +1.0f, (int)rect.Width -2, (int)rect.Height -2, Colors.ColorToUInteger(this.BackColor));
             graphics.ReleaseHdc();
        }
     }

demo/MWLite.Symbology/Forms/Categories/CategoriesForm.cs

@@ -736,15 +736,15 @@ private void dgvCategories_CellFormatting(object sender, DataGridViewCellFormatt
 
                         if (type == ShpfileType.SHP_POLYGON)
                         {
-                            sdo.DrawRectangle(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawRectangle(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         else if (type == ShpfileType.SHP_POLYLINE)
                         {
-                            sdo.DrawLine(g.GetHdc(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawLine(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width - 1, img.Height - 1, true, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         else if (type == ShpfileType.SHP_POINT)
                         {
-                            sdo.DrawPoint(g.GetHdc(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
+                            sdo.DrawPoint(g.GetHdc().ToInt32(), 0.0f, 0.0f, img.Width, img.Height, Colors.ColorToUInteger(dgvCategories.BackgroundColor));
                         }
                         g.ReleaseHdc();
                         g.Dispose();

demo/MWLite.Symbology/Forms/Charts/ChartStyleForm.cs

@@ -378,9 +378,9 @@ private void Draw()
             if (_charts.Visible)
             {
                 if (_charts.ChartType == MapWinGIS.tkChartType.chtPieChart)
-                    _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2,  false, backColor);
+                    _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2,  false, backColor);
                 else
-                    _charts.DrawChart(hdc, (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);
+                    _charts.DrawChart(hdc.ToInt32(), (width - _charts.IconWidth) / 2, (height - _charts.IconHeight) / 2, false, backColor);
             }
             g.ReleaseHdc();
             pictureBox1.Image = bmp;

demo/MWLite.Symbology/Forms/Symbology/LinesForm.cs

@@ -312,7 +312,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             uint backColor = Colors.ColorToUInteger(this.BackColor);
-            _options.LinePattern.Draw(ptr, 20, 0, rect.Width - 40, rect.Height, backColor);
+            _options.LinePattern.Draw(ptr.ToInt32(), 20, 0, rect.Width - 40, rect.Height, backColor);
 
             g.ReleaseHdc();
 
@@ -371,7 +371,7 @@ private void dgv_CellFormatting(object sender, DataGridViewCellFormattingEventAr
 
                             IntPtr ptr = g.GetHdc();
                             uint backColor = Colors.ColorToUInteger(this.BackColor);
-                            line.Draw(ptr, 0, 0, img.Width, img.Height, backColor);
+                            line.Draw(ptr.ToInt32(), 0, 0, img.Width, img.Height, backColor);
                             g.ReleaseHdc();
                             g.Dispose();
 

demo/MWLite.Symbology/Forms/Symbology/PointsForm.cs

@@ -488,7 +488,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             // creating shape to draw
-            _options.DrawPoint(ptr, 0.0f, 0.0f, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
+            _options.DrawPoint(ptr.ToInt32(), 0.0f, 0.0f, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
 
             g.ReleaseHdc();
             pctPreview.Image = bmp;

demo/MWLite.Symbology/Forms/Symbology/PolygonsForm.cs

@@ -388,7 +388,7 @@ private void DrawPreview()
             IntPtr ptr = g.GetHdc();
 
             // creating shape to draw
-            _options.DrawRectangle(ptr, 40.0f, 40.0f, rect.Width - 80, rect.Height - 80, true, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
+            _options.DrawRectangle(ptr.ToInt32(), 40.0f, 40.0f, rect.Width - 80, rect.Height - 80, true, rect.Width, rect.Height, Colors.ColorToUInteger(this.BackColor));
 
             g.ReleaseHdc();
             pctPreview.Image = bmp;