OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix assertion failures when loading/writing JPEGs

Browse Source 
(e.g. the linking book loading animation). Nobody ever noticed because the debug build was completely broken in MSVC7, and H-uru/Plasma does it completely differently.
This commit is contained in:
Christian Walther
2012-05-01 17:27:12 +02:00
parent b2f8d8c0f0
commit 02dda70b44
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp
View File

@ -288,7 +288,7 @@ plMipmap *plJPEG::IRead( hsStream *inStream )
#else #else
while( cinfo.output_scanline < cinfo.output_height ) while( cinfo.output_scanline < cinfo.output_height )
{ {
UInt8 *startp = newMipmap->GetAddr8( 0, cinfo.output_scanline ); UInt8 *startp = (UInt8*)newMipmap->GetAddr32( 0, cinfo.output_scanline );
(void) jpeg_read_scanlines( &cinfo, &startp, 1 ); (void) jpeg_read_scanlines( &cinfo, &startp, 1 );
} }
#endif #endif
@ -439,7 +439,7 @@ hsBool plJPEG::IWrite( plMipmap *source, hsStream *outStream )
#else #else
while( cinfo.next_scanline < cinfo.image_height ) while( cinfo.next_scanline < cinfo.image_height )
{ {
UInt8 *startp = source->GetAddr8( 0, cinfo.next_scanline ); UInt8 *startp = (UInt8*)source->GetAddr32( 0, cinfo.next_scanline );
(void) jpeg_write_scanlines( &cinfo, &startp, 1 ); (void) jpeg_write_scanlines( &cinfo, &startp, 1 );
} }
jpeg_finish_compress( &cinfo ); jpeg_finish_compress( &cinfo );