Mercurial Mercurial > upstream > oracle > spec-files / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/pilot-link-03-libpng.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 19980 948f931d5487
child 20266 8bea88f4b589
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446

diff -ur pilot-link-0.12.4-old/src/pilot-read-notepad.c pilot-link-0.12.4/src/pilot-read-notepad.c
--- pilot-link-0.12.4-old/src/pilot-read-notepad.c	2007-02-05 07:06:02.000000000 +0800
+++ pilot-link-0.12.4/src/pilot-read-notepad.c	2010-07-30 14:23:24.736922013 +0800
@@ -39,10 +39,6 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
 #endif
 
 const char *progname;
@@ -166,8 +162,8 @@
    width = n->body.width + 8;
 
    png_ptr = png_create_write_struct
-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-       png_error_ptr_NULL, png_error_ptr_NULL);
+     ( PNG_LIBPNG_VER_STRING, NULL,
+       NULL, NULL);
 
    if(!png_ptr)
      return;
diff -ur pilot-link-0.12.4-old/src/pilot-read-palmpix.c pilot-link-0.12.4/src/pilot-read-palmpix.c
--- pilot-link-0.12.4-old/src/pilot-read-palmpix.c	2007-02-05 07:06:03.000000000 +0800
+++ pilot-link-0.12.4/src/pilot-read-palmpix.c	2010-07-30 14:26:11.835122751 +0800
@@ -42,10 +42,6 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
 #endif
 
 const char *progname;
@@ -223,8 +219,8 @@
 	png_infop info_ptr;
 
 	png_ptr = png_create_write_struct
-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-		png_error_ptr_NULL, png_error_ptr_NULL);
+		( PNG_LIBPNG_VER_STRING, NULL,
+		NULL, NULL);
 
 	if(!png_ptr)
 		return;
diff -ur pilot-link-0.12.4-old/src/pilot-read-screenshot.c pilot-link-0.12.4/src/pilot-read-screenshot.c
--- pilot-link-0.12.4-old/src/pilot-read-screenshot.c	2006-11-02 22:54:31.000000000 +0800
+++ pilot-link-0.12.4/src/pilot-read-screenshot.c	2010-07-30 14:25:00.792246819 +0800
@@ -40,10 +40,6 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-#  define png_voidp_NULL (png_voidp)NULL
-#  define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
 #endif
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -87,8 +83,8 @@
 		gray_buf = malloc( state->w );
 
 	png_ptr = png_create_write_struct
-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-		png_error_ptr_NULL, png_error_ptr_NULL);
+		(PNG_LIBPNG_VER_STRING, NULL,
+		NULL, NULL);
 
 	if (!png_ptr)
 		return;
diff -ur pilot-link-0.12.4-old/src/pilot-read-veo.c pilot-link-0.12.4/src/pilot-read-veo.c
--- pilot-link-0.12.4-old/src/pilot-read-veo.c	2007-02-05 07:06:03.000000000 +0800
+++ pilot-link-0.12.4/src/pilot-read-veo.c	2010-07-30 14:27:08.042967985 +0800
@@ -41,10 +41,6 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-#  define png_voidp_NULL (png_voidp)NULL
-#  define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
 #endif
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -856,8 +852,8 @@
    png_infop info_ptr;
 
    png_ptr = png_create_write_struct
-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-	  png_error_ptr_NULL, png_error_ptr_NULL);
+	 (PNG_LIBPNG_VER_STRING, NULL,
+	  NULL, NULL);
 
    if (!png_ptr)
 	 return;
upstream/oracle/spec-files