diff options
Diffstat (limited to 'src/img')
| -rw-r--r-- | src/img/bitmap.nim | 6 | ||||
| -rw-r--r-- | src/img/painter.nim | 6 | ||||
| -rw-r--r-- | src/img/png.nim | 506 |
3 files changed, 6 insertions, 512 deletions
diff --git a/src/img/bitmap.nim b/src/img/bitmap.nim index 9f9b3401..a186b47f 100644 --- a/src/img/bitmap.nim +++ b/src/img/bitmap.nim @@ -8,7 +8,11 @@ type ImageBitmap* = ref object of Bitmap -proc newBitmap*(width, height: uint64): Bitmap = + NetworkBitmap* = ref object of Bitmap + outputId*: int + imageId*: int + +proc newBitmap*(width, height: uint64): ImageBitmap = return ImageBitmap( px: newSeq[ARGBColor](width * height), width: width, diff --git a/src/img/painter.nim b/src/img/painter.nim index a9848d7d..d02f3602 100644 --- a/src/img/painter.nim +++ b/src/img/painter.nim @@ -4,7 +4,6 @@ import std/unicode import css/cssvalues import img/bitmap import img/path -import img/png import types/color import types/line import types/vector @@ -139,15 +138,12 @@ proc clearRect*(bmp: Bitmap; x0, x1, y0, y1: uint64) = proc clear*(bmp: Bitmap) = bmp.clearRect(0, bmp.width, 0, bmp.height) -const unifont = readFile"res/unifont_jp-15.0.05.png" -var unifontBitmap: Bitmap +var unifontBitmap*: Bitmap = nil var glyphCache: seq[tuple[u: uint32, bmp: Bitmap]] var glyphCacheI = 0 proc getCharBmp(u: uint32): Bitmap = # We only have the BMP. let u = if u <= 0xFFFF: u else: 0xFFFD - if unifontBitmap == nil: - unifontBitmap = fromPNG(toOpenArrayByte(unifont, 0, unifont.high)) for (cu, bmp) in glyphCache: if cu == u: return bmp diff --git a/src/img/png.nim b/src/img/png.nim deleted file mode 100644 index 667b589f..00000000 --- a/src/img/png.nim +++ /dev/null @@ -1,506 +0,0 @@ -import bindings/zlib -import img/bitmap -import types/color -import utils/endians - -type PNGWriter = object - buf: pointer - i: int - outlen: int - -func pngInt(i: uint32): auto = - doAssert i < 0x80000000u32 - return i.toBytesBE() - -func oq(writer: PNGWriter): ptr UncheckedArray[uint8] = - cast[ptr UncheckedArray[uint8]](writer.buf) - -proc writeStr[T](writer: var PNGWriter; s: T) = - if writer.outlen < writer.i + s.len: - writer.outlen = writer.i + s.len - writer.buf = realloc(writer.buf, writer.outlen) - copyMem(addr writer.oq[writer.i], unsafeAddr s[0], s.len) - writer.i += s.len - -proc writeInt(writer: var PNGWriter; i: uint32) = - writer.writeStr(i.toBytesBE()) - -proc writePngInt(writer: var PNGWriter; i: uint32) = - doAssert i < 0x80000000u32 - writer.writeInt(i) - -proc writeChunk[T](writer: var PNGWriter; t: string; data: T) = - var crc = uint32(crc32(0, cast[ptr uint8](unsafeAddr t[0]), cuint(t.len))) - if data.len > 0: - crc = uint32(crc32(crc, cast[ptr uint8](unsafeAddr data[0]), - cuint(data.len))) - writer.writePngInt(uint32(data.len)) - writer.writeStr(t) - if data.len > 0: - writer.writeStr(data) - writer.writeInt(uint32(crc)) - -type PNGColorType {.size: sizeof(uint8).} = enum - pcGrayscale = 0 - pcTrueColor = 2 - pcIndexedColor = 3 - pcGrayscaleWithAlpha = 4 - pcTrueColorWithAlpha = 6 - -const PNGSignature = "\x89PNG\r\n\x1A\n" -proc writeIHDR(writer: var PNGWriter; width, height: uint32; - bitDepth: uint8; colorType: PNGColorType; - compressionMethod, filterMethod, interlaceMethod: uint8) = - writer.writeStr(PNGSignature) - var ihdr {.noinit.}: array[13, uint8] - var pw = pngInt(width) - var ph = pngInt(height) - copyMem(addr ihdr[0], addr pw[0], 4) - copyMem(addr ihdr[4], addr ph[0], 4) - ihdr[8] = bitDepth - ihdr[9] = uint8(colorType) - ihdr[10] = compressionMethod - ihdr[11] = filterMethod - ihdr[12] = interlaceMethod - writer.writeChunk("IHDR", ihdr) - -proc writeIDAT(writer: var PNGWriter; bmp: Bitmap) = - #TODO smaller idat chunks - # +1 height for filter - var idat = newSeq[uint8]((bmp.width + 1) * bmp.height * 4) - var j = 0 # idat pointer - for k in 0 ..< bmp.px.len: - if k mod int(bmp.width) == 0: - # begin row - # For now, filter is always 0. TODO implement other filters - inc j - let p = bmp.px[k] - idat[j] = uint8(p.r) - idat[j + 1] = uint8(p.g) - idat[j + 2] = uint8(p.b) - idat[j + 3] = uint8(p.a) - j += 4 - var hlen = compressBound(culong(idat.len)) - var oidat = newSeq[uint8](int(hlen)) - let res = compress(addr oidat[0], addr hlen, addr idat[0], culong(idat.len)) - doAssert res == Z_OK #TODO error handling... - oidat.setLen(int(hlen)) - writer.writeChunk("IDAT", oidat) - -proc toPNG*(bmp: Bitmap; outlen: var int): pointer = - var writer = PNGWriter( - buf: alloc(PNGSignature.len), - outlen: PNGSignature.len - ) - writer.writeIHDR(uint32(bmp.width), uint32(bmp.height), 8, - pcTrueColorWithAlpha, 0, 0, 0) - writer.writeIDAT(bmp) - writer.writeChunk("IEND", "") - outlen = writer.outlen - return writer.buf - -type PNGReader = object - bmp: Bitmap - iq: ptr UncheckedArray[uint8] - limit: int - i: int - bitDepth: uint8 - colorType: PNGColorType - background: ARGBColor - isend: bool - idatBuf: seq[uint8] - uprow: seq[uint8] - idatAt: int - hasstrm: bool - strm: z_stream - strmend: bool - atline: int - plteseen: bool - palette: seq[ARGBColor] - trns: ARGBColor - -func width(reader: PNGReader): int {.inline.} = int(reader.bmp.width) - -func height(reader: PNGReader): int {.inline.} = int(reader.bmp.height) - -func spp(reader: PNGReader): int = - case reader.colorType - of pcTrueColor: return 3 - of pcGrayscale: return 1 - of pcIndexedColor: return 1 - of pcGrayscaleWithAlpha: return 2 - of pcTrueColorWithAlpha: return 4 - -func scanlen(reader: PNGReader): int {.inline.} = - return 1 + (reader.width * reader.spp * int(reader.bitDepth) + 7) div 8 - -proc handleError(reader: var PNGReader; msg: string) = - #TODO proper error handling? - stderr.write(msg & "\n") - reader.bmp = nil - if reader.hasstrm: - discard inflateEnd(addr reader.strm) - -template err(reader: var PNGReader; msg: string) = - reader.handleError(msg) - return - -template readStr(reader: var PNGReader; L: int): string = - if reader.i + L > reader.limit: - reader.err "too short" - var s = newString(L) - copyMem(addr s[0], addr reader.iq[reader.i], L) - reader.i += L - s - -template readU8(reader: var PNGReader): uint8 = - if reader.i >= reader.limit: - reader.err "too short" - let x = reader.iq[reader.i] - inc reader.i - x - -template readU32(reader: var PNGReader): uint32 = - if reader.i + 4 > reader.limit: - reader.err "too short" - let x = fromBytesBEu32(toOpenArray(reader.iq, reader.i, reader.i + 3)) - reader.i += 4 - x - -template readPNGInt(reader: var PNGReader): uint32 = - let x = reader.readU32() - if x >= 0x80000000u32: - reader.err "int too large" - x - -template readColorType(reader: var PNGReader): PNGColorType = - case reader.readU8() - of 0u8: pcGrayscale - of 2u8: pcTrueColor - of 3u8: pcIndexedColor - of 4u8: pcGrayscaleWithAlpha - of 6u8: pcTrueColorWithAlpha - else: reader.err "unknown color type" - -func bitDepthValid(colorType: PNGColorType; bitDepth: uint8): bool = - case colorType - of pcGrayscale: - return int(bitDepth) in [1, 2, 4, 8, 16] - of pcIndexedColor: - return int(bitDepth) in [1, 2, 4, 8] - of pcTrueColor, pcGrayscaleWithAlpha, pcTrueColorWithAlpha: - return int(bitDepth) in [8, 16] - -proc readIHDR(reader: var PNGReader) = - if reader.readStr(PNGSignature.len) != PNGSignature: - reader.err "wrong signature" - if reader.readPNGInt() != 13: - reader.err "invalid header length" - if reader.readStr(4) != "IHDR": - reader.err "invalid header chunk" - let width = reader.readPNGInt() - let height = reader.readPNGInt() - reader.bitDepth = reader.readU8() - reader.colorType = reader.readColorType() - if not bitDepthValid(reader.colorType, reader.bitDepth): - reader.err "invalid bit depth" - let compressionMethod = reader.readU8() - if compressionMethod != 0: - reader.err "unknown compression method" - let filterMethod = reader.readU8() - if filterMethod != 0: - reader.err "unknown filter method" - let interlaceMethod = reader.readU8() - if interlaceMethod != 0: - reader.err "unknown interlace method" - let crc = crc32(0, addr reader.iq[reader.i - 17], 17) - if uint32(crc) != reader.readU32(): reader.err "wrong crc" - reader.bmp = newBitmap(width, height) - -proc readbKGD(reader: var PNGReader) = - case reader.colorType - of pcGrayscale, pcGrayscaleWithAlpha: - # We can't really use bit depth > 8 - discard reader.readU8() - reader.background = gray(reader.readU8()) - of pcTrueColor, pcTrueColorWithAlpha: - discard reader.readU8() - let r = reader.readU8() - discard reader.readU8() - let g = reader.readU8() - discard reader.readU8() - let b = reader.readU8() - reader.background = rgb(r, g, b) - of pcIndexedColor: - let i = int(reader.readU8()) - if i >= reader.palette.len: - reader.err "invalid palette index" - reader.background = reader.palette[i] - -proc readtRNS(reader: var PNGReader) = - case reader.colorType - of pcGrayscale, pcGrayscaleWithAlpha: - # We can't really use bit depth > 8 - discard reader.readU8() - reader.trns = gray(reader.readU8()) - of pcTrueColor, pcTrueColorWithAlpha: - discard reader.readU8() - let r = reader.readU8() - discard reader.readU8() - let g = reader.readU8() - discard reader.readU8() - let b = reader.readU8() - reader.trns = rgb(r, g, b) - of pcIndexedColor: - if reader.limit - reader.i > reader.palette.len: - reader.err "too many trns values" - for c in reader.palette.mitems: - if reader.i >= reader.limit: - break - c.a = reader.readU8() - -func paethPredictor(a, b, c: uint8): uint8 = - let pa0 = int(b) - int(c) - let pb0 = int(a) - int(c) - let pa = abs(pa0) - let pb = abs(pb0) - let pc = abs(pa0 + pb0) - return if pa <= pb and pa <= pc: a elif pb <= pc: b else: c - -proc unfilter(reader: var PNGReader; irow: openArray[uint8]; bpp: int) = - case irow[0] - of 0u8: # none - copyMem(addr reader.uprow[0], unsafeAddr irow[1], irow.len - 1) - of 1u8: # sub - for i in 1 ..< irow.len: - let j = i - 1 # skip filter byte - let aidx = j - bpp - let x = irow[i] - let a = if aidx >= 0: reader.uprow[aidx] else: 0u8 - reader.uprow[j] = x + a - of 2u8: # up - for i in 1 ..< irow.len: - let j = i - 1 # skip filter byte - let x = irow[i] - let b = reader.uprow[j] - reader.uprow[j] = x + b - of 3u8: # average - for i in 1 ..< irow.len: - let j = i - 1 # skip filter byte - let aidx = j - bpp - let x = irow[i] - let a = if aidx >= 0: reader.uprow[aidx] else: 0u8 - let b = reader.uprow[j] - reader.uprow[j] = x + uint8((uint16(a) + uint16(b)) div 2) - of 4u8: # paeth - var cmap: array[8, uint8] # max bpp is 16 bit with true color = 4 * 2 - var k = 0 - for i in 1 ..< irow.len: - let j = i - 1 # skip filter byte - let aidx = j - bpp - let x = irow[i] - let a = if aidx >= 0: reader.uprow[aidx] else: 0u8 - let b = reader.uprow[j] - let kk = k mod bpp - let c = cmap[kk] - cmap[kk] = b - reader.uprow[j] = x + paethPredictor(a, b, c) - inc k - else: - reader.err "got invalid filter" - -proc writepxs(reader: var PNGReader; crow: var openArray[ARGBColor]) = - case reader.colorType - of pcGrayscale: - var i = 0 - var j = 0 - for x in 0 ..< crow.len: - let u = reader.uprow[i] - let n = case reader.bitDepth - of 1: ((u shr (7 - j)) and 0x1) * 255 - of 2: ((u shr (6 - j)) and 0x3) * 85 - of 4: ((u shr (4 - j)) and 0xF) * 17 - of 8: u - of 16: u # we ignore the lower 8 bits. - else: 0 - j += int(reader.bitDepth) - i += j div 8 - j = j mod 8 - crow[x] = rgba(n, n, n, 255u8) - of pcTrueColor: - let step = int(reader.bitDepth) div 8 - var i = 0 - for x in 0 ..< crow.len: - let r = reader.uprow[i] - i += step - let g = reader.uprow[i] - i += step - let b = reader.uprow[i] - i += step - crow[x] = rgba(r, g, b, 255u8) - of pcIndexedColor: - var i = 0 - var j = 0 - for x in 0 ..< crow.len: - let u = reader.uprow[i] - let n = case reader.bitDepth - of 1: ((u shr (7 - j)) and 0x1) - of 2: ((u shr (6 - j)) and 0x3) - of 4: ((u shr (4 - j)) and 0xF) - of 8: u - else: 0 - j += int(reader.bitDepth) - i += j div 8 - j = j mod 8 - if unlikely(int(n) >= reader.palette.len): - reader.err "invalid palette index" - crow[x] = reader.palette[n] - of pcGrayscaleWithAlpha: - let step = int(reader.bitDepth) div 8 - var i = 0 - for x in 0 ..< crow.len: - let n = reader.uprow[i] - i += step - let a = reader.uprow[i] - i += step - crow[x] = rgba(n, n, n, a) - of pcTrueColorWithAlpha: - let step = int(reader.bitDepth) div 8 - var i = 0 - for x in 0 ..< crow.len: - let r = reader.uprow[i] - i += step - let g = reader.uprow[i] - i += step - let b = reader.uprow[i] - i += step - let a = reader.uprow[i] - i += step - crow[x] = rgba(r, g, b, a) - -proc readPLTE(reader: var PNGReader) = - # For non-indexed-color, palette is just a suggestion for quantization. - #TODO support this in term - const CanHavePLTE = {pcTrueColor, pcIndexedColor, pcTrueColorWithAlpha} - if reader.plteseen: - reader.err "too many PLTE chunks" - if reader.colorType notin CanHavePLTE: - reader.err "unexpected PLTE chunk for color type" - let len = reader.limit - reader.i - if len mod 3 != 0: - reader.err "palette length not divisible by 3" - reader.palette = newSeq[ARGBColor](len div 3) - for c in reader.palette.mitems: - let r = reader.readU8() - let g = reader.readU8() - let b = reader.readU8() - c = rgba(r, g, b, 255) - reader.plteseen = true - -proc readIDAT(reader: var PNGReader) = - if reader.idatAt == reader.idatBuf.len: - reader.err "idat buffer already filled" - if reader.strmend: - reader.err "stream already ended" - if reader.colorType == pcIndexedColor and not reader.plteseen: - reader.err "palette expected for indexed color" - reader.strm.avail_in = cuint(reader.limit - reader.i) - reader.strm.next_in = addr reader.iq[reader.i] - let olen = reader.idatBuf.len - reader.idatAt - reader.strm.avail_out = cuint(olen) - reader.strm.next_out = addr reader.idatBuf[reader.idatAt] - let res = inflate(addr reader.strm, Z_NO_FLUSH) - if res == Z_STREAM_ERROR: - if reader.strm.msg != nil: - reader.err "zstream error: " & $reader.strm.msg - else: - reader.err "unknown zstream error" - case res - of Z_NEED_DICT, Z_DATA_ERROR, Z_MEM_ERROR, Z_BUF_ERROR: - # Z_BUF_ERROR is fatal here, as outlen is at least as large as idat. - reader.err "error decompressing idat stream" - of Z_STREAM_END: - reader.strmend = true - of Z_OK: - if reader.strm.avail_out == 0: - reader.err "not enough space for output; is width or height wrong?" - else: doAssert false - reader.idatAt = int(reader.strm.total_out) - reader.i = reader.limit - let maxline = reader.idatAt div int(reader.scanlen) - let bmp = reader.bmp - let bps = if reader.bitDepth <= 8: 1 else: 2 # else 16 bit - let bpp = bps * reader.spp - let sl = int(reader.scanlen) - for y in reader.atline ..< maxline: - let yi = y * sl - assert yi + sl - 1 < reader.idatAt - reader.unfilter(reader.idatBuf.toOpenArray(yi, yi + sl - 1), bpp) - if unlikely(reader.bmp == nil): return - let yj = y * reader.width - reader.writepxs(bmp.px.toOpenArray(yj, yj + reader.width - 1)) - -proc readIEND(reader: var PNGReader) = - if reader.i < reader.limit: - reader.err "IEND too long" - reader.isend = true - -proc readUnknown(reader: var PNGReader; s: string) = - if (int(s[0]) and 0x20) == 0: - reader.err "unrecognized critical chunk " & s - #else: eprint "warning: unknown chunk " & s #debug - reader.i = reader.limit - -proc zlibAlloc(opaque: pointer; items: cuint; size: cuint): pointer {.cdecl.} = - return alloc(items * size) - -proc zlibFree(opaque: pointer; address: pointer) {.cdecl.} = - dealloc(address) - -proc initZStream(reader: var PNGReader) = - reader.idatBuf = newSeq[uint8](reader.scanlen * reader.height) - reader.uprow = newSeq[uint8](reader.scanlen) - reader.strm = z_stream( - zalloc: zlibAlloc, - zfree: zlibFree - ) - let ret = inflateInit(addr reader.strm) - if ret != Z_OK: - reader.err "failed to init inflate: " & $ret - reader.hasstrm = true - -proc fromPNG*(iq: openArray[uint8]): Bitmap = - if iq.len == 0: return - var reader = PNGReader( - iq: cast[ptr UncheckedArray[uint8]](unsafeAddr iq[0]), - limit: iq.len - ) - reader.readIHDR() - if reader.bmp == nil: return - if reader.width == 0 or reader.height == 0: - reader.err "invalid zero sized png" - reader.initZStream() - while reader.i < iq.len and not reader.isend: - let len = int(reader.readPNGInt()) - if reader.i + len > iq.len: - reader.err "chunk too long" - let j = reader.i - let t = reader.readStr(4) - reader.limit = reader.i + len - case t - of "IHDR": reader.err "IHDR expected to be first chunk" - of "PLTE": reader.readPLTE() - of "IDAT": reader.readIDAT() - of "IEND": reader.readIEND() - of "bKGD": reader.readbKGD() - of "tRNS": reader.readtRNS() - else: reader.readUnknown(t) - if reader.bmp == nil: return - let crc = crc32(0, unsafeAddr iq[j], cuint(len + 4)) - reader.limit = iq.len - let y = reader.readU32() - if uint32(crc) != y: - reader.err "wrong crc" - if not reader.isend: - reader.err "IEND not found" - return reader.bmp |