sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(NzImage) Fixed Convert crash and optimized Fill 

Former-commit-id: 674acfd1e8e6fa28a8657ba45adedca311f54949
This commit is contained in:
Lynix 2012-10-24 18:41:13 +02:00
parent 8712de3118
commit 5f95dbe82e
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Nazara/Utility/Image.cpp
View File

@ -105,7 +105,8 @@ bool NzImage::Convert(nzPixelFormat format)
for (unsigned int i = 0; i < m_sharedImage->levelCount; ++i) for (unsigned int i = 0; i < m_sharedImage->levelCount; ++i)
{ {
unsigned int pixelsPerFace = width*height; unsigned int pixelsPerFace = width*height;
nzUInt8* ptr = new nzUInt8[pixelsPerFace*depth*NzPixelFormat::GetBytesPerPixel(format)]; nzUInt8* face = new nzUInt8[pixelsPerFace*depth*NzPixelFormat::GetBytesPerPixel(format)];
nzUInt8* ptr = face;
nzUInt8* pixels = m_sharedImage->pixels[i]; nzUInt8* pixels = m_sharedImage->pixels[i];
unsigned int srcStride = pixelsPerFace * NzPixelFormat::GetBytesPerPixel(m_sharedImage->format); unsigned int srcStride = pixelsPerFace * NzPixelFormat::GetBytesPerPixel(m_sharedImage->format);
unsigned int dstStride = pixelsPerFace * NzPixelFormat::GetBytesPerPixel(format); unsigned int dstStride = pixelsPerFace * NzPixelFormat::GetBytesPerPixel(format);
@ -117,7 +118,7 @@ bool NzImage::Convert(nzPixelFormat format)
NazaraError("Failed to convert image"); NazaraError("Failed to convert image");
// Nettoyage de la mémoire // Nettoyage de la mémoire
delete[] ptr; // Permet une optimisation de boucle (GCC) delete[] face; // Permet une optimisation de boucle (GCC)
for (unsigned int j = 0; j < i; ++j) for (unsigned int j = 0; j < i; ++j)
delete[] levels[j]; delete[] levels[j];
@ -130,7 +131,7 @@ bool NzImage::Convert(nzPixelFormat format)
ptr += dstStride; ptr += dstStride;
} }
levels[i] = ptr; levels[i] = face;
if (width > 1) if (width > 1)
width >>= 1; width >>= 1;
@ -356,33 +357,39 @@ bool NzImage::Fill(const NzColor& color)
} }
#endif #endif
EnsureOwnership();
nzUInt8 bpp = NzPixelFormat::GetBytesPerPixel(m_sharedImage->format); nzUInt8 bpp = NzPixelFormat::GetBytesPerPixel(m_sharedImage->format);
nzUInt8* pixels = new nzUInt8[bpp]; nzUInt8* colorBuffer = new nzUInt8[bpp];
if (!NzPixelFormat::Convert(nzPixelFormat_RGBA8, m_sharedImage->format, &color.r, pixels)) if (!NzPixelFormat::Convert(nzPixelFormat_RGBA8, m_sharedImage->format, &color.r, colorBuffer))
{ {
NazaraError("Failed to convert RGBA8 to " + NzPixelFormat::ToString(m_sharedImage->format)); NazaraError("Failed to convert RGBA8 to " + NzPixelFormat::ToString(m_sharedImage->format));
delete[] pixels; delete[] colorBuffer;
return false; return false;
} }
nzUInt8** levels = new nzUInt8*[m_sharedImage->levelCount];
unsigned int width = m_sharedImage->width; unsigned int width = m_sharedImage->width;
unsigned int height = m_sharedImage->height; unsigned int height = m_sharedImage->height;
// Les images 3D et cubemaps sont stockés de la même façon
unsigned int depth = (m_sharedImage->type == nzImageType_Cubemap) ? 6 : m_sharedImage->depth; unsigned int depth = (m_sharedImage->type == nzImageType_Cubemap) ? 6 : m_sharedImage->depth;
for (unsigned int level = 0; level < m_sharedImage->levelCount; ++level) for (unsigned int i = 0; i < m_sharedImage->levelCount; ++i)
{ {
nzUInt8* ptr = &m_sharedImage->pixels[level][0]; unsigned int size = width*height*depth*bpp;
nzUInt8* end = &m_sharedImage->pixels[level][width*height*depth*bpp]; nzUInt8* face = new nzUInt8[size];
nzUInt8* ptr = face;
nzUInt8* end = &ptr[size];
while (ptr < end) while (ptr < end)
{ {
std::memcpy(ptr, pixels, bpp); std::memcpy(ptr, colorBuffer, bpp);
ptr += bpp; ptr += bpp;
} }
levels[i] = face;
if (width > 1U) if (width > 1U)
width >>= 1; width >>= 1;
@ -393,7 +400,12 @@ bool NzImage::Fill(const NzColor& color)
depth >>= 1; depth >>= 1;
} }
delete[] pixels; delete[] colorBuffer;
SharedImage* newImage = new SharedImage(1, m_sharedImage->type, m_sharedImage->format, m_sharedImage->levelCount, levels, m_sharedImage->width, m_sharedImage->height, m_sharedImage->depth);
ReleaseImage();
m_sharedImage = newImage;
return true; return true;
} }
@ -562,7 +574,6 @@ bool NzImage::FlipHorizontally()
return true; return true;
} }
bool NzImage::FlipVertically() bool NzImage::FlipVertically()
{ {
#if NAZARA_UTILITY_SAFE #if NAZARA_UTILITY_SAFE