diff --git a/build_linux64/libamscppimglib4.linux64.a b/build_linux64/libamscppimglib4.linux64.a index 2896382..c18cf65 100644 Binary files a/build_linux64/libamscppimglib4.linux64.a and b/build_linux64/libamscppimglib4.linux64.a differ diff --git a/build_linux64/objstore/amscppimglib4_amsimage.o b/build_linux64/objstore/amscppimglib4_amsimage.o index b5f9485..3e66396 100644 Binary files a/build_linux64/objstore/amscppimglib4_amsimage.o and b/build_linux64/objstore/amscppimglib4_amsimage.o differ diff --git a/build_linux64/objstore/amscppimglib4_tests.o b/build_linux64/objstore/amscppimglib4_tests.o index de569d8..0fc9a97 100644 Binary files a/build_linux64/objstore/amscppimglib4_tests.o and b/build_linux64/objstore/amscppimglib4_tests.o differ diff --git a/build_linux64/tests b/build_linux64/tests index 7a6c8cc..61411a9 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/src/amscppimglib4/amscppimglib4_amsimage.cpp b/src/amscppimglib4/amscppimglib4_amsimage.cpp index 934dd9f..e02f3a6 100644 --- a/src/amscppimglib4/amscppimglib4_amsimage.cpp +++ b/src/amscppimglib4/amscppimglib4_amsimage.cpp @@ -562,8 +562,8 @@ namespace ams for(I=I0;INx; - Iy = I0/img->Ny; + Ix = I%img->Nx; + Iy = I/img->Nx; img->data[0 + 4*(Ix + img->Nx*Iy)] = color.R; img->data[1 + 4*(Ix + img->Nx*Iy)] = color.G; diff --git a/src/amscppimglib4/amscppimglib4_tests.cpp b/src/amscppimglib4/amscppimglib4_tests.cpp index 0e00d3c..62fdbf0 100644 --- a/src/amscppimglib4/amscppimglib4_tests.cpp +++ b/src/amscppimglib4/amscppimglib4_tests.cpp @@ -46,6 +46,21 @@ namespace ams sprintf(fname2,"../testimg/test_transpose.png"); write_image(fname2,&img2); + img2 = img; + img2.resize(img.Nx/2,img.Ny/2); + sprintf(fname2,"../testimg/test_resize.png"); + write_image(fname2,&img2); + + img2 = img; + img2.resize(img.Nx*2,img.Ny*2); + sprintf(fname2,"../testimg/test_resize2.png"); + write_image(fname2,&img2); + + img2.resize(200,100); + img2.setall(amspixel(0,255,0,255)); + sprintf(fname2,"../testimg/test_green.png"); + write_image(fname2,&img2); + return; diff --git a/testimg/test_green.png b/testimg/test_green.png new file mode 100644 index 0000000..10ea146 Binary files /dev/null and b/testimg/test_green.png differ diff --git a/testimg/test_resize.png b/testimg/test_resize.png new file mode 100644 index 0000000..8eba59e Binary files /dev/null and b/testimg/test_resize.png differ diff --git a/testimg/test_resize2.png b/testimg/test_resize2.png new file mode 100644 index 0000000..bb632d6 Binary files /dev/null and b/testimg/test_resize2.png differ