Prototype of using STB rather than FreeImage #590
Draft
Conversation
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
Signed-off-by: Michael Carroll <[email protected]>
ahcorde
requested changes
Apr 3, 2024
| @@ -0,0 +1,48 @@ | |||
| /* | |||
| * Copyright (C) 2023 Open Source Robotics Foundation | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (C) 2023 Open Source Robotics Foundation | |
| * Copyright (C) 2024 Open Source Robotics Foundation |
|
|
||
| std::shared_ptr<ImageData> ImageLoader::Load(const std::string &_filename) const | ||
| { | ||
| std::string fullName = _filename; |
Comment on lines
+45
to
+48
| } | ||
|
|
||
|
|
||
| } // namespace gz::common |
There was a problem hiding this comment.
Suggested change
| } | |
| } // namespace gz::common | |
| } | |
| } // namespace gz::common |
| @@ -0,0 +1,62 @@ | |||
| /* | |||
| * Copyright (C) 2023 Open Source Robotics Foundation | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (C) 2023 Open Source Robotics Foundation | |
| * Copyright (C) 2024 Open Source Robotics Foundation |
| { | ||
| struct ImageData | ||
| { | ||
| std::string filename {""}; |
| protected: std::shared_ptr<ImageData> LoadImpl_8bit(const std::string &_filename) const; | ||
| protected: std::shared_ptr<ImageData> LoadImpl_16bit(const std::string &_filename) const; | ||
|
|
||
| protected: virtual std::shared_ptr<ImageData> LoadImpl(const std::string &_filename) const override; |
| @@ -0,0 +1,80 @@ | |||
| /* | |||
| * Copyright (C) 2016 Open Source Robotics Foundation | |||
There was a problem hiding this comment.
Suggested change
| * Copyright (C) 2016 Open Source Robotics Foundation | |
| * Copyright (C) 2024 Open Source Robotics Foundation |
|
|
||
| class ImageLoaderTest : public common::testing::AutoLogFixture { }; | ||
|
|
||
| const std::string kTestDataGazeboJpeg = // NOLINT(*) |
| ///////////////////////////////////////////////// | ||
| TEST_F(ImageLoaderTest, LoadBmp) | ||
| { | ||
| auto loader = std::make_unique<TestImageLoader>(); |
| { | ||
| auto loader = std::make_unique<TestImageLoader>(); | ||
| ASSERT_NE(nullptr, loader->Load(kTestData)); | ||
|
|
|
Per our discussion in the PMC meeting, this is unlikely to make it into Ionic, so I'll go ahead and remove the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.