summaryrefslogtreecommitdiffstats
path: root/src/ufodecode.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-07-26 10:47:02 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-07-26 10:47:02 +0200
commit90ecb35a99a136467ab5ae9e090434cb88833743 (patch)
tree5de4b63ead61cf92b9d847110ea522e466c33ea9 /src/ufodecode.c
parent6b320d6ad6943c14cf8685a49e36963adce0ddeb (diff)
downloadufodecode-90ecb35a99a136467ab5ae9e090434cb88833743.tar.gz
ufodecode-90ecb35a99a136467ab5ae9e090434cb88833743.tar.bz2
ufodecode-90ecb35a99a136467ab5ae9e090434cb88833743.tar.xz
ufodecode-90ecb35a99a136467ab5ae9e090434cb88833743.zip
Add --print-num-rows and fix debug output
Diffstat (limited to 'src/ufodecode.c')
-rw-r--r--src/ufodecode.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/ufodecode.c b/src/ufodecode.c
index 58d2a68..31ac7a0 100644
--- a/src/ufodecode.c
+++ b/src/ufodecode.c
@@ -299,10 +299,6 @@ ufo_decode_frame_channels_v4(UfoDecoder *decoder,
int header = (info >> 30) & 0x03;
const int bpp = (info >> 16) & 0x0F;
CHECK_FLAG("raw header magick", header == 2, header);
-
- /* XXX: rows are numbered absolutely so this becomes unnecessary */
- /* CHECK_FLAG("row number, only %i rows requested", row < num_rows, row, num_rows); */
-
CHECK_FLAG("pixel size, only 10 bits are supported", bpp == 10, bpp);
CHECK_FLAG("channel, limited by %zu output channels", channel < channels_per_row, channel, channels_per_row);
#endif
@@ -581,7 +577,7 @@ size_t ufo_decoder_decode_frame(UfoDecoder *decoder,
if ((meta->output_mode != IPECAMERA_MODE_4_CHAN_IO) && (meta->output_mode != IPECAMERA_MODE_16_CHAN_IO)) {
#ifdef DEBUG
- fprintf(stderr, "Output mode 0x%lx is not supported\n", meta->output_mode);
+ fprintf(stderr, "Output mode 0x%x is not supported\n", meta->output_mode);
#endif
return EILSEQ;
}