diff --git a/bin/exemple b/bin/exemple index c02a4ab4d4404999462042b90bc597ed1a00dc43..4446f1829dc02c2a2a515a0e277c0db1ee180fed 100755 Binary files a/bin/exemple and b/bin/exemple differ diff --git a/obj/Image.o b/obj/Image.o index ae8a468286f2fca914dc37bed2b6db54df1e9839..cb32d5cf1382bc1ab6e6e0ae10b916e07477c19a 100644 Binary files a/obj/Image.o and b/obj/Image.o differ diff --git a/obj/Pixel.o b/obj/Pixel.o index f8a3ee9523a682cfb3f6506fe49cc73714fbe214..f10f3d33120c164902d4dc5d891ba6199ab6d909 100644 Binary files a/obj/Pixel.o and b/obj/Pixel.o differ diff --git a/obj/mainExemple.o b/obj/mainExemple.o index ea15320e8b3939923b40230993026f167ac8853f..fdcca1e2b3d1582797b3f8aec05b88ff5ac257cd 100644 Binary files a/obj/mainExemple.o and b/obj/mainExemple.o differ diff --git a/obj/mainTest.o b/obj/mainTest.o index 30a7469d2ac61cddce0d80e7112f876de4d48591..c864982fca0a0b82af7eee29ecb50a6f5d9a82b2 100644 Binary files a/obj/mainTest.o and b/obj/mainTest.o differ diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp index 6f57fe0add2a027b4eb8dfc927ada3fece626634..db7b5338be68e0daf372f91d5da09557eb7aa20b 100644 --- a/src/ImageViewer.cpp +++ b/src/ImageViewer.cpp @@ -86,11 +86,13 @@ ImageViewer::~ImageViewer() void ImageViewer::setSurfText(Image & im) { + /* Uint32 rmask, gmask, bmask, amask; rmask = 0xff000000; gmask = 0x00ff0000; bmask = 0x0000ff00; amask = 0x00000000; + */ //im.ouvrir("./data/image1.ppm"); diff --git a/src/Pixel.cpp b/src/Pixel.cpp index 2ad3783d75d19a44e029693e39545c6b2d3e95b2..92e306db739b03ee5ee5b1f66c1cc06608abcddc 100644 --- a/src/Pixel.cpp +++ b/src/Pixel.cpp @@ -4,9 +4,9 @@ Pixel::Pixel() { - r = 0; - g = 0; - b = 0; + r = char(0); + g = char(0); + b = char(0); } Pixel::Pixel(unsigned int x,unsigned int y, unsigned int z)