pdfimage.c in tioga-1.6

- old
+ new

@@ -258,11 +258,11 @@
    Get_Image_Dest(p, image_destination, dest);
    width = rb_Integer(width);
    height = rb_Integer(height);
    mask_obj_num = rb_Integer(mask_obj_num);
    filename = rb_String(filename);
-   c_show_jpg(p, RSTRING(filename)->ptr, NUM2INT(width), NUM2INT(height), dest, NUM2INT(mask_obj_num));
+   c_show_jpg(p, RSTRING_PTR(filename), NUM2INT(width), NUM2INT(height), dest, NUM2INT(mask_obj_num));
    return fmkr;
 }
 
 VALUE c_private_create_image_data(FM *p, double **data, long num_cols, long num_rows,
             int first_row, int last_row, int first_column, int last_column,
@@ -485,20 +485,20 @@
       value_mask_min = rb_Integer(value_mask_min); mask_min = NUM2INT(value_mask_min);
       value_mask_max = rb_Integer(value_mask_max); mask_max = NUM2INT(value_mask_max);
       hival = rb_Integer(hival);
       hivalue = NUM2INT(hival);
       lookup = rb_String(lookup);
-      lookup_str = (unsigned char *)(RSTRING(lookup)->ptr);
-      lookup_len = RSTRING(lookup)->len;
+      lookup_str = (unsigned char *)(RSTRING_PTR(lookup));
+      lookup_len = RSTRING_LEN(lookup);
    }
    dest[0] = convert_figure_to_output_x(p,NUM2DBL(llx));
    dest[1] = convert_figure_to_output_y(p,NUM2DBL(lly));
    dest[2] = convert_figure_to_output_x(p,NUM2DBL(lrx));
    dest[3] = convert_figure_to_output_y(p,NUM2DBL(lry));
    dest[4] = convert_figure_to_output_x(p,NUM2DBL(ulx));
    dest[5] = convert_figure_to_output_y(p,NUM2DBL(uly));
    int obj_num = c_private_show_image(p, image_type, dest, (interpolate != Qfalse), (reversed == Qtrue), NUM2INT(w), NUM2INT(h), 
-      (unsigned char *)RSTRING(data)->ptr, RSTRING(data)->len, mask_min, mask_max, hivalue, lookup_str, lookup_len, NUM2INT(mask_obj_num));
+      (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), mask_min, mask_max, hivalue, lookup_str, lookup_len, NUM2INT(mask_obj_num));
    return INT2FIX(obj_num);
 }
 
 VALUE FM_private_show_rgb_image(VALUE fmkr, VALUE llx, VALUE lly, VALUE lrx, VALUE lry,
     VALUE ulx, VALUE uly, VALUE interpolate, VALUE w, VALUE h, VALUE data, VALUE mask_obj_num)