(1.0.1.176) unconverted to wmf emf files

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@55767 954022d7-b5bf-4e40-9824-e11837661b57

ASCImageStudio3/ASCGraphics/Objects/ASCImage.h

@@ -234,53 +234,56 @@ private:
 						delete pMetaFile;
 
 						m_lImageType = c_lImageTypeUnknown;
-						return;
 					}
-
-					::fclose( pFile );
-
-					//  Wmf
-					HMETAFILE hTempWmf = CopyMetaFile( hWmf, m_wsTempFilePath.GetBuffer() );
-					DeleteMetaFile( hTempWmf );
-
-					//  Wmf
-					m_oWmfFile.OpenFromFile( m_wsTempFilePath.GetBuffer() );
-					m_oWmfFile.Scan( &m_oRect );
-
-					if ( !m_oWmfFile.CheckError() )
+					else
 					{
-						// Wmf  
-						m_lImageType = c_lImageTypeMetafile | c_lMetaEmf;
+						::fclose( pFile );
+
+						//  Wmf
+						HMETAFILE hTempWmf = CopyMetaFile( hWmf, m_wsTempFilePath.GetBuffer() );
+						DeleteMetaFile( hTempWmf );
+
+						//  Wmf
+						m_oWmfFile.OpenFromFile( m_wsTempFilePath.GetBuffer() );
+						m_oWmfFile.Scan( &m_oRect );
+
+						if ( !m_oWmfFile.CheckError() )
+						{
+							// Wmf  
+							m_lImageType = c_lImageTypeMetafile | c_lMetaEmf;
+
+							DeleteMetaFile( hWmf );
+							DeleteEnhMetaFile( hEmf );
+							delete[] pBuffer;
+							delete pMetaFile;
+
+							return;			
+						}
+						else if ( m_oWmfFile.UnSupportedWmf() )
+						{
+							//   Emf,     Wmf   
+							m_lImageType = c_lImageTypeMetafile | c_lMetaEmf;
+						}
+						else
+						{
+							//    
+							m_oWmfFile.Close();
+							m_lImageType = c_lImageTypeUnknown;
+						}
 
 						DeleteMetaFile( hWmf );
 						DeleteEnhMetaFile( hEmf );
 						delete[] pBuffer;
 						delete pMetaFile;
-
-						return;			
-					}
-					else if ( m_oWmfFile.UnSupportedWmf() )
-					{
-						//   Emf,     Wmf   
-						m_lImageType = c_lImageTypeMetafile | c_lMetaEmf;
-					}
-					else
-					{
-						//    
-						m_oWmfFile.Close();
-						m_lImageType = c_lImageTypeUnknown;
 					}
-
-					DeleteMetaFile( hWmf );
-					DeleteEnhMetaFile( hEmf );
-					delete[] pBuffer;
-					delete pMetaFile;
 				}
 				else
 				{
 					DeleteEnhMetaFile( hEmf );
 					delete pMetaFile;
-
+				}
+				if (TRUE)
+				{
 					Gdiplus::Bitmap* pBitmap = new Gdiplus::Bitmap(bsFilePath);
 
 					MediaCore::IAVSUncompressedVideoFrame* pFrame = NULL;
@@ -297,6 +300,7 @@ private:
 						return;
 					}
 					RELEASEINTERFACE(pFrame);
+					return;
 				}
 			}
 		}

ASCImageStudio3/ASCGraphics/Objects/Structures.h

 #pragma once
 #include "../../../Common/ASCUtils.h"
 #include "../Interfaces/ASCRenderer.h"
-#include "../../../Common/DocxFormat/Source/XML/XmlUtils.h"
+#include "../../../Common/XmlUtils.h"
 #include "../agg/ap_aggplusenums.h"
 
 #include <gdiplus.h>

ASCImageStudio3/ASCGraphics/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//175
-#define INTVER 1,0,1,175
-#define STRVER "1,0,1,175\0"
+//176
+#define INTVER 1,0,1,176
+#define STRVER "1,0,1,176\0"