tioga 1.8 → 1.9

data/split/Tioga/wrappers.h

@@ -92,6 +92,8 @@ extern OBJ_PTR FM_xaxis_stroke_color_get(OBJ_PTR fmkr);
 extern OBJ_PTR FM_xaxis_stroke_color_set(OBJ_PTR fmkr, OBJ_PTR val);
 extern OBJ_PTR FM_yaxis_stroke_color_get(OBJ_PTR fmkr);
 extern OBJ_PTR FM_yaxis_stroke_color_set(OBJ_PTR fmkr, OBJ_PTR val);
+extern OBJ_PTR FM_string_hls_to_rgb_bang(OBJ_PTR fmkr, OBJ_PTR str);
+extern OBJ_PTR FM_string_rgb_to_hls_bang(OBJ_PTR fmkr, OBJ_PTR str);
 
 /*======================================================================*/
 // pdfcoords.c
@@ -156,6 +158,9 @@ extern OBJ_PTR FM_private_create_monochrome_image_data(OBJ_PTR fmkr, OBJ_PTR dat
 extern OBJ_PTR FM_private_show_image(OBJ_PTR fmkr, OBJ_PTR llx, OBJ_PTR lly, OBJ_PTR lrx, OBJ_PTR lry, OBJ_PTR ulx, OBJ_PTR uly,
    OBJ_PTR interpolate, OBJ_PTR w, OBJ_PTR h, OBJ_PTR data, OBJ_PTR OBJ_PTR_mask_min, OBJ_PTR OBJ_PTR_mask_max,
    OBJ_PTR hival, OBJ_PTR lookup, OBJ_PTR mask_xo_num);
+extern OBJ_PTR FM_private_show_hls_image(OBJ_PTR fmkr, 
+   OBJ_PTR llx, OBJ_PTR lly, OBJ_PTR lrx, OBJ_PTR lry, OBJ_PTR ulx, OBJ_PTR uly,
+   OBJ_PTR interpolate, OBJ_PTR w, OBJ_PTR h, OBJ_PTR data, OBJ_PTR mask_xo_num);
 extern OBJ_PTR FM_private_show_rgb_image(OBJ_PTR fmkr, 
    OBJ_PTR llx, OBJ_PTR lly, OBJ_PTR lrx, OBJ_PTR lry, OBJ_PTR ulx, OBJ_PTR uly,
    OBJ_PTR interpolate, OBJ_PTR w, OBJ_PTR h, OBJ_PTR data, OBJ_PTR mask_xo_num);

data/split/extconf.rb

@@ -2,7 +2,7 @@
 
 require './mkmf2.rb'
 
-$CFLAGS += " -O2 -g -Wall -Werror-implicit-function-declaration"
+$CFLAGS += " -O2 -g -Wall"
 
 # Now, if you want to install the include file, you need to
 # set the EXTCONF_RB_INCLUDE
@@ -24,9 +24,10 @@ setup_dir("Dtable", "Dobjects",
 #  b.add_sources("symbols.c")
 end
 
-setup_dir("Flate", "", "Flate", include) do |l,b,i|
-#  b.add_sources("symbols.c")
-end
+
+# setup_dir("Flate", "", "Flate", include) do |l,b,i|
+# #  b.add_sources("symbols.c")
+# end
 
 
 setup_dir("Function", "Dobjects", 
@@ -61,21 +62,32 @@ custom_rule("Tioga/lib/TexPreamble.rb",
              "Tioga/tioga.sty.in", "Tioga/mk_tioga_sty.rb"]
             )
 
-# we check the presence of zlib library
-unless have_header("zlib.h") and have_library("z", "compress", "zlib.h")
-  puts <<"EON"
-Error: you should have zlib (including development files) installed to
-build and run Tioga. You can get it there:
 
-  http://www.zlib.net/
+# Conditional use of embedded zlib
+if have_header("zlib.h") and have_library("z", "compress", "zlib.h")
+  declare_binary_library('Flate', "Flate/*.c")
+else
+  puts "zlib was not found or could not be linked against, using private copy"
+  declare_binary_library('Flate', "Flate/**/*.c")
+end  
+
+add_include_path("Flate/include")
+
+# # we check the presence of zlib library
+# unless have_header("zlib.h") and have_library("z", "compress", "zlib.h")
+#   puts <<"EON"
+# Error: you should have zlib (including development files) installed to
+# build and run Tioga. You can get it there:
 
-If that doesn't solve your problem, please report it on the Tioga tracker:
+#   http://www.zlib.net/
+
+# If that doesn't solve your problem, please report it on the Tioga tracker:
  
-  http://rubyforge.org/tracker/?group_id=701
+#   http://rubyforge.org/tracker/?group_id=701
 
-EON
-  exit 1 
-end
+# EON
+#   exit 1 
+# end
 
 unless have_header("ieee754.h")
   puts "You lack the ieee754.h header file, which might mean lower " +

data/split/namespace.h

@@ -21,27 +21,35 @@
 #ifndef _NAMESPACE_H
 #define _NAMESPACE_H
 
-/* This header file provides two OS-specific macros for the definition of
-   extern symbols:
+/* This header file provides three OS-specific macros for the definition of
+   extern (or NOT extern) symbols:
 
    * PUBLIC, which has to be used to mark objects that will be used
-   outside the module
+     outside the module
 
-   * PRIVATE, for symbols which are "extern" but intern to the module
+   * INTERN, for symbols which are shared among compilation units within a
+     module, but are NOT exported to other modules.
+
+   * PRIVATE, for symbols which are visible only within the containing
+     compilation unit (i.e. C source file) and, of course, are not exported to
+     other modules.
 
    Please don't add "extern" after the PRIVATE or PUBLIC declaration
    as this would break compilation on Darwin.
 */
 
-#ifdef __APPLE__
+#if __GNUC__ >= 4 /* we have the visibility attribute */
+# define INTERN __attribute__ ((visibility ("hidden")))
+# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN extern
+#elif defined __APPLE__
 # define INTERN __private_extern__
 # define PUBLIC 
-#elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define INTERN __attribute__ ((visibility ("hidden"))) 
-# define PUBLIC __attribute__ ((visibility ("default"))) 
+# define INTERN_EXTERN
 #else /* not really good */
 # define INTERN
 # define PUBLIC 
+# define INTERN_EXTERN
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
 /* In any case, PRIVATE is static */

data/split/symbols.h

@@ -22,7 +22,7 @@ PRIVATE void * rb_import_symbol_no_raise(VALUE module,
 		   
 #define DECLARE_SYMBOL(ret_type,name,args) \
   typedef ret_type (*rb_export_##name##_type) args;\
-  INTERN rb_export_##name##_type name
+  INTERN INTERN_EXTERN rb_export_##name##_type name
 
 #define IMPLEMENT_SYMBOL(name)\
   INTERN rb_export_##name##_type name = 0;

data/tests/tc_Dvector.rb

@@ -599,6 +599,30 @@ class TestDvector < Test::Unit::TestCase
         assert_equal(nil, @dv.delete_at(20))
     end
     
+    def test_prune
+        @dv = Dvector.new(5) {|i| i*3 }
+        assert_equal(6, @dv[2])
+        assert_equal(5, @dv.length)
+        x = @dv.prune([0,2])
+        assert_equal(3, x.length)
+        assert_equal(5, @dv.length)
+        assert_equal(3, x[0])
+        assert_equal(9, x[1])
+    end
+    
+    def test_prune_bang
+        @dv = Dvector.new(5) {|i| i*3 }
+        assert_equal(6, @dv[2])
+        assert_equal(5, @dv.length)
+        x = @dv.prune!([0,2])
+        assert_equal(3, x.length)
+        assert_equal(3, @dv.length)
+        assert_equal(3, x[0])
+        assert_equal(9, x[1])
+        assert_equal(@dv[0], x[0])
+        assert_equal(@dv[1], x[1])
+    end
+    
     def test_slice!
         a = Dvector.new(5) {|i| i*3 }
         assert_equal(3, a.slice!(1)) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tioga
 version: !ruby/object:Gem::Version 
-  version: "1.8"
+  version: "1.9"
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: split/scripts
 cert_chain: []
 
-date: 2008-04-05 00:00:00 +02:00
+date: 2008-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -26,36 +26,36 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- split/Tioga/wrappers.c
 - split/Tioga/init.c
 - split/Tioga/figures.c
-- split/Tioga/generic.c
-- split/Tioga/pdf_font_dicts.c
-- split/Tioga/pdfcoords.c
-- split/Tioga/pdftext.c
-- split/Tioga/axes.c
 - split/Tioga/makers.c
-- split/Tioga/pdfpath.c
+- split/Tioga/axes.c
+- split/Tioga/pdf_font_dicts.c
 - split/Tioga/pdfcolor.c
-- split/Tioga/texout.c
+- split/Tioga/pdfcoords.c
 - split/Tioga/pdffile.c
 - split/Tioga/pdfimage.c
+- split/Tioga/pdfpath.c
+- split/Tioga/pdftext.c
+- split/Tioga/texout.c
+- split/Tioga/wrappers.c
+- split/Tioga/generic.c
 - split/Function/function.c
 - split/Function/joint_qsort.c
 - split/Dvector/dvector.c
 - split/Dtable/dtable.c
 - split/Flate/flate.c
-- split/Tioga/generic.h
 - split/Tioga/pdfs.h
-- split/Tioga/wrappers.h
-- split/Tioga/symbols.h
 - split/Tioga/figures.h
+- split/Tioga/symbols.h
 - split/Tioga/defs.h
 - split/Tioga/safe_double.h
 - split/Tioga/namespace.h
 - split/Tioga/dvector.h
 - split/Tioga/dtable.h
 - split/Tioga/flate.h
+- split/Tioga/generic.h
+- split/Tioga/wrappers.h
 - split/Function/symbols.h
 - split/Function/defs.h
 - split/Function/safe_double.h
@@ -66,52 +66,52 @@ files:
 - split/Dvector/defs.h
 - split/Dvector/safe_double.h
 - split/Dvector/namespace.h
-- split/Dtable/symbols.h
 - split/Dtable/dtable_intern.h
+- split/Dtable/symbols.h
 - split/Dtable/defs.h
 - split/Dtable/safe_double.h
 - split/Dtable/namespace.h
 - split/Dtable/dvector.h
-- split/Flate/symbols.h
 - split/Flate/flate_intern.h
+- split/Flate/symbols.h
 - split/Flate/defs.h
 - split/Flate/safe_double.h
 - split/Flate/namespace.h
 - split/Dvector/include/dvector.h
 - split/Dtable/include/dtable.h
 - split/Flate/include/flate.h
-- split/Tioga/lib/Rectangles.rb
-- split/Tioga/lib/Colorbars.rb
 - split/Tioga/lib/Shading.rb
-- split/Tioga/lib/Arcs_and_Circles.rb
 - split/Tioga/lib/MarkerConstants.rb
 - split/Tioga/lib/FigureConstants.rb
+- split/Tioga/lib/Arcs_and_Circles.rb
 - split/Tioga/lib/FigMkr.rb
-- split/Tioga/lib/Legends.rb
-- split/Tioga/lib/Strokes.rb
 - split/Tioga/lib/Coordinate_Conversions.rb
 - split/Tioga/lib/Special_Paths.rb
-- split/Tioga/lib/Creating_Paths.rb
+- split/Tioga/lib/Legends.rb
 - split/Tioga/lib/Using_Paths.rb
-- split/Tioga/lib/X_and_Y_Axes.rb
-- split/Tioga/lib/irb_tioga.rb
+- split/Tioga/lib/Colorbars.rb
+- split/Tioga/lib/Rectangles.rb
+- split/Tioga/lib/Strokes.rb
+- split/Tioga/lib/Creating_Paths.rb
 - split/Tioga/lib/Colormaps.rb
-- split/Tioga/lib/maker.rb
-- split/Tioga/lib/tioga_ui.rb
-- split/Tioga/lib/Utils.rb
-- split/Tioga/lib/Figures_and_Plots.rb
 - split/Tioga/lib/Page_Frame_Bounds.rb
+- split/Tioga/lib/Utils.rb
+- split/Tioga/lib/tioga_ui.rb
 - split/Tioga/lib/Executive.rb
-- split/Tioga/lib/TeX_Text.rb
+- split/Tioga/lib/X_and_Y_Axes.rb
 - split/Tioga/lib/tioga.rb
 - split/Tioga/lib/Markers.rb
-- split/Tioga/lib/tioga_ui_cmds.rb
+- split/Tioga/lib/TeX_Text.rb
 - split/Tioga/lib/Images.rb
 - split/Tioga/lib/Doc.rb
-- split/Tioga/lib/TexPreamble.rb
+- split/Tioga/lib/Figures_and_Plots.rb
 - split/Tioga/lib/Titles_and_Labels.rb
 - split/Tioga/lib/Transparency.rb
 - split/Tioga/lib/ColorConstants.rb
+- split/Tioga/lib/irb_tioga.rb
+- split/Tioga/lib/tioga_ui_cmds.rb
+- split/Tioga/lib/TexPreamble.rb
+- split/Tioga/lib/maker.rb
 - split/Tioga/mk_tioga_sty.rb
 - split/Tioga/extconf.rb
 - split/Function/lib/Function_extras.rb
@@ -126,20 +126,21 @@ files:
 - split/mkmf2.rb
 - split/namespace.h
 - split/defs.h
-- split/symbols.h
 - split/safe_double.h
+- split/symbols.h
 - split/symbols.c
-- tests/profile_Dvector
-- tests/benchmark_dvector_reads.rb
-- tests/dvector_read_test.data
 - tests/dtable_test.data
 - tests/tc_Dtable.rb
 - tests/tc_Flate.rb
-- tests/tc_Function.rb
 - tests/tc_FMkr.rb
-- tests/dvector_test.data
+- tests/dvector_read_test.data
 - tests/ts_Tioga.rb
+- tests/dvector_test.data
+- tests/tc_Function.rb
 - tests/tc_Dvector.rb
+- tests/profile_Dvector
+- tests/benchmark_dvector_reads.rb
+- tests/Icon_Test.pdf
 - Tioga_README
 - lgpl.txt
 has_rdoc: false
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tioga
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Tioga - a powerful scientific plotting library