dsktool 0.2.1 → 0.4.1

data/lib/DSK.rb

@@ -2,42 +2,133 @@ $:.unshift(File.dirname(__FILE__)) unless
 	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 require 'open-uri'
 
+
+
 #
 # For manipulating DSK files, as created by ADT (http://adt.berlios.de) and ADTPRo (http://adtpro.sourceforge.net)
 # used by many Apple 2 emulators.
 #
 class DSK
 
+	FILE_SYSTEMS=[:prodos,:dos33,:nadol,:pascal,:unknown,:none]
+	SECTOR_ORDERS=[:physical,:prodos_from_dos]
+	DSK_IMAGE_EXTENSIONS=[".dsk",".po",".do",".hdv"]
+	INTERLEAVES={
+		:physical=>   [0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F],
+		:prodos_from_dos=>[0x00,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x0F]
+	}
+  
 	#does this filename have a suitable extension?
 	def DSK.is_dsk_file?(filename)
-		!(filename.upcase=~/\.DSK$|\.DSK\.GZ$|\.PO$|\.PO\.GZ$/).nil?
+		extension=File.extname(File.basename(filename,".gz")).downcase
+		DSK_IMAGE_EXTENSIONS.include?(extension)
 	end
 	DSK_FILE_LENGTH=143360
-	attr_accessor (:file_bytes)
+	attr_accessor :file_bytes,:sector_order,:track_count
+
+	def file_system
+		:unknown
+	end
+
+  
+#add_file takes a *File object (of a type compatible with the underlying file system) and adds it to the in-memory image of this DSK
+#this should be overridden in each  *Disk type that has write support enabled
+  def add_file(new_file)
+    raise "add files to #{file_system} file system not yet supported"
+  end
+
+#make_file creates a *File object (of a type compatible with the underlying file system) from filename, contents and options required
+#for the underlying file system. The file is NOT added to the in-memory image of this DSK (call add_file to do that)
+  def make_file(filename,contents,file_options={})
+    raise "creating files for #{file_system} file system not yet supported"
+  end
+
+  def delete_file(filename)
+    raise "deleting from #{file_system} file system not yet supported"
+  end
+  
+  def free_sector_list
+    raise "listing free sectors on #{file_system} file system not yet supported"
+  end
+
 	# does this DSK have a standard Apple DOS 3.3 VTOC?
-	def	is_dos33?
+	def	is_dos33?(sector_order)
+		#currently ignores sector order
 		# VTOC is at offset 0x11000
-		# bytes 1/2/3 are a track number, sector number and DOS version number
+		# bytes 1 & 2 are a track number, sector number and DOS version number
+    # byte 27  is maximum number of track/sector pairs which will fit in one file track/sector list sector (122 for 256 byte sectors)
+    # 35    number of sectors per track (16)
 		# see if these are reasonable values
-
-		(@file_bytes[0x11001]<=34) && (@file_bytes[0x11002]<=15) && (@file_bytes[0x11003]==3)
+    vtoc_sector=get_sector(0x11,0)
+		(vtoc_sector[01]<=34) && (vtoc_sector[02]<=15) && (vtoc_sector[0x27]==0x7A) && (vtoc_sector[0x35]==0x10)
 	end
 
-	def	is_nadol?
+	def	is_nadol?(sector_order)
+		#currently ignores sector order
 		# track $00, sector $02 , bytes $11 - "NADOL"
 		(@file_bytes[0x00211..0x00215]=="NADOL")
+	end
+
+	def	is_prodos?(sector_order)
+		#block $02 - bytes $00/$01 are both $00, byte $04 is $F?, 
+		#bytes $29-$2A = sectors ( 0x118 on a 35 track 5.25" disk)
+		first_sector_in_block_2=INTERLEAVES[sector_order][4]
+		first_sector_in_block_2=get_sector(0,4,sector_order)
+		(first_sector_in_block_2[0..1]=="\x00\x00") && (first_sector_in_block_2[4]>=0xF0) && (first_sector_in_block_2[0x29]+first_sector_in_block_2[0x2a]*0x100==track_count*8)
 	end
-
 
+  def is_pascal?(sector_order)
+	 #block $02 - bytes $00..$01 are both $00, byte $06 is < 8 and 
+		#bytes $0E-$0F = sectors ( 0x118 on a 35 track 5.25" disk)
+		first_sector_in_block_2=INTERLEAVES[sector_order][4]
+		first_sector_in_block_2=get_sector(0,4,sector_order)
+		(first_sector_in_block_2[0..1]=="\x00\x00") && (first_sector_in_block_2[6]<=7) && (first_sector_in_block_2[0x0E]+first_sector_in_block_2[0x0F]*0x100==track_count*8)
+		end
+  
 	#create a new DSK structure (in memory, not on disk)
-	def initialize(file_bytes="\0"*DSK_FILE_LENGTH)	
-		if (file_bytes.length!=DSK_FILE_LENGTH) then
+	def initialize(file_bytes="\0"*DSK_FILE_LENGTH,sector_order=:physical)
+		#file must be a multiple of (16 sectors * 256 bytes) = 4096
+		#some dsks on Asimov appear to have an extra byte at the end so allow for 1 extra byte
+		if (file_bytes.length%4096>1) then
 			raise "DSK files must be #{DSK_FILE_LENGTH} bytes long (was #{file_bytes.length} bytes)"
 		end
 		@file_bytes=file_bytes
-		@files={}
+		@files={}
+		@sector_order=sector_order
+		@track_count=file_bytes.length/4096
 	end
 	
+  #write out DSK to file
+  def save_as(filename)
+    if !(filename=~/\.gz$/).nil? then
+			require 'zlib'
+      f=Zlib::GzipWriter.new(open(filename,"wb"))
+    else
+      f=open(filename,"wb")
+    end    
+    f<<@file_bytes
+    f.close
+  end
+			
+
+  #create a new DSK initialised with specified filesystem
+  def DSK.create_new(filesystem)
+     
+    filesystem=:dos33 if filesystem==:dos 
+    
+    case filesystem 
+      when :none
+        return DSK.new()
+      when :nadol
+        return DSK.read(File.dirname(__FILE__)+"/nadol_blank.po.gz")
+      when :dos33 
+        return DSK.read(File.dirname(__FILE__)+"/dos33_blank.dsk.gz")
+    else 
+        raise "initialisation of #{filesystem} file system not currently supported"
+    end
+  end
+  
+  
 	#read in an existing DSK file (must exist)
 	def DSK.read(filename)
 		#is the file extension .gz?
@@ -46,55 +137,98 @@ class DSK
 			file_bytes=Zlib::GzipReader.new(open(filename,"rb")).read
 		else
 			file_bytes=open(filename,"rb").read
-		end
-		if (file_bytes.length!=DSK_FILE_LENGTH) then
-			abort("#{filename} is not a valid DSK format file")
-		end
-		
+		end
+		
+
 		dsk=DSK.new(file_bytes)		
-		if (dsk.is_dos33?) 
-			require 'DOSDisk'
-			dsk=DOSDisk.new(file_bytes)
-		end
-		
-		if (dsk.is_nadol?) 
-			require 'NADOLDisk'
-			dsk=NADOLDisk.new(file_bytes)
-		end
+		SECTOR_ORDERS.each do |sector_order|
+			begin
+				candidate_filesystem="unknown"
+				if (dsk.is_dos33?(sector_order)) 
+					require 'DOSDisk'
+					candidate_filesystem="DOS 3.3"
+					dsk=DOSDisk.new(file_bytes,sector_order)
+					break
+				end
+				
+				if (dsk.is_nadol?(sector_order)) 
+					require 'NADOLDisk'
+					candidate_filesystem="NADOL"
+					dsk=NADOLDisk.new(file_bytes,sector_order)
+					break
+				end
+				
+				if (dsk.is_prodos?(sector_order))
+					require 'ProDOSDisk'
+					candidate_filesystem="ProDOS"
+					dsk=ProDOSDisk.new(file_bytes,sector_order)
+					break
+				end
+	      
+				if (dsk.is_pascal?(sector_order))
+					require 'PascalDisk'
+					candidate_filesystem="Pascal"
+					dsk=PascalDisk.new(file_bytes,sector_order)
+					break
+				end
 
+			rescue Exception=>e
+				STDERR<<"error while parsing #{filename} as #{candidate_filesystem} (sector order #{sector_order}\n"
+				STDERR<<"#{e}\n"
+				STDERR<<e.backtrace.join("\n")
+			end
+		end
 		dsk
 	end
 
-	def get_sector(track,sector)
-		start_byte=track*16*256+sector*256
+	def get_sector(track,requested_sector,sector_order=@sector_order)
+		raise "bad sector #{requested_sector}" unless requested_sector.between?(0,0x0F)
+		raise "bad sector_order #{sector_order}" if INTERLEAVES[sector_order].nil?
+		physical_sector=INTERLEAVES[sector_order][requested_sector]
+		start_byte=track*16*256+physical_sector*256
 		@file_bytes[start_byte..start_byte+255]
 	end
 
+ def set_sector(track,sector,contents)
+    physical_sector=INTERLEAVES[@sector_order][sector]
+    start_byte=track*16*256+physical_sector*256
+    (0..255).each do |byte|
+      c=(contents[byte] || 0)
+      @file_bytes[start_byte+byte]=c  
+    end  
+end
+
+  #write supplied code to track 0 (from sector 0 to whatever is required)
+  #code should run from $0801 and can be up to 4KB (16 sectors) in length
+  def set_boot_track(contents)
+    sectors_needed=(contents.length / 256)+1
+    raise "boot code can't exceed 16 sectors" if sectors_needed>16
+    s=sectors_needed.chr+contents
+    for sector in 0..sectors_needed-1
+      sector_data=s[sector*256..255+sector*256]
+      set_sector(0,sector,sector_data)
+    end
+  end
+  
+	def get_block(block_no)
+		track=(block_no / 8).to_i
+		first_sector=2*(block_no % 8)
+		raise "illegal block no #{block_no}" if track>=self.track_count
+		return self.get_sector(track,first_sector)+self.get_sector(track,first_sector+1)
+	end
+
 	def files
 		@files
 	end
 
-	#return a formatted hex dump of a single 256 byte sector
+  #return a formatted hex dump of a single 256 byte sector
 	def dump_sector(track,sector)
+    require 'DumpUtilities'
 		start_byte=track.to_i*16*256+sector.to_i*256
 		s=hline
 		s<<sprintf("TRACK: $%02X SECTOR $%02X\ OFFSET $%04X\n",track,sector,start_byte)
-		s<< "\t"
 		sector_data=get_sector(track,sector)
-		(0..15).each {|x| s<<sprintf("%02X ",x) }
-		s<<"\n"
-		s<<hline
-		(0..15).each {|line_number|
-			 lhs=""
-			 rhs=""
-			 start_byte=line_number*16
-			 line=sector_data[start_byte..start_byte+15]
-			 line.each_byte {|byte|
-				  lhs<< sprintf("%02X ", byte)
-				  rhs<< (byte%128).chr.sub(/[\x00-\x1f]/,'.')
-		 	}
-			s<<sprintf("%02X\t%s %s\n",start_byte,lhs,rhs)
-		}
+		s<< DumpUtilities.hex_dump(sector_data)
 		s
 	end
 
@@ -110,7 +244,7 @@ class DSK
 	end
 
 	#return a formatted hex dump of all sectors on all tracks
-	def dump_disk
+	def hex_dump
 		s=""
 		(0..34).each {|track|
 			(0..15).each {|sector|
@@ -126,8 +260,28 @@ private
 		"-"*79+"\n"
 	end
 
+end
+
 
+class DSKTrackSector
+  attr_accessor :track_no,:sector_no,:offset
+  def initialize(track_no,sector_no,offset=0x00)
+    @track_no=track_no
+    @sector_no=sector_no
+    @offset=offset
+  end
+  def to_s 
+    sprintf "TRACK $%02X SECTOR $%02X OFFSET $02X",track_no,sector_no,offset
+  end
+  
+  def <=>(other)
+    return -1 unless other.kind_of?DSKTrackSector
+    return track_no<=>other.track_no unless track_no==other.track_no
+    return sector_no<=>other.sector_no unless sector_no==other.sector_no
+    return offset<=>other.offset
+  end
 end
+
 # == Author
 # Jonno Downes (jonno@jamtronix.com)
 #

data/lib/DSKFile.rb

@@ -0,0 +1,141 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+
+require 'DumpUtilities'
+#Generic Apple II file
+class DSKFile	
+	attr_accessor(:filename,:contents) 
+	def initialize(filename,contents)
+		@filename=filename
+		@contents=contents
+	end
+
+	def to_s
+		@contents
+	end
+
+  def ==(other_object)
+    if  !other_object.kind_of? DSKFile then
+      return false
+    end
+     if self.filename!=other_object.filename then
+       return false
+     end
+    
+    return self.to_s==other_object.to_s
+  end
+  
+	def file_extension
+		".bin"
+	end
+  
+	def hex_dump
+    DumpUtilities.hex_dump(@contents)
+	end
+
+	#default is files can NOT be displayed as a picture
+	def can_be_picture?
+		false
+	end
+  
+  #how many 256 byte sectors does this file require?
+  #excludes any catalog entry or T/S list
+  def length_in_sectors
+    ((255+contents.length)/256)
+  end
+
+# Adapted from FID.C -- a utility to browse Apple II .DSK image files by Paul Schlyter (pausch@saaf.se)
+#
+#Applesoft file format:
+# <Length_of_file> (16-bit little endian)
+# <Line>
+# ......
+# <Line>
+# where <Line> is:
+# <Next addr>  (16-bit little endian)
+# <Line no>    (16-bit little endian: 0-65535)
+# <Tokens and/or characters>
+# <End-of-line marker: $00 >
+#
+	APPLESOFT_TOKENS = [
+	       "END","FOR","NEXT","DATA","INPUT","DEL","DIM","READ",
+		"GR","TEXT","PR#","IN#","CALL","PLOT","HLIN","VLIN",
+		"HGR2","HGR","HCOLOR=","HPLOT","DRAW","XDRAW","HTAB",
+		"HOME","ROT=","SCALE=","SHLOAD","TRACE","NOTRACE",
+		"NORMAL","INVERSE","FLASH","COLOR=","POP","VTAB",
+		"HIMEM=","LOMEM=","ONERR","RESUME","RECALL","STORE",
+		"SPEED=","LET","GOTO","RUN","IF","RESTORE","&","GOSUB",
+		"RETURN","REM","STOP","ON","WAIT","LOAD","SAVE","DEF",
+		"POKE","PRINT","CONT","LIST","CLEAR","GET","NEW",
+		"TAB(","TO","FN","SPC(","THEN","AT","NOT","STEP","+",
+		"-","*","/","^","AND","OR",">","=","<","SGN","INT",
+		"ABS","USR","FRE","SCRN(","PDL","POS","SQR","RND",
+		"LOG","EXP","COS","SIN","TAN","ATN","PEEK","LEN",
+		"STR$","VAL","ASC","CHR$", "LEFT$","RIGHT$","MID$","?",
+		"?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?","?"
+]
+
+	def buffer_as_applesoft_file(buffer)
+
+		length=buffer[0]+buffer[1]*256
+		index=2
+		s=""
+		while (index<length)
+			index+=2 #skip over the "next address" field
+			break if buffer[index].nil?
+			break if buffer[index+1].nil?
+			line_no=buffer[index]+buffer[index+1]*256
+			index+=2 #skip over the "line number" field
+			s+=sprintf("%u",line_no)
+			done_line=false
+			last_char_space=false
+			while (!done_line)			
+				b=buffer[index]
+				break if b.nil?
+				if b>=0x80 then
+					if !last_char_space then
+						s+=" "
+					end
+					s+=APPLESOFT_TOKENS[b-0x80]+" "
+					last_char_space=true
+				else
+					s+=b.chr
+					last_char_space=false
+				end
+				index+=1
+				done_line=(index>=length)||(buffer[index]==0)
+			end
+			s+="\n"
+			index+=1        # skip over "end of line" marker
+		end
+	       s
+	end
+end
+
+
+
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2007 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/DumpUtilities.rb

@@ -0,0 +1,30 @@
+class DumpUtilities
+  
+  def DumpUtilities.hex_dump(buffer)
+   	s=""
+		(0..(buffer.length/16)).each {|line_number|
+			 lhs=""
+			 rhs=""
+			 start_byte=line_number*16
+			 line=buffer[start_byte..start_byte+15]
+			if line.length>0 then
+				 line.each_byte {|byte|
+					  lhs+= sprintf("%02X ", byte)
+					  rhs+= (byte%128).chr.sub(/[\x00-\x1f]/,'.')
+			 	}
+				lhs+=" "*(16-line.length)*3
+				s+=sprintf("%02X\t%s %s\n",start_byte,lhs,rhs)
+			end
+		}
+		s
+  end
+  
+  def DumpUtilities.font_dump(buffer)
+  #treat buffer as a set 8 bit wide characters
+  s=""
+  buffer.each_byte do |byte| 
+      s<<sprintf("%08b\n",byte).tr("1","#").tr("0"," ")
+  end
+  s
+  end
+end

data/lib/HGR.rb

@@ -0,0 +1,136 @@
+#Apple II Hi-Res Graphics routines
+$:.unshift(File.dirname(__FILE__)) unless	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'rubygems'
+gem 'png', '= 1.0.0'
+require 'png'
+#need to add a new method to PNG to get at the raw bytes as the png library only writes to disk
+class PNG
+	def raw_bytes
+		bytes=""
+		bytes<< [137, 80, 78, 71, 13, 10, 26, 10].pack("C*") # PNG signature
+		bytes<< PNG.chunk('IHDR',
+			[ @height, @width, @bits, 6, 0, 0, 0 ].pack("N2C5"))
+		# 0 == filter type code "none"
+		data = @data.map { |row| [0] + row.map { |p| p.values } }.flatten
+		bytes<< PNG.chunk('IDAT', Zlib::Deflate.deflate(data.pack("C*"), 9))
+		bytes<< PNG.chunk('IEND', '')
+		bytes
+	end
+end
+class HGR
+PALLETE_MODES=[:white,:green,:amber,:colour]
+PALLETE={
+	:white=>PNG::Color::White,
+	:green=>PNG::Color.new(0x00, 0x99, 0x00, 0xFF),
+	:amber=>PNG::Color::Orange
+}
+
+#colours cribbed from http://groups.google.com.au/group/comp.sys.apple2/browse_thread/thread/b9aa36ead6935c42/faa0f4df3e89060f
+HGR_BLACK=PNG::Color::Black			#color=0,4
+HGR_GREEN=PNG::Color.new(0x2F,0xB8,0x1F,0xFF)	#color=1
+HGR_VIOLET=PNG::Color.new(0xC8,0x47,0xE4,0xFF)	#color=2
+HGR_WHITE=PNG::Color::White			#color=3,7
+HGR_ORANGE=PNG::Color.new(0xC7,0x70,0x28,0xFF)	#color=5
+HGR_BLUE=PNG::Color.new(0x30,0x8F,0xE3,0xFF)	#color=6
+
+HGR_COLS=40*7
+HGR_ROWS=8*8*3
+SCALE=2
+
+#per Apple // Reference Manual for //e chapter 2, pages 22-35
+#also TechNote - Apple IIe #3 Double High-Resolution Graphics - http://web.pdx.edu/~heiss/technotes/aiie/tn.aiie.03.html
+#HGR screen consists of 3 bands of 8 rows of 8 scanlines
+#for each absolute scanline, what is the offset into screen ram that the 40 bytes for this scanline is stored?
+
+@@scanline_offsets=Array.new(HGR_ROWS)
+
+0.upto(2) do |band|
+		0.upto(7) do |row|						
+			0.upto(7) do |relative_scanline|
+				band_ram_offset=band*40
+				band_scanline_offset=band*64
+				scanline_ram_offset=relative_scanline*1024
+				scanline_scanline_offset=relative_scanline
+				row_ram_offset=128*row
+				row_scanline_offset=8*row
+				scanline_offset=band_scanline_offset+scanline_scanline_offset+row_scanline_offset
+				ram_offset=band_ram_offset+scanline_ram_offset+row_ram_offset								
+				@@scanline_offsets[scanline_offset]=ram_offset
+		end
+	end
+end
+
+
+0.upto(HGR_ROWS-1) do |scanline|
+	puts "no offset defined for scanline #{scanline}" if @@scanline_offsets[scanline].nil?
+end
+	#HGR screen is 8192 bytes stored at either $2000 (page 1) or $4000 (page 2)
+	def HGR.can_be_hgr_screen?(buffer,memory_location=nil)
+	
+	#because only 120 out of every 128 bytes are shown, the last 8 bytes are not needed
+		#in order to save a sector under dos 3.3 it was common to only store 8192=8184 (0x1FF8) bytes
+		#sometimes an extra sector was included by mistake
+			if (buffer.length>=8184 && buffer.length<=8192) && ((memory_location.nil?) || (memory_location==0))
+				return true
+			end
+      
+      if (buffer.length>=8184) && ((memory_location==0x2000) || (memory_location==0x4000))
+				return true
+			end
+		false
+	end
+
+private
+	def HGR.set_pixel(canvas,x,y,colour)
+		0.upto(SCALE-1) do |row|
+			0.upto(SCALE-1) do |col|
+				canvas[x*SCALE+col, y*SCALE+row]= colour
+			end
+		end
+	end
+
+public
+	def HGR.buffer_to_png(buffer,pallete_mode=:amber)
+		canvas = PNG::Canvas.new HGR_COLS*SCALE, HGR_ROWS*SCALE, PNG::Color::Black
+		0.upto(HGR_ROWS-1) do |y|
+			last_bit_set=false
+			0.upto(39) do |x_byte|
+				offset=@@scanline_offsets[y]+x_byte
+				current_byte=buffer[offset]				
+				current_byte=0 if current_byte.nil? #if we overrun the buffer then assume it's black
+				0.upto(6) do |x_bit|
+					x=x_byte*7+x_bit
+					bit_set=((current_byte & (2**x_bit))>0)
+					if (bit_set) then
+						if pallete_mode==:colour then
+							if (last_bit_set) then 
+								#adjacent pixels should both be white
+								set_pixel(canvas,x-1,y,HGR_WHITE) 
+								set_pixel(canvas,x,y,HGR_WHITE)
+							else
+								if current_byte>=0x80 then
+									pallete=[HGR_BLUE,HGR_ORANGE]
+								else
+									pallete=[HGR_VIOLET,HGR_GREEN]
+								end
+								this_pixel_colour=pallete[x%2]
+								set_pixel(canvas,x,y,this_pixel_colour)
+								set_pixel(canvas,x+1,y,this_pixel_colour)
+
+							end
+						else
+							this_pixel_colour=PALLETE[pallete_mode]
+							this_pixel_colour=PALLETE.values[0] if this_pixel_colour.nil?
+							set_pixel(canvas,x,y,this_pixel_colour)
+						end
+					end
+					last_bit_set=bit_set
+				end
+			end
+		end
+		png = PNG.new canvas
+		png.raw_bytes
+	end
+end
+# == Author# Jonno Downes (jonno@jamtronix.com)## == Copyright# Copyright (c) 2007 Jonno Downes (jonno@jamtronix.com)##Permission is hereby granted, free of charge, to any person obtaining#a copy of this software and associated documentation files (the#"Software"), to deal in the Software without restriction, including#without limitation the rights to use, copy, modify, merge, publish,#distribute, sublicense, and/or sell copies of the Software, and to#permit persons to whom the Software is furnished to do so, subject to#the following conditions:# The above copyright notice and this permission notice shall be# included in all copies or substantial portions of the Software.# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.