X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimage.cpp;h=655ecc252d2b81aa3187195e6d662611835e283a;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=bc9185672d13b5cb070333857e5a37c90143f6df;hpb=878faa0c9283ee1e6e5e67b6ea1324cc52385742;p=libs%2Fgltk.git diff --git a/source/image.cpp b/source/image.cpp index bc91856..655ecc2 100644 --- a/source/image.cpp +++ b/source/image.cpp @@ -11,8 +11,7 @@ namespace Msp { namespace GLtk { Image::Image(const GL::Texture2D *i): - image(i), - keep_aspect(true) + image(i) { } @@ -62,7 +61,7 @@ void Image::update_icon() if(root) { if(icon_name.empty()) - image = 0; + image = nullptr; else image = &root->get_resources().get(icon_name); signal_autosize_changed.emit(); @@ -71,7 +70,7 @@ void Image::update_icon() } } - image = 0; + image = nullptr; } void Image::rebuild_special(const Part &part)