rmagick 5.3.0 → 5.4.4

data/ext/RMagick/{rminfo.c → rminfo.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rminfo.c
- * @version  $Id: rminfo.c,v 1.79 2009/12/20 02:33:33 baror Exp $
+ * @file     rminfo.cpp
+ * @version  $Id: rminfo.cpp,v 1.79 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -255,7 +255,7 @@ Info_aref(int argc, VALUE *argv, VALUE self)
 {
     Info *info;
     char *format_p, *key_p;
-    long format_l, key_l;
+    size_t format_l, key_l;
     const char *value;
     char fkey[MaxTextExtent];
 
@@ -318,7 +318,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
     Info *info;
     VALUE value;
     char *format_p, *key_p, *value_p = NULL;
-    long format_l, key_l;
+    size_t format_l, key_l;
     char ckey[MaxTextExtent];
 
     TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
@@ -686,7 +686,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     Info *info;
     char *format, *key;
     const char *value = "";
-    long format_l, key_l;
+    size_t format_l, key_l;
     char ckey[100];
     unsigned int okay;
     VALUE fmt_arg;
@@ -1835,7 +1835,7 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
 {
     Info *info;
     char *sampling_factor_p = NULL;
-    long sampling_factor_len = 0;
+    size_t sampling_factor_len = 0;
 
     TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
@@ -1888,7 +1888,7 @@ Info_scene_eq(VALUE self, VALUE scene)
     TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     info->scene = NUM2ULONG(scene);
 
-    snprintf(buf, sizeof(buf), "%"RMIuSIZE"", info->scene);
+    snprintf(buf, sizeof(buf), "%" RMIuSIZE "", info->scene);
     SetImageOption(info, "scene", buf);
 
     return scene;
@@ -2175,7 +2175,7 @@ Info_undefine(VALUE self, VALUE format, VALUE key)
 {
     Info *info;
     char *format_p, *key_p;
-    long format_l, key_l;
+    size_t format_l, key_l;
     char fkey[MaxTextExtent];
 
     format_p = rm_str2cstr(format, &format_l);
@@ -2350,11 +2350,11 @@ Info_memsize(const void *infoptr)
  *
  * No Ruby usage (internal function)
  *
- * @param class the Ruby class to use
+ * @param klass the Ruby class to use
  * @return a new ImageInfo object
  */
 VALUE
-Info_alloc(VALUE class)
+Info_alloc(VALUE klass)
 {
     Info *info;
     VALUE info_obj;
@@ -2364,7 +2364,7 @@ Info_alloc(VALUE class)
     {
         rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
     }
-    info_obj = TypedData_Wrap_Struct(class, &rm_info_data_type, info);
+    info_obj = TypedData_Wrap_Struct(klass, &rm_info_data_type, info);
 
     RB_GC_GUARD(info_obj);
 

data/ext/RMagick/{rmkinfo.c → rmkinfo.cpp}

@@ -3,8 +3,8 @@
  *
  * Copyright © RMagick Project
  *
- * @file rmkinfo.c
- * @version $Id: rmkinfo.c,v 1.0 2011/11/29 15:33:14 naquad Exp $
+ * @file rmkinfo.cpp
+ * @version $Id: rmkinfo.cpp,v 1.0 2011/11/29 15:33:14 naquad Exp $
  * @author Naquad
  ****************************************************************************/
 
@@ -20,11 +20,6 @@ const rb_data_type_t rm_kernel_info_data_type = {
     RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
-/* UnityAddKernelInfo() was private function until IM 6.9 */
-MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
-/* ScaleKernelInfo() was private function until IM 6.9 */
-MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor, const GeometryFlags normalize_flags);
-
 DEFINE_GVL_VOID_STUB2(UnityAddKernelInfo, KernelInfo *, const double);
 DEFINE_GVL_VOID_STUB3(ScaleKernelInfo, KernelInfo *, const double, const GeometryFlags);
 DEFINE_GVL_VOID_STUB2(ScaleGeometryKernelInfo, KernelInfo *, const char *);
@@ -64,9 +59,9 @@ rm_kernel_info_memsize(const void *ptr)
  * @return [Magick::KernelInfo] a new KernelInfo object
  */
 VALUE
-KernelInfo_alloc(VALUE class)
+KernelInfo_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(class, &rm_kernel_info_data_type, NULL);
+    return TypedData_Wrap_Struct(klass, &rm_kernel_info_data_type, NULL);
 }
 
 /**