Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-20 02:15:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc tweaks

Browse Source 
Minor internal api safety to avoid potential memory leaks
This commit is contained in:
Kurt
2026-06-01 22:25:34 -05:00
parent ff0ad621e3
commit a0328c8330
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PKHeX.Core/Saves/SAV4HGSS.cs
View File

@@ -208,27 +208,22 @@ public int Badges16
}
private const int OFS_GearRolodex = 0xC0EC;
private const byte GearMaxCallers = (byte)(PokegearNumber.Ernest + 1);
private const byte GearCallerCount = (byte)(PokegearNumber.Ernest + 1);
public PokegearNumber GetCallerAtIndex(int index) => (PokegearNumber)General[OFS_GearRolodex + index];
public void SetCallerAtIndex(int index, PokegearNumber caller) => General[OFS_GearRolodex + index] = (byte)caller;
public Span<PokegearNumber> GetPokeGearRoloDex()
{
var arr = General.Slice(OFS_GearRolodex, GearMaxCallers);
var arr = General.Slice(OFS_GearRolodex, GearCallerCount);
return MemoryMarshal.Cast<byte, PokegearNumber>(arr);
}
public void SetPokeGearRoloDex(ReadOnlySpan<PokegearNumber> value)
{
if (value.Length > GearMaxCallers)
throw new ArgumentOutOfRangeException(nameof(value));
MemoryMarshal.AsBytes(value).CopyTo(General.Slice(OFS_GearRolodex, GearMaxCallers));
}
public void SetPokeGearRoloDex(ReadOnlySpan<PokegearNumber> value) => value.CopyTo(GetPokeGearRoloDex());
public void PokeGearUnlockAllCallers()
{
for (int i = 0; i < GearMaxCallers; i++)
for (int i = 0; i < GearCallerCount; i++)
SetCallerAtIndex(i, (PokegearNumber)i);
}

39
PKHeX.Drawing/ImageUtil.cs
View File

@@ -32,8 +32,7 @@ public static class ImageUtil
public Span<byte> GetBitmapData(out BitmapData bmpData, PixelFormat format = PixelFormat.Format32bppArgb)
{
bmpData = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadWrite, format);
var bpp = Image.GetPixelFormatSize(format) / 8;
return GetSpan(bmpData.Scan0, bmp.Width * bmp.Height * bpp);
return GetSpan(bmpData.Scan0, Math.Abs(bmpData.Stride) * bmpData.Height);
}
public void GetBitmapData(Span<byte> data, PixelFormat format = PixelFormat.Format32bppArgb)
@@ -69,10 +68,9 @@ public void SetBitmapData(Span<int> data)
public byte[] GetBitmapData()
{
var format = bmp.PixelFormat;
var bpp = Image.GetPixelFormatSize(format) / 8;
var result = new byte[bmp.Width * bmp.Height * bpp];
bmp.GetBitmapData(result, format);
return result;
var span = bmp.GetBitmapData(out var bmpData, format);
try { return [..span]; }
finally { bmp.UnlockBits(bmpData); }
}
public void ToGrayscale(float intensity)
@@ -81,8 +79,8 @@ public void ToGrayscale(float intensity)
return; // don't care
var data = bmp.GetBitmapData(out var bmpData);
SetAllColorToGrayScale(data, intensity);
bmp.UnlockBits(bmpData);
try { SetAllColorToGrayScale(data, intensity); }
finally { bmp.UnlockBits(bmpData); }
}
public void ChangeOpacity(double trans)
@@ -91,8 +89,8 @@ public void ChangeOpacity(double trans)
return; // don't care
var data = bmp.GetBitmapData(out var bmpData);
SetAllTransparencyTo(data, trans);
bmp.UnlockBits(bmpData);
try { SetAllTransparencyTo(data, trans); }
finally { bmp.UnlockBits(bmpData); }
}
public void BlendTransparentTo(Color c, byte trans, int start = 0, int end = -1)
@@ -100,15 +98,15 @@ public void BlendTransparentTo(Color c, byte trans, int start = 0, int end = -1)
var data = bmp.GetBitmapData(out var bmpData);
if (end == -1)
end = data.Length;
BlendAllTransparencyTo(data[start..end], c, trans);
bmp.UnlockBits(bmpData);
try { BlendAllTransparencyTo(data[start..end], c, trans); }
finally { bmp.UnlockBits(bmpData); }
}
public void ChangeAllColorTo(Color c)
{
var data = bmp.GetBitmapData(out var bmpData);
ChangeAllColorTo(data, c);
bmp.UnlockBits(bmpData);
try { ChangeAllColorTo(data, c); }
finally { bmp.UnlockBits(bmpData); }
}
public void ChangeTransparentTo(Color c, byte trans, int start = 0, int end = -1)
@@ -116,23 +114,22 @@ public void ChangeTransparentTo(Color c, byte trans, int start = 0, int end = -1
var data = bmp.GetBitmapData(out var bmpData);
if (end == -1)
end = data.Length;
SetAllTransparencyTo(data[start..end], c, trans);
bmp.UnlockBits(bmpData);
try { SetAllTransparencyTo(data[start..end], c, trans); }
finally { bmp.UnlockBits(bmpData); }
}
public void WritePixels(Color c, int start, int end)
{
var data = bmp.GetBitmapData(out var bmpData);
ChangeAllTo(data, c, start, end);
bmp.UnlockBits(bmpData);
try { ChangeAllTo(data, c, start, end); }
finally { bmp.UnlockBits(bmpData); }
}
public int GetAverageColor()
{
var data = bmp.GetBitmapData(out var bmpData);
var avg = GetAverageColor(data);
bmp.UnlockBits(bmpData);
return avg;
try { return GetAverageColor(data); }
finally { bmp.UnlockBits(bmpData); }
}
}