[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Imaging Encoder.cs,1.1,1.2 EncoderParameter.cs,1.1,1.2 EncoderParameters.cs,1.1,1.2 FrameDimension.cs,1.1,1.2 ImageCodecInfo.cs,1.1,1.2 ImageFormat.cs,1.1,1.2 Metafile.cs,1.1,1.2PlayRecordCallback.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging
In directory subversions:/tmp/cvs-serv25280/System.Drawing/Imaging

Modified Files:
        Encoder.cs EncoderParameter.cs EncoderParameters.cs 
        FrameDimension.cs ImageCodecInfo.cs ImageFormat.cs Metafile.cs 
        PlayRecordCallback.cs 
Log Message:


Various fixes to compile in non-full profiles.


Index: Encoder.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/Encoder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Encoder.cs  7 Jun 2003 22:40:58 -0000       1.1
--- Encoder.cs  9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,26 ****
--- 23,28 ----
  {
  
+ #if !ECMA_COMPAT
+ 
  public sealed class Encoder
  {
***************
*** 73,76 ****
--- 75,80 ----
  
  }; // class Encoder
+ 
+ #endif // !ECMA_COMPAT
  
  }; // namespace System.Drawing.Imaging

Index: EncoderParameter.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/EncoderParameter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EncoderParameter.cs 7 Jun 2003 22:40:58 -0000       1.1
--- EncoderParameter.cs 9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,26 ****
--- 23,28 ----
  {
  
+ #if !ECMA_COMPAT
+ 
  public sealed class EncoderParameter : IDisposable
  {
***************
*** 233,236 ****
--- 235,240 ----
  
  }; // class EncoderParameter
+ 
+ #endif // !ECMA_COMPAT
  
  }; // namespace System.Drawing.Imaging

Index: EncoderParameters.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/EncoderParameters.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** EncoderParameters.cs        7 Jun 2003 22:40:58 -0000       1.1
--- EncoderParameters.cs        9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,26 ****
--- 23,28 ----
  {
  
+ #if !ECMA_COMPAT
+ 
  public sealed class EncoderParameters : IDisposable
  {
***************
*** 59,62 ****
--- 61,66 ----
  
  }; // class EncoderParameters
+ 
+ #endif // !ECMA_COMPAT
  
  }; // namespace System.Drawing.Imaging

Index: FrameDimension.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/FrameDimension.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FrameDimension.cs   7 Jun 2003 22:40:58 -0000       1.1
--- FrameDimension.cs   9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,26 ****
--- 23,28 ----
  {
  
+ #if !ECMA_COMPAT
+ 
  public sealed class FrameDimension
  {
***************
*** 117,120 ****
--- 119,124 ----
  
  }; // class FrameDimension
+ 
+ #endif // !ECMA_COMPAT
  
  }; // namespace System.Drawing.Imaging

Index: ImageCodecInfo.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/ImageCodecInfo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ImageCodecInfo.cs   7 Jun 2003 22:40:58 -0000       1.1
--- ImageCodecInfo.cs   9 Jun 2003 22:15:09 -0000       1.2
***************
*** 25,33 ****
--- 25,38 ----
  using System.Runtime.InteropServices;
  
+ #if !ECMA_COMPAT
  [ComVisible(false)]
+ #endif
  public sealed class ImageCodecInfo
  {
        // Internal state.
+ #if !ECMA_COMPAT
        private Guid clsid;
+       private Guid formatId;
+ #endif
        private String codecName;
        private String dllName;
***************
*** 35,39 ****
        private ImageCodecFlags flags;
        private String formatDescription;
-       private Guid formatId;
        private String mimeType;
        private byte[][] signatureMasks;
--- 40,43 ----
***************
*** 45,48 ****
--- 49,53 ----
  
        // Get or set this object's properties.
+ #if !ECMA_COMPAT
        public Guid Clsid
                        {
***************
*** 56,59 ****
--- 61,65 ----
                                }
                        }
+ #endif
        public String CodecName
                        {
***************
*** 111,114 ****
--- 117,121 ----
                                }
                        }
+ #if !ECMA_COMPAT
        public Guid FormatID
                        {
***************
*** 122,125 ****
--- 129,133 ----
                                }
                        }
+ #endif
        public String MimeType
                        {

Index: ImageFormat.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/ImageFormat.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ImageFormat.cs      7 Jun 2003 22:40:58 -0000       1.1
--- ImageFormat.cs      9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,26 ****
--- 23,28 ----
  {
  
+ #if !ECMA_COMPAT
+ 
  public sealed class ImageFormat
  {
***************
*** 215,218 ****
--- 217,222 ----
  
  }; // class ImageFormat
+ 
+ #endif // !ECMA_COMPAT
  
  }; // namespace System.Drawing.Imaging

Index: Metafile.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/Metafile.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Metafile.cs 7 Jun 2003 22:40:58 -0000       1.1
--- Metafile.cs 9 Jun 2003 22:15:09 -0000       1.2
***************
*** 26,31 ****
--- 26,33 ----
  using System.Runtime.InteropServices;
  
+ #if !ECMA_COMPAT
  [Serializable]
  [ComVisible(false)]
+ #endif
  public sealed class Metafile : Image
  {

Index: PlayRecordCallback.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Imaging/PlayRecordCallback.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PlayRecordCallback.cs       7 Jun 2003 22:40:58 -0000       1.1
--- PlayRecordCallback.cs       9 Jun 2003 22:15:09 -0000       1.2
***************
*** 23,27 ****
--- 23,29 ----
  {
  
+ #if !ECMA_COMPAT
  [Serializable]
+ #endif
  public delegate void PlayRecordCallback(EmfPlusRecordType recordType,
                                                                                
int flags, int dataSize,