diff --git a/Makefile b/Makefile index 9e495aee336bc0938d63727df8898e7eddafedc5..8c4564f3a8b519adf94aaef465111d56ccd9f45e 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ obj/ImageViewer.o: src/ImageViewer.cpp src/ImageViewer.h src/Image.h obj/mainAffichage.o: src/mainAffichage.cpp src/ImageViewer.h src/Image.h g++ -g -Wall -c src/mainAffichage.cpp -o obj/mainAffichage.o - + doc: doc/doxyfile cd doc ; doxygen doxyfile diff --git a/src/Pixel.cpp b/src/Pixel.cpp index 522f7a5f7ae16cb1d10c7bb4957fada1355de99b..9433531367b90f7665e15ee3c2118a46f892a29b 100644 --- a/src/Pixel.cpp +++ b/src/Pixel.cpp @@ -9,14 +9,14 @@ Pixel::Pixel() b = 0; } -Pixel::Pixel(const unsigned int & x,const unsigned int & y, const unsigned int &z) +Pixel::Pixel(unsigned int nr, unsigned int ng, unsigned int nb) { - assert(x>=0 && x<=255); - assert(y>=0 && y<=255); - assert(z>=0 && z<=255); - r = char(x); - g = char(y); - b = char(z); + assert(nr>=0 && nr<=255); + assert(ng>=0 && ng<=255); + assert(nb>=0 && nb<=255); + r = char(nr); + g = char(ng); + b = char(nb); } diff --git a/src/Pixel.h b/src/Pixel.h index 29c03c645afd6886f0982298b078f79e20f9dfdd..132e3c01ac1c742227a58a1b94780f5fc67dd042 100644 --- a/src/Pixel.h +++ b/src/Pixel.h @@ -33,7 +33,7 @@ struct Pixel unsigned char b; ///< caractère non-signés représentant le niveau de bleu dans la couleur du Pixel. Pixel(); - Pixel(const unsigned int &ro, const unsigned int &ve, const unsigned int &bl); + Pixel(unsigned int nr, unsigned int ng, unsigned int nb); }; #endif \ No newline at end of file diff --git a/src/mainAffichage.cpp b/src/mainAffichage.cpp index 96f81f4523d0bedcbd70d18f245980e914a36d96..4a1d2f8d89933550e079c57fb7984f3eb656389e 100644 --- a/src/mainAffichage.cpp +++ b/src/mainAffichage.cpp @@ -20,9 +20,8 @@ int main (int argc, char** argv) image.setPix(7,8,noir); image.setPix(7,9,noir); ImageViewer imview; - imview.setSurfText(image); + //imview.setSurfText(image); imview.afficher(image); - //image.~Image(); return 0; } \ No newline at end of file