From: Jason W. <mam...@us...> - 2005-08-31 22:54:23
|
Update of /cvsroot/vegastrike/vegastrike/src/gfx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4861 Modified Files: vsimage.cpp Log Message: better gcc4 compilation fix. necessary since klauss made vsimage->pk3_extracted_file private again and created an accessor instead (better after all) Index: vsimage.cpp =================================================================== RCS file: /cvsroot/vegastrike/vegastrike/src/gfx/vsimage.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** vsimage.cpp 29 Aug 2005 18:24:39 -0000 1.10 --- vsimage.cpp 31 Aug 2005 22:54:10 -0000 1.11 *************** *** 415,419 **** jpeg_stdio_src((j_decompress_ptr)&cinfo, img_file->GetFP()); else ! jpeg_memory_src(&cinfo, (unsigned char *)img_file->pk3_extracted_file, img_file->Size()); (void) jpeg_read_header(&cinfo, TRUE); --- 415,419 ---- jpeg_stdio_src((j_decompress_ptr)&cinfo, img_file->GetFP()); else ! jpeg_memory_src(&cinfo, (unsigned char *)img_file->get_pk3_data(), img_file->Size()); (void) jpeg_read_header(&cinfo, TRUE); |