[aseprite] 85/250: We don't need to give a RgbMap to convert from RGB -> Indexed

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e47fa9f04538b192780d1a4b6fd653b4d0367540
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Sep 24 23:42:51 2015 -0300

    We don't need to give a RgbMap to convert from RGB -> Indexed
---
 src/app/file/gif_format.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index 9e76573..da1834d 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -656,13 +656,12 @@ private:
   void convertIndexedSpriteToRgb() {
     for (Cel* cel : m_sprite->uniqueCels()) {
       Image* oldImage = cel->image();
-
       ImageRef newImage(
         render::convert_pixel_format
         (oldImage, NULL, IMAGE_RGB, DitheringMethod::NONE,
-         m_sprite->rgbMap(cel->frame()),
+         nullptr,
          m_sprite->palette(cel->frame()),
-         m_opaque,              // is background
+         m_opaque,
          m_bgIndex));
 
       m_sprite->replaceImage(oldImage->id(), newImage);
@@ -671,7 +670,7 @@ private:
     m_currentImage.reset(
       render::convert_pixel_format
       (m_currentImage.get(), NULL, IMAGE_RGB, DitheringMethod::NONE,
-       m_sprite->rgbMap(m_frameNum),
+       nullptr,
        m_sprite->palette(m_frameNum),
        m_opaque,
        m_bgIndex));
@@ -679,7 +678,7 @@ private:
     m_previousImage.reset(
       render::convert_pixel_format
       (m_previousImage.get(), NULL, IMAGE_RGB, DitheringMethod::NONE,
-       m_sprite->rgbMap(MAX(0, m_frameNum-1)),
+       nullptr,
        m_sprite->palette(MAX(0, m_frameNum-1)),
        m_opaque,
        m_bgIndex));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git