jpeg 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/ext/jpeg_jpeg.c

@@ -20,6 +20,11 @@ void Init_jpeg_jpeg() {
     rb_define_method(Jpeg, "height", jpeg_jpeg_height, 0);
     rb_define_method(Jpeg, "size", jpeg_jpeg_size, 0);
 }
+void jpeg_jpeg_exit(j_common_ptr jpeg) {
+    char buffer[JMSG_LENGTH_MAX];
+    jpeg->err->format_message(jpeg, buffer);
+    rb_raise(rb_eRuntimeError, buffer);
+}
 
 static VALUE jpeg_jpeg_alloc(VALUE klass) {
     struct jpeg_jpeg *jpeg = ALLOC(struct jpeg_jpeg);
@@ -27,6 +32,7 @@ static VALUE jpeg_jpeg_alloc(VALUE klass) {
     jpeg->read = (void *)ALLOC(struct jpeg_decompress_struct);
     jpeg->error = (void *)ALLOC(struct jpeg_error_mgr);
     jpeg->read->err = jpeg_std_error(jpeg->error);
+    jpeg->error->error_exit = jpeg_jpeg_exit;
     jpeg_create_decompress(jpeg->read);
 
     return Data_Wrap_Struct(klass, jpeg_jpeg_mark, jpeg_jpeg_free, jpeg);
@@ -38,7 +44,7 @@ static void jpeg_jpeg_mark(struct jpeg_jpeg *p) {
 
 static void jpeg_jpeg_free(struct jpeg_jpeg *p) {
     if (p->read) {
-        jpeg_destroy_compress(p->read);
+        jpeg_destroy_decompress(p->read);
         free(p->read);
     }
     if (p->error) {
@@ -63,6 +69,7 @@ static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE self) {
         rb_raise(rb_eRuntimeError, "Open file failed");
     }
     jpeg_stdio_src(p_jpeg->read, fp);
+
     jpeg_read_header(p_jpeg->read, TRUE);
     jpeg_start_decompress(p_jpeg->read);
     fclose(fp);

data/jpeg.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "jpeg"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masarakki"]
@@ -35,12 +35,13 @@ Gem::Specification.new do |s|
     "lib/jpeg.rb",
     "spec/jpeg_spec.rb",
     "spec/samples/sample.jpg",
+    "spec/samples/sample.png",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/masarakki/jpeg"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.10"
   s.summary = "libjpeg wrapper for ruby"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84836770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *84836770
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84836420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *84836420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84835960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *84835960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84835420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *84835420
 description: libjpeg wrapper for ruby
 email: masaki@hisme.net
 executables: []
@@ -101,6 +81,7 @@ files:
 - lib/jpeg.rb
 - spec/jpeg_spec.rb
 - spec/samples/sample.jpg
+- spec/samples/sample.png
 - spec/spec_helper.rb
 homepage: http://github.com/masarakki/jpeg
 licenses:
@@ -117,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1096099433015947738
+      hash: -591377119
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: libjpeg wrapper for ruby