Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future

Browse Source
This commit is contained in:
Siana Gearz
2011-10-04 16:26:11 +02:00
parent 13e13ca862 ee9649bf2a
commit 6590172641
20 changed files with 120 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llimage/llimage.cpp
View File

@@ -165,7 +165,7 @@ U8* LLImageBase::allocateData(S32 size)
{
deleteData(); // virtual
mBadBufferAllocation = FALSE ;
mData = new U8[size];
mData = new (std::nothrow) U8[size];
if (!mData)
{
llwarns << "allocate image data: " << size << llendl;
@@ -186,7 +186,7 @@ U8* LLImageBase::reallocateData(S32 size)
return mData;
LLMemType mt1((LLMemType::EMemType)mMemType);
U8 *new_datap = new U8[size];
U8 *new_datap = new (std::nothrow) U8[size];
if (!new_datap)
{
llwarns << "Out of memory in LLImageBase::reallocateData" << llendl;
@@ -349,7 +349,7 @@ BOOL LLImageRaw::resize(U16 width, U16 height, S8 components)
U8 * LLImageRaw::getSubImage(U32 x_pos, U32 y_pos, U32 width, U32 height) const
{
LLMemType mt1((LLMemType::EMemType)mMemType);
U8 *data = new U8[width*height*getComponents()];
U8 *data = new (std::nothrow) U8[width*height*getComponents()];
// Should do some simple bounds checking
if (!data)
@@ -433,7 +433,7 @@ void LLImageRaw::verticalFlip()
{
LLMemType mt1((LLMemType::EMemType)mMemType);
S32 row_bytes = getWidth() * getComponents();
U8* line_buffer = new U8[row_bytes];
U8* line_buffer = new (std::nothrow) U8[row_bytes];
if (!line_buffer )
{
llerrs << "Out of memory in LLImageRaw::verticalFlip()" << llendl;
@@ -578,7 +578,7 @@ void LLImageRaw::compositeScaled4onto3(LLImageRaw* src)
// Vertical: scale but no composite
S32 temp_data_size = src->getWidth() * dst->getHeight() * src->getComponents();
U8* temp_buffer = new U8[ temp_data_size ];
U8* temp_buffer = new (std::nothrow) U8[ temp_data_size ];
if (!temp_buffer )
{
llerrs << "Out of memory in LLImageRaw::compositeScaled4onto3()" << llendl;
@@ -835,7 +835,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
// Vertical
S32 temp_data_size = src->getWidth() * dst->getHeight() * getComponents();
llassert_always(temp_data_size > 0);
U8* temp_buffer = new U8[ temp_data_size ];
U8* temp_buffer = new (std::nothrow) U8[ temp_data_size ];
if (!temp_buffer )
{
llerrs << "Out of memory in LLImageRaw::copyScaled()" << llendl;
@@ -880,7 +880,7 @@ BOOL LLImageRaw::scaleDownWithoutBlending( S32 new_width, S32 new_height)
ratio_x -= 1.0f ;
ratio_y -= 1.0f ;
U8* new_data = new U8[new_data_size] ;
U8* new_data = new (std::nothrow) U8[new_data_size] ;
llassert_always(new_data != NULL) ;
U8* old_data = getData() ;
@@ -923,7 +923,7 @@ BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
// Vertical
S32 temp_data_size = old_width * new_height * getComponents();
llassert_always(temp_data_size > 0);
U8* temp_buffer = new U8[ temp_data_size ];
U8* temp_buffer = new (std::nothrow) U8[ temp_data_size ];
if (!temp_buffer )
{
llerrs << "Out of memory in LLImageRaw::scale()" << llendl;
@@ -951,7 +951,7 @@ BOOL LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
{
// copy out existing image data
S32 temp_data_size = old_width * old_height * getComponents();
U8* temp_buffer = new U8[ temp_data_size ];
U8* temp_buffer = new (std::nothrow) U8[ temp_data_size ];
if (!temp_buffer)
{
llwarns << "Out of memory in LLImageRaw::scale: old (w, h, c) = (" << old_width << ", " << old_height << ", " << (S32)getComponents() <<

2
indra/llimage/llimagedxt.cpp
View File

@@ -435,7 +435,7 @@ bool LLImageDXT::convertToDXR()
S32 nmips = calcNumMips(width,height);
S32 total_bytes = getDataSize();
U8* olddata = getData();
U8* newdata = new U8[total_bytes];
U8* newdata = new (std::nothrow) U8[total_bytes];
if (!newdata)
{
llerrs << "Out of memory in LLImageDXT::convertToDXR()" << llendl;

1
indra/llimage/llimagedxt.h
View File

@@ -33,6 +33,7 @@
#define LL_LLIMAGEDXT_H
#include "llimage.h"
#include "llpointer.h"
// This class decodes and encodes LL DXT files (which may unclude uncompressed RGB or RGBA mipped data)

5
indra/llimage/llimageworker.cpp
View File

@@ -43,6 +43,11 @@ LLImageDecodeThread::LLImageDecodeThread(bool threaded)
{
}
//virtual
LLImageDecodeThread::~LLImageDecodeThread()
{
}
// MAIN THREAD
// virtual
S32 LLImageDecodeThread::update(U32 max_time_ms)

5
indra/llimage/llimageworker.h
View File

@@ -34,7 +34,8 @@
#define LL_LLIMAGEWORKER_H
#include "llimage.h"
#include "llqueuedthread.h"
#include "llpointer.h"
#include "llworkerthread.h"
class LLImageDecodeThread : public LLQueuedThread
{
@@ -78,6 +79,8 @@ public:
public:
LLImageDecodeThread(bool threaded = true);
virtual ~LLImageDecodeThread();
handle_t decodeImage(LLImageFormatted* image,
U32 priority, S32 discard, BOOL needs_aux,
Responder* responder);