diff options
author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-08-29 21:41:58 (GMT) |
---|---|---|
committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-08-29 21:41:58 (GMT) |
commit | 80f4afe96041638b474e87a2abc5777f3358aa9e (patch) | |
tree | 43b1fa9c96cc2cc4e185f9f2c185227100f9c529 /src/libgnomecanvas | |
parent | 522b446f11e7feff791ac54c57d9d2b5699bb168 (diff) |
Switched to GPL V3
svn path=/trunk/; revision=2909
Diffstat (limited to 'src/libgnomecanvas')
-rw-r--r-- | src/libgnomecanvas/gnome-canvas-pixbuf.c | 16 | ||||
-rw-r--r-- | src/libgnomecanvas/gnome-canvas-pixbuf.h | 6 | ||||
-rw-r--r-- | src/libgnomecanvas/gnome-canvas-rich-text.c | 6 | ||||
-rw-r--r-- | src/libgnomecanvas/gnome-canvas-rich-text.h | 6 |
4 files changed, 13 insertions, 21 deletions
diff --git a/src/libgnomecanvas/gnome-canvas-pixbuf.c b/src/libgnomecanvas/gnome-canvas-pixbuf.c index 84452cd..585184c 100644 --- a/src/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/src/libgnomecanvas/gnome-canvas-pixbuf.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include <config.h> @@ -53,7 +51,7 @@ typedef struct { guint height_in_pixels : 1; guint x_in_pixels : 1; guint y_in_pixels : 1; - + /* Whether the pixbuf has changed */ guint need_pixbuf_update : 1; @@ -628,7 +626,7 @@ compute_viewport_affine (GnomeCanvasPixbuf *gcp, double *viewport_affine, double case GTK_ANCHOR_NE: tj_len *= y; break; - + case GTK_ANCHOR_W: case GTK_ANCHOR_CENTER: case GTK_ANCHOR_E: @@ -649,7 +647,7 @@ compute_viewport_affine (GnomeCanvasPixbuf *gcp, double *viewport_affine, double art_affine_scale (scale, si_len, sj_len); art_affine_translate (translate, ti_len, tj_len); - art_affine_multiply (viewport_affine, scale, translate); + art_affine_multiply (viewport_affine, scale, translate); } /* Computes the affine transformation with which the pixbuf needs to be @@ -944,12 +942,12 @@ gnome_canvas_pixbuf_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf) x0 = MIN (x0, buf->rect.x1 - buf->rect.x0); y0 = MAX (y0, 0); y0 = MIN (y0, buf->rect.y1 - buf->rect.y0); - + x1 = MAX (x1, 0); x1 = MIN (x1, buf->rect.x1 - buf->rect.x0); y1 = MAX (y1, 0); y1 = MIN (y1, buf->rect.y1 - buf->rect.y0); - + gdk_pixbuf_composite (priv->pixbuf, dest_pixbuf, x0, y0, diff --git a/src/libgnomecanvas/gnome-canvas-pixbuf.h b/src/libgnomecanvas/gnome-canvas-pixbuf.h index ee97ec9..c271924 100644 --- a/src/libgnomecanvas/gnome-canvas-pixbuf.h +++ b/src/libgnomecanvas/gnome-canvas-pixbuf.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef GNOME_CANVAS_PIXBUF_H diff --git a/src/libgnomecanvas/gnome-canvas-rich-text.c b/src/libgnomecanvas/gnome-canvas-rich-text.c index a27cd06..b166bce 100644 --- a/src/libgnomecanvas/gnome-canvas-rich-text.c +++ b/src/libgnomecanvas/gnome-canvas-rich-text.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include <math.h> diff --git a/src/libgnomecanvas/gnome-canvas-rich-text.h b/src/libgnomecanvas/gnome-canvas-rich-text.h index a662021..23773af 100644 --- a/src/libgnomecanvas/gnome-canvas-rich-text.h +++ b/src/libgnomecanvas/gnome-canvas-rich-text.h @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 3 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef GNOME_CANVAS_RICH_TEXT_H |