X-Git-Url: http://www.fmaj7b5.info/git?p=cuda.git;a=blobdiff_plain;f=libutils%2FImageIO.cpp;fp=libutils%2FImageIO.cpp;h=de43f355f4cc636930571abf0cfd5dd25481073a;hp=309e8ea87c7e7d2a89c6675fdf7f9f36e1fa4dbe;hb=9c4ea7a2596620dcb156a00d12bc55c07ba03339;hpb=869779783d0c06c34e02062ac7d23dac316e73a9 diff --git a/libutils/ImageIO.cpp b/libutils/ImageIO.cpp index 309e8ea..de43f35 100644 --- a/libutils/ImageIO.cpp +++ b/libutils/ImageIO.cpp @@ -43,7 +43,7 @@ static bool skip_comment(FILE* fp); static bool read_end_of_line(FILE* fp); -Image +Image FM7b5::loadPGM(const std::string& filename) { FILE* fp(nullptr); @@ -69,7 +69,7 @@ FM7b5::loadPGM(const std::string& filename) throw std::runtime_error(__FUNCTION__ ": supported depth is 255 only."); } - Image img(header.width, header.height); + Image img(header.width, header.height); switch (header.magic[1]) { case '2': // Gray ASCII format @@ -82,7 +82,7 @@ FM7b5::loadPGM(const std::string& filename) throw std::runtime_error(__FUNCTION__ ": invalid data."); } - img(w, h) = static_cast(val); + img(w, h) = static_cast(val); } } break; @@ -90,7 +90,7 @@ FM7b5::loadPGM(const std::string& filename) case '5': // Gray binary format { const size_t size(header.width * header.height); - size_t ret = fread(img.data(), sizeof(std::uint8_t), size, fp); + size_t ret = fread(img.data(), sizeof(std::uint_fast8_t), size, fp); if (ret != size) { throw std::runtime_error(__FUNCTION__ ": insufficient data."); }