Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
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 Jon Tibble <meths@btinternet.com>
Sat, 06 Oct 2012 16:11:50 +0100
branchs11express-2010-11
changeset 22109 db10202d5f6d
parent 19980 948f931d5487
child 20266 8bea88f4b589
permissions -rw-r--r--
Added tag oi_151a_prestable7 for changeset 25dee50cecca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
19980
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     1
 
diff -ur pilot-link-0.12.4-old/src/pilot-read-notepad.c pilot-link-0.12.4/src/pilot-read-notepad.c
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     2
 
--- pilot-link-0.12.4-old/src/pilot-read-notepad.c	2007-02-05 07:06:02.000000000 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     3
 
+++ pilot-link-0.12.4/src/pilot-read-notepad.c	2010-07-30 14:23:24.736922013 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     4
 
@@ -39,10 +39,6 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     5
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     6
 
 #ifdef HAVE_PNG
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     7
 
 #include "png.h"
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     8
 
-#if (PNG_LIBPNG_VER < 10201)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
     9
 
- #define png_voidp_NULL (png_voidp)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    10
 
- #define png_error_ptr_NULL (png_error_ptr)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    11
 
-#endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    12
 
 #endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    13
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    14
 
 const char *progname;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    15
 
@@ -166,8 +162,8 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    16
 
    width = n->body.width + 8;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    17
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    18
 
    png_ptr = png_create_write_struct
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    19
 
-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    20
 
-       png_error_ptr_NULL, png_error_ptr_NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    21
 
+     ( PNG_LIBPNG_VER_STRING, NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    22
 
+       NULL, NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    23
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    24
 
    if(!png_ptr)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    25
 
      return;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    26
 
diff -ur pilot-link-0.12.4-old/src/pilot-read-palmpix.c pilot-link-0.12.4/src/pilot-read-palmpix.c
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    27
 
--- pilot-link-0.12.4-old/src/pilot-read-palmpix.c	2007-02-05 07:06:03.000000000 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    28
 
+++ pilot-link-0.12.4/src/pilot-read-palmpix.c	2010-07-30 14:26:11.835122751 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    29
 
@@ -42,10 +42,6 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    30
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    31
 
 #ifdef HAVE_PNG
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    32
 
 #include "png.h"
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    33
 
-#if (PNG_LIBPNG_VER < 10201)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    34
 
- #define png_voidp_NULL (png_voidp)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    35
 
- #define png_error_ptr_NULL (png_error_ptr)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    36
 
-#endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    37
 
 #endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    38
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    39
 
 const char *progname;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    40
 
@@ -223,8 +219,8 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    41
 
 	png_infop info_ptr;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    42
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    43
 
 	png_ptr = png_create_write_struct
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    44
 
-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    45
 
-		png_error_ptr_NULL, png_error_ptr_NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    46
 
+		( PNG_LIBPNG_VER_STRING, NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    47
 
+		NULL, NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    48
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    49
 
 	if(!png_ptr)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    50
 
 		return;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    51
 
diff -ur pilot-link-0.12.4-old/src/pilot-read-screenshot.c pilot-link-0.12.4/src/pilot-read-screenshot.c
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    52
 
--- pilot-link-0.12.4-old/src/pilot-read-screenshot.c	2006-11-02 22:54:31.000000000 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    53
 
+++ pilot-link-0.12.4/src/pilot-read-screenshot.c	2010-07-30 14:25:00.792246819 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    54
 
@@ -40,10 +40,6 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    55
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    56
 
 #ifdef HAVE_PNG
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    57
 
 # include "png.h"
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    58
 
-# if (PNG_LIBPNG_VER < 10201)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    59
 
-#  define png_voidp_NULL (png_voidp)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    60
 
-#  define png_error_ptr_NULL (png_error_ptr)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    61
 
-# endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    62
 
 #endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    63
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    64
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    65
 
@@ -87,8 +83,8 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    66
 
 		gray_buf = malloc( state->w );
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    67
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    68
 
 	png_ptr = png_create_write_struct
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    69
 
-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    70
 
-		png_error_ptr_NULL, png_error_ptr_NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    71
 
+		(PNG_LIBPNG_VER_STRING, NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    72
 
+		NULL, NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    73
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    74
 
 	if (!png_ptr)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    75
 
 		return;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    76
 
diff -ur pilot-link-0.12.4-old/src/pilot-read-veo.c pilot-link-0.12.4/src/pilot-read-veo.c
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    77
 
--- pilot-link-0.12.4-old/src/pilot-read-veo.c	2007-02-05 07:06:03.000000000 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    78
 
+++ pilot-link-0.12.4/src/pilot-read-veo.c	2010-07-30 14:27:08.042967985 +0800
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    79
 
@@ -41,10 +41,6 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    80
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    81
 
 #ifdef HAVE_PNG
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    82
 
 # include "png.h"
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    83
 
-# if (PNG_LIBPNG_VER < 10201)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    84
 
-#  define png_voidp_NULL (png_voidp)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    85
 
-#  define png_error_ptr_NULL (png_error_ptr)NULL
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    86
 
-# endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    87
 
 #endif
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    88
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    89
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    90
 
@@ -856,8 +852,8 @@
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    91
 
    png_infop info_ptr;
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    92
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    93
 
    png_ptr = png_create_write_struct
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    94
 
-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    95
 
-	  png_error_ptr_NULL, png_error_ptr_NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    96
 
+	 (PNG_LIBPNG_VER_STRING, NULL,
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    97
 
+	  NULL, NULL);
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    98
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
    99
 
    if (!png_ptr)
948f931d5487 2010-08-03 Dave Lin <[email protected]>
davelam
parents:
diff changeset 
   100
 
 	 return;
sustaining/oi_151a/spec-files