From 300c407189fb0537fec7401b18cdfa3fa3cd982d Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Fri, 14 Oct 2022 17:20:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4sanecmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgsane/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hgsane/CMakeLists.txt b/hgsane/CMakeLists.txt index 16cbd85..de2991f 100644 --- a/hgsane/CMakeLists.txt +++ b/hgsane/CMakeLists.txt @@ -15,10 +15,10 @@ file(GLOB DIR_HEADS "${PROJECT_SOURCE_DIR}/*.h" "${PROJECT_SOURCE_DIR}/*.hpp") set(DIR_SRCS ${DIR_SRCS} ${DIR_HEADS}) add_library(${PROJECT_NAME} SHARED ${DIR_SRCS}) link_directories(${PROJECT_NAME} PRIVATE - ${PROJECT_SOURCE_DIR}/../../release/kylin/${CMAKE_SYSTEM_PROCESSOR} + ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR} ) target_link_libraries(${PROJECT_NAME} PRIVATE hgdriver - ${PROJECT_SOURCE_DIR}/../../release/kylin/${CMAKE_SYSTEM_PROCESSOR}/libhgdriver.so + ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhgdriver.so ) @@ -28,7 +28,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../../sdk/include ) -set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../release/kylin/${CMAKE_SYSTEM_PROCESSOR}) +set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../release/uos/${CMAKE_SYSTEM_PROCESSOR}) From 3f139f817029b669a5e5e18fe48ea246bd62c801 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 14 Oct 2022 17:27:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=AC=E6=8D=A2JPEG=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9DPI=E5=B1=9E=E6=80=A7=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opencv/include/win/opencv2/imgcodecs/imgcodecs_c.h | 7 +++++++ hgdriver/hgdev/image_process.cpp | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/hgdriver/3rdparty/opencv/include/win/opencv2/imgcodecs/imgcodecs_c.h b/hgdriver/3rdparty/opencv/include/win/opencv2/imgcodecs/imgcodecs_c.h index c36dac3..e821999 100644 --- a/hgdriver/3rdparty/opencv/include/win/opencv2/imgcodecs/imgcodecs_c.h +++ b/hgdriver/3rdparty/opencv/include/win/opencv2/imgcodecs/imgcodecs_c.h @@ -85,6 +85,13 @@ enum CV_IMWRITE_JPEG_RST_INTERVAL =4, CV_IMWRITE_JPEG_LUMA_QUALITY =5, CV_IMWRITE_JPEG_CHROMA_QUALITY =6, + + // add for DPI on 2022-10-14 + CV_IMWRITE_JPEG_RESOLUTION_UNIT = 7, // 0 - unknown(default value), 1 - dots/inch, 2 - dots/cm + CV_IMWRITE_JPEG_RESOLUTION_X = 8, // default value - 1 + CV_IMWRITE_JPEG_RESOLUTION_Y = 9, // default value - 1 + // ENDED for DPI + CV_IMWRITE_PNG_COMPRESSION =16, CV_IMWRITE_PNG_STRATEGY =17, CV_IMWRITE_PNG_BILEVEL =18, diff --git a/hgdriver/hgdev/image_process.cpp b/hgdriver/hgdev/image_process.cpp index 773af57..69febc6 100644 --- a/hgdriver/hgdev/image_process.cpp +++ b/hgdriver/hgdev/image_process.cpp @@ -1399,8 +1399,16 @@ namespace hg_imgproc // MSB word[7] and word[8] are x and y resolutions std::vector cpr; unsigned short jpeg_r = (resolution << 8) | ((resolution >> 8) & 0x0ff); + int resolution_y = bih.biYPelsPerMeter / 39.37f + .5f; + cpr.push_back(CV_IMWRITE_JPEG_QUALITY); cpr.push_back((int)(long)conv->dst.fmt.detail); + cpr.push_back(CV_IMWRITE_JPEG_RESOLUTION_UNIT); + cpr.push_back(1); + cpr.push_back(CV_IMWRITE_JPEG_RESOLUTION_X); + cpr.push_back(resolution); + cpr.push_back(CV_IMWRITE_JPEG_RESOLUTION_Y); + cpr.push_back(resolution_y); if (conv->dst.is_file) { cv::imwrite(conv->dst.data, imsg, cpr); From 25837cc569bcc55e6df3dd27d6a56573b6f68c41 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 14 Oct 2022 17:38:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4linux?= =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opencv/include/opencv2/imgcodecs/imgcodecs_c.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hgdriver/3rdparty/opencv/include/opencv2/imgcodecs/imgcodecs_c.h b/hgdriver/3rdparty/opencv/include/opencv2/imgcodecs/imgcodecs_c.h index c36dac3..e821999 100644 --- a/hgdriver/3rdparty/opencv/include/opencv2/imgcodecs/imgcodecs_c.h +++ b/hgdriver/3rdparty/opencv/include/opencv2/imgcodecs/imgcodecs_c.h @@ -85,6 +85,13 @@ enum CV_IMWRITE_JPEG_RST_INTERVAL =4, CV_IMWRITE_JPEG_LUMA_QUALITY =5, CV_IMWRITE_JPEG_CHROMA_QUALITY =6, + + // add for DPI on 2022-10-14 + CV_IMWRITE_JPEG_RESOLUTION_UNIT = 7, // 0 - unknown(default value), 1 - dots/inch, 2 - dots/cm + CV_IMWRITE_JPEG_RESOLUTION_X = 8, // default value - 1 + CV_IMWRITE_JPEG_RESOLUTION_Y = 9, // default value - 1 + // ENDED for DPI + CV_IMWRITE_PNG_COMPRESSION =16, CV_IMWRITE_PNG_STRATEGY =17, CV_IMWRITE_PNG_BILEVEL =18,