← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gc.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/gc.cpp
70
70
    return base + debug_base_fixup();
71
71
}
72
72
 
73
 
int debug_general_register_disappearing_link(void **p_ptr, void *base) {
74
 
    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
 
73
int debug_general_register_disappearing_link(void **p_ptr, void const *base) {
 
74
    char const *real_base = reinterpret_cast<char const *>(base) - debug_base_fixup();
 
75
#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
75
76
    return GC_general_register_disappearing_link(p_ptr, real_base);
 
77
#else // compatibility with older Boehm GC versions
 
78
    return GC_general_register_disappearing_link(p_ptr, const_cast<char *>(real_base));
 
79
#endif
76
80
}
77
81
 
78
82
void dummy_do_init() {}
90
94
    }
91
95
}
92
96
 
93
 
int dummy_general_register_disappearing_link(void **, void *) { return false; }
 
97
int dummy_general_register_disappearing_link(void **, void const *) { return false; }
94
98
 
95
99
int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
96
100
 
112
116
    &GC_malloc_atomic_uncollectable,
113
117
    &GC_base,
114
118
    &GC_register_finalizer_ignore_self,
115
 
    &GC_general_register_disappearing_link,
 
119
#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
 
120
     &GC_general_register_disappearing_link,
 
121
#else // compatibility with older Boehm GC versions
 
122
    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
 
123
#endif
116
124
    &GC_unregister_disappearing_link,
117
125
    &GC_get_heap_size,
118
126
    &GC_get_free_bytes,
202
210
    die_because_not_initialized();
203
211
}
204
212
 
205
 
int stub_general_register_disappearing_link(void **, void *) {
 
213
int stub_general_register_disappearing_link(void **, void const *) {
206
214
    die_because_not_initialized();
207
215
    return 0;
208
216
}