diff options
| author | Jacek Antonelli | 2008-08-15 23:45:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:57 -0500 |
| commit | 7e3007b63521c4b0c5bbad1c3964a557fc526ce2 (patch) | |
| tree | ab231ed574db618873d6ebb25293cf7c0cb6d26e /linden/indra/llimage | |
| parent | Second Life viewer sources 1.20.10 (diff) | |
| download | meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.zip meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.gz meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.bz2 meta-impy-7e3007b63521c4b0c5bbad1c3964a557fc526ce2.tar.xz | |
Second Life viewer sources 1.20.11
Diffstat (limited to 'linden/indra/llimage')
| -rw-r--r-- | linden/indra/llimage/llimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp index 65d19de..508be01 100644 --- a/linden/indra/llimage/llimage.cpp +++ b/linden/indra/llimage/llimage.cpp | |||
| @@ -842,8 +842,8 @@ void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data ) | |||
| 842 | U8* temp_buffer = new U8[ temp_data_size ]; | 842 | U8* temp_buffer = new U8[ temp_data_size ]; |
| 843 | if (!temp_buffer) | 843 | if (!temp_buffer) |
| 844 | { | 844 | { |
| 845 | llerrs << "Out of memory in LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )" << llendl; | 845 | llerrs << "Out of memory in LLImageRaw::scale: old (w, h, c) = (" << old_width << ", " << old_height << ", " << (S32)getComponents() << |
| 846 | return; | 846 | ") ; new (w, h, c) = (" << new_width << ", " << new_height << ", " << (S32)getComponents() << ")" << llendl; |
| 847 | } | 847 | } |
| 848 | memcpy(temp_buffer, getData(), temp_data_size); /* Flawfinder: ignore */ | 848 | memcpy(temp_buffer, getData(), temp_data_size); /* Flawfinder: ignore */ |
| 849 | 849 | ||