--- deliantra/Deliantra-Client/Client.xs 2007/12/26 21:03:21 1.242 +++ deliantra/Deliantra-Client/Client.xs 2007/12/28 15:05:20 1.245 @@ -702,7 +702,7 @@ if (m && m != (SDL_Rect **)-1) while (*m) { - if ((*m)->w >= 800 && (*m)->h >= 600) + if ((*m)->w >= 800 && (*m)->h >= 480) { AV *av = newAV (); av_push (av, newSViv ((*m)->w)); @@ -1319,10 +1319,14 @@ int line, x; pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); + +#if !PANGO_VERSION_CHECK (1, 17. 3) /* pango bug: line is between 1..numlines, not 0..numlines-1 */ + --line; +#endif EXTEND (SP, 2); - PUSHs (sv_2mortal (newSViv (line - 1))); + PUSHs (sv_2mortal (newSViv (line))); PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); } @@ -2848,7 +2852,7 @@ if (gl.SeparableFilter2D) gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); -void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) +void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0) void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)