gdiplus is added to support bmp formats

diff --git a/plugin/gdiplus/FileStream.cpp b/plugin/gdiplus/FileStream.cpp
index 439dcfdbd93181b4339623c567c61da6b0c6e18a..a5d24d455b328c4b96f8d79a13ad5d25c3b0bfdb 100644 (file)
--- a/plugin/gdiplus/FileStream.cpp
+++ b/plugin/gdiplus/FileStream.cpp
@@ -15,6 +15,11 @@
 **********************************************************/
 
 #include "FileStream.h"
+#include "gvplugin_device.h"
+
+#include "gvplugin_gdiplus.h"
+
+
 
 IStream *FileStream::Create(char *name, FILE *file)
 {
@@ -148,6 +153,7 @@ HRESULT FileStream::Commit(
 
 HRESULT FileStream::Revert()
 {
+       return 0;
 }
 
 HRESULT FileStream::LockRegion( 

diff --git a/plugin/gdiplus/FileStream.h b/plugin/gdiplus/FileStream.h
index db7a742a8213a9c9cfb0f9af7f27d144a4890f84..6e42aa0137a0c014e64d1a2421da48de89591559 100644 (file)
--- a/plugin/gdiplus/FileStream.h
+++ b/plugin/gdiplus/FileStream.h
@@ -21,6 +21,8 @@
 #include <sys/stat.h>
 #include <objbase.h>
 
+
+
 class FileStream : public IStream
 {
 public:
@@ -28,62 +30,62 @@ public:
        
        /* IUnknown methods */
        
-       virtual STDMETHODCALLTYPE HRESULT QueryInterface( 
+       virtual HRESULT STDMETHODCALLTYPE  QueryInterface( 
                REFIID riid,
                void **ppvObject);
     
-       virtual STDMETHODCALLTYPE ULONG AddRef();
+       virtual ULONG STDMETHODCALLTYPE  AddRef();
     
-       virtual STDMETHODCALLTYPE ULONG Release();
+       virtual ULONG STDMETHODCALLTYPE  Release();
             
        /* ISequentialStream methods */
     
-       virtual STDMETHODCALLTYPE HRESULT Read( 
+       virtual HRESULT STDMETHODCALLTYPE  Read( 
                void *pv,
                ULONG cb,
                ULONG *pcbRead);
     
-       virtual STDMETHODCALLTYPE HRESULT Write( 
+       virtual HRESULT STDMETHODCALLTYPE  Write( 
                const void *pv,
                ULONG cb,
                ULONG *pcbWritten);
 
        /* IStream methods */
        
-       virtual STDMETHODCALLTYPE HRESULT Seek( 
+       virtual HRESULT STDMETHODCALLTYPE  Seek( 
                LARGE_INTEGER dlibMove,
                DWORD dwOrigin,
                ULARGE_INTEGER *plibNewPosition);
     
-       virtual STDMETHODCALLTYPE HRESULT SetSize( 
+       virtual HRESULT STDMETHODCALLTYPE  SetSize( 
                ULARGE_INTEGER libNewSize);
     
-       virtual STDMETHODCALLTYPE HRESULT CopyTo( 
+       virtual HRESULT STDMETHODCALLTYPE  CopyTo( 
                IStream *pstm,
                ULARGE_INTEGER cb,
                ULARGE_INTEGER *pcbRead,
                ULARGE_INTEGER *pcbWritten);
     
-       virtual STDMETHODCALLTYPE HRESULT Commit( 
+       virtual HRESULT STDMETHODCALLTYPE  Commit( 
                DWORD grfCommitFlags);
     
-       virtual STDMETHODCALLTYPE HRESULT Revert();
+       virtual HRESULT STDMETHODCALLTYPE  Revert();
     
-       virtual STDMETHODCALLTYPE HRESULT LockRegion( 
+       virtual HRESULT STDMETHODCALLTYPE  LockRegion( 
                ULARGE_INTEGER libOffset,
                ULARGE_INTEGER cb,
                DWORD dwLockType);
     
-       virtual STDMETHODCALLTYPE HRESULT UnlockRegion( 
+       virtual HRESULT STDMETHODCALLTYPE  UnlockRegion( 
                ULARGE_INTEGER libOffset,
                ULARGE_INTEGER cb,
                DWORD dwLockType);
     
-       virtual STDMETHODCALLTYPE HRESULT Stat( 
+       virtual HRESULT STDMETHODCALLTYPE  Stat( 
                STATSTG *pstatstg,
                DWORD grfStatFlag);
     
-       virtual STDMETHODCALLTYPE HRESULT Clone( 
+       virtual HRESULT STDMETHODCALLTYPE  Clone( 
                IStream **ppstm);
         
 private: