Skip to content

O
opencv
Commit 0098c4b5 authored by AlexanderStohr's avatar AlexanderStohr Committed by Alexander Stohr
Browse files
Options

fix VS2010 error with type mismatch due to volatile qualifier

parent 7e3d7677
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/imgcodecs/src/grfmt_png.cpp
View file @ 0098c4b5
...@@ -368,7 +368,7 @@ bool PngEncoder::write( const Mat& img, const std::vector<int>& params ) ...@@ -368,7 +368,7 @@ bool PngEncoder::write( const Mat& img, const std::vector<int>& params )
{ {
f = fopen( m_filename.c_str(), "wb" ); f = fopen( m_filename.c_str(), "wb" );
if( f ) if( f )
png_init_io( png_ptr, f ); png_init_io( png_ptr, (png_FILE_p)f );
} }
int compression_level = -1; // Invalid value to allow setting 0-9 as valid int compression_level = -1; // Invalid value to allow setting 0-9 as valid
...@@ -437,7 +437,7 @@ bool PngEncoder::write( const Mat& img, const std::vector<int>& params ) ...@@ -437,7 +437,7 @@ bool PngEncoder::write( const Mat& img, const std::vector<int>& params )
} }
png_destroy_write_struct( &png_ptr, &info_ptr ); png_destroy_write_struct( &png_ptr, &info_ptr );
if(f) fclose( f ); if(f) fclose( (FILE*)f );
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment