1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
--- a/src/libjasper/jpc/jpc_qmfb.c
+++ b/src/libjasper/jpc/jpc_qmfb.c
@@ -94,52 +94,38 @@
#define QMFB_SPLITBUFSIZE 4096
#define QMFB_JOINBUFSIZE 4096
-int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
- int stride);
-int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
- int stride);
-
-int jpc_ns_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
- int stride);
-int jpc_ns_synthesize(jpc_fix_t *a, int xstart, int ystart, int width,
- int height, int stride);
+int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride);
+int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride);
+
+int jpc_ns_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride);
+int jpc_ns_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height, int stride);
void jpc_ft_fwdlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ft_fwdlift_col(jpc_fix_t *a, int numrows, int stride,
- int parity);
-void jpc_ft_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride,
- int parity);
-void jpc_ft_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols,
- int stride, int parity);
+void jpc_ft_fwdlift_col(jpc_fix_t *a, int numrows, int stride, int parity);
+void jpc_ft_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
+void jpc_ft_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
void jpc_ft_invlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ft_invlift_col(jpc_fix_t *a, int numrows, int stride,
- int parity);
-void jpc_ft_invlift_colgrp(jpc_fix_t *a, int numrows, int stride,
- int parity);
-void jpc_ft_invlift_colres(jpc_fix_t *a, int numrows, int numcols,
- int stride, int parity);
+void jpc_ft_invlift_col(jpc_fix_t *a, int numrows, int stride, int parity);
+void jpc_ft_invlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
+void jpc_ft_invlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
void jpc_ns_fwdlift_row(jpc_fix_t *a, int numcols, int parity);
void jpc_ns_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_ns_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
- int parity);
+void jpc_ns_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
void jpc_ns_invlift_row(jpc_fix_t *a, int numcols, int parity);
void jpc_ns_invlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_ns_invlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
- int parity);
+void jpc_ns_invlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity);
void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride, int parity);
void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
- int parity);
+void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity);
void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride, int parity);
void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
- int parity);
+void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols, int stride, int parity);
double jpc_ft_lpenergywts[32] = {
1.2247448713915889,
@@ -1530,7 +1516,7 @@
}
-int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
+int jpc_ft_synthesize(jpc_fix_t *a, int xstart, int ystart, int width, int height,
int stride)
{
int numrows = height;
--- a/src/libjasper/jpc/jpc_qmfb.h
+++ b/src/libjasper/jpc/jpc_qmfb.h
@@ -100,9 +100,10 @@
#define JPC_QMFB_COLGRPSIZE 16
#endif
+#include "jpc_fix.h"
typedef struct {
- int (*analyze)(int *, int, int, int, int, int);
- int (*synthesize)(int *, int, int, int, int, int);
+ int (*analyze)(jpc_fix_t*, int, int, int, int, int);
+ int (*synthesize)(jpc_fix_t*, int, int, int, int, int);
double *lpenergywts;
double *hpenergywts;
} jpc_qmfb2d_t;
--- a/src/libjasper/jpc/jpc_tsfb.c
+++ b/src/libjasper/jpc/jpc_tsfb.c
@@ -88,10 +88,10 @@
int xstart, int ystart, int xend, int yend, jpc_tsfb_band_t **bands,
int numlvls);
-int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
+int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jas_seqent_t *a, int xstart, int ystart,
int width, int height, int stride, int numlvls);
-int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
+int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jas_seqent_t *a, int xstart, int ystart,
int width, int height, int stride, int numlvls);
/******************************************************************************\
@@ -135,7 +135,7 @@
jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
}
-int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
+int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, jas_seqent_t *a, int xstart, int ystart,
int width, int height, int stride, int numlvls)
{
if (width > 0 && height > 0) {
@@ -162,7 +162,7 @@
jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
}
-int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
+int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, jas_seqent_t *a, int xstart, int ystart,
int width, int height, int stride, int numlvls)
{
if (numlvls > 0) {
|
