rapngasm 3.1.7 → 3.2.0.pre2

data/ext/rapngasm/extconf.rb

@@ -1,13 +1,28 @@
-require 'rubygems'
-require 'mkmf-rice'
+require 'mkmf'
 
-$CFLAGS = '-x c++'
-$LOCAL_LIBS = '-lapngasm'
+return unless have_library('stdc++') # make sure we don't have some funny system
 
-dir_config 'apngasm'
+$stdout.write 'Checking for APNGAsm.'
+if have_library('apngasm')
+  $stdout.write 'APNGAsm found, building RAPNGAsm.'
+else
+  $stdout.write 'APNGAsm NOT found. Please install libapngasm.'
+  exit 1
+end
 
-# if have_header('apngasm.h')
-create_makefile 'rapngasm'
-# else
-#   puts 'apngasm is not installed or the headers are not in the system path.'
-# end
+#find header location
+header_loc = `echo '#include <apngasm-conf.h>' | gcc -xc - -E`
+header_loc = header_loc.to_s.match(".*apngasm-conf\.h")
+header_loc = header_loc.to_s.match("\/.*\/")
+$stdout.write "\nAPNGAsm config header found in: #{header_loc.to_s}"
+
+dir_config('rapngasm')
+
+$stdout.write "\nGenerating native interface wrappers with SWIG\n"
+$stdout.write "Using SWIG from #{`which swig`}\n"
+$stdout.write "Generating wrapper sources from #{File.expand_path(File.dirname(__FILE__))}/apngasm.i\n"
+`swig -c++ -ruby -I#{header_loc.to_s} #{File.expand_path(File.dirname(__FILE__))}/apng.i`
+$stdout.write 'Wrappers generated'
+$distcleanfiles += ['apngasm_wrap.cxx']
+
+create_makefile('rapngasm')

data/rapngasm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rapngasm'
-  s.version     = '3.1.7'
+  s.version     = '3.2.0.pre2'
   s.license     = 'libpng/zlib'
   s.summary     = 'apngasm for Ruby'
   s.description = 'Ruby native extension for the apngasm APNG Assembler.'
@@ -8,18 +8,13 @@ Gem::Specification.new do |s|
   s.email       = 'zero@genshin.org'
   s.homepage    = 'http://www.github.com/apngasm/rapngasm'
 
-  s.files       = Dir.glob('ext/**/*.{h,c,cpp,rb}') +
+  s.files       = Dir.glob('ext/**/*') +
                   Dir.glob('lib/**/*.rb') +
                   Dir.glob('vendor/**/*') +
                   ['rapngasm.gemspec']
 
   s.extensions << 'ext/rapngasm/extconf.rb'
-  s.require_paths = ['lib', 'ext']
-  
-  # As of 3.1.7 we will expect full native compilation.
-  # This is to avoid version issues. Precompiled native gems
-  # would be nice if we could version lock them to native lib
-  # versions...
-  s.add_development_dependency 'rake-compiler', '~> 0.9', '~> 0.9.5'
-  s.add_development_dependency 'rice', '~> 1.7', '~> 1.7.0'
+  s.require_paths = ['lib']
+ 
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapngasm
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.2.0.pre2
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -18,9 +18,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,29 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: rice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 description: Ruby native extension for the apngasm APNG Assembler.
 email: zero@genshin.org
 executables: []
@@ -58,9 +32,9 @@ extensions:
 - ext/rapngasm/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/rapngasm/apngasm_ruby.h
+- ext/rapngasm/apng.i
+- ext/rapngasm/apng_wrap.cxx
 - ext/rapngasm/extconf.rb
-- ext/rapngasm/rapngasm.cpp
 - rapngasm.gemspec
 homepage: http://www.github.com/apngasm/rapngasm
 licenses:
@@ -70,7 +44,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -78,9 +51,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/ext/rapngasm/apngasm_ruby.h

@@ -1,5 +0,0 @@
-#ifndef _APNGASM_RUBY_
-#define _APNGASM_RUBY_
-
-
-#endif /* _APNGASM_RUBY_ */

data/ext/rapngasm/rapngasm.cpp

@@ -1,124 +0,0 @@
-//#include <apngasm_ruby.h>
-
-#include <apngasm.h>
-#include <apngframe.h>
-#include "rice/Data_Type.hpp"
-#include "rice/Class.hpp"
-#include "rice/Constructor.hpp"
-#include "rice/Array.hpp"
-
-using namespace Rice;
-using namespace apngasm;
-
-template<>
-Object to_ruby< std::vector<APNGFrame> > (std::vector<APNGFrame> const & x)
-{
-  std::vector<APNGFrame> v = x;
-  Array a;
-
-  for (std::vector<APNGFrame>::iterator vi = v.begin(); vi != v.end(); ++vi)
-    a.push(to_ruby<APNGFrame> (*vi));
-
-  return a;
-}
-
-template<>
-rgb* from_ruby< rgb* > (Object o)
-{ 
-  Array a(o);
-  rgb* rgbArray = (rgb*)malloc(a.size() * 3);
-
-  for (unsigned int i = 0; i < a.size(); i++)
-  {
-      Array array(a[i]);
-      rgb r = { from_ruby<unsigned char>(array[0]), from_ruby<unsigned char>(array[1]),
-                from_ruby<unsigned char>(array[2]) };
-      rgbArray[i] = r;
-  }
-
-  return rgbArray;
-	return NULL;
-}
-
-template<>
-rgba* from_ruby< rgba* > (Object o)
-{ 
-  Array a(o);
-  rgba* rgbaArray = (rgba*)malloc(a.size() * 4);
-
-  for (unsigned int i = 0; i < a.size(); i++)
-  {
-      Array array(a[i]);
-      rgba r = { from_ruby<unsigned char>(array[0]), from_ruby<unsigned char>(array[1]),
-                 from_ruby<unsigned char>(array[2]), from_ruby<unsigned char>(array[3]) };
-      rgbaArray[i] = r;
-  }
-
-  return rgbaArray;
-}
-
-template<>
-const std::string& from_ruby< const std::string& > (Object o)
-{
-  static std::string tmp;
-  String str(o);
-  tmp.clear();
-  tmp.append(str.c_str());
-  return tmp;
-}
-
-//size_t APNGAsm::wrap_add_frame_rgb(Object pixels, unsigned int width, unsigned int height, Object trns_color = NULL, unsigned delayNum = DEFAULT_FRAME_NUMERATOR, unsigned delayDen = DEFAULT_FRAME_DENOMINATOR) {
-//	return this.addFrame(from_ruby<rgb*>(pixels), width, height, from_ruby<rgb*>(trns_color), delayNum, delayDen);
-//}
-
-extern "C"
-void Init_rapngasm()
-{
-	define_class<APNGFrame>("APNGFrame")
-		.define_constructor(Constructor<APNGFrame>())
-		.define_method("pixels", &APNGFrame::pixels, (Arg("pixels") = NULL))
-		.define_method("width", &APNGFrame::width, (Arg("width") = 0))
-		.define_method("height", &APNGFrame::height, (Arg("height") = 0))
-		.define_method("color_type", &APNGFrame::colorType, (Arg("color_type") = 255))
-		.define_method("palette", &APNGFrame::palette, (Arg("palette") = NULL))
-		.define_method("transparency", &APNGFrame::transparency, (Arg("transparency") = NULL))
-		.define_method("palettes_size", &APNGFrame::paletteSize, (Arg("palettes_size") = 0))
-		.define_method("transparency_size", &APNGFrame::transparencySize, (Arg("transparency_size") = NULL))
-		.define_method("delay_numerator", &APNGFrame::delayNum, (Arg("delay_numerator") = 0))
-		.define_method("delay_denominator", &APNGFrame::delayDen, (Arg("delay_denominator") = 0))
-		.define_method("rows", &APNGFrame::rows, (Arg("rows") = NULL))
-		.define_method("save", &APNGFrame::save, (Arg("out_path")));
-
-	typedef size_t (APNGAsm::*add_frame_object)(const APNGFrame&);
-	typedef size_t (APNGAsm::*add_frame_file)(const std::string&, unsigned, unsigned);
-  typedef size_t (APNGAsm::*add_frame_rgb)(rgb*, unsigned int, unsigned int, rgb*, unsigned, unsigned);
-  typedef size_t (APNGAsm::*add_frame_rgba)(rgba*, unsigned int, unsigned int, unsigned, unsigned);
-	define_class<APNGAsm>("APNGAsm")
-		.define_constructor(Constructor<APNGAsm>())
-		.define_method("assemble", &APNGAsm::assemble)
-		.define_method("disassemble", &APNGAsm::disassemble)
-		.define_method("load_animation_spec", &APNGAsm::loadAnimationSpec)
-		.define_method("save_pngs", &APNGAsm::savePNGs)
-		.define_method("save_json", &APNGAsm::saveJSON)
-		.define_method("save_xml", &APNGAsm::saveXML)
-		//.define_method("set_apngasm_listener", &APNGAsm::setAPNGAsmListener)
-		.define_method("get_frames", &APNGAsm::getFrames)
-		.define_method("frame_count", &APNGAsm::frameCount)
-    .define_method("set_loops", &APNGAsm::setLoops, Arg("loops") = 0)
-    .define_method("set_skip_first", &APNGAsm::setSkipFirst, Arg("skip_first"))
-    .define_method("get_loops", &APNGAsm::getLoops)
-    .define_method("is_skip_first", &APNGAsm::isSkipFirst)
-		.define_method("reset", &APNGAsm::reset)
-		.define_method("version", &APNGAsm::version)
-		.define_method("add_frame", add_frame_object(&APNGAsm::addFrame))
-		.define_method("add_frame_file", add_frame_file(&APNGAsm::addFrame),
-						(Arg("file_path"), Arg("delay_numerator") = DEFAULT_FRAME_NUMERATOR,
-						 Arg("delay_denominator") = DEFAULT_FRAME_DENOMINATOR))
-		.define_method("add_frame_rgb", add_frame_rgb(&APNGAsm::addFrame),
-						(Arg("pixels"), Arg("width"), Arg("height"), Arg("trns_color") = NULL,
-						Arg("delay_numerator") = DEFAULT_FRAME_NUMERATOR,
-						Arg("delay_denominator") = DEFAULT_FRAME_DENOMINATOR))
-		.define_method("add_frame_rgba", add_frame_rgba(&APNGAsm::addFrame),
-						(Arg("pixels"), Arg("width"), Arg("height"),
-						Arg("delay_numerator") = DEFAULT_FRAME_NUMERATOR, Arg("delay_denominator") = DEFAULT_FRAME_DENOMINATOR));
-}