dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use PANGO_DISABLE_DEPRECATED for pango < 0.13.0. 

2006-05-29  Sven Neumann  <sven@gimp.org>

	* configure.in: use PANGO_DISABLE_DEPRECATED for pango < 0.13.0.

	* app/text/gimptext-vectors.c: added const qualifiers to the
	FT_Vector parameters of the FT_Outline_Funcs.
This commit is contained in:
Sven Neumann 2006-05-29 20:12:52 +00:00 committed by Sven Neumann
parent 80bddf14a9
commit cdfb4bcc29
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-29 Sven Neumann <sven@gimp.org>
* configure.in: use PANGO_DISABLE_DEPRECATED for pango < 0.13.0.
* app/text/gimptext-vectors.c: added const qualifiers to the
FT_Vector parameters of the FT_Outline_Funcs.
2006-05-29 Sven Neumann <sven@gimp.org>
* app/widgets/gimpdialogfactory.c

30
app/text/gimptext-vectors.c
View File

@ -120,10 +120,10 @@ gimp_text_vector_coords (RenderContext *context,
}
static gint
moveto (FT_Vector *to,
gpointer data)
moveto (const FT_Vector *to,
gpointer data)
{
RenderContext *context = (RenderContext *) data;
RenderContext *context = data;
GimpCoords start;
#if GIMP_TEXT_DEBUG
@ -144,10 +144,10 @@ moveto (FT_Vector *to,
}
static gint
lineto (FT_Vector *to,
gpointer data)
lineto (const FT_Vector *to,
gpointer data)
{
RenderContext *context = (RenderContext *) data;
RenderContext *context = data;
GimpCoords end;
#if GIMP_TEXT_DEBUG
@ -165,11 +165,11 @@ lineto (FT_Vector *to,
}
static gint
conicto (FT_Vector *ftcontrol,
FT_Vector *to,
gpointer data)
conicto (const FT_Vector *ftcontrol,
const FT_Vector *to,
gpointer data)
{
RenderContext *context = (RenderContext *) data;
RenderContext *context = data;
GimpCoords control;
GimpCoords end;
@ -189,12 +189,12 @@ conicto (FT_Vector *ftcontrol,
}
static gint
cubicto (FT_Vector *ftcontrol1,
FT_Vector *ftcontrol2,
FT_Vector *to,
gpointer data)
cubicto (const FT_Vector *ftcontrol1,
const FT_Vector *ftcontrol2,
const FT_Vector *to,
gpointer data)
{
RenderContext *context = (RenderContext *) data;
RenderContext *context = data;
GimpCoords control1;
GimpCoords control2;
GimpCoords end;

12
configure.in
View File

@ -451,13 +451,13 @@ PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= pangoft2_required_version, :,
*** We require Pango with the optional support for FreeType2 compiled in.
*** See the file 'INSTALL' for more help.]))
AC_MSG_CHECKING([if Pango is version 1.11.0 or newer])
if $PKG_CONFIG --atleast-version=1.11.0 pango; then
have_pango_1_11=yes
AC_MSG_CHECKING([if Pango is version 1.13.0 or newer])
if $PKG_CONFIG --atleast-version=1.13.0 pango; then
have_pango_1_13=yes
else
have_pango_1_11=no
have_pango_1_13=no
fi
AC_MSG_RESULT($have_pango_1_11)
AC_MSG_RESULT($have_pango_1_13)
gimp_save_CFLAGS=$CFLAGS
CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
@ -1657,7 +1657,7 @@ if test "x$have_gtk_2_9" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
fi
if test "x$have_pango_1_11" != "xyes"; then
if test "x$have_pango_1_13" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
fi