View | Details | Raw Unified | Return to bug 75066 | Differences between
and this patch

Collapse All | Expand All

(-)codec/encoder-jpeg.cpp (-4 / +8 lines)
Lines 132-137 Link Here
132
	u_short val;
132
	u_short val;
133
	u_short nb;
133
	u_short nb;
134
    };
134
    };
135
	static huffentry ldht[];
136
	static huffentry cdht[];
137
	static huffentry laht[];
138
	static huffentry caht[];
135
139
136
    int command(int argc, const char*const* argv);
140
    int command(int argc, const char*const* argv);
137
141
Lines 194-208 Link Here
194
    99, 99, 99, 99, 99, 99, 99, 99,
198
    99, 99, 99, 99, 99, 99, 99, 99,
195
    99, 99, 99, 99, 99, 99, 99, 99 };
199
    99, 99, 99, 99, 99, 99, 99, 99 };
196
200
197
static struct JpegEncoder::huffentry ldht[] = {
201
JpegEncoder::huffentry JpegEncoder::ldht[] = {
198
    {0x0, 2}, {0x2, 3}, {0x3, 3}, {0x4, 3}, {0x5, 3}, {0x6, 3},
202
    {0x0, 2}, {0x2, 3}, {0x3, 3}, {0x4, 3}, {0x5, 3}, {0x6, 3},
199
    {0xe, 4}, {0x1e, 5}, {0x3e, 6}, {0x7e, 7}, {0xfe, 8}, {0x1fe, 9}};
203
    {0xe, 4}, {0x1e, 5}, {0x3e, 6}, {0x7e, 7}, {0xfe, 8}, {0x1fe, 9}};
200
204
201
static struct JpegEncoder::huffentry cdht[] = {
205
JpegEncoder::huffentry JpegEncoder::cdht[] = {
202
    {0x0, 2}, {0x1, 2}, {0x2, 2}, {0x6, 3}, {0xe, 4}, {0x1e, 5}, {0x3e, 6},
206
    {0x0, 2}, {0x1, 2}, {0x2, 2}, {0x6, 3}, {0xe, 4}, {0x1e, 5}, {0x3e, 6},
203
    {0x7e, 7}, {0xfe, 8}, {0x1fe, 9}, {0x3fe, 10}, {0x7fe, 11}};
207
    {0x7e, 7}, {0xfe, 8}, {0x1fe, 9}, {0x3fe, 10}, {0x7fe, 11}};
204
208
205
static struct JpegEncoder::huffentry laht[] = {
209
JpegEncoder::huffentry JpegEncoder::laht[] = {
206
    {0x0a, 4}, {0x00, 2}, {0x01, 2}, {0x04, 3}, 
210
    {0x0a, 4}, {0x00, 2}, {0x01, 2}, {0x04, 3}, 
207
    {0x0b, 4}, {0x1a, 5}, {0x78, 7}, {0xf8, 8}, 
211
    {0x0b, 4}, {0x1a, 5}, {0x78, 7}, {0xf8, 8}, 
208
    {0x3f6, 10}, {0xff82, 16}, {0xff83, 16}, {0x00, 0}, 
212
    {0x3f6, 10}, {0xff82, 16}, {0xff83, 16}, {0x00, 0}, 
Lines 268-274 Link Here
268
    {0xfffc, 16}, {0xfffd, 16}, {0xfffe, 16}, {0x00, 0}, 
272
    {0xfffc, 16}, {0xfffd, 16}, {0xfffe, 16}, {0x00, 0}, 
269
    {0x00, 0}, {0x00, 0}, {0x00, 0}, {0x00, 0} };
273
    {0x00, 0}, {0x00, 0}, {0x00, 0}, {0x00, 0} };
270
274
271
static struct JpegEncoder::huffentry caht[] = {
275
JpegEncoder::huffentry JpegEncoder::caht[] = {
272
    {0x00, 2}, {0x01, 2}, {0x04, 3}, {0x0a, 4}, 
276
    {0x00, 2}, {0x01, 2}, {0x04, 3}, {0x0a, 4}, 
273
    {0x18, 5}, {0x19, 5}, {0x38, 6}, {0x78, 7}, 
277
    {0x18, 5}, {0x19, 5}, {0x38, 6}, {0x78, 7}, 
274
    {0x1f4, 9}, {0x3f6, 10}, {0xff4, 12}, {0x00, 0}, 
278
    {0x1f4, 9}, {0x3f6, 10}, {0xff4, 12}, {0x00, 0}, 

Return to bug 75066