MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Morepretty

Browse source
This commit is contained in:
treeform 2022-02-11 20:11:01 -08:00
parent c2350c9642
commit 81b82e2277
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/pixie/fileformats/bmp.nim
View file

@ -28,9 +28,9 @@ proc decodeBmp*(data: string): Image {.raises: [PixieError].} =
height = data.readInt32(22).int height = data.readInt32(22).int
offset = data.readUInt32(10).int offset = data.readUInt32(10).int
# Default channels if header does not contain them: # Default channels if header does not contain them:
redChannel = 0x00FF0000.uint32 redChannel = 0x00FF0000.uint32
greenChannel = 0x0000FF00.uint32 greenChannel = 0x0000FF00.uint32
blueChannel = 0x000000FF.uint32 blueChannel = 0x000000FF.uint32
alphaChannel = 0xFF000000.uint32 alphaChannel = 0xFF000000.uint32
useAlpha = false useAlpha = false
flipVertical = false flipVertical = false
@ -75,7 +75,7 @@ proc decodeBmp*(data: string): Image {.raises: [PixieError].} =
if redChannel == 0 or greenChannel == 0 or if redChannel == 0 or greenChannel == 0 or
blueChannel == 0 or alphaChannel == 0: blueChannel == 0 or alphaChannel == 0:
raise newException(PixieError, "Unsupported 0 channel mask.") raise newException(PixieError, "Unsupported 0 channel mask.")
if bits notin [1, 4, 8, 32, 24]: if bits notin [1, 4, 8, 32, 24]:
raise newException(PixieError, "Unsupported BMP data format") raise newException(PixieError, "Unsupported BMP data format")
@ -177,7 +177,6 @@ proc decodeBmp*(data: string): Image {.raises: [PixieError].} =
result[x, result.height - y - 1] = rgba.rgbx() result[x, result.height - y - 1] = rgba.rgbx()
if bits == 32: if bits == 32:
for y in 0 ..< result.height: for y in 0 ..< result.height:
for x in 0 ..< result.width: for x in 0 ..< result.width:
if offset >= data.len - 2: if offset >= data.len - 2: