[cairo-commit] cairo ChangeLog,1.454,1.455 configure.in,1.93,1.94

[Kristian Hogsberg]

Committed by: krh

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv8153

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-03-28  Kristian Høgsberg  <krh at redhat.com>

        * src/cairo-png.c (cairo_image_surface_write_png)
        (cairo_image_surface_create_from_png): New PNG utility functions.

        * src/cairo_pdf_surface.c, src/cairo-pdf.h: Reverse the naming of
        the pdf constructors so the callback based ones have the long
        names.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -d -r1.454 -r1.455
--- ChangeLog	25 Mar 2005 19:47:38 -0000	1.454
+++ ChangeLog	28 Mar 2005 21:58:26 -0000	1.455
@@ -1,3 +1,12 @@
+2005-03-28  Kristian Høgsberg  <krh at redhat.com>
+
+	* src/cairo-png.c (cairo_image_surface_write_png) 
+	(cairo_image_surface_create_from_png): New PNG utility functions.
+
+	* src/cairo_pdf_surface.c, src/cairo-pdf.h: Reverse the naming of
+	the pdf constructors so the callback based ones have the long
+	names.
+
 2005-03-25  Jamey Sharp  <jamey at minilop.net>
 
 	* src/cairo-xcb.h:

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- configure.in	9 Mar 2005 03:34:04 -0000	1.93
+++ configure.in	28 Mar 2005 21:58:26 -0000	1.94
@@ -189,7 +189,7 @@
 dnl ===========================================================================
 
 AC_ARG_ENABLE(png,
-  [  --disable-png           Disable cairo's PNG backend],
+  [  --disable-png           Disable cairo's PNG functions],
   [use_png=$enableval], [use_png=yes])
 
 if test "x$use_png" = "xyes"; then
@@ -212,17 +212,17 @@
 fi
 
 if test "x$use_png" != "xyes"; then
-  PNG_SURFACE_FEATURE=CAIRO_HAS_NO_PNG_SURFACE
-  AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, false)
+  PNG_FUNCTIONS_FEATURE=CAIRO_HAS_NO_PNG_FUNCTIONS
+  AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, false)
 else
-  PNG_SURFACE_FEATURE=CAIRO_HAS_PNG_SURFACE
-  AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, true)
+  PNG_FUNCTIONS_FEATURE=CAIRO_HAS_PNG_FUNCTIONS
+  AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, true)
 fi
 
 CAIRO_CFLAGS="$CAIRO_CFLAGS $PNG_CFLAGS"
 CAIRO_LIBS="$CAIRO_LIBS $PNG_LIBS"
 
-AC_SUBST(PNG_SURFACE_FEATURE)
+AC_SUBST(PNG_FUNCTIONS_FEATURE)
 AC_SUBST(PNG_REQUIRES)
 
 dnl ===========================================================================
@@ -435,14 +435,15 @@
 echo "  Win32: $use_win32"
 echo "  PostScript: $use_ps"
 echo "  PDF: $use_pdf"
-echo "  PNG: $use_png"
 echo "  glitz: $use_glitz"
 echo ""
-echo "and the following font backends:"
+echo "the following font backends:"
 echo "  FreeType: $use_freetype"
 echo "  Win32: $use_win32"
 echo "  ATSUI: $use_atsui"
 echo ""
+echo "and the following features:"
+echo "  PNG functions: $use_png"
 
 if test x"$use_freetype" != "xyes" && \
    test x"$use_win32"    != "xyes" && \
@@ -453,4 +454,3 @@
 		  http://freetype.org/	http://fontconfig.org/
 		])
 fi
-