Merged
Conversation
tools/convert_imageset.cpp
Outdated
Member
There was a problem hiding this comment.
Why keep these around as comments? Just drop.
Member
|
@philkr thanks for improving the encoding. Can you squash this into a single commit and take care of the inline comments? Thanks. |
Member
|
Please combine your commits for the sake of the history http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html then this can be merged. |
…le) to be encoded. Allowing for a change in encoded (jpg -> png vice versa) and cleaning up some unused functions.
Contributor
Author
|
ahh, the wonders of git :) |
shelhamer
added a commit
that referenced
this pull request
Feb 17, 2015
Groom handling of encoded image inputs
shelhamer
added a commit
that referenced
this pull request
Feb 19, 2015
This reverts the encoding cleanup since it breaks data processing for existing inputs as discussed in #1901.
shelhamer
added a commit
that referenced
this pull request
Feb 20, 2015
shelhamer
added a commit
to shelhamer/caffe
that referenced
this pull request
Feb 20, 2015
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I decided to clean the encoded flag up a bit and add some more options.
convert_imageset can now store images encoded with resize and gray options on. Internally io.cpp will use opencv to re-encode a resized image if needed. It is also possible to change the encoding, using the encode_type flag.
The DecodeDatumToCVMat and DecodeDatum functions were renamed to DecodeDatumToCVMatNative and DecodeDatumNative . The ...Native functions will load images with their native color channels (grey or BGR) instead of always converting encoded images to BGR. This allows the encoding of 1d label masks (such as image class labels).