FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #856 from elsid/fix_build_with_libcxx

Browse Source 
Fix clang 8 & libc++ build errors
This commit is contained in:
OpenSceneGraph git repository 2019-12-12 11:28:55 +00:00 committed by GitHub
commit f63b2e05c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/osgPlugins/tga/ReaderWriterTGA.cpp
View File

@ -322,10 +322,13 @@ struct SafeArray
impl = new T[size]; impl = new T[size];
} }
operator T*() { return impl; } const T& operator[](std::size_t i) const { return impl[i]; }
template<typename U> T& operator[](std::size_t i) { return impl[i]; }
operator U() { return (U)impl; }
const T* data() const { return impl; }
T* data() { return impl; }
private: private:
T* impl; T* impl;
@ -452,12 +455,12 @@ int *numComponents_ret)
colormapLen = getInt16(&header[5]); colormapLen = getInt16(&header[5]);
colormapDepth = (header[7] + 7) >> 3; colormapDepth = (header[7] + 7) >> 3;
colormap.reinitialise(colormapLen*colormapDepth); colormap.reinitialise(colormapLen*colormapDepth);
if (colormap == NULL) if (colormap.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
} }
fin.read((char*)colormap, colormapLen*colormapDepth); fin.read(reinterpret_cast<char*>(colormap.data()), colormapLen*colormapDepth);
if (colormapDepth == 2) /* 16 bits */ if (colormapDepth == 2) /* 16 bits */
{ {
@ -518,11 +521,11 @@ int *numComponents_ret)
rleRemaining = 0; rleRemaining = 0;
rleEntrySize = depth; rleEntrySize = depth;
SafeArray<unsigned char> buffer(width*height*format); SafeArray<unsigned char> buffer(width*height*format);
dest = buffer; dest = buffer.data();
bpr = format * width; bpr = format * width;
SafeArray<unsigned char> linebuf(width * depth); SafeArray<unsigned char> linebuf(width * depth);
if (buffer == NULL || linebuf == NULL) if (buffer.data() == NULL || linebuf.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
@ -545,20 +548,20 @@ int *numComponents_ret)
return NULL; return NULL;
} }
SafeArray<unsigned char> formattedMap(colormapLen * format); SafeArray<unsigned char> formattedMap(colormapLen * format);
if (formattedMap == NULL) if (formattedMap.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
} }
for (int i = 0; i < colormapLen; i++) for (int i = 0; i < colormapLen; i++)
{ {
convert_data(colormap, formattedMap, i, colormapDepth, format); convert_data(colormap.data(), formattedMap.data(), i, colormapDepth, format);
} }
int x, y; int x, y;
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
fin.read((char*)linebuf, width*depth); fin.read(reinterpret_cast<char*>(linebuf.data()), width*depth);
if (fin.gcount() != (std::streamsize) (width*depth)) if (fin.gcount() != (std::streamsize) (width*depth))
{ {
tgaerror = ERR_READ; tgaerror = ERR_READ;
@ -574,13 +577,13 @@ int *numComponents_ret)
index = linebuf[x]; index = linebuf[x];
break; break;
case 2: case 2:
index = getInt16(linebuf + x * 2); index = getInt16(linebuf.data() + x * 2);
break; break;
case 3: case 3:
index = getInt24(linebuf + x * 3); index = getInt24(linebuf.data() + x * 3);
break; break;
case 4: case 4:
index = getInt32(linebuf + x * 4); index = getInt32(linebuf.data() + x * 4);
break; break;
default: default:
tgaerror = ERR_UNSUPPORTED; tgaerror = ERR_UNSUPPORTED;
@ -589,7 +592,7 @@ int *numComponents_ret)
int adjustedX = bLeftToRight ? x : (width - 1) - x; int adjustedX = bLeftToRight ? x : (width - 1) - x;
for (int i = 0; i < format; i++) for (int i = 0; i < format; i++)
(dest + adjustedX * format)[i] = (formattedMap + index * format)[i]; (dest + adjustedX * format)[i] = formattedMap[index * format + i];
} }
dest += lineoffset; dest += lineoffset;
} }
@ -601,7 +604,7 @@ int *numComponents_ret)
int x, y; int x, y;
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
fin.read((char*)linebuf,width*depth); fin.read(reinterpret_cast<char*>(linebuf.data()), width*depth);
if (fin.gcount() != (std::streamsize) (width*depth)) if (fin.gcount() != (std::streamsize) (width*depth))
{ {
tgaerror = ERR_READ; tgaerror = ERR_READ;
@ -609,7 +612,7 @@ int *numComponents_ret)
} }
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
convert_data(linebuf, dest, bLeftToRight ? x : (width-1) - x, depth, format); convert_data(linebuf.data(), dest, bLeftToRight ? x : (width-1) - x, depth, format);
} }
dest += lineoffset; dest += lineoffset;
} }
@ -623,14 +626,14 @@ int *numComponents_ret)
return NULL; return NULL;
} }
SafeArray<unsigned char> formattedMap(colormapLen * format); SafeArray<unsigned char> formattedMap(colormapLen * format);
if (formattedMap == NULL) if (formattedMap.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
} }
for (int i = 0; i < colormapLen; i++) for (int i = 0; i < colormapLen; i++)
{ {
convert_data(colormap, formattedMap, i, colormapDepth, format); convert_data(colormap.data(), formattedMap.data(), i, colormapDepth, format);
} }
int size, x, y; int size, x, y;
@ -639,19 +642,19 @@ int *numComponents_ret)
size = (int)(endOfImage - pos); size = (int)(endOfImage - pos);
SafeArray<unsigned char> buf(size); SafeArray<unsigned char> buf(size);
if (buf == NULL) if (buf.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
} }
unsigned char* src = buf; unsigned char* src = buf.data();
fin.read((char*)buf, size); fin.read(reinterpret_cast<char*>(buf.data()), size);
if (fin.gcount() == (std::streamsize)size) if (fin.gcount() == (std::streamsize)size)
{ {
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
rle_decode(&src, linebuf, width*depth, &rleRemaining, rle_decode(&src, linebuf.data(), width*depth, &rleRemaining,
&rleIsCompressed, rleCurrent, rleEntrySize); &rleIsCompressed, rleCurrent, rleEntrySize);
assert(src <= buf + size); assert(src <= buf + size);
@ -664,13 +667,13 @@ int *numComponents_ret)
index = linebuf[x]; index = linebuf[x];
break; break;
case 2: case 2:
index = getInt16(linebuf + x * 2); index = getInt16(linebuf.data() + x * 2);
break; break;
case 3: case 3:
index = getInt24(linebuf + x * 3); index = getInt24(linebuf.data() + x * 3);
break; break;
case 4: case 4:
index = getInt32(linebuf + x * 4); index = getInt32(linebuf.data() + x * 4);
break; break;
default: default:
tgaerror = ERR_UNSUPPORTED; tgaerror = ERR_UNSUPPORTED;
@ -685,7 +688,7 @@ int *numComponents_ret)
int adjustedX = bLeftToRight ? x : (width - 1) - x; int adjustedX = bLeftToRight ? x : (width - 1) - x;
for (int i = 0; i < format; i++) for (int i = 0; i < format; i++)
(dest + adjustedX * format)[i] = (formattedMap + index * format)[i]; (dest + adjustedX * format)[i] = formattedMap[index * format + i];
} }
dest += lineoffset; dest += lineoffset;
} }
@ -705,24 +708,24 @@ int *numComponents_ret)
size = (int)(endOfImage - pos); size = (int)(endOfImage - pos);
SafeArray<unsigned char> buf(size); SafeArray<unsigned char> buf(size);
if (buf == NULL) if (buf.data() == NULL)
{ {
tgaerror = ERR_MEM; tgaerror = ERR_MEM;
return NULL; return NULL;
} }
unsigned char* src = buf; unsigned char* src = buf.data();
fin.read((char*)buf,size); fin.read(reinterpret_cast<char*>(buf.data()), size);
if (fin.gcount() == (std::streamsize) size) if (fin.gcount() == (std::streamsize) size)
{ {
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
rle_decode(&src, linebuf, width*depth, &rleRemaining, rle_decode(&src, linebuf.data(), width*depth, &rleRemaining,
&rleIsCompressed, rleCurrent, rleEntrySize); &rleIsCompressed, rleCurrent, rleEntrySize);
assert(src <= buf + size); assert(src <= buf + size);
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
convert_data(linebuf, dest, bLeftToRight ? x : (width-1) - x, depth, format); convert_data(linebuf.data(), dest, bLeftToRight ? x : (width-1) - x, depth, format);
} }
dest += lineoffset; dest += lineoffset;
} }