[Hdrflow-svn] SF.net SVN: hdrflow: [350] trunk/lib/openlibraries/src/openpluginlib/pl

[<gl...@us...>]

Revision: 350
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=350&view=rev
Author:   glslang
Date:     2007-10-07 14:32:23 -0700 (Sun, 07 Oct 2007)

Log Message:
-----------
+ use msxml6

Modified Paths:
--------------
    trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
    trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp	2007-10-06 19:49:45 UTC (rev 349)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp	2007-10-07 21:32:23 UTC (rev 350)
@@ -45,18 +45,20 @@
 	
 #ifdef WIN32
 	MSXML2::ISAXXMLReaderPtr pSAXReader = NULL;
-	HRESULT hr = pSAXReader.CreateInstance( __uuidof( MSXML2::SAXXMLReader40 ) );
-
-	assert( SUCCEEDED( hr ) && L"openpluginlib::opl_importer::operator( ) SAXReader instantiation failed." );
+	HRESULT hr = pSAXReader.CreateInstance( __uuidof( MSXML2::SAXXMLReader60 ) );
+	if( FAILED( hr ) )
+		return;
 	
 	content_handler_msxml* ch = new content_handler_msxml( );
 	ch->set_branch_path( file.branch_path( ) );
 
 	hr = pSAXReader->putContentHandler( ch );
-	assert( SUCCEEDED( hr && L"openpluginlib::opl_importer::opl_importer:operator( ) putContentHandler failed." ) );
+	if( FAILED( hr ) )
+		return;
 
 	hr = pSAXReader->parseURL( ( unsigned short* ) to_wstring( file.native_file_string( ).c_str( ) ).c_str( ) );
-	assert( SUCCEEDED( hr ) && L"openpluginlib::opl_importer::opl_importer:operator( ) parseURL failed." );
+	if( FAILED( hr ) )
+		return;
 #else
 	std::auto_ptr<content_handler_libxml> ch( new content_handler_libxml( ) );
 	ch->set_branch_path( file.branch_path( ) );

Modified: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp	2007-10-06 19:49:45 UTC (rev 349)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp	2007-10-07 21:32:23 UTC (rev 350)
@@ -27,7 +27,7 @@
 		mapped_.open( fs_path.native_file_string( ), flags );
 		if( mapped_.is_open( ) )
 		{
-			if( ( flags_ && std::ios::out ) != 0 )data_ = const_cast<char*>( mapped_.const_data( ) );
+			if( ( flags_ && std::ios::out ) != 0 ) data_ = const_cast<char*>( mapped_.const_data( ) );
 			else data_ = mapped_.data( );
 
 			max_size_ = mapped_.size( );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.