diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-08-23 11:17:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-08-23 11:17:03 +0100 |
| commit | d6be9f27147113dc6355ed0de7c99d1312aaeebd (patch) | |
| tree | 5df043ccf1a56938f256976cc1f5ce7f2fea6057 /test | |
| parent | 57796599a3acc10feebcbc87da70daf4d0af04f6 (diff) | |
Tidy up duplicated code.
Diffstat (limited to 'test')
| -rw-r--r-- | test/image_test.cc | 2 | ||||
| -rw-r--r-- | test/make_black_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/image_test.cc b/test/image_test.cc index 4205e5f48..82ebe0b1f 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) image = image->crop (crop, true); /* Convert it back to RGB to make comparison to black easier */ - image = image->scale_and_convert_to_rgb (image->size(), Scaler::from_id ("bicubic"), true); + image = image->scale (image->size(), Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); /* Check that its still black after the crop */ uint8_t* p = image->data()[0]; diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 78c7fbbcb..17c78d231 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (make_black_test) for (list<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { boost::shared_ptr<Image> foo (new Image (*i, in_size, true)); foo->make_black (); - boost::shared_ptr<Image> bar = foo->scale_and_convert_to_rgb (out_size, Scaler::from_id ("bicubic"), true); + boost::shared_ptr<Image> bar = foo->scale (out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); uint8_t* p = bar->data()[0]; for (int y = 0; y < bar->size().height; ++y) { |