From 6e936b6120680427096c2deb24fb242fab978007 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 27 Jun 2014 21:18:22 +0200 Subject: [PATCH] Fixed Image::GetPixels returning wrong pointer when level is over 0 Former-commit-id: c54b77b3b7aee5ee9aeff9a022e94f33f4b45453 --- src/Nazara/Utility/Image.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Utility/Image.cpp b/src/Nazara/Utility/Image.cpp index fd7108238..a6ceaf41a 100644 --- a/src/Nazara/Utility/Image.cpp +++ b/src/Nazara/Utility/Image.cpp @@ -11,6 +11,7 @@ #include ///TODO: Rajouter des warnings (Formats compressés avec les méthodes Copy/Update, tests taille dans Copy) +///TODO: Rendre les méthodes exception-safe namespace { @@ -768,7 +769,7 @@ nzUInt8* NzImage::GetPixels(unsigned int x, unsigned int y, unsigned int z, nzUI EnsureOwnership(); - return GetPixelPtr(m_sharedImage->pixels[level], NzPixelFormat::GetBytesPerPixel(m_sharedImage->format), x, y, z, m_sharedImage->width, m_sharedImage->height); + return GetPixelPtr(m_sharedImage->pixels[level], NzPixelFormat::GetBytesPerPixel(m_sharedImage->format), x, y, z, width, height); } unsigned int NzImage::GetSize() const