From 4edfe1f41d386c0fa6043926d761219bdb29e7c0 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Mon, 25 Dec 2017 10:27:45 -0500 Subject: Add tests for new PNG filters --- libtests/png_filter.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libtests/png_filter.cc') diff --git a/libtests/png_filter.cc b/libtests/png_filter.cc index 6a4f676c..7494cb7a 100644 --- a/libtests/png_filter.cc +++ b/libtests/png_filter.cc @@ -8,7 +8,8 @@ #include #include -void run(char const* filename, bool encode, unsigned int columns) +void run(char const* filename, bool encode, unsigned int columns, + int bits_per_sample, int samples_per_pixel) { // Decode the file FILE* in = QUtil::safe_fopen(filename, "rb"); @@ -17,7 +18,7 @@ void run(char const* filename, bool encode, unsigned int columns) Pipeline* pl = new Pl_PNGFilter( "png", out, encode ? Pl_PNGFilter::a_encode : Pl_PNGFilter::a_decode, - columns); + columns, samples_per_pixel, bits_per_sample); assert((2 * (columns + 1)) < 1024); unsigned char buf[1024]; size_t len; @@ -54,18 +55,22 @@ void run(char const* filename, bool encode, unsigned int columns) int main(int argc, char* argv[]) { - if (argc != 4) + if (argc != 6) { - std::cerr << "Usage: pipeline {en,de}code filename columns" << std::endl; + std::cerr << "Usage: png_filter {en,de}code filename" + << " columns samples-per-pixel bits-per-sample" + << std::endl; exit(2); } bool encode = (strcmp(argv[1], "encode") == 0); char* filename = argv[2]; int columns = QUtil::string_to_int(argv[3]); + int samples_per_pixel = QUtil::string_to_int(argv[4]); + int bits_per_sample = QUtil::string_to_int(argv[5]); try { - run(filename, encode, columns); + run(filename, encode, columns, bits_per_sample, samples_per_pixel); } catch (std::exception& e) { -- cgit v1.2.3-54-g00ecf