sixel: binary search, cut another 40% #1380

src/lib/sixel.c

@@ -44,19 +44,39 @@ dtable_to_ctable(int dtable, unsigned char* ctable){
 static int
 find_color(colortable* ctab, unsigned char comps[static 3]){
   int i;
-  for(i = 0 ; i < ctab->colors ; ++i){
+  if(ctab->colors){
-    int cmp = memcmp(ctab->table + i * 5, comps, 3);
+    int l, r;
-    if(cmp == 0){
+    l = 0;
-      return ctable_to_dtable(ctab->table + i * 5);
+    r = ctab->colors - 1;
-    }else if(cmp > 0){
+    do{
-      break;
+      i = l + (r - l) / 2;
+//fprintf(stderr, "%02x%02x%02x L %d R %d m %d\n", comps[0], comps[1], comps[2], l, r, i);
+      int cmp = memcmp(ctab->table + i * 5, comps, 3);
+      if(cmp == 0){
+        return ctable_to_dtable(ctab->table + i * 5);
+      }
+      if(cmp < 0){
+        l = i + 1;
+      }else{ // key is smaller
+        r = i - 1;
+      }
+//fprintf(stderr, "BCMP: %d L %d R %d m: %d\n", cmp, l, r, i);
+    }while(l <= r);
+    if(r < 0){
+      i = 0;
+    }else if(l == ctab->colors){
+      i = ctab->colors;
+    }else{
+      i = l;
     }
-  }
+    if(ctab->colors == MAXCOLORS){
-  if(ctab->colors == MAXCOLORS){
+      return -1;
-    return -1;
+    }
-  }
+    if(i < ctab->colors){
-  if(i < ctab->colors){
+      memmove(ctab->table + (i + 1) * 5, ctab->table + i * 5, (ctab->colors - i) * 5);
-    memmove(ctab->table + (i + 1) * 5, ctab->table + i * 5, (ctab->colors - i) * 5);
+    }
+  }else{
+    i = 0;
   }
   memcpy(ctab->table + i * 5, comps, 3);
   dtable_to_ctable(ctab->colors, ctab->table + i * 5);