Merge pull request #38 from jangko/fix_test

add nimz test

.appveyor.yml

@@ -1,9 +1,9 @@
 version: '{build}'
 
 cache:
-- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -> .appveyor.yml
-- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -> .appveyor.yml
-- Nim -> .appveyor.yml
+ - x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z -> .appveyor.yml
+ - i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z -> .appveyor.yml
+ - Nim -> .appveyor.yml
 
 matrix:
   # We always want 32 and 64-bit compilation
@@ -17,13 +17,13 @@ install:
   - setlocal EnableExtensions EnableDelayedExpansion
 
   - IF "%PLATFORM%" == "x86" (
-      SET "MINGW_ARCHIVE=i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
-      SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
+      SET "MINGW_ARCHIVE=i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" &
+      SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z" &
       SET "MINGW_DIR=mingw32"
     ) ELSE (
       IF "%PLATFORM%" == "x64" (
-        SET "MINGW_ARCHIVE=x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
-        SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win64/Personal%%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
+        SET "MINGW_ARCHIVE=x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" &
+        SET "MINGW_URL=https://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win64/Personal%%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z" &
         SET "MINGW_DIR=mingw64"
       ) else (
         echo "Unknown platform"

nimPNG.nimble

@@ -1,19 +1,22 @@
 # Package
-version       = "0.2.5"
+version       = "0.2.6"
 author        = "Andri Lim"
 description   = "PNG encoder and decoder"
 license       = "MIT"
-skipDirs      = @["apng", "suite", "tester", "docs"]
+skipDirs      = @["tests", "docs"]
 
 # Deps
 requires "nim >= 0.19.0"
 
 task tests, "Run tests":
-  withDir("tester"):
-    exec "nim c -r test.nim"
-    exec "nim c -r testCodec.nim"
-    exec "nim c -r testSuite.nim"
-    
-    exec "nim c -r -d:release test.nim"
-    exec "nim c -r -d:release testCodec.nim"
-    exec "nim c -r -d:release testSuite.nim"
+  exec "nim c -r tests/test_apng.nim"
+  exec "nim c -r tests/test_codec.nim"
+  exec "nim c -r tests/test_suite.nim"
+  exec "nim c -r tests/test_nimz.nim"
+
+  exec "nim c -r -d:release tests/test_apng.nim"
+  exec "nim c -r -d:release tests/test_codec.nim"
+  exec "nim c -r -d:release tests/test_suite.nim"
+  exec "nim c -r -d:release tests/test_nimz.nim"
+
+  exec "nim c -r --gc:arc -d:release tests/test_nimz.nim"

nimPNG/nimz.nim

@@ -1221,6 +1221,9 @@ proc nzDeflateInit*(input: string): nzStream =
   nz.mode = nzsDeflate
   result = nz
 
+template nzCompressInit*(input: string): nzStream =
+  nzDeflateInit(input)
+
 proc nzInflateInit*(input: string): nzStream =
   var nz = nzInit()
   nz.data = newStringOfCap(1024 * 1024 * 5) # Allocate 5MB in advance
@@ -1230,6 +1233,9 @@ proc nzInflateInit*(input: string): nzStream =
   nz.mode = nzsInflate
   result = nz
 
+template nzDecompressInit*(input: string): nzStream =
+  nzInflateInit(input)
+
 proc nzGetResult(nz: nzStream): string =
   if nz.mode == nzsInflate: return nz.data
   result = nz.bits.data

tester/nim.cfg

@@ -1 +0,0 @@
---path:".."