diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-11-18 12:51:08 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-11-18 12:51:08 +0000 |
| commit | 52740571184eaf9869298ca5b3b6cb154246b6df (patch) | |
| tree | 77305fe93eaa4aff25ceb6561982cacb4ac033ac /src | |
| parent | extend the range of cap rounding, rename it to make more sense (diff) | |
| download | inkscape-52740571184eaf9869298ca5b3b6cb154246b6df.tar.gz inkscape-52740571184eaf9869298ca5b3b6cb154246b6df.zip | |
remove g++ 4.1.1 compiler errors
(bzr r1980)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/ps.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/ps.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp index fe668a138..1301e888a 100644 --- a/src/extension/internal/ps.cpp +++ b/src/extension/internal/ps.cpp @@ -1274,9 +1274,9 @@ PrintPS::text(Inkscape::Extension::Print *mod, char const *text, NR::Point p, * (TODO?) * Else, back to the former way of printing. */ - gchar* is_embedded; + gpointer is_embedded; //if not first time the font is used and if font embedding requested, check whether the font has been embedded (successfully the first time). - if(g_tree_lookup_extended(_fonts, fn, NULL, (gpointer*)&is_embedded)) font_embedded = font_embedded && (strcmp(is_embedded, "TRUE") == 0); + if(g_tree_lookup_extended(_fonts, fn, NULL, &is_embedded)) font_embedded = font_embedded && (strcmp((char *)is_embedded, "TRUE") == 0); else { //first time the font is used diff --git a/src/extension/internal/ps.h b/src/extension/internal/ps.h index a5dea8c69..673cde82c 100644 --- a/src/extension/internal/ps.h +++ b/src/extension/internal/ps.h @@ -53,10 +53,10 @@ class PrintPS : public Inkscape::Extension::Implementation::Implementation { void print_stroke_style(SVGOStringStream &os, SPStyle const *style); char const *PSFontName(SPStyle const *style); - bool PrintPS::embed_t1(SVGOStringStream &os, font_instance* font); - bool PrintPS::embed_font(SVGOStringStream &os, font_instance* font); + bool embed_t1(SVGOStringStream &os, font_instance* font); + bool embed_font(SVGOStringStream &os, font_instance* font); - void PrintPS::print_glyphlist(SVGOStringStream &os, font_instance* font, Glib::ustring unistring); + void print_glyphlist(SVGOStringStream &os, font_instance* font, Glib::ustring unistring); unsigned int print_image(FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs, NRMatrix const *transform); |