Index: detail/jpeg_io_read.hpp =================================================================== --- detail/jpeg_io_read.hpp (revision 317) +++ detail/jpeg_io_read.hpp (working copy) @@ -194,28 +194,29 @@ template void apply_impl( const View& view ) { - start_decompress(); + + this->start_decompress(); - switch( _info._color_space ) + switch(this->_info._color_space ) { case JCS_GRAYSCALE: - io_error_if(_info._num_components!=1,"reader: error in image data"); + io_error_if(this->_info._num_components!=1,"reader: error in image data"); read_rows( view ); break; case JCS_RGB: - io_error_if(_info._num_components!=3,"reader: error in image data"); + io_error_if(this->_info._num_components!=3,"reader: error in image data"); read_rows( view ); case JCS_YCbCr: - io_error_if(_info._num_components!=3,"reader: error in image data"); + io_error_if(this->_info._num_components!=3,"reader: error in image data"); //!\todo add Y'CbCr? We loose image quality when reading JCS_YCbCr as JCS_RGB read_rows( view ); break; case JCS_CMYK: - io_error_if(_info._num_components!=4,"reader: error in image data"); + io_error_if(this->_info._num_components!=4,"reader: error in image data"); read_rows( view ); break; case JCS_YCCK: - io_error_if(_info._num_components!=4,"reader: error in image data"); + io_error_if(this->_info._num_components!=4,"reader: error in image data"); //!\todo add Y'CbCrK? We loose image quality when reading JCS_YCCK as JCS_CMYK this->_cinfo.out_color_space = JCS_CMYK; read_rows( view ); @@ -225,7 +226,7 @@ // unknown } - finish_decompress(); + this->finish_decompress(); } template< typename ImagePixel @@ -240,14 +241,14 @@ ); - std::vector buffer( _info._width ); + std::vector buffer( this->_info._width ); JSAMPLE *row_adr = reinterpret_cast< JSAMPLE* >( &buffer[0] ); //Skip scanlines if necessary. - for( int y = 0; y < _top_left.y; ++y ) + for( int y = 0; y < this->_top_left.y; ++y ) { - io_error_if( jpeg_read_scanlines( &_cinfo + io_error_if( jpeg_read_scanlines( &this->_cinfo , &row_adr , 1 ) !=1 @@ -257,22 +258,22 @@ // Read data. for( int y = 0; y < view.height(); ++y ) { - io_error_if( jpeg_read_scanlines( &_cinfo + io_error_if( jpeg_read_scanlines( &this->_cinfo , &row_adr , 1 ) !=1 , "jpeg_read_scanlines: fail to read JPEG file" ); - _cc_policy.read( buffer.begin() + _top_left.x - , buffer.begin() + _dim.x - , view.row_begin( y ) - ); + this->_cc_policy.read( buffer.begin() + this->_top_left.x + , buffer.begin() + this->_dim.x + , view.row_begin( y ) + ); } //@todo: Finish up. There might be a better way to do that. - while( _cinfo.output_scanline < _cinfo.image_height ) + while( this->_cinfo.output_scanline < this->_cinfo.image_height ) { - io_error_if( jpeg_read_scanlines( &_cinfo + io_error_if( jpeg_read_scanlines( &this->_cinfo , &row_adr , 1 ) !=1 Index: detail/path_spec.hpp =================================================================== --- detail/path_spec.hpp (revision 317) +++ detail/path_spec.hpp (working copy) @@ -75,4 +75,4 @@ }}} -#endif BOOST_GIL_EXTENSION_IO_DETAIL_PATH_SPEC_HPP_INCLUDED +#endif //BOOST_GIL_EXTENSION_IO_DETAIL_PATH_SPEC_HPP_INCLUDED