projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-05-14 Sebastien Pouliot <sebastien@ximian.com>
[mono.git]
/
mcs
/
class
/
System.Drawing
/
System.Drawing
/
Bitmap.jvm.cs
diff --git
a/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
b/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
index 90db022df0d0692792abcf88ad54ad0601203a19..57b1ca2306ac0ae06422faa347b2ca8ccd3e5d52 100644
(file)
--- a/
mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
+++ b/
mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
@@
-125,6
+125,9
@@
namespace System.Drawing
else
ic = ImageCodec.CreateReader(format);
else
ic = ImageCodec.CreateReader(format);
+ if (ic == null)
+ throw new ArgumentException ("Parameter is not valid.");
+
try {
ic.NativeStream = input;
PlainImage pi = ic.ReadPlainImage();
try {
ic.NativeStream = input;
PlainImage pi = ic.ReadPlainImage();
@@
-274,6
+277,13
@@
namespace System.Drawing
public BitmapData LockBits (Rectangle rect, ImageLockMode flags, PixelFormat format) {
throw new NotImplementedException();
}
public BitmapData LockBits (Rectangle rect, ImageLockMode flags, PixelFormat format) {
throw new NotImplementedException();
}
+
+#if NET_2_0
+ public
+#endif
+ BitmapData LockBits (Rectangle rect, ImageLockMode flags, PixelFormat format, BitmapData bitmapData) {
+ throw new NotImplementedException();
+ }
#endregion
#region MakeTransparent
#endregion
#region MakeTransparent
@@
-357,7
+367,7
@@
namespace System.Drawing
case 11://JavaImage.TYPE_USHORT_GRAY:
return PixelFormat.Format16bppGrayScale;
case 10://JavaImage.TYPE_BYTE_GRAY:
case 11://JavaImage.TYPE_USHORT_GRAY:
return PixelFormat.Format16bppGrayScale;
case 10://JavaImage.TYPE_BYTE_GRAY:
- return PixelFormat.Format
1
bppIndexed;
+ return PixelFormat.Format
8
bppIndexed;
case 1: //JavaImage.TYPE_INT_RGB
return PixelFormat.Format32bppRgb;
case 2: //JavaImage.TYPE_INT_ARGB:
case 1: //JavaImage.TYPE_INT_RGB
return PixelFormat.Format32bppRgb;
case 2: //JavaImage.TYPE_INT_ARGB: