LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

If numpy has a problem reshaping data, issue a warning instead of crashing

Browse Source 
Addresses #1038
This commit is contained in:
Andrew Chin
2013-12-13 18:56:26 -05:00
parent df732bfa25
commit f35859e026
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
overviewer_core/world.py
View File

@@ -414,31 +414,39 @@ class RegionSet(object):
# Turn the skylight array into a 16x16x16 matrix. The array comes # Turn the skylight array into a 16x16x16 matrix. The array comes
# packed 2 elements per byte, so we need to expand it. # packed 2 elements per byte, so we need to expand it.
skylight = numpy.frombuffer(section['SkyLight'], dtype=numpy.uint8) try:
skylight = skylight.reshape((16,16,8)) skylight = numpy.frombuffer(section['SkyLight'], dtype=numpy.uint8)
skylight_expanded = numpy.empty((16,16,16), dtype=numpy.uint8) skylight = skylight.reshape((16,16,8))
skylight_expanded[:,:,::2] = skylight & 0x0F skylight_expanded = numpy.empty((16,16,16), dtype=numpy.uint8)
skylight_expanded[:,:,1::2] = (skylight & 0xF0) >> 4 skylight_expanded[:,:,::2] = skylight & 0x0F
del skylight skylight_expanded[:,:,1::2] = (skylight & 0xF0) >> 4
section['SkyLight'] = skylight_expanded del skylight
section['SkyLight'] = skylight_expanded
# Turn the BlockLight array into a 16x16x16 matrix, same as SkyLight # Turn the BlockLight array into a 16x16x16 matrix, same as SkyLight
blocklight = numpy.frombuffer(section['BlockLight'], dtype=numpy.uint8) blocklight = numpy.frombuffer(section['BlockLight'], dtype=numpy.uint8)
blocklight = blocklight.reshape((16,16,8)) blocklight = blocklight.reshape((16,16,8))
blocklight_expanded = numpy.empty((16,16,16), dtype=numpy.uint8) blocklight_expanded = numpy.empty((16,16,16), dtype=numpy.uint8)
blocklight_expanded[:,:,::2] = blocklight & 0x0F blocklight_expanded[:,:,::2] = blocklight & 0x0F
blocklight_expanded[:,:,1::2] = (blocklight & 0xF0) >> 4 blocklight_expanded[:,:,1::2] = (blocklight & 0xF0) >> 4
del blocklight del blocklight
section['BlockLight'] = blocklight_expanded section['BlockLight'] = blocklight_expanded
# Turn the Data array into a 16x16x16 matrix, same as SkyLight # Turn the Data array into a 16x16x16 matrix, same as SkyLight
data = numpy.frombuffer(section['Data'], dtype=numpy.uint8) data = numpy.frombuffer(section['Data'], dtype=numpy.uint8)
data = data.reshape((16,16,8)) data = data.reshape((16,16,8))
data_expanded = numpy.empty((16,16,16), dtype=numpy.uint8) data_expanded = numpy.empty((16,16,16), dtype=numpy.uint8)
data_expanded[:,:,::2] = data & 0x0F data_expanded[:,:,::2] = data & 0x0F
data_expanded[:,:,1::2] = (data & 0xF0) >> 4 data_expanded[:,:,1::2] = (data & 0xF0) >> 4
del data del data
section['Data'] = data_expanded section['Data'] = data_expanded
except ValueError:
# iv'e seen at least 1 case where numpy raises a value error during the reshapes. i'm not
# sure what's going on here, but let's treat this as a corrupt chunk error
logging.warning("There was a problem reading chunk %d,%d. It might be corrupt. I am giving up and will not render this particular chunk.", x, z)
logging.debug("Full traceback:", exc_info=1)
raise nbt.CorruptChunkError()
return chunk_data return chunk_data