modifs v14

src/Image.cpp

@@ -92,7 +92,7 @@ void Image::ouvrir(const string &filename)
 {
     ifstream fichier(filename.c_str());
     assert(fichier.is_open());
-    int r, g, b;
+    unsigned char r, g, b;
     string mot;
     dimx = dimy = 0;
     fichier >> mot >> dimx >> dimy >> mot;
@@ -106,9 +106,9 @@ void Image::ouvrir(const string &filename)
         {
             fichier >> r >> g >> b;
             //cout<<r<<" , "<<g<<" , "<<b<<endl;
-            getPix(x, y).r = int(r);
-            getPix(x, y).g = int(g);
-            getPix(x, y).b = int(b);
+            getPix(x, y).r = r;
+            getPix(x, y).g = g;
+            getPix(x, y).b = b;
         }
     fichier.close();
     cout << "Lecture de l'image " << filename << " ... OK\n";
@@ -122,7 +122,7 @@ void Image::afficherConsole()
         for (unsigned int x = 0; x < dimx; ++x)
         {
             Pixel &pix = getPix(x, y);
-            cout << +pix.r << " " << +pix.g << " " << +pix.b << " ";
+            cout << pix.r << " " << pix.g << " " << pix.b << " ";
         }
         cout << endl;
     }

src/Image.h

@@ -51,6 +51,8 @@ private:
 
     };
 
+  
+
     void sauver(const string &filename) const;
     void ouvrir(const string &filename);
     void afficherConsole();

src/Pixel.cpp

@@ -14,9 +14,9 @@ Pixel::Pixel(unsigned int x,unsigned int y, unsigned int z)
     assert(x>=0 && x<=255);
     assert(y>=0 && y<=255);
     assert(z>=0 && z<=255);
-    r = x;
-    g = y;
-    b = z;
+    r = char(x);
+    g = char(y);
+    b = char(z);
 }
 
 Pixel Pixel::operator=(Pixel p)

src/Pixel.h

@@ -4,13 +4,14 @@
 class Pixel
 {
     public :
-    unsigned int r;
-    unsigned int g;
-    unsigned int b;
+    unsigned char r;
+    unsigned char g;
+    unsigned char b;
 
     Pixel();
-    Pixel(unsigned ro, unsigned int ve, unsigned int bl);
+    Pixel(unsigned int ro, unsigned int ve, unsigned int bl);
     Pixel operator=(Pixel p);
+    
 };
 
 #endif
\ No newline at end of file