Attached patch to 0.8-branch will allow compilation against libpng 1.4 
versions.

Patch is not from me, it's taken from pld linux, so credits should go to them:
https://bugs.launchpad.net/pld-linux/+bug/522344

-- 
Hanno Böck              Blog:           http://www.hboeck.de/
GPG: 3DBD3B20           Jabber/Mail:    [email protected]

http://schokokeks.org - professional webhosting
diff -uNr compiz-0.8.4.old/plugins/png.c compiz-0.8.4/plugins/png.c
--- compiz-0.8.4.old/plugins/png.c	2009-09-01 07:38:22.000000000 +0200
+++ compiz-0.8.4/plugins/png.c	2010-02-15 22:16:30.000000000 +0100
@@ -102,7 +102,7 @@
 
     /* expand gray bit depth if needed */
     if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8)
-	png_set_gray_1_2_4_to_8 (png);
+	png_set_expand_gray_1_2_4_to_8 (png);
 
     /* transform transparency to alpha */
     if (png_get_valid(png, info, PNG_INFO_tRNS))
@@ -167,7 +167,7 @@
     Bool	  status;
 
     sig_bytes = fread (png_sig, 1, PNG_SIG_SIZE, file);
-    if (png_check_sig (png_sig, sig_bytes) == 0)
+    if (png_sig_cmp (png_sig, 0, sig_bytes) != 0)
 	return FALSE;
 
     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -218,7 +218,7 @@
     Bool		status;
 
     memcpy (png_sig, buffer, PNG_SIG_SIZE);
-    if (png_check_sig (png_sig, PNG_SIG_SIZE) == 0)
+    if (png_sig_cmp (png_sig, 0, PNG_SIG_SIZE) != 0)
 	return FALSE;
 
     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Dev mailing list
[email protected]
http://lists.compiz-fusion.org/mailman/listinfo/dev

Reply via email to