projects/dwt-mac: dwt/graphics/Image.d comparison

comparison dwt/graphics/Image.d @ 36:db5a898b2119

Fixed a lot of compile errors

author	Jacob Carlborg <doob@me.com> <jacob.carlborg@gmail.com>
date	Tue, 07 Oct 2008 12:56:18 +0200
parents	7d135fe0caf2
children	d8635bb48c7c

comparison

equal deleted inserted replaced

-:7d135fe0caf2
+:db5a898b2119
 * @see ImageData
 * @see ImageLoader
 */
 public final class Image : Resource, Drawable {
+alias Resource.init_ init_;
 /**
 * specifies whether the receiver is a bitmap or an icon
 * (one of <code>DWT.BITMAP</code>, <code>DWT.ICON</code>)
 * <p>
 * <b>IMPORTANT:</b> This field is <em>not</em> part of the DWT
 *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
 * </ul>
 */
 public this(Device device, int width, int height) {
 super(device);
-init(width, height);
+init_(width, height);
-init();
+init_();
 }
 /**
 * Constructs a new instance of this class based on the
 * provided image, with an appearance that varies depending
 /* Create the image */
 handle = cast(NSImage)(new NSImage()).alloc();
 handle = handle.initWithSize(size);
 NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
-rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(null, cast(NSInteger) width, cast(NSInteger) height, srcRep.bitsPerSample(), srcRep.samplesPerPixel(), srcRep.samplesPerPixel() is 4, srcRep.isPlanar(), new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, srcRep.bytesPerRow(), srcRep.bitsPerPixel());
+rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(null, cast(NSInteger) width, cast(NSInteger) height, srcRep.bitsPerSample(), srcRep.samplesPerPixel(), srcRep.samplesPerPixel() is 4, srcRep.isPlanar(), OS.NSDeviceRGBColorSpace, NSAlphaFirstBitmapFormat | NSAlphaNonpremultipliedBitmapFormat, srcRep.bytesPerRow(), srcRep.bitsPerPixel());
 handle.addRepresentation(rep);
 objc.id data = rep.bitmapData();
 OS.memmove(data, srcImage.imageRep.bitmapData(), cast(size_t) (width * height * 4));
 if (flag !is DWT.IMAGE_COPY) {
 }
 break;
 }
 }
 }
-init();
+init_();
 }
 /**
 * Constructs an empty instance of this class with the
 * width and height of the specified rectangle. The result
 * </ul>
 */
 public this(Device device, Rectangle bounds) {
 super(device);
 if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-init(bounds.width, bounds.height);
+init_(bounds.width, bounds.height);
-init();
+init_();
 }
 /**
 * Constructs an instance of this class from the given
 * <code>ImageData</code>.
 *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
 * </ul>
 */
 public this(Device device, ImageData data) {
 super(device);
-init(data);
+init_(data);
-init();
+init_();
 }
 /**
 * Constructs an instance of this class, whose type is
 * <code>DWT.ICON</code>, from the two given <code>ImageData</code>
 }
 mask = ImageData.convertMask(mask);
 ImageData image = new ImageData(source.width, source.height, source.depth, source.palette, source.scanlinePad, source.data);
 image.maskPad = mask.scanlinePad;
 image.maskData = mask.data;
-init(image);
+init_(image);
 }
 /**
 * Constructs an instance of this class by loading its representation
 * from the specified input stream. Throws an error if an error
 *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
 * </ul>
 */
 public this(Device device, InputStream stream) {
 super(device);
-init(new ImageData(stream));
+init_(new ImageData(stream));
-init();
+init_();
 }
 /**
 * Constructs an instance of this class by loading its representation
 * from the file with the specified name. Throws an error if an error
 *    <li>ERROR_NO_HANDLES if a handle could not be obtained for image creation</li>
 * </ul>
 */
 public this(Device device, String filename) {
 super(device);
-init(new ImageData(filename));
+init_(new ImageData(filename));
-init();
+init_();
 }
 void createAlpha () {
 if (transparentPixel is -1 && alpha is -1 && alphaData is null) return;
 NSSize size = handle.size();
 if (isDisposed()) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (transparentPixel is -1) return null;
 int red = (transparentPixel >> 16) & 0xFF;
 int green = (transparentPixel >> 8) & 0xFF;
 int blue = (transparentPixel >> 0) & 0xFF;
-return Color.cocoa_new(device, new float[][red / 255f, green / 255f, blue / 255f, 1]);
+return Color.cocoa_new(device, [red / 255f, green / 255f, blue / 255f, 1]);
 }
 /**
 * Returns the bounds of the receiver. The rectangle will always
 * have x and y values of 0, and the width and height of the
 * @return the receiver's hash
 *
 * @see #equals
 */
 public hash_t toHash () {
-return handle !is null ? handle.id_ : null;
+return handle !is null ? cast(hash_t) handle.id_ : 0;
 }
 alias toHash hashCode;
-void init(int width, int height) {
+void init_(int width, int height) {
 if (width <= 0 || height <= 0) {
 DWT.error (DWT.ERROR_INVALID_ARGUMENT);
 }
 this.type = DWT.BITMAP;
 this.width = width;
 NSSize size = NSSize();
 size.width = width;
 size.height = height;
 handle = handle.initWithSize(size);
 NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
-rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(0, cast(NSInteger) width, cast(NSInteger) height, 8, 3, false, false, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, cast(NSInteger) (width * 4), 32);
+rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(null, cast(NSInteger) width, cast(NSInteger) height, 8, 3, false, false, OS.NSDeviceRGBColorSpace, NSAlphaFirstBitmapFormat | NSAlphaNonpremultipliedBitmapFormat, cast(NSInteger) (width * 4), 32);
 OS.memset(rep.bitmapData(), 0xFF, cast(size_t) (width * height * 4));
 handle.addRepresentation(rep);
 //  rep.release();
 }
-void init(ImageData image) {
+void init_(ImageData image) {
 if (image is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 this.width = image.width;
 this.height = image.height;
 PaletteData palette = image.palette;
 if (!(((image.depth is 1 || image.depth is 2 || image.depth is 4 || image.depth is 8) && !palette.isDirect) ||
 size.width = width;
 size.height = height;
 handle = handle.initWithSize(size);
 NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
 rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-null, cast(NSInteger) width, cast(NSInteger) height, 8, hasAlpha ? 4 : 3, hasAlpha, false, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, cast(NSInteger) bpr, 32);
+null, cast(NSInteger) width, cast(NSInteger) height, 8, hasAlpha ? 4 : 3, hasAlpha, false, OS.NSDeviceRGBColorSpace, NSAlphaFirstBitmapFormat | NSAlphaNonpremultipliedBitmapFormat, cast(NSInteger) bpr, 32);
 OS.memmove(rep.bitmapData(), buffer.ptr, dataSize);
 handle.addRepresentation(rep);
 //  rep.release();
 }
 * </p>
 *
 * @param data the platform specific GC data
 * @return the platform specific GC handle
 */
-public int internal_new_GC (GCData data) {
+public objc.id internal_new_GC (GCData data) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (type !is DWT.BITMAP || memGC !is null) {
 DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 }
 NSGraphicsContext current = NSGraphicsContext.currentContext();
 NSBitmapImageRep rep = imageRep;
 if (imageRep.hasAlpha()) {
 NSInteger bpr = width * 4;
 rep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
-int bitmapData = imageRep.bitmapData();
+objc.id bitmapData = imageRep.bitmapData();
 if (data.bitmapDataAddress !is null) OS.free(data.bitmapDataAddress);
-data.bitmapDataAddress = OS.malloc((void*).sizeof);
+data.bitmapDataAddress = cast(ubyte*) OS.malloc((void*).sizeof);
-OS.memmove(data.bitmapDataAddress, (new int[] (bitmapData)).ptr, (void*).sizeof);
+OS.memmove(data.bitmapDataAddress, bitmapData, (void*).sizeof);
 rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-&data.bitmapDataAddress, cast(NSInteger) width, cast(NSInteger) height, 8, 3, false, false, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat , bpr, 32);
+&data.bitmapDataAddress, cast(NSInteger) width, cast(NSInteger) height, 8, 3, false, false, OS.NSDeviceRGBColorSpace, NSAlphaFirstBitmapFormat , bpr, 32);
 rep.autorelease();
 }
 NSGraphicsContext context = NSGraphicsContext.graphicsContextWithBitmapImageRep(rep);
 NSGraphicsContext.setCurrentContext(context);
 NSAffineTransform transform = NSAffineTransform.transform();
 data.foreground = device.COLOR_BLACK.handle;
 data.font = device.systemFont;
 data.image = this;
 }
 NSGraphicsContext.setCurrentContext(current);
-return context.id;
+return context.id_;
 }
 /**
 * Invokes platform specific functionality to dispose a GC handle.
 * <p>
 * </p>
 *
 * @param hDC the platform specific GC handle
 * @param data the platform specific GC data
 */
-public void internal_dispose_GC (int context, GCData data) {
+public void internal_dispose_GC (objc.id context, GCData data) {
 if (data.bitmapDataAddress !is null) OS.free(data.bitmapDataAddress);
 data.bitmapDataAddress = null;
 }
 /**

Mercurial > projects > dwt-mac

comparison dwt/graphics/Image.d @ 36:db5a898b2119