From 0062520c9cc87eeeb8828361bbb33033a6f07b7e Mon Sep 17 00:00:00 2001 From: gaillaro Date: Tue, 5 Apr 2005 17:51:44 +0000 Subject: chasse aux consts ajout #include dans raw_reader.cc ajout de raw_reader.o dans Makefiles.defs --- 2005/i/robert/src/image/Makefile.defs | 2 +- 2005/i/robert/src/image/raw_reader.cc | 3 ++- 2005/i/robert/src/image/raw_reader.hh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to '2005/i') diff --git a/2005/i/robert/src/image/Makefile.defs b/2005/i/robert/src/image/Makefile.defs index 1423798..b0e7f74 100644 --- a/2005/i/robert/src/image/Makefile.defs +++ b/2005/i/robert/src/image/Makefile.defs @@ -1,6 +1,6 @@ PROGRAMS += test_image -image_OBJECTS = image.o +image_OBJECTS = image.o raw_reader.o test_image_OBJECTS = test_image.o $(image_OBJECTS) diff --git a/2005/i/robert/src/image/raw_reader.cc b/2005/i/robert/src/image/raw_reader.cc index 8adacca..e77df08 100644 --- a/2005/i/robert/src/image/raw_reader.cc +++ b/2005/i/robert/src/image/raw_reader.cc @@ -24,6 +24,7 @@ // }}} #include "raw_reader.hh" #include "data/data_input.hh" +#include /// Constructeur, les paramètres doivent être précisés car non présents /// dans le binaire. @@ -37,7 +38,7 @@ RawReader::RawReader (DataInput &data, int width, int height, /// Récupère les paramètres de l'image. void RawReader::getParam (int &width, int &height, - Image::PixelFormat &pixelFormat) + Image::PixelFormat &pixelFormat) const { width = width_; height = height_; diff --git a/2005/i/robert/src/image/raw_reader.hh b/2005/i/robert/src/image/raw_reader.hh index b5ecd78..e62452d 100644 --- a/2005/i/robert/src/image/raw_reader.hh +++ b/2005/i/robert/src/image/raw_reader.hh @@ -41,7 +41,7 @@ class RawReader : public ImageReader Image::PixelFormat pixelFormat); /// Récupère les paramètres de l'image. void getParam (int &width, int &height, - Image::PixelFormat &pixelFormat); + Image::PixelFormat &pixelFormat) const; /// Lit une image, lance une exception en cas d'erreur. void read (uint8_t *buf, unsigned size); }; -- cgit v1.2.3