IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 14, 2008, 1:51:07 PM (19 years ago)
Author:
eugene
Message:

fixing Wall,Werror warnings

Location:
trunk/Ohana/src/kapa2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/kapa2/include/prototypes.h

    r16011 r16061  
    1515void          CheckGeometry       PROTO((Graphic *graphic, int *argc, char **argv));
    1616void          TopWindow           PROTO((Graphic *graphic, Icon *icon));
    17 void           CreateWindow       PROTO((Graphic *graphic, Window parent, int border, long events));
    18 void           MakeGC             PROTO((Graphic *graphic));
    19 void           MakeCursor         PROTO((Graphic *graphic, unsigned int cursor));
     17void          CreateWindow        PROTO((Graphic *graphic, Window parent, int border, long events));
     18void          MakeGC              PROTO((Graphic *graphic));
     19void          MakeCursor          PROTO((Graphic *graphic, unsigned int cursor));
    2020void          LoadFont            PROTO((Graphic *graphic, int *argc, char **argv, char *default_name));
    2121void          SetNormalHints      PROTO((Graphic *graphic));
    … …  
    2323void          NameWindow          PROTO((Graphic *graphic, char *name));
    2424void          MapWindow           PROTO((Graphic *graphic));
    25 void CheckVisual (Graphic *graphic, int *argc, char **argv);
     25void          CheckVisual         PROTO((Graphic *graphic, int *argc, char **argv));
    2626
    2727/* X drawing utilities */
    … …  
    7171int           GetImageCoords      PROTO((int sock));
    7272int           GetImageRange       PROTO((int sock));
    73 int           SetChannel (int sock);
    74 int           SetColormapFromPipe (int sock);
     73int           SetChannel          PROTO((int sock));
     74int           SetColormapFromPipe PROTO((int sock));
    7575
    7676int           LoadVectorData      PROTO((int sock, KapaGraphWidget *graph, int N, char *type));
    … …  
    8888int           SetActiveSectionByNumber PROTO((int N));
    8989int           ListSection         PROTO((int sock));
    90 void SetSectionSizes (Section *section);
     90void          SetSectionSizes     PROTO((Section *section));
    9191
    9292KapaGraphWidget *InitGraph        PROTO(());
    … …  
    198198
    199199/* misc functions */
    200 void SetToolbox (int sock);
    201 int EraseOverlay (int sock);
    202 int LoadOverlay (int sock);
    203 int SaveOverlay (int sock);
    204 int CSaveOverlay (int sock);
    205 int JPEGit24 (int sock);
    206 
    207 int UpdatePointer (Graphic *graphic, XMotionEvent *event);
    208 int InterpretPresses (Graphic *graphic, XButtonEvent *event);
    209 int InterpretKeys (Graphic *graphic, XKeyEvent *event);
    210 void InitPipe (char *namedSocket);
    211 void EraseGraph (KapaGraphWidget *graph);
    212 void StatusBox (Graphic *graphic, KapaImageWidget *image);
    213 
    214 void CreatePicture (KapaImageWidget *image, Graphic *graphic);
    215 void CreateColorbar (KapaImageWidget *image, Graphic *graphic);
    216 void CreateZoom (KapaImageWidget *image, Graphic *graphic, double x, double y);
    217 void UpdateStatusBox (Graphic *graphic, KapaImageWidget *image, double x, double y, double z, int mode);
    218 
    219 void CreateZoom8  (KapaImageWidget *image, Graphic *graphic, double x, double y);
    220 void CreateZoom16 (KapaImageWidget *image, Graphic *graphic, double x, double y);
    221 void CreateZoom24 (KapaImageWidget *image, Graphic *graphic, double x, double y);
    222 void CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y);
    223 
    224 int GetActiveSocket ();
    225 void InvertButton (Graphic *graphic, Button *button);
    226 void bDrawOverlay (KapaImageWidget *image, int N);
     200void          SetToolbox  (int sock);
     201int           EraseOverlay (int sock);
     202int           LoadOverlay (int sock);
     203int           SaveOverlay (int sock);
     204int           CSaveOverlay (int sock);
     205int           JPEGit24    (int sock);
     206
     207int           UpdatePointer (Graphic *graphic, XMotionEvent *event);
     208int           InterpretPresses (Graphic *graphic, XButtonEvent *event);
     209int           InterpretKeys (Graphic *graphic, XKeyEvent *event);
     210void          InitPipe (char *namedSocket);
     211void          EraseGraph (KapaGraphWidget *graph);
     212void          StatusBox (Graphic *graphic, KapaImageWidget *image);
     213
     214void          CreatePicture (KapaImageWidget *image, Graphic *graphic);
     215void          CreateColorbar (KapaImageWidget *image, Graphic *graphic);
     216void          CreateZoom (KapaImageWidget *image, Graphic *graphic, double x, double y);
     217void          UpdateStatusBox (Graphic *graphic, KapaImageWidget *image, double x, double y, double z, int mode);
     218
     219void          CreateZoom8  (KapaImageWidget *image, Graphic *graphic, double x, double y);
     220void          CreateZoom16 (KapaImageWidget *image, Graphic *graphic, double x, double y);
     221void          CreateZoom24 (KapaImageWidget *image, Graphic *graphic, double x, double y);
     222void          CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y);
     223
     224int           GetActiveSocket ();
     225void          InvertButton (Graphic *graphic, Button *button);
     226void          bDrawOverlay (KapaImageWidget *image, int N);
    227227
    228228/* color cube tools */
    … …  
    243243
    244244int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image);
    245 
    246 void sort (float *value, int N);
     245int SetColorCubeHistogram ();

  • trunk/Ohana/src/kapa2/src/ColorCube.c

    r16011 r16061  
    9494  int ix, iy, iz;
    9595
    96   if (current == max) return;
     96  if (current == max) return TRUE;
    9797  current ++;
    9898
    … …  
    105105    }
    106106  }
    107   return;
     107  return TRUE;
    108108}
    109109

  • trunk/Ohana/src/kapa2/src/ColorHistogram.c

    r16011 r16061  
    44void ColorHistogram (KapaImageWidget *image, CCNode *cube) {
    55
    6   int i, j, DX, DY, value, nPixels;
     6  int i, DX, DY, nPixels;
    77  float *rData, *bData, *gData, rValue, gValue, bValue;
    88  float redSlope, blueSlope, greenSlope;
    … …  
    8080void CCNodeSetColorPixels (KapaImageWidget *image, CCNode *cube) {
    8181
    82   int i, j, DX, DY, value, nPixels;
     82  int i, DX, DY, nPixels;
    8383  float *rData, *bData, *gData, rValue, gValue, bValue;
    8484  unsigned short *oData;

  • trunk/Ohana/src/kapa2/src/CreateZoom32.c

    r16011 r16061  
    77  int i_start, i_end, j_start, j_end;
    88  int dropback;  /* this is a bit of a kludge... */
    9   int dx, dy, DX, DY, pixelN;
     9  int dx, dy, DX, DY;
    1010  double expand, zoomscale, Rx, Ry;
    1111  int expand_in, expand_out;

  • trunk/Ohana/src/kapa2/src/JPEGit24.c

    r16011 r16061  
    55# define WHITE_G 255
    66# define WHITE_B 255
    7 
    8 static float slope = 1.0;
    9 static float start = 0.0;
    10 static int MaxValue = 255;
    11 
    12 // XXX inline this if needed
    13 static int PixelLookup(float value) {
    14   int out;
    15   out = MIN (MAX (slope * value - start, 0), MaxValue);
    16   return (out);
    17 }
    187
    198// XXX this currently writes out the jpeg for just the active image
    … …  
    3221  int i_start, i_end, j_start, j_end;
    3322  int dropback;  /* this is a bit of a kludge... */
    34   int dx, dy, DX, DY, pixelN;
     23  int dx, dy, DX, DY;
    3524  int quality;
    3625  int expand_in, expand_out;

  • trunk/Ohana/src/kapa2/src/Remap32.c

    r16011 r16061  
    66  int i_start, i_end, j_start, j_end;
    77  int dropback;  /* this is a bit of a kludge... */
    8   int dx, dy, DX, DY, pixelN;
     8  int dx, dy, DX, DY;
    99  double expand, Rx, Ry, X, Y;
    1010  int expand_in, expand_out;

  • trunk/Ohana/src/kapa2/src/SetColorScale.c

    r16039 r16061  
    2929
    3030void SetColorScale1D (Graphic *graphic, KapaImageWidget *image) {
    31   int i, j, DX, DY, value, nPixels;
     31  int i, DX, DY, value, nPixels;
    3232  float *iData;
    3333  unsigned short *oData;
    … …  
    7373// XXX this uses a crude, uniform-spacing cube
    7474int SetColorScale3D (Graphic *graphic, KapaImageWidget *image) {
    75   int i, j, DX, DY, value, nPixels, rValue, gValue, bValue;
     75
     76  int i, DX, DY, nPixels, rValue, gValue, bValue;
    7677  float *rData, *bData, *gData;
    7778  unsigned short *oData;
    … …  
    151152
    152153  int i, DX, DY, Nvalues, NVALUES, Npixels, Nmin;
    153   float *values, *colors;
     154  float *values;
    154155  CCNode *cube;
    155156  Graphic *graphic;
    … …  
    233234int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image) {
    234235
    235   int i, DX, DY, Nvalues, NVALUES, Npixels, Nmin;
    236   float *values, *colors;
    237236  CCNode *cube;
    238237

  • trunk/Ohana/src/kapa2/src/sort.c

    r16011 r16061  
    1 # include "Ximage.h"
    2 
    3 void sort (float *value, int N) {
    4 
    5   int l,j,ir,i;
    6   float temp;
    7  
    8   if (N < 2) return;
    9   l = N >> 1;
    10   ir = N - 1;
    11   for (;;) {
    12     if (l > 0) {
    13       temp = value[--l];
    14     }
    15     else {
    16       temp = value[ir];
    17       value[ir] = value[0];
    18       if (--ir == 0) {
    19         value[0] = temp;
    20         return;
    21       }
    22     }
    23     i = l;
    24     j = (l << 1) + 1;
    25     while (j <= ir) {
    26       if (j < ir && value[j] < value[j+1]) ++j;
    27       if (temp < value[j]) {
    28         value[i]=value[j];
    29         j += (i=j) + 1;
    30       }
    31       else j = ir + 1;
    32     }
    33     value[i] = temp;
    34   }
    35 }
    36 
Note: See TracChangeset for help on using the changeset viewer.