liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make rtengine/fujicompressed.cc -Wextra clean, #4155

Browse Source
This commit is contained in:
heckflosse
2017-10-23 14:06:04 +02:00
parent 54a07be45d
commit fa4444d6d3
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/dcraw.h
View File

@@ -285,8 +285,8 @@ void fuji_extend_generic(ushort *linebuf[_ltotal], int line_width, int start, in
void fuji_extend_red(ushort *linebuf[_ltotal], int line_width); void fuji_extend_red(ushort *linebuf[_ltotal], int line_width);
void fuji_extend_green(ushort *linebuf[_ltotal], int line_width); void fuji_extend_green(ushort *linebuf[_ltotal], int line_width);
void fuji_extend_blue(ushort *linebuf[_ltotal], int line_width); void fuji_extend_blue(ushort *linebuf[_ltotal], int line_width);
void xtrans_decode_block(struct fuji_compressed_block* info, const struct fuji_compressed_params *params, int cur_line); void xtrans_decode_block(struct fuji_compressed_block* info, const struct fuji_compressed_params *params);
void fuji_bayer_decode_block(struct fuji_compressed_block* info, const struct fuji_compressed_params *params, int cur_line); void fuji_bayer_decode_block(struct fuji_compressed_block* info, const struct fuji_compressed_params *params);
void fuji_decode_strip(const struct fuji_compressed_params* info_common, int cur_block, INT64 raw_offset, unsigned dsize); void fuji_decode_strip(const struct fuji_compressed_params* info_common, int cur_block, INT64 raw_offset, unsigned dsize);
void fuji_compressed_load_raw(); void fuji_compressed_load_raw();
void fuji_decode_loop(const struct fuji_compressed_params* common_info, int count, INT64* raw_block_offsets, unsigned *block_sizes); void fuji_decode_loop(const struct fuji_compressed_params* common_info, int count, INT64* raw_block_offsets, unsigned *block_sizes);

9
rtengine/fujicompressed.cc
View File

@@ -534,7 +534,7 @@ void CLASS fuji_extend_blue (ushort *linebuf[_ltotal], int line_width)
fuji_extend_generic (linebuf, line_width, _B2, _B4); fuji_extend_generic (linebuf, line_width, _B2, _B4);
} }
void CLASS xtrans_decode_block (struct fuji_compressed_block* info, const struct fuji_compressed_params *params, int cur_line) void CLASS xtrans_decode_block (struct fuji_compressed_block* info, const struct fuji_compressed_params *params)
{ {
int r_even_pos = 0, r_odd_pos = 1; int r_even_pos = 0, r_odd_pos = 1;
int g_even_pos = 0, g_odd_pos = 1; int g_even_pos = 0, g_odd_pos = 1;
@@ -699,8 +699,7 @@ void CLASS xtrans_decode_block (struct fuji_compressed_block* info, const struct
} }
} }
void CLASS fuji_bayer_decode_block (struct fuji_compressed_block *info, const struct fuji_compressed_params *params, void CLASS fuji_bayer_decode_block (struct fuji_compressed_block *info, const struct fuji_compressed_params *params)
int cur_line)
{ {
int r_even_pos = 0, r_odd_pos = 1; int r_even_pos = 0, r_odd_pos = 1;
int g_even_pos = 0, g_odd_pos = 1; int g_even_pos = 0, g_odd_pos = 1;
@@ -867,9 +866,9 @@ void CLASS fuji_decode_strip (const struct fuji_compressed_params* info_common,
for (cur_line = 0; cur_line < fuji_total_lines; cur_line++) { for (cur_line = 0; cur_line < fuji_total_lines; cur_line++) {
if (fuji_raw_type == 16) { if (fuji_raw_type == 16) {
xtrans_decode_block (&info, info_common, cur_line); xtrans_decode_block (&info, info_common);
} else { } else {
fuji_bayer_decode_block (&info, info_common, cur_line); fuji_bayer_decode_block (&info, info_common);
} }
// copy data from line buffers and advance // copy data from line buffers and advance