diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
| commit | 050919103f76dbe4aebaa8ac8a1e2633713ee571 (patch) | |
| tree | 1ff838116d1bdfa2607daf40eba4a38eb2404b8c /src/Fl_XPM_Image.cxx | |
| parent | a6b935289ed59305318929b857bf74f671125e87 (diff) | |
More shadow variable changes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2567 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_XPM_Image.cxx')
| -rw-r--r-- | src/Fl_XPM_Image.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Fl_XPM_Image.cxx b/src/Fl_XPM_Image.cxx index 3f963eeb6..4901e2949 100644 --- a/src/Fl_XPM_Image.cxx +++ b/src/Fl_XPM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_XPM_Image.cxx,v 1.1.2.6 2002/05/25 13:38:24 easysw Exp $" +// "$Id: Fl_XPM_Image.cxx,v 1.1.2.7 2002/08/09 03:17:30 easysw Exp $" // // Fl_XPM_Image routines. // @@ -77,9 +77,9 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { q++; int n = 0; for (int x = 0; x < 3; x++) { - int d = hexdigit(*q); - if (d > 15) break; - n = (n<<4)+d; + int xd = hexdigit(*q); + if (xd > 15) break; + n = (n<<4)+xd; q++; } *myp++ = n; @@ -89,9 +89,9 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { if (c>='0' && c<='7') { c -= '0'; for (int x=0; x<2; x++) { - int d = hexdigit(*q); - if (d>7) break; - c = (c<<3)+d; + int xd = hexdigit(*q); + if (xd>7) break; + c = (c<<3)+xd; q++; } } @@ -125,5 +125,5 @@ Fl_XPM_Image::Fl_XPM_Image(const char *name) : Fl_Pixmap((char *const*)0) { // -// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.6 2002/05/25 13:38:24 easysw Exp $". +// End of "$Id: Fl_XPM_Image.cxx,v 1.1.2.7 2002/08/09 03:17:30 easysw Exp $". // |