Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix a bug in document packaging.

pull/97/head
Canming Huang 8 years ago
parent
4da1fa0763
commit
a927d31458
4 changed files with 55 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Emgu.CV.Extern/core/core_c_extra.h
  2. 13
      miscellaneous/CMakeLists.txt
  3. 92
      miscellaneous/Emgu.CV.html.shfbproj
  4. 5
      platforms/windows/Build_Binary_x86.bat

1
Emgu.CV.Extern/core/core_c_extra.h
View File

@ -97,6 +97,7 @@ CVAPI(double) cveDeterminant(cv::_InputArray* mtx);
CVAPI(double) cveNorm(cv::_InputArray* src1, cv::_InputArray* src2, int normType, cv::_InputArray* mask);
CVAPI(bool) cveCheckRange(cv::_InputArray* arr, bool quiet, CvPoint* index, double minVal, double maxVal);
CVAPI(void) cvePatchNaNs(cv::_InputOutputArray* a, double val);
CVAPI(void) cveGemm(cv::_InputArray* src1, cv::_InputArray* src2, double alpha, cv::_InputArray* src3, double beta, cv::_OutputArray* dst, int flags);
CVAPI(void) cveAddWeighted(cv::_InputArray* src1, double alpha, cv::_InputArray* src2, double beta, double gamma, cv::_OutputArray* dst, int dtype);
CVAPI(void) cveConvertScaleAbs(cv::_InputArray* src, cv::_OutputArray* dst, double alpha, double beta);

13
miscellaneous/CMakeLists.txt
View File

@ -7,25 +7,18 @@ SET(MSBUILD_EXECUTABLE ${MSBUILD_EXECUTABLE_40})
IF(NOT ("${MSBUILD_EXECUTABLE}" STREQUAL ""))
#MESSAGE(STATUS "MSBUILD_EXECUTABLE: ${MSBUILD_EXECUTABLE}")
PROJECT(Emgu.CV.Document.Html)
PROJECT(Emgu.CV.Document)
ADD_CUSTOM_TARGET(
${PROJECT_NAME}
COMMAND ${MSBUILD_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.html.shfbproj
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.html.shfbproj
)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
PROJECT(Emgu.CV.Documentation.chm)
ADD_CUSTOM_TARGET(
${PROJECT_NAME} ALL
COMMAND ${MSBUILD_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.html.shfbproj /property:OutputPath=. /property:HelpFileFormat=HtmlHelp1
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.html.shfbproj
ALL
)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
INSTALL(
FILES
"${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Documentation.chm"
"${CMAKE_CURRENT_SOURCE_DIR}/../Help/Emgu.CV.Documentation.chm"
DESTINATION ./
COMPONENT emgucv_document
)

92
miscellaneous/Emgu.CV.html.shfbproj
View File

@ -8,7 +8,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{03215a85-5e82-40d0-8fc1-aa1795446be1}</ProjectGuid>
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
<SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
Studio adds them anyway -->
<AssemblyName>Documentation</AssemblyName>
@ -19,7 +19,7 @@
<HtmlHelpName>Emgu.CV.Documentation</HtmlHelpName>
<ProjectSummary>A cross platform .Net wrapper for the OpenCV image-processing library. Allows OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython. The wrapper can be compiled in Mono and run on Windows, Android, iOS, Windows Phone, Mac OS X and Linux.</ProjectSummary>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter</MissingTags>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected, EditorBrowsableNever, NonBrowsable</VisibleItems>
<HtmlHelp1xCompilerPath>
</HtmlHelp1xCompilerPath>
<HtmlHelp2xCompilerPath>
@ -30,11 +30,11 @@
<KeepLogFile>False</KeepLogFile>
<BuildLogFile>
</BuildLogFile>
<HelpFileFormat>Website</HelpFileFormat>
<HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
<CppCommentsFixup>False</CppCommentsFixup>
<FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
<HelpTitle>Emgu CV Library Documentation</HelpTitle>
<CopyrightText>2017 Emgu Corporation, All Rights Reserved,</CopyrightText>
<CopyrightText>2018 Emgu Corporation, All Rights Reserved,</CopyrightText>
<FeedbackEMailAddress>support%40emgu.com</FeedbackEMailAddress>
<HeaderText>http://www.emgu.com</HeaderText>
<FooterText>For questions and discussions please visit http://www.emgu.com/forum</FooterText>
@ -44,48 +44,49 @@
</DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="True">Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. The wrapper can be compiled in Mono and run on Windows, Linux, Mac OS X, iPhone, iPad and Android devices.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu" isDocumented="True">Root namespace for class and functions implemented by Emgu</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV" isDocumented="True">Wrapper of OpenCV's image processing functions.
<NamespaceSummaryItem name="Emgu" isDocumented="True">Root namespace for class and functions implemented by Emgu</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV" isDocumented="True">Wrapper of OpenCV's image processing functions.
Base functions (L1) can be found in CvInvoke class</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.CameraCalibration" isDocumented="True">Camera calibration related functions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.CvEnum" isDocumented="True">OpenCV Enumeration</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML" isDocumented="True">Wrapper of OpenCV's Machine Learning Library</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML.MlEnum" isDocumented="True">OpenCV's Machine Learning enumeration</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML.Structure" isDocumented="True">OpenCV's Machine Learning structures</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Properties" isDocumented="False" />
<NamespaceSummaryItem name="Emgu.CV.Reflection" isDocumented="True">Code that use reflection to get image information from Emgu CV objects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Structure" isDocumented="True">Wrapped OpenCV structures</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.UI" isDocumented="True">User interface (ImageBox) for displaying Image object.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.VideoSurveillance" isDocumented="True">Background/Foreground segmentation and Blob tracking</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Reflection" isDocumented="True">Contains functions that use reflection to create menu for ImageBox</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Util" isDocumented="True">A collection of utilities used by Emgu projects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Util.TypeEnum" isDocumented="True">Various enumeration for Emgu.Util namespace</NamespaceSummaryItem>
<NamespaceSummaryItem name="ZedGraph" isDocumented="False" />
<NamespaceSummaryItem name="Emgu.CV.Flann" isDocumented="True">Fast Library for Approximate Nearest Neighbors (Marius Muja and David Lowe)</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Features2D" isDocumented="True">Contains classes for 2D feature detection, extraction and matching.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Geodetic" isDocumented="True">Contains library that can be use for geomatic transformation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Tiff" isDocumented="True">Contains writer classes that can be used to write different tiff formats, such as tile tiff and geotiff.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Util" isDocumented="True">A collection of utilities used by Emgu.CV projects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.OCR" isDocumented="True">Optical character recognition. Wraps the tesseract-ocr engine.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Cvb" isDocumented="True">Contains interface for the CvBlob library</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Stitching" isDocumented="True">Image stitching</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.VideoStab" isDocumented="True">The video stabilization module contains a set of functions and classes that can be used to solve the problem of video stabilization.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.OpenCL" isDocumented="True">Computer vision using OpenCL</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Cuda" isDocumented="True">NVidia Cuda image processing functions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Shape" isDocumented="True">The module contains algorithms that embed a notion of shape distance. These algorithms may be used for shape matching and retrieval, or shape comparison.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Superres" isDocumented="True">The Super Resolution module contains a set of functions and classes that can be used to solve the problem of resolution enhancement.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Face" isDocumented="True">The module contains some recently added functionality that has not been stabilized, or functionality that is considered optional.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Text" isDocumented="True">This module provides different algorithms for text detection and recognition in natural scene images.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XFeatures2D" isDocumented="True">Extra 2D Features Framework</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.BgSegm" isDocumented="True">Background Segmentation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Aruco" isDocumented="True">ArUco Marker Detection</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Dnn" isDocumented="True">Deep Neural Network module</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Fuzzy" isDocumented="True">Fuzzy image processing</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.LineDescriptor" isDocumented="True">Binary descriptors for lines extracted from an image</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Plot" isDocumented="True">This Plot module allows you to easily plot data in 1D or 2D.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Tracking" isDocumented="True">Long-term optical tracking API</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XImgproc" isDocumented="True">Extended Image Processing</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XPhoto" isDocumented="True">Additional photo processing algorithms</NamespaceSummaryItem></NamespaceSummaries>
<NamespaceSummaryItem name="Emgu.CV.CameraCalibration" isDocumented="True">Camera calibration related functions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.CvEnum" isDocumented="True">OpenCV Enumeration</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML" isDocumented="True">Wrapper of OpenCV's Machine Learning Library</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML.MlEnum" isDocumented="True">OpenCV's Machine Learning enumeration</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.ML.Structure" isDocumented="True">OpenCV's Machine Learning structures</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Properties" isDocumented="False" />
<NamespaceSummaryItem name="Emgu.CV.Reflection" isDocumented="True">Code that use reflection to get image information from Emgu CV objects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Structure" isDocumented="True">Wrapped OpenCV structures</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.UI" isDocumented="True">User interface (ImageBox) for displaying Image object.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.VideoSurveillance" isDocumented="True">Background/Foreground segmentation and Blob tracking</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Reflection" isDocumented="True">Contains functions that use reflection to create menu for ImageBox</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Util" isDocumented="True">A collection of utilities used by Emgu projects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.Util.TypeEnum" isDocumented="True">Various enumeration for Emgu.Util namespace</NamespaceSummaryItem>
<NamespaceSummaryItem name="ZedGraph" isDocumented="False" />
<NamespaceSummaryItem name="Emgu.CV.Flann" isDocumented="True">Fast Library for Approximate Nearest Neighbors (Marius Muja and David Lowe)</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Features2D" isDocumented="True">Contains classes for 2D feature detection, extraction and matching.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Geodetic" isDocumented="True">Contains library that can be use for geomatic transformation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Tiff" isDocumented="True">Contains writer classes that can be used to write different tiff formats, such as tile tiff and geotiff.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Util" isDocumented="True">A collection of utilities used by Emgu.CV projects</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.OCR" isDocumented="True">Optical character recognition. Wraps the tesseract-ocr engine.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Cvb" isDocumented="True">Contains interface for the CvBlob library</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Stitching" isDocumented="True">Image stitching</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.VideoStab" isDocumented="True">The video stabilization module contains a set of functions and classes that can be used to solve the problem of video stabilization.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.OpenCL" isDocumented="True">Computer vision using OpenCL</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Cuda" isDocumented="True">NVidia Cuda image processing functions</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Shape" isDocumented="True">The module contains algorithms that embed a notion of shape distance. These algorithms may be used for shape matching and retrieval, or shape comparison.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Superres" isDocumented="True">The Super Resolution module contains a set of functions and classes that can be used to solve the problem of resolution enhancement.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Face" isDocumented="True">The module contains some recently added functionality that has not been stabilized, or functionality that is considered optional.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Text" isDocumented="True">This module provides different algorithms for text detection and recognition in natural scene images.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XFeatures2D" isDocumented="True">Extra 2D Features Framework</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.BgSegm" isDocumented="True">Background Segmentation.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Aruco" isDocumented="True">ArUco Marker Detection</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Dnn" isDocumented="True">Deep Neural Network module</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Fuzzy" isDocumented="True">Fuzzy image processing</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.LineDescriptor" isDocumented="True">Binary descriptors for lines extracted from an image</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Plot" isDocumented="True">This Plot module allows you to easily plot data in 1D or 2D.</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.Tracking" isDocumented="True">Long-term optical tracking API</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XImgproc" isDocumented="True">Extended Image Processing</NamespaceSummaryItem>
<NamespaceSummaryItem name="Emgu.CV.XPhoto" isDocumented="True">Additional photo processing algorithms</NamespaceSummaryItem>
</NamespaceSummaries>
<PlugInConfigurations>
</PlugInConfigurations>
<MaximumGroupParts>2</MaximumGroupParts>
@ -102,6 +103,7 @@ Base functions (L1) can be found in CvInvoke class</NamespaceSummaryItem>
<IndentHtml>False</IndentHtml>
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
<CleanIntermediates>True</CleanIntermediates>
<HelpFileVersion>1.0.0.0</HelpFileVersion>
</PropertyGroup>
<!-- There are no properties for these two groups but they need to appear in
order for Visual Studio to perform the build. -->

5
platforms/windows/Build_Binary_x86.bat
View File

@ -363,8 +363,11 @@ GOTO RUN_CMAKE
IF NOT "%7%"=="build" GOTO END
call %DEVENV% %BUILD_TYPE% emgucv.sln %BUILD_PROJECT%
IF "%5%"=="htmldoc" ^
call %DEVENV% %BUILD_TYPE% emgucv.sln /project Emgu.CV.Document.Html
call %DEVENV% %BUILD_TYPE% emgucv.sln /project Emgu.CV.Document
IF "%5%"=="doc" ^
call %DEVENV% %BUILD_TYPE% emgucv.sln /project Emgu.CV.Document
IF "%8%"=="nuget" ^
call %DEVENV% %BUILD_TYPE% emgucv.sln /project Emgu.CV.nuget

Write Preview
Loading…
Cancel
Save