eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 19:49:19 +02:00
Code Issues 123 Wiki Activity

fix png and bmp loading

Browse Source
This commit is contained in:
milek7
2018-10-25 19:44:05 +02:00
parent 00206b8c50
commit aa64e1ff97
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Texture.cpp
View File

@@ -208,7 +208,7 @@ void opengl_texture::load_PNG()
memset(&png, 0, sizeof(png_image)); memset(&png, 0, sizeof(png_image));
png.version = PNG_IMAGE_VERSION; png.version = PNG_IMAGE_VERSION;
png_image_begin_read_from_file(&png, name.c_str()); png_image_begin_read_from_file(&png, (name + type).c_str());
if (png.warning_or_error) if (png.warning_or_error)
{ {
data_state = resource_state::failed; data_state = resource_state::failed;
@@ -290,11 +290,11 @@ opengl_texture::make_request() {
void void
opengl_texture::load_BMP() { opengl_texture::load_BMP() {
std::basic_ifstream<unsigned char> file( name + type, std::ios::binary ); file.unsetf( std::ios::skipws ); std::ifstream file( name + type, std::ios::binary ); file.unsetf( std::ios::skipws );
BITMAPFILEHEADER header; BITMAPFILEHEADER header;
file.read( (unsigned char *)&header, sizeof( BITMAPFILEHEADER ) ); file.read((char *) &header, sizeof( BITMAPFILEHEADER ) );
if( file.eof() ) { if( file.eof() ) {
data_state = resource_state::failed; data_state = resource_state::failed;
@@ -307,7 +307,7 @@ opengl_texture::load_BMP() {
if( infosize > sizeof( info ) ) { if( infosize > sizeof( info ) ) {
WriteLog( "Warning - BMP header is larger than expected, possible format difference.", logtype::texture ); WriteLog( "Warning - BMP header is larger than expected, possible format difference.", logtype::texture );
} }
file.read( (unsigned char *)&info, std::min( (size_t)infosize, sizeof( info ) ) ); file.read((char *) &info, std::min( (size_t)infosize, sizeof( info ) ) );
data_width = info.bmiHeader.biWidth; data_width = info.bmiHeader.biWidth;
data_height = info.bmiHeader.biHeight; data_height = info.bmiHeader.biHeight;
@@ -326,7 +326,7 @@ opengl_texture::load_BMP() {
} }
data.resize( datasize ); data.resize( datasize );
file.read( &data[0], datasize ); file.read((char*) &data[0], datasize );
// we're storing texture data internally with bottom-left origin // we're storing texture data internally with bottom-left origin
// so BMP origin matches, no flipping needed // so BMP origin matches, no flipping needed