Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce the scope of some local variables

Browse Source
This commit is contained in:
Paul Cornett
2019-04-05 10:44:02 -07:00
parent af1cf0a5f3
commit fe1737d399
63 changed files with 163 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/image.cpp
View File

@@ -1339,7 +1339,6 @@ wxImage wxImage::Rotate90( bool clockwise ) const
if ( source_alpha )
{
unsigned char *alpha_data = image.GetAlpha();
unsigned char *target_alpha = 0 ;
for (long ii = 0; ii < width; )
{
@@ -1351,6 +1350,7 @@ wxImage wxImage::Rotate90( bool clockwise ) const
for (long i = ii; i < next_ii; i++)
{
unsigned char* target_alpha;
if ( clockwise )
{
target_alpha = alpha_data + (i+1)*height - j - 1;
@@ -1929,10 +1929,10 @@ void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, uns
x2 = rect.GetRight() + 1,
y2 = rect.GetBottom() + 1;
unsigned char *data wxDUMMY_INITIALIZE(NULL);
int x, y, width = GetWidth();
for (y = y1; y < y2; y++)
{
unsigned char* data;
data = M_IMGDATA->m_data + (y*width + x1)*3;
for (x = x1; x < x2; x++)
{
@@ -3236,8 +3236,6 @@ void wxImage::RotateHue(double angle)
{
AllocExclusive();
unsigned char *srcBytePtr;
unsigned char *dstBytePtr;
unsigned long count;
wxImage::HSVValue hsv;
wxImage::RGBValue rgb;
@@ -3246,6 +3244,8 @@ void wxImage::RotateHue(double angle)
count = M_IMGDATA->m_width * M_IMGDATA->m_height;
if ( count > 0 && !wxIsNullDouble(angle) )
{
unsigned char* srcBytePtr;
unsigned char* dstBytePtr;
srcBytePtr = M_IMGDATA->m_data;
dstBytePtr = srcBytePtr;
do
@@ -3448,9 +3448,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) const
{
wxHashTable h;
wxObject dummy;
unsigned char r, g, b;
unsigned char *p;
unsigned long size, nentries, key;
unsigned long size, nentries;
p = GetData();
size = static_cast<unsigned long>(GetWidth()) * GetHeight();
@@ -3458,6 +3457,8 @@ unsigned long wxImage::CountColours( unsigned long stopafter ) const
for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
{
unsigned char r, g, b;
unsigned long key;
r = *(p++);
g = *(p++);
b = *(p++);
@@ -3483,9 +3484,9 @@ unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
const unsigned long size = static_cast<unsigned long>(GetWidth()) * GetHeight();
unsigned char r, g, b;
for ( unsigned long n = 0; n < size; n++ )
{
unsigned char r, g, b;
r = *p++;
g = *p++;
b = *p++;