Browse Source

remove conflict

master
Odilitime 5 years ago
parent
commit
c20b03416b
  1. 7
      src/parsers/images/netpbm/pnm.cpp

7
src/parsers/images/netpbm/pnm.cpp

@ -104,11 +104,8 @@ RGBAPNMObject * readPPM(const char* fileName) { @@ -104,11 +104,8 @@ RGBAPNMObject * readPPM(const char* fileName) {
std::cout << "read " << fileName << " pnm/pam " << width << "," << height << "@" << static_cast<int>(bits) << "(" << bits/8 << ")" << "/" << data->maxColVal << std::endl;
// allocate array for pixels
<<<<<<< Updated upstream:src/pnm.cpp
char* pixels = static_cast<char*>(tlsf_malloc(size)); // used to be: new char[size];
=======
unsigned char* pixels = reinterpret_cast<unsigned char*>(tlsf_calloc(size, sizeof(unsigned char))); // used to be: new char[size];
>>>>>>> Stashed changes:src/parsers/images/netpbm/pnm.cpp
unsigned char* pixels = static_cast<unsigned char*>(tlsf_malloc(size)); // used to be: new char[size];
//unsigned char* pixels = reinterpret_cast<unsigned char*>(tlsf_calloc(size, sizeof(unsigned char))); // used to be: new char[size];
// unformatted read of binary pixel data
res = fread(pixels, 1, size,fr);

Loading…
Cancel
Save