diff options
| author | MenTaLguY <mental@rydia.net> | 2006-05-28 19:51:13 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-05-28 19:51:13 +0000 |
| commit | 2d08a9d98d19a0581eeae687bb0322dc98806d40 (patch) | |
| tree | 3adec19e80f170b623e41454aae370cb7c75dade /src/dialogs | |
| parent | okay, that looked better in the icon preview than it did in practice; putting... (diff) | |
| download | inkscape-2d08a9d98d19a0581eeae687bb0322dc98806d40.tar.gz inkscape-2d08a9d98d19a0581eeae687bb0322dc98806d40.zip | |
replace nr_new() with g_new(), and try to converge on using the glib allocator a little more instead of the others (aside from libgc)
(bzr r1044)
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/clonetiler.cpp | 3 | ||||
| -rw-r--r-- | src/dialogs/iconpreview.cpp | 3 | ||||
| -rw-r--r-- | src/dialogs/stroke-style.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp index 64edcbfd5..e47437c72 100644 --- a/src/dialogs/clonetiler.cpp +++ b/src/dialogs/clonetiler.cpp @@ -13,6 +13,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include <glib/gmem.h> #include <gtk/gtk.h> #include <glibmm/i18n.h> @@ -778,7 +779,7 @@ clonetiler_trace_pick (NR::Rect box) int height = ibox.y1 - ibox.y0; /* Set up pixblock */ - guchar *px = nr_new(guchar, 4 * width * height); + guchar *px = g_new(guchar, 4 * width * height); memset(px, 0x00, 4 * width * height); /* Render */ diff --git a/src/dialogs/iconpreview.cpp b/src/dialogs/iconpreview.cpp index 6641b3bfb..90f48a4a6 100644 --- a/src/dialogs/iconpreview.cpp +++ b/src/dialogs/iconpreview.cpp @@ -19,6 +19,7 @@ #include <gtk/gtk.h> +#include <glib/gmem.h> #include <gtk/gtkdialog.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include <gtkmm/buttonbox.h> @@ -160,7 +161,7 @@ IconPreviewPanel::IconPreviewPanel() : pixMem[i] = new guchar[4 * sizes[i] * sizes[i]]; memset( pixMem[i], 0x00, 4 * sizes[i] * sizes[i] ); - GdkPixbuf *pb = gdk_pixbuf_new_from_data( pixMem[i], GDK_COLORSPACE_RGB, TRUE, 8, sizes[i], sizes[i], sizes[i] * 4, /*(GdkPixbufDestroyNotify)nr_free*/NULL, NULL ); + GdkPixbuf *pb = gdk_pixbuf_new_from_data( pixMem[i], GDK_COLORSPACE_RGB, TRUE, 8, sizes[i], sizes[i], sizes[i] * 4, /*(GdkPixbufDestroyNotify)g_free*/NULL, NULL ); GtkImage* img = GTK_IMAGE( gtk_image_new_from_pixbuf( pb ) ); images[i] = Glib::wrap(img); Glib::ustring label(*labels[i]); diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index 5fefb8aa9..8f345d837 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -23,6 +23,7 @@ +#include <glib/gmem.h> #include <gtk/gtk.h> #include <glibmm/i18n.h> @@ -590,7 +591,7 @@ sp_marker_prev_new(unsigned size, gchar const *mname, ua.y1 = MIN(ibox.y1, area.y1); /* Set up pixblock */ - guchar *px = nr_new(guchar, 4 * size * size); + guchar *px = g_new(guchar, 4 * size * size); memset(px, 0x00, 4 * size * size); /* Render */ @@ -609,7 +610,7 @@ sp_marker_prev_new(unsigned size, gchar const *mname, GDK_COLORSPACE_RGB, TRUE, 8, size, size, size * 4, - (GdkPixbufDestroyNotify)nr_free, + (GdkPixbufDestroyNotify)g_free, NULL)); return pb; } |