ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved MemoryStream handling in TileImageLoader

Browse source
This commit is contained in:
ClemensF 2012-07-27 18:47:57 +02:00
parent d368c9358c
commit 940d8bad62
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
MapControl/TileImageLoader.cs
View file

@ -247,14 +247,22 @@ namespace MapControl
} }
using (HttpWebResponse response = (HttpWebResponse)request.GetResponse()) using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
{
using (Stream responseStream = response.GetResponseStream()) using (Stream responseStream = response.GetResponseStream())
{ {
buffer = new byte[(int)response.ContentLength]; if (response.ContentLength > 0)
{
using (MemoryStream memoryStream = new MemoryStream(buffer)) using (MemoryStream memoryStream = new MemoryStream((int)response.ContentLength))
{ {
responseStream.CopyTo(memoryStream); responseStream.CopyTo(memoryStream);
buffer = memoryStream.GetBuffer();
}
}
else
{
using (MemoryStream memoryStream = new MemoryStream())
{
responseStream.CopyTo(memoryStream);
buffer = memoryStream.ToArray();
} }
} }
} }
@ -263,8 +271,6 @@ namespace MapControl
} }
catch (WebException ex) catch (WebException ex)
{ {
buffer = null;
if (ex.Status == WebExceptionStatus.ProtocolError) if (ex.Status == WebExceptionStatus.ProtocolError)
{ {
TraceInformation("{0} - {1}", tile.Uri, ((HttpWebResponse)ex.Response).StatusCode); TraceInformation("{0} - {1}", tile.Uri, ((HttpWebResponse)ex.Response).StatusCode);
@ -280,8 +286,6 @@ namespace MapControl
} }
catch (Exception ex) catch (Exception ex)
{ {
buffer = null;
TraceWarning("{0} - {1}", tile.Uri, ex.Message); TraceWarning("{0} - {1}", tile.Uri, ex.Message);
} }