Thu Dec 20 21:52:28 2012 UTC ()
Consistently use void.


(joerg)
diff -r1.3 -r1.4 pkgsrc/graphics/jpeg_ls/distinfo
diff -r0 -r1.1 pkgsrc/graphics/jpeg_ls/patches/patch-Encoder_melcode.c
diff -r1.2 -r1.3 pkgsrc/graphics/jpeg_ls/patches/patch-ad
cvs diff -r1.3 -r1.4 pkgsrc/graphics/jpeg_ls/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg_ls/distinfo 2005/12/30 23:23:54 1.3
+++ pkgsrc/graphics/jpeg_ls/distinfo 2012/12/20 21:52:28 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.3 2005/12/30 23:23:54 joerg Exp $ 1$NetBSD: distinfo,v 1.4 2012/12/20 21:52:28 joerg Exp $
2 2
3SHA1 (jpeg_ls_v2.2.tar.gz) = d4fde989359eebdc98cf57feeac3076fdfd06c64 3SHA1 (jpeg_ls_v2.2.tar.gz) = d4fde989359eebdc98cf57feeac3076fdfd06c64
4RMD160 (jpeg_ls_v2.2.tar.gz) = e0879e170ee18fae46d148c711a8b5a398586cd9 4RMD160 (jpeg_ls_v2.2.tar.gz) = e0879e170ee18fae46d148c711a8b5a398586cd9
5Size (jpeg_ls_v2.2.tar.gz) = 854276 bytes 5Size (jpeg_ls_v2.2.tar.gz) = 854276 bytes
 6SHA1 (patch-Encoder_melcode.c) = 6da84593b3160bf86593de40e837e9712e9848e3
6SHA1 (patch-aa) = 9f5168b5b1a2e34de850cf35414c1b6aa4c63108 7SHA1 (patch-aa) = 9f5168b5b1a2e34de850cf35414c1b6aa4c63108
7SHA1 (patch-ab) = e87c51ca50be30ae6c07094fd935fedee8a1a2f5 8SHA1 (patch-ab) = e87c51ca50be30ae6c07094fd935fedee8a1a2f5
8SHA1 (patch-ac) = cdb1d11427c50062df26d4d4c73eca041d08c972 9SHA1 (patch-ac) = cdb1d11427c50062df26d4d4c73eca041d08c972
9SHA1 (patch-ad) = 95418e8331cb3bfc370f63562ab8a4fa0f46c8ef 10SHA1 (patch-ad) = d17bf2ad6ad6d5f02c1a421a5941648bff93da7a
10SHA1 (patch-ae) = 5ca83b5d3ec9a14d017144c8e6cfb1b0bb5c7e9d 11SHA1 (patch-ae) = 5ca83b5d3ec9a14d017144c8e6cfb1b0bb5c7e9d
11SHA1 (patch-af) = a0558fef1b2b79343bd6af4cc205e42b65621944 12SHA1 (patch-af) = a0558fef1b2b79343bd6af4cc205e42b65621944
12SHA1 (patch-ag) = 0fcd2ebda598b5d7db62437fda16242a28689295 13SHA1 (patch-ag) = 0fcd2ebda598b5d7db62437fda16242a28689295
13SHA1 (patch-ah) = 7026e009b445b554737ee8e575ebf073f7ebee57 14SHA1 (patch-ah) = 7026e009b445b554737ee8e575ebf073f7ebee57
14SHA1 (patch-ai) = fac6897b6bc9a055094488a79760d9092252198b 15SHA1 (patch-ai) = fac6897b6bc9a055094488a79760d9092252198b
15SHA1 (patch-aj) = dc0449278ae19d47437bea3b39efad5883c3bb39 16SHA1 (patch-aj) = dc0449278ae19d47437bea3b39efad5883c3bb39
16SHA1 (patch-ak) = 94e9bc64b03c4af599f763522dc3598116448eb6 17SHA1 (patch-ak) = 94e9bc64b03c4af599f763522dc3598116448eb6
17SHA1 (patch-al) = 2eaa1647ef4d18a84c1542ae86c0bb863f87753d 18SHA1 (patch-al) = 2eaa1647ef4d18a84c1542ae86c0bb863f87753d
File Added: pkgsrc/graphics/jpeg_ls/patches/patch-Encoder_melcode.c
$NetBSD: patch-Encoder_melcode.c,v 1.1 2012/12/20 21:52:28 joerg Exp $

--- Encoder/melcode.c.orig	2012-12-20 14:15:16.000000000 +0000
+++ Encoder/melcode.c
@@ -88,7 +88,7 @@ void init_process_run(int maxrun)    /* 
 
 
 
-process_run(int runlen, int eoline, int color)
+void process_run(int runlen, int eoline, int color)
 {
 	int hits = 0;
cvs diff -r1.2 -r1.3 pkgsrc/graphics/jpeg_ls/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/jpeg_ls/patches/patch-ad 2005/12/30 23:23:54 1.2
+++ pkgsrc/graphics/jpeg_ls/patches/patch-ad 2012/12/20 21:52:28 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ad,v 1.2 2005/12/30 23:23:54 joerg Exp $ 1$NetBSD: patch-ad,v 1.3 2012/12/20 21:52:28 joerg Exp $
2 2
3--- Encoder/global.h.orig Tue Jun 22 20:14:15 1999 3--- Encoder/global.h.orig 1999-06-22 18:14:15.000000000 +0000
4+++ Encoder/global.h 4+++ Encoder/global.h
5@@ -97,8 +97,6 @@ extern char *plane_int_string, 5@@ -97,8 +97,6 @@ extern char *plane_int_string,
6 *pixel_int_string; 6 *pixel_int_string;
7  7
8  8
9-#define BIG_ENDIAN 1 9-#define BIG_ENDIAN 1
10- 10-
11 typedef struct jpeg_ls { 11 typedef struct jpeg_ls {
12  12
13 int columns, /* The number of columns */ 13 int columns, /* The number of columns */
14@@ -300,7 +298,7 @@ typedef unsigned short pixel; 14@@ -300,7 +298,7 @@ typedef unsigned short pixel;
15  15
16 /****** Global variables prototypes */ 16 /****** Global variables prototypes */
@@ -19,22 +19,31 @@ $NetBSD: patch-ad,v 1.2 2005/12/30 23:23 @@ -19,22 +19,31 @@ $NetBSD: patch-ad,v 1.2 2005/12/30 23:23
19+extern FILE *in, *out; 19+extern FILE *in, *out;
20 extern FILE *c_in[MAX_COMPONENTS]; 20 extern FILE *c_in[MAX_COMPONENTS];
21 extern FILE *c_out[MAX_COMPONENTS]; 21 extern FILE *c_out[MAX_COMPONENTS];
22 extern int inhandle; 22 extern int inhandle;
23@@ -318,7 +316,7 @@ extern int alpha; 23@@ -318,7 +316,7 @@ extern int alpha;
24 extern int vLUT[3][2 * LUTMAX16]; 24 extern int vLUT[3][2 * LUTMAX16];
25 extern int lutmax; 25 extern int lutmax;
26 extern int classmap[CONTEXTS1]; 26 extern int classmap[CONTEXTS1];
27-extern int *qdiv0, *qdiv, /* quantization table (division via look-up) */ 27-extern int *qdiv0, *qdiv, /* quantization table (division via look-up) */
28+extern int *qdiv0, *qdiv1, /* quantization table (division via look-up) */ 28+extern int *qdiv0, *qdiv1, /* quantization table (division via look-up) */
29 *qmul0, *qmul; /* dequantization table */ 29 *qmul0, *qmul; /* dequantization table */
30  30
31 /* statistics tables */ 31 /* statistics tables */
 32@@ -355,7 +353,7 @@ void buffinit(FILE *);
 33 /* melcode.c */
 34 void init_process_run(int);
 35 void close_process_run();
 36-int process_run(int,int,int);
 37+void process_run(int,int,int);
 38
 39
 40 /* initialize.c */
32@@ -365,7 +363,7 @@ void init_stats(int); 41@@ -365,7 +363,7 @@ void init_stats(int);
33  42
34  43
35  44
36-#ifdef BIG_ENDIAN 45-#ifdef BIG_ENDIAN
37+#ifdef NEVER_ASSUME_BIG_ENDIAN 46+#ifdef NEVER_ASSUME_BIG_ENDIAN
38 # define ENDIAN8(x) (x) 47 # define ENDIAN8(x) (x)
39 # define ENDIAN16(x) (x) 48 # define ENDIAN16(x) (x)
40 #else 49 #else