Commit Graph
113 Commits
Author SHA1 Message Date
Vladimir Krasnov 61a7879505 ImageCodecInfo.jvm.cs: fixed GetValueFromMetadata, SetResolution
svn path=/trunk/mcs/; revision=49640
2005-09-07 15:40:40 +00:00
Vladimir Krasnov d23b6caec3 System.Drawing.vmwcsproj: ImageCodec.jvm.cs
Added Mainsoft.Drawing.Configuration.jvm folder with
ResolutionConfiguration.cs, ResolutionConfigurationCollection.cs, 
ResolutionConfigurationHandler.cs
Bitmap.jvm.cs: fixed bitamp accessors
Image.jvm.cs: fixed image accessors
ImageCodecInfo.jvm.cs: Refactoring
Added ImageCodec.jvm.cs

svn path=/trunk/mcs/; revision=49628
2005-09-07 10:51:13 +00:00
Vladimir Krasnov d88c2074f3 ImageCodecInfo.jvm.cs: Fixed Iterate
svn path=/trunk/mcs/; revision=49018
2005-08-28 10:12:28 +00:00
Andrew Skiba ed4855c56b ./
* System.Drawing.vmwcsproj: use ImageFormat.cs instead of jvm.cs
System.Drawing/
	* Icon.jvm.cs: match Bitmap internal constructor change
	* Image.jvm.cs: use ImageCodecInfo.Clsid as primary format id, not ImageFormat
	* Bitmap.jvm.cs: started changes for supporting ImageCodecInfo System.Drawing.Imaging/
	* ImageCodecInfo.jvm.cs: implement via java imageio, add internal APIs for
	fast read-only requests
	* Methafile.jvm.cs: change in not implemented api to match image.jvm.cs
Test/DrawingTest/Test/
	* Test.dotnet.csproj, Test.vmwcsproj: make Bitmap1.png embedded resource, add Bitmap1.bmp
	* Bitmap1.bmp: added to make tests on java without jai
	* Bitmap.cs: open bitmap from resources, to get rid of dir dependency
	* Color.cs: remove unnecessary using DrawingTestHelper
	* Graphics.cs: naive StringAlignment tests, must be improved later
	* Image.cs: same as Bitmap.cs + use test.bmp instead of test.png (works immediately on java w/o jai)
Test/System.Drawing.Imaging/
	* TestImageCodecInfo.cs: use regular expressions for results that may vary	while still in correct format, so same tests can be used for jvm
Test/
	* Test.dotnet.csproj, Test.vmwcsproj: Embed Bitmap1.png, add Bitmap1.bmp


svn path=/trunk/mcs/; revision=48441
2005-08-16 17:10:59 +00:00
Andrew Skiba 68a46e3c0a System.Drawing compiles on GH!
svn path=/trunk/mcs/; revision=47963
2005-08-03 15:34:40 +00:00
Andrew Skiba 1825fb6ca5 * ColorPalette.cs, FrameDimension.cs, EncoderParameters.cs: TARGET_JVM
exclude not supported internal methods
	* EncoderParameter.jvm.cs, ImageAttributes.jvm.cs, ImageFormat.jvm.cs,
	ImageCodecInfo.jvm.cs: added TARGET_JVM implementation of these classes

svn path=/trunk/mcs/; revision=47959
2005-08-03 13:54:01 +00:00
Jordi Mas i Hernandez 5ee56869b8 In System.Drawing.Imaging:
2005-03-23 Jordi Mas i Hernandez <[email protected]>

	* ColorPalette.cs: fixes ColorPalette marshaling	

In System.Drawing:
2005-03-23 Jordi Mas i Hernandez <[email protected]>

	* gdipFunctions.cs: fixes GdipGetImagePalette signature
	* Image.cs: Implements Palette property using gdiplus	  


svn path=/trunk/mcs/; revision=42133
2005-03-23 09:40:43 +00:00
Jordi Mas i Hernandez 49d833f94c 2004-03-21 Jordi Mas i Hernadez <[email protected]>
* ColorMatrix.cs: fixes Matrix00 init 
	* ImageAttributes.cs: fixes dispose method and signature


svn path=/trunk/mcs/; revision=42045
2005-03-21 11:21:50 +00:00
Jordi Mas i Hernandez 9fb6d31fbc 2004-02-25 Jordi Mas i Hernadez <[email protected]>
* ColorMatrix.cs: rewritten to be able to marshall it properly
	

svn path=/trunk/mcs/; revision=41197
2005-02-25 13:16:53 +00:00
Jordi Mas i Hernandez 8f9c22ce10 Zoltan's fixes of SD marshalling in AMD64
svn path=/trunk/mcs/; revision=38108
2004-12-27 17:31:16 +00:00
Marek Safar f405a09600 removed unused variables
svn path=/trunk/mcs/; revision=36532
2004-11-25 10:11:32 +00:00
Miguel de Icaza 26630c5262 2004-11-03 Miguel de Icaza <[email protected]>
* TextureBrush.cs (Clone): While cloning, it is not enough to let
	GDIPlus clone the underlying data, we must alos clone the managed
	information.

	* Pen.cs (Dispose): Set the nativeObject to IntPtr.Zero to catch
	errors in the future, set the lock on the object before doing any
	other tests, not after.

	(Clone): While cloning, it is not enough to let
	GDIPlus clone the underlying data, we must alos clone the managed
	information.

	* Brush.cs (Dispose): Set the nativeObject to IntPtr.Zero to catch
	errors in the future.

	Set the lock in the object before checkign disposed.

	* SolidBrush.cs (Clone): While cloning, it is not enough to let
	GDIPlus clone the underlying data, we must alos clone the managed
	information.

	(Dispose): Set the nativeObject to IntPtr.Zero to catch
	errors in the future.

2004-11-03  Miguel de Icaza  <[email protected]>

	* ColorPalette.cs: Add internal Clone method

svn path=/trunk/mcs/; revision=35607
2004-11-03 20:01:04 +00:00
Ravindra 6dcd8a5283 * BitmapData.cs: Synchronized the class with BitmapData struct in
libgdiplus.

svn path=/trunk/mcs/; revision=34807
2004-10-08 13:37:17 +00:00
Gert Driesen f5d2c69c7a * EmfPlusRecordType.cs: fixed mismatches in enum field values
svn path=/trunk/mcs/; revision=29482
2004-06-14 05:47:33 +00:00
Jordi Mas i Hernandez 62a16ab086 fixes GDI+ parameter call
svn path=/trunk/mcs/; revision=27605
2004-05-18 17:55:45 +00:00
Gert Driesen c76c6cfac3 * EncoderParameterValueType.cs: fix Windows build (CSC),
MCS bug #58571

* EncoderParameter.cs: removed ctors taking int value,
to fix public API

svn path=/trunk/mcs/; revision=27472
2004-05-16 11:28:07 +00:00
Vladimir Vukicevic e932bf2d09 * EncoderParameters.cs: Added ToNativePtr() method to marshal
struct correctly to a native struct.  Resulting data should be
FreeHGlobal'd when finished.

* EncoderParameter.cs: Changed data storage to correspond to
native code layout.  Also changed layout to match native layout.

* EncoderParameterValueType.cs: force EncoderParameterValueType to
be Int32

* gdipFunctions.cs: Fixed prototype for
GdipGetEncoderParameterList

* Image.cs: Reworked Save functions to handle EncoderParameters.
Implemented GetEncoderParameterList.
Also removed unused setGDIPalette internal method.

svn path=/trunk/mcs/; revision=27467
2004-05-15 23:33:15 +00:00
Jordi Mas i Hernandez 28eafe391c make private data private
svn path=/trunk/mcs/; revision=27240
2004-05-13 07:39:14 +00:00
Sanja Gupta 68aa476b9c ChangeLog: Updated ChangeLog
MetafileHeader.cs: Added internal constructor.
PropertyItem.cs: Added internal constructor.

svn path=/trunk/mcs/; revision=27225
2004-05-13 05:17:42 +00:00
Sanja Gupta 460cda8266 ChangeLog: Updated ChangeLog.
Metafile.cs: Added Editor attribute to class Metafile.

svn path=/trunk/mcs/; revision=27214
2004-05-13 03:00:29 +00:00
Sanja Gupta 71f4f40e36 ChangeLog: Updated ChangeLog.
WmfPlaceablleFileHeader.cs: Removed extra property Id.

svn path=/trunk/mcs/; revision=27213
2004-05-13 02:50:09 +00:00
Vladimir Vukicevic 840e2f96ba * BitmapData.cs: re-synchronized with libgdiplus; also
removed memory deallocs here (as the data is always owned
by libgdiplus)

svn path=/trunk/mcs/; revision=26718
2004-05-04 22:19:34 +00:00
Sanja Gupta 6c4e289c38 ChangeLog: Updated ChangeLog
Modified Files: Converted from dos2unix format

 Modified Files:
 	BitmapData.cs ChangeLog ColorAdjustType.cs ColorChannelFlag.cs
 	ColorMap.cs ColorMapType.cs ColorMatrix.cs ColorMatrixFlag.cs
 	ColorMode.cs ColorPalette.cs EmfPlusRecordType.cs EmfType.cs
 	Encoder.cs EncoderParameter.cs EncoderParameterValueType.cs
 	EncoderParameters.cs EncoderValue.cs FrameDimension.cs
 	ImageAttributes.cs ImageCodecFlags.cs ImageCodecInfo.cs
 	ImageFlags.cs ImageFormat.cs ImageLockMode.cs MetaHeader.cs
 	Metafile.cs MetafileFrameUnit.cs MetafileHeader.cs
 	MetafileType.cs PaletteFlags.cs PixelFormat.cs
 	PlayRecordCallback.cs PropertyItem.cs
 	WmfPlaceableFileHeader.cs

svn path=/trunk/mcs/; revision=26145
2004-04-28 13:21:54 +00:00
Ravindra a8a1eee996 Implemented ImageAttributes.SetWrapMode method.
svn path=/trunk/mcs/; revision=26125
2004-04-28 09:36:32 +00:00
Jordi Mas i Hernandez acf920e23f Codecs use gdi+ and fixes
svn path=/trunk/mcs/; revision=26123
2004-04-28 09:08:30 +00:00
Sanja Gupta 7a9a226722 ChangeLog: Updated ChangeLog
ImageFormat.cs: Implemented Equals() method

svn path=/trunk/mcs/; revision=26117
2004-04-28 06:47:41 +00:00
Sanja Gupta 0604a6f44d ChangeLog: Updated ChangeLog
ImageFormat.cs: Implemented ToString() method.

svn path=/trunk/mcs/; revision=26053
2004-04-27 11:39:09 +00:00
Vladimir Vukicevic 2a17599938 Note: Some functionality is (temporarily) lost from System.Drawing --
reading bmp files is not yet implemented, and only png files can be
written.  Support for the rest will show up in the next few days.

* gdipFunctions.cs: Added stream delegate helpers for
stream loading/saving on linux

* Image.cs, Bitmap.cs: Converted to call into GDIPlus for
loading/saving image data.

* BitmapData.cs: synced up data structure with libgdiplus

* BmpCodec.cs, JPEGCodec.cs, PNGCodec.cs: Removed codec impls,
left just codecinfo getters; the codecs are in libgdiplus

* ImageCodecInfo.cs: removed encode/decode delegates

svn path=/trunk/mcs/; revision=25083
2004-04-06 09:05:48 +00:00
Jordi Mas i Hernandez d34e25c9e7 more image methods implemented
svn path=/trunk/mcs/; revision=24848
2004-03-31 15:15:18 +00:00
Jordi Mas i Hernandez c4330b9186 added missing members and complete the wrapper
svn path=/trunk/mcs/; revision=24641
2004-03-26 17:53:51 +00:00
Jordi Mas i Hernandez 5a48761f6e fixes image and bmp dpi
svn path=/trunk/mcs/; revision=24521
2004-03-24 14:52:41 +00:00
Jordi Mas i Hernandez 55cb57557c bmp encoder /decoder enhancements and bug fixing
svn path=/trunk/mcs/; revision=24334
2004-03-19 17:25:27 +00:00
Sanja Gupta 3a46ddd8ef ChangeLog: Updated ChangeLog
Metafile.cs: Corrected the signature for constructor

svn path=/trunk/mcs/; revision=23682
2004-03-04 05:46:05 +00:00
Nick Drochak 33ca9a2f45 2004-03-04 Nick Drochak <[email protected]>
* Metafile.cs: Fix build, remove duplicate member.

svn path=/trunk/mcs/; revision=23680
2004-03-04 04:06:37 +00:00
Sanja Gupta 16e0d2166a ChangeLog: Updated ChangeLog
ImageAttributes.cs: Added few missing functions
Metafile.cs: Added stubs for missing constructors and functions

svn path=/trunk/mcs/; revision=23653
2004-03-03 14:48:31 +00:00
Nick Drochak 93613b1a23 2004-03-03 Nick Drochak <[email protected]>
* BmpCodec.cs: Remove unsed variable.

svn path=/trunk/mcs/; revision=23651
2004-03-03 13:48:26 +00:00
Ravindra b9f8467779 Few bug fixes in EncoderParameter.cs and file format changed to unix.
svn path=/trunk/mcs/; revision=23160
2004-02-17 06:05:52 +00:00
Sanja Gupta 2531d682a4 ChangeLog: Updated ChangeLog
FrameDimension.cs: Implemented missing functionalities.

svn path=/trunk/mcs/; revision=23053
2004-02-13 10:11:10 +00:00
Ravindra 8f28c89441 Implemented EncoderParameter.cs and EncoderParameters.cs.
svn path=/trunk/mcs/; revision=23026
2004-02-12 14:34:59 +00:00
Jordi Mas i Hernandez fe395ca826 serveral methods added, serveral fixes, and test case
svn path=/trunk/mcs/; revision=22390
2004-01-22 10:41:03 +00:00
Ravindra 36421a5fc5 Implemented Encoder.cs.
svn path=/trunk/mcs/; revision=22252
2004-01-19 15:08:21 +00:00
Ravindra ed6b9ca7c3 Made all Enums serializable and corrected some class declarations.
svn path=/trunk/mcs/; revision=21900
2004-01-10 09:43:58 +00:00
Andreas N 37809261cd 2003-11-13 Andreas Nahr <[email protected]>
* ColorMap.cs: Implemented
	* ColorMatrix.cs: Implemented, Removed unneccesary members
	* ImageAttributes.cs: Fixed signature
	* ImageCodecInfo.cs: Added missing attribure, hide constructor
	* ImageFormat.cs: Implemented, Added attribute
	* MetaHeader.cs: Implemented
	* PropertyItem.cs: Implemented
	* ImageFlags.cs: Added Attribute
	* ImageCodecFlags.cs: Added Attribute
	* EmfPlusRecordType.cs: Added missing members

svn path=/trunk/mcs/; revision=19972
2003-11-13 22:37:11 +00:00
Alexandre Pigolkine bb033e86c8 convert BGR to RGB, PNG codec fixed
svn path=/trunk/mcs/; revision=19917
2003-11-12 21:20:52 +00:00
Alexandre Pigolkine 74a08e4969 codec can select pixel format of bitmap
svn path=/trunk/mcs/; revision=19557
2003-11-02 20:41:19 +00:00
Miguel de Icaza 52bad3e3db In Short:
Updated System.Drawing, lots of cleanups.
	Added JPEG encoder/decoder back to Bitmap.
	We can load and save images again.
	Still need work to support all formats, everywhere
	PNG codec broken (but at least its plugged back).

2003-10-23  Miguel de Icaza  <[email protected]>

	* bitmap.c (GdipCreateBitmapFromScan0): Do not allocate buffer
	here, expect that our caller to allocate that.

	Do not compute the stride here, expect our caller to do this
	properly.

	* Use the Mono coding conventions.

2003-10-23  Miguel de Icaza  <[email protected]>

	* Image.cs: Kill the InternalImageInfo, everything is now done in
	terms of Image and BitmapData.

	* Rectangle.cs: Make this one also sequential, change from using
	Point + Size to use x, y, width, height;  So we can use GdiPlus.

	* gdipFunctions.cs (GdipBitmapLockBits): Remove the ref from the
	BitmapData class argument, and instead use the [In,Out]
	attributes, which will do struct marshalling on the fields.   Now
	we can use C#'s BitmapData directly to talk to Gdiplus.

	* gdipStructs.cs: Every internal structure that has to talk to
	Gdi+ is properly prefixed, to minimize the confussion.

	* Bitmap.cs Bitmap (int width, int height, PixelFormat format):
	Compute the stride here where we have the BPP information,
	allocate a buffer of the proper size, and pass this to
	GdipCreateBitmapFromScan0

	* Image.cs: Implement Dispose pattern.

2003-10-23  Miguel de Icaza  <[email protected]>

	* JPEGCodec.cs (JSAMPARRAY): Do not allocate memory here anymore,
	we will just have the JPEG library copy directly into our buffer.

	(Encode, Decode): Ported to the new model which avoid copies, and
	eliminates InternalImageInfo.

	TODO: need to port the PNG coder/decoder, and add support for RGBA
	images which got dropped from this version

	* BmpCodec.cs: Rework this one to use BitmapData and Image.  Do
	not use the RawBytes property, instead pull the data one line at a
	time, and write that out.

	* ImageCodecInfo.cs: Make the encoding and decoding delegates take
	a Image parameter;

	* BmpCodec.cs:

	* BitmapData.cs: Make this one sequential, and also mimic the
	layout of GdiPlus.h so we can use this instead of making copies
	back and forth.

svn path=/trunk/mcs/; revision=19354
2003-10-24 05:05:30 +00:00
Alexandre Pigolkine d42edaabb1 warning removed
svn path=/trunk/mcs/; revision=18926
2003-10-12 21:01:59 +00:00
Alexandre Pigolkine c907a90d5e cosmetic changes
svn path=/trunk/mcs/; revision=16867
2003-07-30 02:25:46 +00:00
Alexandre Pigolkine a3ccb895c1 png codec added
svn path=/trunk/mcs/; revision=16545
2003-07-22 19:54:16 +00:00
Andreas N 41fdc7c50d 2003-07-21 Andreas Nahr <[email protected]>
* Metafile.cs: Inherits from image (fix for System.Drawing.Design)

svn path=/trunk/mcs/; revision=16502
2003-07-21 21:04:02 +00:00