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

comparison dwt/graphics/Image.d @ 32:b9226997409c

Ported dwt.graphics.Image*

author	Jacob Carlborg <doob@me.com> <jacob.carlborg@gmail.com>
date	Fri, 12 Sep 2008 13:44:30 +0200
parents	a9ab4c738ed8
children	7d135fe0caf2

comparison

equal deleted inserted replaced

-:9a3047e87f1d
+:b9226997409c
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
+*
+* Port to the D programming language:
+*     Jacob Carlborg <jacob.carlborg@gmail.com>
 *******************************************************************************/
 module dwt.graphics.Image;
-import dwt.dwthelper.utils;
-import java.io.InputStream;
+import dwt.dwthelper.InputStream;
 import dwt.DWT;
 import dwt.DWTError;
 import dwt.DWTException;
 import dwt.internal.cocoa.NSAffineTransform;
 import dwt.internal.cocoa.NSImage;
 import dwt.internal.cocoa.NSImageRep;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
+import tango.text.convert.Format;
+import dwt.dwthelper.utils;
+import dwt.graphics.Color;
+import dwt.graphics.Device;
+import dwt.graphics.Drawable;
+import dwt.graphics.GC;
+import dwt.graphics.GCData;
+import dwt.graphics.ImageData;
+import dwt.graphics.PaletteData;
+import dwt.graphics.RGB;
+import dwt.graphics.Rectangle;
+import dwt.graphics.Resource;
+import dwt.internal.cocoa.NSInteger;
+import objc = dwt.internal.objc.runtime;
 /**
 * Instances of this class are graphics which have been prepared
 * for display on a specific device. That is, they are ready
 * to paint using methods such as <code>GC.drawImage()</code>
 *
 * @see Color
 * @see ImageData
 * @see ImageLoader
 */
-public final class Image : Resource , Drawable {
+public final class Image : Resource, Drawable {
 /**
 * specifies whether the receiver is a bitmap or an icon
 * (one of <code>DWT.BITMAP</code>, <code>DWT.ICON</code>)
 * <p>
 /* Get source image size */
 NSSize size = srcImage.handle.size();
 int width = cast(int)size.width;
 int height = cast(int)size.height;
 NSBitmapImageRep srcRep = srcImage.imageRep;
-int bpr = srcRep.bytesPerRow();
+NSInteger bpr = srcRep.bytesPerRow();
 /* Copy transparent pixel and alpha data when necessary */
 transparentPixel = srcImage.transparentPixel;
 alpha = srcImage.alpha;
 if (srcImage.alphaData !is null) {
 alphaData = new byte[srcImage.alphaData.length];
 System.arraycopy(srcImage.alphaData, 0, alphaData, 0, alphaData.length);
 }
 /* Create the image */
-handle = cast(NSImage)new NSImage().alloc();
+handle = cast(NSImage)(new NSImage()).alloc();
 handle = handle.initWithSize(size);
-NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)new NSBitmapImageRep().alloc();
+NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
-rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(0, width, 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(), new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, srcRep.bytesPerRow(), srcRep.bitsPerPixel());
 handle.addRepresentation(rep);
-int data = rep.bitmapData();
+objc.id data = rep.bitmapData();
-OS.memmove(data, srcImage.imageRep.bitmapData(), width * height * 4);
+OS.memmove(data, srcImage.imageRep.bitmapData(), cast(size_t) (width * height * 4));
 if (flag !is DWT.IMAGE_COPY) {
 /* Apply transformation */
 switch (flag) {
 case DWT.IMAGE_DISABLE: {
 byte oneRed = cast(byte)oneRGB.red;
 byte oneGreen = cast(byte)oneRGB.green;
 byte oneBlue = cast(byte)oneRGB.blue;
 byte[] line = new byte[bpr];
 for (int y=0; y<height; y++) {
-OS.memmove(line, data + (y * bpr), bpr);
+OS.memmove(line.ptr, data + (y * bpr), bpr);
 int offset = 0;
 for (int x=0; x<width; x++) {
 int red = line[offset+1] & 0xFF;
 int green = line[offset+2] & 0xFF;
 int blue = line[offset+3] & 0xFF;
 line[offset+2] = oneGreen;
 line[offset+3] = oneBlue;
 }
 offset += 4;
 }
-OS.memmove(data + (y * bpr), line, bpr);
+OS.memmove(data + (y * bpr), line.ptr, bpr);
 }
 break;
 }
 case DWT.IMAGE_GRAY: {
 byte[] line = new byte[bpr];
 for (int y=0; y<height; y++) {
-OS.memmove(line, data + (y * bpr), bpr);
+OS.memmove(line.ptr, data + (y * bpr), bpr);
 int offset = 0;
 for (int x=0; x<width; x++) {
 int red = line[offset+1] & 0xFF;
 int green = line[offset+2] & 0xFF;
 int blue = line[offset+3] & 0xFF;
 byte intensity = cast(byte)((red+red+green+green+green+green+green+blue) >> 3);
 line[offset+1] = line[offset+2] = line[offset+3] = intensity;
 offset += 4;
 }
-OS.memmove(data + (y * bpr), line, bpr);
+OS.memmove(data + (y * bpr), line.ptr, bpr);
 }
 break;
 }
 }
 }
 void createAlpha () {
 if (transparentPixel is -1 && alpha is -1 && alphaData is null) return;
 NSSize size = handle.size();
 int height = cast(int)size.height;
-int bpr = imageRep.bytesPerRow();
+NSInteger bpr = imageRep.bytesPerRow();
-int dataSize = height * bpr;
+size_t dataSize = height * bpr;
 byte[] srcData = new byte[dataSize];
-OS.memmove(srcData, imageRep.bitmapData(), dataSize);
+OS.memmove(srcData.ptr, imageRep.bitmapData(), dataSize);
 if (transparentPixel !is -1) {
 for (int i=0; i<dataSize; i+=4) {
 int pixel = ((srcData[i+1] & 0xFF) << 16) | ((srcData[i+2] & 0xFF) << 8) | (srcData[i+3] & 0xFF);
 srcData[i] = cast(byte)(pixel is transparentPixel ? 0 : 0xFF);
 }
 offset += 4;
 alphaOffset += 1;
 }
 }
 }
-OS.memmove(imageRep.bitmapData(), srcData, dataSize);
+OS.memmove(imageRep.bitmapData(), srcData.ptr, dataSize);
 }
 void destroy() {
 if (memGC !is null) memGC.dispose();
 if (imageRep !is null) imageRep.release();
 * @param object the object to compare with this object
 * @return <code>true</code> if the object is the same as this object and <code>false</code> otherwise
 *
 * @see #hashCode
 */
-public bool equals (Object object) {
+public bool opEquals (Object object) {
 if (object is this) return true;
 if (!( null !is cast(Image)object )) return false;
 Image image = cast(Image)object;
 return device is image.device && handle is image.handle &&
 transparentPixel is image.transparentPixel;
 }
+alias opEquals equals;
 /**
 * Returns the color to which to map the transparent pixel, or null if
 * the receiver has no transparent pixel.
 * <p>
 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, new float[][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
 NSSize size = handle.size();
 int width = cast(int)size.width;
 int height = cast(int)size.height;
 NSBitmapImageRep imageRep = this.imageRep;
-int bpr = imageRep.bytesPerRow();
+NSInteger  bpr = imageRep.bytesPerRow();
-int bpp = imageRep.bitsPerPixel();
+NSInteger  bpp = imageRep.bitsPerPixel();
-int dataSize = height * bpr;
+size_t dataSize = height * bpr;
 byte[] srcData = new byte[dataSize];
-OS.memmove(srcData, imageRep.bitmapData(), dataSize);
+OS.memmove(srcData.ptr, imageRep.bitmapData(), dataSize);
 PaletteData palette = new PaletteData(0xFF0000, 0xFF00, 0xFF);
 ImageData data = new ImageData(width, height, bpp, palette);
 data.data = srcData;
 data.bytesPerLine = bpr;
 Image image = new Image(device);
 image.type = type;
 image.handle = nsImage;
 NSImageRep rep = nsImage.bestRepresentationForDevice(null);
 if (rep.isKindOfClass(NSBitmapImageRep.static_class())) {
-image.imageRep = new NSBitmapImageRep(rep.id);
+image.imageRep = new NSBitmapImageRep(rep.id_);
 }
 return image;
 }
 /**
 *
 * @return the receiver's hash
 *
 * @see #equals
 */
-public int hashCode () {
+public hash_t toHash () {
-return handle !is null ? handle.id : 0;
+return handle !is null ? handle.id_ : null;
 }
+alias toHash hashCode;
 void init(int width, int height) {
 if (width <= 0 || height <= 0) {
 DWT.error (DWT.ERROR_INVALID_ARGUMENT);
 }
 this.type = DWT.BITMAP;
 this.width = width;
 this.height = height;
-handle = cast(NSImage)new NSImage().alloc();
+handle = cast(NSImage)(new NSImage()).alloc();
-NSSize size = new NSSize();
+NSSize size = NSSize();
 size.width = width;
 size.height = height;
 handle = handle.initWithSize(size);
-NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)new NSBitmapImageRep().alloc();
+NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
-rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(0, width, height, 8, 3, false, false, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, width * 4, 32);
+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);
-OS.memset(rep.bitmapData(), 0xFF, width * height * 4);
+OS.memset(rep.bitmapData(), 0xFF, cast(size_t) (width * height * 4));
 handle.addRepresentation(rep);
 //  rep.release();
 }
 void init(ImageData image) {
 if (!(((image.depth is 1 || image.depth is 2 || image.depth is 4 || image.depth is 8) && !palette.isDirect) ||
 ((image.depth is 8) || (image.depth is 16 || image.depth is 24 || image.depth is 32) && palette.isDirect)))
 DWT.error(DWT.ERROR_UNSUPPORTED_DEPTH);
 /* Create the image */
-int dataSize = width * height * 4;
+size_t dataSize = width * height * 4;
 /* Initialize data */
 int bpr = width * 4;
 byte[] buffer = new byte[dataSize];
 if (palette.isDirect) {
 alphaOffset += 1;
 }
 }
 }
 }
-handle = cast(NSImage)new NSImage().alloc();
+handle = cast(NSImage)(new NSImage()).alloc();
-NSSize size = new NSSize();
+NSSize size = NSSize();
 size.width = width;
 size.height = height;
 handle = handle.initWithSize(size);
-NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)new NSBitmapImageRep().alloc();
+NSBitmapImageRep rep = imageRep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
 rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-0, width, height, 8, hasAlpha ? 4 : 3, hasAlpha, false, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat | OS.NSAlphaNonpremultipliedBitmapFormat, bpr, 32);
+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);
-OS.memmove(rep.bitmapData(), buffer, dataSize);
+OS.memmove(rep.bitmapData(), buffer.ptr, dataSize);
 handle.addRepresentation(rep);
 //  rep.release();
 }
 /**
 DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 }
 NSGraphicsContext current = NSGraphicsContext.currentContext();
 NSBitmapImageRep rep = imageRep;
 if (imageRep.hasAlpha()) {
-int bpr = width * 4;
+NSInteger bpr = width * 4;
-rep = cast(NSBitmapImageRep)new NSBitmapImageRep().alloc();
+rep = cast(NSBitmapImageRep)(new NSBitmapImageRep()).alloc();
 int bitmapData = imageRep.bitmapData();
-if (data.bitmapDataAddress !is 0) OS.free(data.bitmapDataAddress);
+if (data.bitmapDataAddress !is null) OS.free(data.bitmapDataAddress);
-data.bitmapDataAddress = OS.malloc(4);
+data.bitmapDataAddress = OS.malloc((void*).sizeof);
-OS.memmove(data.bitmapDataAddress, new int[] {bitmapData}, 4);
+OS.memmove(data.bitmapDataAddress, (new int[] (bitmapData)).ptr, (void*).sizeof);
 rep = rep.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-data.bitmapDataAddress, width, 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, new NSString(OS.NSDeviceRGBColorSpace()), OS.NSAlphaFirstBitmapFormat , bpr, 32);
 rep.autorelease();
 }
 NSGraphicsContext context = NSGraphicsContext.graphicsContextWithBitmapImageRep(rep);
 NSGraphicsContext.setCurrentContext(context);
 NSAffineTransform transform = NSAffineTransform.transform();
 *
 * @param hDC the platform specific GC handle
 * @param data the platform specific GC data
 */
 public void internal_dispose_GC (int context, GCData data) {
-if (data.bitmapDataAddress !is 0) OS.free(data.bitmapDataAddress);
+if (data.bitmapDataAddress !is null) OS.free(data.bitmapDataAddress);
-data.bitmapDataAddress = 0;
+data.bitmapDataAddress = null;
 }
 /**
 * Returns <code>true</code> if the image has been disposed,
 * and <code>false</code> otherwise.
 *
 * @return a string representation of the receiver
 */
 public String toString () {
 if (isDisposed()) return "Image {*DISPOSED*}";
-return "Image {" + handle + "}";
+return Format("Image {{}{}" , handle , "}");
 }
 }

Mercurial > projects > dwt-mac

comparison dwt/graphics/Image.d @ 32:b9226997409c