[Plplot-cvs] SF.net SVN: plplot:[11292] trunk/bindings

[<ai...@us...>]

Revision: 11292
          http://plplot.svn.sourceforge.net/plplot/?rev=11292&view=rev
Author:   airwin
Date:     2010-10-30 21:21:12 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
Style previously committed changes.

Modified Paths:
--------------
    trunk/bindings/f77/sccont.c
    trunk/bindings/ocaml/plplot_impl.c

Modified: trunk/bindings/f77/sccont.c
===================================================================
--- trunk/bindings/f77/sccont.c	2010-10-30 21:20:35 UTC (rev 11291)
+++ trunk/bindings/f77/sccont.c	2010-10-30 21:21:12 UTC (rev 11292)
@@ -273,12 +273,12 @@
            PLINT *min_color, PLINT *min_width,
            PLINT *max_color, PLINT *max_width, PLINT *lx )
 {
-    PLINT rect = 1;
+    PLINT   rect = 1;
 
     PLfGrid data;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = z;
+    data.f  = z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -323,7 +323,7 @@
     cgrid.yg = yg1;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = z;
+    data.f  = z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -349,9 +349,9 @@
            PLINT *max_color, PLINT *max_width,
            PLFLT *xg2, PLFLT *yg2, PLINT *lx )
 {
-    PLINT    rect = 0;
-    PLfGrid  data;
-    PLcGrid  cgrid;
+    PLINT   rect = 0;
+    PLfGrid data;
+    PLcGrid cgrid;
 
 /* Fill a grid data structure to hold the coordinate arrays. */
     cgrid.nx = *lx;
@@ -360,7 +360,7 @@
     cgrid.yg = yg2;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = z;
+    data.f  = z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -383,11 +383,11 @@
           PLINT *min_color, PLINT *min_width,
           PLINT *max_color, PLINT *max_width, PLFLT *ftr, PLINT *lx )
 {
-    PLINT rect = 1;
-    PLfGrid  data;
+    PLINT   rect = 1;
+    PLfGrid data;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = z;
+    data.f  = z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -422,7 +422,7 @@
     PLfGrid2 data;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = (PLFLT **) z;
+    data.f  = (PLFLT **) z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -447,7 +447,7 @@
     PLcGrid  cgrid;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = (PLFLT **) z;
+    data.f  = (PLFLT **) z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -478,7 +478,7 @@
     PLcGrid  cgrid;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = (PLFLT **) z;
+    data.f  = (PLFLT **) z;
     data.nx = *lx;
     data.ny = *ny;
 
@@ -507,7 +507,7 @@
     PLfGrid2 data;
 
 /* Fill a grid data structure to hold the fortran z array. */
-    data.f = (PLFLT **) z;
+    data.f  = (PLFLT **) z;
     data.nx = *lx;
     data.ny = *ny;
 

Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c	2010-10-30 21:20:35 UTC (rev 11291)
+++ trunk/bindings/ocaml/plplot_impl.c	2010-10-30 21:21:12 UTC (rev 11292)
@@ -641,18 +641,18 @@
 }
 
 // Copy a string array
-#define INIT_STRING_ARRAY( o ) \
-    int o##_length; \
-    o##_length = Wosize_val( o ); \
-    const char *c_##o[o##_length]; \
-    for ( i = 0; i < o##_length; i++ ) { c_##o[i] = String_val( Field( o, i ) ); }
+#define INIT_STRING_ARRAY( o )         \
+    int o ## _length;                  \
+    o ## _length = Wosize_val( o );    \
+    const char *c_ ## o[o ## _length]; \
+    for ( i = 0; i < o ## _length; i++ ) { c_ ## o[i] = String_val( Field( o, i ) ); }
 
 // Copy an int array, o, of n element to the C array c
-#define INIT_INT_ARRAY( o ) \
-    int o##_length; \
-    o##_length = Wosize_val( o ); \
-    int c_##o[o##_length]; \
-    for ( i = 0; i < (o##_length); i++ ) { (c_##o)[i] = Int_val( Field( (o), i ) ); }
+#define INIT_INT_ARRAY( o )         \
+    int o ## _length;               \
+    o ## _length = Wosize_val( o ); \
+    int c_ ## o[o ## _length];      \
+    for ( i = 0; i < ( o ## _length ); i++ ) { ( c_ ## o )[i] = Int_val( Field( ( o ), i ) ); }
 
 int lor_ml_list( value list, ML_VARIANT_FUNC variant_f )
 {
@@ -740,12 +740,12 @@
     int translated_option;
     switch ( legend_option )
     {
-    case 0: translated_option = PL_LEGEND_NONE; break;
-    case 1: translated_option = PL_LEGEND_COLOR_BOX; break;
-    case 2: translated_option = PL_LEGEND_LINE; break;
-    case 3: translated_option = PL_LEGEND_SYMBOL; break;
-    case 4: translated_option = PL_LEGEND_TEXT_LEFT; break;
-    case 5: translated_option = PL_LEGEND_BACKGROUND; break;
+    case 0: translated_option  = PL_LEGEND_NONE; break;
+    case 1: translated_option  = PL_LEGEND_COLOR_BOX; break;
+    case 2: translated_option  = PL_LEGEND_LINE; break;
+    case 3: translated_option  = PL_LEGEND_SYMBOL; break;
+    case 4: translated_option  = PL_LEGEND_TEXT_LEFT; break;
+    case 5: translated_option  = PL_LEGEND_BACKGROUND; break;
     default: translated_option = -1;
     }
     return translated_option;
@@ -762,10 +762,10 @@
 {
     CAMLparam5( opt, x, y, plot_width, bg_color );
     CAMLxparam5( opt_array, text_offset, text_scale, text_spacing,
-                 text_justification );
+        text_justification );
     CAMLxparam5( text_colors, text, box_colors, box_patterns, box_scales );
     CAMLxparam5( line_colors, line_styles, line_widths, symbol_colors,
-                 symbol_scales );
+        symbol_scales );
     CAMLxparam2( symbol_numbers, symbols );
 
     // Counter
@@ -803,15 +803,15 @@
     }
 
     pllegend( c_opt, Double_val( x ), Double_val( y ),
-              Double_val( plot_width ), Int_val( bg_color ), n_legend,
-              c_opt_array,
-              Double_val( text_offset ), Double_val( text_scale ),
-              Double_val( text_spacing ), Double_val( text_justification ),
-              c_text_colors, c_text,
-              c_box_colors, c_box_patterns, (double *)box_scales,
-              c_line_colors, c_line_styles, c_line_widths,
-              c_symbol_colors, (double *)symbol_scales, c_symbol_numbers,
-              c_symbols );
+        Double_val( plot_width ), Int_val( bg_color ), n_legend,
+        c_opt_array,
+        Double_val( text_offset ), Double_val( text_scale ),
+        Double_val( text_spacing ), Double_val( text_justification ),
+        c_text_colors, c_text,
+        c_box_colors, c_box_patterns, (double *) box_scales,
+        c_line_colors, c_line_styles, c_line_widths,
+        c_symbol_colors, (double *) symbol_scales, c_symbol_numbers,
+        c_symbols );
 
     CAMLreturn( Val_unit );
 }
@@ -819,10 +819,10 @@
 value ml_pllegend_byte( value* argv, int argn )
 {
     return ml_pllegend( argv[0], argv[1], argv[2], argv[3], argv[4],
-                        argv[5], argv[6], argv[7], argv[8], argv[9],
-                        argv[10], argv[11], argv[12], argv[13], argv[14],
-                        argv[15], argv[16], argv[17], argv[18], argv[19],
-                        argv[20], argv[21] );
+        argv[5], argv[6], argv[7], argv[8], argv[9],
+        argv[10], argv[11], argv[12], argv[13], argv[14],
+        argv[15], argv[16], argv[17], argv[18], argv[19],
+        argv[20], argv[21] );
 }
 
 /* pltr* function implementations */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.