X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fjdatasrc.cxx;h=cfb526abd8593898d18c825923ecb1f799227669;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=53717cd5006b1ae246d6cc8b4b8576be511c1ffb;hpb=95e43356511d138225d8f718f632b3e7a8fcc106;p=gdcm.git diff --git a/src/jdatasrc.cxx b/src/jdatasrc.cxx index 53717cd5..cfb526ab 100644 --- a/src/jdatasrc.cxx +++ b/src/jdatasrc.cxx @@ -27,11 +27,11 @@ extern "C" { typedef struct { struct jpeg_source_mgr pub; /* public fields */ - std::ifstream *infile; /* source stream */ + std::istream *infile; /* source stream */ JOCTET * buffer; /* start of buffer */ boolean start_of_file; /* have we gotten any data yet? */ - gdcm::JPEGFragment *frag; + GDCM_NAME_SPACE::JPEGFragment *frag; size_t bytes_read; } my_source_mgr; @@ -198,7 +198,7 @@ term_source (j_decompress_ptr cinfo) */ GLOBAL(void) -jpeg_stdio_src (j_decompress_ptr cinfo, std::ifstream * infile, gdcm::JPEGFragment *frag, int flag) +jpeg_stdio_src (j_decompress_ptr cinfo, std::istream * infile, GDCM_NAME_SPACE::JPEGFragment *frag, int flag) { my_src_ptr src;