revert canvas.cpp to master version
fix gcc compilation of AttributeIterator