--- /dev/null
+#!/bin/bash
+
+# Calculate coverage
+cd build
+gcovr --root=$(pwd) --keep
+lcov --capture --directory $(pwd) --base-directory $(pwd) --output-file test/coverage.info
+lcov --remove test/coverage.info "/usr*" -o test/coverage.info
+genhtml test/coverage.info --output-directory test/coverage
# and check that they are right
$dcpinfo -s $private/JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV >> $work/jah.log
-# Calculate coverage
-cd build
-gcovr --root=$(pwd) --keep
-lcov --capture --directory $(pwd) --base-directory $(pwd) --output-file test/coverage.info
-lcov --remove test/coverage.info "/usr*" -o test/coverage.info
-genhtml test/coverage.info --output-directory test/coverage
-
echo "PASS"
Image (boost::shared_ptr<const Image>);
virtual ~Image () {}
- virtual uint16_t * const * data () const = 0;
+ virtual uint8_t * const * data () const = 0;
/** @return array of strides in bytes */
virtual int const * stride () const = 0;
int jn = 0;
for (int y = 0; y < rgb->size().height; ++y) {
- uint16_t* p = rgb->data()[0] + y * rgb->stride()[0] / 2;
+ uint16_t* p = reinterpret_cast<uint16_t*> (rgb->data()[0] + y * rgb->stride()[0]);
for (int x = 0; x < rgb->size().width; ++x) {
/* In gamma LUT (converting 16-bit to 12-bit) */
int jn = 0;
for (int y = 0; y < xyz_16->size().height; ++y) {
- uint16_t* p = xyz_16->data()[0] + y * xyz_16->stride()[0] / 2;
+ uint16_t* p = reinterpret_cast<uint16_t*> (xyz_16->data()[0] + y * xyz_16->stride()[0]);
for (int x = 0; x < xyz_16->size().width; ++x) {
/* Truncate 16-bit to 12-bit */
xyz_12->data(0)[jn] = *p++ >> 4;
}
- uint16_t * const * data () const {
+ uint8_t * const * data () const {
return 0;
}
{
/* 48bpp */
_stride[0] = _size.width * 6;
- _data[0] = new uint16_t[size.height * stride()[0] / 2];
+ _data[0] = new uint8_t[size.height * stride()[0]];
}
~SimpleImage ()
delete[] _data[0];
}
- uint16_t * const * data () const {
+ uint8_t * const * data () const {
return _data;
}
}
private:
- uint16_t* _data[1];
+ uint8_t* _data[1];
int _stride[1];
};
shared_ptr<const dcp::Image> rgb (new SimpleImage (size));
for (int y = 0; y < size.height; ++y) {
- uint16_t* p = rgb->data()[0] + y * rgb->stride()[0] / 2;
+ uint16_t* p = reinterpret_cast<uint16_t*> (rgb->data()[0] + y * rgb->stride()[0]);
for (int x = 0; x < size.width; ++x) {
/* Write a 12-bit random number for each component */
for (int c = 0; c < 3; ++c) {
shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (rgb, dcp::ColourConversion::srgb_to_xyz);
for (int y = 0; y < size.height; ++y) {
- uint16_t* p = rgb->data()[0] + y * rgb->stride()[0] / 2;
+ uint16_t* p = reinterpret_cast<uint16_t*> (rgb->data()[0] + y * rgb->stride()[0]);
for (int x = 0; x < size.width; ++x) {
double cr = *p++ / 65535.0;
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
using std::string;
-string private_test;
+boost::filesystem::path private_test;
struct TestConfig
{
};
BOOST_GLOBAL_FIXTURE (TestConfig);
-
-boost::filesystem::path
-j2c (int)
-{
- return "test/data/32x32_red_square.j2c";
-}
-
-boost::filesystem::path
-wav (dcp::Channel)
-{
- return "test/data/1s_24-bit_48k_silence.wav";
-}
-
-
/*
- Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-extern std::string private_test;
+extern boost::filesystem::path private_test;