clear waveform cache when shape changes - fixes #6525

[ardour.git] / libs / canvas / stateful_image.cc

diff --git a/libs/canvas/stateful_image.cc b/libs/canvas/stateful_image.cc
index f2b8e7174434efcd37f6e568939a3d128ae6db47..f5cc76dd039694e1bbaf9b1c51b4760ef5ba8dca 100644 (file)
--- a/libs/canvas/stateful_image.cc
+++ b/libs/canvas/stateful_image.cc
@@ -19,8 +19,8 @@ using PBD::error;
 PBD::Searchpath StatefulImage::_image_search_path;
 StatefulImage::ImageCache StatefulImage::_image_cache;
 
-StatefulImage::StatefulImage (Group* group, const XMLNode& node)
-       : Item (group)
+StatefulImage::StatefulImage (Canvas* c, const XMLNode& node)
+       : Item (c)
        , _state (0)
        , _font (0)
        , _text_x (0)
@@ -101,7 +101,7 @@ StatefulImage::load_states (const XMLNode& node)
                        error << _("no ID for state") << endmsg;
                        continue;
                }
-               sscanf (prop->value().c_str(), "%zd", &id);
+               sscanf (prop->value().c_str(), "%" G_GSIZE_FORMAT, &id);
 
                if ((prop = (*i)->property ("image")) == 0) {
                        error << _("no image for state") << endmsg;
@@ -134,7 +134,7 @@ StatefulImage::find_image (const std::string& name)
 
        std::string path;
 
-       if (!find_file_in_search_path (_image_search_path, name, path)) {
+       if (!find_file (_image_search_path, name, path)) {
                error << string_compose (_("Image named %1 not found"),
                                         name) << endmsg;
                return ImageHandle();