← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/trace/imagemap-gdk.cpp

  • Committer: Package Import Robot
  • Author(s): Alex Valavanis
  • Date: 2014-08-19 19:10:32 UTC
  • mfrom: (1.6.5) (2.5.14 sid)
  • Revision ID: package-import@ubuntu.com-20140819191032-2eca1qihaszjk9i6
Tags: 0.48.5-2ubuntu1
https://launchpad.net/bugs/1358863
https://launchpad.net/bugs/166371
https://launchpad.net/bugs/966441
https://launchpad.net/bugs/1051017
https://launchpad.net/bugs/1163241
https://launchpad.net/bugs/529843
https://launchpad.net/bugs/1090865
* Merge with Debian Unstable (LP: #1358863). Fixes several Ubuntu bugs:
  - Illustrator CS SVG won't load: namespace URIs in entities (LP: #166371)
  - inkscape crashed with SIGSEGV in
    sp_dtw_color_profile_event() (LP: #966441)
  - inkscape crashed with SIGSEGV (LP: #1051017)
  - inkscape crashed with SIGSEGV in Inkscape::Preferences::_getNode()
    (LP: #1163241)
  - save a copy reverts to save as (LP: #529843)
  - Extension to braille not working on Xubuntu 12.10 (LP: #1090865)
* Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + demote pstoedit from Recommends to Suggests (because it's in universe),
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation
* Drop debian/patches/librevenge.patch (superseded by
    debian/patches/0006-Update_to_new_libwpg.patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/trace/imagemap-gdk.cpp
58
58
 
59
59
    GdkPixbuf *buf = gdk_pixbuf_new_from_data(pixdata, GDK_COLORSPACE_RGB,
60
60
                        0, 8, grayMap->width, grayMap->height,
61
 
                        rowstride, NULL, NULL);
 
61
                        rowstride, (GdkPixbufDestroyNotify)g_free, NULL);
62
62
 
63
63
    //### Fill in the odd cells with RGB values
64
64
    int x,y;
122
122
    return ppMap;
123
123
}
124
124
 
125
 
GdkPixbuf *packedPixelMapToGdkPixbuf(PackedPixelMap *ppMap)
 
125
/*GdkPixbuf *packedPixelMapToGdkPixbuf(PackedPixelMap *ppMap)
126
126
{
127
127
    if (!ppMap)
128
128
        return NULL;
137
137
 
138
138
    GdkPixbuf *buf = gdk_pixbuf_new_from_data(pixdata, GDK_COLORSPACE_RGB,
139
139
                        0, 8, ppMap->width, ppMap->height,
140
 
                        rowstride, NULL, NULL);
 
140
                        rowstride, NULL, NULL); //first NULL: replace by (GdkPixbufDestroyNotify)g_free ??
141
141
 
142
142
    //### Fill in the cells with RGB values
143
143
    int x,y;
158
158
 
159
159
    return buf;
160
160
}
161
 
 
 
161
*/
162
162
 
163
163
 
164
164
/*#########################################################################
203
203
    return rgbMap;
204
204
}
205
205
 
 
206
/*
206
207
GdkPixbuf *rgbMapToGdkPixbuf(RgbMap *rgbMap)
207
208
{
208
209
    if (!rgbMap)
218
219
 
219
220
    GdkPixbuf *buf = gdk_pixbuf_new_from_data(pixdata, GDK_COLORSPACE_RGB,
220
221
                        0, 8, rgbMap->width, rgbMap->height,
221
 
                        rowstride, NULL, NULL);
 
222
                        rowstride, NULL, NULL); //first NULL: replace by (GdkPixbufDestroyNotify)g_free ??
222
223
 
223
224
    //### Fill in the cells with RGB values
224
225
    int x,y;
239
240
 
240
241
    return buf;
241
242
}
 
243
*/
242
244
 
243
245
/*#########################################################################
244
246
## I N D E X E D   M A P
260
262
 
261
263
    GdkPixbuf *buf = gdk_pixbuf_new_from_data(pixdata, GDK_COLORSPACE_RGB,
262
264
                        0, 8, iMap->width, iMap->height,
263
 
                        rowstride, NULL, NULL);
 
265
                        rowstride, (GdkPixbufDestroyNotify)g_free, NULL);
264
266
 
265
267
    //### Fill in the cells with RGB values
266
268
    int x,y;