TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

correct RGB reversal

Browse Source
This commit is contained in:
David Rose 2009-07-09 18:33:22 +00:00
parent 3f6d8ab9b1
commit 68fd96555c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
direct/src/plugin/p3dWinSplashWindow.cxx
View File

@ -467,6 +467,24 @@ update_image_filename(const string &image_filename, bool image_filename_temp) {
return;
}
size_t data_length = data.length();
char *new_data = new char[data_length];
memcpy(new_data, data.data(), data_length);
if (num_channels == 3) {
// We have to reverse the order of the RGB channels: libjpeg and
// Windows follow an opposite convention.
for (int yi = 0; yi < _bitmap_height; ++yi) {
char *dp = new_data + yi * row_stride;
for (int xi = 0; xi < _bitmap_width; ++xi) {
char b = dp[0];
dp[0] = dp[2];
dp[2] = b;
dp += 3;
}
}
}
// Now load the image.
BITMAPINFOHEADER bmih;
bmih.biSize = sizeof(bmih);
@ -485,9 +503,11 @@ update_image_filename(const string &image_filename, bool image_filename_temp) {
memcpy(&bmi, &bmih, sizeof(bmih));
HDC dc = GetDC(_hwnd);
_bitmap = CreateDIBitmap(dc, &bmih, CBM_INIT, data.data(), &bmi, 0);
_bitmap = CreateDIBitmap(dc, &bmih, CBM_INIT, new_data, &bmi, 0);
ReleaseDC(_hwnd, dc);
delete[] new_data;
nout << "Loaded splash file image: " << image_filename << "\n"
<< flush;
}