summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2011-02-02 18:39:34 +0000
committerManolo Gouy <Manolo>2011-02-02 18:39:34 +0000
commit8072ef8ce89b5b94e7f705e1099b7e4e8c4c3a30 (patch)
treec8354ac58372c147fbebf80a037c16bb9ade1424 /src
parent40624df4a9ad48a5d60cb56b6b9428329bb37c17 (diff)
Replaced a bunch of delete by delete[] where it's legitimate.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8362 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Double_Window.cxx2
-rw-r--r--src/Fl_Native_File_Chooser_MAC.mm2
-rw-r--r--src/Fl_Paged_Device.cxx2
-rw-r--r--src/Fl_PostScript.cxx4
-rw-r--r--src/Fl_cocoa.mm2
-rw-r--r--src/fl_draw_pixmap.cxx2
-rw-r--r--src/fl_read_image_mac.cxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index fa59c8cec..bb9273e82 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -85,7 +85,7 @@ void fl_copy_offscreen(int x, int y, int w, int h, Fl_Offscreen pixmap, int srcx
uchar *img = fl_read_image(NULL, srcx, srcy, w, h, 0);
fl_end_offscreen();
fl_draw_image(img, x, y, w, h, 3, 0);
- delete img;
+ delete[] img;
}
}
/** @} */
diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm
index 9ed970d69..2927d86fb 100644
--- a/src/Fl_Native_File_Chooser_MAC.mm
+++ b/src/Fl_Native_File_Chooser_MAC.mm
@@ -504,7 +504,7 @@ int Fl_Native_File_Chooser::post() {
p = r + 1;
} while(*p);
popup = createPopupAccessory((NSSavePanel*)_panel, t, "Enable:", 0);
- delete t;
+ delete[] t;
[[popup menu] addItem:[NSMenuItem separatorItem]];
[popup addItemWithTitle:@"All Documents"];
[popup setAction:@selector(validateVisibleColumns)];
diff --git a/src/Fl_Paged_Device.cxx b/src/Fl_Paged_Device.cxx
index f6cf37815..6bdf24b30 100644
--- a/src/Fl_Paged_Device.cxx
+++ b/src/Fl_Paged_Device.cxx
@@ -141,7 +141,7 @@ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int
save_front->show();
current->set_current();
fl_draw_image(image_data, delta_x, delta_y, w, h, 3);
- delete image_data;
+ delete[] image_data;
}
/**
diff --git a/src/Fl_PostScript.cxx b/src/Fl_PostScript.cxx
index f1e9a8177..372b3e624 100644
--- a/src/Fl_PostScript.cxx
+++ b/src/Fl_PostScript.cxx
@@ -1017,7 +1017,7 @@ static void transformed_draw_extra(const char* str, int n, double x, double y, i
fl_delete_offscreen(off);
// compute the mask of what is not the background
uchar *mask = calc_mask(img, w, h, bg_color);
- delete img;
+ delete[] img;
// write the string image to PostScript as a scaled bitmask
fprintf(output, "%g %g %g %g %d %d MI\n", x, y - h*0.77/scale, w/scale, h/scale, w, h);
uchar *di;
@@ -1032,7 +1032,7 @@ static void transformed_draw_extra(const char* str, int n, double x, double y, i
fprintf(output,"\n");
}
fprintf(output,">\n");
- delete mask;
+ delete[] mask;
}
static int is_in_table(unsigned utf) {
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 90e40a07a..66c6373d9 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3265,7 +3265,7 @@ unsigned char *Fl_X::bitmap_from_window_rect(Fl_Window *win, int x, int y, int w
static void imgProviderReleaseData (void *info, const void *data, size_t size)
{
- delete (unsigned char *)data;
+ delete[] (unsigned char *)data;
}
CGImageRef Fl_X::CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h)
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index 25b485952..25262d5c7 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -370,7 +370,7 @@ int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) {
CGContextDrawImage(fl_gc, rect, img);
Fl_X::q_end_image();
CGImageRelease(img);
- delete array;
+ delete[] array;
}
else {
#endif // __APPLE_QUARTZ__
diff --git a/src/fl_read_image_mac.cxx b/src/fl_read_image_mac.cxx
index 2ccd5f56d..fb897293d 100644
--- a/src/fl_read_image_mac.cxx
+++ b/src/fl_read_image_mac.cxx
@@ -72,7 +72,7 @@ fl_read_image(uchar *p, // I - Pixel buffer or NULL to allocate
pdst[2] = psrc[2]; // B
}
}
- if(fl_window != NULL) delete base;
+ if(fl_window != NULL) delete[] base;
return p;
}