Changeset 86 for trunk/src/get_conf.c

Timestamp:

11/21/08 11:27:21 (14 years ago)

Author:

andreu

Message:

ticket #23

Files:

• trunk/src/get_conf.c (modified) (4 diffs)

trunk/src/get_conf.c

@@ -434 +434 @@
   unsigned short counter = 0;
   unsigned short n0;
+#if defined(MULTISAMPLING)
+  unsigned short n1;
+#endif
   unsigned short buffer;
   int i = 0;
-  char ASStrTab[MAX_AS][7];
+  char ASStrTab[MAX_AS][256];
 
   if (!(asFile = fopen(filename, "r"))) {
@@ -446 +449 @@
     ASTabPtr[i].sampling = 0;
   }
-  while (fgets(line, 7, asFile) != 0)
+  while (fgets(line, 256, asFile) != 0)
     {
       strcpy(ASStrTab[counter], line);
@@ -457 +460 @@
       }
     }
-  qsort(ASStrTab, counter, 7, compASStr);
+  qsort(ASStrTab, counter, 256, compASStr);
   for(i=0;i<counter;i++)
     {
+#if defined(MULTISAMPLING)
+      sscanf(ASStrTab[i],"%hu %hu\n",
+             &n0,
+             &n1);
+      buffer = (unsigned short)n0;
+      ASTabPtr[i].as = *((unsigned short*)&buffer);
+      buffer = (unsigned short)n1;
+      ASTabPtr[i].sampling = *((unsigned short*)&buffer);
+#else
       sscanf(ASStrTab[i],"%hu\n",
              &n0);
@@ -465 +477 @@
       ASTabPtr[i].as = *((unsigned short*)&buffer);
       ASTabPtr[i].sampling = 0;
+#endif
     }
   if( fclose(asFile) == 0) {