[DIP][OSPP] Add JPEG image encoding and decoding. (#222)

* [DIP][OSPP] Add JPEG image encoding and decoding.

* Added opencv options for dip

* Minor modification syntax

CMakeLists.txt

@@ -93,6 +93,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BUDDY_BINARY_DIR})
 set(BUDDY_EXAMPLES OFF CACHE BOOL "Build examples")
 set(BUDDY_ENABLE_OPENCV OFF CACHE BOOL "Enable OpenCV support.")
 
+if(BUDDY_ENABLE_OPENCV)
+  add_definitions(-DBUDDY_ENABLE_OPENCV)
+endif()
+
 # Generate libraries into `lib` of build directory.
 set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
 
@@ -123,6 +127,13 @@ include(AddLLVM)
 include(AddMLIR)
 include(HandleLLVMOptions)
 
+#-------------------------------------------------------------------------------
+# Dip lib configuration
+#-------------------------------------------------------------------------------
+
+find_package(JPEG REQUIRED)
+find_package(PNG REQUIRED)
+
 #-------------------------------------------------------------------------------
 # Hardware detection
 #-------------------------------------------------------------------------------
@@ -184,4 +195,4 @@ add_subdirectory(tests)
 
 add_custom_target(check-buddy
   DEPENDS check-examples check-tests
-)
+)

examples/ConvOpt/CMakeLists.txt

@@ -42,8 +42,9 @@ SET_TARGET_PROPERTIES(
 if(BUDDY_ENABLE_OPENCV)
   find_package(OpenCV REQUIRED CONFIG)
   include_directories(${OpenCV_INCLUDE_DIRS})
-endif()
+  add_executable(edge-detection edge-detection.cpp)
+  add_dependencies(edge-detection buddy-opt)
+  target_link_libraries(edge-detection ${OpenCV_LIBS} Conv2D)
+  endif()
+
 
-add_executable(edge-detection edge-detection.cpp)
-add_dependencies(edge-detection buddy-opt)
-target_link_libraries(edge-detection ${OpenCV_LIBS} Conv2D)

examples/DIPDialect/CMakeLists.txt

@@ -1,25 +1,30 @@
+set(DIP_LIBS ${JPEG_LIBRARY} ${PNG_LIBRARY} BuddyLibDIP)
+
 if(BUDDY_ENABLE_OPENCV)
   find_package(OpenCV REQUIRED CONFIG)
   include_directories(${OpenCV_INCLUDE_DIRS})
-endif()
 
-add_executable(correlation2D correlation2D.cpp)
-target_link_libraries(correlation2D ${OpenCV_LIBS} BuddyLibDIP)
+  add_executable(correlation2D correlation2D.cpp)
+  target_link_libraries(correlation2D ${OpenCV_LIBS} ${DIP_LIBS})
+
+  add_executable(correlationFFT2D correlationFFT2D.cpp)
+  target_link_libraries(correlationFFT2D ${OpenCV_LIBS} ${DIP_LIBS})
 
-add_executable(correlationFFT2D correlationFFT2D.cpp)
-target_link_libraries(correlationFFT2D ${OpenCV_LIBS} BuddyLibDIP)
+  add_executable(morph2D morph2D.cpp)
+  target_link_libraries(morph2D ${OpenCV_LIBS} ${DIP_LIBS})
+
+  add_executable(dip-all DIPAll.cpp)
+  target_link_libraries(dip-all ${OpenCV_LIBS} ${DIP_LIBS})
+
+  add_executable(opencv-all OpenCVAll.cpp)
+  target_link_libraries(opencv-all ${OpenCV_LIBS})
+endif()
 
 add_executable(rotation2D rotation2D.cpp)
-target_link_libraries(rotation2D ${OpenCV_LIBS} BuddyLibDIP)
+target_link_libraries(rotation2D ${DIP_LIBS})
 
 add_executable(resize2D resize2D.cpp)
-target_link_libraries(resize2D ${OpenCV_LIBS} BuddyLibDIP)
+target_link_libraries(resize2D ${DIP_LIBS})
 
-add_executable(morph2D morph2D.cpp)
-target_link_libraries(morph2D ${OpenCV_LIBS} BuddyLibDIP)
 
-add_executable(dip-all DIPAll.cpp)
-target_link_libraries(dip-all ${OpenCV_LIBS} BuddyLibDIP)
 
-add_executable(opencv-all OpenCVAll.cpp)
-target_link_libraries(opencv-all ${OpenCV_LIBS})

examples/DIPDialect/resize2D.cpp

@@ -27,6 +27,7 @@
 #include <buddy/DIP/DIP.h>
 #include <buddy/DIP/ImageContainer.h>
 #include <iostream>
+#include <math.h>
 
 using namespace std;
 

examples/DIPDialect/rotation2D.cpp

@@ -27,6 +27,7 @@
 #include <buddy/DIP/DIP.h>
 #include <buddy/DIP/ImageContainer.h>
 #include <iostream>
+#include <math.h>
 
 using namespace std;
 

frontend/Interfaces/buddy/DIP/DIP.h

@@ -23,7 +23,7 @@
 
 #include "buddy/Core/Container.h"
 #include "buddy/DIP/ImageContainer.h"
-
+#include <math.h>
 namespace dip {
 // Availale types of boundary extrapolation techniques provided in DIP dialect.
 enum class BOUNDARY_OPTION { CONSTANT_PADDING, REPLICATE_PADDING };

frontend/Interfaces/buddy/DIP/ImageContainer.h

@@ -24,7 +24,10 @@
 #include "buddy/Core/Container.h"
 #include "buddy/DIP/imgcodecs/replenishment.h"
 #include <cassert>
+
+#ifdef BUDDY_ENABLE_OPENCV
 #include <opencv2/opencv.hpp>
+#endif
 
 using namespace dip;
 // Image container.
@@ -68,12 +71,14 @@ template <typename T, size_t N> class Img : public MemRef<T, N> {
   // Move assignment operator.
   Img &operator=(Img<T, N> &&m);
 
+#ifdef BUDDY_ENABLE_OPENCV
   /**
    * @brief Load image data from OpenCV Mat.
    * @param image represents the OpenCV Mat object.
    * @param norm indicates whether to perform.
    */
   Img(cv::Mat image, intptr_t sizes[N] = nullptr, bool norm = false);
+#endif
 
   int channels();
 };
@@ -133,6 +138,7 @@ Img<T, N> &Img<T, N>::operator=(const Img<T, N> &m) {
 template <typename T, size_t N>
 Img<T, N>::Img(T *data, intptr_t sizes[N]) : MemRef<T, N>(data, sizes) {}
 
+#ifdef BUDDY_ENABLE_OPENCV
 // Image Constructor from OpenCV Mat.
 template <typename T, size_t N>
 Img<T, N>::Img(cv::Mat image, intptr_t sizes[N], bool norm) : MemRef<T, N>() {
@@ -173,6 +179,7 @@ Img<T, N>::Img(cv::Mat image, intptr_t sizes[N], bool norm) : MemRef<T, N>() {
     }
   }
 }
+#endif
 
 template <typename T, size_t N> int Img<T, N>::channels() {
   if (N == 2) {

frontend/Interfaces/buddy/DIP/imgcodecs/grfmt_bmp.h

@@ -1,11 +1,10 @@
-//===- Grfmt_bmp.h ---------------------------------------------------===//
+//===-----------------------grfmt_bmp.h----------------------------===//
 //
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this
-//  license. If you do not agree to this license, do not download, install, copy
-//  or use the software.
+// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
 //
+// By downloading, copying, installing or using the software you agree to
+// this license. If you do not agree to this license, do not download,
+// install, copy or use the software.
 //
 //                        Intel License Agreement
 //                For Open Source Computer Vision Library
@@ -16,17 +15,17 @@
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
 //
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
+//  * Redistribution's of source code must retain the above copyright notice,
+//  this list of conditions and the following disclaimer.
 //
-//   * Redistribution's in binary form must reproduce the above copyright
-//   notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
+//  * Redistribution's in binary form must reproduce the above copyright
+//  notice,
+//  this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
 //
-//   * The name of Intel Corporation may not be used to endorse or promote
-//   products
-//     derived from this software without specific prior written permission.
+//  * The name of Intel Corporation may not be used to endorse or promote
+//  products
+//  derived from this software without specific prior written permission.
 //
 // This software is provided by the copyright holders and contributors "as is"
 // and any express or implied warranties, including, but not limited to, the
@@ -41,11 +40,12 @@
 // possibility of such damage.
 //
 //
-//===----------------------------------------------------------------------===//
+//----------------------------------------------------------------------//
 //
-// This file is modified from opencv's modules/imgcodecs/src/grfmt_bmp.hpp file
+// This file is modified from opencv's
+// modules/imgcodecs/src/grfmt_bmp.hpp file
 //
-//===----------------------------------------------------------------------===//
+//----------------------------------------------------------------------//
 
 #ifndef _GRFMT_BMP_H_
 #define _GRFMT_BMP_H_
@@ -450,4 +450,4 @@ bool BmpEncoder<T, N>::write(Img<T, N> &img, const std::vector<int> &) {
   return true;
 }
 } // namespace dip
-#endif /*_GRFMT_BMP_H_*/
+#endif /*_GRFMT_BMP_H_*/