From 4c75974f2ac6bfe751e583fca37ffdd8b14ea84d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 23:24:17 +0000 Subject: Fix another load of forward declaration tags (bzr r12205) --- src/display/canvas-axonomgrid.h | 2 +- src/display/nr-filter-diffuselighting.h | 2 +- src/display/nr-filter-flood.h | 2 +- src/display/nr-filter-specularlighting.h | 2 +- src/display/nr-style.h | 1 - src/display/sp-ctrlcurve.h | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/display') diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index 0e24d3f56..f58ea3aca 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -12,7 +12,7 @@ #include "line-snapper.h" #include "canvas-grid.h" -class SPCanvasBuf; +struct SPCanvasBuf; class SPDesktop; struct SPNamedView; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index 315bf9f48..043a5eb39 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -22,7 +22,7 @@ class SPFeDistantLight; class SPFePointLight; class SPFeSpotLight; -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-filter-flood.h b/src/display/nr-filter-flood.h index 8568502ff..9a968047d 100644 --- a/src/display/nr-filter-flood.h +++ b/src/display/nr-filter-flood.h @@ -14,7 +14,7 @@ #include "display/nr-filter-primitive.h" -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index 4f8c2d112..c57e3a9ff 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -20,7 +20,7 @@ class SPFeDistantLight; class SPFePointLight; class SPFeSpotLight; -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 597ae7a2c..725828089 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -16,7 +16,6 @@ #include <2geom/rect.h> #include "color.h" -class SPColor; class SPPaintServer; struct SPStyle; diff --git a/src/display/sp-ctrlcurve.h b/src/display/sp-ctrlcurve.h index 15de20161..90936185c 100644 --- a/src/display/sp-ctrlcurve.h +++ b/src/display/sp-ctrlcurve.h @@ -17,7 +17,7 @@ #include "display/sp-ctrlline.h" -struct SPItem; +class SPItem; #define SP_TYPE_CTRLCURVE (SPCtrlCurve::getType()) #define SP_CTRLCURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLCURVE, SPCtrlCurve)) -- cgit v1.2.3 From 78b82d1a27484ccbfe5fe2d7e14a486b8275ac3a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 00:39:02 +0000 Subject: Fix even more forward declaration tags (bzr r12206) --- src/display/guideline.h | 2 +- src/display/nr-filter-diffuselighting.h | 6 +++--- src/display/nr-filter-specularlighting.h | 6 +++--- src/display/nr-style.h | 2 +- src/display/nr-svgfonts.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/display') diff --git a/src/display/guideline.h b/src/display/guideline.h index 164244c46..2d9a87d9b 100644 --- a/src/display/guideline.h +++ b/src/display/guideline.h @@ -21,7 +21,7 @@ #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine)) #define SP_IS_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_GUIDELINE)) -class SPCtrlPoint; +struct SPCtrlPoint; struct SPGuideLine { SPCanvasItem item; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index 043a5eb39..15cc8e1ff 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -19,9 +19,9 @@ #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -class SPFeDistantLight; -class SPFePointLight; -class SPFeSpotLight; +struct SPFeDistantLight; +struct SPFePointLight; +struct SPFeSpotLight; struct SVGICCColor; namespace Inkscape { diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index c57e3a9ff..0d1c0644f 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -17,9 +17,9 @@ #include "display/nr-light-types.h" #include "display/nr-filter-primitive.h" -class SPFeDistantLight; -class SPFePointLight; -class SPFeSpotLight; +struct SPFeDistantLight; +struct SPFePointLight; +struct SPFeSpotLight; struct SVGICCColor; namespace Inkscape { diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 725828089..80547c43e 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -16,7 +16,7 @@ #include <2geom/rect.h> #include "color.h" -class SPPaintServer; +struct SPPaintServer; struct SPStyle; namespace Inkscape { diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h index 6138e2fbb..1101f93f2 100644 --- a/src/display/nr-svgfonts.h +++ b/src/display/nr-svgfonts.h @@ -18,8 +18,8 @@ class SvgFont; struct SPFont; -class SPGlyph; -class SPMissingGlyph; +struct SPGlyph; +struct SPMissingGlyph; struct _GdkEventExpose; typedef _GdkEventExpose GdkEventExpose; -- cgit v1.2.3 From efa9bdd372b89848165dc575fafff45851514e69 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 16 Mar 2013 12:20:26 +0000 Subject: Warning cleanup (bzr r12211) --- src/display/cairo-utils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/display') diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index a55b05fe3..fc56c7b26 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -655,8 +655,8 @@ int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface) cairo_surface_flush(surface); int width = cairo_image_surface_get_width(surface); int height = cairo_image_surface_get_height(surface); - int stride = cairo_image_surface_get_stride(surface); - unsigned char *data = cairo_image_surface_get_data(surface); + // int stride = cairo_image_surface_get_stride(surface); + // unsigned char *data = cairo_image_surface_get_data(surface); ink_cairo_surface_filter( surface, surface, SurfaceSrgbToLinear() ); @@ -698,8 +698,8 @@ int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface) cairo_surface_flush(surface); int width = cairo_image_surface_get_width(surface); int height = cairo_image_surface_get_height(surface); - int stride = cairo_image_surface_get_stride(surface); - unsigned char *data = cairo_image_surface_get_data(surface); + // int stride = cairo_image_surface_get_stride(surface); + // unsigned char *data = cairo_image_surface_get_data(surface); ink_cairo_surface_filter( surface, surface, SurfaceLinearToSrgb() ); @@ -888,4 +888,4 @@ guint32 argb32_from_rgba(guint32 in) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From 207c0491084f51a46bd81ec60538dc48bedfe63f Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 16 Mar 2013 16:26:03 +0000 Subject: Drop checks for ancient dependency versions. These are satisfied elsewhere. (bzr r12213) --- src/display/nr-svgfonts.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/display') diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp index 0d1b56d54..84b4bd080 100644 --- a/src/display/nr-svgfonts.cpp +++ b/src/display/nr-svgfonts.cpp @@ -1,5 +1,4 @@ #include "config.h" -#ifdef ENABLE_SVG_FONTS /* * SVGFonts rendering implementation * @@ -356,8 +355,6 @@ void SvgFont::refresh(){ this->userfont = NULL; } -#endif //#ifdef ENABLE_SVG_FONTS - /* Local Variables: mode:c++ -- cgit v1.2.3