Merge pull request #36 from cobaltgit/stb_image

Migrate fbscreenshot/display from nimPNG to stb_image

Author: cobaltgit

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "modules/third-party/stb"]
+	path = modules/third-party/stb
+	url = https://github.com/nothings/stb
 [submodule "third-party/dropbear"]
 	path = modules/third-party/dropbear
 	url = https://github.com/mkj/dropbear

modules/third-party/stb

@@ -7,7 +7,6 @@ license        = "GPL-3.0"
 srcDir         = "src"
 
 requires "nim >= 2.0.0"
-requires "nimPNG >= 0.3.1"
 
 const Root = getCurrentDir()
 const BinDir = Root / "dist" / "System" / "bin"

quark.nimble

@@ -1,5 +1,5 @@
 import std/posix
-import nimPNG
+import ffi/stb/stb_image
 
 const
   FbWidth* = 240
@@ -66,4 +66,11 @@ proc fbscreenshot*(fbMap: pointer, output: string) =
       rotatedPixels[dstIdx + 2] = FiveToEight[b]
       rotatedPixels[dstIdx + 3] = 255
 
-  discard savePNG32(output, rotatedPixels, FbHeight, FbWidth)
+  discard stbi_write_png(
+    cstring(output),
+    cint(FbHeight),
+    cint(FbWidth),
+    cint(4),
+    addr rotatedPixels[0],
+    cint(FbHeight * 4)
+  )

src/common/fb.nim

@@ -0,0 +1,33 @@
+import std/os
+
+const StbDir = currentSourcePath().splitPath().head /
+  ".." / ".." / ".." / ".." /
+  "modules" / "third-party" / "stb"
+
+{.passC: "-O3 -I" & StbDir.}
+
+{.emit: """
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include "stb_image.h"
+#include "stb_image_write.h"
+""".}
+
+proc stbi_load*(
+  filename: cstring,
+  x: ptr cint,
+  y: ptr cint,
+  channels_in_file: ptr cint,
+  desired_channels: cint
+): ptr uint8 {.importc, header: StbDir / "stb_image.h".}
+
+proc stbi_write_png*(
+  filename: cstring,
+  w: cint,
+  h: cint,
+  comp: cint,
+  data: pointer,
+  stride_in_bytes: cint
+): cint {.importc, header: StbDir / "stb_image_write.h".}
+
+proc stbi_image_free*(data: pointer) {.importc, header: StbDir / "stb_image.h".}

src/common/ffi/stb/stb_image.nim

@@ -1,31 +1,39 @@
 import std/os
 
-{.compile: "stb_truetype.c".}
-{.passC: "-I" & currentSourcePath().splitPath().head.}
+const StbDir = currentSourcePath().splitPath().head /
+  ".." / ".." / ".." / ".." /
+  "modules" / "third-party" / "stb"
+
+{.passC: "-O3 -I" & StbDir.}
+
+{.emit: """
+#define STB_TRUETYPE_IMPLEMENTATION
+#include "stb_truetype.h"
+""".}
 
 type
-  stbtt_fontinfo* {.importc, header: "stb_truetype.h".} = object
+  stbtt_fontinfo* {.importc, header: StbDir / "stb_truetype.h".} = object
 
 proc stbtt_InitFont*(info: ptr stbtt_fontinfo, data: ptr UncheckedArray[byte], offset: cint): cint
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_ScaleForPixelHeight*(info: ptr stbtt_fontinfo, pixels: cfloat): cfloat
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_GetFontVMetrics*(info: ptr stbtt_fontinfo, ascent, descent, lineGap: ptr cint)
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_GetCodepointBitmapBox*(info: ptr stbtt_fontinfo, codepoint: cint,
   scale_x, scale_y: cfloat, ix0, iy0, ix1, iy1: ptr cint)
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_MakeCodepointBitmap*(info: ptr stbtt_fontinfo, output: ptr UncheckedArray[byte],
   out_w, out_h, out_stride: cint, scale_x, scale_y: cfloat, codepoint: cint)
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_GetCodepointHMetrics*(info: ptr stbtt_fontinfo, codepoint: cint,
   advanceWidth, leftSideBearing: ptr cint)
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}
 
 proc stbtt_GetCodepointKernAdvance*(info: ptr stbtt_fontinfo, ch1, ch2: cint): cint
-  {.importc, header: "stb_truetype.h".}
+  {.importc, header: StbDir / "stb_truetype.h".}