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_XBM_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_XBM_Image.cxx')
| -rw-r--r-- | src/Fl_XBM_Image.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_XBM_Image.cxx b/src/Fl_XBM_Image.cxx index 1de0bb6b0..1e6ab4c9d 100644 --- a/src/Fl_XBM_Image.cxx +++ b/src/Fl_XBM_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_XBM_Image.cxx,v 1.1.2.6 2002/06/28 15:23:03 easysw Exp $" +// "$Id: Fl_XBM_Image.cxx,v 1.1.2.7 2002/08/09 03:17:30 easysw Exp $" // // Fl_XBM_Image routines. // @@ -43,7 +43,7 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { FILE *f; - uchar *data; + uchar *ptr; if ((f = fopen(name, "rb")) == NULL) return; @@ -79,7 +79,7 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { array = new uchar[n]; // read the data: - for (i = 0, data = (uchar *)array; i < n;) { + for (i = 0, ptr = (uchar *)array; i < n;) { if (!fgets(buffer,1024,f)) { fclose(f); return; @@ -88,7 +88,7 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { while (*a && i<n) { int t; if (sscanf(a," 0x%x",&t)>0) { - *data++ = t; + *ptr++ = t; i ++; } while (*a && *a++ != ','); @@ -100,5 +100,5 @@ Fl_XBM_Image::Fl_XBM_Image(const char *name) : Fl_Bitmap((const char *)0,0,0) { // -// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.6 2002/06/28 15:23:03 easysw Exp $". +// End of "$Id: Fl_XBM_Image.cxx,v 1.1.2.7 2002/08/09 03:17:30 easysw Exp $". // |