From af86a79f6ac5c11d1986be8a3d549fef03482789 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 25 Jun 2015 23:10:21 +0300 Subject: Add missing checks into render directory. --- src/render/normalopenglgraphics.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/render/normalopenglgraphics.cpp') diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index dd4fe3002..eb5609b19 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -203,6 +203,11 @@ static inline void bindPointerInt(const GLint *const vert, } } +static inline void drawQuad(const Image *const image, + const int srcX, const int srcY, + const int dstX, const int dstY, + const int width, const int height) A_NONNULL(1); + static inline void drawQuad(const Image *const image, const int srcX, const int srcY, const int dstX, const int dstY, @@ -265,6 +270,13 @@ static inline void drawQuad(const Image *const image, } } +static inline void drawRescaledQuad(const Image *const image, + const int srcX, const int srcY, + const int dstX, const int dstY, + const int width, const int height, + const int desiredWidth, + const int desiredHeight) A_NONNULL(1); + static inline void drawRescaledQuad(const Image *const image, const int srcX, const int srcY, const int dstX, const int dstY, @@ -995,6 +1007,8 @@ void NormalOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, const Image *const image, int x, int y) { + if (!vertCol || !image) + return; if (vertCol->currentGLImage != image->mGLImage) { ImageVertexes *const vert = new ImageVertexes(); @@ -1013,6 +1027,8 @@ void NormalOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol, void NormalOpenGLGraphics::drawTileCollection(const ImageCollection *const vertCol) { + if (!vertCol) + return; const ImageVertexesVector &draws = vertCol->draws; const ImageCollectionCIter it_end = draws.end(); for (ImageCollectionCIter it = draws.begin(); it != it_end; ++ it) @@ -1035,6 +1051,8 @@ void NormalOpenGLGraphics::calcPattern(ImageCollection* const vertCol, const int x, const int y, const int w, const int h) const { + if (!vertCol || !image) + return; ImageVertexes *vert = nullptr; if (vertCol->currentGLImage != image->mGLImage) { @@ -1151,6 +1169,8 @@ void NormalOpenGLGraphics::calcWindow(ImageCollection *const vertCol, const int w, const int h, const ImageRect &imgRect) { + if (!vertCol) + return; ImageVertexes *vert = nullptr; Image *const image = imgRect.grid[4]; if (!image) -- cgit v1.2.3-60-g2f50