From be399952bc1bddfeedd76dabe900da77d0d4a620 Mon Sep 17 00:00:00 2001
From: TAO Cheng <cheng.tao@hexagon.com>
Date: Fri, 7 Mar 2014 18:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9ESV4000E=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=8D=A1=E7=9A=84=E9=99=8D=E5=99=AA=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Aso7=5Fconfig.ini=E9=99=8D=E5=99=AA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E8=AE=BE=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp |   2 ++
 .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc   |   8 ++++----
 .../UsbUtility/UsbUtil/Videocard_SV4000E.cpp  |   2 ++
 .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo   | Bin 2355712 -> 2355712 bytes
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
index 4353c2c..fd1ca0f 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/SevenOcean/SO7_Proto.cpp
@@ -2216,6 +2216,8 @@ SSI_STATUS_MOTION CSO7_Proto::Save_So7_Config()
     fprintf(m_pOutFile, "\n;\n");
 
     outBuff="[VIDEOCARD]";
+    fprintf(m_pOutFile,"%s", outBuff);
+    fprintf(m_pOutFile, "\n");
     outBuff="SDK3000_SLEEP_COUNT=";
     fprintf(m_pOutFile,"%s", outBuff);
     fprintf(m_pOutFile,"%d", g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal);
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
index c9f2529..ba1c251 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
@@ -2374,8 +2374,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,1,0,0
- PRODUCTVERSION 7,1,0,0
+ FILEVERSION 7,2,0,0
+ PRODUCTVERSION 7,2,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2392,12 +2392,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Hexagon Metrology"
             VALUE "FileDescription", "Utility for Hexagon Metrology"
-            VALUE "FileVersion", "7.1.0.0"
+            VALUE "FileVersion", "7.2.0.0"
             VALUE "InternalName", "Usb_Util.exe"
             VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology."
             VALUE "OriginalFilename", "Usb_Util.exe"
             VALUE "ProductName", "Utility"
-            VALUE "ProductVersion", "7.1.0.0"
+            VALUE "ProductVersion", "7.2.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.cpp
index f536bc1..d36b9a3 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.cpp
@@ -207,6 +207,8 @@ void CVideocard_SV4000E::EnableDenoise(int _DeviceID)
 {
 #ifdef _RELEASE_FULL_VERSION
   DXEnableDenoise(m_device[_DeviceID],m_DenoiseValue[_DeviceID]);
+#else
+  UNREFERENCED_PARAMETER(_DeviceID);
 #endif //_RELEASE_FULL_VERSION
 
 }
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
index ee71abe2c5191555d034f41369e2fab1abb85051..c2be507e0adc6e207aca5cfdea4d7f607b63f115 100644
GIT binary patch
delta 3287
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
ai4l@GR}v#7ah@caBr!@7qa9*Q<NpAt3YU-o

delta 4511
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
U*<oQuSjY(r+OUut5%M<v52uBV<^TWy