asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loading unaligned pbm

Browse source
This commit is contained in:
Ariel Manzur 2016-01-12 06:19:56 -03:00
parent a625f7d073
commit 761b08ec8f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/pnm/bitmap_loader_pnm.cpp
View file

@ -170,15 +170,12 @@ RES ResourceFormatPBM::load(const String &p_path,const String& p_original_path,E
} }
DVector<uint8_t>::Read r=token.read(); DVector<uint8_t>::Read r=token.read();
int bitwidth = width;
if (bitwidth % 8)
bitwidth+=8-(bitwidth%8);
for(int i=0;i<height;i++) { for(int i=0;i<height;i++) {
for(int j=0;j<width;j++) { for(int j=0;j<width;j++) {
char num = r[i*bitwidth+j]; char num = r[i*width+j];
bm->set_bit(Point2i(j,i),num=='0'); bm->set_bit(Point2i(j,i),num=='0');
} }
@ -197,11 +194,14 @@ RES ResourceFormatPBM::load(const String &p_path,const String& p_original_path,E
} }
DVector<uint8_t>::Read r=token.read(); DVector<uint8_t>::Read r=token.read();
int bitwidth = width;
if (bitwidth % 8)
bitwidth+=8-(bitwidth%8);
for(int i=0;i<height;i++) { for(int i=0;i<height;i++) {
for(int j=0;j<width;j++) { for(int j=0;j<width;j++) {
int ofs = width*i+j; int ofs = bitwidth*i+j;
uint8_t byte = r[ofs/8]; uint8_t byte = r[ofs/8];
bool bit = (byte>>(7-(ofs%8)))&1; bool bit = (byte>>(7-(ofs%8)))&1;