Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DebugTools: initial implementation of CompareImage class.
Currently just does per-pixel comparison and calculates absolute delta, failing the comparison if max/mean delta threshold is above specified values. Useful enough for the case I have right now, might fail in other case -- but still better than whatever else I was using before :)
- Loading branch information
Showing
13 changed files
with
1,250 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# | ||
# This file is part of Magnum. | ||
# | ||
# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016 | ||
# Vladimír Vondruš <mosra@centrum.cz> | ||
# | ||
# Permission is hereby granted, free of charge, to any person obtaining a | ||
# copy of this software and associated documentation files (the "Software"), | ||
# to deal in the Software without restriction, including without limitation | ||
# the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
# and/or sell copies of the Software, and to permit persons to whom the | ||
# Software is furnished to do so, subject to the following conditions: | ||
# | ||
# The above copyright notice and this permission notice shall be included | ||
# in all copies or substantial portions of the Software. | ||
# | ||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
# DEALINGS IN THE SOFTWARE. | ||
# | ||
|
||
find_package(Corrade COMPONENTS TestSuite) | ||
|
||
if(WITH_DEBUGTOOLS AND Corrade_TestSuite_FOUND) | ||
set(SNIPPETS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) | ||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake | ||
${CMAKE_CURRENT_BINARY_DIR}/configure.h) | ||
|
||
# CompareImage documentation snippet. I need it executable so I can | ||
# copy&paste the output to the documentation. Also mot using | ||
# corrade_add_test() because it shouldn't be run as part of CTest as it | ||
# purposedly fails. | ||
add_executable(debugtools-compareimage debugtools-compareimage.cpp) | ||
target_link_libraries(debugtools-compareimage PRIVATE MagnumDebugTools) | ||
target_include_directories(debugtools-compareimage PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
This file is part of Magnum. | ||
|
||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016 | ||
Vladimír Vondruš <mosra@centrum.cz> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a | ||
copy of this software and associated documentation files (the "Software"), | ||
to deal in the Software without restriction, including without limitation | ||
the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
and/or sell copies of the Software, and to permit persons to whom the | ||
Software is furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included | ||
in all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
DEALINGS IN THE SOFTWARE. | ||
*/ | ||
|
||
#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DIR}" | ||
#define SNIPPETS_DIR "${SNIPPETS_DIR}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/* | ||
This file is part of Magnum. | ||
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016 | ||
Vladimír Vondruš <mosra@centrum.cz> | ||
Permission is hereby granted, free of charge, to any person obtaining a | ||
copy of this software and associated documentation files (the "Software"), | ||
to deal in the Software without restriction, including without limitation | ||
the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
and/or sell copies of the Software, and to permit persons to whom the | ||
Software is furnished to do so, subject to the following conditions: | ||
The above copyright notice and this permission notice shall be included | ||
in all copies or substantial portions of the Software. | ||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
DEALINGS IN THE SOFTWARE. | ||
*/ | ||
|
||
#include <Corrade/PluginManager/Manager.h> | ||
#include <Corrade/TestSuite/Tester.h> | ||
#include <Corrade/Utility/Directory.h> | ||
|
||
#include "Magnum/Image.h" | ||
#include "Magnum/Trade/ImageData.h" | ||
#include "Magnum/Trade/AbstractImporter.h" | ||
#include "Magnum/DebugTools/CompareImage.h" | ||
|
||
#include "configure.h" | ||
|
||
using namespace Magnum; | ||
|
||
namespace { | ||
|
||
Image2D doProcessing() { | ||
PluginManager::Manager<Trade::AbstractImporter> manager{MAGNUM_PLUGINS_IMPORTER_DIR}; | ||
std::unique_ptr<Trade::AbstractImporter> importer = manager.loadAndInstantiate("TgaImporter"); | ||
importer->openFile(Utility::Directory::join(SNIPPETS_DIR, "image2.tga")); | ||
auto image = importer->image2D(0); | ||
CORRADE_INTERNAL_ASSERT(image); | ||
return Image2D{image->storage(), image->format(), image->type(), image->size(), image->release()}; | ||
} | ||
|
||
Image2D loadExpectedImage() { | ||
PluginManager::Manager<Trade::AbstractImporter> manager{MAGNUM_PLUGINS_IMPORTER_DIR}; | ||
std::unique_ptr<Trade::AbstractImporter> importer = manager.loadAndInstantiate("TgaImporter"); | ||
importer->openFile(Utility::Directory::join(SNIPPETS_DIR, "image1.tga")); | ||
auto image = importer->image2D(0); | ||
CORRADE_INTERNAL_ASSERT(image); | ||
return Image2D{image->storage(), image->format(), image->type(), image->size(), image->release()}; | ||
} | ||
|
||
} | ||
|
||
struct ProcessingTest: TestSuite::Tester { | ||
explicit ProcessingTest(); | ||
|
||
void process(); | ||
}; | ||
|
||
ProcessingTest::ProcessingTest() { | ||
addTests({&ProcessingTest::process}); | ||
} | ||
|
||
/** [0] */ | ||
void ProcessingTest::process() { | ||
Image2D actual = doProcessing(); | ||
Image2D expected = loadExpectedImage(); | ||
|
||
CORRADE_COMPARE_WITH(actual, expected, | ||
(DebugTools::CompareImage{170.0f, 96.0f})); | ||
} | ||
/** [0] */ | ||
|
||
CORRADE_TEST_MAIN(ProcessingTest) | ||
|
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.