diff options
| author | Frédéric-Emmanuel Picca <picca@debian.org> | 2018-08-08 14:09:02 +0200 |
|---|---|---|
| committer | Frédéric-Emmanuel Picca <picca@debian.org> | 2018-08-08 14:09:02 +0200 |
| commit | 75271d5d9979b204baf8172b2a03da4330b14083 (patch) | |
| tree | 22a2e31692654f1464c6fc8463cafe6598d9bdc4 /silx/gui/plot/backends/glutils/GLText.py | |
| parent | 989033673e36f8d9959dd2d3a8285e5339bfae0c (diff) | |
| parent | 302d3bcf3ef555284ce1bcf5cd7cd371addfa608 (diff) | |
Merge tag 'debian/0.8.0+dfsg-1' into debian/stretch-backports
silx release 0.8.0+dfsg-1 for unstable (sid)
(maintainer view tag generated by dgit --quilt=gbp)
Diffstat (limited to 'silx/gui/plot/backends/glutils/GLText.py')
| -rw-r--r-- | silx/gui/plot/backends/glutils/GLText.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/silx/gui/plot/backends/glutils/GLText.py b/silx/gui/plot/backends/glutils/GLText.py index cef0c5a..1540e26 100644 --- a/silx/gui/plot/backends/glutils/GLText.py +++ b/silx/gui/plot/backends/glutils/GLText.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2014-2017 European Synchrotron Radiation Facility +# Copyright (c) 2014-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -195,8 +195,9 @@ class Text2D(object): gl.glUniform1i(prog.uniforms['texText'], texUnit) + mat = numpy.dot(matrix, mat4Translate(int(self.x), int(self.y))) gl.glUniformMatrix4fv(prog.uniforms['matrix'], 1, gl.GL_TRUE, - matrix * mat4Translate(int(self.x), int(self.y))) + mat.astype(numpy.float32)) gl.glUniform4f(prog.uniforms['color'], *self.color) if self.bgColor is not None: |