rgd 0.4.1a → 0.4.2

data/ext/rgd/gd_playground/gdhelpers.h

@@ -1,61 +1,61 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef GDHELPERS_H
-#define GDHELPERS_H 1
-
-/* sys/types.h is needed for size_t on Sparc-SunOS-4.1 */
-#include <sys/types.h>
-
-/* TBB: strtok_r is not universal; provide an implementation of it. */
-
- char * gd_strtok_r (char *s, char *sep, char **state);
-
-/* These functions wrap memory management. gdFree is
-	in gd.h, where callers can utilize it to correctly
-	free memory allocated by these functions with the
-	right version of free(). */
-void *gdCalloc (size_t nmemb, size_t size);
-void *gdMalloc (size_t size);
-void *gdRealloc (void *ptr, size_t size);
-
-/* Returns nonzero if multiplying the two quantities will
-	result in integer overflow. Also returns nonzero if 
-	either quantity is negative. By Phil Knirsch based on
-	netpbm fixes by Alan Cox. */
-
-int overflow2(int a, int b);
-
-/* 2.0.16: portable mutex support for thread safety. */
-
-#ifdef WIN32
-/* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
-#include <windows.h>
-#define gdMutexDeclare(x) CRITICAL_SECTION x
-#define gdMutexSetup(x) InitializeCriticalSection(&x)
-#define gdMutexShutdown(x) DeleteCriticalSection(&x)
-#define gdMutexLock(x) EnterCriticalSection(&x)
-#define gdMutexUnlock(x) LeaveCriticalSection(&x)
-#else
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-#define gdMutexDeclare(x) pthread_mutex_t x
-#define gdMutexSetup(x) pthread_mutex_init(&x, 0)
-#define gdMutexShutdown(x) pthread_mutex_destroy(&x)
-#define gdMutexLock(x) pthread_mutex_lock(&x)
-#define gdMutexUnlock(x) pthread_mutex_unlock(&x)
-#else
-#define gdMutexDeclare(x)
-#define gdMutexSetup(x) 
-#define gdMutexShutdown(x) 
-#define gdMutexLock(x) 
-#define gdMutexUnlock(x) 
-#endif /* HAVE_PTHREAD */
-#endif /* WIN32 */
-
-#endif /* GDHELPERS_H */
-
-#ifdef __cplusplus
-}
-#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef GDHELPERS_H
+#define GDHELPERS_H 1
+
+/* sys/types.h is needed for size_t on Sparc-SunOS-4.1 */
+#include <sys/types.h>
+
+/* TBB: strtok_r is not universal; provide an implementation of it. */
+
+ char * gd_strtok_r (char *s, char *sep, char **state);
+
+/* These functions wrap memory management. gdFree is
+	in gd.h, where callers can utilize it to correctly
+	free memory allocated by these functions with the
+	right version of free(). */
+void *gdCalloc (size_t nmemb, size_t size);
+void *gdMalloc (size_t size);
+void *gdRealloc (void *ptr, size_t size);
+
+/* Returns nonzero if multiplying the two quantities will
+	result in integer overflow. Also returns nonzero if 
+	either quantity is negative. By Phil Knirsch based on
+	netpbm fixes by Alan Cox. */
+
+int overflow2(int a, int b);
+
+/* 2.0.16: portable mutex support for thread safety. */
+
+#ifdef WIN32
+/* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
+#include <windows.h>
+#define gdMutexDeclare(x) CRITICAL_SECTION x
+#define gdMutexSetup(x) InitializeCriticalSection(&x)
+#define gdMutexShutdown(x) DeleteCriticalSection(&x)
+#define gdMutexLock(x) EnterCriticalSection(&x)
+#define gdMutexUnlock(x) LeaveCriticalSection(&x)
+#else
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+#define gdMutexDeclare(x) pthread_mutex_t x
+#define gdMutexSetup(x) pthread_mutex_init(&x, 0)
+#define gdMutexShutdown(x) pthread_mutex_destroy(&x)
+#define gdMutexLock(x) pthread_mutex_lock(&x)
+#define gdMutexUnlock(x) pthread_mutex_unlock(&x)
+#else
+#define gdMutexDeclare(x)
+#define gdMutexSetup(x) 
+#define gdMutexShutdown(x) 
+#define gdMutexLock(x) 
+#define gdMutexUnlock(x) 
+#endif /* HAVE_PTHREAD */
+#endif /* WIN32 */
+
+#endif /* GDHELPERS_H */
+
+#ifdef __cplusplus
+}
+#endif

data/ext/rgd/rgd.c

@@ -2970,6 +2970,7 @@ void Init_rgd() {
     rb_define_method(rb_cImage, "data", image_data, -1);
     rb_define_method(rb_cImage, "clone", image_clone, 0);
     rb_define_method(rb_cImage, "to_palette", image_to_palette, -1);
+    rb_define_alias(rb_cImage, "text", "stringft");
 
     // Init
     gdFontCacheSetup();

data/lib/rgd.rb

@@ -1,2 +1,3 @@
 # coding: utf-8
+require 'rgd/version'
 require "rgd/#{RUBY_VERSION.sub(/\.\d+$/, '')}/rgd"

data/lib/rgd/version.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+
+module RGD
+  VERSION = '0.4.2'
+end

data/test/main.rb

@@ -1,6 +1,11 @@
 # coding: utf-8
+
+FILE_PATH = File.expand_path(__FILE__)
+FILE_DIR = File.dirname(FILE_PATH)
+
 begin
-  require File.join(File.dirname(File.expand_path(__FILE__)), '../ext/rgd/rgd')
+  require File.join(FILE_DIR, '../ext/rgd/rgd')
+  require File.join(FILE_DIR, '../lib/rgd/version')
 rescue Exception => e
   require 'rubygems'
   require 'rgd'
@@ -8,12 +13,12 @@ end
 
 $:.push '.'
 
-if ARGV.length >= 1 && File.expand_path(__FILE__) != File.expand_path(ARGV[0]) then
+if ARGV.length >= 1 && FILE_PATH != File.expand_path(ARGV[0]) then
   load(ARGV[0])
   exit
 end
 
-Dir.chdir(File.dirname(File.expand_path(__FILE__))) do;Dir.glob('test*.rb') do |fn|
+Dir.chdir(FILE_DIR) do;Dir.glob('test*.rb') do |fn|
   begin
     load(fn)
   rescue Exception => e

data/test/test_copy_rotated.rb

@@ -7,7 +7,6 @@ m.filled_ellipse(25, 25, 30, 40, 0x50FFFFFF)
 
 n = RGD::Image.create_truecolor(50, 50)
 n.copy_rotated(m, 25, 25, 0, 0, 50, 50, 60)
-n.png('t.png')
 
 basename = File.basename(__FILE__, '.rb')
 t = RGD::Image.new(basename + '.png')

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgd
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 4
-  - 1a
-  version: 0.4.1a
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - oCameLo
@@ -25,18 +25,19 @@ executables: []
 extensions: 
 - ext/rgd/extconf.rb
 extra_rdoc_files: 
-- README
-- COPYING
+- README.rdoc
+- COPYING.rdoc
 files: 
 - BSDL
-- COPYING
+- COPYING.rdoc
 - Rakefile
-- README
+- README.rdoc
 - ext/rgd/extconf.rb
 - ext/rgd/gd_playground/bmp.h
 - ext/rgd/gd_playground/gdhelpers.h
 - ext/rgd/gd_playground/gd_bmp.c
 - ext/rgd/rgd.c
+- lib/rgd/version.rb
 - lib/rgd.rb
 - test/main.rb
 - test/mtest_stringft_cn.png
@@ -78,7 +79,7 @@ files:
 - test/test_tiled.png
 - test/test_tiled.rb
 has_rdoc: true
-homepage: http://otnth.blogspot.com
+homepage: https://github.com/oTnTh/rgd
 licenses: []
 
 post_install_message: 
@@ -97,13 +98,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: