diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-12-15 16:19:28 +0000 |
|---|---|---|
| committer | Krzysztof KosiĆski <tweenk.pl@gmail.com> | 2010-12-15 16:19:28 +0000 |
| commit | 70201e92aa1e700d49279871f2b84082750b8ed8 (patch) | |
| tree | 1886fcdf8ad20d73b92bf4f4bfd3ab1406ba4c66 /src/svg-view-widget.cpp | |
| parent | Fix mask luminance calculation, so the coeffs add up to 1 (diff) | |
| parent | Win32 post-GSoC fixups. (diff) | |
| download | inkscape-70201e92aa1e700d49279871f2b84082750b8ed8.tar.gz inkscape-70201e92aa1e700d49279871f2b84082750b8ed8.zip | |
Merge from trunk (again)
(bzr r9508.1.72)
Diffstat (limited to 'src/svg-view-widget.cpp')
| -rw-r--r-- | src/svg-view-widget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 10d997656..d2a31966a 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -1,11 +1,10 @@ -#define __SP_SVG_VIEW_C__ - /** \file * Functions and callbacks for generic SVG view and widget * * Authors: * Lauris Kaplinski <lauris@kaplinski.com> * Ralf Stephan <ralf@ark.in-berlin.de> + * Abhishek Sharma * * Copyright (C) 2001-2002 Lauris Kaplinski * Copyright (C) 2001 Ximian, Inc. @@ -149,8 +148,8 @@ sp_svg_view_widget_size_request (GtkWidget *widget, GtkRequisition *req) gdouble width, height; svgv = static_cast<SPSVGView*> (v); - width = sp_document_width (v->doc()) * svgv->_hscale; - height = sp_document_height (v->doc()) * svgv->_vscale; + width = (v->doc())->getWidth () * svgv->_hscale; + height = (v->doc())->getHeight () * svgv->_vscale; if (width <= vw->maxwidth) { hpol = GTK_POLICY_NEVER; |
