Skip to content

Commit

Permalink
Merge pull request #220 from buddy-compiler/revert-205-DIP_jpeg
Browse files Browse the repository at this point in the history
Revert "[DIP][OSPP] Add JPEG image encoding and decoding."
  • Loading branch information
FlagerLee authored Oct 24, 2023
2 parents 326f835 + 2750a0c commit baa17b1
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 962 deletions.
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,6 @@ include(AddLLVM)
include(AddMLIR)
include(HandleLLVMOptions)

#-------------------------------------------------------------------------------
# Dip lib configuration
#-------------------------------------------------------------------------------

find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)

#-------------------------------------------------------------------------------
# Hardware detection
#-------------------------------------------------------------------------------
Expand Down
14 changes: 6 additions & 8 deletions examples/DIPDialect/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,23 @@ if(BUDDY_ENABLE_OPENCV)
include_directories(${OpenCV_INCLUDE_DIRS})
endif()

set(DIP_LIBS ${JPEG_LIBRARY} ${PNG_LIBRARY} BuddyLibDIP)

add_executable(correlation2D correlation2D.cpp)
target_link_libraries(correlation2D ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(correlation2D ${OpenCV_LIBS} BuddyLibDIP)

add_executable(correlationFFT2D correlationFFT2D.cpp)
target_link_libraries(correlationFFT2D ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(correlationFFT2D ${OpenCV_LIBS} BuddyLibDIP)

add_executable(rotation2D rotation2D.cpp)
target_link_libraries(rotation2D ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(rotation2D ${OpenCV_LIBS} BuddyLibDIP)

add_executable(resize2D resize2D.cpp)
target_link_libraries(resize2D ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(resize2D ${OpenCV_LIBS} BuddyLibDIP)

add_executable(morph2D morph2D.cpp)
target_link_libraries(morph2D ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(morph2D ${OpenCV_LIBS} BuddyLibDIP)

add_executable(dip-all DIPAll.cpp)
target_link_libraries(dip-all ${OpenCV_LIBS} ${DIP_LIBS})
target_link_libraries(dip-all ${OpenCV_LIBS} BuddyLibDIP)

add_executable(opencv-all OpenCVAll.cpp)
target_link_libraries(opencv-all ${OpenCV_LIBS})
Binary file removed examples/images/YuTu.jpg
Binary file not shown.
36 changes: 18 additions & 18 deletions frontend/Interfaces/buddy/DIP/imgcodecs/grfmt_bmp.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
//===-----------------------grfmt_bmp.h----------------------------===//
//===- Grfmt_bmp.h ---------------------------------------------------===//
//
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
// 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.
//
// 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
Expand All @@ -15,17 +16,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
Expand All @@ -40,12 +41,11 @@
// 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_
Expand Down
Loading

0 comments on commit baa17b1

Please sign in to comment.