nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

netpbm: avoid image w/h/s variables

Browse Source
This commit is contained in:
Danny Robson 2015-10-19 17:08:35 +11:00
parent 4cd6dcc85c
commit b45255900c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netpbm.cpp
View File

@ -48,9 +48,9 @@ util::pgm::read (const boost::filesystem::path &path)
if (expected != remain) if (expected != remain)
throw std::runtime_error ("expected data size mismatch"); throw std::runtime_error ("expected data size mismatch");
util::image::buffer<uint8_t> out (width, height); util::image::buffer<uint8_t> out ({width, height});
CHECK_EQ (out.w, out.s); CHECK (out.is_packed ());
std::copy (raw.begin () + cooked.tellg () - 1, raw.end (), out.begin ()); std::copy (raw.begin () + cooked.tellg () - 1, raw.end (), out.begin ());
return out; return out;
@ -88,7 +88,7 @@ void
util::pgm::write (const util::image::buffer<uint8_t> &src, util::pgm::write (const util::image::buffer<uint8_t> &src,
std::ostream &dst) std::ostream &dst)
{ {
write (src.begin (), src.w, src.h, src.s, dst); write (src.begin (), src.extent ().w, src.extent ().h, src.stride ().y, dst);
} }
@ -98,7 +98,7 @@ util::pgm::write (const util::image::buffer<uint8_t> &src,
const boost::filesystem::path &path) const boost::filesystem::path &path)
{ {
std::ofstream dst (path.string ()); std::ofstream dst (path.string ());
write (src.begin (), src.w, src.h, src.s, path); write (src.begin (), src.extent ().w, src.extent ().h, src.stride ().y, path);
} }