Mirrorlandia_minetest/irrlicht
1
0
Fork 1
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-27 08:27:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix glHint parameter, type size and add more null checks (#130)

Browse Source
This commit is contained in:
Herman Semenov 2022-09-02 09:40:02 +03:00 committed by GitHub
parent f0766c845f
commit d733e03430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/CB3DMeshFileLoader.cpp
View File

@ -26,7 +26,7 @@ namespace scene
//! Constructor //! Constructor
CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr) CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr)
: AnimatedMesh(0), B3DFile(0), NormalsInFile(false), : AnimatedMesh(0), B3DFile(0), VerticesStart(0), NormalsInFile(false),
HasVertexColors(false), ShowWarning(true) HasVertexColors(false), ShowWarning(true)
{ {
#ifdef _DEBUG #ifdef _DEBUG

2
source/Irrlicht/CGUIFileOpenDialog.cpp
View File

@ -74,7 +74,7 @@ CGUIFileOpenDialog::CGUIFileOpenDialog(const wchar_t* title,
L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close"); L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close");
CloseButton->setSubElement(true); CloseButton->setSubElement(true);
CloseButton->setTabStop(false); CloseButton->setTabStop(false);
if (sprites) if (sprites && skin)
{ {
CloseButton->setSpriteBank(sprites); CloseButton->setSpriteBank(sprites);
CloseButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_WINDOW_CLOSE), color); CloseButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_WINDOW_CLOSE), color);

2
source/Irrlicht/CImageLoaderPNG.cpp
View File

@ -40,7 +40,7 @@ void PNGAPI user_read_data_fcn(png_structp png_ptr, png_bytep data, png_size_t l
// changed by zola { // changed by zola {
io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr); io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
check=(png_size_t) file->read((void*)data,(u32)length); check=(png_size_t) file->read((void*)data, length);
// } // }
if (check != length) if (check != length)

2
source/Irrlicht/CImageWriterPNG.cpp
View File

@ -46,7 +46,7 @@ void PNGAPI user_write_data_fcn(png_structp png_ptr, png_bytep data, png_size_t
png_size_t check; png_size_t check;
io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr); io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
check=(png_size_t) file->write((const void*)data,(u32)length); check=(png_size_t) file->write((const void*)data, length);
if (check != length) if (check != length)
png_error(png_ptr, "Write Error"); png_error(png_ptr, "Write Error");

6
source/Irrlicht/COpenGLDriver.cpp
View File

@ -2615,7 +2615,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
if ((material.AntiAliasing & EAAM_QUALITY) == EAAM_QUALITY) if ((material.AntiAliasing & EAAM_QUALITY) == EAAM_QUALITY)
glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST); glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST);
else else
glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_NICEST); glHint(GL_MULTISAMPLE_FILTER_HINT_NV, GL_FASTEST);
} }
#endif #endif
} }
@ -3805,10 +3805,10 @@ IImage* COpenGLDriver::createScreenShot(video::ECOLOR_FORMAT format, video::E_RE
glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE); glPixelStorei(GL_PACK_INVERT_MESA, GL_FALSE);
else else
#endif #endif
if (pixels) if (pixels && newImage)
{ {
// opengl images are horizontally flipped, so we have to fix that here. // opengl images are horizontally flipped, so we have to fix that here.
const s32 pitch=newImage->getPitch(); const s32 pitch = newImage->getPitch();
u8* p2 = pixels + (ScreenSize.Height - 1) * pitch; u8* p2 = pixels + (ScreenSize.Height - 1) * pitch;
u8* tmpBuffer = new u8[pitch]; u8* tmpBuffer = new u8[pitch];
for (u32 i=0; i < ScreenSize.Height; i += 2) for (u32 i=0; i < ScreenSize.Height; i += 2)

3
source/Irrlicht/CWGLManager.cpp
View File

@ -46,13 +46,12 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters& params, const SE
wcex.cbClsExtra = 0; wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0; wcex.cbWndExtra = 0;
wcex.hInstance = lhInstance; wcex.hInstance = lhInstance;
wcex.hIcon = NULL; wcex.hIcon = 0;
wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
wcex.lpszMenuName = 0; wcex.lpszMenuName = 0;
wcex.lpszClassName = ClassName; wcex.lpszClassName = ClassName;
wcex.hIconSm = 0; wcex.hIconSm = 0;
wcex.hIcon = 0;
RegisterClassEx(&wcex); RegisterClassEx(&wcex);
RECT clientSize; RECT clientSize;

3
source/Irrlicht/CWriteFile.cpp
View File

@ -12,13 +12,12 @@ namespace io
CWriteFile::CWriteFile(const io::path& fileName, bool append) CWriteFile::CWriteFile(const io::path& fileName, bool append)
: FileSize(0) : FileSize(0), Filename(fileName)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CWriteFile"); setDebugName("CWriteFile");
#endif #endif
Filename = fileName;
openFile(append); openFile(append);
} }