manual BMP rendering colour issues

[Goseph]

I am reading in a .BMP file with a datainputstream and trying to create a bufferedImage
containing the data which I then draw on a JPanel.
It basically works but the colours are messed up as you can see:

Gray scale Lena.bmp (8-bit, indexed):
photos-h.ak.fbcdn.net/photos-ak-snc1/v1977/195/12/761545483/n761545483_6011263_6885.jpg
How I render her:
photos-a.ak.fbcdn.net/photos-ak-snc1/v1977/195/12/761545483/n761545483_6011264_7096.jpg
Coloured Lena.bmp (24 bit, non-indexed):
photos-b.ak.fbcdn.net/photos-ak-snc1/v1977/195/12/761545483/n761545483_6011265_7280.jpg
how I render her:
photos-c.ak.fbcdn.net/photos-ak-snc1/v1977/195/12/761545483/n761545483_6011266_7579.jpg

Here are the relevant bits of code:

	//here my BufferedImage "img" is created,
	//occassionally reading relevant image parameters from the next class
	....................
	if (bmp.bitsPerPixel == 8)
		img = new BufferedImage(bmp.width, bmp.height, BufferedImage.TYPE_BYTE_INDEXED, bmp.getPalette());
	else if (bmp.bitsPerPixel == 24)
		img = new BufferedImage(bmp.width, bmp.height, BufferedImage.TYPE_INT_RGB);
	img.setRGB(0, 0, bmp.width, bmp.height, bmp.getImageData(), 0, bmp.width);
	....................
	
	
	/******************************** CLASS FOR EXTRACTING IMAGE INFO *********************************** **/
	
	//the relevant extractor methods/variables from the class
	//that processes the image's dataInputStream "data"
	
	private int[] imageData;	//array of image pixels
								//with usual coordinate system (origin at top left hand corner of image)
	private IndexColorModel palette;
	
	public int[] getImageData() { return imageData; } //Getters for pixel data and palette
	public IndexColorModel getPalette() { return palette; }
	
	private IndexColorModel readPalette() throws IOException	//extracts palette as a ColorModel
	{															//assumes that pointer to data
		byte[] r = new byte[noColours];							//is at start of palette
		byte[] g = new byte[noColours];
		byte[] b = new byte[noColours];
		for (int i = 0; i < noColours; ++i) {
			b[i] = data.readByte();
			g[i] = data.readByte();
			r[i] = data.readByte();
			data.skipBytes(1);
		}
		return new IndexColorModel(8, 256, r, g, b);
	}
	
	private void readImageData() throws IOException		//-extracts image data assuming
	{													//-that pointer is at start of image data
		imageData = new int[height*width];
		int padding = (32-((width*bitsPerPixel)%32))%32;//length of row padding in bits
		for (int y = height - 1; y >= 0; --y) {
			for (int x = 0; x < width; ++x) {
				byte b = data.readByte();
				switch (bitsPerPixel) {
					case 8: imageData[(y * width) + x] = (b > 0) ? b : b + 256; break;
					case 24:byte g = data.readByte();
							byte r = data.readByte();
							imageData[(y * width) + x] = b | (g << 8) | (r << 16);
				}
			}
			data.skipBytes(padding/8);	//skip end of row padding
		}
	}
	
	/***************************************************************************************************/

Any BufferedImage ninjas out there who understand whats going on?

PS. My post count isn't high enough to insert images, but if you need to see whats going on then you can just copy those links at the top into a browser