-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from uiuc-fa20-cs126/week2
Week 2 Merge to Main
- Loading branch information
Showing
7 changed files
with
447 additions
and
174 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| #include "maskade_classifier.hpp" | ||
| #include "cinder/app/RendererGl.h" | ||
|
|
||
| using ci::app::RendererGl; | ||
| using maskade::MaskadeClassifier; | ||
|
|
||
| CINDER_APP(MaskadeClassifier, RendererGl) | ||
| CINDER_APP(maskade::MaskadeClassifier, ci::app::RendererGl) |
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,6 @@ | ||
| { | ||
| "model_image_width": 224, | ||
| "model_image_height": 224, | ||
| "font": "IBM Plex Mono", | ||
| "font_color": "0xFFBFBF" | ||
| } |
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,197 @@ | ||
| // This file is borrowed from the Cinder-OpenCV Cinderblock | ||
| // https://github.com/cinder/Cinder-OpenCV3/blob/master/include/CinderOpenCV.h | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "opencv2/opencv.hpp" | ||
|
|
||
| #include "cinder/Cinder.h" | ||
| #include "cinder/ImageIo.h" | ||
|
|
||
| namespace cinder { | ||
|
|
||
| class ImageTargetCvMat : public ImageTarget { | ||
| public: | ||
| static std::shared_ptr<ImageTargetCvMat> createRef( cv::Mat *mat ) { return std::shared_ptr<ImageTargetCvMat>( new ImageTargetCvMat( mat ) ); } | ||
|
|
||
| virtual bool hasAlpha() const { return mMat->channels() == 4; } | ||
| virtual void* getRowPointer( int32_t row ) { return reinterpret_cast<void*>( reinterpret_cast<uint8_t*>(mMat->data) + row * mMat->step ); } | ||
|
|
||
| protected: | ||
| ImageTargetCvMat( cv::Mat *mat ); | ||
|
|
||
| cv::Mat *mMat; | ||
| }; | ||
|
|
||
| class ImageSourceCvMat : public ImageSource { | ||
| public: | ||
| ImageSourceCvMat( const cv::Mat &mat ) | ||
| : ImageSource() | ||
| { | ||
| mWidth = mat.cols; | ||
| mHeight = mat.rows; | ||
| if( (mat.channels() == 3) || (mat.channels() == 4) ) { | ||
| setColorModel( ImageIo::CM_RGB ); | ||
| if( mat.channels() == 4 ) | ||
| setChannelOrder( ImageIo::BGRA ); | ||
| else | ||
| setChannelOrder( ImageIo::BGR ); | ||
| } | ||
| else if( mat.channels() == 1 ) { | ||
| setColorModel( ImageIo::CM_GRAY ); | ||
| setChannelOrder( ImageIo::Y ); | ||
| } | ||
|
|
||
| switch( mat.depth() ) { | ||
| case CV_8U: setDataType( ImageIo::UINT8 ); break; | ||
| case CV_16U: setDataType( ImageIo::UINT16 ); break; | ||
| case CV_32F: setDataType( ImageIo::FLOAT32 ); break; | ||
| default: | ||
| throw ImageIoExceptionIllegalDataType(); | ||
| } | ||
|
|
||
| mRowBytes = (int32_t)mat.step; | ||
| mData = reinterpret_cast<const uint8_t*>( mat.data ); | ||
| } | ||
|
|
||
| void load( ImageTargetRef target ) { | ||
| // get a pointer to the ImageSource function appropriate for handling our data configuration | ||
| ImageSource::RowFunc func = setupRowFunc( target ); | ||
|
|
||
| const uint8_t *data = mData; | ||
| for( int32_t row = 0; row < mHeight; ++row ) { | ||
| ((*this).*func)( target, row, data ); | ||
| data += mRowBytes; | ||
| } | ||
| } | ||
|
|
||
| const uint8_t *mData; | ||
| int32_t mRowBytes; | ||
| }; | ||
|
|
||
| ////////////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| // ImageTargetCvMat | ||
| inline ImageTargetCvMat::ImageTargetCvMat( cv::Mat *mat ) | ||
| : ImageTarget(), mMat( mat ) | ||
| { | ||
| switch( mat->depth() ) { | ||
| case CV_8U: setDataType( ImageIo::UINT8 ); break; | ||
| case CV_16U: setDataType( ImageIo::UINT16 ); break; | ||
| case CV_32F: setDataType( ImageIo::FLOAT32 ); break; | ||
| default: | ||
| throw ImageIoExceptionIllegalDataType(); | ||
| } | ||
|
|
||
| switch( mat->channels() ) { | ||
| case 1: | ||
| setColorModel( ImageIo::CM_GRAY ); | ||
| setChannelOrder( ImageIo::Y ); | ||
| break; | ||
| case 3: | ||
| setColorModel( ImageIo::CM_RGB ); | ||
| setChannelOrder( ImageIo::BGR ); | ||
| break; | ||
| case 4: | ||
| setColorModel( ImageIo::CM_RGB ); | ||
| setChannelOrder( ImageIo::BGRA ); | ||
| break; | ||
| default: | ||
| throw ImageIoExceptionIllegalColorModel(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| inline cv::Mat toOcv( ci::ImageSourceRef sourceRef, int type = -1 ) | ||
| { | ||
| if( type == -1 ) { | ||
| int depth = CV_8U; | ||
| if( sourceRef->getDataType() == ImageIo::UINT16 ) | ||
| depth = CV_16U; | ||
| else if( ( sourceRef->getDataType() == ImageIo::FLOAT32 ) || ( sourceRef->getDataType() == ImageIo::FLOAT16 ) ) | ||
| depth = CV_32F; | ||
| int channels = ImageIo::channelOrderNumChannels( sourceRef->getChannelOrder() ); | ||
| type = CV_MAKETYPE( depth, channels ); | ||
| } | ||
|
|
||
| cv::Mat result( sourceRef->getHeight(), sourceRef->getWidth(), type ); | ||
| ImageTargetRef target = ImageTargetCvMat::createRef( &result ); | ||
| sourceRef->load( target ); | ||
| return result; | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Channel8u &channel ) | ||
| { | ||
| return cv::Mat( channel.getHeight(), channel.getWidth(), CV_MAKETYPE( CV_8U, 1 ), channel.getData(), channel.getRowBytes() ); | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Channel16u &channel ) | ||
| { | ||
| return cv::Mat( channel.getHeight(), channel.getWidth(), CV_MAKETYPE( CV_16U, 1 ), channel.getData(), channel.getRowBytes() ); | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Channel32f &channel ) | ||
| { | ||
| return cv::Mat( channel.getHeight(), channel.getWidth(), CV_MAKETYPE( CV_32F, 1 ), channel.getData(), channel.getRowBytes() ); | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Surface8u &surface ) | ||
| { | ||
| return cv::Mat( surface.getHeight(), surface.getWidth(), CV_MAKETYPE( CV_8U, surface.hasAlpha()?4:3), surface.getData(), surface.getRowBytes() ); | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Surface16u &surface ) | ||
| { | ||
| return cv::Mat( surface.getHeight(), surface.getWidth(), CV_MAKETYPE( CV_16U, surface.hasAlpha()?4:3), surface.getData(), surface.getRowBytes() ); | ||
| } | ||
|
|
||
| inline cv::Mat toOcvRef( Surface32f &surface ) | ||
| { | ||
| return cv::Mat( surface.getHeight(), surface.getWidth(), CV_MAKETYPE( CV_32F, surface.hasAlpha()?4:3), surface.getData(), surface.getRowBytes() ); | ||
| } | ||
|
|
||
| inline ImageSourceRef fromOcv( cv::Mat &mat ) | ||
| { | ||
| return ImageSourceRef( new ImageSourceCvMat( mat ) ); | ||
| } | ||
|
|
||
| inline ImageSourceRef fromOcv( cv::UMat &umat ) | ||
| { | ||
| return ImageSourceRef( new ImageSourceCvMat( umat.getMat( cv::ACCESS_READ ) ) ); | ||
| } | ||
|
|
||
| inline cv::Scalar toOcv( const Color &color ) | ||
| { | ||
| return CV_RGB( color.r * 255, color.g * 255, color.b * 255 ); | ||
| } | ||
|
|
||
| inline vec2 fromOcv( const cv::Point2f &point ) | ||
| { | ||
| return vec2( point.x, point.y ); | ||
| } | ||
|
|
||
| inline cv::Point2f toOcv( const vec2 &point ) | ||
| { | ||
| return cv::Point2f( point.x, point.y ); | ||
| } | ||
|
|
||
| inline ivec2 fromOcv( const cv::Point &point ) | ||
| { | ||
| return ivec2( point.x, point.y ); | ||
| } | ||
|
|
||
| inline cv::Point toOcv( const ivec2 &point ) | ||
| { | ||
| return cv::Point( point.x, point.y ); | ||
| } | ||
|
|
||
| inline cv::Rect toOcv( const ci::Area &r ) | ||
| { | ||
| return cv::Rect( r.x1, r.y1, r.getWidth(), r.getHeight() ); | ||
| } | ||
|
|
||
| inline ci::Area fromOcv( const cv::Rect &r ) | ||
| { | ||
| return Area( r.x, r.y, r.x + r.width, r.y + r.height ); | ||
| } | ||
|
|
||
| } // namespace cinder |
Oops, something went wrong.