LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageData:paste can copy between ImageData of different formats. Resolves issue #1249.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-03-03 22:10:10 -04:00
parent cb9aa857d7
commit 074107b01d
2 changed files with 158 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/ImageData.cpp
+134 -24
View File
@@ -83,20 +83,20 @@ void ImageData::getPixel(int x, int y, Pixel &p) const
void ImageData::paste(ImageData *src, int dx, int dy, int sx, int sy, int sw, int sh) void ImageData::paste(ImageData *src, int dx, int dy, int sx, int sy, int sw, int sh)
{ {
if (getFormat() != src->getFormat()) PixelFormat dstformat = getFormat();
throw love::Exception("ImageData formats must match!"); PixelFormat srcformat = src->getFormat();
Lock lock2(src->mutex); int srcW = src->getWidth();
Lock lock1(mutex); int srcH = src->getHeight();
int dstW = getWidth();
int dstH = getHeight();
uint8 *s = (uint8 *) src->getData(); size_t srcpixelsize = src->getPixelSize();
uint8 *d = (uint8 *) getData(); size_t dstpixelsize = getPixelSize();
size_t pixelsize = getPixelSize();
// Check bounds; if the data ends up completely out of bounds, get out early. // Check bounds; if the data ends up completely out of bounds, get out early.
if (sx >= src->getWidth() || sx + sw < 0 || sy >= src->getHeight() || sy + sh < 0 if (sx >= srcW || sx + sw < 0 || sy >= srcH || sy + sh < 0
|| dx >= getWidth() || dx + sw < 0 || dy >= getHeight() || dy + sh < 0) || dx >= dstW || dx + sw < 0 || dy >= dstH || dy + sh < 0)
return; return;
// Normalize values to the inside of both images. // Normalize values to the inside of both images.
@@ -125,36 +125,146 @@ void ImageData::paste(ImageData *src, int dx, int dy, int sx, int sy, int sw, in
sy = 0; sy = 0;
} }
if (dx + sw > getWidth()) if (dx + sw > dstW)
sw = getWidth() - dx; sw = dstW - dx;
if (dy + sh > getHeight()) if (dy + sh > dstH)
sh = getHeight() - dy; sh = dstH - dy;
if (sx + sw > src->getWidth()) if (sx + sw > srcW)
sw = src->getWidth() - sx; sw = srcW - sx;
if (sy + sh > src->getHeight()) if (sy + sh > srcH)
sh = src->getHeight() - sy; sh = srcH - sy;
Lock lock2(src->mutex);
Lock lock1(mutex);
uint8 *s = (uint8 *) src->getData();
uint8 *d = (uint8 *) getData();
// If the dimensions match up, copy the entire memory stream in one go // If the dimensions match up, copy the entire memory stream in one go
if (sw == getWidth() && getWidth() == src->getWidth() if (srcformat == dstformat && (sw == dstW && dstW == srcW && sh == dstH && dstH == srcH))
&& sh == getHeight() && getHeight() == src->getHeight())
{ {
memcpy(d, s, pixelsize * sw * sh); memcpy(d, s, srcpixelsize * sw * sh);
} }
else if (sw > 0) else if (sw > 0)
{ {
// Otherwise, copy each row individually. // Otherwise, copy each row individually.
for (int i = 0; i < sh; i++) for (int i = 0; i < sh; i++)
{ {
const uint8 *rowsrc = s + (sx + (i + sy) * src->getWidth()) * pixelsize; Row rowsrc = {s + (sx + (i + sy) * srcW) * srcpixelsize};
uint8 *rowdst = d + (dx + (i + dy) * getWidth()) * pixelsize; Row rowdst = {d + (dx + (i + dy) * dstW) * dstpixelsize};
memcpy(rowdst, rowsrc, pixelsize * sw);
if (srcformat == dstformat)
memcpy(rowdst.u8, rowsrc.u8, srcpixelsize * sw);
else if (srcformat == PIXELFORMAT_RGBA8 && dstformat == PIXELFORMAT_RGBA16)
pasteRGBA8toRGBA16(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA8 && dstformat == PIXELFORMAT_RGBA16F)
pasteRGBA8toRGBA16F(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA8 && dstformat == PIXELFORMAT_RGBA32F)
pasteRGBA8toRGBA32F(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16 && dstformat == PIXELFORMAT_RGBA8)
pasteRGBA16toRGBA8(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16 && dstformat == PIXELFORMAT_RGBA16F)
pasteRGBA16toRGBA16F(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16 && dstformat == PIXELFORMAT_RGBA32F)
pasteRGBA16toRGBA32F(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16F && dstformat == PIXELFORMAT_RGBA8)
pasteRGBA16FtoRGBA8(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16F && dstformat == PIXELFORMAT_RGBA16)
pasteRGBA16FtoRGBA16(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA16F && dstformat == PIXELFORMAT_RGBA32F)
pasteRGBA16FtoRGBA32F(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA32F && dstformat == PIXELFORMAT_RGBA8)
pasteRGBA32FtoRGBA8(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA32F && dstformat == PIXELFORMAT_RGBA16)
pasteRGBA32FtoRGBA16(rowsrc, rowdst, sw);
else if (srcformat == PIXELFORMAT_RGBA32F && dstformat == PIXELFORMAT_RGBA16F)
pasteRGBA32FtoRGBA16F(rowsrc, rowdst, sw);
else
throw love::Exception("Unsupported pixel format combination in ImageData:paste!");
} }
} }
} }
void ImageData::pasteRGBA8toRGBA16(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u16[i] = (uint16) src.u8[i] << 8u;
}
void ImageData::pasteRGBA8toRGBA16F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f16[i] = floatToHalf(src.u8[i] / 255.0f);
}
void ImageData::pasteRGBA8toRGBA32F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f32[i] = src.u8[i] / 255.0f;
}
void ImageData::pasteRGBA16toRGBA8(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u8[i] = src.u16[i] >> 8u;
}
void ImageData::pasteRGBA16toRGBA16F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f16[i] = floatToHalf(src.u16[i] / 65535.0f);
}
void ImageData::pasteRGBA16toRGBA32F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f32[i] = src.u16[i] / 65535.0f;
}
void ImageData::pasteRGBA16FtoRGBA8(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u8[i] = (uint8) (halfToFloat(src.f16[i]) * 255.0f);
}
void ImageData::pasteRGBA16FtoRGBA16(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u16[i] = (uint16) (halfToFloat(src.f16[i]) * 65535.0f);
}
void ImageData::pasteRGBA16FtoRGBA32F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f32[i] = halfToFloat(src.f16[i]);
}
void ImageData::pasteRGBA32FtoRGBA8(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u8[i] = (uint8) (src.f32[i] * 255.0f);
}
void ImageData::pasteRGBA32FtoRGBA16(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.u16[i] = (uint16) (src.f32[i] * 65535.0f);
}
void ImageData::pasteRGBA32FtoRGBA16F(Row src, Row dst, int w)
{
for (int i = 0; i < w * 4; i++)
dst.f16[i] = (uint16) floatToHalf(src.f32[i]);
}
love::thread::Mutex *ImageData::getMutex() const love::thread::Mutex *ImageData::getMutex() const
{ {
return mutex; return mutex;
src/modules/image/ImageData.h
+24
View File
@@ -140,6 +140,30 @@ protected:
private: private:
union Row
{
uint8 *u8;
uint16 *u16;
half *f16;
float *f32;
};
static void pasteRGBA8toRGBA16(Row src, Row dst, int w);
static void pasteRGBA8toRGBA16F(Row src, Row dst, int w);
static void pasteRGBA8toRGBA32F(Row src, Row dst, int w);
static void pasteRGBA16toRGBA8(Row src, Row dst, int w);
static void pasteRGBA16toRGBA16F(Row src, Row dst, int w);
static void pasteRGBA16toRGBA32F(Row src, Row dst, int w);
static void pasteRGBA16FtoRGBA8(Row src, Row dst, int w);
static void pasteRGBA16FtoRGBA16(Row src, Row dst, int w);
static void pasteRGBA16FtoRGBA32F(Row src, Row dst, int w);
static void pasteRGBA32FtoRGBA8(Row src, Row dst, int w);
static void pasteRGBA32FtoRGBA16(Row src, Row dst, int w);
static void pasteRGBA32FtoRGBA16F(Row src, Row dst, int w);
static StringMap<EncodedFormat, ENCODED_MAX_ENUM>::Entry encodedFormatEntries[]; static StringMap<EncodedFormat, ENCODED_MAX_ENUM>::Entry encodedFormatEntries[];
static StringMap<EncodedFormat, ENCODED_MAX_ENUM> encodedFormats; static StringMap<EncodedFormat, ENCODED_MAX_ENUM> encodedFormats;