개정판 5b5d9b1f
KCOM_API imageCompare 수정
Change-Id: Ic4f7d2112d765de48c7bccc06fef8d69988db370
KCOM_API/KCOM_API.csproj | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 |
<Import Project="..\packages\OpenCvSharp4.runtime.win.4.3.0.20200524\build\net\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.3.0.20200524\build\net\OpenCvSharp4.runtime.win.props')" /> |
|
3 | 4 |
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
4 | 5 |
<PropertyGroup> |
5 | 6 |
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
... | ... | |
49 | 50 |
<PlatformTarget>x64</PlatformTarget> |
50 | 51 |
</PropertyGroup> |
51 | 52 |
<ItemGroup> |
52 |
<Reference Include="Emgu.CV.UI, Version=4.1.1.3497, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL">
|
|
53 |
<HintPath>..\packages\EMGU.CV.4.1.1.3497\lib\net35\Emgu.CV.UI.dll</HintPath>
|
|
53 |
<Reference Include="Markus.Image.OpenCV, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
|
54 |
<HintPath>..\packages\Markus.Image.ImageCompare.1.0.0\lib\net461\Markus.Image.OpenCV.dll</HintPath>
|
|
54 | 55 |
</Reference> |
55 |
<Reference Include="Emgu.CV.World, Version=4.1.1.3497, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL"> |
|
56 |
<HintPath>..\packages\EMGU.CV.4.1.1.3497\lib\net35\Emgu.CV.World.dll</HintPath> |
|
56 |
<Reference Include="Microsoft.CSharp" /> |
|
57 |
<Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> |
|
58 |
<HintPath>..\packages\OpenCvSharp4.4.3.0.20200524\lib\net461\OpenCvSharp.dll</HintPath> |
|
57 | 59 |
</Reference> |
58 |
<Reference Include="Markus.Image, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |
|
59 |
<HintPath>..\packages\Markus.Image.ImageComparer.1.1.3\lib\net45\Markus.Image.dll</HintPath> |
|
60 |
<Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> |
|
61 |
<HintPath>..\packages\OpenCvSharp4.4.3.0.20200524\lib\net461\OpenCvSharp.Blob.dll</HintPath> |
|
62 |
</Reference> |
|
63 |
<Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL"> |
|
64 |
<HintPath>..\packages\OpenCvSharp4.4.3.0.20200524\lib\net461\OpenCvSharp.Extensions.dll</HintPath> |
|
60 | 65 |
</Reference> |
61 |
<Reference Include="Microsoft.CSharp" /> |
|
62 | 66 |
<Reference Include="System.Data.DataSetExtensions" /> |
63 | 67 |
<Reference Include="System.Data.Entity" /> |
68 |
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> |
|
69 |
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath> |
|
70 |
</Reference> |
|
64 | 71 |
<Reference Include="System.Runtime.Remoting" /> |
65 | 72 |
<Reference Include="System.Runtime.Serialization" /> |
66 | 73 |
<Reference Include="System.ServiceModel" /> |
... | ... | |
80 | 87 |
<Reference Include="System.EnterpriseServices" /> |
81 | 88 |
<Reference Include="System.Xml.Linq" /> |
82 | 89 |
<Reference Include="WindowsBase" /> |
83 |
<Reference Include="ZedGraph, Version=5.1.7.430, Culture=neutral, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL"> |
|
84 |
<HintPath>..\packages\ZedGraph.5.1.7\lib\net35-Client\ZedGraph.dll</HintPath> |
|
85 |
</Reference> |
|
86 | 90 |
</ItemGroup> |
87 | 91 |
<ItemGroup> |
88 | 92 |
<Content Include="Default.aspx" /> |
... | ... | |
394 | 398 |
</FlavorProperties> |
395 | 399 |
</VisualStudio> |
396 | 400 |
</ProjectExtensions> |
397 |
<Import Project="..\packages\EMGU.CV.4.1.1.3497\build\EMGU.CV.targets" Condition="Exists('..\packages\EMGU.CV.4.1.1.3497\build\EMGU.CV.targets')" /> |
|
398 |
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
|
399 |
<PropertyGroup> |
|
400 |
<ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText> |
|
401 |
</PropertyGroup> |
|
402 |
<Error Condition="!Exists('..\packages\EMGU.CV.4.1.1.3497\build\EMGU.CV.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EMGU.CV.4.1.1.3497\build\EMGU.CV.targets'))" /> |
|
403 |
</Target> |
|
404 | 401 |
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
405 | 402 |
Other similar extension points exist, see Microsoft.Common.targets. --> |
406 | 403 |
<Target Name="BeforeBuild"> |
... | ... | |
415 | 412 |
<TransformXml Source="Web.Debug_HyoSung.config" Destination="$(OutputPath)Web.Debug_HyoSung.config" Transform="Web.config" /> |
416 | 413 |
</Target> |
417 | 414 |
<UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" /> |
415 |
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
|
416 |
<PropertyGroup> |
|
417 |
<ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText> |
|
418 |
</PropertyGroup> |
|
419 |
<Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.3.0.20200524\build\net\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.3.0.20200524\build\net\OpenCvSharp4.runtime.win.props'))" /> |
|
420 |
</Target> |
|
418 | 421 |
</Project> |
KCOM_API/ServiceDeepView.svc.cs | ||
---|---|---|
265 | 265 |
targetFile = String.Format(KCOM_API.Properties.Settings.Default.TileSoucePath_SUB, projectNo, targetDocItem_ID, targetPageNo); |
266 | 266 |
} |
267 | 267 |
|
268 |
using (Markus.Image.ImageComparer compareLib = new Markus.Image.ImageComparer())
|
|
268 |
using (Markus.Image.ImageCompare compareLib = new Markus.Image.ImageCompare())
|
|
269 | 269 |
{ |
270 | 270 |
result = compareLib.CompareReturnRects(originFile, targetFile, new System.Drawing.Size(20, 20)); |
271 | 271 |
} |
KCOM_API/packages.config | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<packages> |
3 |
<package id="EMGU.CV" version="4.1.1.3497" targetFramework="net461" /> |
|
4 |
<package id="Markus.Image.ImageComparer" version="1.1.3" targetFramework="net461" /> |
|
5 |
<package id="ZedGraph" version="5.1.7" targetFramework="net461" /> |
|
3 |
<package id="Markus.Image.ImageCompare" version="1.0.0" targetFramework="net461" /> |
|
4 |
<package id="OpenCvSharp4" version="4.3.0.20200524" targetFramework="net461" /> |
|
5 |
<package id="OpenCvSharp4.runtime.win" version="4.3.0.20200524" targetFramework="net461" /> |
|
6 |
<package id="OpenCvSharp4.Windows" version="4.3.0.20200524" targetFramework="net461" /> |
|
7 |
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" /> |
|
6 | 8 |
</packages> |
내보내기 Unified diff