Update to trunk

(bzr r12588.1.25)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 86668d9ed..8f7a60ca6 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -555,7 +555,7 @@ Inkscape::XML::Node *SPImage::write(Inkscape::XML::Document *xml_doc, Inkscape::
     return repr;
 }
 
-Geom::OptRect SPImage::bbox(Geom::Affine const &transform, SPItem::BBoxType type) {
+Geom::OptRect SPImage::bbox(Geom::Affine const &transform, SPItem::BBoxType /*type*/) const {
     Geom::OptRect bbox;
 
     if ((this->width.computed > 0.0) && (this->height.computed > 0.0)) {
@@ -612,11 +612,11 @@ void SPImage::print(SPPrintContext *ctx) {
     }
 }
 
-const char* SPImage::displayName() {
+const char* SPImage::displayName() const {
     return _("Image");
 }
 
-gchar* SPImage::description() {
+gchar* SPImage::description() const {
     char *href_desc;
 
     if (this->href) {
@@ -638,7 +638,7 @@ gchar* SPImage::description() {
     return ret;
 }
 
-Inkscape::DrawingItem* SPImage::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) {
+Inkscape::DrawingItem* SPImage::show(Inkscape::Drawing &drawing, unsigned int /*key*/, unsigned int /*flags*/) {
     Inkscape::DrawingImage *ai = new Inkscape::DrawingImage(drawing);
 
     sp_image_update_arenaitem(this, ai);
@@ -748,7 +748,7 @@ static void sp_image_update_canvas_image(SPImage *image)
     }
 }
 
-void SPImage::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) {
+void SPImage::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const {
     /* An image doesn't have any nodes to snap, but still we want to be able snap one image
     to another. Therefore we will create some snappoints at the corner, similar to a rect. If
     the image is rotated, then the snappoints will rotate with it. Again, just like a rect.