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

diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp
index 05f9f0fd0f093998a87760b27e3b95ea45dcdcaa..ca86a6a4326d70239336472b06ca2032e6c05c5a 100644 (file)
--- a/source/Irrlicht/CB3DMeshFileLoader.cpp
+++ b/source/Irrlicht/CB3DMeshFileLoader.cpp
@@ -26,7 +26,7 @@ namespace scene
 \r
 //! Constructor\r
 CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr)\r
-: AnimatedMesh(0), B3DFile(0), NormalsInFile(false),\r
+: AnimatedMesh(0), B3DFile(0), VerticesStart(0), NormalsInFile(false),\r
        HasVertexColors(false), ShowWarning(true)\r
 {\r
        #ifdef _DEBUG\r

diff --git a/source/Irrlicht/CGUIFileOpenDialog.cpp b/source/Irrlicht/CGUIFileOpenDialog.cpp
index 9e46d80d306767bec6c8f5d1d5c830abbb2b3523..6599bef5520c7484202592700c9e6aa7305a407b 100644 (file)
--- a/source/Irrlicht/CGUIFileOpenDialog.cpp
+++ b/source/Irrlicht/CGUIFileOpenDialog.cpp
@@ -74,7 +74,7 @@ CGUIFileOpenDialog::CGUIFileOpenDialog(const wchar_t* title,
                L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close");\r
        CloseButton->setSubElement(true);\r
        CloseButton->setTabStop(false);\r
-       if (sprites)\r
+       if (sprites && skin)\r
        {\r
                CloseButton->setSpriteBank(sprites);\r
                CloseButton->setSprite(EGBS_BUTTON_UP, skin->getIcon(EGDI_WINDOW_CLOSE), color);\r

diff --git a/source/Irrlicht/CImageLoaderPNG.cpp b/source/Irrlicht/CImageLoaderPNG.cpp
index 9638421d9173bfadf8e7ef392d55d7b428c52e5f..b46801733714ff95e562ada6d3534ddd8ca86868 100644 (file)
--- a/source/Irrlicht/CImageLoaderPNG.cpp
+++ b/source/Irrlicht/CImageLoaderPNG.cpp
@@ -40,7 +40,7 @@ void PNGAPI user_read_data_fcn(png_structp png_ptr, png_bytep data, png_size_t l
 \r
        // changed by zola {\r
        io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);\r
-       check=(png_size_t) file->read((void*)data,(u32)length);\r
+       check=(png_size_t) file->read((void*)data, length);\r
        // }\r
 \r
        if (check != length)\r

diff --git a/source/Irrlicht/CImageWriterPNG.cpp b/source/Irrlicht/CImageWriterPNG.cpp
index e9c3dc64005795a22991db1e911056e1d6cbe89a..55ae00ec5b31a73cd323bc37e8a9f599d502740b 100644 (file)
--- a/source/Irrlicht/CImageWriterPNG.cpp
+++ b/source/Irrlicht/CImageWriterPNG.cpp
@@ -46,7 +46,7 @@ void PNGAPI user_write_data_fcn(png_structp png_ptr, png_bytep data, png_size_t
        png_size_t check;\r
 \r
        io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);\r
-       check=(png_size_t) file->write((const void*)data,(u32)length);\r
+       check=(png_size_t) file->write((const void*)data, length);\r
 \r
        if (check != length)\r
                png_error(png_ptr, "Write Error");\r

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

diff --git a/source/Irrlicht/CWGLManager.cpp b/source/Irrlicht/CWGLManager.cpp
index 182c460ceb08b73e89215bda0e1c23aa87e5a305..0d7ef42cdf1db8893a3066e6e8e4f19440b1b437 100644 (file)
--- a/source/Irrlicht/CWGLManager.cpp
+++ b/source/Irrlicht/CWGLManager.cpp
@@ -46,13 +46,12 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters& params, const SE
        wcex.cbClsExtra    = 0;\r
        wcex.cbWndExtra    = 0;\r
        wcex.hInstance     = lhInstance;\r
-       wcex.hIcon         = NULL;\r
+       wcex.hIcon         = 0;\r
        wcex.hCursor       = LoadCursor(NULL, IDC_ARROW);\r
        wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);\r
        wcex.lpszMenuName  = 0;\r
        wcex.lpszClassName = ClassName;\r
        wcex.hIconSm       = 0;\r
-       wcex.hIcon         = 0;\r
        RegisterClassEx(&wcex);\r
 \r
        RECT clientSize;\r

diff --git a/source/Irrlicht/CWriteFile.cpp b/source/Irrlicht/CWriteFile.cpp
index 3279402a581ac54b1271181bb45beb90b8161904..aa07b49e7c14ba583a345ac9978843a5bc2ab656 100644 (file)
--- a/source/Irrlicht/CWriteFile.cpp
+++ b/source/Irrlicht/CWriteFile.cpp
@@ -12,13 +12,12 @@ namespace io
 \r
 \r
 CWriteFile::CWriteFile(const io::path& fileName, bool append)\r
-: FileSize(0)\r
+: FileSize(0), Filename(fileName)\r
 {\r
        #ifdef _DEBUG\r
        setDebugName("CWriteFile");\r
        #endif\r
 \r
-       Filename = fileName;\r
        openFile(append);\r
 }\r
 \r