diff --git a/bin/exemple b/bin/exemple index c07e0789cf1cb18f18a95e44808a9789daa12d4f..7cd334fa6cf0bfd17dee6c44d61cad93ebf9b433 100755 Binary files a/bin/exemple and b/bin/exemple differ diff --git a/obj/Image.o b/obj/Image.o index 15dbe813fdd69faa85466a622ccb65811a3b0601..1ce7b1bd5db495ef96bc5996ec230bad71a252c5 100644 Binary files a/obj/Image.o and b/obj/Image.o differ diff --git a/obj/Pixel.o b/obj/Pixel.o index 8eed7d4078e2c757ce563382473d46abd28b495b..3839cea553750c6cb1c34252662d704b1b20d0b8 100644 Binary files a/obj/Pixel.o and b/obj/Pixel.o differ diff --git a/obj/mainExemple.o b/obj/mainExemple.o index 125d4897cb5fba4a2a7561189020eb76fe710ef5..753f7d5357b5b3aac9a01f2ea222d63518a0d774 100644 Binary files a/obj/mainExemple.o and b/obj/mainExemple.o differ diff --git a/obj/mainTest.o b/obj/mainTest.o index 06c5667be4146558d888ea425046b07efcdb0755..4ae8b471ff3e2f394dc5a1180fe07e542c396e7f 100644 Binary files a/obj/mainTest.o and b/obj/mainTest.o differ diff --git a/src/Image.cpp b/src/Image.cpp index 95e1cb21e1b1e2182e90a457d497b087b90aa725..76ac1353b3b6d7adf67db3b7940c5db60c4bceeb 100644 --- a/src/Image.cpp +++ b/src/Image.cpp @@ -12,7 +12,7 @@ Image::Image() dimy = 0; } -Image::Image(int x, int y) +Image::Image(unsigned int x, unsigned int y) { assert (x>0 && y>0); @@ -30,14 +30,14 @@ Image::~Image() } -Pixel & Image::getPix(int x, int y) const +Pixel & Image::getPix(unsigned int x, unsigned int y) const { assert (x>=0 && y>=0); return tab[y*dimx+x];; } -Pixel Image::getPix2(int x, int y) const +Pixel Image::getPix2(unsigned int x, unsigned int y) const { assert (x>=0 && y>=0); @@ -46,14 +46,14 @@ Pixel Image::getPix2(int x, int y) const return ret; } -void Image::setPix(int x, int y, Pixel couleur) +void Image::setPix(unsigned int x, unsigned int y, Pixel couleur) { tab[y*dimx+x] = couleur; } -void Image::dessinerRectangle(int Xmin, int Ymin, int Xmax, int Ymax, Pixel couleur) +void Image::dessinerRectangle(unsigned Xmin, unsigned int Ymin, unsigned int Xmax, unsigned int Ymax, Pixel couleur) { - int i,j; + unsigned i,j; for(i=Xmin;i<Xmax;i++) { diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp index ccafd09e864adc3c877be5f4df82d3c35d5f368e..89d9f3db592b2dd3508f142a23cfced5561e5f3c 100644 --- a/src/ImageViewer.cpp +++ b/src/ImageViewer.cpp @@ -19,7 +19,7 @@ ImageViewer::ImageViewer() { m_surface = nullptr; m_texture = nullptr; - m_hasChanged = false; + //m_hasChanged = false; // Initialisation de la SDL cout << "SDL: init" << endl; @@ -74,7 +74,7 @@ ImageViewer::~ImageViewer() { m_surface = nullptr; m_texture = nullptr; - m_hasChanged = false; + // m_hasChanged = false; TTF_Quit(); SDL_FreeSurface(m_surface);