chunky_png 0.7.1 → 0.7.3

data/chunky_png.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
 
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "0.7.1"
-  s.date    = "2010-03-23"
+  s.version = "0.7.3"
+  s.date    = "2010-04-29"
 
   s.summary     = "Pure ruby library for read/write, chunk-level access to PNG files"
   s.description = <<-EOT

data/lib/chunky_png.rb

@@ -27,7 +27,7 @@ module ChunkyPNG
 
   # The current version of ChunkyPNG. This value will be updated automatically
   # by them gem:release rake task.
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 
   ###################################################
   # PNG international standard defined constants
@@ -51,4 +51,30 @@ module ChunkyPNG
   FILTER_UP             = 2
   FILTER_AVERAGE        = 3
   FILTER_PAETH          = 4
+  
+  ###################################################
+  # ChunkyPNG exception classes
+  ###################################################
+  
+  # Default exception class for ChunkyPNG
+  class Exception < ::StandardError
+  end
+  
+  # Exception that is raised for an unsopported PNG image.
+  class NotSupported < ChunkyPNG::Exception
+  end
+  
+  # Exception that is raised if the PNG signature is not encountered at the 
+  # beginning of the file.
+  class SignatureMismatch < ChunkyPNG::Exception
+  end
+
+  # Exception that is raised if the CRC check for a block failes
+  class CRCMismatch < ChunkyPNG::Exception
+  end
+
+  
+  # Exception that is raised if an expectation fails.
+  class ExpectationFailed < ChunkyPNG::Exception
+  end  
 end

data/lib/chunky_png/canvas.rb

@@ -64,7 +64,7 @@ module ChunkyPNG
       elsif initial.kind_of?(Array) && initial.size == width * height
         @pixels = initial
       else
-        raise "Cannot use this value as initial canvas: #{initial.inspect}!"
+        raise ChunkyPNG::ExpectationFailed, "Cannot use this value as initial canvas: #{initial.inspect}!"
       end
     end
     

data/lib/chunky_png/canvas/operations.rb

@@ -53,15 +53,15 @@ module ChunkyPNG
       end
       
       def change_mask_color!(new_color)
-        raise "This is not a mask image!" if palette.opaque_palette.size != 1
+        raise ChunkyPNG::ExpectationFailed, "This is not a mask image!" if palette.opaque_palette.size != 1
         pixels.map! { |pixel| (new_color & 0xffffff00) | ChunkyPNG::Color.a(pixel) }
       end
 
       protected
 
       def check_size_constraints!(other, offset_x, offset_y)
-        raise "Background image width is too small!"  if width  < other.width  + offset_x
-        raise "Background image height is too small!" if height < other.height + offset_y
+        raise ChunkyPNG::ExpectationFailed, "Background image width is too small!"  if width  < other.width  + offset_x
+        raise ChunkyPNG::ExpectationFailed, "Background image height is too small!" if height < other.height + offset_y
       end
     end
   end

data/lib/chunky_png/canvas/png_decoding.rb

@@ -61,7 +61,7 @@ module ChunkyPNG
       # @param [ChunkyPNG::Datastream] ds The datastream to decode.
       # @return [ChunkyPNG::Canvas] The canvas decoded from the PNG datastream.
       def from_datastream(ds)
-        raise "Only 8-bit color depth is currently supported by ChunkyPNG!" unless ds.header_chunk.depth == 8
+        raise ChunkyPNG::NotSupported, "Only 8-bit color depth is currently supported by ChunkyPNG!" unless ds.header_chunk.depth == 8
 
         width      = ds.header_chunk.width
         height     = ds.header_chunk.height
@@ -83,12 +83,12 @@ module ChunkyPNG
       # @param [Integer] interlace The interlace method of the encoded pixelstream.
       # @return [ChunkyPNG::Canvas] The decoded Canvas instance.
       def decode_png_pixelstream(stream, width, height, color_mode = ChunkyPNG::COLOR_TRUECOLOR, interlace = ChunkyPNG::INTERLACING_NONE)
-        raise "This palette is not suitable for decoding!" if decoding_palette && !decoding_palette.can_decode?
+        raise ChunkyPNG::ExpectationFailed, "This palette is not suitable for decoding!" if decoding_palette && !decoding_palette.can_decode?
 
         return case interlace
           when ChunkyPNG::INTERLACING_NONE  then decode_png_without_interlacing(stream, width, height, color_mode)
           when ChunkyPNG::INTERLACING_ADAM7 then decode_png_with_adam7_interlacing(stream, width, height, color_mode)
-          else raise "Don't know how the handle interlacing method #{interlace}!"
+          else raise ChunkyPNG::NotSupported, "Don't know how the handle interlacing method #{interlace}!"
         end
       end
 
@@ -146,13 +146,13 @@ module ChunkyPNG
           when ChunkyPNG::COLOR_INDEXED         then lambda { |bytes| decoding_palette[bytes.first] }
           when ChunkyPNG::COLOR_GRAYSCALE       then lambda { |bytes| ChunkyPNG::Color.grayscale(*bytes) }
           when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then lambda { |bytes| ChunkyPNG::Color.grayscale_alpha(*bytes) }
-          else raise "No suitable pixel decoder found for color mode #{color_mode}!"
+          else raise ChunkyPNG::NotSupported, "No suitable pixel decoder found for color mode #{color_mode}!"
         end
         
         pixels = []
         if width > 0
           
-          raise "Invalid stream length!" unless stream.length - start_pos >= width * height * pixel_size + height
+          raise ChunkyPNG::ExpectationFailed, "Invalid stream length!" unless stream.length - start_pos >= width * height * pixel_size + height
           
           decoded_bytes = Array.new(width * pixel_size, 0)
           for line_no in 0...height do
@@ -193,7 +193,7 @@ module ChunkyPNG
         when ChunkyPNG::FILTER_UP      then decode_png_scanline_up(      bytes, previous_bytes, pixelsize)
         when ChunkyPNG::FILTER_AVERAGE then decode_png_scanline_average( bytes, previous_bytes, pixelsize)
         when ChunkyPNG::FILTER_PAETH   then decode_png_scanline_paeth(   bytes, previous_bytes, pixelsize)
-        else raise "Unknown filter type"
+        else raise ChunkyPNG::NotSupported, "Unknown filter type: #{filter}!"
         end
       end
 

data/lib/chunky_png/canvas/png_encoding.rb

@@ -125,13 +125,13 @@ module ChunkyPNG
       def encode_png_pixelstream(color_mode = ChunkyPNG::COLOR_TRUECOLOR, interlace = ChunkyPNG::INTERLACING_NONE, compression = ZLib::DEFAULT_COMPRESSION)
 
         if color_mode == ChunkyPNG::COLOR_INDEXED && (encoding_palette.nil? || !encoding_palette.can_encode?)
-          raise "This palette is not suitable for encoding!"
+          raise ChunkyPNG::ExpectationFailed, "This palette is not suitable for encoding!"
         end
 
         case interlace
           when ChunkyPNG::INTERLACING_NONE  then encode_png_image_without_interlacing(color_mode, compression)
           when ChunkyPNG::INTERLACING_ADAM7 then encode_png_image_with_interlacing(color_mode, compression)
-          else raise "Unknown interlacing method!"
+          else raise ChunkyPNG::NotSupported, "Unknown interlacing method: #{interlace}!"
         end
       end
 
@@ -188,7 +188,7 @@ module ChunkyPNG
             when ChunkyPNG::COLOR_INDEXED         then lambda { |color| [encoding_palette.index(color)] }
             when ChunkyPNG::COLOR_GRAYSCALE       then lambda { |color| Color.to_grayscale_bytes(color) }
             when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then lambda { |color| Color.to_grayscale_alpha_bytes(color) }
-            else raise "Cannot encode pixels for this mode: #{color_mode}!"
+            else raise ChunkyPNG::NotSupported, "Cannot encode pixels for this mode: #{color_mode}!"
           end
 
           previous_bytes = Array.new(pixel_size * width, 0)
@@ -223,7 +223,7 @@ module ChunkyPNG
         when ChunkyPNG::FILTER_UP      then encode_png_scanline_up(      bytes, previous_bytes, pixelsize)
         when ChunkyPNG::FILTER_AVERAGE then encode_png_scanline_average( bytes, previous_bytes, pixelsize)
         when ChunkyPNG::FILTER_PAETH   then encode_png_scanline_paeth(   bytes, previous_bytes, pixelsize)
-        else raise "Unknown filter type"
+        else raise ChunkyPNG::NotSupported, "Unknown filter type: #{filter}!"
         end
       end
 

data/lib/chunky_png/chunk.rb

@@ -36,7 +36,7 @@ module ChunkyPNG
     #    is not equal to the expected CRC value.
     def self.verify_crc!(type, content, found_crc)
       expected_crc = Zlib.crc32(content, Zlib.crc32(type))
-      raise "Chuck CRC mismatch!" if found_crc != expected_crc
+      raise ChunkyPNG::CRCMismatch, "Chuck CRC mismatch!" if found_crc != expected_crc
     end
 
     # The base chunk class is the superclass for every chunk type. It contains
@@ -246,7 +246,7 @@ module ChunkyPNG
 
       def self.read(type, content)
         keyword, compression, value = content.unpack('Z*Ca*')
-        raise "Compression method #{compression.inspect} not supported!" unless compression == ChunkyPNG::COMPRESSION_DEFAULT
+        raise ChunkyPNG::NotSupported, "Compression method #{compression.inspect} not supported!" unless compression == ChunkyPNG::COMPRESSION_DEFAULT
         new(keyword, Zlib::Inflate.inflate(value))
       end
 

data/lib/chunky_png/color.rb

@@ -82,7 +82,7 @@ module ChunkyPNG
       case str
         when /^(?:#|0x)?([0-9a-f]{6})$/i then ($1.hex << 8) | 0xff
         when /^(?:#|0x)?([0-9a-f]{8})$/i then $1.hex
-        else raise "Not a valid hex color notation: #{str.inspect}!"
+        else raise ChunkyPNG::ExpectationFailed, "Not a valid hex color notation: #{str.inspect}!"
       end
     end
 
@@ -396,7 +396,7 @@ module ChunkyPNG
         when ChunkyPNG::COLOR_TRUECOLOR_ALPHA then 4
         when ChunkyPNG::COLOR_GRAYSCALE       then 1
         when ChunkyPNG::COLOR_GRAYSCALE_ALPHA then 2
-        else raise "Don't know the bytesize of pixels in this colormode: #{color_mode}!"
+        else raise ChunkyPNG::NotSupported, "Don't know the bytesize of pixels in this colormode: #{color_mode}!"
       end
     end
   end

data/lib/chunky_png/datastream.rb

@@ -98,7 +98,9 @@ module ChunkyPNG
       #    the beginning of the stream.
       def verify_signature!(io)
         signature = io.read(ChunkyPNG::Datastream::SIGNATURE.length)
-        raise "PNG signature not found!" unless signature == ChunkyPNG::Datastream::SIGNATURE
+        unless signature == ChunkyPNG::Datastream::SIGNATURE
+          raise ChunkyPNG::SignatureMismatch, "PNG signature not found!"
+        end
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency