BlinkenLib

@@ -200,7 +200,7 @@ int BlinkenGifSave(stBlinkenMovie *pMovie, const char *pFilename)

 {

   GifFileType *gif;

   int frameCnt, height, width, channels, maxval, channels_new, maxval_new,

-      colors, r, g, b, i, frame, y, x, c, y1, x1, y2, x2, v, ret;

+      r, g, b, i, frame, y, x, c, y1, x1, y2, x2, v, ret;

   unsigned int delay;

   stBlinkenMovie *pOutMovie;

   stBlinkenFrame *pFrame, *pLast;

@@ -223,10 +223,10 @@ int BlinkenGifSave(stBlinkenMovie *pMovie, const char *pFilename)

   else

     channels_new = channels;

   switch (channels) {

-    case 1:  maxval_new = 255; colors = 256; break;

-    case 2:  maxval_new = 15;  colors = 256; break;

-    case 3:  maxval_new = 5;   colors = 216; break;

-    default: maxval_new = 255; colors = 255; break;

+    case 1:  maxval_new = 255; break;

+    case 2:  maxval_new = 15;  break;

+    case 3:  maxval_new = 5;   break;

+    default: maxval_new = 255; break;

   }

   pOutMovie = BlinkenMovieClone(pMovie);

   if (pOutMovie == NULL)

@@ -247,7 +247,7 @@ int BlinkenGifSave(stBlinkenMovie *pMovie, const char *pFilename)

   // set global GIF config

   gif->SWidth = width;

   gif->SHeight = height;

-  gif->SColorResolution = colors;

+  gif->SColorResolution = 256;

   gif->SBackGroundColor = 0;

   gif->SColorMap = NULL;

   gif->ImageCount = frameCnt;

@@ -266,15 +266,39 @@ int BlinkenGifSave(stBlinkenMovie *pMovie, const char *pFilename)

     BlinkenMovieFree(pOutMovie);

     return -1; // error

   }

-  for (b = 0, i = 0; b <= maxval && i < colors; ++b) {

-    for (g = 0; g <= maxval && i < colors; ++g) {

-      for (r = 0; r <= maxval && i < colors; ++r, ++i) {

+  i = 0;

+  switch (channels) {

+    case 1:

+      for (r = 0; r <= maxval; ++r) {

+        gif->SColorMap->Colors[i].Red   = ((int)r * 255 + maxval / 2) / maxval;

+        gif->SColorMap->Colors[i].Green = gif->SColorMap->Colors[i].Red;

+        gif->SColorMap->Colors[i].Blue  = gif->SColorMap->Colors[i].Red;

+        ++i;

+      }

+      break;

+    case 2:

+      for (g = 0; g <= maxval; ++g) {

+        for (r = 0; r <= maxval; ++r) {

+          gif->SColorMap->Colors[i].Red   = ((int)r * 255 + maxval / 2) / maxval;

+          gif->SColorMap->Colors[i].Green = ((int)g * 255 + maxval / 2) / maxval;

+          gif->SColorMap->Colors[i].Blue  = gif->SColorMap->Colors[i].Green;

+          ++i;

+        }

+      }

+      break;

+    case 3:

+      for (b = 0; b <= maxval; ++b) {

+        for (g = 0; g <= maxval; ++g) {

+          for (r = 0; r <= maxval; ++r) {

             gif->SColorMap->Colors[i].Red   = ((int)r * 255 + maxval / 2) / maxval;

             gif->SColorMap->Colors[i].Green = ((int)g * 255 + maxval / 2) / maxval;

             gif->SColorMap->Colors[i].Blue  = ((int)b * 255 + maxval / 2) / maxval;

+            ++i;

           }

         }

       }

+      break;

+  } // switch channels

   for (; i < 256; ++i) {

     gif->SColorMap->Colors[i].Red   = 0;

     gif->SColorMap->Colors[i].Green = 0;