Browse Source

Rename VS2013-15 folder to Windows.Desktop.

EMGUCV_3_1
Canming Huang 9 years ago
parent
commit
4af8fdec8b
  1. 10
      CMakeLists.txt
  2. 15
      Emgu.CV/Photo/CalibrateCRF.cs
  3. 0
      Solution/Windows.Desktop/Emgu.CV.DebuggerVisualizers.sln
  4. 0
      Solution/Windows.Desktop/Emgu.CV.Example.sln
  5. 0
      Solution/Windows.Desktop/Emgu.CV.Test.sln
  6. 0
      Solution/Windows.Desktop/Emgu.CV.sln

10
CMakeLists.txt

@ -1073,7 +1073,7 @@ uninstallDebuggerVisualizer4${vs_version}Done:
PATTERN "Android" EXCLUDE
PATTERN "iOS" EXCLUDE
PATTERN "Windows.Store" EXCLUDE
PATTERN "VS2013-2015" EXCLUDE
PATTERN "Windows.Desktop" EXCLUDE
PATTERN "CrossPlatform" EXCLUDE
)
ENDIF()
@ -1093,7 +1093,7 @@ uninstallDebuggerVisualizer4${vs_version}Done:
PATTERN "Android" EXCLUDE
PATTERN "iOS" EXCLUDE
PATTERN "Windows.Phone" EXCLUDE
PATTERN "VS2013-2015" EXCLUDE
PATTERN "Windows.Desktop" EXCLUDE
PATTERN "CrossPlatform" EXCLUDE
)
INSTALL(
@ -1108,7 +1108,7 @@ uninstallDebuggerVisualizer4${vs_version}Done:
PATTERN "Android" EXCLUDE
PATTERN "iOS" EXCLUDE
PATTERN "Windows.Phone" EXCLUDE
PATTERN "VS2013-2015" EXCLUDE
PATTERN "Windows.Desktop" EXCLUDE
PATTERN "CrossPlatform" EXCLUDE
)
ENDIF()
@ -1266,9 +1266,9 @@ uninstallDebuggerVisualizer4${vs_version}Done:
# ----------------------------------------------------------------------------
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\nCreateDirectory \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Visual Studio Solution\\\" ")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\nCreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Visual Studio Solution\\\\Visual Studio 2013 - 2015 Examples.lnk\\\" \\\"$INSTDIR\\\\Solution\\\\VS2013-2015\\\\Emgu.CV.Example.sln\\\" ")
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}\nCreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Visual Studio Solution\\\\Visual Studio 2013 - 2017 Examples.lnk\\\" \\\"$INSTDIR\\\\Solution\\\\Windows.Desktop\\\\Emgu.CV.Example.sln\\\" ")
SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}\n Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Visual Studio Solution\\\\Visual Studio 2013 - 2015 Examples.lnk\\\" ")
SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}\n Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Visual Studio Solution\\\\Visual Studio 2013 - 2017 Examples.lnk\\\" ")
SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}\nRMDir \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\Visual Studio Solution\\\" ")

15
Emgu.CV/Photo/CalibrateCRF.cs

@ -18,7 +18,7 @@ namespace Emgu.CV
public abstract class CalibrateCRF : UnmanagedObject
{
/// <summary>
/// The pointer the the calibrateCRF object
/// The pointer to the calibrateCRF object
/// </summary>
protected IntPtr _calibrateCRFPtr;
@ -47,9 +47,18 @@ namespace Emgu.CV
}
}
/// <summary>
/// Inverse camera response function is extracted for each brightness value by minimizing an objective function as linear system. Objective function is constructed using pixel values on the same position in all images, extra term is added to make the result smoother.
/// </summary>
public class CalibrateDebevec : CalibrateCRF
{
public CalibrateDebevec(int samples, float lambda, bool random)
/// <summary>
/// Creates CalibrateDebevec object.
/// </summary>
/// <param name="samples">Number of pixel locations to use</param>
/// <param name="lambda">Smoothness term weight. Greater values produce smoother results, but can alter the response.</param>
/// <param name="random">If true sample pixel locations are chosen at random, otherwise the form a rectangular grid.</param>
public CalibrateDebevec(int samples = 70, float lambda = 10.0f, bool random = false)
{
_ptr = CvInvoke.cveCalibrateDebevecCreate(samples, lambda, random, ref _calibrateCRFPtr);
}
@ -77,7 +86,7 @@ namespace Emgu.CV
/// </summary>
/// <param name="maxIter">maximal number of Gauss-Seidel solver iterations.</param>
/// <param name="threshold">get difference between results of two successive steps of the minimization.</param>
public CalibrateRobertson(int maxIter, float threshold)
public CalibrateRobertson(int maxIter = 30, float threshold = 0.01f)
{
_ptr = CvInvoke.cveCalibrateRobertsonCreate(maxIter, threshold, ref _calibrateCRFPtr);
}

0
Solution/VS2013-2015/Emgu.CV.DebuggerVisualizers.sln → Solution/Windows.Desktop/Emgu.CV.DebuggerVisualizers.sln

0
Solution/VS2013-2015/Emgu.CV.Example.sln → Solution/Windows.Desktop/Emgu.CV.Example.sln

0
Solution/VS2013-2015/Emgu.CV.Test.sln → Solution/Windows.Desktop/Emgu.CV.Test.sln

0
Solution/VS2013-2015/Emgu.CV.sln → Solution/Windows.Desktop/Emgu.CV.sln

Loading…
Cancel
Save