diff --git a/src/util/base64stream.cc b/src/util/base64stream.cc index 7df00fe..ab10e72 100644 --- a/src/util/base64stream.cc +++ b/src/util/base64stream.cc @@ -7,14 +7,14 @@ using std::ostream; ostream & base64stream::dumpto(ostream & out) { unsigned char buf[3]; - while(in->read((char*)buf, 3)) + while(in.read((char*)buf, 3)) { out << base64_encoding[(buf[0] & 0xfc)>>2] << base64_encoding[((buf[0] & 0x03)<<4) | ((buf[1] & 0xf0)>>4)] << base64_encoding[((buf[1] & 0x0f)<<2) | ((buf[2] & 0xc0)>>6)] << base64_encoding[(buf[2] & 0x3f)]; } - auto cnt = in->gcount(); + auto cnt = in.gcount(); if(cnt > 0) { for(int i = cnt; i < 3; ++i) diff --git a/src/util/base64stream.h b/src/util/base64stream.h index 46955cf..8bc810f 100644 --- a/src/util/base64stream.h +++ b/src/util/base64stream.h @@ -15,14 +15,12 @@ namespace pdf2htmlEX { class base64stream { public: - - base64stream(std::istream & in) : in(&in) { } - base64stream(std::istream && in) : in(&in) { } + base64stream(std::istream & in) : in(in) { } std::ostream & dumpto(std::ostream & out); private: - std::istream * in; + std::istream & in; static const char * base64_encoding; };