From f1b82c1b06604c2c1eed750a6c980aa0b5355560 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 11 Oct 2013 14:48:19 +0300 Subject: First part of checks from Parasoft C++ Test. --- src/render/mobileopenglgraphics.cpp | 8 +++++--- src/render/sdlgraphics.cpp | 11 ++++------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src/render') diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index b5e1cb883..972bcc89a 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -905,15 +905,17 @@ SDL_Surface* MobileOpenGLGraphics::getScreenshot() if (SDL_MUSTLOCK(screenshot)) SDL_LockSurface(screenshot); + const unsigned int lineSize = 3 * w; + GLubyte *const buf = static_cast(malloc(lineSize)); + if (!buf) + return nullptr; + // Grap the pixel buffer and write it to the SDL surface glGetIntegerv(GL_PACK_ALIGNMENT, &pack); glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, screenshot->pixels); // Flip the screenshot, as OpenGL has 0,0 in bottom left - const unsigned int lineSize = 3 * w; - GLubyte *const buf = static_cast(malloc(lineSize)); - const int h2 = h / 2; for (int i = 0; i < h2; i++) { diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 4df797762..3cba46abe 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -677,13 +677,10 @@ int SDLGraphics::SDL_FakeUpperBlit(const SDL_Surface *const src, if (w > 0 && h > 0) { - if (srcrect) - { - srcrect->x = static_cast(srcx); - srcrect->y = static_cast(srcy); - srcrect->w = static_cast(w); - srcrect->h = static_cast(h); - } + srcrect->x = static_cast(srcx); + srcrect->y = static_cast(srcy); + srcrect->w = static_cast(w); + srcrect->h = static_cast(h); dstrect->w = static_cast(w); dstrect->h = static_cast(h); -- cgit v1.2.3-70-g09d2