clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: C9: the bitmap decoders and pixel helpers are CBitmapRes members in the original (they call Unload through the vtable at

Browse source 
Batch #18237 by ragnarok-clanker: forced by an admin (1 lower score(s), 14 changed function(s)); checked with 437 compiled unit(s), including every includer of Source/Resource/Bitmap/BitmapImage.h, Source/Resource/Bitmap/BitmapResource.h, Source/UI/Window/UIWindow.h.
This commit is contained in:
ragnarok-clanker 2026-11-12 11:59:34 +00:00
commit da97b80236
11 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/Resource/Bitmap/BitmapImagePng.cpp
View file

@ -1,4 +1,4 @@
#include "Resource/Bitmap/BitmapImage.h"
#include "Resource/Bitmap/BitmapResource.h"
#include <cstdlib>
#include <cstring>
@ -25,7 +25,7 @@ namespace {
// OFFSET: 0x0074BF10
// FUNCTION: fn_07872
bool BitmapImage::DecodePng(const void* data, int bytes, const char*) {
bool CBitmapRes::DecodePng(const void* data, int bytes, const char*) {
unsigned char signature[8] = {};
if (data) {
std::memcpy(signature, data, sizeof(signature));
@ -60,8 +60,8 @@ bool BitmapImage::DecodePng(const void* data, int bytes, const char*) {
std::iostream stream(&buffer);
png_set_read_fn(png, &stream, ReadPng);
png_read_info(png, info);
this->width = png_get_image_width(png, info);
this->height = png_get_image_height(png, info);
this->image.width = png_get_image_width(png, info);
this->image.height = png_get_image_height(png, info);
const unsigned colorType = png_get_color_type(png, info);
const unsigned depth = png_get_bit_depth(png, info);
png_set_interlace_handling(png);
@ -91,27 +91,27 @@ bool BitmapImage::DecodePng(const void* data, int bytes, const char*) {
}
png_read_update_info(png, info);
auto** rows = static_cast<png_bytep*>(std::malloc(sizeof(png_bytep) * static_cast<std::uint32_t>(this->height)));
auto** rows = static_cast<png_bytep*>(std::malloc(sizeof(png_bytep) * static_cast<std::uint32_t>(this->image.height)));
for (int y = 0; y < this->height; ++y) {
for (int y = 0; y < this->image.height; ++y) {
rows[y] = static_cast<png_bytep>(std::malloc(png_get_rowbytes(png, info)));
}
png_read_image(png, rows);
this->pixels = new std::uint32_t[this->width * this->height];
this->image.pixels = new std::uint32_t[this->image.width * this->image.height];
for (int y = 0; y < this->height; ++y) {
for (int y = 0; y < this->image.height; ++y) {
const unsigned char* pixel = rows[y];
std::uint32_t* out = &this->pixels[this->width * y];
for (int x = 0; x < this->width; ++x) {
std::uint32_t* out = &this->image.pixels[this->image.width * y];
for (int x = 0; x < this->image.width; ++x) {
*out++ = (((((pixel[3] << 8) + pixel[0]) << 8) + pixel[1]) << 8) + pixel[2];
pixel += 4;
}
}
this->alpha = 1;
this->image.alpha = 1;
for (int y = 0; y < this->height; ++y) {
for (int y = 0; y < this->image.height; ++y) {
std::free(rows[y]);
}