From 9a0aae3bbb6b5cbdded45cc5c1163ac6f03ab11e Mon Sep 17 00:00:00 2001 From: z-kk Date: Tue, 28 Jun 2022 21:46:56 +0900 Subject: [PATCH 1/4] fix for nim 1.2.0 --- src/png.nim | 6 +++--- tests/testSigMatch.nim | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/png.nim b/src/png.nim index 4021410..dc7ab6c 100644 --- a/src/png.nim +++ b/src/png.nim @@ -492,7 +492,7 @@ proc png_handle_as_unknown*(png_ptr: png_structp; chunk_name: png_bytep): cint { cdecl, importc: "png_handle_as_unknown", dynlib: pnglib.} proc png_image_begin_read_from_file*(image: png_imagep; file_name: cstring): cint {. cdecl, importc: "png_image_begin_read_from_file", dynlib: pnglib.} -proc png_image_begin_read_from_stdio*(image: png_imagep; file: TFile): cint {. +proc png_image_begin_read_from_stdio*(image: png_imagep; file: File): cint {. cdecl, importc: "png_image_begin_read_from_stdio", dynlib: pnglib.} proc png_image_begin_read_from_memory*(image: png_imagep; memory: png_const_voidp; size: png_size_t): cint {. @@ -507,13 +507,13 @@ proc png_image_write_to_file*(image: png_imagep; file: cstring; convert_to_8bit: cint; buffer: pointer; row_stride: png_int_32; colormap: pointer): cint {. cdecl, importc: "png_image_write_to_file", dynlib: pnglib.} -proc png_image_write_to_stdio*(image: png_imagep; file: TFile; +proc png_image_write_to_stdio*(image: png_imagep; file: File; convert_to_8_bit: cint; buffer: pointer; row_stride: png_int_32; colormap: pointer): cint {. cdecl, importc: "png_image_write_to_stdio", dynlib: pnglib.} proc png_info_init_3*(info_ptr: png_infopp; png_info_struct_size: png_size_t) {. cdecl, importc: "png_info_init_3", dynlib: pnglib.} -proc png_init_io*(png_ptr: png_structp; fp: TFile) {.cdecl, +proc png_init_io*(png_ptr: png_structp; fp: File) {.cdecl, importc: "png_init_io", dynlib: pnglib.} proc png_longjmp*(png_ptr: png_structp; val: cint) {.cdecl, importc: "png_longjmp", dynlib: pnglib.} diff --git a/tests/testSigMatch.nim b/tests/testSigMatch.nim index 755d11d..7ee1dc1 100644 --- a/tests/testSigMatch.nim +++ b/tests/testSigMatch.nim @@ -1,9 +1,9 @@ import png proc testOwl(): bool = - var image = Open("OwlAlpha.png") + var image = open("tests/OwlAlpha.png") var header: array[0..7, int8] discard readBytes(image, header, 0, 8) - var is_png = png_sig_cmp(cast[ptr cuchar](header), 0, 8) + var is_png = png_sig_cmp(header[0].addr, 0, 8) result = is_png == 0 when isMainModule: var testRes = testOwl() From c3abdc1746980048dac69648bdd9a5b0c21af737 Mon Sep 17 00:00:00 2001 From: z-kk Date: Tue, 28 Jun 2022 21:47:21 +0900 Subject: [PATCH 2/4] fix warning --- src/png.nim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/png.nim b/src/png.nim index dc7ab6c..96b83ed 100644 --- a/src/png.nim +++ b/src/png.nim @@ -69,7 +69,7 @@ type png_const_structp = ptr png_struct png_structpp = ptr ptr png_struct png_const_charp = cstring - png_byte = cuchar + png_byte = int8 png_bytep = ptr png_byte png_const_bytep = ptr png_byte png_bytepp = ptr ptr png_byte @@ -95,8 +95,8 @@ type alpha*: png_byte png_color_8p = ptr png_color_8 png_color_8pp = ptr ptr png_color_8 - png_alloc_size_t = csize - png_size_t = csize + png_alloc_size_t = csize_t + png_size_t = csize_t png_voidp = pointer png_const_voidp = pointer png_uint_16 = uint16 From 2493ca3a94d8344bdd93b1aff47407f425b0354f Mon Sep 17 00:00:00 2001 From: z-kk Date: Tue, 28 Jun 2022 21:48:06 +0900 Subject: [PATCH 3/4] nimble test usable --- tests/config.nims | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/config.nims diff --git a/tests/config.nims b/tests/config.nims new file mode 100644 index 0000000..3bb69f8 --- /dev/null +++ b/tests/config.nims @@ -0,0 +1 @@ +switch("path", "$projectDir/../src") \ No newline at end of file From 4177d47af7087138aac7e7953db553dded8f3af6 Mon Sep 17 00:00:00 2001 From: z-kk Date: Tue, 28 Jun 2022 21:48:48 +0900 Subject: [PATCH 4/4] update version --- png.nimble | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/png.nimble b/png.nimble index ff8f3e1..592eeab 100644 --- a/png.nimble +++ b/png.nimble @@ -1,12 +1,12 @@ # Package -version = "0.2.2" +version = "0.3.0" author = "Charles Barto" description = "Wrapper around the libpng library for png graphics" license = "MIT" # Dependencies -requires "nim >= 0.17.2" +requires "nim >= 1.2.0" srcDir = "src"