Merge remote-tracking branch 'origin/patch'

This commit is contained in:
ghidra1
2023-08-25 18:14:51 -04:00
@@ -38,7 +38,7 @@ public class MemoryBlockMap implements AddressPixelMap {
return; return;
} }
blocks = program.getMemory().getBlocks(); blocks = includeBlocks();
pixels = new int[blocks.length]; pixels = new int[blocks.length];
long totalSize = 0; long totalSize = 0;
for (MemoryBlock block : blocks) { for (MemoryBlock block : blocks) {
@@ -50,6 +50,10 @@ public class MemoryBlockMap implements AddressPixelMap {
} }
} }
protected MemoryBlock[] includeBlocks() {
return program.getMemory().getBlocks();
}
@Override @Override
public Address getAddress(int pixel) { public Address getAddress(int pixel) {
if (pixels == null) { if (pixels == null) {