From 7f66b5ebc88936db974e3320d77c7ec9d4ab85e6 Mon Sep 17 00:00:00 2001 From: bptato Date: Thu, 20 Jun 2024 21:28:23 +0200 Subject: img: use stb_image, drop zlib as dependency Now we have decoders for gif, jpeg, bmp. Also, the in-house PNG decoder has been replaced in favor of the stbi implementation; this means we no longer depend on zlib, since stbi comes with a built in inflate implementation. --- src/img/bitmap.nim | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/img/bitmap.nim') diff --git a/src/img/bitmap.nim b/src/img/bitmap.nim index a186b47f..70244643 100644 --- a/src/img/bitmap.nim +++ b/src/img/bitmap.nim @@ -2,7 +2,7 @@ import types/color type Bitmap* = ref object of RootObj - px*: seq[ARGBColor] + px*: seq[RGBAColorBE] width*: uint64 height*: uint64 @@ -14,19 +14,25 @@ type proc newBitmap*(width, height: uint64): ImageBitmap = return ImageBitmap( - px: newSeq[ARGBColor](width * height), + px: newSeq[RGBAColorBE](width * height), width: width, height: height ) -proc setpx*(bmp: Bitmap; x, y: uint64; color: ARGBColor) {.inline.} = +proc setpx*(bmp: Bitmap; x, y: uint64; color: RGBAColorBE) {.inline.} = bmp.px[bmp.width * y + x] = color -proc getpx*(bmp: Bitmap; x, y: uint64): ARGBColor {.inline.} = +proc setpx*(bmp: Bitmap; x, y: uint64; color: ARGBColor) {.inline.} = + bmp.px[bmp.width * y + x] = rgba_be(color.r, color.g, color.b, color.a) + +proc getpx*(bmp: Bitmap; x, y: uint64): RGBAColorBE {.inline.} = return bmp.px[bmp.width * y + x] -proc setpxb*(bmp: Bitmap; x, y: uint64; color: ARGBColor) {.inline.} = - if color.a == 255: - bmp.setpx(x, y, color) +proc setpxb*(bmp: Bitmap; x, y: uint64; c: RGBAColorBE) {.inline.} = + if c.a == 255: + bmp.setpx(x, y, c) else: - bmp.setpx(x, y, bmp.getpx(x, y).blend(color)) + bmp.setpx(x, y, bmp.getpx(x, y).blend(c)) + +proc setpxb*(bmp: Bitmap; x, y: uint64; c: ARGBColor) {.inline.} = + bmp.setpxb(x, y, rgba_be(c.r, c.g, c.b, c.a)) -- cgit 1.4.1-2-gfad0