godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use placement new in texture_loader_pvr.cpp (#24417).

Browse Source 
Use constructor via placement new and swap colors directly.
This commit is contained in:
marxin 2019-01-25 11:49:06 +01:00
parent 00ec3e9d2a
commit 32713e60ab
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/pvr/texture_loader_pvr.cpp
View File

@ -33,6 +33,7 @@
#include "RgbaBitmap.h" #include "RgbaBitmap.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#include <string.h> #include <string.h>
#include <new>
static void _pvrtc_decompress(Image *p_img); static void _pvrtc_decompress(Image *p_img);
@ -215,12 +216,10 @@ static void _compress_pvrtc4(Image *p_img) {
int ofs, size, w, h; int ofs, size, w, h;
img->get_mipmap_offset_size_and_dimensions(i, ofs, size, w, h); img->get_mipmap_offset_size_and_dimensions(i, ofs, size, w, h);
Javelin::RgbaBitmap bm(w, h); Javelin::RgbaBitmap bm(w, h);
copymem(bm.GetData(), &r[ofs], size); for (unsigned j = 0; j < size / 4; j++) {
{
Javelin::ColorRgba<unsigned char> *dp = bm.GetData(); Javelin::ColorRgba<unsigned char> *dp = bm.GetData();
for (int j = 0; j < size / 4; j++) { /* red and Green colors are swapped. */
SWAP(dp[j].r, dp[j].b); new (dp) Javelin::ColorRgba<unsigned char>(r[ofs + 4 * j + 2], r[ofs + 4 * j + 1], r[ofs + 4 * j], r[ofs + 4 * j + 3]);
}
} }
new_img->get_mipmap_offset_size_and_dimensions(i, ofs, size, w, h); new_img->get_mipmap_offset_size_and_dimensions(i, ofs, size, w, h);