Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [154] trunk/lib/openlibraries/src/openpluginlib/pl
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn
|
From: <gl...@us...> - 2007-06-17 08:29:26
|
Revision: 154
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=154&view=rev
Author: glslang
Date: 2007-06-17 01:29:21 -0700 (Sun, 17 Jun 2007)
Log Message:
-----------
+ initial stream abstraction
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
Added Paths:
-----------
trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-06-16 22:00:18 UTC (rev 153)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-06-17 08:29:21 UTC (rev 154)
@@ -261,6 +261,10 @@
>
</File>
<File
+ RelativePath=".\stream.cpp"
+ >
+ </File>
+ <File
RelativePath=".\pcos\subject.cpp"
>
</File>
@@ -399,6 +403,10 @@
>
</File>
<File
+ RelativePath=".\stream.hpp"
+ >
+ </File>
+ <File
RelativePath=".\string.hpp"
>
</File>
Added: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-06-17 08:29:21 UTC (rev 154)
@@ -0,0 +1,17 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#include <openpluginlib/pl/stream.hpp>
+
+namespace olib { namespace openpluginlib {
+
+stream_ptr make_stream( const string&, int )
+{
+ return stream_ptr( );
+}
+
+} }
Added: trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp (rev 0)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp 2007-06-17 08:29:21 UTC (rev 154)
@@ -0,0 +1,60 @@
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.openlibraries.org.
+
+#ifndef STREAM_INC_
+#define STREAM_INC_
+
+#include <boost/shared_ptr.hpp>
+
+#include <openpluginlib/pl/config.hpp>
+#include <openpluginlib/pl/string.hpp>
+
+namespace olib { namespace openpluginlib {
+
+class OPENPLUGINLIB_DECLSPEC stream
+{
+public:
+ typedef char value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+
+public:
+ static const int in_stream = 1;
+ static const int out_stream = 2;
+ static const int binary_stream = 4;
+
+public:
+ explicit stream( pointer data = 0, int flags = in_stream | out_stream | binary_stream )
+ : data_( data )
+ , flags_( flags )
+ { }
+
+ int read( pointer, int );
+ int write( const_pointer, int );
+ long seek( long, int );
+
+ int flags( ) const;
+ bool is_thread_safe( ) const;
+ bool is_null( ) const { return data_ == ( pointer ) 0; }
+
+private:
+ stream( const stream& );
+ stream& operator=( const stream& );
+
+private:
+ pointer data_;
+ int flags_;
+};
+
+typedef boost::shared_ptr<stream> stream_ptr;
+
+stream_ptr make_stream( const string& path, int flags );
+stream_ptr make_stream( void* data, int flags );
+
+} }
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-04 06:52:20
|
Revision: 172
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=172&view=rev
Author: glslang
Date: 2007-07-03 23:52:17 -0700 (Tue, 03 Jul 2007)
Log Message:
-----------
+ eol-native
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
Property Changed:
----------------
trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-07-03 23:16:17 UTC (rev 171)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp 2007-07-04 06:52:17 UTC (rev 172)
@@ -1,122 +1,122 @@
-
-// openpluginlib - A plugin interface to openlibraries.
-
-// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
-// Released under the LGPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#include <boost/filesystem/operations.hpp>
-
-#include <openpluginlib/pl/utf8_utils.hpp>
-#include <openpluginlib/pl/stream.hpp>
-
-namespace fs = boost::filesystem;
-
-namespace olib { namespace openpluginlib {
-
-stream::stream( const string& path, std::ios::openmode flags, std::size_t max_size )
- : data_( 0 )
- , offset_( 0 )
- , max_size_( max_size )
- , flags_( flags )
- , path_( path )
-{
- fs::path fs_path( path.c_str( ), fs::native );
- if( fs::exists( fs_path ) )
- {
- 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( ) );
- else data_ = mapped_.data( );
-
- max_size_ = mapped_.size( );
- }
- }
-}
-
-stream::~stream( )
-{
- if( mapped_.is_open( ) )
- {
- data_ = 0;
- offset_ = 0;
- mapped_.close( );
- }
-}
-
-std::size_t stream::read( stream::pointer data, std::size_t bytes )
-{
- bytes = actual_bytes( bytes );
-
- memcpy( data, data_ + offset_, bytes );
- offset_ += bytes;
-
- return bytes;
-}
-
-std::size_t stream::write( stream::const_pointer data, std::size_t bytes )
-{
- bytes = actual_bytes( bytes );
-
- memcpy( data_ + offset_, data, bytes );
- offset_ += bytes;
-
- return bytes;
-}
-
-void stream::seek( std::size_t bytes, std::ios::seekdir flags )
-{
- if( flags == std::ios::beg )
- offset_ = bytes;
- else if( flags == std::ios::cur )
- offset_ += bytes;
- else if( flags == std::ios::end )
- offset_ = max_size_ - bytes;
-}
-
-std::size_t stream::getline( pointer data, std::size_t bytes )
-{
- bytes = actual_bytes( bytes );
-
- std::size_t i = 0;
- for( ; *( data_ + i ) != '\n' && i < bytes; ++i )
- *data++ = *( data_ + i );
-
- if( *( data_ + i ) == '\n' )
- ++i;
-
- offset_ += i;
-
- return bytes;
-}
-
-string stream::path( ) const
-{
- return fs::path( path_.c_str( ), fs::native ).native_file_string( );
-}
-
-wstring stream::wpath( ) const
-{
- return to_wstring( path( ) );
-}
-
-std::size_t stream::actual_bytes( std::size_t bytes ) const
-{
- if( offset_ + bytes > max_size_ )
- bytes = max_size_ - offset_;
-
- return bytes;
-}
-
-stream_ptr make_stream( const string& path, std::ios::openmode flags )
-{
- return stream_ptr( new stream( path, flags ) );
-}
-
-stream_ptr make_stream( void* data, std::ios::openmode flags )
-{
- return stream_ptr( new stream( static_cast<char*>( data ), flags ) );
-}
-
-} }
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include <boost/filesystem/operations.hpp>
+
+#include <openpluginlib/pl/utf8_utils.hpp>
+#include <openpluginlib/pl/stream.hpp>
+
+namespace fs = boost::filesystem;
+
+namespace olib { namespace openpluginlib {
+
+stream::stream( const string& path, std::ios::openmode flags, std::size_t max_size )
+ : data_( 0 )
+ , offset_( 0 )
+ , max_size_( max_size )
+ , flags_( flags )
+ , path_( path )
+{
+ fs::path fs_path( path.c_str( ), fs::native );
+ if( fs::exists( fs_path ) )
+ {
+ 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( ) );
+ else data_ = mapped_.data( );
+
+ max_size_ = mapped_.size( );
+ }
+ }
+}
+
+stream::~stream( )
+{
+ if( mapped_.is_open( ) )
+ {
+ data_ = 0;
+ offset_ = 0;
+ mapped_.close( );
+ }
+}
+
+std::size_t stream::read( stream::pointer data, std::size_t bytes )
+{
+ bytes = actual_bytes( bytes );
+
+ memcpy( data, data_ + offset_, bytes );
+ offset_ += bytes;
+
+ return bytes;
+}
+
+std::size_t stream::write( stream::const_pointer data, std::size_t bytes )
+{
+ bytes = actual_bytes( bytes );
+
+ memcpy( data_ + offset_, data, bytes );
+ offset_ += bytes;
+
+ return bytes;
+}
+
+void stream::seek( std::size_t bytes, std::ios::seekdir flags )
+{
+ if( flags == std::ios::beg )
+ offset_ = bytes;
+ else if( flags == std::ios::cur )
+ offset_ += bytes;
+ else if( flags == std::ios::end )
+ offset_ = max_size_ - bytes;
+}
+
+std::size_t stream::getline( pointer data, std::size_t bytes )
+{
+ bytes = actual_bytes( bytes );
+
+ std::size_t i = 0;
+ for( ; *( data_ + i ) != '\n' && i < bytes; ++i )
+ *data++ = *( data_ + i );
+
+ if( *( data_ + i ) == '\n' )
+ ++i;
+
+ offset_ += i;
+
+ return bytes;
+}
+
+string stream::path( ) const
+{
+ return fs::path( path_.c_str( ), fs::native ).native_file_string( );
+}
+
+wstring stream::wpath( ) const
+{
+ return to_wstring( path( ) );
+}
+
+std::size_t stream::actual_bytes( std::size_t bytes ) const
+{
+ if( offset_ + bytes > max_size_ )
+ bytes = max_size_ - offset_;
+
+ return bytes;
+}
+
+stream_ptr make_stream( const string& path, std::ios::openmode flags )
+{
+ return stream_ptr( new stream( path, flags ) );
+}
+
+stream_ptr make_stream( void* data, std::ios::openmode flags )
+{
+ return stream_ptr( new stream( static_cast<char*>( data ), flags ) );
+}
+
+} }
Property changes on: trunk/lib/openlibraries/src/openpluginlib/pl/stream.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp 2007-07-03 23:16:17 UTC (rev 171)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp 2007-07-04 06:52:17 UTC (rev 172)
@@ -1,85 +1,85 @@
-
-// openpluginlib - A plugin interface to openlibraries.
-
-// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
-// Released under the LGPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#ifndef STREAM_INC_
-#define STREAM_INC_
-
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4251 )
-#endif
-
-#include <boost/shared_ptr.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>
-
-#include <openpluginlib/pl/config.hpp>
-#include <openpluginlib/pl/string.hpp>
-
-namespace olib { namespace openpluginlib {
-
-class OPENPLUGINLIB_DECLSPEC stream
-{
-public:
- typedef char value_type;
- typedef value_type* pointer;
- typedef const value_type* const_pointer;
-
-public:
- explicit stream( pointer data = 0, std::ios::openmode flags = std::ios::in | std::ios::out, std::size_t max_size = 0 )
- : data_( data )
- , offset_( 0 )
- , max_size_( max_size )
- , flags_( flags )
- { }
-
- explicit stream( const string& path, std::ios::openmode flags = std::ios::in | std::ios::out, std::size_t max_size = 0 );
-
- ~stream( );
-
- std::size_t read( pointer data, std::size_t bytes );
- std::size_t write( const_pointer data, std::size_t bytes );
- void seek( std::size_t bytes, std::ios::seekdir flags );
- std::size_t getline( pointer data, std::size_t bytes );
-
- std::ios::openmode flags( ) const { return flags_; }
- bool is_null( ) const { return data_ == 0; }
- const char* data( ) const { return data_; }
- std::size_t offset( ) const { return offset_; }
- std::size_t max_size( ) const { return max_size_; }
-
- string path( ) const;
- wstring wpath( ) const;
-
-private:
- std::size_t actual_bytes( std::size_t bytes ) const;
-
-private:
- stream( const stream& );
- stream& operator=( const stream& );
-
-private:
- pointer data_;
- std::size_t offset_, max_size_;
- std::ios::openmode flags_;
- string path_;
-
-private:
- boost::iostreams::mapped_file mapped_;
-};
-
-typedef boost::shared_ptr<stream> stream_ptr;
-
-OPENPLUGINLIB_DECLSPEC stream_ptr make_stream( const string& path, std::ios::openmode flags );
-OPENPLUGINLIB_DECLSPEC stream_ptr make_stream( void* data, std::ios::openmode flags );
-
-} }
-
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
-
-#endif
+
+// openpluginlib - A plugin interface to openlibraries.
+
+// Copyright (C) 2007 Goncalo Nuno M. de Carvalho
+// Released under the LGPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef STREAM_INC_
+#define STREAM_INC_
+
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
+
+#include <boost/shared_ptr.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>
+
+#include <openpluginlib/pl/config.hpp>
+#include <openpluginlib/pl/string.hpp>
+
+namespace olib { namespace openpluginlib {
+
+class OPENPLUGINLIB_DECLSPEC stream
+{
+public:
+ typedef char value_type;
+ typedef value_type* pointer;
+ typedef const value_type* const_pointer;
+
+public:
+ explicit stream( pointer data = 0, std::ios::openmode flags = std::ios::in | std::ios::out, std::size_t max_size = 0 )
+ : data_( data )
+ , offset_( 0 )
+ , max_size_( max_size )
+ , flags_( flags )
+ { }
+
+ explicit stream( const string& path, std::ios::openmode flags = std::ios::in | std::ios::out, std::size_t max_size = 0 );
+
+ ~stream( );
+
+ std::size_t read( pointer data, std::size_t bytes );
+ std::size_t write( const_pointer data, std::size_t bytes );
+ void seek( std::size_t bytes, std::ios::seekdir flags );
+ std::size_t getline( pointer data, std::size_t bytes );
+
+ std::ios::openmode flags( ) const { return flags_; }
+ bool is_null( ) const { return data_ == 0; }
+ const char* data( ) const { return data_; }
+ std::size_t offset( ) const { return offset_; }
+ std::size_t max_size( ) const { return max_size_; }
+
+ string path( ) const;
+ wstring wpath( ) const;
+
+private:
+ std::size_t actual_bytes( std::size_t bytes ) const;
+
+private:
+ stream( const stream& );
+ stream& operator=( const stream& );
+
+private:
+ pointer data_;
+ std::size_t offset_, max_size_;
+ std::ios::openmode flags_;
+ string path_;
+
+private:
+ boost::iostreams::mapped_file mapped_;
+};
+
+typedef boost::shared_ptr<stream> stream_ptr;
+
+OPENPLUGINLIB_DECLSPEC stream_ptr make_stream( const string& path, std::ios::openmode flags );
+OPENPLUGINLIB_DECLSPEC stream_ptr make_stream( void* data, std::ios::openmode flags );
+
+} }
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
+#endif
Property changes on: trunk/lib/openlibraries/src/openpluginlib/pl/stream.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-19 11:17:18
|
Revision: 255
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=255&view=rev
Author: glslang
Date: 2007-08-19 04:17:16 -0700 (Sun, 19 Aug 2007)
Log Message:
-----------
+ build updates
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-08-19 11:06:26 UTC (rev 254)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-08-19 11:17:16 UTC (rev 255)
@@ -261,6 +261,10 @@
>
</File>
<File
+ RelativePath=".\shlib.cpp"
+ >
+ </File>
+ <File
RelativePath=".\stream.cpp"
>
</File>
@@ -375,11 +379,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
@@ -395,6 +399,10 @@
>
</File>
<File
+ RelativePath=".\shlib.hpp"
+ >
+ </File>
+ <File
RelativePath=".\simplestringstorage.h"
>
</File>
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:06:26 UTC (rev 254)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/shlib.cpp 2007-08-19 11:17:16 UTC (rev 255)
@@ -9,10 +9,15 @@
#include <openlibraries_global_config.hpp>
#endif
-#ifdef __APPLE__
+#ifdef WIN32
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#elif defined __APPLE__
#include <CoreFoundation/CoreFoundation.h>
#endif
+#include <openpluginlib/pl/utf8_utils.hpp>
#include <openpluginlib/pl/shlib.hpp>
namespace olib { namespace openpluginlib {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-06 11:33:33
|
Revision: 345
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=345&view=rev
Author: glslang
Date: 2007-10-06 04:32:43 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
+ fixes memory leak in opl
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.cpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -53,6 +53,11 @@
handler_.endElement = opl_endElement;
}
+content_handler_libxml::~content_handler_libxml( )
+{
+ xmlCleanupParser( );
+}
+
//
actions::opl_parser_action& content_handler_libxml::get_action( )
{ return action_; }
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -18,10 +18,11 @@
{
public:
explicit content_handler_libxml( );
+ ~content_handler_libxml( );
- actions::opl_parser_action& get_action( );
- xmlSAXHandler* get_content_handler( );
- void set_branch_path( const boost::filesystem::path& branch_path );
+ actions::opl_parser_action& get_action( );
+ xmlSAXHandler* get_content_handler( );
+ void set_branch_path( const boost::filesystem::path& branch_path );
private:
actions::opl_parser_action action_;
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-03 20:54:17 UTC (rev 344)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/opl_importer.cpp 2007-10-06 11:32:43 UTC (rev 345)
@@ -58,7 +58,7 @@
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." );
#else
- content_handler_libxml* ch = new content_handler_libxml( );
+ std::auto_ptr<content_handler_libxml> ch( new content_handler_libxml( ) );
ch->set_branch_path( file.branch_path( ) );
if( xmlSAXUserParseFile( ch->get_content_handler( ), &ch->get_action( ), file.native_file_string( ).c_str( ) ) < 0 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-10-07 21:32:26
|
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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X