Difference for common/image.c from version 1.16 to 1.17

version 1.16 version 1.17
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_image_c =   * static char *rcsid_image_c =
  *   "$Id: image.c,v 1.16 2005/10/24 18:27:37 akirschbaum Exp $";   *   "$Id: image.c,v 1.17 2005/10/24 20:48:15 akirschbaum Exp $";
  */   */
   
 /*  /*
Line 58
 
Line 58
   
   
 /* nroffiles is the actual number of bitmaps defined.  /* nroffiles is the actual number of bitmaps defined.
  * nrofpixmaps is the higest numbers bitmap that is loaded.  With   * nrofpixmaps is the number of bitmaps loaded.  With
  * the automatic generation of the bmaps file, this is now equal   * the automatic generation of the bmaps file, this is now equal
  * to nroffiles.   * to nroffiles.
  *   *
  * The xbm array (which contains name and number information, and   * The xbm array (which contains name and number information, and
  * is then sorted) contains nroffiles+1 entries.  the xbm_names   * is then sorted) contains nroffiles entries.  the xbm_names
  * array (which is used for converting the numeric face to   * array (which is used for converting the numeric face to
  * a name) contains nrofpixmaps+1 entries.   * a name) contains nrofpixmaps entries.
  */   */
 int nroffiles = 0, nrofpixmaps=0;  static int nroffiles = 0;
   int nrofpixmaps = 0;
   
   /**
    * id is the face to smooth, smooth is the 16x2 face used to smooth id.
    */
 struct smoothing {  struct smoothing {
     uint16 id;      uint16 id;
     uint16 smooth;      uint16 smooth;
 };  };
   
   /**
    * Contains all defined smoothing entries. smooth is an array of nrofsmooth
    * entries. It is sorted by smooth[].id.
    */
 static struct smoothing *smooth=NULL;  static struct smoothing *smooth=NULL;
 int nrofsmooth=0;  int nrofsmooth=0;
   
 /* the only thing this table is used for now is to  /* the only thing this table is used for now is to
  * translate the colorname in the magicmap field of the   * translate the colorname in the magicmap field of the
  * face into a numeric index that is then sent to the   * face into a numeric index that is then sent to the
  * client for magic map commands.  The order of this table   * client for magic map commands.  The order of this table
  * must match that of the NDI colors in include/newclient.h.   * must match that of the NDI colors in include/newclient.h.
  */   */
 char *colorname[NUM_COLORS] = {  static const char *const colorname[] = {
 "black", /* 0  */  "black", /* 0  */
 "white", /* 1  */  "white", /* 1  */
 "blue", /* 2  */  "blue", /* 2  */
Line 114
 
Line 123
  * Returns the matching color in the coloralias if found,   * Returns the matching color in the coloralias if found,
  * 0 otherwise.  Note that 0 will actually be black, so there is no   * 0 otherwise.  Note that 0 will actually be black, so there is no
  * way the calling function can tell if an error occurred or not   * way the calling function can tell if an error occurred or not
  *  
  * CF 0.91.7: relocated from loader.c file - this perhaps can be  
  * declared static.  
  */   */
   
 char find_color(char *name) {  static uint8 find_color(const char *name) {
   int i;    uint8 i;
   for(i=0;i<NUM_COLORS;i++)    for(i=0;i<sizeof(colorname)/sizeof(*colorname);i++)
     if(!strcmp(name,colorname[i]))      if(!strcmp(name,colorname[i]))
       return i;        return i;
   LOG(llevError,"Unknown color: %s\n",name);    LOG(llevError,"Unknown color: %s\n",name);
Line 132
 
Line 138
  * it is called by ReadBmapNames.   * it is called by ReadBmapNames.
  */   */
   
   
 static void ReadFaceData()  static void ReadFaceData()
 {  {
     char buf[MAX_BUF], *cp;      char buf[MAX_BUF], *cp;
Line 198
 
Line 203
  * difference.)   * difference.)
  */   */
   
 int ReadBmapNames () {  void ReadBmapNames () {
     char buf[MAX_BUF], *p, *q;      char buf[MAX_BUF], *p, *q;
     FILE *fp;      FILE *fp;
     int value, nrofbmaps = 0, i;      int value, nrofbmaps = 0, i;
Line 218
 
Line 223
      nrofbmaps++;       nrofbmaps++;
     rewind(fp);      rewind(fp);
          
     xbm = (struct bmappair *) malloc(sizeof(struct bmappair) * (nrofbmaps + 1));      xbm = (struct bmappair *) malloc(sizeof(struct bmappair) * nrofbmaps);
     memset (xbm, 0, sizeof (struct bmappair) * (nrofbmaps + 1));      memset (xbm, 0, sizeof (struct bmappair) * nrofbmaps);
          
     while(fgets (buf, MAX_BUF, fp)!=NULL) {      while(nroffiles < nrofbmaps && fgets (buf, MAX_BUF, fp) != NULL) {
  if (*buf == '#')   if (*buf == '#')
      continue;       continue;
    
Line 253
 
Line 258
      bmaps_checksum &= 0xffffffff;       bmaps_checksum &= 0xffffffff;
  }   }
    
   
  xbm[nroffiles].number = value;   xbm[nroffiles].number = value;
  nroffiles++;   nroffiles++;
  if(value > nrofpixmaps)   if(value >= nrofpixmaps)
      nrofpixmaps = value;       nrofpixmaps = value+1;
     }      }
     fclose(fp);      fclose(fp);
   
     LOG(llevDebug,"done (got %d/%d/%d)\n",nrofpixmaps,nrofbmaps,nroffiles);      LOG(llevDebug,"done (got %d/%d/%d)\n",nrofpixmaps,nrofbmaps,nroffiles);
   
     new_faces = (New_Face *)malloc(sizeof(New_Face) * (nrofpixmaps+1));      new_faces = (New_Face *)malloc(sizeof(New_Face) * nrofpixmaps);
     for (i = 0; i <= nrofpixmaps; i++) {      for (i = 0; i < nrofpixmaps; i++) {
  new_faces[i].name = "";   new_faces[i].name = "";
  new_faces[i].number = i;   new_faces[i].number = i;
  new_faces[i].visibility=0;   new_faces[i].visibility=0;
Line 274
 
Line 278
  new_faces[xbm[i].number].name = xbm[i].name;   new_faces[xbm[i].number].name = xbm[i].name;
     }      }
   
     nrofpixmaps++;      qsort (xbm, nroffiles, sizeof(struct bmappair), (int (*)(const void*, const void*))compar);
   
     qsort (xbm, nrofbmaps, sizeof(struct bmappair), (int (*)(const void*, const void*))compar);  
   
     ReadFaceData();      ReadFaceData();
   
Line 302
 
Line 304
     dark_faces[2] = &new_faces[FindFace (DARK_FACE3_NAME,0)];      dark_faces[2] = &new_faces[FindFace (DARK_FACE3_NAME,0)];
   
     smooth_face = &new_faces[FindFace(SMOOTH_FACE_NAME,0)];      smooth_face = &new_faces[FindFace(SMOOTH_FACE_NAME,0)];
   
     return nrofpixmaps;  
 }  }
   
 /* This returns an the face number of face 'name'.  Number is constant  /* This returns an the face number of face 'name'.  Number is constant
Line 320
 
Line 320
  * from the server)   * from the server)
  */   */
 int FindFace (char *name, int error) {  int FindFace (char *name, int error) {
     int i;  
     struct bmappair *bp, tmp;      struct bmappair *bp, tmp;
     char *p;      char *p;
   
   
     /* Using actual numbers for faces is a very bad idea.  This is because  
      * each time the archetype file is rebuilt, all the face numbers  
      * change.  
      */  
     if ((i = atoi(name))) {  
  LOG(llevError,"Warning: Integer face name used: %s\n", name);  
  return i;  
     }  
   
     if ((p = strchr (name, '\n')))      if ((p = strchr (name, '\n')))
  *p = '\0';   *p = '\0';
   
Line 373
 
Line 362
     smooth = (struct smoothing *) malloc(sizeof(struct smoothing) * (smoothcount));      smooth = (struct smoothing *) malloc(sizeof(struct smoothing) * (smoothcount));
     memset (smooth, 0, sizeof (struct smoothing) * (smoothcount));      memset (smooth, 0, sizeof (struct smoothing) * (smoothcount));
   
     while(fgets (buf, MAX_BUF, fp)!=NULL) {      while(nrofsmooth < smoothcount && fgets (buf, MAX_BUF, fp)!=NULL) {
         if (*buf == '#')          if (*buf == '#')
             continue;              continue;
         p=strchr(buf,' ');          p=strchr(buf,' ');
Line 393
 
Line 382
     return nrofsmooth;      return nrofsmooth;
 }  }
   
   /**
    * Find the smooth face for a given face.
    *
    * @param face the face to find the smoothing face for
    *
    * @param smoothed return value: set to smooth face
    *
    * @return 1=smooth face found, 0=no smooth face found
    */
 int FindSmooth (uint16 face, uint16* smoothed) {  int FindSmooth (uint16 face, uint16* smoothed) {
     struct smoothing *bp, tmp;      struct smoothing *bp, tmp;
   
Line 405
 
Line 403
     return bp ? 1 : 0;      return bp ? 1 : 0;
 }  }
   
   /**
    * Deallocates memory allocated by ReadBmapNames() and ReadSmooth().
    */
 void free_all_images()  void free_all_images()
 {  {
     int i;      int i;
Line 413
 
Line 414
  free(xbm[i].name);   free(xbm[i].name);
     free(xbm);      free(xbm);
     free(new_faces);      free(new_faces);
       free(smooth);
 }  }

Legend:
line(s) removed in v.1.16 
line(s) changed
 line(s) added in v.1.17
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:06