From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- modules/pbm/bitmap_loader_pbm.cpp | 154 +++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 87 deletions(-) (limited to 'modules/pbm/bitmap_loader_pbm.cpp') diff --git a/modules/pbm/bitmap_loader_pbm.cpp b/modules/pbm/bitmap_loader_pbm.cpp index f9fc19b2c..6e7d989fa 100644 --- a/modules/pbm/bitmap_loader_pbm.cpp +++ b/modules/pbm/bitmap_loader_pbm.cpp @@ -30,30 +30,27 @@ #include "os/file_access.h" #include "scene/resources/bit_mask.h" - -static bool _get_token(FileAccessRef& f,uint8_t &saved,DVector& r_token,bool p_binary=false,bool p_single_chunk=false) { - +static bool _get_token(FileAccessRef &f, uint8_t &saved, DVector &r_token, bool p_binary = false, bool p_single_chunk = false) { int token_max = r_token.size(); DVector::Write w; if (token_max) - w=r_token.write(); - int ofs=0; - bool lf=false; - + w = r_token.write(); + int ofs = 0; + bool lf = false; - while(true) { + while (true) { uint8_t b; if (saved) { - b=saved; - saved=0; + b = saved; + saved = 0; } else { b = f->get_8(); } if (f->eof_reached()) { if (ofs) { - w=DVector::Write(); + w = DVector::Write(); r_token.resize(ofs); return true; } else { @@ -61,9 +58,9 @@ static bool _get_token(FileAccessRef& f,uint8_t &saved,DVector& r_token } } - if (!ofs && !p_binary && b=='#') { + if (!ofs && !p_binary && b == '#') { //skip comment - while(b!='\n') { + while (b != '\n') { if (f->eof_reached()) { return false; } @@ -71,182 +68,165 @@ static bool _get_token(FileAccessRef& f,uint8_t &saved,DVector& r_token b = f->get_8(); } - lf=true; + lf = true; - } else if (b<=32 && !(p_binary && (ofs || lf))) { + } else if (b <= 32 && !(p_binary && (ofs || lf))) { - if (b=='\n') { - lf=true; + if (b == '\n') { + lf = true; } - if (ofs && !p_single_chunk) { - w=DVector::Write(); + w = DVector::Write(); r_token.resize(ofs); - saved=b; + saved = b; return true; } } else { - bool resized=false; - while (ofs>=token_max) { + bool resized = false; + while (ofs >= token_max) { if (token_max) - token_max<<=1; + token_max <<= 1; else - token_max=1; - resized=true; + token_max = 1; + resized = true; } if (resized) { - w=DVector::Write(); + w = DVector::Write(); r_token.resize(token_max); - w=r_token.write(); + w = r_token.write(); } - w[ofs++]=b; + w[ofs++] = b; } } return false; } -static int _get_number_from_token(DVector& r_token) { +static int _get_number_from_token(DVector &r_token) { int len = r_token.size(); DVector::Read r = r_token.read(); - return String::to_int((const char*)r.ptr(),len); - + return String::to_int((const char *)r.ptr(), len); } +RES ResourceFormatPBM::load(const String &p_path, const String &p_original_path, Error *r_error) { -RES ResourceFormatPBM::load(const String &p_path,const String& p_original_path,Error *r_error) { - -#define _RETURN(m_err)\ -{\ - if (r_error)\ - *r_error=m_err;\ - ERR_FAIL_V(RES());\ -} - +#define _RETURN(m_err) \ + { \ + if (r_error) \ + *r_error = m_err; \ + ERR_FAIL_V(RES()); \ + } - FileAccessRef f=FileAccess::open(p_path,FileAccess::READ); - uint8_t saved=0; + FileAccessRef f = FileAccess::open(p_path, FileAccess::READ); + uint8_t saved = 0; if (!f) _RETURN(ERR_CANT_OPEN); DVector token; - if (!_get_token(f,saved,token)) { + if (!_get_token(f, saved, token)) { _RETURN(ERR_PARSE_ERROR); } - if (token.size()!=2) { + if (token.size() != 2) { _RETURN(ERR_FILE_CORRUPT); } - if (token[0]!='P') { + if (token[0] != 'P') { _RETURN(ERR_FILE_CORRUPT); } - if (token[1]!='1' && token[1]!='4') { + if (token[1] != '1' && token[1] != '4') { _RETURN(ERR_FILE_CORRUPT); } - bool bits = token[1]=='4'; + bool bits = token[1] == '4'; - if (!_get_token(f,saved,token)) { + if (!_get_token(f, saved, token)) { _RETURN(ERR_PARSE_ERROR); } int width = _get_number_from_token(token); - if (width<=0) { + if (width <= 0) { _RETURN(ERR_FILE_CORRUPT); } - - if (!_get_token(f,saved,token)) { + if (!_get_token(f, saved, token)) { _RETURN(ERR_PARSE_ERROR); } int height = _get_number_from_token(token); - if (height<=0) { + if (height <= 0) { _RETURN(ERR_FILE_CORRUPT); } - Ref bm; bm.instance(); - bm->create(Size2i(width,height)); + bm->create(Size2i(width, height)); if (!bits) { - int required_bytes = width*height; - if (!_get_token(f,saved,token,false,true)) { + int required_bytes = width * height; + if (!_get_token(f, saved, token, false, true)) { _RETURN(ERR_PARSE_ERROR); } - if (token.size()::Read r=token.read(); - - for(int i=0;i::Read r = token.read(); + for (int i = 0; i < height; i++) { + for (int j = 0; j < width; j++) { - char num = r[i*width+j]; - bm->set_bit(Point2i(j,i),num=='0'); + char num = r[i * width + j]; + bm->set_bit(Point2i(j, i), num == '0'); } - } - - } else { //a single, entire token of bits! - if (!_get_token(f,saved,token,true)) { + if (!_get_token(f, saved, token, true)) { _RETURN(ERR_PARSE_ERROR); } - int required_bytes = Math::ceil((width*height)/8.0); - if (token.size()::Read r=token.read(); + DVector::Read r = token.read(); int bitwidth = width; if (bitwidth % 8) - bitwidth+=8-(bitwidth%8); + bitwidth += 8 - (bitwidth % 8); - for(int i=0;i>(7-(ofs%8)))&1; - - bm->set_bit(Point2i(j,i),!bit); + uint8_t byte = r[ofs / 8]; + bool bit = (byte >> (7 - (ofs % 8))) & 1; + bm->set_bit(Point2i(j, i), !bit); } - } - } return bm; - - } void ResourceFormatPBM::get_recognized_extensions(List *p_extensions) const { p_extensions->push_back("pbm"); } -bool ResourceFormatPBM::handles_type(const String& p_type) const { - return p_type=="BitMap"; +bool ResourceFormatPBM::handles_type(const String &p_type) const { + return p_type == "BitMap"; } String ResourceFormatPBM::get_resource_type(const String &p_path) const { - if (p_path.extension().to_lower()=="pbm") + if (p_path.extension().to_lower() == "pbm") return "BitMap"; return ""; } - - -- cgit v1.3.1