Mercurial > hg > octave-nkf

comparison src/gl-render.cc @ 10076:4b270d1540f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid various GCC warnings
author John W. Eaton <jwe@octave.org>
date Sat, 09 Jan 2010 02:24:49 -0500
parents 7dedfd70dd9f
children cd96d29c5efa
comparison
equal deleted inserted replaced
10075:84b0725f4b09 10076:4b270d1540f7
2714 pix_dx = (p1(0) - p0(0))/(w-1); 2714 pix_dx = (p1(0) - p0(0))/(w-1);
2715 nor_dx = (x(1) - x(0))/(w-1); 2715 nor_dx = (x(1) - x(0))/(w-1);
2716 } 2716 }
2717 else 2717 else
2718 { 2718 {
2719 const ColumnVector p1 = xform.transform (x(1) + 1, y(1), 0); 2719 const ColumnVector p1w = xform.transform (x(1) + 1, y(1), 0);
2720 pix_dx = p1(0) - p0(0); 2720 pix_dx = p1w(0) - p0(0);
2721 nor_dx = 1; 2721 nor_dx = 1;
2722 } 2722 }
2723
2723 if (h > 1) 2724 if (h > 1)
2724 { 2725 {
2725 pix_dy = (p1(1) - p0(1))/(h-1); 2726 pix_dy = (p1(1) - p0(1))/(h-1);
2726 nor_dy = (y(1) - y(0))/(h-1); 2727 nor_dy = (y(1) - y(0))/(h-1);
2727 } 2728 }
2728 else 2729 else
2729 { 2730 {
2730 const ColumnVector p1 = xform.transform (x(1), y(1) + 1, 0); 2731 const ColumnVector p1h = xform.transform (x(1), y(1) + 1, 0);
2731 pix_dy = p1(1) - p0(1); 2732 pix_dy = p1h(1) - p0(1);
2732 nor_dy = 1; 2733 nor_dy = 1;
2733 } 2734 }
2734 2735
2735 2736
2736 // OpenGL won't draw the image if it's origin is outside the 2737 // OpenGL won't draw the image if it's origin is outside the