ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.91 by root, Fri Jun 15 13:21:59 2012 UTC vs.
Revision 1.92 by root, Fri Jun 15 18:05:15 2012 UTC

1#include <string.h>
1#include <math.h> 2#include <math.h>
2#include "../config.h" 3#include "../config.h"
3#include "rxvt.h" 4#include "rxvt.h"
4 5
5#if HAVE_IMG 6#if HAVE_IMG
7
8typedef rxvt_img::nv nv;
9
10struct mat3x3
11{
12 nv v[3][3];
13
14 mat3x3 ()
15 {
16 }
17
18 mat3x3 (nv matrix[3][3])
19 {
20 memcpy (v, matrix, sizeof (v));
21 }
22
23 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
24 {
25 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
26 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
27 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
28 }
29
30 mat3x3 invert ();
31
32 nv *operator [](int i) { return &v[i][0]; }
33 const nv *operator [](int i) const { return &v[i][0]; }
34
35 // quite inefficient, hopefully gcc pulls the w calc out of any loops
36 nv apply1 (int i, nv x, nv y)
37 {
38 mat3x3 &m = *this;
39
40 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
41 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
42
43 return v * (1. / w);
44 }
45
46 static mat3x3 translate (nv x, nv y);
47};
48
49mat3x3
50mat3x3::invert ()
51{
52 mat3x3 &m = *this;
53 mat3x3 inv;
54
55 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
56 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
57 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
58
59 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
60
61 inv[0][0] = invdet * s0;
62 inv[0][1] = invdet * s1;
63 inv[0][2] = invdet * s2;
64
65 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
66 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
67 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
68
69 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
70 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
71 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
72
73 return inv;
74}
75
76static mat3x3
77operator *(const mat3x3 &a, const mat3x3 &b)
78{
79 mat3x3 r;
80
81 for (int i = 0; i < 3; ++i)
82 for (int j = 0; j < 3; ++j)
83 r[i][j] = a[i][0] * b[0][j]
84 + a[i][1] * b[1][j]
85 + a[i][2] * b[2][j];
86
87 return r;
88}
89
90mat3x3
91mat3x3::translate (nv x, nv y)
92{
93 return mat3x3 (
94 1, 0, x,
95 0, 1, y,
96 0, 0, 1
97 );
98}
6 99
7#if 0 100#if 0
8struct pict 101struct pict
9{ 102{
10 Display *dpy; 103 Display *dpy;
… …
312 405
313 delete img; 406 delete img;
314} 407}
315 408
316static void 409static void
317get_gaussian_kernel (int radius, int width, rxvt_img::nv *kernel, XFixed *params) 410get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
318{ 411{
319 rxvt_img::nv sigma = radius / 2.0; 412 nv sigma = radius / 2.0;
320 rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma; 413 nv scale = sqrt (2.0 * M_PI) * sigma;
321 rxvt_img::nv sum = 0.0; 414 nv sum = 0.0;
322 415
323 for (int i = 0; i < width; i++) 416 for (int i = 0; i < width; i++)
324 { 417 {
325 rxvt_img::nv x = i - width / 2; 418 nv x = i - width / 2;
326 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 419 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
327 sum += kernel[i]; 420 sum += kernel[i];
328 } 421 }
329 422
330 params[0] = XDoubleToFixed (width); 423 params[0] = XDoubleToFixed (width);
… …
595 } 688 }
596 689
597 return img; 690 return img;
598} 691}
599 692
600typedef rxvt_img::nv matrix[3][3];
601
602static void
603mat_invert (matrix mat, rxvt_img::nv (&inv)[3][3])
604{
605 rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
606 rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
607 rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
608
609 rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
610
611 inv [0][0] = invdet * s0;
612 inv [0][1] = invdet * s1;
613 inv [0][2] = invdet * s2;
614
615 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
616 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
617 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
618
619 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
620 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
621 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
622}
623
624static rxvt_img::nv
625mat_apply (matrix mat, int i, rxvt_img::nv x, rxvt_img::nv y)
626{
627 rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
628 rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
629
630 return v * (1. / w);
631}
632
633static void
634mat_mult (matrix a, matrix b, matrix r)
635{
636 for (int i = 0; i < 3; ++i)
637 for (int j = 0; j < 3; ++j)
638 r [i][j] = a [i][0] * b [0][j]
639 + a [i][1] * b [1][j]
640 + a [i][2] * b [2][j];
641}
642
643static void
644mat_trans (rxvt_img::nv x, rxvt_img::nv y, matrix mat)
645{
646 mat [0][0] = 1; mat [0][1] = 0; mat [0][2] = x;
647 mat [1][0] = 0; mat [1][1] = 1; mat [1][2] = y;
648 mat [2][0] = 0; mat [2][1] = 0; mat [2][2] = 1;
649}
650
651rxvt_img * 693rxvt_img *
652rxvt_img::transform (nv matrix[3][3]) 694rxvt_img::transform (nv matrix[3][3])
653{ 695{
654 // calculate new pixel bounding box coordinates 696 // calculate new pixel bounding box coordinates
655 nv r[2], rmin[2], rmax[2]; 697 nv r[2], rmin[2], rmax[2];
656 698
699 mat3x3 m (matrix);
700
657 for (int i = 0; i < 2; ++i) 701 for (int i = 0; i < 2; ++i)
658 { 702 {
659 nv v; 703 nv v;
660 704
661 v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v; 705 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
662 v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v); 706 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
663 v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); 707 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
664 v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v); 708 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
665 } 709 }
666 710
667 float sx = rmin [0] - x; 711 float sx = rmin [0] - x;
668 float sy = rmin [1] - y; 712 float sy = rmin [1] - y;
669 713
… …
672 int ny = floor (rmin [1]); 716 int ny = floor (rmin [1]);
673 717
674 int new_width = ceil (rmax [0] - rmin [0]); 718 int new_width = ceil (rmax [0] - rmin [0]);
675 int new_height = ceil (rmax [1] - rmin [1]); 719 int new_height = ceil (rmax [1] - rmin [1]);
676 720
677 ::matrix tr, tmp; 721 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
678 mat_trans (x, y, tr);
679 mat_mult (matrix, tr, tmp);
680 mat_trans (-x, -y, tr);
681 mat_mult (tr, tmp, matrix);
682 722
683 ::matrix inv; 723 mat3x3 inv = m.invert ();
684 mat_invert (matrix, inv);
685 724
686 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat); 725 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
687 img->alloc (); 726 img->alloc ();
688 727
689 Display *dpy = s->display->dpy; 728 Display *dpy = s->display->dpy;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines