head	1.1;
access;
symbols
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2006.06.27.04.35.57;	author mi;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Upgrade from 1.4.6 to 1.4.7. LIB_DEPEND on png and use the standard -lmd
instead of building our own versions.

The bundled qtools/ can be removed too, but that will make the port
always depend on Qt (hence X11), which it currently avoids.

Approved by:	maintainer timeout (13 days)
@
text
@Use the standard png-library instead of rolling our own.

	-mi

--- src/pngenc.cpp	Sun May  7 14:02:31 2006
+++ src/pngenc.cpp	Wed Jun 14 01:50:19 2006
@@@@ -21,10 +21,5 @@@@
  */
 
-#ifndef png_jmpbuf
-#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
-#endif
-
-#define ALL_STATIC
-#include <../libpng/png.h>
+#include <png.h>
 #include <stdio.h>
 #include <stdlib.h>
@@@@ -33,6 +28,4 @@@@
 #include "pngenc.h"
 #include "message.h"
-
-#undef jmpbuf
 
 static void user_error_fn(png_structp, png_const_charp error_msg)
@
