From 6bb663cc98281c7ea512036e60e0c1cfb7f43470 Mon Sep 17 00:00:00 2001
From: Jean-Marc <jeanmarc.vwalu@gmail.com>
Date: Thu, 20 Feb 2025 13:01:20 +0100
Subject: [PATCH] test reg5
---
Makefile | 2 +-
src/Pixel.cpp | 14 +++++++-------
src/Pixel.h | 2 +-
src/mainAffichage.cpp | 3 +--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 9e495ae..8c4564f 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 522f7a5..9433531 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 29c03c6..132e3c0 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 96f81f4..4a1d2f8 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
--
GitLab