Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/libOpenImageIO/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,10 @@ if (OIIO_BUILD_TESTS AND BUILD_TESTING)
add_test (unit_imageinout ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imageinout_test)
set_tests_properties (unit_imageinout PROPERTIES PROCESSORS 2 COST 30)

if (NOT DEFINED ENV{OpenImageIO_CI})
fancy_add_executable (NAME imagespeed_test SRC imagespeed_test.cpp
LINK_LIBRARIES OpenImageIO
FOLDER "Unit Tests" NO_INSTALL)
#add_test (imagespeed_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imagespeed_test)
endif ()
fancy_add_executable (NAME imagespeed_test SRC imagespeed_test.cpp
LINK_LIBRARIES OpenImageIO
FOLDER "Unit Tests" NO_INSTALL)
#add_test (imagespeed_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/imagespeed_test)

fancy_add_executable (NAME compute_test SRC compute_test.cpp
LINK_LIBRARIES OpenImageIO
Expand Down
4 changes: 0 additions & 4 deletions src/libOpenImageIO/imagespeed_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ time_write_scanline_at_a_time()

size_t pixelsize = outspec.nchannels * sizeof(float);
imagesize_t scanlinesize = outspec.width * pixelsize;
bool ok = true;
for (int y = 0; y < outspec.height && ok; ++y) {
ok = out->write_scanline(y + outspec.y, outspec.z, bufspec.format,
&buffer[scanlinesize * y]);
Expand All @@ -220,7 +219,6 @@ time_write_64_scanlines_at_a_time()
OIIO_ASSERT(out);
bool ok = out->open(output_filename, outspec);
OIIO_ASSERT(ok);
bool ok = true;
size_t pixelsize = outspec.nchannels * sizeof(float);
imagesize_t scanlinesize = outspec.width * pixelsize;
for (int y = 0; y < outspec.height && ok; y += 64) {
Expand All @@ -246,7 +244,6 @@ time_write_tile_at_a_time()
size_t pixelsize = outspec.nchannels * sizeof(float);
imagesize_t scanlinesize = outspec.width * pixelsize;
imagesize_t planesize = outspec.height * scanlinesize;
bool ok = true;
for (int z = 0; z < outspec.depth && ok; z += outspec.tile_depth) {
for (int y = 0; y < outspec.height && ok; y += outspec.tile_height) {
for (int x = 0; x < outspec.width && ok; x += outspec.tile_width) {
Expand All @@ -272,7 +269,6 @@ time_write_tiles_row_at_a_time()

size_t pixelsize = outspec.nchannels * sizeof(float);
imagesize_t scanlinesize = outspec.width * pixelsize;
bool ok = true;
for (int z = 0; z < outspec.depth && ok; z += outspec.tile_depth) {
for (int y = 0; y < outspec.height && ok; y += outspec.tile_height) {
ok = out->write_tiles(outspec.x, outspec.x + outspec.width,
Expand Down
Loading