From 53896f9bfb47ac5c68c2dc380302bf41e9ec30b0 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Tue, 18 Jan 2011 19:30:42 -0300
Subject: [PATCH] Avoid to create an optimized palette for RGB images if the
 same loading process creates one. + Added Palette:isBlack member function.

---
 src/file/file.cpp      | 9 ++++++---
 src/raster/palette.cpp | 9 +++++++++
 src/raster/palette.h   | 3 +++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/file/file.cpp b/src/file/file.cpp
index 5cae3b1c9..284bcc6a8 100644
--- a/src/file/file.cpp
+++ b/src/file/file.cpp
@@ -394,7 +394,7 @@ FileOp *fop_to_save_sprite(Sprite *sprite)
   else
     fop->filename = fop->sprite->getFilename();
 
-  /* configure output format? */
+  // Configure output format?
   if (fop->format->support(FILE_SUPPORT_GET_FORMAT_OPTIONS)) {
     FormatOptions* format_options = fop->format->getFormatOptions(fop);
 
@@ -540,7 +540,8 @@ void fop_operate(FileOp *fop)
 	// Set the frames range
 	fop->sprite->setTotalFrames(frame);
 
-	// Set the frames range
+	// Sets special options from the specific format (e.g. BMP
+	// file can contain the number of bits per pixel).
 	fop->sprite->setFormatOptions(fop->seq.format_options);
       }
     }
@@ -566,7 +567,9 @@ void fop_operate(FileOp *fop)
 	fop->sprite->setFilename(fop->filename.c_str());
 
       // Creates a suitable palette for RGB images
-      if (fop->sprite->getImgType() == IMAGE_RGB) {
+      if (fop->sprite->getImgType() == IMAGE_RGB &&
+	  fop->sprite->getPalettes().size() <= 1 &&
+	  fop->sprite->getPalette(0)->isBlack()) {
 	Palette* palette = quantization::create_palette_from_rgb(fop->sprite);
 
 	fop->sprite->resetPalettes();
diff --git a/src/raster/palette.cpp b/src/raster/palette.cpp
index e402eb8a0..a2e42c7c3 100644
--- a/src/raster/palette.cpp
+++ b/src/raster/palette.cpp
@@ -128,6 +128,15 @@ int Palette::countDiff(const Palette* other, int* from, int* to) const
   return diff;
 }
 
+bool Palette::isBlack() const
+{
+  for (size_t c=0; c<m_colors.size(); ++c)
+    if (getEntry(c) != _rgba(0, 0, 0, 255))
+      return false;
+
+  return true;
+}
+
 void Palette::makeBlack()
 {
   std::fill(m_colors.begin(), m_colors.end(), _rgba(0, 0, 0, 255));
diff --git a/src/raster/palette.h b/src/raster/palette.h
index 090729473..c1d6c0f5d 100644
--- a/src/raster/palette.h
+++ b/src/raster/palette.h
@@ -78,7 +78,10 @@ public:
 
   int countDiff(const Palette* other, int* from, int* to) const;
 
+  // Returns true if the palette is completelly black.
+  bool isBlack() const;
   void makeBlack();
+
   void makeHorzRamp(int from, int to);
   void makeVertRamp(int from, int to, int columns);
   void makeRectRamp(int from, int to, int columns);