更新算法
This commit is contained in:
mo1027728827@qq.com
parent
31be481744
commit
bf3879507b
|
|
@ -9,22 +9,22 @@ set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS})
|
|||
add_library(${PROJECT_NAME} STATIC ${DIR_SRCS})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PRIVATE
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libopencv_world.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libittnotify.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibjasper.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibjpeg-turbo.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibpng.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibprotobuf.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibtiff.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libquirc.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libzlib.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibwebp.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libIlmImf.a
|
||||
)
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libopencv_world.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libittnotify.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibjasper.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibjpeg-turbo.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibpng.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibprotobuf.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibtiff.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libquirc.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libzlib.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/liblibwebp.a
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/lib/x86_64/libIlmImf.a
|
||||
)
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/nick
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
|
||||
)
|
||||
|
||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/)
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/nick
|
||||
${PROJECT_SOURCE_DIR}/../hgimgproc
|
||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
|
||||
)
|
||||
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../staticlib)
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ CImageApplyChannel::~CImageApplyChannel()
|
|||
if (colors != nullptr) delete colors;
|
||||
}
|
||||
|
||||
void CImageApplyChannel::apply(cv::Mat& pDib,int side)
|
||||
void CImageApplyChannel::apply(cv::Mat& pDib, int side)
|
||||
{
|
||||
(void)side;
|
||||
if (pDib.empty()) return;
|
||||
(void)side;
|
||||
if (pDib.empty()) return;
|
||||
|
||||
cv::Mat dst(pDib.rows, pDib.cols, CV_8UC1);
|
||||
switch (m_channel)
|
||||
|
|
@ -35,9 +35,9 @@ void CImageApplyChannel::apply(cv::Mat& pDib,int side)
|
|||
break;
|
||||
case Blue:
|
||||
cv::extractChannel(pDib, dst, 0);
|
||||
break;
|
||||
case All:
|
||||
colourless(pDib, dst, 80);
|
||||
break;
|
||||
case All:
|
||||
colourless(pDib, dst, 80);
|
||||
break;
|
||||
case Except_Red:
|
||||
except_channel(pDib, dst, 2);
|
||||
|
|
@ -61,7 +61,7 @@ void CImageApplyChannel::apply(cv::Mat& pDib,int side)
|
|||
|
||||
void CImageApplyChannel::apply(std::vector<cv::Mat>& mats, bool isTwoSide)
|
||||
{
|
||||
(void)isTwoSide;
|
||||
(void)isTwoSide;
|
||||
int i = 0;
|
||||
for (cv::Mat& var : mats) {
|
||||
if (i != 0 && isTwoSide == false)
|
||||
|
|
@ -72,57 +72,56 @@ void CImageApplyChannel::apply(std::vector<cv::Mat>& mats, bool isTwoSide)
|
|||
}
|
||||
}
|
||||
|
||||
void CImageApplyChannel::except_channel(const cv::Mat & src, cv::Mat & dst, int channel)
|
||||
void CImageApplyChannel::except_channel(const cv::Mat& src, cv::Mat& dst, int channel)
|
||||
{
|
||||
int rows = static_cast<int>(src.total());
|
||||
cv::Mat src_temp(rows, 3, CV_8UC1, src.data);
|
||||
cv::Mat dst_temp(rows, 1, CV_8UC1, dst.data);
|
||||
|
||||
cv::Mat temp1, temp2;
|
||||
cv::Mat mv[3];
|
||||
cv::split(src, mv);
|
||||
cv::Mat mask, mask1, mask2;
|
||||
switch (channel)
|
||||
{
|
||||
case 0:
|
||||
temp1 = src_temp(cv::Rect(1, 0, 1, rows));
|
||||
temp2 = src_temp(cv::Rect(2, 0, 1, rows));
|
||||
cv::addWeighted(temp1, 0.587, temp2, 0.299, 0, dst_temp);
|
||||
mask1 = mv[0] - mv[1];
|
||||
mask2 = mv[0] - mv[2];
|
||||
break;
|
||||
case 1:
|
||||
temp1 = src_temp(cv::Rect(0, 0, 1, rows));
|
||||
temp2 = src_temp(cv::Rect(2, 0, 1, rows));
|
||||
cv::addWeighted(temp1, 0.114, temp2, 0.299, 0, dst_temp);
|
||||
mask1 = mv[1] - mv[0];
|
||||
mask2 = mv[1] - mv[2];
|
||||
break;
|
||||
case 2:
|
||||
temp1 = src_temp(cv::Rect(0, 0, 1, rows));
|
||||
temp2 = src_temp(cv::Rect(1, 0, 1, rows));
|
||||
cv::addWeighted(temp1, 0.114, temp2, 0.587, 0, dst_temp);
|
||||
mask1 = mv[2] - mv[1];
|
||||
mask2 = mv[2] - mv[0];
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
cv::min(mask1, mask2, mask);
|
||||
|
||||
cv::cvtColor(src, dst, cv::COLOR_BGR2GRAY);
|
||||
dst -= mask;
|
||||
}
|
||||
|
||||
void CImageApplyChannel::colourless(const cv::Mat &src, cv::Mat &dst, uchar threshold)
|
||||
void CImageApplyChannel::colourless(const cv::Mat& src, cv::Mat& dst, uchar threshold)
|
||||
{
|
||||
if (src.channels() != 3)
|
||||
{
|
||||
dst = src;
|
||||
return;
|
||||
}
|
||||
if (src.channels() != 3)
|
||||
{
|
||||
dst = src;
|
||||
return;
|
||||
}
|
||||
|
||||
cv::Mat hsv;
|
||||
cv::cvtColor(src, hsv, cv::COLOR_BGR2HSV_FULL);
|
||||
cv::Mat mv_hsv[3];
|
||||
cv::split(hsv, mv_hsv);
|
||||
size_t total = mv_hsv[1].total();
|
||||
uchar* ptr_s = mv_hsv[1].data;
|
||||
uchar* ptr_v = mv_hsv[2].data;
|
||||
for (size_t i = 0; i < total; i++)
|
||||
if (ptr_s[i] > threshold)
|
||||
{
|
||||
ptr_s[i] = 0;
|
||||
ptr_v[i] = 255;
|
||||
}
|
||||
cv::merge(mv_hsv, 3, hsv);
|
||||
cv::cvtColor(hsv, hsv, cv::COLOR_HSV2BGR_FULL);
|
||||
cv::cvtColor(hsv, dst, cv::COLOR_BGR2GRAY);
|
||||
cv::Mat hsv;
|
||||
cv::cvtColor(src, hsv, cv::COLOR_BGR2HSV_FULL);
|
||||
cv::Mat mv_hsv[3];
|
||||
cv::split(hsv, mv_hsv);
|
||||
size_t total = mv_hsv[1].total();
|
||||
uchar* ptr_s = mv_hsv[1].data;
|
||||
uchar* ptr_v = mv_hsv[2].data;
|
||||
for (size_t i = 0; i < total; i++)
|
||||
if (ptr_s[i] > threshold)
|
||||
{
|
||||
ptr_s[i] = 0;
|
||||
ptr_v[i] = 255;
|
||||
}
|
||||
cv::merge(mv_hsv, 3, hsv);
|
||||
cv::cvtColor(hsv, hsv, cv::COLOR_HSV2BGR_FULL);
|
||||
cv::cvtColor(hsv, dst, cv::COLOR_BGR2GRAY);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
* 最近修改时间：v1.0 2020/4/21
|
||||
v1.1 2020/6/11 在除红时，增加对比度，提高除色效果。
|
||||
v1.2 2020/7/21 修正之前增强红绿蓝效果的色彩配比。
|
||||
* 版本号：v1.2
|
||||
v1.3 2021/5/24 替换红色增强算法方案。
|
||||
* 版本号：v1.3
|
||||
|
||||
* ====================================================
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
/*
|
||||
* ====================================================
|
||||
|
||||
* <EFBFBD><EFBFBD><EFBFBD>ܣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԭ<EFBFBD><EFBFBD>Ϊ<EFBFBD>˲<EFBFBD>
|
||||
* <EFBFBD><EFBFBD><EFBFBD>ߣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ά
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣺2020/4/21
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣺2020/4/21
|
||||
* <EFBFBD>汾<EFBFBD>ţ<EFBFBD>v1.0
|
||||
* „1¤7„1¤7„1¤7<EFBFBD>1ť1„1¤7„1¤7„1¤7„1¤7„1¤7<EFBFBD>0Č6„1¤7„1¤7<EFBFBD>0č9„1¤7„1¤7<EFBFBD>0Ë2„1¤7<EFBFBD>0»2„1¤7
|
||||
* „1¤7„1¤7„1¤7<EFBFBD>1°3„1¤7„1¤7„1¤7„1¤7„1¤7<EFBFBD>0Ë4
|
||||
* „1¤7„1¤7„1¤7„1¤7<EFBFBD>0µ2„1¤7‚4Ź22020/4/21
|
||||
* „1¤7„1¤7„1¤7„1¤7<EFBFBD>1¬0„1¤7<EFBFBD>0µ2„1¤7‚4Ź22020/4/21
|
||||
* „1¤7·Ú„1¤7<EFBFBD>0•0„1¤7v1.0
|
||||
|
||||
* ====================================================
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue