From c16ba61435b2dc94c9871cee77bd2291febbc7fe Mon Sep 17 00:00:00 2001
From: JinweiClarkChao <clarkzjw@gmail.com>
Date: Tue, 25 Aug 2015 16:48:29 +0800
Subject: add refs in README

---
 DCP/DCP.vcxproj     | 69 ++---------------------------------------------------
 DCP/darkchannel.cpp | 12 ++++------
 DCP/dcp.cpp         | 13 ++++++++++
 DCP/dcp.h           |  1 -
 DCP/dcp_core.h      |  2 ++
 DCP/test.cpp        |  2 +-
 6 files changed, 22 insertions(+), 77 deletions(-)

(limited to 'DCP')

diff --git a/DCP/DCP.vcxproj b/DCP/DCP.vcxproj
index b2ef313..68eeb69 100644
--- a/DCP/DCP.vcxproj
+++ b/DCP/DCP.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1543533F-481B-40EC-BEFC-90E46456A5F8}</ProjectGuid>
@@ -30,12 +22,6 @@
     <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -43,31 +29,16 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
+    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3GPU.props" />
+    <Import Project="D:\3rdLibs\OpenCV3\OpenCV3Contrib.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <NuGetPackageImportStamp>ed7df352</NuGetPackageImportStamp>
@@ -75,15 +46,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -97,19 +62,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -127,23 +79,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="dcp.h" />
     <ClInclude Include="dcp_core.h" />
diff --git a/DCP/darkchannel.cpp b/DCP/darkchannel.cpp
index ab5a365..64d9963 100644
--- a/DCP/darkchannel.cpp
+++ b/DCP/darkchannel.cpp
@@ -25,14 +25,10 @@ void CalcDarkChannel(IplImage *darkchannel, IplImage *input, int radius)
 			st_row = i - radius, ed_row = i + radius;
 			st_col = j - radius, ed_col = j + radius;
 
-			if (st_row < 0)
-				st_row = 0;
-			if (ed_row >= height)
-				ed_row = height - 1;
-			if (st_col < 0)
-				st_col = 0;
-			if (ed_col >= width)
-				ed_col = width - 1;
+			st_row = st_row < 0 ? 0 : st_row;
+			ed_row = ed_row >= height ? (height - 1) : ed_row;
+			st_col = st_col < 0 ? 0 : st_col;
+			ed_col = ed_col >= width ? (width - 1) : ed_col;
 
 			int cur = 0;
 			int min = 300;
diff --git a/DCP/dcp.cpp b/DCP/dcp.cpp
index 716759c..97a597f 100644
--- a/DCP/dcp.cpp
+++ b/DCP/dcp.cpp
@@ -1,5 +1,7 @@
 #include "dcp_core.h"
 
+using namespace cv::ximgproc;
+
 void dehaze(IplImage *recover, IplImage *input)
 {
 	int height = input->height;
@@ -30,7 +32,18 @@ void dehaze(IplImage *recover, IplImage *input)
 
 	t.tic();
 	printf("GuidedFilterColor...");
+	// GuidedFilterColor() is my own implementation of guided filter
+	// guidedFilter() is the implementation included in OpenCV 3.0
+	// The result is almost the same, however my implementation is much more slower
+	// because I haven't spend much time optimizing the code efficiency.
+
+	// See http://research.microsoft.com/en-us/um/people/kahe/eccv10/ for more details
+	// ref:
+	// He, Kaiming, Jian Sun, and Xiaoou Tang. "Guided image filtering." 
+	// Pattern Analysis and Machine Intelligence, IEEE Transactions on 35.6 (2013): 1397-1409.
+
 	GuidedFilterColor(refine_transmission, input, transmission, 1e-6, 60);
+	// guidedFilter(cv::cvarrToMat(input), cv::cvarrToMat(transmission), cv::cvarrToMat(refine_transmission), 60, 1e-6);
 	t.toc();
 
 	t.tic();
diff --git a/DCP/dcp.h b/DCP/dcp.h
index 00c7e53..eb64d63 100644
--- a/DCP/dcp.h
+++ b/DCP/dcp.h
@@ -2,7 +2,6 @@
 #define DCP_H
 
 #include "dcp_core.h"
-
 void dehaze(IplImage *recover, IplImage *input);
 
 #endif
\ No newline at end of file
diff --git a/DCP/dcp_core.h b/DCP/dcp_core.h
index 658e461..98db7a4 100644
--- a/DCP/dcp_core.h
+++ b/DCP/dcp_core.h
@@ -3,6 +3,8 @@
 
 #include <opencv\cv.h>
 #include <opencv\highgui.h>
+#include <opencv2\opencv.hpp>
+#include <opencv2\ximgproc.hpp>
 
 #include <iostream>
 
diff --git a/DCP/test.cpp b/DCP/test.cpp
index 2af8719..7587c35 100644
--- a/DCP/test.cpp
+++ b/DCP/test.cpp
@@ -2,7 +2,7 @@
 
 int main()
 {
-    IplImage *input = cvLoadImage("house-input.bmp");
+    IplImage *input = cvLoadImage("input.png");
 	IplImage *result = cvCreateImage(cvGetSize(input), IPL_DEPTH_8U, 3);
 	dehaze(result, input);
 
-- 
cgit v1.2.3